add fields to resolver context

99designs · Mar 27, 2018 · e700774 · e700774
1 parent 40918d5
commit e700774
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 11 deletions.
diff --git a/codegen/object.go b/codegen/object.go
@@ -82,7 +82,7 @@ func (f *Field) CallArgs() string {
 	var args []string
 
 	if f.GoMethodName == "" {
-		args = append(args, "ctx")
+		args = append(args, "rctx")
 
 		if !f.Object.Root {
 			args = append(args, "obj")

diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
@@ -4,6 +4,7 @@
 {{- if $object.Stream }}
 	func (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField) func() graphql.Marshaler {
 		{{- template "args.gotpl" $field.Args }}
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
 		results, err := ec.resolvers.{{ $object.GQLType }}_{{ $field.GQLName }}({{ $field.CallArgs }})
 		if err != nil {
 			ec.Error(err)
@@ -47,6 +48,7 @@
 					}
 				{{- end }}
 			{{- else }}
+				rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
 				res, err := ec.resolvers.{{ $object.GQLType }}_{{ $field.GQLName }}({{ $field.CallArgs }})
 				if err != nil {
 					ec.Error(err)

diff --git a/graphql/context.go b/graphql/context.go
@@ -17,10 +17,13 @@ type RequestContext struct {
 
 type key string
 
-const rcKey key = "request_context"
+const (
+	request  key = "request_context"
+	resolver key = "resolver_context"
+)
 
 func GetRequestContext(ctx context.Context) *RequestContext {
-	val := ctx.Value(rcKey)
+	val := ctx.Value(request)
 	if val == nil {
 		return nil
 	}
@@ -29,5 +32,22 @@ func GetRequestContext(ctx context.Context) *RequestContext {
 }
 
 func WithRequestContext(ctx context.Context, rc *RequestContext) context.Context {
-	return context.WithValue(ctx, rcKey, rc)
+	return context.WithValue(ctx, request, rc)
+}
+
+type ResolverContext struct {
+	Field CollectedField
+}
+
+func GetResolverContext(ctx context.Context) *ResolverContext {
+	val := ctx.Value(resolver)
+	if val == nil {
+		return nil
+	}
+
+	return val.(*ResolverContext)
+}
+
+func WithResolverContext(ctx context.Context, rc *ResolverContext) context.Context {
+	return context.WithValue(ctx, request, rc)
 }
diff --git a/test/generated.go b/test/generated.go
@@ -184,7 +184,8 @@ func (ec *executionContext) _OuterObject_inner(ctx context.Context, field graphq
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.OuterObject_inner(ctx, obj)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.OuterObject_inner(rctx, obj)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null
@@ -272,7 +273,8 @@ func (ec *executionContext) _Query_nestedInputs(ctx context.Context, field graph
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.Query_nestedInputs(ctx, arg0)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.Query_nestedInputs(rctx, arg0)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null
@@ -293,7 +295,8 @@ func (ec *executionContext) _Query_nestedOutputs(ctx context.Context, field grap
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.Query_nestedOutputs(ctx)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.Query_nestedOutputs(rctx)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null
@@ -321,7 +324,8 @@ func (ec *executionContext) _Query_shapes(ctx context.Context, field graphql.Col
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.Query_shapes(ctx)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.Query_shapes(rctx)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null
@@ -357,7 +361,8 @@ func (ec *executionContext) _Query_recursive(ctx context.Context, field graphql.
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.Query_recursive(ctx, arg0)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.Query_recursive(rctx, arg0)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null
@@ -392,7 +397,8 @@ func (ec *executionContext) _Query_mapInput(ctx context.Context, field graphql.C
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.Query_mapInput(ctx, arg0)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.Query_mapInput(rctx, arg0)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null
@@ -413,7 +419,8 @@ func (ec *executionContext) _Query_collision(ctx context.Context, field graphql.
 				ret = graphql.Null
 			}
 		}()
-		res, err := ec.resolvers.Query_collision(ctx)
+		rctx := graphql.WithResolverContext(ctx, &graphql.ResolverContext{Field: field})
+		res, err := ec.resolvers.Query_collision(rctx)
 		if err != nil {
 			ec.Error(err)
 			return graphql.Null