eslint 9.22.0 → 9.24.0

package/lib/rules/prefer-exponentiation-operator.js

@@ -16,7 +16,10 @@ const { CALL, ReferenceTracker } = require("@eslint-community/eslint-utils");
 // Helpers
 //------------------------------------------------------------------------------
 
-const PRECEDENCE_OF_EXPONENTIATION_EXPR = astUtils.getPrecedence({ type: "BinaryExpression", operator: "**" });
+const PRECEDENCE_OF_EXPONENTIATION_EXPR = astUtils.getPrecedence({
+	type: "BinaryExpression",
+	operator: "**",
+});
 
 /**
  * Determines whether the given node needs parens if used as the base in an exponentiation binary expression.
@@ -24,15 +27,13 @@ const PRECEDENCE_OF_EXPONENTIATION_EXPR = astUtils.getPrecedence({ type: "Binary
  * @returns {boolean} `true` if the node needs to be parenthesised.
  */
 function doesBaseNeedParens(base) {
-    return (
-
-        // '**' is right-associative, parens are needed when Math.pow(a ** b, c) is converted to (a ** b) ** c
-        astUtils.getPrecedence(base) <= PRECEDENCE_OF_EXPONENTIATION_EXPR ||
-
-        // An unary operator cannot be used immediately before an exponentiation expression
-        base.type === "AwaitExpression" ||
-        base.type === "UnaryExpression"
-    );
+	return (
+		// '**' is right-associative, parens are needed when Math.pow(a ** b, c) is converted to (a ** b) ** c
+		astUtils.getPrecedence(base) <= PRECEDENCE_OF_EXPONENTIATION_EXPR ||
+		// An unary operator cannot be used immediately before an exponentiation expression
+		base.type === "AwaitExpression" ||
+		base.type === "UnaryExpression"
+	);
 }
 
 /**
@@ -41,9 +42,8 @@ function doesBaseNeedParens(base) {
  * @returns {boolean} `true` if the node needs to be parenthesised.
  */
 function doesExponentNeedParens(exponent) {
-
-    // '**' is right-associative, there is no need for parens when Math.pow(a, b ** c) is converted to a ** b ** c
-    return astUtils.getPrecedence(exponent) < PRECEDENCE_OF_EXPONENTIATION_EXPR;
+	// '**' is right-associative, there is no need for parens when Math.pow(a, b ** c) is converted to a ** b ** c
+	return astUtils.getPrecedence(exponent) < PRECEDENCE_OF_EXPONENTIATION_EXPR;
 }
 
 /**
@@ -53,22 +53,35 @@ function doesExponentNeedParens(exponent) {
  * @returns {boolean} `true` if the expression needs to be parenthesised.
  */
 function doesExponentiationExpressionNeedParens(node, sourceCode) {
-    const parent = node.parent.type === "ChainExpression" ? node.parent.parent : node.parent;
-
-    const parentPrecedence = astUtils.getPrecedence(parent);
-    const needsParens = (
-        parent.type === "ClassDeclaration" ||
-        (
-            parent.type.endsWith("Expression") &&
-            (parentPrecedence === -1 || parentPrecedence >= PRECEDENCE_OF_EXPONENTIATION_EXPR) &&
-            !(parent.type === "BinaryExpression" && parent.operator === "**" && parent.right === node) &&
-            !((parent.type === "CallExpression" || parent.type === "NewExpression") && parent.arguments.includes(node)) &&
-            !(parent.type === "MemberExpression" && parent.computed && parent.property === node) &&
-            !(parent.type === "ArrayExpression")
-        )
-    );
-
-    return needsParens && !astUtils.isParenthesised(sourceCode, node);
+	const parent =
+		node.parent.type === "ChainExpression"
+			? node.parent.parent
+			: node.parent;
+
+	const parentPrecedence = astUtils.getPrecedence(parent);
+	const needsParens =
+		parent.type === "ClassDeclaration" ||
+		(parent.type.endsWith("Expression") &&
+			(parentPrecedence === -1 ||
+				parentPrecedence >= PRECEDENCE_OF_EXPONENTIATION_EXPR) &&
+			!(
+				parent.type === "BinaryExpression" &&
+				parent.operator === "**" &&
+				parent.right === node
+			) &&
+			!(
+				(parent.type === "CallExpression" ||
+					parent.type === "NewExpression") &&
+				parent.arguments.includes(node)
+			) &&
+			!(
+				parent.type === "MemberExpression" &&
+				parent.computed &&
+				parent.property === node
+			) &&
+			!(parent.type === "ArrayExpression"));
+
+	return needsParens && !astUtils.isParenthesised(sourceCode, node);
 }
 
 /**
@@ -78,115 +91,145 @@ function doesExponentiationExpressionNeedParens(node, sourceCode) {
  * @returns {string} parenthesised or unchanged text.
  */
 function parenthesizeIfShould(text, shouldParenthesize) {
-    return shouldParenthesize ? `(${text})` : text;
+	return shouldParenthesize ? `(${text})` : text;
 }
 
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
-/** @type {import('../shared/types').Rule} */
+/** @type {import('../types').Rule.RuleModule} */
 module.exports = {
-    meta: {
-        type: "suggestion",
-
-        docs: {
-            description: "Disallow the use of `Math.pow` in favor of the `**` operator",
-            recommended: false,
-            frozen: true,
-            url: "https://eslint.org/docs/latest/rules/prefer-exponentiation-operator"
-        },
-
-        schema: [],
-        fixable: "code",
-
-        messages: {
-            useExponentiation: "Use the '**' operator instead of 'Math.pow'."
-        }
-    },
-
-    create(context) {
-        const sourceCode = context.sourceCode;
-
-        /**
-         * Reports the given node.
-         * @param {ASTNode} node 'Math.pow()' node to report.
-         * @returns {void}
-         */
-        function report(node) {
-            context.report({
-                node,
-                messageId: "useExponentiation",
-                fix(fixer) {
-                    if (
-                        node.arguments.length !== 2 ||
-                        node.arguments.some(arg => arg.type === "SpreadElement") ||
-                        sourceCode.getCommentsInside(node).length > 0
-                    ) {
-                        return null;
-                    }
-
-                    const base = node.arguments[0],
-                        exponent = node.arguments[1],
-                        baseText = sourceCode.getText(base),
-                        exponentText = sourceCode.getText(exponent),
-                        shouldParenthesizeBase = doesBaseNeedParens(base),
-                        shouldParenthesizeExponent = doesExponentNeedParens(exponent),
-                        shouldParenthesizeAll = doesExponentiationExpressionNeedParens(node, sourceCode);
-
-                    let prefix = "",
-                        suffix = "";
-
-                    if (!shouldParenthesizeAll) {
-                        if (!shouldParenthesizeBase) {
-                            const firstReplacementToken = sourceCode.getFirstToken(base),
-                                tokenBefore = sourceCode.getTokenBefore(node);
-
-                            if (
-                                tokenBefore &&
-                                tokenBefore.range[1] === node.range[0] &&
-                                !astUtils.canTokensBeAdjacent(tokenBefore, firstReplacementToken)
-                            ) {
-                                prefix = " "; // a+Math.pow(++b, c) -> a+ ++b**c
-                            }
-                        }
-                        if (!shouldParenthesizeExponent) {
-                            const lastReplacementToken = sourceCode.getLastToken(exponent),
-                                tokenAfter = sourceCode.getTokenAfter(node);
-
-                            if (
-                                tokenAfter &&
-                                node.range[1] === tokenAfter.range[0] &&
-                                !astUtils.canTokensBeAdjacent(lastReplacementToken, tokenAfter)
-                            ) {
-                                suffix = " "; // Math.pow(a, b)in c -> a**b in c
-                            }
-                        }
-                    }
-
-                    const baseReplacement = parenthesizeIfShould(baseText, shouldParenthesizeBase),
-                        exponentReplacement = parenthesizeIfShould(exponentText, shouldParenthesizeExponent),
-                        replacement = parenthesizeIfShould(`${baseReplacement}**${exponentReplacement}`, shouldParenthesizeAll);
-
-                    return fixer.replaceText(node, `${prefix}${replacement}${suffix}`);
-                }
-            });
-        }
-
-        return {
-            Program(node) {
-                const scope = sourceCode.getScope(node);
-                const tracker = new ReferenceTracker(scope);
-                const trackMap = {
-                    Math: {
-                        pow: { [CALL]: true }
-                    }
-                };
-
-                for (const { node: refNode } of tracker.iterateGlobalReferences(trackMap)) {
-                    report(refNode);
-                }
-            }
-        };
-    }
+	meta: {
+		type: "suggestion",
+
+		docs: {
+			description:
+				"Disallow the use of `Math.pow` in favor of the `**` operator",
+			recommended: false,
+			frozen: true,
+			url: "https://eslint.org/docs/latest/rules/prefer-exponentiation-operator",
+		},
+
+		schema: [],
+		fixable: "code",
+
+		messages: {
+			useExponentiation: "Use the '**' operator instead of 'Math.pow'.",
+		},
+	},
+
+	create(context) {
+		const sourceCode = context.sourceCode;
+
+		/**
+		 * Reports the given node.
+		 * @param {ASTNode} node 'Math.pow()' node to report.
+		 * @returns {void}
+		 */
+		function report(node) {
+			context.report({
+				node,
+				messageId: "useExponentiation",
+				fix(fixer) {
+					if (
+						node.arguments.length !== 2 ||
+						node.arguments.some(
+							arg => arg.type === "SpreadElement",
+						) ||
+						sourceCode.getCommentsInside(node).length > 0
+					) {
+						return null;
+					}
+
+					const base = node.arguments[0],
+						exponent = node.arguments[1],
+						baseText = sourceCode.getText(base),
+						exponentText = sourceCode.getText(exponent),
+						shouldParenthesizeBase = doesBaseNeedParens(base),
+						shouldParenthesizeExponent =
+							doesExponentNeedParens(exponent),
+						shouldParenthesizeAll =
+							doesExponentiationExpressionNeedParens(
+								node,
+								sourceCode,
+							);
+
+					let prefix = "",
+						suffix = "";
+
+					if (!shouldParenthesizeAll) {
+						if (!shouldParenthesizeBase) {
+							const firstReplacementToken =
+									sourceCode.getFirstToken(base),
+								tokenBefore = sourceCode.getTokenBefore(node);
+
+							if (
+								tokenBefore &&
+								tokenBefore.range[1] === node.range[0] &&
+								!astUtils.canTokensBeAdjacent(
+									tokenBefore,
+									firstReplacementToken,
+								)
+							) {
+								prefix = " "; // a+Math.pow(++b, c) -> a+ ++b**c
+							}
+						}
+						if (!shouldParenthesizeExponent) {
+							const lastReplacementToken =
+									sourceCode.getLastToken(exponent),
+								tokenAfter = sourceCode.getTokenAfter(node);
+
+							if (
+								tokenAfter &&
+								node.range[1] === tokenAfter.range[0] &&
+								!astUtils.canTokensBeAdjacent(
+									lastReplacementToken,
+									tokenAfter,
+								)
+							) {
+								suffix = " "; // Math.pow(a, b)in c -> a**b in c
+							}
+						}
+					}
+
+					const baseReplacement = parenthesizeIfShould(
+							baseText,
+							shouldParenthesizeBase,
+						),
+						exponentReplacement = parenthesizeIfShould(
+							exponentText,
+							shouldParenthesizeExponent,
+						),
+						replacement = parenthesizeIfShould(
+							`${baseReplacement}**${exponentReplacement}`,
+							shouldParenthesizeAll,
+						);
+
+					return fixer.replaceText(
+						node,
+						`${prefix}${replacement}${suffix}`,
+					);
+				},
+			});
+		}
+
+		return {
+			Program(node) {
+				const scope = sourceCode.getScope(node);
+				const tracker = new ReferenceTracker(scope);
+				const trackMap = {
+					Math: {
+						pow: { [CALL]: true },
+					},
+				};
+
+				for (const { node: refNode } of tracker.iterateGlobalReferences(
+					trackMap,
+				)) {
+					report(refNode);
+				}
+			},
+		};
+	},
 };

