Merge pull request 99designs#722 from marwan-at-work/deps

resolve all pkg dependencies

codegen/config/binder.go

@@ -14,7 +14,7 @@ import (
 
 // Binder connects graphql types to golang types using static analysis
 type Binder struct {
-	pkgs       []*packages.Package
+	pkgs       map[string]*packages.Package
 	schema     *ast.Schema
 	cfg        *Config
 	References []*TypeReference
@@ -26,7 +26,9 @@ func (c *Config) NewBinder(s *ast.Schema) (*Binder, error) {
 		return nil, err
 	}
 
+	mp := map[string]*packages.Package{}
 	for _, p := range pkgs {
+		populatePkg(mp, p)
 		for _, e := range p.Errors {
 			if e.Kind == packages.ListError {
 				return nil, p.Errors[0]
@@ -35,12 +37,23 @@ func (c *Config) NewBinder(s *ast.Schema) (*Binder, error) {
 	}
 
 	return &Binder{
-		pkgs:   pkgs,
+		pkgs:   mp,
 		schema: s,
 		cfg:    c,
 	}, nil
 }
 
+func populatePkg(mp map[string]*packages.Package, p *packages.Package) {
+	imp := code.NormalizeVendor(p.PkgPath)
+	if _, ok := mp[imp]; ok {
+		return
+	}
+	mp[imp] = p
+	for _, p := range p.Imports {
+		populatePkg(mp, p)
+	}
+}
+
 func (b *Binder) TypePosition(typ types.Type) token.Position {
 	named, isNamed := typ.(*types.Named)
 	if !isNamed {
@@ -75,10 +88,9 @@ func (b *Binder) FindType(pkgName string, typeName string) (types.Type, error) {
 }
 
 func (b *Binder) getPkg(find string) *packages.Package {
-	for _, p := range b.pkgs {
-		if code.NormalizeVendor(find) == code.NormalizeVendor(p.PkgPath) {
-			return p
-		}
+	imp := code.NormalizeVendor(find)
+	if p, ok := b.pkgs[imp]; ok {
+		return p
 	}
 	return nil
 }

codegen/testserver/gqlgen.yml

@@ -76,3 +76,7 @@ models:
     model: "github.com/99designs/gqlgen/codegen/testserver.FallbackToStringEncoding"
   Bytes:
     model: "github.com/99designs/gqlgen/codegen/testserver.Bytes"
+  WrappedStruct:
+    model: "github.com/99designs/gqlgen/codegen/testserver.WrappedStruct"
+  WrappedScalar:
+    model: "github.com/99designs/gqlgen/codegen/testserver.WrappedScalar"

codegen/testserver/otherpkg/model.go

@@ -0,0 +1,7 @@
+package otherpkg
+
+type Scalar string
+
+type Struct struct {
+	Name string
+}

codegen/testserver/resolver.go

@@ -203,6 +203,12 @@ func (r *queryResolver) OptionalUnion(ctx context.Context) (TestUnion, error) {
 func (r *queryResolver) ValidType(ctx context.Context) (*ValidType, error) {
 	panic("not implemented")
 }
+func (r *queryResolver) WrappedStruct(ctx context.Context) (*WrappedStruct, error) {
+	panic("not implemented")
+}
+func (r *queryResolver) WrappedScalar(ctx context.Context) (WrappedScalar, error) {
+	panic("not implemented")
+}
 
 type subscriptionResolver struct{ *Resolver }
 

codegen/testserver/wrapped_type.go

@@ -0,0 +1,6 @@
+package testserver
+
+import "github.com/99designs/gqlgen/codegen/testserver/otherpkg"
+
+type WrappedScalar otherpkg.Scalar
+type WrappedStruct otherpkg.Struct