apply old changes on top of up to date main branch

Author: twof

src/__testUtils__/kitchenSinkQuery.ts

@@ -10,6 +10,10 @@ query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
           ...frag @onFragmentSpread
         }
       }
+      field3!
+      requiredField4: field4!
+      field5?
+      optionalField6: field6?
     }
     ... @skip(unless: $foo) {
       id

src/execution/__tests__/executor-test.ts

@@ -1220,4 +1220,155 @@ describe('Execute: Handles basic execution tasks', () => {
     expect(result).to.deep.equal({ data: { foo: { bar: 'bar' } } });
     expect(possibleTypes).to.deep.equal([fooObject]);
   });
+
+  it('bubbles null up to nearest nullable parent', () => {
+    const schema = new GraphQLSchema({
+      query: new GraphQLObjectType({
+        name: 'Query',
+        fields: {
+          food: {
+            type: new GraphQLObjectType({
+              name: 'Food',
+              fields: {
+                name: { type: GraphQLString },
+                calories: { type: GraphQLInt },
+              },
+            }),
+            resolve() {
+              return {
+                name: null,
+                calories: 10,
+              };
+            },
+          },
+        },
+      }),
+    });
+
+    const plainDocument = parse(`
+      query {
+        food {
+          name
+          calories
+        }
+      }
+    `);
+    const plainResult = executeSync({ schema, document: plainDocument });
+
+    expect(plainResult).to.deep.equal({
+      data: { food: { name: null, calories: 10 } },
+    });
+
+    const singleNonNullOnNullValueDocument = parse(`
+      query {
+        food {
+          name!
+          calories
+        }
+      }
+    `);
+    const singleNonNullOnNullValueResult = executeSync({
+      schema,
+      document: singleNonNullOnNullValueDocument,
+    });
+
+    expect(singleNonNullOnNullValueResult).to.deep.equal({
+      data: { food: null },
+      errors: [
+        {
+          locations: [{ column: 11, line: 4 }],
+          message: 'Cannot return null for non-nullable field Food.name.',
+          path: ['food', 'name'],
+        },
+      ],
+    });
+
+    const bothNonNullOnNullValueDocument = parse(`
+      query {
+        food {
+          name!
+          calories!
+        }
+      }
+    `);
+    const bothNonNullOnNullValueResult = executeSync({
+      schema,
+      document: bothNonNullOnNullValueDocument,
+    });
+
+    expect(bothNonNullOnNullValueResult).to.deep.equal({
+      data: { food: null },
+      errors: [
+        {
+          locations: [{ column: 11, line: 4 }],
+          message: 'Cannot return null for non-nullable field Food.name.',
+          path: ['food', 'name'],
+        },
+      ],
+    });
+
+    const singleNonNullOnNonNullValueDocument = parse(`
+      query {
+        food {
+          calories!
+        }
+      }
+    `);
+    const singleNonNullOnNonNullValueResult = executeSync({
+      schema,
+      document: singleNonNullOnNonNullValueDocument,
+    });
+
+    expect(singleNonNullOnNonNullValueResult).to.deep.equal({
+      data: { food: { calories: 10 } },
+    });
+
+    const nonNullAliasOnNullValueDocument = parse(`
+      query {
+        food {
+          theNameOfTheFood: name!
+        }
+      }
+    `);
+    const nonNullAliasOnNullValueResult = executeSync({
+      schema,
+      document: nonNullAliasOnNullValueDocument,
+    });
+
+    expect(nonNullAliasOnNullValueResult).to.deep.equal({
+      data: { food: null },
+      errors: [
+        {
+          locations: [{ column: 11, line: 4 }],
+          message: 'Cannot return null for non-nullable field Food.name.',
+          path: ['food', 'theNameOfTheFood'],
+        },
+      ],
+    });
+
+    const nonNullInFragmentDocument = parse(`
+      query {
+        food {
+          ... on Food {
+            name!
+          }
+        }
+      }
+    `);
+    const nonNullInFragmentResult = executeSync({
+      schema,
+      document: nonNullInFragmentDocument,
+    });
+
+    expect(nonNullInFragmentResult).to.deep.equal({
+      data: { food: null },
+      errors: [
+        {
+          locations: [{ column: 13, line: 5 }],
+          message: 'Cannot return null for non-nullable field Food.name.',
+          path: ['food', 'name'],
+        },
+      ],
+    });
+  });
 });

src/execution/execute.ts

