Merge pull request 99designs#1243 from 99designs/nilable-nullable-unn…

…marshal

Remove a bunch of unneeded nil checks from non-nullable graphql type unmarshalling

codegen/testserver/input_test.go

@@ -28,4 +28,22 @@ func TestInput(t *testing.T) {
 		require.EqualError(t, err, `http 422: {"errors":[{"message":"Expected type String!, found 1.","locations":[{"line":1,"column":32}],"extensions":{"code":"GRAPHQL_VALIDATION_FAILED"}},{"message":"Expected type String!, found 2.","locations":[{"line":1,"column":35}],"extensions":{"code":"GRAPHQL_VALIDATION_FAILED"}}],"data":null}`)
 		require.Nil(t, resp.DirectiveArg)
 	})
+
+	t.Run("when input slice nullable", func(t *testing.T) {
+		resolvers.QueryResolver.InputNullableSlice = func(ctx context.Context, arg []string) (b bool, e error) {
+			return arg == nil, nil
+		}
+
+		var resp struct {
+			InputNullableSlice bool
+		}
+		var err error
+		err = c.Post(`query { inputNullableSlice(arg: null) }`, &resp)
+		require.NoError(t, err)
+		require.True(t, resp.InputNullableSlice)
+
+		err = c.Post(`query { inputNullableSlice(arg: []) }`, &resp)
+		require.NoError(t, err)
+		require.False(t, resp.InputNullableSlice)
+	})
 }

codegen/testserver/resolver.go

@@ -107,6 +107,10 @@ func (r *queryResolver) InputSlice(ctx context.Context, arg []string) (bool, err
 	panic("not implemented")
 }
 
+func (r *queryResolver) InputNullableSlice(ctx context.Context, arg []string) (bool, error) {
+	panic("not implemented")
+}
+
 func (r *queryResolver) ShapeUnion(ctx context.Context) (ShapeUnion, error) {
 	panic("not implemented")
 }

codegen/testserver/schema.graphql

@@ -12,6 +12,7 @@ type Query {
     user(id: Int!): User!
     nullableArg(arg: Int = 123): String
     inputSlice(arg: [String!]!): Boolean!
+    inputNullableSlice(arg: [String!]): Boolean!
     shapeUnion: ShapeUnion!
     autobind: Autobind
     deprecatedField: String! @deprecated(reason: "test deprecated directive")

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 }}