shadow context to ensure scoped context use

cgxxv · Jul 26, 2020 · 54f457a · 54f457a
1 parent 7f691f9
commit 54f457a
Show file tree

Hide file tree

Showing 17 changed files with 554 additions and 554 deletions.
diff --git a/codegen/args.gotpl b/codegen/args.gotpl
@@ -5,11 +5,11 @@ func (ec *executionContext) {{ $name }}(ctx context.Context, rawArgs map[string]
 	{{- range $i, $arg := . }}
 		var arg{{$i}} {{ $arg.TypeReference.GO | ref}}
 		if tmp, ok := rawArgs[{{$arg.Name|quote}}]; ok {
-			childCtx := graphql.WithFieldInputContext(ctx, graphql.NewFieldInputWithField({{$arg.Name|quote}}))
+			ctx := graphql.WithFieldInputContext(ctx, graphql.NewFieldInputWithField({{$arg.Name|quote}}))
 			{{- if $arg.ImplDirectives }}
-				directive0 := func(ctx context.Context) (interface{}, error) { return ec.{{ $arg.TypeReference.UnmarshalFunc }}(childCtx, tmp) }
+				directive0 := func(ctx context.Context) (interface{}, error) { return ec.{{ $arg.TypeReference.UnmarshalFunc }}(ctx, tmp) }
 				{{ template "implDirectives" $arg }}
-				tmp, err = directive{{$arg.ImplDirectives|len}}(childCtx)
+				tmp, err = directive{{$arg.ImplDirectives|len}}(ctx)
 				if err != nil {
 					return nil, err
 				}
@@ -23,7 +23,7 @@ func (ec *executionContext) {{ $name }}(ctx context.Context, rawArgs map[string]
 					return nil, fmt.Errorf(`unexpected type %T from directive, should be {{ $arg.TypeReference.GO }}`, tmp)
 				}
 			{{- else }}
-				arg{{$i}}, err = ec.{{ $arg.TypeReference.UnmarshalFunc }}(childCtx, tmp)
+				arg{{$i}}, err = ec.{{ $arg.TypeReference.UnmarshalFunc }}(ctx, tmp)
 				if err != nil {
 					return nil, err
 				}

diff --git a/codegen/input.gotpl b/codegen/input.gotpl
@@ -17,11 +17,11 @@
 			case {{$field.Name|quote}}:
 				var err error
 
-				childCtx := graphql.WithFieldInputContext(ctx, graphql.NewFieldInputWithField({{$field.Name|quote}}))
+				ctx := graphql.WithFieldInputContext(ctx, graphql.NewFieldInputWithField({{$field.Name|quote}}))
 				{{- if $field.ImplDirectives }}
-					directive0 := func(ctx context.Context) (interface{}, error) { return ec.{{ $field.TypeReference.UnmarshalFunc }}(childCtx, v) }
+					directive0 := func(ctx context.Context) (interface{}, error) { return ec.{{ $field.TypeReference.UnmarshalFunc }}(ctx, v) }
 					{{ template "implDirectives" $field }}
-					tmp, err := directive{{$field.ImplDirectives|len}}(childCtx)
+					tmp, err := directive{{$field.ImplDirectives|len}}(ctx)
 					if err != nil {
 						return it, err
 					}
@@ -35,7 +35,7 @@
 						return it, fmt.Errorf(`unexpected type %T from directive, should be {{ $field.TypeReference.GO }}`, tmp)
 					}
 				{{- else }}
-					it.{{$field.GoFieldName}}, err = ec.{{ $field.TypeReference.UnmarshalFunc }}(childCtx, v)
+					it.{{$field.GoFieldName}}, err = ec.{{ $field.TypeReference.UnmarshalFunc }}(ctx, v)
 					if err != nil {
 						return it, err
 					}

diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/codegen/type.gotpl b/codegen/type.gotpl
@@ -19,10 +19,10 @@
 				var err error
 				res := make([]{{$type.GO.Elem | ref}}, len(vSlice))
 				for i := range vSlice {
-					nctx := graphql.WithFieldInputContext(ctx, graphql.NewFieldInputWithIndex(i))
-					res[i], err = ec.{{ $type.Elem.UnmarshalFunc }}(nctx, vSlice[i])
+					ctx := graphql.WithFieldInputContext(ctx, graphql.NewFieldInputWithIndex(i))
+					res[i], err = ec.{{ $type.Elem.UnmarshalFunc }}(ctx, vSlice[i])
 					if err != nil {
-						return nil, graphql.WrapErrorWithInputPath(nctx, err)
+						return nil, graphql.WrapErrorWithInputPath(ctx, err)
 					}
 				}
 				return res, nil

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