Merge pull request #605 from 99designs/fix-default-scalars

Fix default scalars
99designs · Mar 11, 2019 · 485ddf3 · 485ddf3
2 parents 3ca2599 + 30d235b
commit 485ddf3
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 6 deletions.
diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/codegen/testserver/models-gen.go b/codegen/testserver/models-gen.go
diff --git a/codegen/testserver/scalar_default.graphql b/codegen/testserver/scalar_default.graphql
@@ -4,3 +4,7 @@ extend type Query {
 
 """ This doesnt have an implementation in the typemap, so it should act like a string """
 scalar DefaultScalarImplementation
+
+type EmbeddedDefaultScalar {
+    value: DefaultScalarImplementation
+}
diff --git a/plugin/modelgen/models.go b/plugin/modelgen/models.go
@@ -118,12 +118,22 @@ func (m *Plugin) MutateConfig(cfg *config.Config) error {
 						return err
 					}
 				} else {
-					// no user defined model, must reference another generated model
-					typ = types.NewNamed(
-						types.NewTypeName(0, cfg.Model.Pkg(), templates.ToGo(field.Type.Name()), nil),
-						nil,
-						nil,
-					)
+					fieldDef := schema.Types[field.Type.Name()]
+					if fieldDef.Kind == ast.Scalar {
+						// no user defined model, referencing a default scalar
+						typ = types.NewNamed(
+							types.NewTypeName(0, cfg.Model.Pkg(), "string", nil),
+							nil,
+							nil,
+						)
+					} else {
+						// no user defined model, must reference another generated model
+						typ = types.NewNamed(
+							types.NewTypeName(0, cfg.Model.Pkg(), templates.ToGo(field.Type.Name()), nil),
+							nil,
+							nil,
+						)
+					}
 				}
 
 				name := field.Name