@graphql-eslint/eslint-plugin 4.3.0 → 4.4.0-alpha-20241207210859-41eb4549764dc0314b5bd4f257ea6667b178540e

package/esm/processor.js

@@ -7,19 +7,25 @@ import { loadOnDiskGraphQLConfig } from "./graphql-config.js";
 import { version } from "./meta.js";
 import { CWD, REPORT_ON_FIRST_CHARACTER } from "./utils.js";
 const blocksMap = /* @__PURE__ */ new Map();
-let onDiskConfig, onDiskConfigLoaded = !1;
-const RELEVANT_KEYWORDS = ["gql", "graphql", "GraphQL"], processor = {
+let onDiskConfig;
+let onDiskConfigLoaded = false;
+const RELEVANT_KEYWORDS = ["gql", "graphql", "GraphQL"];
+const processor = {
   meta: {
     name: "@graphql-eslint/processor",
     version
   },
-  supportsAutofix: !0,
+  supportsAutofix: true,
   preprocess(code, filePath) {
-    if (process.env.ESLINT_USE_FLAT_CONFIG !== "false" && filePath.endsWith(".vue"))
+    if (process.env.ESLINT_USE_FLAT_CONFIG !== "false" && filePath.endsWith(".vue")) {
       throw new Error(
         "Processing of `.vue` files is no longer supported, follow the new official vue example for ESLint's flat config https://github.com/dimaMachina/graphql-eslint/tree/master/examples/vue-code-file"
       );
-    onDiskConfigLoaded || (onDiskConfig = loadOnDiskGraphQLConfig(filePath), onDiskConfigLoaded = !0);
+    }
+    if (!onDiskConfigLoaded) {
+      onDiskConfig = loadOnDiskGraphQLConfig(filePath);
+      onDiskConfigLoaded = true;
+    }
     let keywords = RELEVANT_KEYWORDS;
     const pluckConfig = onDiskConfig?.getProjectForFile(filePath).extensions.pluckConfig;
     if (pluckConfig) {
@@ -27,34 +33,43 @@ const RELEVANT_KEYWORDS = ["gql", "graphql", "GraphQL"], processor = {
         modules = [],
         globalGqlIdentifierName = ["gql", "graphql"],
         gqlMagicComment = "GraphQL"
-      } = pluckConfig, result = [...modules.map(({ identifier }) => identifier).filter((v) => !!v), ...asArray(globalGqlIdentifierName), gqlMagicComment];
+      } = pluckConfig;
+      const mods = modules.map(({ identifier }) => identifier).filter((v) => !!v);
+      const result = [...mods, ...asArray(globalGqlIdentifierName), gqlMagicComment];
       keywords = [...new Set(result)];
     }
-    if (keywords.every((keyword) => !code.includes(keyword)))
+    if (keywords.every((keyword) => !code.includes(keyword))) {
       return [code];
+    }
     try {
-      const blocks = gqlPluckFromCodeStringSync(filePath, code, {
-        skipIndent: !0,
+      const sources = gqlPluckFromCodeStringSync(filePath, code, {
+        skipIndent: true,
         ...pluckConfig
-      }).map((item) => ({
+      });
+      const blocks = sources.map((item) => ({
         filename: "document.graphql",
         text: item.body,
         lineOffset: item.locationOffset.line - 1,
         // @ts-expect-error -- `index` field exist but show ts error
         offset: item.locationOffset.index + 1
       }));
-      return blocksMap.set(filePath, blocks), [
+      blocksMap.set(filePath, blocks);
+      return [
         ...blocks,
         code
         /* source code must be provided and be last */
       ];
     } catch (error) {
-      return error instanceof Error && (error.message = `[graphql-eslint] Error while preprocessing "${relative(
-        CWD,
-        filePath
-      )}" file
+      if (error instanceof Error) {
+        error.message = `[graphql-eslint] Error while preprocessing "${relative(
+          CWD,
+          filePath
+        )}" file
 
-${error.message}`), console.error(error), [code];
+${error.message}`;
+      }
+      console.error(error);
+      return [code];
     }
   },
   postprocess(messages, filePath) {
@@ -62,18 +77,31 @@ ${error.message}`), console.error(error), [code];
     for (let i = 0; i < blocks.length; i += 1) {
       const { lineOffset, offset } = blocks[i];
       for (const message of messages[i] || []) {
-        if (/\.(vue|svelte)$/.test(filePath)) {
-          delete message.endLine, delete message.endColumn, delete message.fix, delete message.suggestions, Object.assign(message, REPORT_ON_FIRST_CHARACTER);
+        const isVueOrSvelte = /\.(vue|svelte)$/.test(filePath);
+        if (isVueOrSvelte) {
+          delete message.endLine;
+          delete message.endColumn;
+          delete message.fix;
+          delete message.suggestions;
+          Object.assign(message, REPORT_ON_FIRST_CHARACTER);
           continue;
         }
-        message.line += lineOffset, typeof message.endLine == "number" && (message.endLine += lineOffset), message.fix && (message.fix.range[0] += offset, message.fix.range[1] += offset);
+        message.line += lineOffset;
+        if (typeof message.endLine === "number") {
+          message.endLine += lineOffset;
+        }
+        if (message.fix) {
+          message.fix.range[0] += offset;
+          message.fix.range[1] += offset;
+        }
         for (const suggestion of message.suggestions || []) {
           const [start, end] = suggestion.fix.range;
           suggestion.fix.range = [start + offset, end + offset];
         }
       }
     }
-    return messages.flat().sort((a, b) => a.line - b.line || a.column - b.column);
+    const result = messages.flat();
+    return result.sort((a, b) => a.line - b.line || a.column - b.column);
   }
 };
 export {

package/esm/rules/alphabetize/index.js

@@ -3,25 +3,29 @@ import {
 } from "graphql";
 import lowerCase from "lodash.lowercase";
 import { ARRAY_DEFAULT_OPTIONS, displayNodeName } from "../../utils.js";
-const RULE_ID = "alphabetize", fieldsEnum = [
+const RULE_ID = "alphabetize";
+const fieldsEnum = [
   Kind.OBJECT_TYPE_DEFINITION,
   Kind.INTERFACE_TYPE_DEFINITION,
   Kind.INPUT_OBJECT_TYPE_DEFINITION
-], selectionsEnum = [
+];
+const selectionsEnum = [
   Kind.OPERATION_DEFINITION,
   Kind.FRAGMENT_DEFINITION
-], argumentsEnum = [
+];
+const argumentsEnum = [
   Kind.FIELD_DEFINITION,
   Kind.FIELD,
   Kind.DIRECTIVE_DEFINITION,
   Kind.DIRECTIVE
-], schema = {
+];
+const schema = {
   type: "array",
   minItems: 1,
   maxItems: 1,
   items: {
     type: "object",
-    additionalProperties: !1,
+    additionalProperties: false,
     minProperties: 1,
     properties: {
       fields: {
@@ -66,12 +70,12 @@ const RULE_ID = "alphabetize", fieldsEnum = [
           "- `id` stands for field with name `id`",
           "- `*` stands for everything else",
           "- `{` stands for fields `selection set`"
-        ].join(`
-`)
+        ].join("\n")
       }
     }
   }
-}, rule = {
+};
+const rule = {
   meta: {
     type: "suggestion",
     fixable: "code",
@@ -112,7 +116,7 @@ const RULE_ID = "alphabetize", fieldsEnum = [
         },
         {
           title: "Incorrect",
-          usage: [{ values: !0 }],
+          usage: [{ values: true }],
           code: (
             /* GraphQL */
             `
@@ -127,7 +131,7 @@ const RULE_ID = "alphabetize", fieldsEnum = [
         },
         {
           title: "Correct",
-          usage: [{ values: !0 }],
+          usage: [{ values: true }],
           code: (
             /* GraphQL */
             `
@@ -176,18 +180,18 @@ const RULE_ID = "alphabetize", fieldsEnum = [
       configOptions: {
         schema: [
           {
-            definitions: !0,
+            definitions: true,
             fields: fieldsEnum,
-            values: !0,
+            values: true,
             arguments: argumentsEnum,
             groups: ["id", "*", "createdAt", "updatedAt"]
           }
         ],
         operations: [
           {
-            definitions: !0,
+            definitions: true,
             selections: selectionsEnum,
-            variables: !0,
+            variables: true,
             arguments: [Kind.FIELD, Kind.DIRECTIVE],
             groups: ["...", "id", "*", "{"]
           }
@@ -206,43 +210,65 @@ const RULE_ID = "alphabetize", fieldsEnum = [
     }
     function getBeforeComments(node) {
       const commentsBefore = sourceCode.getCommentsBefore(node);
-      if (commentsBefore.length === 0)
+      if (commentsBefore.length === 0) {
         return [];
+      }
       const tokenBefore = sourceCode.getTokenBefore(node);
-      if (tokenBefore)
+      if (tokenBefore) {
         return commentsBefore.filter((comment) => !isNodeAndCommentOnSameLine(tokenBefore, comment));
-      const filteredComments = [], nodeLine = node.loc.start.line;
+      }
+      const filteredComments = [];
+      const nodeLine = node.loc.start.line;
       for (let i = commentsBefore.length - 1; i >= 0; i -= 1) {
         const comment = commentsBefore[i];
-        if (nodeLine - comment.loc.start.line - filteredComments.length > 1)
+        if (nodeLine - comment.loc.start.line - filteredComments.length > 1) {
           break;
+        }
         filteredComments.unshift(comment);
       }
       return filteredComments;
     }
     function getRangeWithComments(node) {
-      node.kind === Kind.VARIABLE && (node = node.parent);
-      const [firstBeforeComment] = getBeforeComments(node), [firstAfterComment] = sourceCode.getCommentsAfter(node), from = firstBeforeComment || node, to = firstAfterComment && isNodeAndCommentOnSameLine(node, firstAfterComment) ? firstAfterComment : node;
+      if (node.kind === Kind.VARIABLE) {
+        node = node.parent;
+      }
+      const [firstBeforeComment] = getBeforeComments(node);
+      const [firstAfterComment] = sourceCode.getCommentsAfter(node);
+      const from = firstBeforeComment || node;
+      const to = firstAfterComment && isNodeAndCommentOnSameLine(node, firstAfterComment) ? firstAfterComment : node;
       return [from.range[0], to.range[1]];
     }
     function checkNodes(nodes = []) {
       for (let i = 1; i < nodes.length; i += 1) {
-        const currNode = nodes[i], currName = getName(currNode);
-        if (!currName)
+        const currNode = nodes[i];
+        const currName = getName(currNode);
+        if (!currName) {
           continue;
-        const prevNode = nodes[i - 1], prevName = getName(prevNode);
+        }
+        const prevNode = nodes[i - 1];
+        const prevName = getName(prevNode);
         if (prevName) {
-          const compareResult = prevName.localeCompare(currName), { groups } = opts;
-          let shouldSortByGroup = !1;
+          const compareResult = prevName.localeCompare(currName);
+          const { groups } = opts;
+          let shouldSortByGroup = false;
           if (groups?.length) {
-            if (!groups.includes("*"))
+            if (!groups.includes("*")) {
               throw new Error("`groups` option should contain `*` string.");
-            const indexForPrev = getIndex({ node: prevNode, groups }), indexForCurr = getIndex({ node: currNode, groups });
-            if (shouldSortByGroup = indexForPrev - indexForCurr > 0, indexForPrev < indexForCurr)
+            }
+            const indexForPrev = getIndex({ node: prevNode, groups });
+            const indexForCurr = getIndex({ node: currNode, groups });
+            shouldSortByGroup = indexForPrev - indexForCurr > 0;
+            if (indexForPrev < indexForCurr) {
+              continue;
+            }
+          }
+          const shouldSort = compareResult === 1;
+          if (!shouldSortByGroup && !shouldSort) {
+            const isSameName = compareResult === 0;
+            if (!isSameName || !prevNode.kind.endsWith("Extension") || currNode.kind.endsWith("Extension")) {
               continue;
+            }
           }
-          if (!shouldSortByGroup && !(compareResult === 1) && (!(compareResult === 0) || !prevNode.kind.endsWith("Extension") || currNode.kind.endsWith("Extension")))
-            continue;
         }
         context.report({
           // @ts-expect-error can't be undefined
@@ -253,11 +279,13 @@ const RULE_ID = "alphabetize", fieldsEnum = [
             prevNode: prevName ? displayNodeName(prevNode) : lowerCase(prevNode.kind)
           },
           *fix(fixer) {
-            const prevRange = getRangeWithComments(prevNode), currRange = getRangeWithComments(currNode);
+            const prevRange = getRangeWithComments(prevNode);
+            const currRange = getRangeWithComments(currNode);
             yield fixer.replaceTextRange(
               prevRange,
               sourceCode.getText({ range: currRange })
-            ), yield fixer.replaceTextRange(
+            );
+            yield fixer.replaceTextRange(
               currRange,
               sourceCode.getText({ range: prevRange })
             );
@@ -265,7 +293,10 @@ const RULE_ID = "alphabetize", fieldsEnum = [
         });
       }
     }
-    const opts = context.options[0], fields = new Set(opts.fields ?? []), listeners = {}, fieldsSelector = [
+    const opts = context.options[0];
+    const fields = new Set(opts.fields ?? []);
+    const listeners = {};
+    const kinds = [
       fields.has(Kind.OBJECT_TYPE_DEFINITION) && [
         Kind.OBJECT_TYPE_DEFINITION,
         Kind.OBJECT_TYPE_EXTENSION
@@ -278,24 +309,42 @@ const RULE_ID = "alphabetize", fieldsEnum = [
         Kind.INPUT_OBJECT_TYPE_DEFINITION,
         Kind.INPUT_OBJECT_TYPE_EXTENSION
       ]
-    ].filter((v) => !!v).flat().join(","), selectionsSelector = opts.selections?.join(","), argumentsSelector = opts.arguments?.join(",");
-    if (fieldsSelector && (listeners[fieldsSelector] = (node) => {
-      checkNodes(node.fields);
-    }), opts.values) {
+    ].filter((v) => !!v).flat();
+    const fieldsSelector = kinds.join(",");
+    const selectionsSelector = opts.selections?.join(",");
+    const argumentsSelector = opts.arguments?.join(",");
+    if (fieldsSelector) {
+      listeners[fieldsSelector] = (node) => {
+        checkNodes(node.fields);
+      };
+    }
+    if (opts.values) {
       const enumValuesSelector = [Kind.ENUM_TYPE_DEFINITION, Kind.ENUM_TYPE_EXTENSION].join(",");
       listeners[enumValuesSelector] = (node) => {
         checkNodes(node.values);
       };
     }
-    return selectionsSelector && (listeners[`:matches(${selectionsSelector}) SelectionSet`] = (node) => {
-      checkNodes(node.selections);
-    }), opts.variables && (listeners.OperationDefinition = (node) => {
-      checkNodes(node.variableDefinitions?.map((varDef) => varDef.variable));
-    }), argumentsSelector && (listeners[argumentsSelector] = (node) => {
-      checkNodes(node.arguments);
-    }), opts.definitions && (listeners.Document = (node) => {
-      checkNodes(node.definitions);
-    }), listeners;
+    if (selectionsSelector) {
+      listeners[`:matches(${selectionsSelector}) SelectionSet`] = (node) => {
+        checkNodes(node.selections);
+      };
+    }
+    if (opts.variables) {
+      listeners.OperationDefinition = (node) => {
+        checkNodes(node.variableDefinitions?.map((varDef) => varDef.variable));
+      };
+    }
+    if (argumentsSelector) {
+      listeners[argumentsSelector] = (node) => {
+        checkNodes(node.arguments);
+      };
+    }
+    if (opts.definitions) {
+      listeners.Document = (node) => {
+        checkNodes(node.definitions);
+      };
+    }
+    return listeners;
   }
 };
 function getIndex({
@@ -303,7 +352,10 @@ function getIndex({
   groups
 }) {
   let index = groups.indexOf(getName(node));
-  return index === -1 && "selectionSet" in node && node.selectionSet && (index = groups.indexOf("{")), index === -1 && node.kind === Kind.FRAGMENT_SPREAD && (index = groups.indexOf("...")), index === -1 && (index = groups.indexOf("*")), index;
+  if (index === -1 && "selectionSet" in node && node.selectionSet) index = groups.indexOf("{");
+  if (index === -1 && node.kind === Kind.FRAGMENT_SPREAD) index = groups.indexOf("...");
+  if (index === -1) index = groups.indexOf("*");
+  return index;
 }
 function getName(node) {
   return "alias" in node && node.alias?.value || //

package/esm/rules/description-style/index.js

@@ -4,7 +4,7 @@ const schema = {
   maxItems: 1,
   items: {
     type: "object",
-    additionalProperties: !1,
+    additionalProperties: false,
     minProperties: 1,
     properties: {
       style: {
@@ -13,10 +13,11 @@ const schema = {
       }
     }
   }
-}, rule = {
+};
+const rule = {
   meta: {
     type: "suggestion",
-    hasSuggestions: !0,
+    hasSuggestions: true,
     docs: {
       examples: [
         {
@@ -49,12 +50,13 @@ const schema = {
       description: "Require all comments to follow the same style (either block or inline).",
       category: "Schema",
       url: "https://the-guild.dev/graphql/eslint/rules/description-style",
-      recommended: !0
+      recommended: true
     },
     schema
   },
   create(context) {
-    const { style = "block" } = context.options[0] || {}, isBlock = style === "block";
+    const { style = "block" } = context.options[0] || {};
+    const isBlock = style === "block";
     return {
       [`.description[type=StringValue][block!=${isBlock}]`](node) {
         context.report({
@@ -66,7 +68,9 @@ const schema = {
             {
               desc: `Change to ${isBlock ? "block" : "inline"} style description`,
               fix(fixer) {
-                const originalText = context.getSourceCode().getText(node), newText = isBlock ? originalText.replace(/(^")|("$)/g, '"""') : originalText.replace(/(^""")|("""$)/g, '"').replace(/\s+/g, " ");
+                const sourceCode = context.getSourceCode();
+                const originalText = sourceCode.getText(node);
+                const newText = isBlock ? originalText.replace(/(^")|("$)/g, '"""') : originalText.replace(/(^""")|("""$)/g, '"').replace(/\s+/g, " ");
                 return fixer.replaceText(node, newText);
               }
             }