tests passing

depinject/check_type.go

@@ -16,12 +16,12 @@ func isExportedType(typ reflect.Type) error {
 	pkgPath := typ.PkgPath()
 	if name != "" && pkgPath != "" {
 		if unicode.IsLower([]rune(name)[0]) {
-			return errors.Errorf("type is not exported: %s", typ)
+			return errors.Errorf("type must be exported: %s", typ)
 		}
 
 		pkgParts := strings.Split(pkgPath, "/")
 		if slices.Contains(pkgParts, "internal") {
-			return errors.Errorf("type is in an internal package: %s", typ)
+			return errors.Errorf("type must not come from an internal package: %s", typ)
 		}
 
 		return nil

depinject/check_type_test.go

@@ -7,7 +7,6 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"cosmossdk.io/depinject/internal/codegen"
 	"cosmossdk.io/depinject/internal/graphviz"
 )
 
@@ -42,19 +41,11 @@ func TestCheckIsExportedType(t *testing.T) {
 	expectValidType(t, uintptr(0))
 	expectValidType(t, (*Location)(nil))
 
-	expectInvalidType(t, container{}, "not exported")
-	expectInvalidType(t, &container{}, "not exported")
+	expectInvalidType(t, container{}, "must be exported")
+	expectInvalidType(t, &container{}, "must be exported")
 	expectInvalidType(t, graphviz.Attributes{}, "internal")
 	expectInvalidType(t, map[string]graphviz.Attributes{}, "internal")
 	expectInvalidType(t, []graphviz.Attributes{}, "internal")
-
-	// generics
-	expectValidType(t, AGenericStruct[int, In]{})
-	expectValidType(t, AGenericStruct[*In, *Out]{})
-	expectInvalidType(t, AGenericStruct[container, containerConfig]{}, "not exported")
-	expectInvalidType(t, AGenericStruct[*container, *containerConfig]{}, "not exported")
-	expectInvalidType(t, AGenericStruct[graphviz.Attributes, codegen.FileGen]{}, "internal")
-	expectInvalidType(t, AGenericStruct[*graphviz.Attributes, *codegen.FileGen]{}, "internal")
 }
 
 func expectValidType(t *testing.T, v interface{}) {
@@ -66,8 +57,3 @@ func expectInvalidType(t *testing.T, v interface{}, errContains string) {
 	t.Helper()
 	assert.ErrorContains(t, isExportedType(reflect.TypeOf(v)), errContains)
 }
-
-type AGenericStruct[A, B any] struct {
-	A A
-	B B
-}

depinject/invoke_test.go

@@ -10,49 +10,49 @@ import (
 )
 
 func TestInvoke(t *testing.T) {
-	gocuke.NewRunner(t, &invokeSuite{}).
+	gocuke.NewRunner(t, &InvokeSuite{}).
 		Path("features/invoke.feature").
-		Step("an int provider returning 5", (*invokeSuite).AnIntProviderReturning5).
-		Step(`a string pointer provider pointing to "foo"`, (*invokeSuite).AStringPointerProviderPointingToFoo).
+		Step("an int provider returning 5", (*InvokeSuite).AnIntProviderReturning5).
+		Step(`a string pointer provider pointing to "foo"`, (*InvokeSuite).AStringPointerProviderPointingToFoo).
 		Run()
 }
 
-type invokeSuite struct {
+type InvokeSuite struct {
 	gocuke.TestingT
 	configs []depinject.Config
 	i       int
 	sp      *string
 }
 
-func (s *invokeSuite) AnInvokerRequestingAnIntAndStringPointer() {
+func (s *InvokeSuite) AnInvokerRequestingAnIntAndStringPointer() {
 	s.configs = append(s.configs,
 		depinject.Supply(s),
-		depinject.Invoke((*invokeSuite).IntStringPointerInvoker),
+		depinject.Invoke((*InvokeSuite).IntStringPointerInvoker),
 	)
 }
 
-func (s *invokeSuite) IntStringPointerInvoker(i int, sp *string) {
+func (s *InvokeSuite) IntStringPointerInvoker(i int, sp *string) {
 	s.i = i
 	s.sp = sp
 }
 
-func (s *invokeSuite) TheContainerIsBuilt() {
+func (s *InvokeSuite) TheContainerIsBuilt() {
 	assert.NilError(s, depinject.Inject(depinject.Configs(s.configs...)))
 }
 
-func (s *invokeSuite) TheInvokerWillGetTheIntParameterSetTo(a int64) {
+func (s *InvokeSuite) TheInvokerWillGetTheIntParameterSetTo(a int64) {
 	assert.Equal(s, int(a), s.i)
 }
 
-func (s *invokeSuite) TheInvokerWillGetTheStringPointerParameterSetToNil() {
+func (s *InvokeSuite) TheInvokerWillGetTheStringPointerParameterSetToNil() {
 	if s.sp != nil {
 		s.Fatalf("expected a nil string pointer, got %s", *s.sp)
 	}
 }
 
 func IntProvider5() int { return 5 }
 
-func (s *invokeSuite) AnIntProviderReturning5() {
+func (s *InvokeSuite) AnIntProviderReturning5() {
 	s.configs = append(s.configs, depinject.Provide(IntProvider5))
 }
 
@@ -61,28 +61,28 @@ func StringPtrProviderFoo() *string {
 	return &x
 }
 
-func (s *invokeSuite) AStringPointerProviderPointingToFoo() {
+func (s *InvokeSuite) AStringPointerProviderPointingToFoo() {
 	s.configs = append(s.configs, depinject.Provide(StringPtrProviderFoo))
 }
 
-func (s *invokeSuite) TheInvokerWillGetTheStringPointerParameterSetTo(a string) {
+func (s *InvokeSuite) TheInvokerWillGetTheStringPointerParameterSetTo(a string) {
 	if s.sp == nil {
 		s.Fatalf("expected a non-nil string pointer")
 	}
 	assert.Equal(s, a, *s.sp)
 }
 
-func (s *invokeSuite) AnInvokerRequestingAnIntAndStringPointerRunInModule(a string) {
+func (s *InvokeSuite) AnInvokerRequestingAnIntAndStringPointerRunInModule(a string) {
 	s.configs = append(s.configs,
 		depinject.Supply(s),
-		depinject.InvokeInModule(a, (*invokeSuite).IntStringPointerInvoker),
+		depinject.InvokeInModule(a, (*InvokeSuite).IntStringPointerInvoker),
 	)
 }
 
 func ProvideLenModuleKey(key depinject.ModuleKey) int {
 	return len(key.Name())
 }
 
-func (s *invokeSuite) AModulescopedIntProviderWhichReturnsTheLengthOfTheModuleName() {
+func (s *InvokeSuite) AModulescopedIntProviderWhichReturnsTheLengthOfTheModuleName() {
 	s.configs = append(s.configs, depinject.Provide(ProvideLenModuleKey))
 }

depinject/provider_desc.go

@@ -1,7 +1,6 @@
 package depinject
 
 import (
-	"fmt"
 	"reflect"
 	"strings"
 	"unicode"
@@ -147,42 +146,18 @@ func postProcessProvider(descriptor providerDescriptor) (providerDescriptor, err
 
 func checkInputAndOutputTypes(descriptor providerDescriptor) error {
 	for _, input := range descriptor.Inputs {
-		err := checkType(input.Type)
+		err := isExportedType(input.Type)
 		if err != nil {
 			return err
 		}
 	}
 
 	for _, output := range descriptor.Outputs {
-		err := checkType(output.Type)
+		err := isExportedType(output.Type)
 		if err != nil {
 			return err
 		}
 	}
 
 	return nil
 }
-
-func checkType(typ reflect.Type) error {
-
-	name := typ.Name()
-	if name == "" {
-		return nil
-	}
-
-	pkgPath := typ.PkgPath()
-	if pkgPath == "" {
-
-	}
-
-	if unicode.IsLower([]rune(name)[0]) {
-		return fmt.Errorf("type must be exported: %s", typ)
-	}
-
-	pkgParts := strings.Split(pkgPath, "/")
-	if slices.Contains(pkgParts, "internal") {
-		return errors.Errorf("type must not be in an internal package: %s", typ)
-	}
-
-	return nil
-}

depinject/provider_desc_test.go

@@ -5,6 +5,9 @@ import (
 	"testing"
 
 	"gotest.tools/v3/assert"
+
+	"cosmossdk.io/depinject/internal/codegen"
+	"cosmossdk.io/depinject/internal/graphviz"
 )
 
 type StructIn struct {
@@ -26,6 +29,10 @@ type StructOut struct {
 
 func privateProvider(int, float64) (string, []byte) { return "", nil }
 
+func PrivateInAndOut(containerConfig) *container { return nil }
+
+func InternalInAndOut(graphviz.Attributes) *codegen.FileGen { return nil }
+
 type SomeStruct struct{}
 
 func (SomeStruct) privateMethod() int { return 0 }
@@ -77,6 +84,20 @@ func TestExtractProviderDescriptor(t *testing.T) {
 			nil,
 			"function must be exported",
 		},
+		{
+			"private in and out",
+			PrivateInAndOut,
+			nil,
+			nil,
+			"type must be exported",
+		},
+		{
+			"internal in and out",
+			InternalInAndOut,
+			nil,
+			nil,
+			"internal",
+		},
 		{
 			"struct",
 			SomeStruct{},
@@ -134,13 +155,13 @@ func TestExtractProviderDescriptor(t *testing.T) {
 				assert.ErrorContains(t, err, tt.wantErr)
 			} else {
 				assert.NilError(t, err)
-			}
 
-			if !reflect.DeepEqual(got.Inputs, tt.wantIn) {
-				t.Errorf("extractProviderDescriptor() got = %v, want %v", got.Inputs, tt.wantIn)
-			}
-			if !reflect.DeepEqual(got.Outputs, tt.wantOut) {
-				t.Errorf("extractProviderDescriptor() got = %v, want %v", got.Outputs, tt.wantOut)
+				if !reflect.DeepEqual(got.Inputs, tt.wantIn) {
+					t.Errorf("extractProviderDescriptor() got = %v, want %v", got.Inputs, tt.wantIn)
+				}
+				if !reflect.DeepEqual(got.Outputs, tt.wantOut) {
+					t.Errorf("extractProviderDescriptor() got = %v, want %v", got.Outputs, tt.wantOut)
+				}
 			}
 		})
 	}