Merge branch 'master' of https://github.com/nveenjain/graphql-js into feature/addCommentInAST

Signed-off-by: Naveen Jain <[email protected]>

Author: nveenjain

.eslintrc.yml

@@ -433,7 +433,7 @@ overrides:
       flowtype/require-valid-file-annotation: off
 
       ##########################################################################
-      # `@typescript-eslint/eslint-plugin` rule list based on `v2.17.x`
+      # `@typescript-eslint/eslint-plugin` rule list based on `v2.21.x`
       ##########################################################################
 
       # Supported Rules

.flowconfig

@@ -40,4 +40,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)?)\\)
 suppress_comment=\\(.\\|\n\\)*\\$DisableFlowOnNegativeTest
 
 [version]
-^0.118.0
+^0.119.0

package.json

@@ -44,23 +44,23 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "7.8.4",
+    "@babel/core": "7.8.6",
     "@babel/plugin-transform-flow-strip-types": "7.8.3",
-    "@babel/preset-env": "7.8.4",
-    "@babel/register": "7.8.3",
-    "@typescript-eslint/eslint-plugin": "2.19.2",
-    "@typescript-eslint/parser": "2.19.2",
-    "babel-eslint": "10.0.3",
+    "@babel/preset-env": "7.8.6",
+    "@babel/register": "7.8.6",
+    "@typescript-eslint/eslint-plugin": "2.21.0",
+    "@typescript-eslint/parser": "2.21.0",
+    "babel-eslint": "10.1.0",
     "chai": "4.2.0",
-    "cspell": "4.0.46",
-    "dtslint": "2.0.6",
+    "cspell": "4.0.55",
+    "dtslint": "3.2.0",
     "eslint": "6.8.0",
     "eslint-plugin-flowtype": "4.6.0",
     "eslint-plugin-import": "2.20.1",
-    "flow-bin": "0.118.0",
-    "mocha": "7.0.1",
+    "flow-bin": "0.119.1",
+    "mocha": "7.1.0",
     "nyc": "15.0.0",
     "prettier": "1.19.1",
-    "typescript": "^3.7.5"
+    "typescript": "^3.8.3"
   }
 }

src/README.md

@@ -17,7 +17,7 @@ Each sub directory within is a sub-module of graphql-js:
   fulfilling a GraphQL result.
 - [`graphql/execution`](execution/README.md): The Execution phase of fulfilling
   a GraphQL request.
-- [`graphql/error`](error/README.md): Creating and formating GraphQL errors.
+- [`graphql/error`](error/README.md): Creating and formatting GraphQL errors.
 - [`graphql/utilities`](utilities/README.md): Common useful computations upon
   the GraphQL language and type objects.
 - [`graphql/subscription`](subscription/README.md): Subscribe to data updates.

src/__tests__/graphql-test.js

@@ -93,6 +93,17 @@ describe('Execute: synchronously when possible', () => {
   });
 
   describe('graphqlSync', () => {
+    it('report errors raised during schema validation', () => {
+      const badSchema = new GraphQLSchema({});
+      const result = graphqlSync({
+        schema: badSchema,
+        source: '{ __typename }',
+      });
+      expect(result).to.deep.equal({
+        errors: [{ message: 'Query root type must be provided.' }],
+      });
+    });
+
     it('does not return a Promise for syntax errors', () => {
       const doc = 'fragment Example on Query { { { syncField }';
       const result = graphqlSync({

src/execution/__tests__/sync-test.js

@@ -153,11 +153,28 @@ describe('Parser', () => {
       type alpha{ field(arg: string):string }
     `);
 
-    expect(ast).to.have.nested.property(
-      'comments[0].value',
-      'This comment has a \u0A0A multi-byte character.',
-    );
-    expect(ast.comments).to.have.length(1);
+    expect(toJSONDeep(ast.comments)).to.deep.equal([
+      {
+        kind: 'Comment',
+        loc: { start: 7, end: 50 },
+        value: 'This comment has a ਊ multi-byte character.',
+      },
+    ]);
+  });
+
+  it('Add empty comments from in AST', () => {
+    const ast = parse(`
+      #
+      type alpha{ field(arg: string):string }
+    `);
+
+    expect(toJSONDeep(ast.comments)).to.deep.equal([
+      {
+        kind: 'Comment',
+        loc: { start: 7, end: 8 },
+        value: '',
+      },
+    ]);
   });
 
   it('Add multiple comments in AST', () => {
@@ -169,15 +186,18 @@ describe('Parser', () => {
       }
     `);
 
-    expect(ast).to.have.nested.property(
-      'comments[0].value',
-      'This comment is demo comment.',
-    );
-    expect(ast).to.have.nested.property(
-      'comments[1].value',
-      'This is another demo comment having # inside',
-    );
-    expect(ast.comments).to.have.length(2);
+    expect(toJSONDeep(ast.comments)).to.deep.equal([
+      {
+        kind: 'Comment',
+        loc: { start: 27, end: 57 },
+        value: 'This comment is demo comment.',
+      },
+      {
+        kind: 'Comment',
+        loc: { start: 101, end: 146 },
+        value: 'This is another demo comment having # inside',
+      },
+    ]);
   });
 
   it('parses kitchen sink', () => {
@@ -264,7 +284,6 @@ describe('Parser', () => {
 
     expect(toJSONDeep(result)).to.deep.equal({
       kind: Kind.DOCUMENT,
-      comments: [],
       loc: { start: 0, end: 41 },
       definitions: [
         {
@@ -355,7 +374,6 @@ describe('Parser', () => {
 
     expect(toJSONDeep(result)).to.deep.equal({
       kind: Kind.DOCUMENT,
-      comments: [],
       loc: { start: 0, end: 30 },
       definitions: [
         {