eslint 9.2.0 → 9.4.0

package/lib/rules/no-loop-func.js

@@ -9,140 +9,16 @@
 // Helpers
 //------------------------------------------------------------------------------
 
-/**
- * Gets the containing loop node of a specified node.
- *
- * We don't need to check nested functions, so this ignores those.
- * `Scope.through` contains references of nested functions.
- * @param {ASTNode} node An AST node to get.
- * @returns {ASTNode|null} The containing loop node of the specified node, or
- *      `null`.
- */
-function getContainingLoopNode(node) {
-    for (let currentNode = node; currentNode.parent; currentNode = currentNode.parent) {
-        const parent = currentNode.parent;
-
-        switch (parent.type) {
-            case "WhileStatement":
-            case "DoWhileStatement":
-                return parent;
-
-            case "ForStatement":
-
-                // `init` is outside of the loop.
-                if (parent.init !== currentNode) {
-                    return parent;
-                }
-                break;
-
-            case "ForInStatement":
-            case "ForOfStatement":
-
-                // `right` is outside of the loop.
-                if (parent.right !== currentNode) {
-                    return parent;
-                }
-                break;
-
-            case "ArrowFunctionExpression":
-            case "FunctionExpression":
-            case "FunctionDeclaration":
-
-                // We don't need to check nested functions.
-                return null;
-
-            default:
-                break;
-        }
-    }
-
-    return null;
-}
 
 /**
- * Gets the containing loop node of a given node.
- * If the loop was nested, this returns the most outer loop.
- * @param {ASTNode} node A node to get. This is a loop node.
- * @param {ASTNode|null} excludedNode A node that the result node should not
- *      include.
- * @returns {ASTNode} The most outer loop node.
+ * Identifies is a node is a FunctionExpression which is part of an IIFE
+ * @param {ASTNode} node Node to test
+ * @returns {boolean} True if it's an IIFE
  */
