@wondermarin/eslint-config 2.4.1 → 2.5.0

package/dist/main.js

@@ -895,10 +895,9 @@ async function typescriptConfig(projectRoot) {
 
 // src/configs/stylistic.ts
 async function stylisticConfig() {
-  const [prettierConfig, prettierPlugin, stylisticPlugin, perfectionistPlugin] = await Promise.all([
+  const [prettierConfig, prettierPlugin, perfectionistPlugin] = await Promise.all([
     interopDefault(import('eslint-config-prettier')),
     interopDefault(import('eslint-plugin-prettier')),
-    interopDefault(import('@stylistic/eslint-plugin')),
     interopDefault(import('eslint-plugin-perfectionist'))
   ]);
   return [
@@ -913,176 +912,6 @@ async function stylisticConfig() {
         ...prettierConfig.rules
       }
     },
-    {
-      name: "wondermarin/eslint-config/stylistic",
-      files: ["**/*.?([cm])js" /* JS */, "**/*.jsx" /* JSX */, "**/*.?([cm])ts" /* TS */, "**/*.tsx" /* TSX */, "**/*.vue" /* VUE */],
-      plugins: {
-        "@stylistic": stylisticPlugin
-      },
-      rules: {
-        "@stylistic/array-bracket-newline": "off",
-        "@stylistic/array-bracket-spacing": "off",
-        "@stylistic/array-element-newline": "off",
-        "@stylistic/arrow-parens": "off",
-        "@stylistic/arrow-spacing": "off",
-        "@stylistic/block-spacing": "off",
-        "@stylistic/brace-style": "off",
-        "@stylistic/comma-dangle": "off",
-        "@stylistic/comma-spacing": "off",
-        "@stylistic/comma-style": "off",
-        "@stylistic/computed-property-spacing": "off",
-        "@stylistic/dot-location": "off",
-        "@stylistic/eol-last": "off",
-        "@stylistic/function-call-argument-newline": "off",
-        "@stylistic/function-call-spacing": "off",
-        "@stylistic/function-paren-newline": "off",
-        "@stylistic/generator-star-spacing": "off",
-        "@stylistic/implicit-arrow-linebreak": "off",
-        "@stylistic/indent": "off",
-        "@stylistic/indent-binary-ops": "off",
-        "@stylistic/jsx-child-element-spacing": "off",
-        "@stylistic/jsx-closing-bracket-location": "off",
-        "@stylistic/jsx-closing-tag-location": "off",
-        "@stylistic/jsx-curly-brace-presence": "off",
-        "@stylistic/jsx-curly-newline": "off",
-        "@stylistic/jsx-curly-spacing": "off",
-        "@stylistic/jsx-equals-spacing": "off",
-        "@stylistic/jsx-first-prop-new-line": "off",
-        "@stylistic/jsx-function-call-newline": "off",
-        "@stylistic/jsx-indent-props": "off",
-        "@stylistic/jsx-max-props-per-line": "off",
-        "@stylistic/jsx-newline": "off",
-        "@stylistic/jsx-one-expression-per-line": "off",
-        "@stylistic/jsx-pascal-case": "off",
-        "@stylistic/jsx-props-no-multi-spaces": "off",
-        "@stylistic/jsx-quotes": "off",
-        "@stylistic/jsx-self-closing-comp": "off",
-        "@stylistic/jsx-sort-props": "off",
-        "@stylistic/jsx-tag-spacing": "off",
-        "@stylistic/jsx-wrap-multilines": "off",
-        "@stylistic/key-spacing": "off",
-        "@stylistic/keyword-spacing": "off",
-        "@stylistic/line-comment-position": "off",
-        "@stylistic/linebreak-style": "off",
-        "@stylistic/lines-around-comment": "off",
-        "@stylistic/lines-between-class-members": "off",
-        "@stylistic/max-len": "off",
-        "@stylistic/max-statements-per-line": "off",
-        "@stylistic/member-delimiter-style": "off",
-        "@stylistic/multiline-comment-style": "off",
-        "@stylistic/multiline-ternary": "off",
-        "@stylistic/new-parens": "off",
-        "@stylistic/newline-per-chained-call": "off",
-        "@stylistic/no-confusing-arrow": "off",
-        "@stylistic/no-extra-parens": "off",
-        "@stylistic/no-extra-semi": "off",
-        "@stylistic/no-floating-decimal": "off",
-        "@stylistic/no-mixed-operators": "off",
-        "@stylistic/no-mixed-spaces-and-tabs": "off",
-        "@stylistic/no-multi-spaces": "off",
-        "@stylistic/no-multiple-empty-lines": "off",
-        "@stylistic/no-tabs": "off",
-        "@stylistic/no-trailing-spaces": "off",
-        "@stylistic/no-whitespace-before-property": "off",
-        "@stylistic/nonblock-statement-body-position": "off",
-        "@stylistic/object-curly-newline": "off",
-        "@stylistic/object-curly-spacing": "off",
-        "@stylistic/object-property-newline": "off",
-        "@stylistic/one-var-declaration-per-line": "off",
-        "@stylistic/operator-linebreak": "off",
-        "@stylistic/padded-blocks": "off",
-        "@stylistic/padding-line-between-statements": [
-          "error",
-          {
-            blankLine: "always",
-            next: "*",
-            prev: [
-              "block-like",
-              "case",
-              "class",
-              "debugger",
-              "default",
-              "directive",
-              "do",
-              "expression",
-              "for",
-              "function",
-              "if",
-              "iife",
-              "multiline-expression",
-              "multiline-const",
-              "multiline-let",
-              "switch",
-              "throw",
-              "try",
-              "while",
-              "with"
-            ]
-          },
-          {
-            blankLine: "always",
-            next: [
-              "block-like",
-              "break",
-              "case",
-              "class",
-              "continue",
-              "debugger",
-              "default",
-              "do",
-              "expression",
-              "for",
-              "function",
-              "if",
-              "iife",
-              "multiline-expression",
-              "multiline-const",
-              "multiline-let",
-              "return",
-              "singleline-const",
-              "singleline-let",
-              "switch",
-              "throw",
-              "try",
-              "while",
-              "with"
-            ],
-            prev: "*"
-          },
-          {
-            blankLine: "any",
-            next: "expression",
-            prev: "expression"
-          },
-          {
-            blankLine: "any",
-            next: ["singleline-const", "singleline-let"],
-            prev: ["singleline-const", "singleline-let"]
-          }
-        ],
-        "@stylistic/quote-props": "off",
-        "@stylistic/quotes": "off",
-        "@stylistic/rest-spread-spacing": "off",
-        "@stylistic/semi": "off",
-        "@stylistic/semi-spacing": "off",
-        "@stylistic/semi-style": "off",
-        "@stylistic/space-before-blocks": "off",
-        "@stylistic/space-before-function-paren": "off",
-        "@stylistic/space-in-parens": "off",
-        "@stylistic/space-infix-ops": "off",
-        "@stylistic/space-unary-ops": "off",
-        "@stylistic/spaced-comment": "off",
-        "@stylistic/switch-colon-spacing": "off",
-        "@stylistic/template-curly-spacing": "off",
-        "@stylistic/template-tag-spacing": "off",
-        "@stylistic/type-annotation-spacing": "off",
-        "@stylistic/type-generic-spacing": "off",
-        "@stylistic/type-named-tuple-spacing": "off",
-        "@stylistic/wrap-iife": "off",
-        "@stylistic/wrap-regex": "off",
-        "@stylistic/yield-star-spacing": "off"
-      }
-    },
     {
       name: "wondermarin/eslint-config/perfectionist",
       files: ["**/*.?([cm])js" /* JS */, "**/*.jsx" /* JSX */, "**/*.?([cm])ts" /* TS */, "**/*.tsx" /* TSX */, "**/*.vue" /* VUE */],
@@ -1207,6 +1036,21 @@ var fixedUpRuleReplacements = /* @__PURE__ */ new WeakMap();
 var fixedUpRules = /* @__PURE__ */ new WeakSet();
 var fixedUpPluginReplacements = /* @__PURE__ */ new WeakMap();
 var fixedUpPlugins = /* @__PURE__ */ new WeakSet();
+function nodesOrTokensOverlap(first, second) {
+  return first.range[0] <= second.range[0] && first.range[1] >= second.range[0] || second.range[0] <= first.range[0] && second.range[1] >= first.range[0];
+}
+function looksLikeExport(node) {
+  return node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration";
+}
+function findJSDocComment(node, sourceCode) {
+  const tokenBefore = sourceCode.getTokenBefore(node, {
+    includeComments: true
+  });
+  if (tokenBefore && tokenBefore.type === "Block" && tokenBefore.value.charAt(0) === "*" && node.loc.start.line - tokenBefore.loc.end.line <= 1) {
+    return tokenBefore;
+  }
+  return null;
+}
 function fixupRule(ruleDefinition) {
   if (fixedUpRuleReplacements.has(ruleDefinition)) {
     return fixedUpRuleReplacements.get(ruleDefinition);
@@ -1217,35 +1061,129 @@ function fixupRule(ruleDefinition) {
   }
   const originalCreate = isLegacyRule ? ruleDefinition : ruleDefinition.create.bind(ruleDefinition);
   function ruleCreate(context) {
+    const sourceCode = context.sourceCode;
     if ("getScope" in context) {
       return originalCreate(context);
     }
-    const sourceCode = context.sourceCode;
-    let currentNode = sourceCode.ast;
-    const newContext = Object.assign(Object.create(context), {
-      parserServices: sourceCode.parserServices,
+    let eslintVersion = 9;
+    if (!("getCwd" in context)) {
+      eslintVersion = 10;
+    }
+    let compatSourceCode = sourceCode;
+    if (eslintVersion >= 10) {
+      compatSourceCode = Object.assign(Object.create(sourceCode), {
+        getTokenOrCommentBefore(node, skip) {
+          return sourceCode.getTokenBefore(node, {
+            includeComments: true,
+            skip
+          });
+        },
+        getTokenOrCommentAfter(node, skip) {
+          return sourceCode.getTokenAfter(node, {
+            includeComments: true,
+            skip
+          });
+        },
+        isSpaceBetweenTokens(first, second) {
+          if (nodesOrTokensOverlap(first, second)) {
+            return false;
+          }
+          const [startingNodeOrToken, endingNodeOrToken] = first.range[1] <= second.range[0] ? [first, second] : [second, first];
+          const firstToken = sourceCode.getLastToken(startingNodeOrToken) || startingNodeOrToken;
+          const finalToken = sourceCode.getFirstToken(endingNodeOrToken) || endingNodeOrToken;
+          let currentToken = firstToken;
+          while (currentToken !== finalToken) {
+            const nextToken = sourceCode.getTokenAfter(
+              currentToken,
+              {
+                includeComments: true
+              }
+            );
+            if (currentToken.range[1] !== nextToken.range[0] || nextToken !== finalToken && nextToken.type === "JSXText" && /\s/u.test(nextToken.value)) {
+              return true;
+            }
+            currentToken = nextToken;
+          }
+          return false;
+        },
+        getJSDocComment(node) {
+          let parent = node.parent;
+          switch (node.type) {
+            case "ClassDeclaration":
+            case "FunctionDeclaration":
+              return findJSDocComment(
+                looksLikeExport(parent) ? parent : node,
+                sourceCode
+              );
+            case "ClassExpression":
+              return findJSDocComment(parent.parent, sourceCode);
+            case "ArrowFunctionExpression":
+            case "FunctionExpression":
+              if (parent.type !== "CallExpression" && parent.type !== "NewExpression") {
+                while (!sourceCode.getCommentsBefore(parent).length && !/Function/u.test(parent.type) && parent.type !== "MethodDefinition" && parent.type !== "Property") {
+                  parent = parent.parent;
+                  if (!parent) {
+                    break;
+                  }
+                }
+                if (parent && parent.type !== "FunctionDeclaration" && parent.type !== "Program") {
+                  return findJSDocComment(parent, sourceCode);
+                }
+              }
+              return findJSDocComment(node, sourceCode);
+            default:
+              return null;
+          }
+        }
+      });
+      Object.freeze(compatSourceCode);
+    }
+    let currentNode = compatSourceCode.ast;
+    const compatContext = Object.assign(Object.create(context), {
+      parserServices: compatSourceCode.parserServices,
       /*
        * The following methods rely on the current node in the traversal,
        * so we need to add them manually.
        */
       getScope() {
-        return sourceCode.getScope(currentNode);
+        return compatSourceCode.getScope(currentNode);
       },
       getAncestors() {
-        return sourceCode.getAncestors(currentNode);
+        return compatSourceCode.getAncestors(currentNode);
       },
       markVariableAsUsed(variable) {
-        sourceCode.markVariableAsUsed(variable, currentNode);
+        compatSourceCode.markVariableAsUsed(variable, currentNode);
       }
     });
+    if (eslintVersion >= 10) {
+      Object.assign(compatContext, {
+        parserOptions: compatContext.languageOptions.parserOptions,
+        getCwd() {
+          return compatContext.cwd;
+        },
+        getFilename() {
+          return compatContext.filename;
+        },
+        getPhysicalFilename() {
+          return compatContext.physicalFilename;
+        },
+        getSourceCode() {
+          return compatSourceCode;
+        }
+      });
+      Object.defineProperty(compatContext, "sourceCode", {
+        enumerable: true,
+        value: compatSourceCode
+      });
+    }
     for (const [
       contextMethodName,
       sourceCodeMethodName
     ] of removedMethodNames) {
-      newContext[contextMethodName] = sourceCode[sourceCodeMethodName].bind(sourceCode);
+      compatContext[contextMethodName] = compatSourceCode[sourceCodeMethodName].bind(compatSourceCode);
     }
-    Object.freeze(newContext);
-    const visitor = originalCreate(newContext);
+    Object.freeze(compatContext);
+    const visitor = originalCreate(compatContext);
     for (const [methodName, method] of Object.entries(visitor)) {
       if (methodName.startsWith("on")) {
         visitor[methodName] = (...args) => {
@@ -1312,13 +1250,14 @@ function convertIgnorePatternToMinimatch(pattern) {
   const matchEverywherePrefix = firstIndexOfSlash < 0 || firstIndexOfSlash === patternToTest.length - 1 ? "**/" : "";
   const patternWithoutLeadingSlash = firstIndexOfSlash === 0 ? patternToTest.slice(1) : patternToTest;
   const escapedPatternWithoutLeadingSlash = patternWithoutLeadingSlash.replaceAll(
+    // eslint-disable-next-line regexp/no-empty-lookarounds-assertion -- False positive
     /(?=((?:\\.|[^{(])*))\1([{(])/guy,
     "$1\\$2"
   );
   const matchInsideSuffix = patternToTest.endsWith("/**") ? "/*" : "";
   return `${negatedPrefix}${matchEverywherePrefix}${escapedPatternWithoutLeadingSlash}${matchInsideSuffix}`;
 }
-function includeIgnoreFile(ignoreFilePath) {
+function includeIgnoreFile(ignoreFilePath, name) {
   if (!path.isAbsolute(ignoreFilePath)) {
     throw new Error("The ignore file location must be an absolute path.");
   }
@@ -1334,7 +1273,6 @@ function includeIgnoreFile(ignoreFilePath) {
 async function reactConfig() {
   const [reactPlugin, reactHooksPlugin] = await Promise.all([
     interopDefault(import('eslint-plugin-react')),
-    // @ts-expect-error missing types
     interopDefault(import('eslint-plugin-react-hooks'))
   ]);
   return [
@@ -1597,8 +1535,8 @@ async function wondermarin(options) {
   });
   const projectRoot = findProjectRoot();
   const configs = await Promise.all([
-    baseConfig(projectRoot),
-    options.javascript ? javascriptConfig() : [],
+    Promise.resolve(baseConfig(projectRoot)),
+    Promise.resolve(options.javascript ? javascriptConfig() : []),
     options.typescript ? typescriptConfig(projectRoot) : [],
     options.stylistic ? stylisticConfig() : [],
     options.json ? jsonConfig() : [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wondermarin/eslint-config",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "Personal ESLint config.",
   "homepage": "https://github.com/Wondermarin/eslint-config#readme",
   "repository": {
@@ -28,37 +28,36 @@
     "build": "tsup"
   },
   "dependencies": {
-    "@stylistic/eslint-plugin": "^2.10.1",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^9.1.2",
     "eslint-plugin-package-json": "^0.15.6",
     "eslint-plugin-perfectionist": "^3.9.1",
-    "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.12.0",
-    "jsonc-eslint-parser": "^2.4.0"
+    "eslint-plugin-prettier": "^5.5.4",
+    "globals": "^15.15.0",
+    "jsonc-eslint-parser": "^2.4.2"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.3",
+    "@eslint/compat": "^2.0.0",
     "@types/eslint": "^9.6.1",
     "@types/eslint-config-prettier": "^6.11.3",
-    "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.14.0",
-    "@typescript-eslint/parser": "^8.14.0",
+    "@types/node": "^25.0.3",
+    "@typescript-eslint/eslint-plugin": "^8.51.0",
+    "@typescript-eslint/parser": "^8.51.0",
     "@wondermarin/prettier-config": "^1.0.0",
     "defu": "^6.1.4",
-    "eslint": "^9.14.0",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0",
-    "jiti": "^2.4.0",
-    "prettier": "^3.3.3",
-    "tsup": "^8.3.5",
-    "typescript": "^5.6.3"
+    "eslint": "^9.39.2",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "jiti": "^2.6.1",
+    "prettier": "^3.7.4",
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "^8.14",
     "@typescript-eslint/parser": "^8.14",
     "eslint": "^9.14",
     "eslint-plugin-react": "^7.37",
-    "eslint-plugin-react-hooks": "^5"
+    "eslint-plugin-react-hooks": "^5 || ^6.1 || ^7"
   },
   "peerDependenciesMeta": {
     "@typescript-eslint/eslint-plugin": {