@graphql-eslint/eslint-plugin 3.14.1-alpha-20221227104629-b686a2c → 3.14.2-alpha-20221227181549-bdccde8

package/cjs/processor.js

@@ -4,6 +4,7 @@ exports.processor = void 0;
 const graphql_tag_pluck_1 = require("@graphql-tools/graphql-tag-pluck");
 const utils_1 = require("@graphql-tools/utils");
 const graphql_config_js_1 = require("./graphql-config.js");
+const utils_js_1 = require("./utils.js");
 const blocksMap = new Map();
 let onDiskConfig;
 let onDiskConfigLoaded = false;
@@ -35,18 +36,19 @@ exports.processor = {
                 skipIndent: true,
                 ...pluckConfig,
             });
-            const isSvelte = filePath.endsWith('.svelte');
             const blocks = sources.map(item => ({
                 filename: 'document.graphql',
                 text: item.body,
-                lineOffset: item.locationOffset.line - (isSvelte ? 3 : 1),
+                lineOffset: item.locationOffset.line - 1,
                 // @ts-expect-error -- `index` field exist but show ts error
-                offset: item.locationOffset.index + (isSvelte ? -52 : 1),
+                offset: item.locationOffset.index + 1,
             }));
             blocksMap.set(filePath, blocks);
             return [...blocks, code /* source code must be provided and be last */];
         }
-        catch (_a) {
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.error(e);
             // in case of parsing error return code as is
             return [code];
         }
@@ -55,7 +57,18 @@ exports.processor = {
         const blocks = blocksMap.get(filePath) || [];
         for (let i = 0; i < blocks.length; i += 1) {
             const { lineOffset, offset } = blocks[i];
-            for (const message of messages[i]) {
+            for (const message of messages[i] || []) {
+                const isVueOrSvelte = /\.(vue|svelte)$/.test(filePath);
+                if (isVueOrSvelte) {
+                    // We can't show correct report location because after processing with
+                    // graphql-tag-pluck location is incorrect, disable fixes as well
+                    delete message.endLine;
+                    delete message.endColumn;
+                    delete message.fix;
+                    delete message.suggestions;
+                    Object.assign(message, utils_js_1.REPORT_ON_FIRST_CHARACTER);
+                    continue;
+                }
                 message.line += lineOffset;
                 // endLine can not exist if only `loc: { start, column }` was provided to context.report
                 if (typeof message.endLine === 'number') {

package/esm/processor.js

@@ -1,6 +1,7 @@
 import { gqlPluckFromCodeStringSync, } from '@graphql-tools/graphql-tag-pluck';
 import { asArray } from '@graphql-tools/utils';
 import { loadOnDiskGraphQLConfig } from './graphql-config.js';
+import { REPORT_ON_FIRST_CHARACTER } from './utils.js';
 const blocksMap = new Map();
 let onDiskConfig;
 let onDiskConfigLoaded = false;
@@ -32,18 +33,19 @@ export const processor = {
                 skipIndent: true,
                 ...pluckConfig,
             });
-            const isSvelte = filePath.endsWith('.svelte');
             const blocks = sources.map(item => ({
                 filename: 'document.graphql',
                 text: item.body,
-                lineOffset: item.locationOffset.line - (isSvelte ? 3 : 1),
+                lineOffset: item.locationOffset.line - 1,
                 // @ts-expect-error -- `index` field exist but show ts error
-                offset: item.locationOffset.index + (isSvelte ? -52 : 1),
+                offset: item.locationOffset.index + 1,
             }));
             blocksMap.set(filePath, blocks);
             return [...blocks, code /* source code must be provided and be last */];
         }
-        catch (_a) {
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.error(e);
             // in case of parsing error return code as is
             return [code];
         }
@@ -52,7 +54,18 @@ export const processor = {
         const blocks = blocksMap.get(filePath) || [];
         for (let i = 0; i < blocks.length; i += 1) {
             const { lineOffset, offset } = blocks[i];
-            for (const message of messages[i]) {
+            for (const message of messages[i] || []) {
+                const isVueOrSvelte = /\.(vue|svelte)$/.test(filePath);
+                if (isVueOrSvelte) {
+                    // We can't show correct report location because after processing with
+                    // graphql-tag-pluck location is incorrect, disable fixes as well
+                    delete message.endLine;
+                    delete message.endColumn;
+                    delete message.fix;
+                    delete message.suggestions;
+                    Object.assign(message, REPORT_ON_FIRST_CHARACTER);
+                    continue;
+                }
                 message.line += lineOffset;
                 // endLine can not exist if only `loc: { start, column }` was provided to context.report
                 if (typeof message.endLine === 'number') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.14.1-alpha-20221227104629-b686a2c",
+  "version": "3.14.2-alpha-20221227181549-bdccde8",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "peerDependencies": {