Address PR feedback

Author: erikkessler1

src/__testUtils__/kitchenSinkSDL.ts

@@ -27,6 +27,7 @@ type Foo implements Bar & Baz & Two {
   five(argument: [String] = ["string", "string"]): String
   six(argument: InputType = {key: "value"}): Type
   seven(argument: Int = null): Type
+  eight(argument: OneOfInputType): Type
 }
 
 type AnnotatedObject @onObject(arg: "value") {
@@ -116,6 +117,11 @@ input InputType {
   answer: Int = 42
 }
 
+input OneOfInputType @oneOf {
+  string: String
+  int: Int
+}
+
 input AnnotatedInput @onInputObject {
   annotatedField: Type @onInputFieldDefinition
 }

src/execution/__tests__/oneof-test.ts

@@ -23,10 +23,6 @@ const schema = buildSchema(`
     a: String
     b: Int
   }
-
-  schema {
-    query: Query
-  }
 `);
 
 function executeQuery(
@@ -85,6 +81,8 @@ describe('Execute: Handles OneOf Input Objects', () => {
           {
             locations: [{ column: 23, line: 3 }],
             message:
+              // This type of error would be caught at validation-time
+              // hence the vague error message here.
               'Argument "input" of non-null type "TestInputObject!" must not be null.',
             path: ['test'],
           },
@@ -154,7 +152,7 @@ describe('Execute: Handles OneOf Input Objects', () => {
           {
             locations: [{ column: 16, line: 2 }],
             message:
-              'Variable "$input" got invalid value { a: "abc", b: 123 }; Exactly one key must be specified.',
+              'Variable "$input" got invalid value { a: "abc", b: 123 }; Exactly one key must be specified for OneOf type "TestInputObject".',
           },
         ],
       });
@@ -178,7 +176,7 @@ describe('Execute: Handles OneOf Input Objects', () => {
           {
             locations: [{ column: 16, line: 2 }],
             message:
-              'Variable "$input" got invalid value { a: "abc", b: null }; Exactly one key must be specified.',
+              'Variable "$input" got invalid value { a: "abc", b: null }; Exactly one key must be specified for OneOf type "TestInputObject".',
           },
         ],
       });

src/language/__tests__/schema-printer-test.ts

@@ -61,6 +61,7 @@ describe('Printer: SDL document', () => {
         five(argument: [String] = ["string", "string"]): String
         six(argument: InputType = { key: "value" }): Type
         seven(argument: Int = null): Type
+        eight(argument: OneOfInputType): Type
       }
 
       type AnnotatedObject @onObject(arg: "value") {
@@ -143,6 +144,11 @@ describe('Printer: SDL document', () => {
         answer: Int = 42
       }
 
+      input OneOfInputType @oneOf {
+        string: String
+        int: Int
+      }
+
       input AnnotatedInput @onInputObject {
         annotatedField: Type @onInputFieldDefinition
       }

src/type/__tests__/introspection-test.ts

@@ -1555,21 +1555,21 @@ describe('Introspection', () => {
 
     const source = `
       {
-        a: __type(name: "SomeInputObject") {
+        oneOfInputObject: __type(name: "SomeInputObject") {
           isOneOf
         }
-        b: __type(name: "AnotherInputObject") {
+        inputObject: __type(name: "AnotherInputObject") {
           isOneOf
         }
       }
     `;
 
     expect(graphqlSync({ schema, source })).to.deep.equal({
       data: {
-        a: {
+        oneOfInputObject: {
           isOneOf: true,
         },
-        b: {
+        inputObject: {
           isOneOf: false,
         },
       },
@@ -1578,59 +1578,49 @@ describe('Introspection', () => {
 
   it('returns null for oneOf for other types', () => {
     const schema = buildSchema(`
-      type A implements I {
-        a: String
+      type SomeObject implements SomeInterface {
+        fieldA: String
       }
-      enum E {
-        A
+      enum SomeEnum {
+        SomeObject
       }
-      interface I {
-        a: String
+      interface SomeInterface {
+        fieldA: String
       }
-      union U = A
+      union SomeUnion = SomeObject
       type Query {
-        someField(e: E): U
-        anotherField(e: E): I
+        someField(enum: SomeEnum): SomeUnion
+        anotherField(enum: SomeEnum): SomeInterface
       }
     `);
 
     const source = `
       {
-        a: __type(name: "A") {
+        object: __type(name: "SomeObject") {
           isOneOf
         }
-        e: __type(name: "E") {
+        enum: __type(name: "SomeEnum") {
           isOneOf
         }
-        i: __type(name: "I") {
+        interface: __type(name: "SomeInterface") {
           isOneOf
         }
-        o: __type(name: "String") {
+        scalar: __type(name: "String") {
           isOneOf
         }
-        u: __type(name: "U") {
+        union: __type(name: "SomeUnion") {
           isOneOf
         }
       }
     `;
 
     expect(graphqlSync({ schema, source })).to.deep.equal({
       data: {
-        a: {
-          isOneOf: null,
-        },
-        e: {
-          isOneOf: null,
-        },
-        i: {
-          isOneOf: null,
-        },
-        o: {
-          isOneOf: null,
-        },
-        u: {
-          isOneOf: null,
-        },
+        object: { isOneOf: null },
+        enum: { isOneOf: null },
+        interface: { isOneOf: null },
+        scalar: { isOneOf: null },
+        union: { isOneOf: null },
       },
     });
   });

src/utilities/__tests__/coerceInputValue-test.ts

@@ -292,7 +292,8 @@ describe('coerceInputValue', () => {
       const result = coerceValue({ foo: 123, bar: null }, TestInputObject);
       expectErrors(result).to.deep.equal([
         {
-          error: 'Exactly one key must be specified.',
+          error:
+            'Exactly one key must be specified for OneOf type "TestInputObject".',
           path: [],
           value: { foo: 123, bar: null },
         },
@@ -335,7 +336,8 @@ describe('coerceInputValue', () => {
           value: 'def',
         },
         {
-          error: 'Exactly one key must be specified.',
+          error:
+            'Exactly one key must be specified for OneOf type "TestInputObject".',
           path: [],
           value: { foo: 'abc', bar: 'def' },
         },
@@ -367,7 +369,8 @@ describe('coerceInputValue', () => {
           value: { bart: 123 },
         },
         {
-          error: 'Exactly one key must be specified.',
+          error:
+            'Exactly one key must be specified for OneOf type "TestInputObject".',
           path: [],
           value: { bart: 123 },
         },

src/utilities/coerceInputValue.ts

@@ -149,7 +149,9 @@ function coerceInputValueImpl(
         onError(
           pathToArray(path),
           inputValue,
-          new GraphQLError('Exactly one key must be specified.'),
+          new GraphQLError(
+            `Exactly one key must be specified for OneOf type "${type.name}".`,
+          ),
         );
       }