eslint 9.6.0 → 9.7.0

package/README.md

@@ -39,7 +39,7 @@ ESLint is a tool for identifying and reporting on patterns found in ECMAScript/J
 10. [License](#license)
 11. [Team](#team)
 12. [Sponsors](#sponsors)
-13. [Technology Sponsors](#technology-sponsors)
+13. [Technology Sponsors](#technology-sponsors) <!-- markdownlint-disable-line MD051 -->
 
 ## Installation and Usage
 
@@ -294,14 +294,13 @@ The following companies, organizations, and individuals support ESLint's ongoing
 <!-- NOTE: This section is autogenerated. Do not manually edit.-->
 <!--sponsorsstart-->
 <h3>Platinum Sponsors</h3>
-<p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="undefined"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="undefined"></a></p><h3>Gold Sponsors</h3>
+<p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="128"></a></p><h3>Gold Sponsors</h3>
 <p><a href="#"><img src="https://images.opencollective.com/guest-bf377e88/avatar.png" alt="Eli Schleifer" height="96"></a> <a href="https://engineering.salesforce.com"><img src="https://images.opencollective.com/salesforce/ca8f997/logo.png" alt="Salesforce" height="96"></a></p><h3>Silver Sponsors</h3>
 <p><a href="https://www.jetbrains.com/"><img src="https://images.opencollective.com/jetbrains/fe76f99/logo.png" alt="JetBrains" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://americanexpress.io"><img src="https://avatars.githubusercontent.com/u/3853301?v=4" alt="American Express" height="64"></a> <a href="https://www.workleap.com"><img src="https://avatars.githubusercontent.com/u/53535748?u=d1e55d7661d724bf2281c1bfd33cb8f99fe2465f&v=4" alt="Workleap" height="64"></a></p><h3>Bronze Sponsors</h3>
 <p><a href="https://www.notion.so"><img src="https://images.opencollective.com/notion/bf3b117/logo.png" alt="notion" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.ignitionapp.com"><img src="https://avatars.githubusercontent.com/u/5753491?v=4" alt="Ignition" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104?v=4" alt="Nx" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774?v=4" alt="HeroCoders" height="32"></a> <a href="https://usenextbase.com"><img src="https://avatars.githubusercontent.com/u/145838380?v=4" alt="Nextbase Starter Kit" height="32"></a></p>
 <!--sponsorsend-->
 
-## Technology Sponsors
-
-* Site search ([eslint.org](https://eslint.org)) is sponsored by [Algolia](https://www.algolia.com)
-* Hosting for ([eslint.org](https://eslint.org)) is sponsored by [Netlify](https://www.netlify.com)
-* Password management is sponsored by [1Password](https://www.1password.com)
+<!--techsponsorsstart-->
+<h2>Technology Sponsors</h2>
+<p><a href="https://netlify.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/netlify-icon.svg" alt="Netlify" height="32"></a> <a href="https://algolia.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/algolia-icon.svg" alt="Algolia" height="32"></a> <a href="https://1password.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/1password-icon.svg" alt="1Password" height="32"></a></p>
+<!--techsponsorsend-->

package/lib/languages/js/index.js

@@ -20,7 +20,9 @@ const { validateLanguageOptions } = require("./validate-language-options");
 // Type Definitions
 //-----------------------------------------------------------------------------
 
-/** @typedef {import("../../linter/vfile").VFile} VFile */
+/** @typedef {import("@eslint/core").File} File */
+/** @typedef {import("@eslint/core").Language} Language */
+/** @typedef {import("@eslint/core").OkParseResult} OkParseResult */
 
 //-----------------------------------------------------------------------------
 // Helpers
@@ -56,6 +58,9 @@ function analyzeScope(ast, languageOptions, visitorKeys) {
 // Exports
 //-----------------------------------------------------------------------------
 
+/**
+ * @type {Language}
+ */
 module.exports = {
 
     fileType: "text",
@@ -143,7 +148,7 @@ module.exports = {
 
     /**
      * Parses the given file into an AST.
-     * @param {VFile} file The virtual file to parse.
+     * @param {File} file The virtual file to parse.
      * @param {Object} options Additional options passed from ESLint.
      * @param {LanguageOptions} options.languageOptions The language options.
      * @returns {Object} The result of parsing.
@@ -200,7 +205,7 @@ module.exports = {
         } catch (ex) {
 
             // If the message includes a leading line number, strip it:
-            const message = `Parsing error: ${ex.message.replace(/^line \d+:/iu, "").trim()}`;
+            const message = ex.message.replace(/^line \d+:/iu, "").trim();
 
             debug("%s\n%s", message, ex.stack);
 
@@ -218,8 +223,8 @@ module.exports = {
 
     /**
      * Creates a new `SourceCode` object from the given information.
-     * @param {VFile} file The virtual file to create a `SourceCode` object from.
-     * @param {Object} parseResult The result returned from `parse()`.
+     * @param {File} file The virtual file to create a `SourceCode` object from.
+     * @param {OkParseResult} parseResult The result returned from `parse()`.
      * @param {Object} options Additional options passed from ESLint.
      * @param {LanguageOptions} options.languageOptions The language options.
      * @returns {SourceCode} The new `SourceCode` object.

package/lib/languages/js/source-code/source-code.js

@@ -29,6 +29,10 @@ const
 //------------------------------------------------------------------------------
 
 /** @typedef {import("eslint-scope").Variable} Variable */
+/** @typedef {import("eslint-scope").Scope} Scope */
+/** @typedef {import("@eslint/core").SourceCode} ISourceCode */
+/** @typedef {import("@eslint/core").Directive} IDirective */
+/** @typedef {import("@eslint/core").TraversalStep} ITraversalStep */
 
 //------------------------------------------------------------------------------
 // Private
@@ -373,6 +377,7 @@ class TraversalStep {
 
 /**
  * A class to represent a directive comment.
+ * @implements {IDirective}
  */
 class Directive {
 
@@ -429,12 +434,13 @@ const caches = Symbol("caches");
 
 /**
  * Represents parsed source code.
+ * @implements {ISourceCode}
  */
 class SourceCode extends TokenStore {
 
     /**
      * The cache of steps that were taken while traversing the source code.
-     * @type {Array<TraversalStep>}
+     * @type {Array<ITraversalStep>}
      */
     #steps;
 
@@ -838,7 +844,7 @@ class SourceCode extends TokenStore {
     /**
      * Gets the scope for the given node
      * @param {ASTNode} currentNode The node to get the scope of
-     * @returns {eslint-scope.Scope} The scope information for this node
+     * @returns {Scope} The scope information for this node
      * @throws {TypeError} If the `currentNode` argument is missing.
      */
     getScope(currentNode) {

package/lib/linter/apply-disable-directives.js

@@ -10,6 +10,9 @@
 //------------------------------------------------------------------------------
 
 /** @typedef {import("../shared/types").LintMessage} LintMessage */
+/** @typedef {import("@eslint/core").Language} Language */
+/** @typedef {import("@eslint/core").Position} Position */
+/** @typedef {import("@eslint/core").RulesConfig} RulesConfig */
 
 //------------------------------------------------------------------------------
 // Module Definition
@@ -24,8 +27,8 @@ const {
 
 /**
  * Compares the locations of two objects in a source file
- * @param {{line: number, column: number}} itemA The first object
- * @param {{line: number, column: number}} itemB The second object
+ * @param {Position} itemA The first object
+ * @param {Position} itemB The second object
  * @returns {number} A value less than 1 if itemA appears before itemB in the source file, greater than 1 if
  * itemA appears after itemB in the source file, or 0 if itemA and itemB have the same location.
  */
@@ -418,7 +421,7 @@ function applyDirectives(options) {
  * @param {{ruleId: (string|null), line: number, column: number}[]} options.problems
  * A list of problems reported by rules, sorted by increasing location in the file, with one-based columns.
  * @param {"off" | "warn" | "error"} options.reportUnusedDisableDirectives If `"warn"` or `"error"`, adds additional problems for unused directives
- * @param {Object} options.configuredRules The rules configuration.
+ * @param {RulesConfig} options.configuredRules The rules configuration.
  * @param {Function} options.ruleFilter A predicate function to filter which rules should be executed.
  * @param {boolean} options.disableFixes If true, it doesn't make `fix` properties.
  * @returns {{ruleId: (string|null), line: number, column: number, suppressions?: {kind: string, justification: string}}[]}

package/lib/linter/linter.js

@@ -72,6 +72,10 @@ const STEP_KIND_CALL = 2;
 /** @typedef {import("../shared/types").Processor} Processor */
 /** @typedef {import("../shared/types").Rule} Rule */
 /** @typedef {import("../shared/types").Times} Times */
+/** @typedef {import("@eslint/core").Language} Language */
+/** @typedef {import("@eslint/core").RuleSeverity} RuleSeverity */
+/** @typedef {import("@eslint/core").RuleConfig} RuleConfig */
+
 
 /* eslint-disable jsdoc/valid-types -- https://github.com/jsdoc-type-pratt-parser/jsdoc-type-pratt-parser/issues/4#issuecomment-778805577 */
 /**
@@ -276,7 +280,7 @@ function updateLocationInformation({ line, column, endLine, endColumn }, languag
  * @param {string} [options.ruleId] the ruleId to report
  * @param {Object} [options.loc] the loc to report
  * @param {string} [options.message] the error message to report
- * @param {string} [options.severity] the error message to report
+ * @param {RuleSeverity} [options.severity] the error message to report
  * @param {Language} [options.language] the language to use to adjust the location information
  * @returns {LintMessage} created problem, returns a missing-rule problem if only provided ruleId.
  * @private
@@ -877,7 +881,7 @@ function storeTime(time, timeOpts, slots) {
 
 /**
  * Get the options for a rule (not including severity), if any
- * @param {Array|number} ruleConfig rule configuration
+ * @param {RuleConfig} ruleConfig rule configuration
  * @returns {Array} of rule options, empty Array if none
  */
 function getRuleOptions(ruleConfig) {
@@ -941,7 +945,7 @@ function parse(file, language, languageOptions) {
             nodeType: null,
             fatal: true,
             severity: 2,
-            message: error.message,
+            message: `Parsing error: ${error.message}`,
             line: error.line,
             column: error.column
         }))

package/lib/linter/node-event-generator.js

@@ -334,10 +334,8 @@ class NodeEventGenerator {
      * @returns {void}
      */
     enterNode(node) {
-        if (node.parent) {
-            this.currentAncestry.unshift(node.parent);
-        }
         this.applySelectors(node, false);
+        this.currentAncestry.unshift(node);
     }
 
     /**
@@ -346,8 +344,8 @@ class NodeEventGenerator {
      * @returns {void}
      */
     leaveNode(node) {
-        this.applySelectors(node, true);
         this.currentAncestry.shift();
+        this.applySelectors(node, true);
     }
 }
 

package/lib/linter/vfile.js

@@ -5,6 +5,12 @@
 
 "use strict";
 
+//-----------------------------------------------------------------------------
+// Type Definitions
+//-----------------------------------------------------------------------------
+
+/** @typedef {import("@eslint/core").File} File */
+
 //------------------------------------------------------------------------------
 // Helpers
 //------------------------------------------------------------------------------
@@ -54,6 +60,7 @@ function stripUnicodeBOM(value) {
 
 /**
  * Represents a virtual file inside of ESLint.
+ * @implements {File}
  */
 class VFile {
 

package/lib/rules/no-restricted-imports.js

@@ -89,6 +89,9 @@ const arrayOfStringsOrObjectPatterns = {
                         minItems: 1,
                         uniqueItems: true
                     },
+                    regex: {
+                        type: "string"
+                    },
                     importNamePattern: {
                         type: "string"
                     },
@@ -104,7 +107,6 @@ const arrayOfStringsOrObjectPatterns = {
                     }
                 },
                 additionalProperties: false,
-                required: ["group"],
                 not: {
                     anyOf: [
                         { required: ["importNames", "allowImportNames"] },
@@ -113,7 +115,11 @@ const arrayOfStringsOrObjectPatterns = {
                         { required: ["importNamePattern", "allowImportNames"] },
                         { required: ["allowImportNames", "allowImportNamePattern"] }
                     ]
-                }
+                },
+                oneOf: [
+                    { required: ["group"] },
+                    { required: ["regex"] }
+                ]
             },
             uniqueItems: true
         }
@@ -235,9 +241,10 @@ module.exports = {
 
         // relative paths are supported for this rule
         const restrictedPatternGroups = restrictedPatterns.map(
-            ({ group, message, caseSensitive, importNames, importNamePattern, allowImportNames, allowImportNamePattern }) => (
+            ({ group, regex, message, caseSensitive, importNames, importNamePattern, allowImportNames, allowImportNamePattern }) => (
                 {
-                    matcher: ignore({ allowRelativePaths: true, ignorecase: !caseSensitive }).add(group),
+                    ...(group ? { matcher: ignore({ allowRelativePaths: true, ignorecase: !caseSensitive }).add(group) } : {}),
+                    ...(typeof regex === "string" ? { regexMatcher: new RegExp(regex, caseSensitive ? "u" : "iu") } : {}),
                     customMessage: message,
                     importNames,
                     importNamePattern,
@@ -493,7 +500,7 @@ module.exports = {
          * @private
          */
         function isRestrictedPattern(importSource, group) {
-            return group.matcher.ignores(importSource);
+            return group.regexMatcher ? group.regexMatcher.test(importSource) : group.matcher.ignores(importSource);
         }
 
         /**

package/lib/rules/no-unused-vars.js

@@ -340,7 +340,7 @@ module.exports = {
         /**
          * Determines if a variable has a sibling rest property
          * @param {Variable} variable eslint-scope variable object.
-         * @returns {boolean} True if the variable is exported, false if not.
+         * @returns {boolean} True if the variable has a sibling rest property, false if not.
          * @private
          */
         function hasRestSpreadSibling(variable) {

package/lib/rules/no-useless-backreference.js

@@ -72,11 +72,11 @@ module.exports = {
         schema: [],
 
         messages: {
-            nested: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}' from within that group.",
-            forward: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}' which appears later in the pattern.",
-            backward: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}' which appears before in the same lookbehind.",
-            disjunctive: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}' which is in another alternative.",
-            intoNegativeLookaround: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}' which is in a negative lookaround."
+            nested: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}'{{ otherGroups }} from within that group.",
+            forward: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}'{{ otherGroups }} which appears later in the pattern.",
+            backward: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}'{{ otherGroups }} which appears before in the same lookbehind.",
+            disjunctive: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}'{{ otherGroups }} which is in another alternative.",
+            intoNegativeLookaround: "Backreference '{{ bref }}' will be ignored. It references group '{{ group }}'{{ otherGroups }} which is in a negative lookaround."
         }
     },
 
@@ -104,16 +104,21 @@ module.exports = {
 
             visitRegExpAST(regExpAST, {
                 onBackreferenceEnter(bref) {
-                    const group = bref.resolved,
-                        brefPath = getPathToRoot(bref),
-                        groupPath = getPathToRoot(group);
-                    let messageId = null;
+                    const groups = [bref.resolved].flat(),
+                        brefPath = getPathToRoot(bref);
 
-                    if (brefPath.includes(group)) {
+                    const problems = groups.map(group => {
+                        const groupPath = getPathToRoot(group);
+
+                        if (brefPath.includes(group)) {
+
+                            // group is bref's ancestor => bref is nested ('nested reference') => group hasn't matched yet when bref starts to match.
+                            return {
+                                messageId: "nested",
+                                group
+                            };
+                        }
 
-                        // group is bref's ancestor => bref is nested ('nested reference') => group hasn't matched yet when bref starts to match.
-                        messageId = "nested";
-                    } else {
 
                         // Start from the root to find the lowest common ancestor.
                         let i = brefPath.length - 1,
@@ -130,35 +135,80 @@ module.exports = {
                             lowestCommonLookaround = commonPath.find(isLookaround),
                             isMatchingBackward = lowestCommonLookaround && lowestCommonLookaround.kind === "lookbehind";
 
+                        if (groupCut.at(-1).type === "Alternative") {
+
+                            // group's and bref's ancestor nodes below the lowest common ancestor are sibling alternatives => they're disjunctive.
+                            return {
+                                messageId: "disjunctive",
+                                group
+                            };
+                        }
                         if (!isMatchingBackward && bref.end <= group.start) {
 
                             // bref is left, group is right ('forward reference') => group hasn't matched yet when bref starts to match.
-                            messageId = "forward";
-                        } else if (isMatchingBackward && group.end <= bref.start) {
+                            return {
+                                messageId: "forward",
+                                group
+                            };
+                        }
+                        if (isMatchingBackward && group.end <= bref.start) {
 
                             // the opposite of the previous when the regex is matching backward in a lookbehind context.
-                            messageId = "backward";
-                        } else if (groupCut.at(-1).type === "Alternative") {
-
-                            // group's and bref's ancestor nodes below the lowest common ancestor are sibling alternatives => they're disjunctive.
-                            messageId = "disjunctive";
-                        } else if (groupCut.some(isNegativeLookaround)) {
+                            return {
+                                messageId: "backward",
+                                group
+                            };
+                        }
+                        if (groupCut.some(isNegativeLookaround)) {
 
                             // group is in a negative lookaround which isn't bref's ancestor => group has already failed when bref starts to match.
-                            messageId = "intoNegativeLookaround";
+                            return {
+                                messageId: "intoNegativeLookaround",
+                                group
+                            };
                         }
+
+                        return null;
+                    });
+
+                    if (problems.length === 0 || problems.some(problem => !problem)) {
+
+                        // If there are no problems or no problems with any group then do not report it.
+                        return;
                     }
 
-                    if (messageId) {
-                        context.report({
-                            node,
-                            messageId,
-                            data: {
-                                bref: bref.raw,
-                                group: group.raw
-                            }
-                        });
+                    let problemsToReport;
+
+                    // Gets problems that appear in the same disjunction.
+                    const problemsInSameDisjunction = problems.filter(problem => problem.messageId !== "disjunctive");
+
+                    if (problemsInSameDisjunction.length) {
+
+                        // Only report problems that appear in the same disjunction.
+                        problemsToReport = problemsInSameDisjunction;
+                    } else {
+
+                        // If all groups appear in different disjunctions, report it.
+                        problemsToReport = problems;
                     }
+
+                    const [{ messageId, group }, ...other] = problemsToReport;
+                    let otherGroups = "";
+
+                    if (other.length === 1) {
+                        otherGroups = " and another group";
+                    } else if (other.length > 1) {
+                        otherGroups = ` and other ${other.length} groups`;
+                    }
+                    context.report({
+                        node,
+                        messageId,
+                        data: {
+                            bref: bref.raw,
+                            group: group.raw,
+                            otherGroups
+                        }
+                    });
                 }
             });
         }

package/lib/rules/utils/regular-expressions.js

@@ -8,7 +8,7 @@
 
 const { RegExpValidator } = require("@eslint-community/regexpp");
 
-const REGEXPP_LATEST_ECMA_VERSION = 2024;
+const REGEXPP_LATEST_ECMA_VERSION = 2025;
 
 /**
  * Checks if the given regular expression pattern would be valid with the `u` flag.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -67,10 +67,10 @@
   "bugs": "https://github.com/eslint/eslint/issues/",
   "dependencies": {
     "@eslint-community/eslint-utils": "^4.2.0",
-    "@eslint-community/regexpp": "^4.6.1",
+    "@eslint-community/regexpp": "^4.11.0",
     "@eslint/config-array": "^0.17.0",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "9.6.0",
+    "@eslint/js": "9.7.0",
     "@humanwhocodes/module-importer": "^1.0.1",
     "@humanwhocodes/retry": "^0.3.0",
     "@nodelib/fs.walk": "^1.2.8",
@@ -79,7 +79,7 @@
     "cross-spawn": "^7.0.2",
     "debug": "^4.3.2",
     "escape-string-regexp": "^4.0.0",
-    "eslint-scope": "^8.0.1",
+    "eslint-scope": "^8.0.2",
     "eslint-visitor-keys": "^4.0.0",
     "espree": "^10.1.0",
     "esquery": "^1.5.0",
@@ -104,6 +104,7 @@
   "devDependencies": {
     "@babel/core": "^7.4.3",
     "@babel/preset-env": "^7.4.3",
+    "@eslint/core": "^0.1.0",
     "@types/estree": "^1.0.5",
     "@types/node": "^20.11.5",
     "@wdio/browser-runner": "^8.38.3",