Merge pull request 99designs#358 from 99designs/fix-embedded-pointer

Fix Embedded Pointer

codegen/testserver/gqlgen.yml

@@ -34,3 +34,5 @@ models:
       friends: { resolver: true }
   Error:
     model: "github.com/99designs/gqlgen/codegen/testserver.Error"
+  EmbeddedPointer:
+    model: "github.com/99designs/gqlgen/codegen/testserver.EmbeddedPointerModel"

codegen/testserver/models.go

@@ -21,3 +21,12 @@ func (Error) ErrorOnNonRequiredField() (string, error) {
 func (Error) NilOnRequiredField() *string {
 	return nil
 }
+
+type EmbeddedPointerModel struct {
+	*EmbeddedPointer
+	ID string
+}
+
+type EmbeddedPointer struct {
+	Title string
+}

codegen/testserver/schema.graphql

@@ -137,3 +137,8 @@ union ShapeUnion = Circle | Rectangle
 type ForcedResolver {
     field: Circle
 }
+
+type EmbeddedPointer {
+    ID: String
+    Title: String
+}

codegen/util.go

@@ -132,17 +132,16 @@ func findField(typ *types.Struct, name, structTag string) (*types.Var, error) {
 		}
 
 		if field.Anonymous() {
-			if named, ok := field.Type().(*types.Struct); ok {
-				f, err := findField(named, name, structTag)
-				if err != nil && !strings.HasPrefix(err.Error(), "no field named") {
-					return nil, err
-				}
-				if f != nil && foundField == nil {
-					foundField = f
-				}
+
+			fieldType := field.Type()
+
+			if ptr, ok := fieldType.(*types.Pointer); ok {
+				fieldType = ptr.Elem()
 			}
 
-			if named, ok := field.Type().Underlying().(*types.Struct); ok {
+			// Type.Underlying() returns itself for all types except types.Named, where it returns a struct type.
+			// It should be safe to always call.
+			if named, ok := fieldType.Underlying().(*types.Struct); ok {
 				f, err := findField(named, name, structTag)
 				if err != nil && !strings.HasPrefix(err.Error(), "no field named") {
 					return nil, err