Merge pull request #301 from 99designs/feat-directive-parent

add Result field to ResolverContext
99designs · Aug 24, 2018 · 9b24710 · 9b24710
2 parents 50588a8 + 6ef2035
commit 9b24710
Show file tree

Hide file tree

Showing 14 changed files with 1,644 additions and 394 deletions.
diff --git a/codegen/import_build.go b/codegen/import_build.go
@@ -5,6 +5,7 @@ import (
 	"go/build"
 	"sort"
 	"strconv"
+
 	// Import and ignore the ambient imports listed below so dependency managers
 	// don't prune unused code for us. Both lists should be kept in sync.
 	_ "github.com/99designs/gqlgen/graphql"

diff --git a/codegen/object.go b/codegen/object.go
@@ -212,21 +212,31 @@ func (f *Field) doWriteJson(val string, remainingMods []string, astType *ast.Typ
 		}
 		var arr = "arr" + strconv.Itoa(depth)
 		var index = "idx" + strconv.Itoa(depth)
+		var usePtr bool
+		if len(remainingMods) == 1 && !isPtr {
+			usePtr = true
+		}
 
 		return tpl(`{{.arr}} := graphql.Array{}
 			for {{.index}} := range {{.val}} {
+				{{- if not .isScalar }}
+					rctx := &graphql.ResolverContext{
+						Index: &{{.index}},
+						Result: {{ if .usePtr }}&{{end}}{{.val}}[{{.index}}],
+					}
+					ctx := graphql.WithResolverContext(ctx, rctx)
+				{{- end}}
 				{{.arr}} = append({{.arr}}, func() graphql.Marshaler {
-					rctx := graphql.GetResolverContext(ctx)
-					rctx.PushIndex({{.index}})
-					defer rctx.Pop()
 					{{ .next }} 
 				}())
 			}
 			return {{.arr}}`, map[string]interface{}{
-			"val":   val,
-			"arr":   arr,
-			"index": index,
-			"next":  f.doWriteJson(val+"["+index+"]", remainingMods[1:], astType.Elem, false, depth+1),
+			"val":      val,
+			"arr":      arr,
+			"index":    index,
+			"isScalar": f.IsScalar,
+			"usePtr":   usePtr,
+			"next":     f.doWriteJson(val+"["+index+"]", remainingMods[1:], astType.Elem, false, depth+1),
 		})
 
 	case f.IsScalar:
@@ -239,7 +249,11 @@ func (f *Field) doWriteJson(val string, remainingMods []string, astType *ast.Typ
 		if !isPtr {
 			val = "&" + val
 		}
-		return fmt.Sprintf("return ec._%s(ctx, field.Selections, %s)", f.GQLType, val)
+		return tpl(`
+			return ec._{{.type}}(ctx, field.Selections, {{.val}})`, map[string]interface{}{
+			"type": f.GQLType,
+			"val":  val,
+		})
 	}
 }
 

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
@@ -7,7 +7,9 @@
 			rawArgs := field.ArgumentMap(ec.Variables)
 			{{ template "args.gotpl" $field.Args }}
 		{{- end }}
-		ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
+			Field: field,
+		})
 		results, err := ec.resolvers.{{ $field.ShortInvocation }}
 		if err != nil {
 			ec.Error(ctx, err)
@@ -24,6 +26,7 @@
 		}
 	}
 {{ else }}
+	// nolint: vetshadow
 	func (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField, {{if not $object.Root}}obj *{{$object.FullName}}{{end}}) graphql.Marshaler {
 		{{- if $field.Args }}
 			rawArgs := field.ArgumentMap(ec.Variables)
@@ -57,6 +60,7 @@
 			return graphql.Null
 		}
 		res := resTmp.({{$field.Signature}})
+		rctx.Result = res
 		{{ $field.WriteJson }}
 	}
 {{ end }}