Merge pull request 99designs#554 from 99designs/fix-missing-recover

Recover from panics in unlikly places

codegen/args.go

@@ -78,7 +78,7 @@ nextArg:
 		}
 
 		// no matching arg found, abort
-		return fmt.Errorf("%s is not in schema", param.Name())
+		return fmt.Errorf("arg %s not in schema", param.Name())
 	}
 
 	field.Args = newArgs

codegen/config/binder.go

@@ -84,7 +84,7 @@ var InterfaceType = types.NewInterfaceType(nil, nil)
 func (b *Binder) DefaultUserObject(name string) (types.Type, error) {
 	models := b.cfg.Models[name].Model
 	if len(models) == 0 {
-		return nil, fmt.Errorf(name + " not found")
+		return nil, fmt.Errorf(name + " not found in typemap")
 	}
 
 	if models[0] == "map[string]interface{}" {
@@ -346,6 +346,10 @@ func (b *Binder) TypeReference(schemaType *ast.Type, bindTarget types.Type) (ret
 		}
 	}()
 
+	if len(b.cfg.Models[schemaType.Name()].Model) == 0 {
+		return nil, fmt.Errorf("%s was not found", schemaType.Name())
+	}
+
 	for _, model := range b.cfg.Models[schemaType.Name()].Model {
 		if model == "map[string]interface{}" {
 			if !isMap(bindTarget) {
@@ -404,7 +408,7 @@ func (b *Binder) TypeReference(schemaType *ast.Type, bindTarget types.Type) (ret
 		return ref, nil
 	}
 
-	return nil, fmt.Errorf("not found")
+	return nil, fmt.Errorf("%s has type compatible with %s", schemaType.Name(), bindTarget.String())
 }
 
 func (b *Binder) CopyModifiersFromAst(t *ast.Type, usePtr bool, base types.Type) types.Type {

codegen/field.go

@@ -62,9 +62,14 @@ func (b *builder) buildField(obj *Object, field *ast.FieldDefinition) (*Field, e
 	}
 
 	if err = b.bindField(obj, &f); err != nil {
+		f.IsResolver = true
 		log.Println(err.Error())
 	}
 
+	if f.IsResolver && !f.TypeReference.IsPtr() && f.TypeReference.IsStruct() {
+		f.TypeReference = b.Binder.PointerTo(f.TypeReference)
+	}
+
 	return &f, nil
 }
 
@@ -77,10 +82,6 @@ func (b *builder) bindField(obj *Object, f *Field) error {
 			}
 			f.TypeReference = tr
 		}
-
-		if f.IsResolver && !f.TypeReference.IsPtr() && f.TypeReference.IsStruct() {
-			f.TypeReference = b.Binder.PointerTo(f.TypeReference)
-		}
 	}()
 
 	switch {
@@ -115,8 +116,6 @@ func (b *builder) bindField(obj *Object, f *Field) error {
 
 	switch target := target.(type) {
 	case nil:
-		f.IsResolver = true
-
 		objPos := b.Binder.TypePosition(obj.Type)
 		return fmt.Errorf(
 			"%s:%d adding resolver method for %s.%s, nothing matched",
@@ -125,6 +124,7 @@ func (b *builder) bindField(obj *Object, f *Field) error {
 			obj.Name,
 			f.Name,
 		)
+
 	case *types.Func:
 		sig := target.Type().(*types.Signature)
 		if sig.Results().Len() == 1 {

codegen/object.gotpl

@@ -42,6 +42,11 @@ func (ec *executionContext) _{{$object.Name}}(ctx context.Context, sel ast.Selec
 			{{- if $field.IsConcurrent }}
 				field := field
 				out.Concurrently(i, func() (res graphql.Marshaler) {
+					defer func() {
+						if r := recover(); r != nil {
+							ec.Error(ctx, ec.Recover(ctx, r))
+						}
+					}()
 					res = ec._{{$object.Name}}_{{$field.Name}}(ctx, field{{if not $object.Root}}, obj{{end}})
 					{{- if $field.TypeReference.GQL.NonNull }}
 						if res == graphql.Null {