address comment

codegen/config.go

@@ -79,7 +79,7 @@ type TypeMapEntry struct {
 
 type TypeMapField struct {
 	Resolver  bool   `yaml:"resolver"`
-	ModelName string `yaml:"modelField"`
+	FieldName string `yaml:"fieldName"`
 }
 
 func (c *PackageConfig) normalize() error {

codegen/input_build.go

@@ -49,20 +49,18 @@ func (cfg *Config) buildInput(types NamedTypes, typ *ast.Definition) (*Object, e
 	typeEntry, entryExists := cfg.Models[typ.Name]
 
 	for _, field := range typ.Fields {
-		var goVarName string
+		newField := Field{
+			GQLName: field.Name,
+			Type:    types.getType(field.Type),
+			Object:  obj,
+		}
+
 		if entryExists {
 			if typeField, ok := typeEntry.Fields[field.Name]; ok {
-				goVarName = typeField.ModelName
+				newField.GoFieldName = typeField.FieldName
 			}
 		}
 
-		newField := Field{
-			GQLName:     field.Name,
-			Type:        types.getType(field.Type),
-			Object:      obj,
-			GoFieldName: goVarName,
-		}
-
 		if field.DefaultValue != nil {
 			var err error
 			newField.Default, err = field.DefaultValue.Value(nil)

codegen/object_build.go

@@ -137,7 +137,7 @@ func (cfg *Config) buildObject(types NamedTypes, typ *ast.Definition, imports *I
 		var goName string
 		if entryExists {
 			if typeField, ok := typeEntry.Fields[field.Name]; ok {
-				goName = typeField.ModelName
+				goName = typeField.FieldName
 				forceResolver = typeField.Resolver
 			}
 		}

example/config/.gqlgen.yml

@@ -16,13 +16,13 @@ models:
   Todo:    # Object
     fields:
       text:
-        modelField: Description # Field
+        fieldName: Description # Field
   NewTodo: # Input
     fields:
       userId:
-        modelField: UserID      # Field
+        fieldName: UserID      # Field
   User:
     model: github.com/vektah/gqlgen/example/config.User
     fields:
       name:
-        modelField: FullName    # Method
+        fieldName: FullName    # Method

example/config/server/server.go

@@ -1,11 +1,8 @@
 package main
 
 import (
-	"context"
-	"errors"
 	"log"
 	"net/http"
-	"runtime/debug"
 
 	todo "github.com/vektah/gqlgen/example/config"
 	"github.com/vektah/gqlgen/handler"
@@ -15,12 +12,6 @@ func main() {
 	http.Handle("/", handler.Playground("Todo", "/query"))
 	http.Handle("/query", handler.GraphQL(
 		todo.NewExecutableSchema(todo.New()),
-		handler.RecoverFunc(func(ctx context.Context, err interface{}) error {
-			// send this panic somewhere
-			log.Print(err)
-			debug.PrintStack()
-			return errors.New("user message on panic")
-		}),
 	))
 	log.Fatal(http.ListenAndServe(":8081", nil))
 }