refactor ResolverContext#indicies and suppress lint error

99designs · Aug 22, 2018 · e57464f · e57464f
1 parent 09e4bf8
commit e57464f
Show file tree

Hide file tree

Showing 13 changed files with 824 additions and 272 deletions.
diff --git a/codegen/object.go b/codegen/object.go
@@ -216,8 +216,9 @@ func (f *Field) doWriteJson(val string, remainingMods []string, astType *ast.Typ
 		return tpl(`{{.arr}} := graphql.Array{}
 			for {{.index}} := range {{.val}} {
 				{{.arr}} = append({{.arr}}, func(ctx context.Context) graphql.Marshaler {
-					rctx := graphql.GetResolverContext(ctx).Copy()
-					rctx.PushIndex({{.index}})
+					rctx := &graphql.ResolverContext{
+						Index: &{{.index}},
+					}
 					ctx = graphql.WithResolverContext(ctx, rctx)
 					{{ .next }} 
 				}(ctx))

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: megacheck, ineffassign
 	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)