Fix directives returning nils from optional interfaces

99designs · Sep 24, 2019 · 34d1097 · 34d1097
1 parent eea38e5
commit 34d1097
Show file tree

Hide file tree

Showing 11 changed files with 261 additions and 107 deletions.
diff --git a/codegen/config/binder.go b/codegen/config/binder.go
@@ -427,6 +427,9 @@ func (b *Binder) CopyModifiersFromAst(t *ast.Type, base types.Type) types.Type {
 }
 
 func isNilable(t types.Type) bool {
+	if namedType, isNamed := t.(*types.Named); isNamed {
+		t = namedType.Underlying()
+	}
 	_, isPtr := t.(*types.Pointer)
 	_, isMap := t.(*types.Map)
 	_, isInterface := t.(*types.Interface)

diff --git a/codegen/interface.gotpl b/codegen/interface.gotpl
@@ -1,7 +1,7 @@
 {{- range $interface := .Interfaces }}
 
-func (ec *executionContext) _{{$interface.Name}}(ctx context.Context, sel ast.SelectionSet, obj *{{$interface.Type | ref}}) graphql.Marshaler {
-	switch obj := (*obj).(type) {
+func (ec *executionContext) _{{$interface.Name}}(ctx context.Context, sel ast.SelectionSet, obj {{$interface.Type | ref}}) graphql.Marshaler {
+	switch obj := (obj).(type) {
 	case nil:
 		return graphql.Null
 	{{- range $implementor := $interface.Implementors }}

diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go