Merge pull request 99designs#314 from 99designs/directive-obj

Add obj to Directives
cgxxv · Aug 24, 2018 · 87315f4 · 87315f4
2 parents df8c6c8 + e35812f
commit 87315f4
Show file tree

Hide file tree

Showing 19 changed files with 567 additions and 579 deletions.
diff --git a/codegen/directive.go b/codegen/directive.go
@@ -12,7 +12,7 @@ type Directive struct {
 }
 
 func (d *Directive) CallArgs() string {
-	args := []string{"ctx", "n"}
+	args := []string{"ctx", "obj", "n"}
 
 	for _, arg := range d.Args {
 		args = append(args, "args["+strconv.Quote(arg.GQLName)+"].("+arg.Signature()+")")
@@ -22,7 +22,7 @@ func (d *Directive) CallArgs() string {
 }
 
 func (d *Directive) Declaration() string {
-	res := ucFirst(d.Name) + " func(ctx context.Context, next graphql.Resolver"
+	res := ucFirst(d.Name) + " func(ctx context.Context, obj interface{}, next graphql.Resolver"
 
 	for _, arg := range d.Args {
 		res += fmt.Sprintf(", %s %s", arg.GoVarName, arg.Signature())

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
@@ -38,7 +38,7 @@
 			Field: field,
 		}
 		ctx = graphql.WithResolverContext(ctx, rctx)
-		resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
+		resTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(ctx context.Context) (interface{}, error) {
 			{{- if $field.IsResolver }}
 				return ec.resolvers.{{ $field.ShortInvocation }}
 			{{- else if $field.IsMethod }}

diff --git a/codegen/templates/generated.gotpl b/codegen/templates/generated.gotpl
@@ -147,7 +147,7 @@ type executionContext struct {
 	{{ template "input.gotpl" $input }}
 {{- end }}
 
-func (ec *executionContext) FieldMiddleware(ctx context.Context, next graphql.Resolver) (ret interface{}) {
+func (ec *executionContext) FieldMiddleware(ctx context.Context, obj interface{}, next graphql.Resolver) (ret interface{}) {
 	defer func() {
 		if r := recover(); r != nil {
 			ec.Error(ctx, ec.Recover(ctx, r))

diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
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
diff --git a/example/scalars/generated.go b/example/scalars/generated.go
diff --git a/example/selection/generated.go b/example/selection/generated.go
diff --git a/example/starwars/generated.go b/example/starwars/generated.go