@graphql-eslint/eslint-plugin 3.11.1-alpha-20220926113716-66ecd5e → 3.11.1

package/index.js

@@ -86,22 +86,28 @@ const processor = {
         if (RELEVANT_KEYWORDS.every(keyword => !code.includes(keyword))) {
             return [code];
         }
-        const extractedDocuments = graphqlTagPluck.parseCode({
-            code,
-            filePath,
-            options: {
-                skipIndent: true,
-                ...graphQLTagPluckOptions,
-            },
-        });
-        const blocks = extractedDocuments.map(item => ({
-            filename: 'document.graphql',
-            text: item.content,
-            lineOffset: item.loc.start.line - 1,
-            offset: item.start + 1,
-        }));
-        blocksMap.set(filePath, blocks);
-        return [...blocks, code /* source code must be provided and be last */];
+        try {
+            const extractedDocuments = graphqlTagPluck.parseCode({
+                code,
+                filePath,
+                options: {
+                    skipIndent: true,
+                    ...graphQLTagPluckOptions,
+                },
+            });
+            const blocks = extractedDocuments.map(item => ({
+                filename: 'document.graphql',
+                text: item.content,
+                lineOffset: item.loc.start.line - 1,
+                offset: item.start + 1,
+            }));
+            blocksMap.set(filePath, blocks);
+            return [...blocks, code /* source code must be provided and be last */];
+        }
+        catch (_c) {
+            // in case of parsing error return code as is
+            return [code];
+        }
     },
     postprocess(messages, filePath) {
         const blocks = blocksMap.get(filePath) || [];
@@ -123,7 +129,9 @@ const processor = {
                 }
             }
         }
-        return messages.flat();
+        const result = messages.flat();
+        // sort eslint/graphql-eslint messages by line/column
+        return result.sort((a, b) => a.line - b.line || a.column - b.column);
     },
 };
 

package/index.mjs

@@ -80,22 +80,28 @@ const processor = {
         if (RELEVANT_KEYWORDS.every(keyword => !code.includes(keyword))) {
             return [code];
         }
-        const extractedDocuments = parseCode({
-            code,
-            filePath,
-            options: {
-                skipIndent: true,
-                ...graphQLTagPluckOptions,
-            },
-        });
-        const blocks = extractedDocuments.map(item => ({
-            filename: 'document.graphql',
-            text: item.content,
-            lineOffset: item.loc.start.line - 1,
-            offset: item.start + 1,
-        }));
-        blocksMap.set(filePath, blocks);
-        return [...blocks, code /* source code must be provided and be last */];
+        try {
+            const extractedDocuments = parseCode({
+                code,
+                filePath,
+                options: {
+                    skipIndent: true,
+                    ...graphQLTagPluckOptions,
+                },
+            });
+            const blocks = extractedDocuments.map(item => ({
+                filename: 'document.graphql',
+                text: item.content,
+                lineOffset: item.loc.start.line - 1,
+                offset: item.start + 1,
+            }));
+            blocksMap.set(filePath, blocks);
+            return [...blocks, code /* source code must be provided and be last */];
+        }
+        catch (_c) {
+            // in case of parsing error return code as is
+            return [code];
+        }
     },
     postprocess(messages, filePath) {
         const blocks = blocksMap.get(filePath) || [];
@@ -117,7 +123,9 @@ const processor = {
                 }
             }
         }
-        return messages.flat();
+        const result = messages.flat();
+        // sort eslint/graphql-eslint messages by line/column
+        return result.sort((a, b) => a.line - b.line || a.column - b.column);
     },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.11.1-alpha-20220926113716-66ecd5e",
+  "version": "3.11.1",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "peerDependencies": {