Pass context to CollectFields instead of RequestContext

Internally it can still get to RequestContext as required.
99designs · Jul 23, 2018 · a69071e · a69071e
1 parent c7ff320
commit a69071e
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 157 deletions.
diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/object.gotpl b/codegen/templates/object.gotpl
@@ -5,8 +5,7 @@ var {{ $object.GQLType|lcFirst}}Implementors = {{$object.Implementors}}
 // nolint: gocyclo, errcheck, gas, goconst
 {{- if .Stream }}
 func (ec *executionContext) _{{$object.GQLType}}(ctx context.Context, sel ast.SelectionSet) func() graphql.Marshaler {
-	reqCtx := graphql.GetRequestContext(ctx)
-	fields := graphql.CollectFields(reqCtx, sel, {{$object.GQLType|lcFirst}}Implementors)
+	fields := graphql.CollectFields(ctx, sel, {{$object.GQLType|lcFirst}}Implementors)
 	ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
 		Object: {{$object.GQLType|quote}},
 	})
@@ -26,8 +25,7 @@ func (ec *executionContext) _{{$object.GQLType}}(ctx context.Context, sel ast.Se
 }
 {{- else }}
 func (ec *executionContext) _{{$object.GQLType}}(ctx context.Context, sel ast.SelectionSet{{if not $object.Root}}, obj *{{$object.FullName}} {{end}}) graphql.Marshaler {
-	reqCtx := graphql.GetRequestContext(ctx)
-	fields := graphql.CollectFields(reqCtx, sel, {{$object.GQLType|lcFirst}}Implementors)
+	fields := graphql.CollectFields(ctx, sel, {{$object.GQLType|lcFirst}}Implementors)
 	{{if $object.Root}}
 		ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
 			Object: {{$object.GQLType|quote}},

diff --git a/example/chat/generated.go b/example/chat/generated.go
diff --git a/example/dataloader/generated.go b/example/dataloader/generated.go