@@ -53,6 +53,8 @@ import {
 
 import { getOperationRootType } from '../utilities/getOperationRootType';
 
+import { modifiedOutputType } from '../utilities/applyRequiredStatus';
+
 import { getVariableValues, getArgumentValues } from './values';
 import { collectFields } from './collectFields';
 
@@ -456,7 +458,7 @@ function executeField(
     return;
   }
 
-  const returnType = fieldDef.type;
+  const returnType = modifiedOutputType(fieldDef.type, fieldNodes[0].required);
   const resolveFn = fieldDef.resolve ?? exeContext.fieldResolver;
 
   const info = buildResolveInfo(

src/index.ts

@@ -223,6 +223,7 @@ export {
   isTypeDefinitionNode,
   isTypeSystemExtensionNode,
   isTypeExtensionNode,
+  RequiredStatus,
 } from './language/index';
 
 export type {
@@ -297,6 +298,7 @@ export type {
   UnionTypeExtensionNode,
   EnumTypeExtensionNode,
   InputObjectTypeExtensionNode,
+  RequiredStatus,
 } from './language/index';
 
 /** Execute GraphQL queries. */
@@ -438,6 +440,7 @@ export {
   DangerousChangeType,
   findBreakingChanges,
   findDangerousChanges,
+  modifiedOutputType,
 } from './utilities/index';
 
 export type {

src/language/__tests__/lexer-test.ts

@@ -167,16 +167,16 @@ describe('Lexer', () => {
   it('errors respect whitespace', () => {
     let caughtError;
     try {
-      lexOne(['', '', '    ?', ''].join('\n'));
+      lexOne(['', '', ' ~', ''].join('\n'));
     } catch (error) {
       caughtError = error;
     }
     expect(String(caughtError)).to.equal(dedent`
-      Syntax Error: Unexpected character: "?".
+      Syntax Error: Unexpected character: "~".
 
       GraphQL request:3:5
       2 |
-      3 |     ?
+      3 |     ~
         |     ^
       4 |
     `);
@@ -185,18 +185,18 @@ describe('Lexer', () => {
   it('updates line numbers in error for file context', () => {
     let caughtError;
     try {
-      const str = ['', '', '     ?', ''].join('\n');
+      const str = ['', '', '     ~', ''].join('\n');
       const source = new Source(str, 'foo.js', { line: 11, column: 12 });
       new Lexer(source).advance();
     } catch (error) {
       caughtError = error;
     }
     expect(String(caughtError)).to.equal(dedent`
-      Syntax Error: Unexpected character: "?".
+      Syntax Error: Unexpected character: "~".
 
       foo.js:13:6
       12 |
-      13 |      ?
+      13 |      ~
          |      ^
       14 |
     `);
@@ -205,16 +205,16 @@ describe('Lexer', () => {
   it('updates column numbers in error for file context', () => {
     let caughtError;
     try {
-      const source = new Source('?', 'foo.js', { line: 1, column: 5 });
+      const source = new Source('~', 'foo.js', { line: 1, column: 5 });
       new Lexer(source).advance();
     } catch (error) {
       caughtError = error;
     }
     expect(String(caughtError)).to.equal(dedent`
-      Syntax Error: Unexpected character: "?".
+      Syntax Error: Unexpected character: "~".
 
       foo.js:1:5
-      1 |     ?
+      1 |     ~
         |     ^
     `);
   });
@@ -1004,8 +1004,8 @@ describe('Lexer', () => {
       locations: [{ line: 1, column: 1 }],
     });
 
-    expectSyntaxError('?').to.deep.equal({
-      message: 'Syntax Error: Unexpected character: "?".',
+    expectSyntaxError('~').to.deep.equal({
+      message: 'Syntax Error: Unexpected character: "~".',
       locations: [{ line: 1, column: 1 }],
     });
 

src/language/__tests__/parser-test.ts

@@ -225,6 +225,66 @@ describe('Parser', () => {
     ).to.not.throw();
   });
 
+  it('parses required field', () => {
+    expect(() =>
+      parse(`
+      query {
+        requiredField!
+      }
+    `),
+    ).to.not.throw();
+  });
+
+  it('parses optional field', () => {
+    expect(() =>
+      parse(`
+      query {
+        optionalField?
+      }
+    `),
+    ).to.not.throw();
+  });
+
+  it('parses required with alias', () => {
+    expect(() =>
+      parse(`
+      query {
+        requiredField: field!
+      }
+    `),
+    ).to.not.throw();
+  });
+
+  it('does not parse aliased field with bang on left of colon', () => {
+    expect(() =>
+      parse(`
+      query {
+        requiredField!: field
+      }
+    `),
+    ).to.throw();
+  });
+
+  it('does not parse aliased field with bang on left and right of colon', () => {
+    expect(() =>
+      parse(`
+      query {
+        requiredField!: field!
+      }
+    `),
+    ).to.throw();
+  });
+
+  it('parses required within fragment', () => {
+    expect(() =>
+      parse(`
+      fragment MyFragment on Query {
+        field!
+      }
+    `),
+    ).to.not.throw();
+  });
+
   it('creates ast', () => {
     const result = parse(dedent`
       {
@@ -246,6 +306,7 @@ describe('Parser', () => {
           name: undefined,
           variableDefinitions: [],
           directives: [],
+          required: 'unset',
           selectionSet: {
             kind: Kind.SELECTION_SET,
             loc: { start: 0, end: 40 },
@@ -276,6 +337,7 @@ describe('Parser', () => {
                   },
                 ],
                 directives: [],
+                required: 'unset',
                 selectionSet: {
                   kind: Kind.SELECTION_SET,
                   loc: { start: 16, end: 38 },
@@ -336,6 +398,7 @@ describe('Parser', () => {
           name: undefined,
           variableDefinitions: [],
           directives: [],
+          required: 'unset',
           selectionSet: {
             kind: Kind.SELECTION_SET,
             loc: { start: 6, end: 29 },
@@ -351,6 +414,7 @@ describe('Parser', () => {
                 },
                 arguments: [],
                 directives: [],
+                required: 'unset',
                 selectionSet: {
                   kind: Kind.SELECTION_SET,
                   loc: { start: 15, end: 27 },

src/language/__tests__/printer-test.ts

@@ -12,6 +12,7 @@ describe('Printer: Query document', () => {
     const ast = {
       kind: 'Field',
       name: { kind: 'Name', value: 'foo' },
+      required: 'unset',
     } as const;
     expect(print(ast)).to.equal('foo');
   });
@@ -164,6 +165,10 @@ describe('Printer: Query document', () => {
                 ...frag @onFragmentSpread
               }
             }
+            field3!
+            requiredField4: field4!
+            field5?
+            optionalField6: field6?
           }
           ... @skip(unless: $foo) {
             id