Merge pull request 99designs#285 from 99designs/fix-force-type

Stop force resolver from picking up types from matching fields

codegen/object.go

@@ -71,7 +71,7 @@ func (o *Object) HasResolvers() bool {
 }
 
 func (f *Field) IsResolver() bool {
-	return f.ForceResolver || f.GoFieldName == ""
+	return f.GoFieldName == ""
 }
 
 func (f *Field) IsMethod() bool {

codegen/testserver/generated_test.go

@@ -7,11 +7,20 @@ import (
 	"net/http"
 	"testing"
 
+	"reflect"
+
 	"github.com/99designs/gqlgen/handler"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCompiles(t *testing.T) {
 	http.Handle("/query", handler.GraphQL(NewExecutableSchema(Config{
 		Resolvers: &Resolver{},
 	})))
 }
+
+func TestForcedResolverFieldIsPointer(t *testing.T) {
+	field, ok := reflect.TypeOf((*ForcedResolverResolver)(nil)).Elem().MethodByName("Field")
+	require.True(t, ok)
+	require.Equal(t, "*testserver.Circle", field.Type.Out(0).String())
+}

codegen/testserver/gqlgen.yml

@@ -25,3 +25,7 @@ models:
     model: "github.com/99designs/gqlgen/codegen/testserver.Circle"
   Rectangle:
     model: "github.com/99designs/gqlgen/codegen/testserver.Rectangle"
+  ForcedResolver:
+    model: "github.com/99designs/gqlgen/codegen/testserver.ForcedResolver"
+    fields:
+      field: { resolver: true }

codegen/testserver/models.go

@@ -0,0 +1,5 @@
+package testserver
+
+type ForcedResolver struct {
+	Field Circle
+}

codegen/testserver/resolver.go

@@ -11,10 +11,19 @@ import (
 
 type Resolver struct{}
 
+func (r *Resolver) ForcedResolver() ForcedResolverResolver {
+	return &forcedResolverResolver{r}
+}
 func (r *Resolver) Query() QueryResolver {
 	return &queryResolver{r}
 }
 
+type forcedResolverResolver struct{ *Resolver }
+
+func (r *forcedResolverResolver) Field(ctx context.Context, obj *ForcedResolver) (*Circle, error) {
+	panic("not implemented")
+}
+
 type queryResolver struct{ *Resolver }
 
 func (r *queryResolver) InvalidIdentifier(ctx context.Context) (*invalid_packagename.InvalidIdentifier, error) {

codegen/testserver/schema.graphql

@@ -113,3 +113,7 @@ type Rectangle implements Shape {
     area: Float
 }
 union ShapeUnion = Circle | Rectangle
+
+type ForcedResolver {
+    field: Circle
+}

codegen/util.go

@@ -166,6 +166,10 @@ func bindObject(t types.Type, object *Object, imports *Imports) BindErrors {
 	for i := range object.Fields {
 		field := &object.Fields[i]
 
+		if field.ForceResolver {
+			continue
+		}
+
 		// first try binding to a method
 		methodErr := bindMethod(imports, t, field)
 		if methodErr == nil {
@@ -261,7 +265,9 @@ nextArg:
 		param := params.At(j)
 		for _, oldArg := range field.Args {
 			if strings.EqualFold(oldArg.GQLName, param.Name()) {
-				oldArg.Type.Modifiers = modifiersFromGoType(param.Type())
+				if !field.ForceResolver {
+					oldArg.Type.Modifiers = modifiersFromGoType(param.Type())
+				}
 				newArgs = append(newArgs, oldArg)
 				continue nextArg
 			}

example/todo/todo_test.go

@@ -223,10 +223,10 @@ func TestSkipAndIncludeDirectives(t *testing.T) {
 			Expected bool
 		}
 		table := []TestCase{
-			TestCase{Skip: true, Include: true, Expected: false},
-			TestCase{Skip: true, Include: false, Expected: false},
-			TestCase{Skip: false, Include: true, Expected: true},
-			TestCase{Skip: false, Include: false, Expected: false},
+			{Skip: true, Include: true, Expected: false},
+			{Skip: true, Include: false, Expected: false},
+			{Skip: false, Include: true, Expected: true},
+			{Skip: false, Include: false, Expected: false},
 		}
 		q := `query Test($skip: Boolean!, $include: Boolean!) { todo(id: 1) @skip(if: $skip) @include(if: $include) { __typename } }`
 		for _, tc := range table {