consolidate parser changes

Author: yaacovCR

src/language/__tests__/parser-test.ts

@@ -58,6 +58,15 @@ describe('Parser', () => {
       locations: [{ line: 1, column: 1 }],
     });
 
+    // Throws on first error, the unexpected description.
+    expectSyntaxError(`
+      "Unexpected description"
+      notAnOperation Foo { field }
+    `).to.deep.include({
+      message: 'Syntax Error: Unexpected description, only GraphQL definitions support descriptions.',
+      locations: [{ line: 2, column: 7 }],
+    });
+
     expectSyntaxError('...').to.deep.include({
       message: 'Syntax Error: Unexpected "...".',
       locations: [{ line: 1, column: 1 }],
@@ -751,7 +760,7 @@ describe('Parser', () => {
           }
         `),
       ).to.throw(
-        'Syntax Error: Unexpected description, descriptions are not supported on shorthand queries.',
+        'Syntax Error: Unexpected description, shorthand queries do not support descriptions.',
       );
     });
   });

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

@@ -331,7 +331,7 @@ describe('Schema Parser', () => {
       }
     `).to.deep.equal({
       message:
-        'Syntax Error: Unexpected description, descriptions are not supported on type extensions.',
+        'Syntax Error: Unexpected description, only GraphQL definitions support descriptions.',
       locations: [{ line: 2, column: 7 }],
     });
 
@@ -353,7 +353,7 @@ describe('Schema Parser', () => {
       }
     `).to.deep.equal({
       message:
-        'Syntax Error: Unexpected description, descriptions are not supported on type extensions.',
+        'Syntax Error: Unexpected description, only GraphQL definitions support descriptions.',
       locations: [{ line: 2, column: 7 }],
     });
 

src/language/parser.ts

@@ -258,16 +258,25 @@ export class Parser {
    *   - InputObjectTypeDefinition
    */
   parseDefinition(): DefinitionNode {
-    if (this.peek(TokenKind.BRACE_L)) {
-      return this.parseOperationDefinition();
-    }
 
     // Many definitions begin with a description and require a lookahead.
     const hasDescription = this.peekDescription();
     const keywordToken = hasDescription
       ? this._lexer.lookahead()
       : this._lexer.token;
 
+    if (keywordToken.kind === TokenKind.BRACE_L) {
+      // Check for shorthand query with description
+      if (hasDescription) {
+        throw syntaxError(
+          this._lexer.source,
+          this._lexer.token.start,
+          'Unexpected description, shorthand queries do not support descriptions.',
+        );
+      }
+      return this.parseOperationDefinition();
+    }
+
     if (keywordToken.kind === TokenKind.NAME) {
       switch (keywordToken.value) {
         case 'schema':
@@ -286,37 +295,27 @@ export class Parser {
           return this.parseInputObjectTypeDefinition();
         case 'directive':
           return this.parseDirectiveDefinition();
+        case 'query':
+        case 'mutation':
+        case 'subscription':
+          return this.parseOperationDefinition();
+        case 'fragment':
+          return this.parseFragmentDefinition();
       }
 
-      if (hasDescription && keywordToken.value === 'extend') {
+      if (hasDescription) {
         throw syntaxError(
           this._lexer.source,
           this._lexer.token.start,
-          'Unexpected description, descriptions are not supported on type extensions.',
+          'Unexpected description, only GraphQL definitions support descriptions.',
         );
       }
 
-      switch (keywordToken.value) {
-        case 'query':
-        case 'mutation':
-        case 'subscription':
-          return this.parseOperationDefinition();
-        case 'fragment':
-          return this.parseFragmentDefinition();
-        case 'extend':
-          return this.parseTypeSystemExtension();
+      if (keywordToken.value == 'extend') {
+        return this.parseTypeSystemExtension();
       }
     }
 
-    // Check for shorthand query with description
-    if (hasDescription && keywordToken.kind === TokenKind.BRACE_L) {
-      throw syntaxError(
-        this._lexer.source,
-        this._lexer.token.start,
-        'Unexpected description, descriptions are not supported on shorthand queries.',
-      );
-    }
-
     throw this.unexpected(keywordToken);
   }