Merge pull request #180 from vektah/import-alias-before-finalize

Fix a bug custom scalar marshallers in external packages
99designs · Jul 10, 2018 · ac9e5a6 · ac9e5a6
2 parents 43212c0 + 160ebab
commit ac9e5a6
Show file tree

Hide file tree

Showing 16 changed files with 127 additions and 118 deletions.
diff --git a/codegen/build.go b/codegen/build.go
@@ -103,19 +103,19 @@ func (cfg *Config) bind() (*Build, error) {
 	// Poke a few magic methods into query
 	q := b.Objects.ByName(b.QueryRoot.GQLType)
 	q.Fields = append(q.Fields, Field{
-		Type:         &Type{namedTypes["__Schema"], []string{modPtr}, ""},
+		Type:         &Type{namedTypes["__Schema"], []string{modPtr}, nil},
 		GQLName:      "__schema",
 		NoErr:        true,
 		GoMethodName: "ec.introspectSchema",
 		Object:       q,
 	})
 	q.Fields = append(q.Fields, Field{
-		Type:         &Type{namedTypes["__Type"], []string{modPtr}, ""},
+		Type:         &Type{namedTypes["__Type"], []string{modPtr}, nil},
 		GQLName:      "__type",
 		NoErr:        true,
 		GoMethodName: "ec.introspectType",
 		Args: []FieldArgument{
-			{GQLName: "name", Type: &Type{namedTypes["String"], []string{}, ""}, Object: &Object{}},
+			{GQLName: "name", Type: &Type{namedTypes["String"], []string{}, nil}, Object: &Object{}},
 		},
 		Object: q,
 	})

diff --git a/codegen/import.go b/codegen/import.go
@@ -5,9 +5,10 @@ import (
 )
 
 type Import struct {
-	Name  string
-	Alias string
-	Path  string
+	Name string
+	Path string
+
+	alias string
 }
 
 type Imports struct {
@@ -16,5 +17,13 @@ type Imports struct {
 }
 
 func (i *Import) Write() string {
-	return i.Alias + " " + strconv.Quote(i.Path)
+	return i.Alias() + " " + strconv.Quote(i.Path)
+}
+
+func (i *Import) Alias() string {
+	if i.alias == "" {
+		panic("alias called before imports are finalized")
+	}
+
+	return i.alias
 }
diff --git a/codegen/import_build.go b/codegen/import_build.go
@@ -88,10 +88,10 @@ func (s Imports) finalize() []*Import {
 			alias = imp.Name + strconv.Itoa(i)
 			i++
 			if i > 10 {
-				panic(fmt.Errorf("too many collisions, last attempt was %s", imp.Alias))
+				panic(fmt.Errorf("too many collisions, last attempt was %s", alias))
 			}
 		}
-		imp.Alias = alias
+		imp.alias = alias
 	}
 
 	return s.imports
@@ -108,7 +108,7 @@ func (s Imports) findByPath(importPath string) *Import {
 
 func (s Imports) findByAlias(alias string) *Import {
 	for _, imp := range s.imports {
-		if imp.Alias == alias {
+		if imp.alias == alias {
 			return imp
 		}
 	}

diff --git a/codegen/type.go b/codegen/type.go
@@ -27,7 +27,7 @@ type Type struct {
 	*NamedType
 
 	Modifiers []string
-	CastType  string // the type to cast to when unmarshalling
+	CastType  *Ref // the type to cast to when unmarshalling
 }
 
 const (
@@ -40,10 +40,10 @@ func (t Ref) FullName() string {
 }
 
 func (t Ref) PkgDot() string {
-	if t.Import == nil || t.Import.Alias == "" {
+	if t.Import == nil || t.Import.Alias() == "" {
 		return ""
 	}
-	return t.Import.Alias + "."
+	return t.Import.Alias() + "."
 }
 
 func (t Type) Signature() string {
@@ -125,7 +125,7 @@ func (t Type) unmarshal(result, raw string, remainingMods []string, depth int) s
 	}
 
 	realResult := result
-	if t.CastType != "" {
+	if t.CastType != nil {
 		result = "castTmp"
 	}
 
@@ -140,7 +140,7 @@ func (t Type) unmarshal(result, raw string, remainingMods []string, depth int) s
 				err = (&{{.result}}).UnmarshalGQL({{.raw}})
 			{{- end }}
 		{{- if .t.CastType }}
-			{{ .realResult }} = {{.t.CastType}}(castTmp)
+			{{ .realResult }} = {{.t.CastType.FullName}}(castTmp)
 		{{- end }}`, map[string]interface{}{
 		"realResult": realResult,
 		"result":     result,
@@ -150,7 +150,7 @@ func (t Type) unmarshal(result, raw string, remainingMods []string, depth int) s
 }
 
 func (t Type) Marshal(val string) string {
-	if t.CastType != "" {
+	if t.CastType != nil {
 		val = t.GoType + "(" + val + ")"
 	}
 

diff --git a/codegen/util.go b/codegen/util.go
@@ -185,10 +185,7 @@ func bindObject(t types.Type, object *Object, imports *Imports) error {
 			case normalizeVendor(structField.Type().Underlying().String()):
 				pkg, typ := pkgAndType(structField.Type().String())
 				imp := imports.findByPath(pkg)
-				field.CastType = typ
-				if imp != nil {
-					field.CastType = imp.Alias + "." + typ
-				}
+				field.CastType = &Ref{GoType: typ, Import: imp}
 
 			default:
 				// type mismatch, require custom resolver for field

diff --git a/example/scalars/.gqlgen.yml b/example/scalars/.gqlgen.yml
@@ -1,13 +1,16 @@
+model:
+  filename: model/generated.go
+
 models:
   User:
-    model: github.com/vektah/gqlgen/example/scalars.User
+    model: github.com/vektah/gqlgen/example/scalars/model.User
   Timestamp:
-    model: github.com/vektah/gqlgen/example/scalars.Timestamp
+    model: github.com/vektah/gqlgen/example/scalars/model.Timestamp
   SearchArgs:
-    model: github.com/vektah/gqlgen/example/scalars.SearchArgs
+    model: github.com/vektah/gqlgen/example/scalars/model.SearchArgs
   Point:
-    model: github.com/vektah/gqlgen/example/scalars.Point
+    model: github.com/vektah/gqlgen/example/scalars/model.Point
   ID:
-    model: github.com/vektah/gqlgen/example/scalars.ID
+    model: github.com/vektah/gqlgen/example/scalars/model.ID
   Tier:
-    model: github.com/vektah/gqlgen/example/scalars.Tier
+    model: github.com/vektah/gqlgen/example/scalars/model.Tier