Only return nil for nilable types when the graphql spec would allow it

99designs · Jul 10, 2020 · 14d1a4d · 14d1a4d
1 parent 3e59a10
commit 14d1a4d
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 112 deletions.
diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/codegen/type.gotpl b/codegen/type.gotpl
@@ -1,7 +1,7 @@
 {{- range $type := .ReferencedTypes }}
 	{{ with $type.UnmarshalFunc }}
 		func (ec *executionContext) {{ . }}(ctx context.Context, v interface{}) ({{ $type.GO | ref }}, error) {
-			{{- if $type.IsNilable }}
+			{{- if and $type.IsNilable (not $type.GQL.NonNull) }}
 				if v == nil { return nil, nil }
 			{{- end }}
 			{{- if $type.IsPtr }}

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/federation/accounts/graph/generated/generated.go b/example/federation/accounts/graph/generated/generated.go
diff --git a/example/federation/products/graph/generated/generated.go b/example/federation/products/graph/generated/generated.go
diff --git a/example/federation/reviews/graph/generated/generated.go b/example/federation/reviews/graph/generated/generated.go
diff --git a/example/fileupload/generated.go b/example/fileupload/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/exec.go b/example/starwars/generated/exec.go
diff --git a/example/todo/generated.go b/example/todo/generated.go
diff --git a/example/type-system-extension/generated.go b/example/type-system-extension/generated.go
diff --git a/integration/generated.go b/integration/generated.go