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

nveenjain · nveenjain · commit 0b877aaee93f · 2020-03-03T11:34:54.000+05:30
Signed-off-by: Naveen Jain &lt;nveenjain@gmail.com&gt;
diff --git a/.eslintrc.yml b/.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
diff --git a/.flowconfig b/.flowconfig
@@ -40,4 +40,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)?)\\)
 suppress_comment=\\(.\\|\n\\)*\\$DisableFlowOnNegativeTest
 
 [version]
-^0.118.0
+^0.119.0
diff --git a/package.json b/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"
   }
 }
diff --git a/src/README.md b/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.
diff --git a/src/__tests__/graphql-test.js b/src/__tests__/graphql-test.js
diff --git a/src/execution/__tests__/sync-test.js b/src/execution/__tests__/sync-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({
diff --git a/src/language/lexer.d.ts b/src/language/lexer.d.ts
@@ -1,4 +1,4 @@
-import { Token } from './ast';
+import { Token, CommentNode } from './ast';
 import { Source } from './source';
 
 /**
diff --git a/src/language/lexer.js b/src/language/lexer.js
@@ -83,9 +83,6 @@ export class Lexer {
 }
 
 function addCommentNodeToList(lexer: Lexer, commentToken: Token) {
-  if (commentToken.kind !== TokenKind.COMMENT) {
-    return;
-  }
   const { start, end, column, line, value } = commentToken;
 
   lexer.commentsList.push({
diff --git a/src/type/definition.d.ts b/src/type/definition.d.ts
@@ -517,7 +517,7 @@ export interface GraphQLField<
   args: Array<GraphQLArgument>;
   resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
   subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-  isDeprecated?: boolean;
+  isDeprecated: boolean;
   deprecationReason?: Maybe<string>;
   extensions: Maybe<Readonly<Record<string, any>>>;
   astNode?: Maybe<FieldDefinitionNode>;
@@ -739,7 +739,7 @@ export interface GraphQLEnumValue {
   name: string;
   description: Maybe<string>;
   value: any;
-  isDeprecated?: boolean;
+  isDeprecated: boolean;
   deprecationReason: Maybe<string>;
   extensions: Maybe<Readonly<Record<string, any>>>;
   astNode?: Maybe<EnumValueDefinitionNode>;
diff --git a/src/type/definition.js b/src/type/definition.js
@@ -967,7 +967,7 @@ export type GraphQLField<
   args: Array<GraphQLArgument>,
   resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>,
   subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>,
-  isDeprecated?: boolean,
+  isDeprecated: boolean,
   deprecationReason: ?string,
   extensions: ?ReadOnlyObjMap<mixed>,
   astNode: ?FieldDefinitionNode,
diff --git a/src/type/introspection.js b/src/type/introspection.js
@@ -457,6 +457,7 @@ export const SchemaMetaFieldDef: GraphQLField<mixed, mixed> = {
   description: 'Access the current type schema of this server.',
   args: [],
   resolve: (_source, _args, _context, { schema }) => schema,
+  isDeprecated: false,
   deprecationReason: undefined,
   extensions: undefined,
   astNode: undefined,
@@ -477,6 +478,7 @@ export const TypeMetaFieldDef: GraphQLField<mixed, mixed> = {
     },
   ],
   resolve: (_source, { name }, _context, { schema }) => schema.getType(name),
+  isDeprecated: false,
   deprecationReason: undefined,
   extensions: undefined,
   astNode: undefined,
@@ -488,6 +490,7 @@ export const TypeNameMetaFieldDef: GraphQLField<mixed, mixed> = {
   description: 'The name of the current Object type at runtime.',
   args: [],
   resolve: (_source, _args, _context, { parentType }) => parentType.name,
+  isDeprecated: false,
   deprecationReason: undefined,
   extensions: undefined,
   astNode: undefined,
diff --git a/src/utilities/__tests__/buildASTSchema-test.js b/src/utilities/__tests__/buildASTSchema-test.js
@@ -62,6 +62,7 @@ function printAllASTNodes(obj) {
   return print({
     kind: Kind.DOCUMENT,
     definitions: [obj.astNode, ...obj.extensionASTNodes],
+    comments: [],
   });
 }
 
diff --git a/src/utilities/__tests__/extendSchema-test.js b/src/utilities/__tests__/extendSchema-test.js
@@ -41,6 +41,7 @@ function printExtensionNodes(obj) {
   return print({
     kind: Kind.DOCUMENT,
     definitions: obj.extensionASTNodes,
+    comments: [],
   });
 }
 
@@ -52,6 +53,7 @@ function printSchemaChanges(schema, extendedSchema) {
     definitions: ast.definitions.filter(
       node => !schemaDefinitions.includes(print(node)),
     ),
+    comments: [],
   });
 }
 
diff --git a/src/utilities/concatAST.js b/src/utilities/concatAST.js
@@ -13,5 +13,6 @@ export function concatAST(asts: $ReadOnlyArray<DocumentNode>): DocumentNode {
   return {
     kind: 'Document',
     definitions: flatMap(asts, ast => ast.definitions),
+    comments: [],
   };
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Token } from './ast';`
	`1`	`+import { Token, CommentNode } from './ast';`
`2`	`2`	`import { Source } from './source';`
`3`	`3`
`4`	`4`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,6 @@ export class Lexer {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`function addCommentNodeToList(lexer: Lexer, commentToken: Token) {`
`86`		`- if (commentToken.kind !== TokenKind.COMMENT) {`
`87`		`- return;`
`88`		`- }`
`89`	`86`	`const { start, end, column, line, value } = commentToken;`
`90`	`87`
`91`	`88`	`lexer.commentsList.push({`