Fix tests and formatting

Author: JoviDeCroock

src/language/__tests__/parser-test.ts

@@ -409,7 +409,7 @@ describe('Parser', () => {
 
     expectJSON(result).toDeepEqual({
       kind: Kind.DOCUMENT,
-      loc: { start: 0, end: 43},
+      loc: { start: 0, end: 43 },
       definitions: [
         {
           kind: Kind.OPERATION_DEFINITION,
@@ -729,7 +729,7 @@ describe('Parser', () => {
     });
   });
 
-    describe('operation and variable definition descriptions', () => {
+  describe('operation and variable definition descriptions', () => {
     it('parses operation with description and variable descriptions', () => {
       const result = parse(dedent`
         "Operation description"
@@ -772,6 +772,14 @@ describe('Parser', () => {
       }
     });
 
+    it('descriptions on a short-hand query produce a sensible error', () => {
+      const input = `"""Invalid"""
+        { __typename }`;
+      expect(() => parse(input)).to.throw(
+        'Syntax Error: Unexpected description, descriptions are not supported on shorthand queries.',
+      );
+    });
+
     it('parses variable definition with description, default value, and directives', () => {
       const result = parse(dedent`
         query (

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 and shorthand queries.',
+        'Syntax Error: Unexpected description, descriptions are not supported on type extensions.',
       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 and shorthand queries.',
+        'Syntax Error: Unexpected description, descriptions are not supported on type extensions.',
       locations: [{ line: 2, column: 7 }],
     });
 

src/language/ast.ts

@@ -204,7 +204,13 @@ export const QueryDocumentKeys: {
     'directives',
     'selectionSet',
   ],
-  VariableDefinition: ['description', 'variable', 'type', 'defaultValue', 'directives'],
+  VariableDefinition: [
+    'description',
+    'variable',
+    'type',
+    'defaultValue',
+    'directives',
+  ],
   Variable: ['name'],
   SelectionSet: ['selections'],
   Field: ['alias', 'name', 'arguments', 'directives', 'selectionSet'],

src/language/parser.ts

@@ -268,6 +268,13 @@ export class Parser {
       ? this._lexer.lookahead()
       : this._lexer.token;
 
+    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.',
+      );
+    }
     if (keywordToken.kind === TokenKind.NAME) {
       switch (keywordToken.value) {
         case 'schema':
@@ -301,7 +308,7 @@ export class Parser {
         throw syntaxError(
           this._lexer.source,
           this._lexer.token.start,
-          'Unexpected description, descriptions are not supported on type extensions and shorthand queries.',
+          'Unexpected description, descriptions are not supported on type extensions.',
         );
       }
 
@@ -323,6 +330,18 @@ export class Parser {
    */
   parseOperationDefinition(): OperationDefinitionNode {
     const start = this._lexer.token;
+
+    // Check if there's a description first
+    const hasDescription = this.peekDescription();
+    if (hasDescription) {
+      // Look ahead to see what comes after the description
+      const nextToken = this._lexer.lookahead();
+      if (nextToken.kind === TokenKind.BRACE_L) {
+        // Short-hand queries cannot have descriptions
+        throw this.unexpected(this._lexer.token);
+      }
+    }
+
     if (this.peek(TokenKind.BRACE_L)) {
       return this.node<OperationDefinitionNode>(start, {
         kind: Kind.OPERATION_DEFINITION,
@@ -551,7 +570,7 @@ export class Parser {
     }
     return this.node<FragmentDefinitionNode>(start, {
       kind: Kind.FRAGMENT_DEFINITION,
-    description,
+      description,
       name: this.parseFragmentName(),
       typeCondition: (this.expectKeyword('on'), this.parseNamedType()),
       directives: this.parseDirectives(false),

src/language/printer.ts

@@ -31,14 +31,16 @@ const printDocASTReducer: ASTReducer<string> = {
       const varDefs = hasMultilineItems(node.variableDefinitions)
         ? wrap('(\n', join(node.variableDefinitions, '\n'), '\n)')
         : wrap('(', join(node.variableDefinitions, ', '), ')');
-      const prefix = wrap('', node.description, '\n') + join(
-        [
-          node.operation,
-          join([node.name, varDefs]),
-          join(node.directives, ' '),
-        ],
-        ' ',
-      );
+      const prefix =
+        wrap('', node.description, '\n') +
+        join(
+          [
+            node.operation,
+            join([node.name, varDefs]),
+            join(node.directives, ' '),
+          ],
+          ' ',
+        );
 
       // Anonymous queries with no directives or variable definitions can use
       // the query short form.
@@ -99,7 +101,7 @@ const printDocASTReducer: ASTReducer<string> = {
       variableDefinitions,
       directives,
       selectionSet,
-      description
+      description,
     }) =>
       wrap('', description, '\n') +
       // Note: fragment variable definitions are experimental and may be changed