Fix pointer returns from directive

99designs · Jun 30, 2019 · beaa2ae · beaa2ae
1 parent 21b6511
commit beaa2ae
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/codegen/args.gotpl b/codegen/args.gotpl
@@ -14,6 +14,10 @@ func (ec *executionContext) {{ $name }}(ctx context.Context, rawArgs map[string]
 				}
 				if data, ok := tmp.({{ $arg.TypeReference.GO | ref }}) ; ok {
 					arg{{$i}} = data
+				{{- if $arg.TypeReference.IsNilable }}
+					} else if tmp == nil {
+						arg{{$i}} = nil
+				{{- end }}
 				} else {
 					return nil, fmt.Errorf(`unexpected type %T from directive, should be {{ $arg.TypeReference.GO }}`, tmp)
 				}

diff --git a/codegen/field.gotpl b/codegen/field.gotpl
@@ -107,6 +107,11 @@
 		if data, ok := tmp.({{ .TypeReference.GO | ref }}) ; ok {
 			return data, nil
 		}
+		{{- if .TypeReference.IsNilable -}}
+			else if tmp == nil {
+				return nil, nil
+			}
+		{{- end }}
 		return nil, fmt.Errorf(`unexpected type %T from directive, should be {{ .TypeReference.GO }}`, tmp)
 	{{- else -}}
 		ctx = rctx  // use context from middleware stack in children

diff --git a/codegen/input.gotpl b/codegen/input.gotpl
@@ -25,6 +25,10 @@
 					}
 					if data, ok := tmp.({{ $field.TypeReference.GO | ref }}) ; ok {
 						it.{{$field.GoFieldName}} = data
+					{{- if $field.TypeReference.IsNilable }}
+						} else if tmp == nil {
+							it.{{$field.GoFieldName}} = nil
+					{{- end }}
 					} else {
 						return it, fmt.Errorf(`unexpected type %T from directive, should be {{ $field.TypeReference.GO }}`, tmp)
 					}

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