-function getTopLoopNode(node, excludedNode) {
-    const border = excludedNode ? excludedNode.range[1] : 0;
-    let retv = node;
-    let containingLoopNode = node;
-
-    while (containingLoopNode && containingLoopNode.range[0] >= border) {
-        retv = containingLoopNode;
-        containingLoopNode = getContainingLoopNode(containingLoopNode);
-    }
-
-    return retv;
+function isIIFE(node) {
+    return (node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") && node.parent && node.parent.type === "CallExpression" && node.parent.callee === node;
 }
 
-/**
- * Checks whether a given reference which refers to an upper scope's variable is
- * safe or not.
- * @param {ASTNode} loopNode A containing loop node.
- * @param {eslint-scope.Reference} reference A reference to check.
- * @returns {boolean} `true` if the reference is safe or not.
- */
-function isSafe(loopNode, reference) {
-    const variable = reference.resolved;
-    const definition = variable && variable.defs[0];
-    const declaration = definition && definition.parent;
-    const kind = (declaration && declaration.type === "VariableDeclaration")
-        ? declaration.kind
-        : "";
-
-    // Variables which are declared by `const` is safe.
-    if (kind === "const") {
-        return true;
-    }
-
-    /*
-     * Variables which are declared by `let` in the loop is safe.
-     * It's a different instance from the next loop step's.
-     */
-    if (kind === "let" &&
-        declaration.range[0] > loopNode.range[0] &&
-        declaration.range[1] < loopNode.range[1]
-    ) {
-        return true;
-    }
-
-    /*
-     * WriteReferences which exist after this border are unsafe because those
-     * can modify the variable.
-     */
-    const border = getTopLoopNode(
-        loopNode,
-        (kind === "let") ? declaration : null
-    ).range[0];
-
-    /**
-     * Checks whether a given reference is safe or not.
-     * The reference is every reference of the upper scope's variable we are
-     * looking now.
-     *
-     * It's safe if the reference matches one of the following condition.
-     * - is readonly.
-     * - doesn't exist inside a local function and after the border.
-     * @param {eslint-scope.Reference} upperRef A reference to check.
-     * @returns {boolean} `true` if the reference is safe.
-     */
-    function isSafeReference(upperRef) {
-        const id = upperRef.identifier;
-
-        return (
-            !upperRef.isWrite() ||
-            variable.scope.variableScope === upperRef.from.variableScope &&
-            id.range[0] < border
-        );
-    }
-
-    return Boolean(variable) && variable.references.every(isSafeReference);
-}
 
 //------------------------------------------------------------------------------
 // Rule Definition
@@ -168,8 +44,147 @@ module.exports = {
 
     create(context) {
 
+        const SKIPPED_IIFE_NODES = new Set();
         const sourceCode = context.sourceCode;
 
+        /**
+         * Gets the containing loop node of a specified node.
+         *
+         * We don't need to check nested functions, so this ignores those, with the exception of IIFE.
+         * `Scope.through` contains references of nested functions.
+         * @param {ASTNode} node An AST node to get.
+         * @returns {ASTNode|null} The containing loop node of the specified node, or
+         *      `null`.
+         */
+        function getContainingLoopNode(node) {
+            for (let currentNode = node; currentNode.parent; currentNode = currentNode.parent) {
+                const parent = currentNode.parent;
+
+                switch (parent.type) {
+                    case "WhileStatement":
+                    case "DoWhileStatement":
+                        return parent;
+
+                    case "ForStatement":
+
+                        // `init` is outside of the loop.
+                        if (parent.init !== currentNode) {
+                            return parent;
+                        }
+                        break;
+
+                    case "ForInStatement":
+                    case "ForOfStatement":
+
+                        // `right` is outside of the loop.
+                        if (parent.right !== currentNode) {
+                            return parent;
+                        }
+                        break;
+
+                    case "ArrowFunctionExpression":
+                    case "FunctionExpression":
+                    case "FunctionDeclaration":
+
+                        // We need to check nested functions only in case of IIFE.
+                        if (SKIPPED_IIFE_NODES.has(parent)) {
+                            break;
+                        }
+
+                        return null;
+                    default:
+                        break;
+                }
+            }
+
+            return null;
+        }
+
+        /**
+         * Gets the containing loop node of a given node.
+         * If the loop was nested, this returns the most outer loop.
+         * @param {ASTNode} node A node to get. This is a loop node.
+         * @param {ASTNode|null} excludedNode A node that the result node should not
+         *      include.
+         * @returns {ASTNode} The most outer loop node.
+         */
+        function getTopLoopNode(node, excludedNode) {
+            const border = excludedNode ? excludedNode.range[1] : 0;
+            let retv = node;
+            let containingLoopNode = node;
+
+            while (containingLoopNode && containingLoopNode.range[0] >= border) {
+                retv = containingLoopNode;
+                containingLoopNode = getContainingLoopNode(containingLoopNode);
+            }
+
+            return retv;
+        }
+
+        /**
+         * Checks whether a given reference which refers to an upper scope's variable is
+         * safe or not.
+         * @param {ASTNode} loopNode A containing loop node.
+         * @param {eslint-scope.Reference} reference A reference to check.
+         * @returns {boolean} `true` if the reference is safe or not.
+         */
+        function isSafe(loopNode, reference) {
+            const variable = reference.resolved;
+            const definition = variable && variable.defs[0];
+            const declaration = definition && definition.parent;
+            const kind = (declaration && declaration.type === "VariableDeclaration")
+                ? declaration.kind
+                : "";
+
+            // Variables which are declared by `const` is safe.
+            if (kind === "const") {
+                return true;
+            }
+
+            /*
+             * Variables which are declared by `let` in the loop is safe.
+             * It's a different instance from the next loop step's.
+             */
+            if (kind === "let" &&
+                declaration.range[0] > loopNode.range[0] &&
+                declaration.range[1] < loopNode.range[1]
+            ) {
+                return true;
+            }
+
+            /*
+             * WriteReferences which exist after this border are unsafe because those
+             * can modify the variable.
+             */
+            const border = getTopLoopNode(
+                loopNode,
+                (kind === "let") ? declaration : null
+            ).range[0];
+
+            /**
+             * Checks whether a given reference is safe or not.
+             * The reference is every reference of the upper scope's variable we are
+             * looking now.
+             *
+             * It's safe if the reference matches one of the following condition.
+             * - is readonly.
+             * - doesn't exist inside a local function and after the border.
+             * @param {eslint-scope.Reference} upperRef A reference to check.
+             * @returns {boolean} `true` if the reference is safe.
+             */
+            function isSafeReference(upperRef) {
+                const id = upperRef.identifier;
+
+                return (
+                    !upperRef.isWrite() ||
+                    variable.scope.variableScope === upperRef.from.variableScope &&
+                    id.range[0] < border
+                );
+            }
+
+            return Boolean(variable) && variable.references.every(isSafeReference);
+        }
+
         /**
          * Reports functions which match the following condition:
          *
@@ -186,6 +201,23 @@ module.exports = {
             }
 
             const references = sourceCode.getScope(node).through;
+
+            // Check if the function is not asynchronous or a generator function
+            if (!(node.async || node.generator)) {
+                if (isIIFE(node)) {
+
+                    const isFunctionExpression = node.type === "FunctionExpression";
+
+                    // Check if the function is referenced elsewhere in the code
+                    const isFunctionReferenced = isFunctionExpression && node.id ? references.some(r => r.identifier.name === node.id.name) : false;
+
+                    if (!isFunctionReferenced) {
+                        SKIPPED_IIFE_NODES.add(node);
+                        return;
+                    }
+                }
+            }
+
             const unsafeRefs = references.filter(r => r.resolved && !isSafe(loopNode, r)).map(r => r.identifier.name);
 
             if (unsafeRefs.length > 0) {

package/lib/rules/no-misleading-character-class.js

@@ -85,12 +85,10 @@ function isUnicodeCodePointEscape(char) {
 const findCharacterSequences = {
     *surrogatePairWithoutUFlag(chars) {
         for (const [index, char] of chars.entries()) {
-            if (index === 0) {
-                continue;
-            }
             const previous = chars[index - 1];
 
             if (
+                previous && char &&
                 isSurrogatePair(previous.value, char.value) &&
                 !isUnicodeCodePointEscape(previous) &&
                 !isUnicodeCodePointEscape(char)
@@ -102,12 +100,10 @@ const findCharacterSequences = {
 
     *surrogatePair(chars) {
         for (const [index, char] of chars.entries()) {
-            if (index === 0) {
-                continue;
-            }
             const previous = chars[index - 1];
 
             if (
+                previous && char &&
                 isSurrogatePair(previous.value, char.value) &&
                 (
                     isUnicodeCodePointEscape(previous) ||
@@ -119,14 +115,17 @@ const findCharacterSequences = {
         }
     },
 
-    *combiningClass(chars) {
+    *combiningClass(chars, unfilteredChars) {
+
+        /*
+         * When `allowEscape` is `true`, a combined character should only be allowed if the combining mark appears as an escape sequence.
+         * This means that the base character should be considered even if it's escaped.
+         */
         for (const [index, char] of chars.entries()) {
-            if (index === 0) {
-                continue;
-            }
-            const previous = chars[index - 1];
+            const previous = unfilteredChars[index - 1];
 
             if (
+                previous && char &&
                 isCombiningCharacter(char.value) &&
                 !isCombiningCharacter(previous.value)
             ) {
@@ -137,12 +136,10 @@ const findCharacterSequences = {
 
     *emojiModifier(chars) {
         for (const [index, char] of chars.entries()) {
-            if (index === 0) {
-                continue;
-            }
             const previous = chars[index - 1];
 
             if (
+                previous && char &&
                 isEmojiModifier(char.value) &&
                 !isEmojiModifier(previous.value)
             ) {
@@ -153,12 +150,10 @@ const findCharacterSequences = {
 
     *regionalIndicatorSymbol(chars) {
         for (const [index, char] of chars.entries()) {
-            if (index === 0) {
-                continue;
-            }
             const previous = chars[index - 1];
 
             if (
+                previous && char &&
                 isRegionalIndicatorSymbol(char.value) &&
                 isRegionalIndicatorSymbol(previous.value)
             ) {
@@ -171,17 +166,18 @@ const findCharacterSequences = {
         let sequence = null;
 
         for (const [index, char] of chars.entries()) {
-            if (index === 0 || index === chars.length - 1) {
-                continue;
-            }
+            const previous = chars[index - 1];
+            const next = chars[index + 1];
+
             if (
+                previous && char && next &&
                 char.value === 0x200d &&
-                chars[index - 1].value !== 0x200d &&
-                chars[index + 1].value !== 0x200d
+                previous.value !== 0x200d &&
+                next.value !== 0x200d
             ) {
                 if (sequence) {
-                    if (sequence.at(-1) === chars[index - 1]) {
-                        sequence.push(char, chars[index + 1]); // append to the sequence
+                    if (sequence.at(-1) === previous) {
+                        sequence.push(char, next); // append to the sequence
                     } else {
                         yield sequence;
                         sequence = chars.slice(index - 1, index + 2);
@@ -227,6 +223,41 @@ function getStaticValueOrRegex(node, initialScope) {
     return staticValue;
 }
 
+/**
+ * Checks whether a specified regexpp character is represented as an acceptable escape sequence.
+ * This function requires the source text of the character to be known.
+ * @param {Character} char Character to check.
+ * @param {string} charSource Source text of the character to check.
+ * @returns {boolean} Whether the specified regexpp character is represented as an acceptable escape sequence.
+ */
+function checkForAcceptableEscape(char, charSource) {
+    if (!charSource.startsWith("\\")) {
+        return false;
+    }
+    const match = /(?<=^\\+).$/su.exec(charSource);
+
+    return match?.[0] !== String.fromCodePoint(char.value);
+}
+
+/**
+ * Checks whether a specified regexpp character is represented as an acceptable escape sequence.
+ * This function works with characters that are produced by a string or template literal.
+ * It requires the source text and the CodeUnit list of the literal to be known.
+ * @param {Character} char Character to check.
+ * @param {string} nodeSource Source text of the string or template literal that produces the character.
+ * @param {CodeUnit[]} codeUnits List of CodeUnit objects of the literal that produces the character.
+ * @returns {boolean} Whether the specified regexpp character is represented as an acceptable escape sequence.
+ */
+function checkForAcceptableEscapeInString(char, nodeSource, codeUnits) {
+    const firstIndex = char.start;
+    const lastIndex = char.end - 1;
+    const start = codeUnits[firstIndex].start;
+    const end = codeUnits[lastIndex].end;
+    const charSource = nodeSource.slice(start, end);
+
+    return checkForAcceptableEscape(char, charSource);
+}
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -244,7 +275,18 @@ module.exports = {
 
         hasSuggestions: true,
 
-        schema: [],
+        schema: [
+            {
+                type: "object",
+                properties: {
+                    allowEscape: {
+                        type: "boolean",
+                        default: false
+                    }
+                },
+                additionalProperties: false
+            }
+        ],
 
         messages: {
             surrogatePairWithoutUFlag: "Unexpected surrogate pair in character class. Use 'u' flag.",
@@ -257,6 +299,7 @@ module.exports = {
         }
     },
     create(context) {
+        const allowEscape = context.options[0]?.allowEscape;
         const sourceCode = context.sourceCode;
         const parser = new RegExpParser();
         const checkedPatternNodes = new Set();
@@ -288,24 +331,62 @@ module.exports = {
                 return;
             }
 
+            let codeUnits = null;
+
+            /**
+             * Checks whether a specified regexpp character is represented as an acceptable escape sequence.
+             * For the purposes of this rule, an escape sequence is considered acceptable if it consists of one or more backslashes followed by the character being escaped.
+             * @param {Character} char Character to check.
+             * @returns {boolean} Whether the specified regexpp character is represented as an acceptable escape sequence.
+             */
+            function isAcceptableEscapeSequence(char) {
+                if (node.type === "Literal" && node.regex) {
+                    return checkForAcceptableEscape(char, char.raw);
+                }
+                if (node.type === "Literal" && typeof node.value === "string") {
+                    const nodeSource = node.raw;
+
+                    codeUnits ??= parseStringLiteral(nodeSource);
+
+                    return checkForAcceptableEscapeInString(char, nodeSource, codeUnits);
+                }
+                if (astUtils.isStaticTemplateLiteral(node)) {
+                    const nodeSource = sourceCode.getText(node);
+
+                    codeUnits ??= parseTemplateToken(nodeSource);
+
+                    return checkForAcceptableEscapeInString(char, nodeSource, codeUnits);
+                }
+                return false;
+            }
+
             const foundKindMatches = new Map();
 
             visitRegExpAST(patternNode, {
                 onCharacterClassEnter(ccNode) {
-                    for (const chars of iterateCharacterSequence(ccNode.elements)) {
+                    for (const unfilteredChars of iterateCharacterSequence(ccNode.elements)) {
+                        let chars;
+
+                        if (allowEscape) {
+
+                            // Replace escape sequences with null to avoid having them flagged.
+                            chars = unfilteredChars.map(char => (isAcceptableEscapeSequence(char) ? null : char));
+                        } else {
+                            chars = unfilteredChars;
+                        }
                         for (const kind of kinds) {
+                            const matches = findCharacterSequences[kind](chars, unfilteredChars);
+
                             if (foundKindMatches.has(kind)) {
-                                foundKindMatches.get(kind).push(...findCharacterSequences[kind](chars));
+                                foundKindMatches.get(kind).push(...matches);
                             } else {
-                                foundKindMatches.set(kind, [...findCharacterSequences[kind](chars)]);
+                                foundKindMatches.set(kind, [...matches]);
                             }
                         }
                     }
                 }
             });
 
-            let codeUnits = null;
-
             /**
              * Finds the report loc(s) for a range of matches.
              * Only literals and expression-less templates generate granular errors.

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

@@ -37,7 +37,8 @@ module.exports = {
                                 type: "string"
                             },
                             uniqueItems: true
-                        }
+                        },
+                        restrictedNamedExportsPattern: { type: "string" }
                     },
                     additionalProperties: false
                 },
@@ -52,6 +53,7 @@ module.exports = {
                             },
                             uniqueItems: true
                         },
+                        restrictedNamedExportsPattern: { type: "string" },
                         restrictDefaultExports: {
                             type: "object",
                             properties: {
@@ -98,6 +100,7 @@ module.exports = {
     create(context) {
 
         const restrictedNames = new Set(context.options[0] && context.options[0].restrictedNamedExports);
+        const restrictedNamePattern = context.options[0] && context.options[0].restrictedNamedExportsPattern;
         const restrictDefaultExports = context.options[0] && context.options[0].restrictDefaultExports;
         const sourceCode = context.sourceCode;
 
@@ -109,7 +112,15 @@ module.exports = {
         function checkExportedName(node) {
             const name = astUtils.getModuleExportName(node);
 
-            if (restrictedNames.has(name)) {
+            let matchesRestrictedNamePattern = false;
+
+            if (restrictedNamePattern && name !== "default") {
+                const patternRegex = new RegExp(restrictedNamePattern, "u");
+
+                matchesRestrictedNamePattern = patternRegex.test(name);
+            }
+
+            if (matchesRestrictedNamePattern || restrictedNames.has(name)) {
                 context.report({
                     node,
                     messageId: "restrictedNamed",

package/lib/rules/object-shorthand.js

@@ -284,35 +284,22 @@ module.exports = {
             const arrowToken = sourceCode.getTokenBefore(node.value.body, astUtils.isArrowToken);
             const fnBody = sourceCode.text.slice(arrowToken.range[1], node.value.range[1]);
 
-            let shouldAddParensAroundParameters = false;
-            let tokenBeforeParams;
-
-            if (node.value.params.length === 0) {
-                tokenBeforeParams = sourceCode.getFirstToken(node.value, astUtils.isOpeningParenToken);
-            } else {
-                tokenBeforeParams = sourceCode.getTokenBefore(node.value.params[0]);
-            }
-
-            if (node.value.params.length === 1) {
-                const hasParen = astUtils.isOpeningParenToken(tokenBeforeParams);
-                const isTokenOutsideNode = tokenBeforeParams.range[0] < node.range[0];
-
-                shouldAddParensAroundParameters = !hasParen || isTokenOutsideNode;
-            }
+            // First token should not be `async`
+            const firstValueToken = sourceCode.getFirstToken(node.value, {
+                skip: node.value.async ? 1 : 0
+            });
 
-            const sliceStart = shouldAddParensAroundParameters
-                ? node.value.params[0].range[0]
-                : tokenBeforeParams.range[0];
+            const sliceStart = firstValueToken.range[0];
             const sliceEnd = sourceCode.getTokenBefore(arrowToken).range[1];
+            const shouldAddParens = node.value.params.length === 1 && node.value.params[0].range[0] === sliceStart;
 
             const oldParamText = sourceCode.text.slice(sliceStart, sliceEnd);
-            const newParamText = shouldAddParensAroundParameters ? `(${oldParamText})` : oldParamText;
+            const newParamText = shouldAddParens ? `(${oldParamText})` : oldParamText;
 
             return fixer.replaceTextRange(
                 fixRange,
                 methodPrefix + newParamText + fnBody
             );
-
         }
 
         /**
@@ -497,6 +484,13 @@ module.exports = {
                         node,
                         messageId: "expectedPropertyShorthand",
                         fix(fixer) {
+
+                            // x: /* */ x
+                            // x: (/* */ x)
+                            if (sourceCode.getCommentsInside(node).length > 0) {
+                                return null;
+                            }
+
                             return fixer.replaceText(node, node.value.name);
                         }
                     });
@@ -510,6 +504,13 @@ module.exports = {
                         node,
                         messageId: "expectedPropertyShorthand",
                         fix(fixer) {
+
+                            // "x": /* */ x
+                            // "x": (/* */ x)
+                            if (sourceCode.getCommentsInside(node).length > 0) {
+                                return null;
+                            }
+
                             return fixer.replaceText(node, node.value.name);
                         }
                     });

package/lib/shared/runtime-info.js

@@ -9,9 +9,9 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const path = require("path");
+const path = require("node:path");
 const spawn = require("cross-spawn");
-const os = require("os");
+const os = require("node:os");
 const log = require("../shared/logging");
 const packageJson = require("../../package.json");