Fix issue 99designs#2470

atzedus · Dec 14, 2022 · 461069d · 461069d
1 parent 3008f4e
commit 461069d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/codegen/field.gotpl b/codegen/field.gotpl
@@ -26,7 +26,9 @@ func (ec *executionContext) _{{$object.Name}}_{{$field.Name}}(ctx context.Contex
 		})
 		if err != nil {
 			ec.Error(ctx, err)
-			return {{ $null }}
+			{{- if not $object.Root }}
+				return {{ $null }}
+    		{{- end }}
 		}
 	{{- end }}
 	if resTmp == nil {

diff --git a/codegen/object.gotpl b/codegen/object.gotpl
@@ -31,7 +31,9 @@ func (ec *executionContext) _{{$object.Name}}(ctx context.Context, sel ast.Selec
         })
     {{end}}
 	out := graphql.NewFieldSet(fields)
-	var invalids uint32
+    {{- if not $object.Root }}
+    	var invalids uint32
+    {{- end }}
 	for i, field := range fields {
         {{- if $object.Root }}
             innerCtx := graphql.WithRootFieldContext(ctx, &graphql.RootFieldContext{
@@ -54,14 +56,16 @@ func (ec *executionContext) _{{$object.Name}}(ctx context.Context, sel ast.Selec
                         }
                     }()
                     res = ec._{{$object.Name}}_{{$field.Name}}(ctx, field{{if not $object.Root}}, obj{{end}})
-                    {{- if $field.TypeReference.GQL.NonNull }}
-                        if res == graphql.Null {
-                            {{- if $object.IsConcurrent }}
-                                atomic.AddUint32(&invalids, 1)
-                            {{- else }}
-                                invalids++
-                            {{- end }}
-                        }
+                    {{- if not $object.Root }}
+                        {{- if $field.TypeReference.GQL.NonNull }}
+                            if res == graphql.Null {
+                                {{- if $object.IsConcurrent }}
+                                    atomic.AddUint32(&invalids, 1)
+                                {{- else }}
+                                    invalids++
+                                {{- end }}
+                            }
+                        {{- end }}
                     {{- end }}
                     return res
                 }
@@ -88,14 +92,16 @@ func (ec *executionContext) _{{$object.Name}}(ctx context.Context, sel ast.Selec
                     out.Values[i] = ec._{{$object.Name}}_{{$field.Name}}(ctx, field, obj)
                 {{end}}
 
-                {{- if $field.TypeReference.GQL.NonNull }}
-                    if out.Values[i] == graphql.Null {
-                        {{- if $object.IsConcurrent }}
-                            atomic.AddUint32(&invalids, 1)
-                        {{- else }}
-                            invalids++
-                        {{- end }}
-                    }
+                {{- if not $object.Root }}
+                    {{- if $field.TypeReference.GQL.NonNull }}
+                        if out.Values[i] == graphql.Null {
+                            {{- if $object.IsConcurrent }}
+                                atomic.AddUint32(&invalids, 1)
+                            {{- else }}
+                                invalids++
+                            {{- end }}
+                        }
+                    {{- end }}
                 {{- end }}
             {{- end }}
         {{- end }}
@@ -104,7 +110,9 @@ func (ec *executionContext) _{{$object.Name}}(ctx context.Context, sel ast.Selec
         }
 	}
 	out.Dispatch()
-	if invalids > 0 { return graphql.Null }
+    {{- if not $object.Root }}
+	    if invalids > 0 { return graphql.Null }
+    {{- end }}
 	return out
 }
 {{- end }}