Merge pull request #370 from civist/nil-pointer-safety

Enum nil pointer safety

Author: chris-ramon

definition.go

@@ -964,7 +964,10 @@ func (gt *Enum) Values() []*EnumValueDefinition {
 }
 func (gt *Enum) Serialize(value interface{}) interface{} {
 	v := value
-	if reflect.ValueOf(v).Kind() == reflect.Ptr {
+	rv := reflect.ValueOf(v)
+	if kind := rv.Kind(); kind == reflect.Ptr && rv.IsNil() {
+		return nil
+	} else if kind == reflect.Ptr {
 		v = reflect.Indirect(reflect.ValueOf(v)).Interface()
 	}
 	if enumValue, ok := gt.getValueLookup()[v]; ok {

enum_type_test.go

@@ -421,3 +421,42 @@ func TestTypeSystem_EnumValues_EnumValueMayBePointer(t *testing.T) {
 		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
 	}
 }
+
+func TestTypeSystem_EnumValues_EnumValueMayBeNilPointer(t *testing.T) {
+	var enumTypeTestSchema, _ = graphql.NewSchema(graphql.SchemaConfig{
+		Query: graphql.NewObject(graphql.ObjectConfig{
+			Name: "Query",
+			Fields: graphql.Fields{
+				"query": &graphql.Field{
+					Type: graphql.NewObject(graphql.ObjectConfig{
+						Name: "query",
+						Fields: graphql.Fields{
+							"color": &graphql.Field{
+								Type: enumTypeTestColorType,
+							},
+						},
+					}),
+					Resolve: func(_ graphql.ResolveParams) (interface{}, error) {
+						return struct {
+							Color *int `graphql:"color"`
+						}{nil}, nil
+					},
+				},
+			},
+		}),
+	})
+	query := "{ query { color } }"
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"query": map[string]interface{}{
+				"color": nil,
+			}},
+	}
+	result := g(t, graphql.Params{
+		Schema:        enumTypeTestSchema,
+		RequestString: query,
+	})
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}

lists_test.go

@@ -870,3 +870,32 @@ func TestLists_ArrayOfNullableObjects_ContainsValues(t *testing.T) {
 	}
 	checkList(t, ttype, data, expected)
 }
+
+func TestLists_ValueMayBeNilPointer(t *testing.T) {
+	var listTestSchema, _ = graphql.NewSchema(graphql.SchemaConfig{
+		Query: graphql.NewObject(graphql.ObjectConfig{
+			Name: "Query",
+			Fields: graphql.Fields{
+				"list": &graphql.Field{
+					Type: graphql.NewList(graphql.Int),
+					Resolve: func(_ graphql.ResolveParams) (interface{}, error) {
+						return []int(nil), nil
+					},
+				},
+			},
+		}),
+	})
+	query := "{ list }"
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"list": []interface{}{},
+		},
+	}
+	result := g(t, graphql.Params{
+		Schema:        listTestSchema,
+		RequestString: query,
+	})
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}

union_interface_test.go

@@ -585,3 +585,62 @@ func TestUnionIntersectionTypes_GetsExecutionInfoInResolver(t *testing.T) {
 		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(schema2, encounteredSchema))
 	}
 }
+
+func TestUnionIntersectionTypes_ValueMayBeNilPointer(t *testing.T) {
+	var unionInterfaceTestSchema, _ = graphql.NewSchema(graphql.SchemaConfig{
+		Query: graphql.NewObject(graphql.ObjectConfig{
+			Name: "Query",
+			Fields: graphql.Fields{
+				"query": &graphql.Field{
+					Type: graphql.NewObject(graphql.ObjectConfig{
+						Name: "query",
+						Fields: graphql.Fields{
+							"pet": &graphql.Field{
+								Type: petType,
+							},
+							"named": &graphql.Field{
+								Type: namedType,
+							},
+						},
+					}),
+					Resolve: func(_ graphql.ResolveParams) (interface{}, error) {
+						return struct {
+							Pet   *testCat2 `graphql:"pet"`
+							Named *testCat2 `graphql:"named"`
+						}{nil, nil}, nil
+					},
+				},
+			},
+		}),
+	})
+	query := `{
+		query {
+			pet {
+				__typename
+			}
+			named {
+				__typename
+				name
+			}
+		}
+	}`
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"query": map[string]interface{}{
+				"pet": map[string]interface{}{
+					"__typename": "Cat",
+				},
+				"named": map[string]interface{}{
+					"__typename": "Cat",
+					"name":       nil,
+				},
+			}},
+	}
+	result := g(t, graphql.Params{
+		Schema:        unionInterfaceTestSchema,
+		RequestString: query,
+	})
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}