@graphql-eslint/eslint-plugin 3.11.1-alpha-20220926130911-b8e2e2b → 3.11.2-alpha-20220926143611-7437e15

package/graphql-config.d.ts

@@ -1,3 +1,4 @@
 import { GraphQLConfig } from 'graphql-config';
 import { ParserOptions } from './types';
+export declare function loadOnDiskGraphQLConfig(filePath: string): GraphQLConfig;
 export declare function loadGraphQLConfig(options?: ParserOptions): GraphQLConfig;

package/index.js

@@ -23,21 +23,22 @@ const codeFrame = require('@babel/code-frame');
 
 const debug = debugFactory('graphql-eslint:graphql-config');
 let graphQLConfig;
+function loadOnDiskGraphQLConfig(filePath) {
+    return graphqlConfig.loadConfigSync({
+        // load config relative to the file being linted
+        rootDir: path.dirname(filePath),
+        throwOnEmpty: false,
+        throwOnMissing: false,
+        extensions: [addCodeFileLoaderExtension],
+    });
+}
 function loadGraphQLConfig(options = {}) {
     // 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) {
         return graphQLConfig;
     }
-    const onDiskConfig = options.skipGraphQLConfig
-        ? null
-        : graphqlConfig.loadConfigSync({
-            // load config relative to the file being linted
-            rootDir: options.filePath ? path.dirname(options.filePath) : undefined,
-            throwOnEmpty: false,
-            throwOnMissing: false,
-            extensions: [addCodeFileLoaderExtension],
-        });
+    const onDiskConfig = !options.skipGraphQLConfig && loadOnDiskGraphQLConfig(options.filePath);
     debug('options.skipGraphQLConfig: %o', options.skipGraphQLConfig);
     if (onDiskConfig) {
         debug('Graphql-config path %o', onDiskConfig.filepath);
@@ -71,9 +72,10 @@ const blocksMap = new Map();
 const processor = {
     supportsAutofix: true,
     preprocess(code, filePath) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!RELEVANT_KEYWORDS) {
-            graphQLTagPluckOptions = (_b = (_a = loadGraphQLConfig().getDefault()) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.graphqlTagPluck;
+            graphQLTagPluckOptions =
+                (_c = (_b = (_a = loadOnDiskGraphQLConfig(filePath)) === null || _a === void 0 ? void 0 : _a.getDefault()) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.graphqlTagPluck;
             const { modules = [], globalGqlIdentifierName = ['gql', 'graphql'], gqlMagicComment = 'GraphQL', } = graphQLTagPluckOptions || {};
             RELEVANT_KEYWORDS = [
                 ...new Set([
@@ -104,7 +106,7 @@ const processor = {
             blocksMap.set(filePath, blocks);
             return [...blocks, code /* source code must be provided and be last */];
         }
-        catch (_c) {
+        catch (_d) {
             // in case of parsing error return code as is
             return [code];
         }

package/index.mjs

@@ -17,21 +17,22 @@ import { codeFrameColumns } from '@babel/code-frame';
 
 const debug = debugFactory('graphql-eslint:graphql-config');
 let graphQLConfig;
+function loadOnDiskGraphQLConfig(filePath) {
+    return loadConfigSync({
+        // load config relative to the file being linted
+        rootDir: dirname(filePath),
+        throwOnEmpty: false,
+        throwOnMissing: false,
+        extensions: [addCodeFileLoaderExtension],
+    });
+}
 function loadGraphQLConfig(options = {}) {
     // 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) {
         return graphQLConfig;
     }
-    const onDiskConfig = options.skipGraphQLConfig
-        ? null
-        : loadConfigSync({
-            // load config relative to the file being linted
-            rootDir: options.filePath ? dirname(options.filePath) : undefined,
-            throwOnEmpty: false,
-            throwOnMissing: false,
-            extensions: [addCodeFileLoaderExtension],
-        });
+    const onDiskConfig = !options.skipGraphQLConfig && loadOnDiskGraphQLConfig(options.filePath);
     debug('options.skipGraphQLConfig: %o', options.skipGraphQLConfig);
     if (onDiskConfig) {
         debug('Graphql-config path %o', onDiskConfig.filepath);
@@ -65,9 +66,10 @@ const blocksMap = new Map();
 const processor = {
     supportsAutofix: true,
     preprocess(code, filePath) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!RELEVANT_KEYWORDS) {
-            graphQLTagPluckOptions = (_b = (_a = loadGraphQLConfig().getDefault()) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.graphqlTagPluck;
+            graphQLTagPluckOptions =
+                (_c = (_b = (_a = loadOnDiskGraphQLConfig(filePath)) === null || _a === void 0 ? void 0 : _a.getDefault()) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.graphqlTagPluck;
             const { modules = [], globalGqlIdentifierName = ['gql', 'graphql'], gqlMagicComment = 'GraphQL', } = graphQLTagPluckOptions || {};
             RELEVANT_KEYWORDS = [
                 ...new Set([
@@ -98,7 +100,7 @@ const processor = {
             blocksMap.set(filePath, blocks);
             return [...blocks, code /* source code must be provided and be last */];
         }
-        catch (_c) {
+        catch (_d) {
             // in case of parsing error return code as is
             return [code];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.11.1-alpha-20220926130911-b8e2e2b",
+  "version": "3.11.2-alpha-20220926143611-7437e15",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "peerDependencies": {