@graphql-eslint/eslint-plugin 2.4.0-alpha-0a1c477.0 → 2.5.0-alpha-f60e6aa.0

package/index.js

@@ -149,7 +149,7 @@ function getLexer(source) {
     throw new Error(`Unsupported GraphQL version! Please make sure to use GraphQL v14 or newer!`);
 }
 function extractTokens(source) {
-    const lexer = getLexer(new graphql.Source(source));
+    const lexer = getLexer(source);
     const tokens = [];
     let token = lexer.advance();
     while (token && token.kind !== '<EOF>') {
@@ -3634,7 +3634,12 @@ function getReachableTypes(schema) {
         Directive: collect,
         NamedType: collect,
     };
-    for (const type of [schema.getQueryType(), schema.getMutationType(), schema.getSubscriptionType()]) {
+    for (const type of [
+        schema,
+        schema.getQueryType(),
+        schema.getMutationType(),
+        schema.getSubscriptionType(),
+    ]) {
         if (type) {
             graphql.visit(type.astNode, visitor);
         }
@@ -3693,7 +3698,7 @@ function parseForESLint(code, options = {}) {
             noLocation: false,
         });
         const { rootTree, comments } = convertToESTree(graphqlAst.document, schema ? new graphql.TypeInfo(schema) : null);
-        const tokens = extractTokens(code);
+        const tokens = extractTokens(new graphql.Source(code, filePath));
         return {
             services: parserServices,
             parserServices,

package/index.mjs

@@ -1,4 +1,4 @@
-import { Kind, Source, validate, isScalarType, TokenKind, isNonNullType, isListType, isObjectType as isObjectType$1, visit, visitWithTypeInfo, GraphQLObjectType, GraphQLInterfaceType, TypeInfo, isInterfaceType, GraphQLError } from 'graphql';
+import { Kind, validate, isScalarType, TokenKind, isNonNullType, isListType, isObjectType as isObjectType$1, visit, visitWithTypeInfo, GraphQLObjectType, GraphQLInterfaceType, TypeInfo, isInterfaceType, Source, GraphQLError } from 'graphql';
 import { validateSDL } from 'graphql/validation/validate';
 import { processImport, parseImportLine } from '@graphql-tools/import';
 import { statSync, existsSync, readFileSync } from 'fs';
@@ -143,7 +143,7 @@ function getLexer(source) {
     throw new Error(`Unsupported GraphQL version! Please make sure to use GraphQL v14 or newer!`);
 }
 function extractTokens(source) {
-    const lexer = getLexer(new Source(source));
+    const lexer = getLexer(source);
     const tokens = [];
     let token = lexer.advance();
     while (token && token.kind !== '<EOF>') {
@@ -3628,7 +3628,12 @@ function getReachableTypes(schema) {
         Directive: collect,
         NamedType: collect,
     };
-    for (const type of [schema.getQueryType(), schema.getMutationType(), schema.getSubscriptionType()]) {
+    for (const type of [
+        schema,
+        schema.getQueryType(),
+        schema.getMutationType(),
+        schema.getSubscriptionType(),
+    ]) {
         if (type) {
             visit(type.astNode, visitor);
         }
@@ -3687,7 +3692,7 @@ function parseForESLint(code, options = {}) {
             noLocation: false,
         });
         const { rootTree, comments } = convertToESTree(graphqlAst.document, schema ? new TypeInfo(schema) : null);
-        const tokens = extractTokens(code);
+        const tokens = extractTokens(new Source(code, filePath));
         return {
             services: parserServices,
             parserServices,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "2.4.0-alpha-0a1c477.0",
+  "version": "2.5.0-alpha-f60e6aa.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"

package/utils.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLSchema, ObjectTypeDefinitionNode, ObjectTypeExtensionNode } from 'graphql';
+import { GraphQLSchema, Source, ObjectTypeDefinitionNode, ObjectTypeExtensionNode } from 'graphql';
 import { AST } from 'eslint';
 import { Source as LoaderSource } from '@graphql-tools/utils';
 import { GraphQLESLintRuleContext } from './types';
@@ -9,7 +9,7 @@ export declare function requireSiblingsOperations(ruleName: string, context: Gra
 export declare function requireGraphQLSchemaFromContext(ruleName: string, context: GraphQLESLintRuleContext): GraphQLSchema | never;
 export declare function requireReachableTypesFromContext(ruleName: string, context: GraphQLESLintRuleContext): ReachableTypes | never;
 export declare function requireUsedFieldsFromContext(ruleName: string, context: GraphQLESLintRuleContext): UsedFields | never;
-export declare function extractTokens(source: string): AST.Token[];
+export declare function extractTokens(source: Source): AST.Token[];
 export declare const normalizePath: (path: string) => string;
 /**
  * https://github.com/prettier/eslint-plugin-prettier/blob/76bd45ece6d56eb52f75db6b4a1efdd2efb56392/eslint-plugin-prettier.js#L71