shorten some generated code (#2120)

* shorten some generated code * generate examples
99designs · Apr 25, 2022 · 77260e8 · 77260e8
1 parent 4da17e1
commit 77260e8
Show file tree

Hide file tree

Showing 38 changed files with 1,026 additions and 3,709 deletions.
diff --git a/_examples/chat/generated.go b/_examples/chat/generated.go
diff --git a/_examples/config/generated.go b/_examples/config/generated.go
diff --git a/_examples/dataloader/generated.go b/_examples/dataloader/generated.go
diff --git a/_examples/federation/accounts/graph/generated/generated.go b/_examples/federation/accounts/graph/generated/generated.go
diff --git a/_examples/federation/products/graph/generated/generated.go b/_examples/federation/products/graph/generated/generated.go
diff --git a/_examples/federation/reviews/graph/generated/generated.go b/_examples/federation/reviews/graph/generated/generated.go
diff --git a/_examples/fileupload/generated.go b/_examples/fileupload/generated.go
diff --git a/_examples/scalars/generated.go b/_examples/scalars/generated.go
diff --git a/_examples/selection/generated.go b/_examples/selection/generated.go
diff --git a/_examples/starwars/generated/exec.go b/_examples/starwars/generated/exec.go
diff --git a/_examples/todo/generated.go b/_examples/todo/generated.go
diff --git a/_examples/type-system-extension/generated.go b/_examples/type-system-extension/generated.go
diff --git a/codegen/object.gotpl b/codegen/object.gotpl
@@ -80,13 +80,12 @@ func (ec *executionContext) _{{$object.Name}}(ctx context.Context, sel ast.Selec
                     {{end}}
                 })
             {{- else }}
-                innerFunc := func(ctx context.Context) (res graphql.Marshaler) {
-                    return ec._{{$object.Name}}_{{$field.Name}}(ctx, field{{if not $object.Root}}, obj{{end}})
-                }
                 {{if $object.Root}}
-                    out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, innerFunc)
+                    out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
+                        return ec._{{$object.Name}}_{{$field.Name}}(ctx, field)
+                    })
                 {{else}}
-                    out.Values[i] = innerFunc(ctx)
+                    out.Values[i] = ec._{{$object.Name}}_{{$field.Name}}(ctx, field, obj)
                 {{end}}
 
                 {{- if $field.TypeReference.GQL.NonNull }}

diff --git a/codegen/testserver/followschema/builtinscalar.generated.go b/codegen/testserver/followschema/builtinscalar.generated.go
diff --git a/codegen/testserver/followschema/complexity.generated.go b/codegen/testserver/followschema/complexity.generated.go
diff --git a/codegen/testserver/followschema/defaults.generated.go b/codegen/testserver/followschema/defaults.generated.go
diff --git a/codegen/testserver/followschema/directive.generated.go b/codegen/testserver/followschema/directive.generated.go
diff --git a/codegen/testserver/followschema/embedded.generated.go b/codegen/testserver/followschema/embedded.generated.go