eslint 9.21.0 → 9.23.0

package/lib/rules/no-unsafe-finally.js

@@ -9,10 +9,12 @@
 // Helpers
 //------------------------------------------------------------------------------
 
-const SENTINEL_NODE_TYPE_RETURN_THROW = /^(?:Program|(?:Function|Class)(?:Declaration|Expression)|ArrowFunctionExpression)$/u;
-const SENTINEL_NODE_TYPE_BREAK = /^(?:Program|(?:Function|Class)(?:Declaration|Expression)|ArrowFunctionExpression|DoWhileStatement|WhileStatement|ForOfStatement|ForInStatement|ForStatement|SwitchStatement)$/u;
-const SENTINEL_NODE_TYPE_CONTINUE = /^(?:Program|(?:Function|Class)(?:Declaration|Expression)|ArrowFunctionExpression|DoWhileStatement|WhileStatement|ForOfStatement|ForInStatement|ForStatement)$/u;
-
+const SENTINEL_NODE_TYPE_RETURN_THROW =
+	/^(?:Program|(?:Function|Class)(?:Declaration|Expression)|ArrowFunctionExpression)$/u;
+const SENTINEL_NODE_TYPE_BREAK =
+	/^(?:Program|(?:Function|Class)(?:Declaration|Expression)|ArrowFunctionExpression|DoWhileStatement|WhileStatement|ForOfStatement|ForInStatement|ForStatement|SwitchStatement)$/u;
+const SENTINEL_NODE_TYPE_CONTINUE =
+	/^(?:Program|(?:Function|Class)(?:Declaration|Expression)|ArrowFunctionExpression|DoWhileStatement|WhileStatement|ForOfStatement|ForInStatement|ForStatement)$/u;
 
 //------------------------------------------------------------------------------
 // Rule Definition
