fixes for parser

Author: dotansimha

packages/plugin/src/estree-parser/converter.ts

@@ -20,6 +20,11 @@ function hasTypeField<T extends ASTNode>(obj: any): obj is T & { readonly type:
   return obj && !!(obj as any).type;
 }
 
+/**
+ * Strips tokens information from `location` object - this is needed since it's created as linked list in GraphQL-JS,
+ * causing eslint to fail on circular JSON
+ * @param location
+ */
 function stripTokens(location: Location): Pick<Location, 'start' | 'end'> {
   return {
     end: location.end,

packages/plugin/src/parser.ts

@@ -1,12 +1,12 @@
 import { convertToESTree } from './estree-parser/converter';
 import { GraphQLParseOptions, parseGraphQLSDL } from '@graphql-tools/utils';
-import { buildSchema, GraphQLError, GraphQLSchema, TypeInfo } from 'graphql';
+import { buildSchema, GraphQLError, GraphQLSchema, Source, Lexer, TypeInfo } from 'graphql';
 import { loadConfigSync, GraphQLProjectConfig } from 'graphql-config';
 import { loadSchemaSync } from '@graphql-tools/load';
 import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader';
 import { JsonFileLoader } from '@graphql-tools/json-file-loader';
 import { UrlLoader } from '@graphql-tools/url-loader';
-import { Linter } from 'eslint';
+import { Linter, AST } from 'eslint';
 import { GraphQLESLintParseResult, ParserOptions } from './types';
 
 const DEFAULT_CONFIG: ParserOptions = {
@@ -18,6 +18,33 @@ export function parse(code: string, options?: GraphQLParseOptions): Linter.ESLin
   return parseForESLint(code, options).ast;
 }
 
+export function extractTokens(source: string): AST.Token[] {
+  const lexer = new Lexer(new Source(source));
+  const tokens: AST.Token[] = [];
+  let token = lexer.advance();
+
+  while (token && token.kind !== '<EOF>') {
+    tokens.push({
+      type: token.kind as any,
+      loc: {
+        start: {
+          line: token.line,
+          column: token.column,
+        },
+        end: {
+          line: token.line,
+          column: token.column,
+        },
+      },
+      value: token.value,
+      range: [token.start, token.end],
+    });
+    token = lexer.advance();
+  }
+
+  return tokens;
+}
+
 export function parseForESLint(code: string, options?: ParserOptions): GraphQLESLintParseResult {
   try {
     const config = {
@@ -83,6 +110,7 @@ export function parseForESLint(code: string, options?: ParserOptions): GraphQLES
     });
 
     const { rootTree, comments } = convertToESTree(graphqlAst.document, schema ? new TypeInfo(schema) : null);
+    const tokens = extractTokens(code);
 
     return {
       services: parserServices,
@@ -94,7 +122,7 @@ export function parseForESLint(code: string, options?: ParserOptions): GraphQLES
         comments,
         loc: rootTree.loc,
         range: rootTree.range as [number, number],
-        tokens: [],
+        tokens,
       },
     };
   } catch (e) {

packages/plugin/tests/__snapshots__/parser.spec.ts.snap

@@ -163,7 +163,62 @@ Object {
     74,
   ],
   "sourceType": "script",
-  "tokens": Array [],
+  "tokens": Array [
+    Object {
+      "loc": Object {
+        "end": Object {
+          "column": 7,
+          "line": 2,
+        },
+        "start": Object {
+          "column": 7,
+          "line": 2,
+        },
+      },
+      "range": Array [
+        7,
+        52,
+      ],
+      "type": "BlockString",
+      "value": "generic query placeholder",
+    },
+    Object {
+      "loc": Object {
+        "end": Object {
+          "column": 7,
+          "line": 5,
+        },
+        "start": Object {
+          "column": 7,
+          "line": 5,
+        },
+      },
+      "range": Array [
+        59,
+        63,
+      ],
+      "type": "Name",
+      "value": "type",
+    },
+    Object {
+      "loc": Object {
+        "end": Object {
+          "column": 12,
+          "line": 5,
+        },
+        "start": Object {
+          "column": 12,
+          "line": 5,
+        },
+      },
+      "range": Array [
+        64,
+        69,
+      ],
+      "type": "Name",
+      "value": "Query",
+    },
+  ],
   "type": "Program",
 }
 `;