package/lib/rules/prefer-named-capture-group.js

@@ -10,10 +10,10 @@
 //------------------------------------------------------------------------------
 
 const {
-    CALL,
-    CONSTRUCT,
-    ReferenceTracker,
-    getStringIfConstant
+	CALL,
+	CONSTRUCT,
+	ReferenceTracker,
+	getStringIfConstant,
 } = require("@eslint-community/eslint-utils");
 const regexpp = require("@eslint-community/regexpp");
 
@@ -32,147 +32,160 @@ const parser = new regexpp.RegExpParser();
  * @returns {Array<SuggestionResult>} Fixer suggestions for the regex, if statically determinable.
  */
 function suggestIfPossible(groupStart, pattern, rawText, regexNode) {
-    switch (regexNode.type) {
-        case "Literal":
-            if (typeof regexNode.value === "string" && rawText.includes("\\")) {
-                return null;
-            }
-            break;
-        case "TemplateLiteral":
-            if (regexNode.expressions.length || rawText.slice(1, -1) !== pattern) {
-                return null;
-            }
-            break;
-        default:
-            return null;
-    }
-
-    const start = regexNode.range[0] + groupStart + 2;
-
-    return [
-        {
-            fix(fixer) {
-                const existingTemps = pattern.match(/temp\d+/gu) || [];
-                const highestTempCount = existingTemps.reduce(
-                    (previous, next) =>
-                        Math.max(previous, Number(next.slice("temp".length))),
-                    0
-                );
-
-                return fixer.insertTextBeforeRange(
-                    [start, start],
-                    `?<temp${highestTempCount + 1}>`
-                );
-            },
-            messageId: "addGroupName"
-        },
-        {
-            fix(fixer) {
-                return fixer.insertTextBeforeRange(
-                    [start, start],
-                    "?:"
-                );
-            },
-            messageId: "addNonCapture"
-        }
-    ];
+	switch (regexNode.type) {
+		case "Literal":
+			if (typeof regexNode.value === "string" && rawText.includes("\\")) {
+				return null;
+			}
+			break;
+		case "TemplateLiteral":
+			if (
+				regexNode.expressions.length ||
+				rawText.slice(1, -1) !== pattern
+			) {
+				return null;
+			}
+			break;
+		default:
+			return null;
+	}
+
+	const start = regexNode.range[0] + groupStart + 2;
+
+	return [
+		{
+			fix(fixer) {
+				const existingTemps = pattern.match(/temp\d+/gu) || [];
+				const highestTempCount = existingTemps.reduce(
+					(previous, next) =>
+						Math.max(previous, Number(next.slice("temp".length))),
+					0,
+				);
+
+				return fixer.insertTextBeforeRange(
+					[start, start],
+					`?<temp${highestTempCount + 1}>`,
+				);
+			},
+			messageId: "addGroupName",
+		},
+		{
+			fix(fixer) {
+				return fixer.insertTextBeforeRange([start, start], "?:");
+			},
+			messageId: "addNonCapture",
+		},
+	];
 }
 
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
-/** @type {import('../shared/types').Rule} */
+/** @type {import('../types').Rule.RuleModule} */
 module.exports = {
-    meta: {
-        type: "suggestion",
-
-        docs: {
-            description: "Enforce using named capture group in regular expression",
-            recommended: false,
-            url: "https://eslint.org/docs/latest/rules/prefer-named-capture-group"
-        },
-
-        hasSuggestions: true,
-
-        schema: [],
-
-        messages: {
-            addGroupName: "Add name to capture group.",
-            addNonCapture: "Convert group to non-capturing.",
-            required: "Capture group '{{group}}' should be converted to a named or non-capturing group."
-        }
-    },
-
-    create(context) {
-        const sourceCode = context.sourceCode;
-
-        /**
-         * Function to check regular expression.
-         * @param {string} pattern The regular expression pattern to be checked.
-         * @param {ASTNode} node AST node which contains the regular expression or a call/new expression.
-         * @param {ASTNode} regexNode AST node which contains the regular expression.
-         * @param {string|null} flags The regular expression flags to be checked.
-         * @returns {void}
-         */
-        function checkRegex(pattern, node, regexNode, flags) {
-            let ast;
-
-            try {
-                ast = parser.parsePattern(pattern, 0, pattern.length, {
-                    unicode: Boolean(flags && flags.includes("u")),
-                    unicodeSets: Boolean(flags && flags.includes("v"))
-                });
-            } catch {
-
-                // ignore regex syntax errors
-                return;
-            }
-
-            regexpp.visitRegExpAST(ast, {
-                onCapturingGroupEnter(group) {
-                    if (!group.name) {
-                        const rawText = sourceCode.getText(regexNode);
-                        const suggest = suggestIfPossible(group.start, pattern, rawText, regexNode);
-
-                        context.report({
-                            node,
-                            messageId: "required",
-                            data: {
-                                group: group.raw
-                            },
-                            suggest
-                        });
-                    }
-                }
-            });
-        }
-
-        return {
-            Literal(node) {
-                if (node.regex) {
-                    checkRegex(node.regex.pattern, node, node, node.regex.flags);
-                }
-            },
-            Program(node) {
-                const scope = sourceCode.getScope(node);
-                const tracker = new ReferenceTracker(scope);
-                const traceMap = {
-                    RegExp: {
-                        [CALL]: true,
-                        [CONSTRUCT]: true
-                    }
-                };
-
-                for (const { node: refNode } of tracker.iterateGlobalReferences(traceMap)) {
-                    const regex = getStringIfConstant(refNode.arguments[0]);
-                    const flags = getStringIfConstant(refNode.arguments[1]);
-
-                    if (regex) {
-                        checkRegex(regex, refNode, refNode.arguments[0], flags);
-                    }
-                }
-            }
-        };
-    }
+	meta: {
+		type: "suggestion",
+
+		docs: {
+			description:
+				"Enforce using named capture group in regular expression",
+			recommended: false,
+			url: "https://eslint.org/docs/latest/rules/prefer-named-capture-group",
+		},
+
+		hasSuggestions: true,
+
+		schema: [],
+
+		messages: {
+			addGroupName: "Add name to capture group.",
+			addNonCapture: "Convert group to non-capturing.",
+			required:
+				"Capture group '{{group}}' should be converted to a named or non-capturing group.",
+		},
+	},
+
+	create(context) {
+		const sourceCode = context.sourceCode;
+
+		/**
+		 * Function to check regular expression.
+		 * @param {string} pattern The regular expression pattern to be checked.
+		 * @param {ASTNode} node AST node which contains the regular expression or a call/new expression.
+		 * @param {ASTNode} regexNode AST node which contains the regular expression.
+		 * @param {string|null} flags The regular expression flags to be checked.
+		 * @returns {void}
+		 */
+		function checkRegex(pattern, node, regexNode, flags) {
+			let ast;
+
+			try {
+				ast = parser.parsePattern(pattern, 0, pattern.length, {
+					unicode: Boolean(flags && flags.includes("u")),
+					unicodeSets: Boolean(flags && flags.includes("v")),
+				});
+			} catch {
+				// ignore regex syntax errors
+				return;
+			}
+
+			regexpp.visitRegExpAST(ast, {
+				onCapturingGroupEnter(group) {
+					if (!group.name) {
+						const rawText = sourceCode.getText(regexNode);
+						const suggest = suggestIfPossible(
+							group.start,
+							pattern,
+							rawText,
+							regexNode,
+						);
+
+						context.report({
+							node,
+							messageId: "required",
+							data: {
+								group: group.raw,
+							},
+							suggest,
+						});
+					}
+				},
+			});
+		}
+
+		return {
+			Literal(node) {
+				if (node.regex) {
+					checkRegex(
+						node.regex.pattern,
+						node,
+						node,
+						node.regex.flags,
+					);
+				}
+			},
+			Program(node) {
+				const scope = sourceCode.getScope(node);
+				const tracker = new ReferenceTracker(scope);
+				const traceMap = {
+					RegExp: {
+						[CALL]: true,
+						[CONSTRUCT]: true,
+					},
+				};
+
+				for (const { node: refNode } of tracker.iterateGlobalReferences(
+					traceMap,
+				)) {
+					const regex = getStringIfConstant(refNode.arguments[0]);
+					const flags = getStringIfConstant(refNode.arguments[1]);
+
+					if (regex) {
+						checkRegex(regex, refNode, refNode.arguments[0], flags);
+					}
+				}
+			},
+		};
+	},
 };