Allow forcing resolvers on generated types

codegen/codegen.go

@@ -38,15 +38,15 @@ func Generate(cfg Config) error {
 			return err
 		}
 		for _, model := range modelsBuild.Models {
-			cfg.Models[model.GQLType] = TypeMapEntry{
-				Model: cfg.Model.ImportPath() + "." + model.GoType,
-			}
+			modelCfg := cfg.Models[model.GQLType]
+			modelCfg.Model = cfg.Model.ImportPath() + "." + model.GoType
+			cfg.Models[model.GQLType] = modelCfg
 		}
 
 		for _, enum := range modelsBuild.Enums {
-			cfg.Models[enum.GQLType] = TypeMapEntry{
-				Model: cfg.Model.ImportPath() + "." + enum.GoType,
-			}
+			modelCfg := cfg.Models[enum.GQLType]
+			modelCfg.Model = cfg.Model.ImportPath() + "." + enum.GoType
+			cfg.Models[enum.GQLType] = modelCfg
 		}
 	}
 

codegen/config.go

@@ -148,9 +148,6 @@ func (tm TypeMap) Exists(typeName string) bool {
 
 func (tm TypeMap) Check() error {
 	for typeName, entry := range tm {
-		if entry.Model == "" {
-			return fmt.Errorf("model %s: entityPath is not defined", typeName)
-		}
 		if strings.LastIndex(entry.Model, ".") < strings.LastIndex(entry.Model, "/") {
 			return fmt.Errorf("model %s: invalid type specifier \"%s\" - you need to specify a struct to map to", typeName, entry.Model)
 		}

codegen/templates/field.gotpl

@@ -47,20 +47,7 @@
 			defer rctx.Pop()
 		{{- end }}
 
-			{{- if $field.GoVarName }}
-				res := obj.{{$field.GoVarName}}
-			{{- else if $field.GoMethodName }}
-				{{- if $field.NoErr }}
-					res := {{$field.GoMethodName}}({{ $field.CallArgs }})
-				{{- else }}
-					res, err := {{$field.GoMethodName}}({{ $field.CallArgs }})
-					if err != nil {
-						ec.Error(ctx, err)
-						return graphql.Null
-					}
-				{{- end }}
-			{{- else }}
-
+			{{- if $field.IsResolver }}
 				resTmp, err := ec.ResolverMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 					return ec.resolvers.{{ $object.GQLType }}_{{ $field.GQLName }}({{ $field.CallArgs }})
 				})
@@ -72,6 +59,18 @@
 					return graphql.Null
 				}
 				res := resTmp.({{$field.Signature}})
+			{{- else if $field.GoVarName }}
+				res := obj.{{$field.GoVarName}}
+			{{- else if $field.GoMethodName }}
+				{{- if $field.NoErr }}
+					res := {{$field.GoMethodName}}({{ $field.CallArgs }})
+				{{- else }}
+					res, err := {{$field.GoMethodName}}({{ $field.CallArgs }})
+					if err != nil {
+						ec.Error(ctx, err)
+						return graphql.Null
+					}
+				{{- end }}
 			{{- end }}
 			{{ $field.WriteJson }}
 		{{- if $field.IsConcurrent }}

codegen/type_build.go

@@ -16,17 +16,12 @@ func (cfg *Config) buildNamedTypes() NamedTypes {
 	for _, schemaType := range cfg.schema.Types {
 		t := namedTypeFromSchema(schemaType)
 
-		userType := ""
-		if userEntry, ok := cfg.Models[t.GQLType]; ok {
-			userType = userEntry.Model
-		}
-		t.IsUserDefined = userType != ""
-		if userType == "" && t.IsScalar {
-			userType = "github.com/vektah/gqlgen/graphql.String"
-		}
-
-		if userType != "" {
-			t.Package, t.GoType = pkgAndType(userType)
+		if userEntry, ok := cfg.Models[t.GQLType]; ok && userEntry.Model != "" {
+			t.IsUserDefined = true
+			t.Package, t.GoType = pkgAndType(userEntry.Model)
+		} else if t.IsScalar {
+			t.Package = "github.com/vektah/gqlgen/graphql"
+			t.GoType = "String"
 		}
 
 		types[t.GQLType] = t

example/starwars/.gqlgen.yml

@@ -3,13 +3,13 @@ models:
     model: github.com/vektah/gqlgen/example/starwars.Droid
   FriendsConnection:
     model: github.com/vektah/gqlgen/example/starwars.FriendsConnection
-  FriendsEdge:
-    model: github.com/vektah/gqlgen/example/starwars.FriendsEdge
   Human:
     model: github.com/vektah/gqlgen/example/starwars.Human
   Review:
     model: github.com/vektah/gqlgen/example/starwars.Review
   ReviewInput:
     model: github.com/vektah/gqlgen/example/starwars.Review
   Starship:
-    model: github.com/vektah/gqlgen/example/starwars.Starship
+    fields:
+      length:
+        resolver: true