Merge pull request #51 from vektah/support-embedding

Support embedding in models
99designs · Mar 17, 2018 · ac832de · ac832de
2 parents cb34e6d + 9d71071
commit ac832de
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 36 deletions.
diff --git a/codegen/util.go b/codegen/util.go
@@ -82,12 +82,42 @@ func findMethod(typ *types.Named, name string) *types.Func {
 			return method
 		}
 	}
+
+	if s, ok := typ.Underlying().(*types.Struct); ok {
+		for i := 0; i < s.NumFields(); i++ {
+			field := s.Field(i)
+			if !field.Anonymous() {
+				continue
+			}
+
+			if named, ok := field.Type().(*types.Named); ok {
+				if f := findMethod(named, name); f != nil {
+					return f
+				}
+			}
+		}
+	}
+
 	return nil
 }
 
 func findField(typ *types.Struct, name string) *types.Var {
 	for i := 0; i < typ.NumFields(); i++ {
 		field := typ.Field(i)
+		if field.Anonymous() {
+			if named, ok := field.Type().(*types.Struct); ok {
+				if f := findField(named, name); f != nil {
+					return f
+				}
+			}
+
+			if named, ok := field.Type().Underlying().(*types.Struct); ok {
+				if f := findField(named, name); f != nil {
+					return f
+				}
+			}
+		}
+
 		if !field.Exported() {
 			continue
 		}

diff --git a/example/starwars/model.go b/example/starwars/model.go
@@ -9,12 +9,16 @@ import (
 	"time"
 )
 
+type CharacterFields struct {
+	ID        string
+	Name      string
+	FriendIds []string
+	AppearsIn []string
+}
+
 type Human struct {
-	ID           string
-	Name         string
-	FriendIds    []string
+	CharacterFields
 	StarshipIds  []string
-	AppearsIn    []string
 	heightMeters float64
 	Mass         float64
 }
@@ -55,10 +59,7 @@ type Review struct {
 }
 
 type Droid struct {
-	ID              string
-	Name            string
-	FriendIds       []string
-	AppearsIn       []string
+	CharacterFields
 	PrimaryFunction string
 }
 

diff --git a/example/starwars/resolvers.go b/example/starwars/resolvers.go
@@ -158,63 +158,77 @@ func NewResolver() *Resolver {
 	r := Resolver{}
 	r.humans = map[string]Human{
 		"1000": {
-			ID:           "1000",
-			Name:         "Luke Skywalker",
-			FriendIds:    []string{"1002", "1003", "2000", "2001"},
-			AppearsIn:    []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			CharacterFields: CharacterFields{
+				ID:        "1000",
+				Name:      "Luke Skywalker",
+				FriendIds: []string{"1002", "1003", "2000", "2001"},
+				AppearsIn: []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			},
 			heightMeters: 1.72,
 			Mass:         77,
 			StarshipIds:  []string{"3001", "3003"},
 		},
 		"1001": {
-			ID:           "1001",
-			Name:         "Darth Vader",
-			FriendIds:    []string{"1004"},
-			AppearsIn:    []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			CharacterFields: CharacterFields{
+				ID:        "1001",
+				Name:      "Darth Vader",
+				FriendIds: []string{"1004"},
+				AppearsIn: []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			},
 			heightMeters: 2.02,
 			Mass:         136,
 			StarshipIds:  []string{"3002"},
 		},
 		"1002": {
-			ID:           "1002",
-			Name:         "Han Solo",
-			FriendIds:    []string{"1000", "1003", "2001"},
-			AppearsIn:    []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			CharacterFields: CharacterFields{
+				ID:        "1002",
+				Name:      "Han Solo",
+				FriendIds: []string{"1000", "1003", "2001"},
+				AppearsIn: []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			},
 			heightMeters: 1.8,
 			Mass:         80,
 			StarshipIds:  []string{"3000", "3003"},
 		},
 		"1003": {
-			ID:           "1003",
-			Name:         "Leia Organa",
-			FriendIds:    []string{"1000", "1002", "2000", "2001"},
-			AppearsIn:    []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			CharacterFields: CharacterFields{
+				ID:        "1003",
+				Name:      "Leia Organa",
+				FriendIds: []string{"1000", "1002", "2000", "2001"},
+				AppearsIn: []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			},
 			heightMeters: 1.5,
 			Mass:         49,
 		},
 		"1004": {
-			ID:           "1004",
-			Name:         "Wilhuff Tarkin",
-			FriendIds:    []string{"1001"},
-			AppearsIn:    []string{"NEWHOPE"},
+			CharacterFields: CharacterFields{
+				ID:        "1004",
+				Name:      "Wilhuff Tarkin",
+				FriendIds: []string{"1001"},
+				AppearsIn: []string{"NEWHOPE"},
+			},
 			heightMeters: 1.8,
 			Mass:         0,
 		},
 	}
 
 	r.droid = map[string]Droid{
 		"2000": {
-			ID:              "2000",
-			Name:            "C-3PO",
-			FriendIds:       []string{"1000", "1002", "1003", "2001"},
-			AppearsIn:       []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			CharacterFields: CharacterFields{
+				ID:        "2000",
+				Name:      "C-3PO",
+				FriendIds: []string{"1000", "1002", "1003", "2001"},
+				AppearsIn: []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			},
 			PrimaryFunction: "Protocol",
 		},
 		"2001": {
-			ID:              "2001",
-			Name:            "R2-D2",
-			FriendIds:       []string{"1000", "1002", "1003"},
-			AppearsIn:       []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			CharacterFields: CharacterFields{
+				ID:        "2001",
+				Name:      "R2-D2",
+				FriendIds: []string{"1000", "1002", "1003"},
+				AppearsIn: []string{"NEWHOPE", "EMPIRE", "JEDI"},
+			},
 			PrimaryFunction: "Astromech",
 		},
 	}