@@ -20,92 +22,98 @@ const SENTINEL_NODE_TYPE_CONTINUE = /^(?:Program|(?:Function|Class)(?:Declaratio
 
 /** @type {import('../shared/types').Rule} */
 module.exports = {
-    meta: {
-        type: "problem",
-
-        docs: {
-            description: "Disallow control flow statements in `finally` blocks",
-            recommended: true,
-            url: "https://eslint.org/docs/latest/rules/no-unsafe-finally"
-        },
+	meta: {
+		type: "problem",
 
-        schema: [],
+		docs: {
+			description: "Disallow control flow statements in `finally` blocks",
+			recommended: true,
+			url: "https://eslint.org/docs/latest/rules/no-unsafe-finally",
+		},
 
-        messages: {
-            unsafeUsage: "Unsafe usage of {{nodeType}}."
-        }
-    },
-    create(context) {
+		schema: [],
 
-        /**
-         * Checks if the node is the finalizer of a TryStatement
-         * @param {ASTNode} node node to check.
-         * @returns {boolean} - true if the node is the finalizer of a TryStatement
-         */
-        function isFinallyBlock(node) {
-            return node.parent.type === "TryStatement" && node.parent.finalizer === node;
-        }
+		messages: {
+			unsafeUsage: "Unsafe usage of {{nodeType}}.",
+		},
+	},
+	create(context) {
+		/**
+		 * Checks if the node is the finalizer of a TryStatement
+		 * @param {ASTNode} node node to check.
+		 * @returns {boolean} - true if the node is the finalizer of a TryStatement
+		 */
+		function isFinallyBlock(node) {
+			return (
+				node.parent.type === "TryStatement" &&
+				node.parent.finalizer === node
+			);
+		}
 
-        /**
-         * Climbs up the tree if the node is not a sentinel node
-         * @param {ASTNode} node node to check.
-         * @param {string} label label of the break or continue statement
-         * @returns {boolean} - return whether the node is a finally block or a sentinel node
-         */
-        function isInFinallyBlock(node, label) {
-            let labelInside = false;
-            let sentinelNodeType;
+		/**
+		 * Climbs up the tree if the node is not a sentinel node
+		 * @param {ASTNode} node node to check.
+		 * @param {string} label label of the break or continue statement
+		 * @returns {boolean} - return whether the node is a finally block or a sentinel node
+		 */
+		function isInFinallyBlock(node, label) {
+			let labelInside = false;
+			let sentinelNodeType;
 
-            if (node.type === "BreakStatement" && !node.label) {
-                sentinelNodeType = SENTINEL_NODE_TYPE_BREAK;
-            } else if (node.type === "ContinueStatement") {
-                sentinelNodeType = SENTINEL_NODE_TYPE_CONTINUE;
-            } else {
-                sentinelNodeType = SENTINEL_NODE_TYPE_RETURN_THROW;
-            }
+			if (node.type === "BreakStatement" && !node.label) {
+				sentinelNodeType = SENTINEL_NODE_TYPE_BREAK;
+			} else if (node.type === "ContinueStatement") {
+				sentinelNodeType = SENTINEL_NODE_TYPE_CONTINUE;
+			} else {
+				sentinelNodeType = SENTINEL_NODE_TYPE_RETURN_THROW;
+			}
 
-            for (
-                let currentNode = node;
-                currentNode && !sentinelNodeType.test(currentNode.type);
-                currentNode = currentNode.parent
-            ) {
-                if (currentNode.parent.label && label && (currentNode.parent.label.name === label.name)) {
-                    labelInside = true;
-                }
-                if (isFinallyBlock(currentNode)) {
-                    if (label && labelInside) {
-                        return false;
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
+			for (
+				let currentNode = node;
+				currentNode && !sentinelNodeType.test(currentNode.type);
+				currentNode = currentNode.parent
+			) {
+				if (
+					currentNode.parent.label &&
+					label &&
+					currentNode.parent.label.name === label.name
+				) {
+					labelInside = true;
+				}
+				if (isFinallyBlock(currentNode)) {
+					if (label && labelInside) {
+						return false;
+					}
+					return true;
+				}
+			}
+			return false;
+		}
 
-        /**
-         * Checks whether the possibly-unsafe statement is inside a finally block.
-         * @param {ASTNode} node node to check.
-         * @returns {void}
-         */
-        function check(node) {
-            if (isInFinallyBlock(node, node.label)) {
-                context.report({
-                    messageId: "unsafeUsage",
-                    data: {
-                        nodeType: node.type
-                    },
-                    node,
-                    line: node.loc.line,
-                    column: node.loc.column
-                });
-            }
-        }
+		/**
+		 * Checks whether the possibly-unsafe statement is inside a finally block.
+		 * @param {ASTNode} node node to check.
+		 * @returns {void}
+		 */
+		function check(node) {
+			if (isInFinallyBlock(node, node.label)) {
+				context.report({
+					messageId: "unsafeUsage",
+					data: {
+						nodeType: node.type,
+					},
+					node,
+					line: node.loc.line,
+					column: node.loc.column,
+				});
+			}
+		}
 
-        return {
-            ReturnStatement: check,
-            ThrowStatement: check,
-            BreakStatement: check,
-            ContinueStatement: check
-        };
-    }
+		return {
+			ReturnStatement: check,
+			ThrowStatement: check,
+			BreakStatement: check,
+			ContinueStatement: check,
+		};
+	},
 };

package/lib/rules/no-unsafe-negation.js

@@ -21,7 +21,7 @@ const astUtils = require("./utils/ast-utils");
  * @returns {boolean} `true` if the operator is `in` or `instanceof`
  */
 function isInOrInstanceOfOperator(op) {
-    return op === "in" || op === "instanceof";
+	return op === "in" || op === "instanceof";
 }
 
 /**
@@ -30,7 +30,7 @@ function isInOrInstanceOfOperator(op) {
  * @returns {boolean} `true` if the operator is an ordering relational operator.
  */
 function isOrderingRelationalOperator(op) {
-    return op === "<" || op === ">" || op === ">=" || op === "<=";
+	return op === "<" || op === ">" || op === ">=" || op === "<=";
 }
 
 /**
@@ -39,7 +39,7 @@ function isOrderingRelationalOperator(op) {
  * @returns {boolean} `true` if the node is a logical negation expression.
  */
 function isNegation(node) {
-    return node.type === "UnaryExpression" && node.operator === "!";
+	return node.type === "UnaryExpression" && node.operator === "!";
 }
 
 //------------------------------------------------------------------------------
@@ -48,83 +48,105 @@ function isNegation(node) {
 
 /** @type {import('../shared/types').Rule} */
 module.exports = {
-    meta: {
-        type: "problem",
-
-        defaultOptions: [{
-            enforceForOrderingRelations: false
-        }],
-
-        docs: {
-            description: "Disallow negating the left operand of relational operators",
-            recommended: true,
-            url: "https://eslint.org/docs/latest/rules/no-unsafe-negation"
-        },
-
-        hasSuggestions: true,
-
-        schema: [
-            {
-                type: "object",
-                properties: {
-                    enforceForOrderingRelations: {
-                        type: "boolean"
-                    }
-                },
-                additionalProperties: false
-            }
-        ],
-
-        fixable: null,
-
-        messages: {
-            unexpected: "Unexpected negating the left operand of '{{operator}}' operator.",
-            suggestNegatedExpression: "Negate '{{operator}}' expression instead of its left operand. This changes the current behavior.",
-            suggestParenthesisedNegation: "Wrap negation in '()' to make the intention explicit. This preserves the current behavior."
-        }
-    },
-
-    create(context) {
-        const sourceCode = context.sourceCode;
-        const [{ enforceForOrderingRelations }] = context.options;
-
-        return {
-            BinaryExpression(node) {
-                const operator = node.operator;
-                const orderingRelationRuleApplies = enforceForOrderingRelations && isOrderingRelationalOperator(operator);
-
-                if (
-                    (isInOrInstanceOfOperator(operator) || orderingRelationRuleApplies) &&
-                    isNegation(node.left) &&
-                    !astUtils.isParenthesised(sourceCode, node.left)
-                ) {
-                    context.report({
-                        node,
-                        loc: node.left.loc,
-                        messageId: "unexpected",
-                        data: { operator },
-                        suggest: [
-                            {
-                                messageId: "suggestNegatedExpression",
-                                data: { operator },
-                                fix(fixer) {
-                                    const negationToken = sourceCode.getFirstToken(node.left);
-                                    const fixRange = [negationToken.range[1], node.range[1]];
-                                    const text = sourceCode.text.slice(fixRange[0], fixRange[1]);
-
-                                    return fixer.replaceTextRange(fixRange, `(${text})`);
-                                }
-                            },
-                            {
-                                messageId: "suggestParenthesisedNegation",
-                                fix(fixer) {
-                                    return fixer.replaceText(node.left, `(${sourceCode.getText(node.left)})`);
-                                }
-                            }
-                        ]
-                    });
-                }
-            }
-        };
-    }
+	meta: {
+		type: "problem",
+
+		defaultOptions: [
+			{
+				enforceForOrderingRelations: false,
+			},
+		],
+
+		docs: {
+			description:
+				"Disallow negating the left operand of relational operators",
+			recommended: true,
+			url: "https://eslint.org/docs/latest/rules/no-unsafe-negation",
+		},
+
+		hasSuggestions: true,
+
+		schema: [
+			{
+				type: "object",
+				properties: {
+					enforceForOrderingRelations: {
+						type: "boolean",
+					},
+				},
+				additionalProperties: false,
+			},
+		],
+
+		fixable: null,
+
+		messages: {
+			unexpected:
+				"Unexpected negating the left operand of '{{operator}}' operator.",
+			suggestNegatedExpression:
+				"Negate '{{operator}}' expression instead of its left operand. This changes the current behavior.",
+			suggestParenthesisedNegation:
+				"Wrap negation in '()' to make the intention explicit. This preserves the current behavior.",
+		},
+	},
+
+	create(context) {
+		const sourceCode = context.sourceCode;
+		const [{ enforceForOrderingRelations }] = context.options;
+
+		return {
+			BinaryExpression(node) {
+				const operator = node.operator;
+				const orderingRelationRuleApplies =
+					enforceForOrderingRelations &&
+					isOrderingRelationalOperator(operator);
+
+				if (
+					(isInOrInstanceOfOperator(operator) ||
+						orderingRelationRuleApplies) &&
+					isNegation(node.left) &&
+					!astUtils.isParenthesised(sourceCode, node.left)
+				) {
+					context.report({
+						node,
+						loc: node.left.loc,
+						messageId: "unexpected",
+						data: { operator },
+						suggest: [
+							{
+								messageId: "suggestNegatedExpression",
+								data: { operator },
+								fix(fixer) {
+									const negationToken =
+										sourceCode.getFirstToken(node.left);
+									const fixRange = [
+										negationToken.range[1],
+										node.range[1],
+									];
+									const text = sourceCode.text.slice(
+										fixRange[0],
+										fixRange[1],
+									);
+
+									return fixer.replaceTextRange(
+										fixRange,
+										`(${text})`,
+									);
+								},
+							},
+							{
+								messageId: "suggestParenthesisedNegation",
+								fix(fixer) {
+									return fixer.replaceText(
+										node.left,
+										`(${sourceCode.getText(node.left)})`,
+									);
+								},
+							},
+						],
+					});
+				}
+			},
+		};
+	},
 };