@graphql-eslint/eslint-plugin 3.12.0-alpha-20221009195322-d8a697f → 3.12.0-alpha-20221010131634-608c49a

package/index.js

@@ -24,24 +24,15 @@ const codeFrame = require('@babel/code-frame');
 const debug = debugFactory('graphql-eslint:graphql-config');
 let graphQLConfig;
 function loadOnDiskGraphQLConfig(filePath) {
-    const rootDir = path.dirname(filePath);
-    const config = graphqlConfig.loadConfigSync({
+    return graphqlConfig.loadConfigSync({
         // load config relative to the file being linted
-        rootDir,
+        rootDir: path.dirname(filePath),
         throwOnEmpty: false,
         throwOnMissing: false,
-    });
-    if (!config) {
-        return null;
-    }
-    const project = config.getProjectForFile(filePath);
-    return graphqlConfig.loadConfigSync({
-        rootDir,
-        extensions: [codeFileLoaderExtension(project.extensions.pluckConfig)],
+        extensions: [codeFileLoaderExtension],
     });
 }
 function loadGraphQLConfig(options) {
-    var _a;
     // We don't want cache config on test environment
     // Otherwise schema and documents will be same for all tests
     if (process.env.NODE_ENV !== 'test' && graphQLConfig) {
@@ -66,37 +57,40 @@ function loadGraphQLConfig(options) {
             new graphqlConfig.GraphQLConfig({
                 config: configOptions,
                 filepath: 'virtual-config',
-            }, [codeFileLoaderExtension((_a = options.extensions) === null || _a === void 0 ? void 0 : _a.pluckConfig)]);
+            }, [codeFileLoaderExtension]);
     return graphQLConfig;
 }
-const codeFileLoaderExtension = (pluckConfig) => api => {
+const codeFileLoaderExtension = api => {
     const { schema, documents } = api.loaders;
-    schema.register(new codeFileLoader.CodeFileLoader({ pluckConfig }));
-    documents.register(new codeFileLoader.CodeFileLoader({ pluckConfig }));
+    schema.register(new codeFileLoader.CodeFileLoader());
+    documents.register(new codeFileLoader.CodeFileLoader());
     return { name: 'graphql-eslint-loaders' };
 };
 
 const blocksMap = new Map();
 let onDiskConfig;
 let onDiskConfigLoaded = false;
+const RELEVANT_KEYWORDS = ['gql', 'graphql', 'GraphQL'];
 const processor = {
     supportsAutofix: true,
     preprocess(code, filePath) {
-        var _a;
         if (!onDiskConfigLoaded) {
             onDiskConfig = loadOnDiskGraphQLConfig(filePath);
             onDiskConfigLoaded = true;
         }
-        const pluckConfig = (_a = onDiskConfig === null || onDiskConfig === void 0 ? void 0 : onDiskConfig.getProjectForFile(filePath).extensions) === null || _a === void 0 ? void 0 : _a.pluckConfig;
-        const { modules = [], globalGqlIdentifierName = ['gql', 'graphql'], gqlMagicComment = 'GraphQL', } = pluckConfig || {};
-        const RELEVANT_KEYWORDS = [
-            ...new Set([
-                ...modules.map(({ identifier }) => identifier),
-                ...utils.asArray(globalGqlIdentifierName),
-                gqlMagicComment,
-            ].filter(Boolean)),
-        ];
-        if (RELEVANT_KEYWORDS.every(keyword => !code.includes(keyword))) {
+        let keywords = RELEVANT_KEYWORDS;
+        const pluckConfig = onDiskConfig === null || onDiskConfig === void 0 ? void 0 : onDiskConfig.getProjectForFile(filePath).extensions.pluckConfig;
+        if (pluckConfig) {
+            const { modules = [], globalGqlIdentifierName = ['gql', 'graphql'], gqlMagicComment = 'GraphQL', } = pluckConfig || {};
+            keywords = [
+                ...new Set([
+                    ...modules.map(({ identifier }) => identifier),
+                    ...utils.asArray(globalGqlIdentifierName),
+                    gqlMagicComment,
+                ].filter(Boolean)),
+            ];
+        }
+        if (keywords.every(keyword => !code.includes(keyword))) {
             return [code];
         }
         try {
@@ -115,7 +109,7 @@ const processor = {
             blocksMap.set(filePath, blocks);
             return [...blocks, code /* source code must be provided and be last */];
         }
-        catch (_b) {
+        catch (_a) {
             // in case of parsing error return code as is
             return [code];
         }
@@ -4283,8 +4277,8 @@ const rules = {
 
 const schemaCache = new Map();
 const debug$1 = debugFactory('graphql-eslint:schema');
-function getSchema(projectForFile, options = {}) {
-    const schemaKey = utils.asArray(projectForFile.schema).sort().join(',');
+function getSchema(project, options = {}) {
+    const schemaKey = utils.asArray(project.schema).sort().join(',');
     if (!schemaKey) {
         return null;
     }
@@ -4293,11 +4287,14 @@ function getSchema(projectForFile, options = {}) {
     }
     let schema;
     try {
-        debug$1('Loading schema from %o', projectForFile.schema);
-        schema = projectForFile.loadSchemaSync(projectForFile.schema, 'GraphQLSchema', options.schemaOptions);
+        debug$1('Loading schema from %o', project.schema);
+        schema = project.loadSchemaSync(project.schema, 'GraphQLSchema', {
+            ...options.schemaOptions,
+            pluckConfig: project.extensions.pluckConfig,
+        });
         if (debug$1.enabled) {
             debug$1('Schema loaded: %o', schema instanceof graphql.GraphQLSchema);
-            const schemaPaths = fastGlob.sync(projectForFile.schema, {
+            const schemaPaths = fastGlob.sync(project.schema, {
                 absolute: true,
             });
             debug$1('Schema pointers %O', schemaPaths);
@@ -4330,20 +4327,21 @@ const handleVirtualPath = (documents) => {
 };
 const operationsCache = new Map();
 const siblingOperationsCache = new Map();
-const getSiblings = (projectForFile) => {
-    const documentsKey = utils.asArray(projectForFile.documents).sort().join(',');
+const getSiblings = (project) => {
+    const documentsKey = utils.asArray(project.documents).sort().join(',');
     if (!documentsKey) {
         return [];
     }
     let siblings = operationsCache.get(documentsKey);
     if (!siblings) {
-        debug$2('Loading operations from %o', projectForFile.documents);
-        const documents = projectForFile.loadDocumentsSync(projectForFile.documents, {
+        debug$2('Loading operations from %o', project.documents);
+        const documents = project.loadDocumentsSync(project.documents, {
             skipGraphQLImport: true,
+            pluckConfig: project.extensions.pluckConfig,
         });
         if (debug$2.enabled) {
             debug$2('Loaded %d operations', documents.length);
-            const operationsPaths = fastGlob.sync(projectForFile.documents, {
+            const operationsPaths = fastGlob.sync(project.documents, {
                 absolute: true,
             });
             debug$2('Operations pointers %O', operationsPaths);
@@ -4353,8 +4351,8 @@ const getSiblings = (projectForFile) => {
     }
     return siblings;
 };
-function getSiblingOperations(projectForFile) {
-    const siblings = getSiblings(projectForFile);
+function getSiblingOperations(project) {
+    const siblings = getSiblings(project);
     if (siblings.length === 0) {
         let printed = false;
         const noopWarn = () => {

package/index.mjs

@@ -2,7 +2,7 @@ import { gqlPluckFromCodeStringSync } from '@graphql-tools/graphql-tag-pluck';
 import { asArray, getDocumentNodeFromSchema, parseGraphQLSDL } from '@graphql-tools/utils';
 import { dirname, extname, basename, relative, resolve } from 'path';
 import debugFactory from 'debug';
-import { GraphQLConfig, loadConfigSync } from 'graphql-config';
+import { loadConfigSync, GraphQLConfig } from 'graphql-config';
 import { CodeFileLoader } from '@graphql-tools/code-file-loader';
 import { Kind, visit, validate, TokenKind, isScalarType, DirectiveLocation, isInterfaceType, TypeInfo, visitWithTypeInfo, isObjectType as isObjectType$1, Source, isNonNullType, isListType, GraphQLObjectType, GraphQLInterfaceType, GraphQLSchema, GraphQLError } from 'graphql';
 import { validateSDL } from 'graphql/validation/validate';
@@ -18,24 +18,15 @@ import { codeFrameColumns } from '@babel/code-frame';
 const debug = debugFactory('graphql-eslint:graphql-config');
 let graphQLConfig;
 function loadOnDiskGraphQLConfig(filePath) {
-    const rootDir = dirname(filePath);
-    const config = loadConfigSync({
+    return loadConfigSync({
         // load config relative to the file being linted
-        rootDir,
+        rootDir: dirname(filePath),
         throwOnEmpty: false,
         throwOnMissing: false,
-    });
-    if (!config) {
-        return null;
-    }
-    const project = config.getProjectForFile(filePath);
-    return loadConfigSync({
-        rootDir,
-        extensions: [codeFileLoaderExtension(project.extensions.pluckConfig)],
+        extensions: [codeFileLoaderExtension],
     });
 }
 function loadGraphQLConfig(options) {
-    var _a;
     // We don't want cache config on test environment
     // Otherwise schema and documents will be same for all tests
     if (process.env.NODE_ENV !== 'test' && graphQLConfig) {
@@ -60,37 +51,40 @@ function loadGraphQLConfig(options) {
             new GraphQLConfig({
                 config: configOptions,
                 filepath: 'virtual-config',
-            }, [codeFileLoaderExtension((_a = options.extensions) === null || _a === void 0 ? void 0 : _a.pluckConfig)]);
+            }, [codeFileLoaderExtension]);
     return graphQLConfig;
 }
-const codeFileLoaderExtension = (pluckConfig) => api => {
+const codeFileLoaderExtension = api => {
     const { schema, documents } = api.loaders;
-    schema.register(new CodeFileLoader({ pluckConfig }));
-    documents.register(new CodeFileLoader({ pluckConfig }));
+    schema.register(new CodeFileLoader());
+    documents.register(new CodeFileLoader());
     return { name: 'graphql-eslint-loaders' };
 };
 
 const blocksMap = new Map();
 let onDiskConfig;
 let onDiskConfigLoaded = false;
+const RELEVANT_KEYWORDS = ['gql', 'graphql', 'GraphQL'];
 const processor = {
     supportsAutofix: true,
     preprocess(code, filePath) {
-        var _a;
         if (!onDiskConfigLoaded) {
             onDiskConfig = loadOnDiskGraphQLConfig(filePath);
             onDiskConfigLoaded = true;
         }
-        const pluckConfig = (_a = onDiskConfig === null || onDiskConfig === void 0 ? void 0 : onDiskConfig.getProjectForFile(filePath).extensions) === null || _a === void 0 ? void 0 : _a.pluckConfig;
-        const { modules = [], globalGqlIdentifierName = ['gql', 'graphql'], gqlMagicComment = 'GraphQL', } = pluckConfig || {};
-        const RELEVANT_KEYWORDS = [
-            ...new Set([
-                ...modules.map(({ identifier }) => identifier),
-                ...asArray(globalGqlIdentifierName),
-                gqlMagicComment,
-            ].filter(Boolean)),
-        ];
-        if (RELEVANT_KEYWORDS.every(keyword => !code.includes(keyword))) {
+        let keywords = RELEVANT_KEYWORDS;
+        const pluckConfig = onDiskConfig === null || onDiskConfig === void 0 ? void 0 : onDiskConfig.getProjectForFile(filePath).extensions.pluckConfig;
+        if (pluckConfig) {
+            const { modules = [], globalGqlIdentifierName = ['gql', 'graphql'], gqlMagicComment = 'GraphQL', } = pluckConfig || {};
+            keywords = [
+                ...new Set([
+                    ...modules.map(({ identifier }) => identifier),
+                    ...asArray(globalGqlIdentifierName),
+                    gqlMagicComment,
+                ].filter(Boolean)),
+            ];
+        }
+        if (keywords.every(keyword => !code.includes(keyword))) {
             return [code];
         }
         try {
@@ -109,7 +103,7 @@ const processor = {
             blocksMap.set(filePath, blocks);
             return [...blocks, code /* source code must be provided and be last */];
         }
-        catch (_b) {
+        catch (_a) {
             // in case of parsing error return code as is
             return [code];
         }
@@ -4277,8 +4271,8 @@ const rules = {
 
 const schemaCache = new Map();
 const debug$1 = debugFactory('graphql-eslint:schema');
-function getSchema(projectForFile, options = {}) {
-    const schemaKey = asArray(projectForFile.schema).sort().join(',');
+function getSchema(project, options = {}) {
+    const schemaKey = asArray(project.schema).sort().join(',');
     if (!schemaKey) {
         return null;
     }
@@ -4287,11 +4281,14 @@ function getSchema(projectForFile, options = {}) {
     }
     let schema;
     try {
-        debug$1('Loading schema from %o', projectForFile.schema);
-        schema = projectForFile.loadSchemaSync(projectForFile.schema, 'GraphQLSchema', options.schemaOptions);
+        debug$1('Loading schema from %o', project.schema);
+        schema = project.loadSchemaSync(project.schema, 'GraphQLSchema', {
+            ...options.schemaOptions,
+            pluckConfig: project.extensions.pluckConfig,
+        });
         if (debug$1.enabled) {
             debug$1('Schema loaded: %o', schema instanceof GraphQLSchema);
-            const schemaPaths = fastGlob.sync(projectForFile.schema, {
+            const schemaPaths = fastGlob.sync(project.schema, {
                 absolute: true,
             });
             debug$1('Schema pointers %O', schemaPaths);
@@ -4324,20 +4321,21 @@ const handleVirtualPath = (documents) => {
 };
 const operationsCache = new Map();
 const siblingOperationsCache = new Map();
-const getSiblings = (projectForFile) => {
-    const documentsKey = asArray(projectForFile.documents).sort().join(',');
+const getSiblings = (project) => {
+    const documentsKey = asArray(project.documents).sort().join(',');
     if (!documentsKey) {
         return [];
     }
     let siblings = operationsCache.get(documentsKey);
     if (!siblings) {
-        debug$2('Loading operations from %o', projectForFile.documents);
-        const documents = projectForFile.loadDocumentsSync(projectForFile.documents, {
+        debug$2('Loading operations from %o', project.documents);
+        const documents = project.loadDocumentsSync(project.documents, {
             skipGraphQLImport: true,
+            pluckConfig: project.extensions.pluckConfig,
         });
         if (debug$2.enabled) {
             debug$2('Loaded %d operations', documents.length);
-            const operationsPaths = fastGlob.sync(projectForFile.documents, {
+            const operationsPaths = fastGlob.sync(project.documents, {
                 absolute: true,
             });
             debug$2('Operations pointers %O', operationsPaths);
@@ -4347,8 +4345,8 @@ const getSiblings = (projectForFile) => {
     }
     return siblings;
 };
-function getSiblingOperations(projectForFile) {
-    const siblings = getSiblings(projectForFile);
+function getSiblingOperations(project) {
+    const siblings = getSiblings(project);
     if (siblings.length === 0) {
         let printed = false;
         const noopWarn = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.12.0-alpha-20221009195322-d8a697f",
+  "version": "3.12.0-alpha-20221010131634-608c49a",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "peerDependencies": {

package/schema.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLProjectConfig } from 'graphql-config';
 import type { ParserOptions, Schema } from './types';
-export declare function getSchema(projectForFile: GraphQLProjectConfig, options?: Omit<ParserOptions, 'filePath'>): Schema;
+export declare function getSchema(project: GraphQLProjectConfig, options?: Omit<ParserOptions, 'filePath'>): Schema;

package/sibling-operations.d.ts

@@ -18,4 +18,4 @@ export declare type SiblingOperations = {
     getOperations(): OperationSource[];
     getOperationByType(operationType: OperationTypeNode): OperationSource[];
 };
-export declare function getSiblingOperations(projectForFile: GraphQLProjectConfig): SiblingOperations;
+export declare function getSiblingOperations(project: GraphQLProjectConfig): SiblingOperations;