eslint 8.57.1 → 9.39.1

package/lib/rules/no-inner-declarations.js

@@ -15,8 +15,17 @@ const astUtils = require("./utils/ast-utils");
 // Rule Definition
 //------------------------------------------------------------------------------
 
-const validParent = new Set(["Program", "StaticBlock", "ExportNamedDeclaration", "ExportDefaultDeclaration"]);
-const validBlockStatementParent = new Set(["FunctionDeclaration", "FunctionExpression", "ArrowFunctionExpression"]);
+const validParent = new Set([
+	"Program",
+	"StaticBlock",
+	"ExportNamedDeclaration",
+	"ExportDefaultDeclaration",
+]);
+const validBlockStatementParent = new Set([
+	"FunctionDeclaration",
+	"FunctionExpression",
+	"ArrowFunctionExpression",
+]);
 
 /**
  * Finds the nearest enclosing context where this rule allows declarations and returns its description.
@@ -24,87 +33,115 @@ const validBlockStatementParent = new Set(["FunctionDeclaration", "FunctionExpre
  * @returns {string} Description. One of "program", "function body", "class static block body".
  */
 function getAllowedBodyDescription(node) {
-    let { parent } = node;
+	let { parent } = node;
 
-    while (parent) {
+	while (parent) {
+		if (parent.type === "StaticBlock") {
+			return "class static block body";
+		}
 
-        if (parent.type === "StaticBlock") {
-            return "class static block body";
-        }
+		if (astUtils.isFunction(parent)) {
+			return "function body";
+		}
 
-        if (astUtils.isFunction(parent)) {
-            return "function body";
-        }
+		({ parent } = parent);
+	}
 
-        ({ parent } = parent);
-    }
-
-    return "program";
+	return "program";
 }
 
-/** @type {import('../shared/types').Rule} */
+/** @type {import('../types').Rule.RuleModule} */
 module.exports = {
-    meta: {
-        type: "problem",
-
-        docs: {
-            description: "Disallow variable or `function` declarations in nested blocks",
-            recommended: true,
-            url: "https://eslint.org/docs/latest/rules/no-inner-declarations"
-        },
-
-        schema: [
-            {
-                enum: ["functions", "both"]
-            }
-        ],
-
-        messages: {
-            moveDeclToRoot: "Move {{type}} declaration to {{body}} root."
-        }
-    },
-
-    create(context) {
-
-        /**
-         * Ensure that a given node is at a program or function body's root.
-         * @param {ASTNode} node Declaration node to check.
-         * @returns {void}
-         */
-        function check(node) {
-            const parent = node.parent;
-
-            if (
-                parent.type === "BlockStatement" && validBlockStatementParent.has(parent.parent.type)
-            ) {
-                return;
-            }
-
-            if (validParent.has(parent.type)) {
-                return;
-            }
-
-            context.report({
-                node,
-                messageId: "moveDeclToRoot",
-                data: {
-                    type: (node.type === "FunctionDeclaration" ? "function" : "variable"),
-                    body: getAllowedBodyDescription(node)
-                }
-            });
-        }
-
-
-        return {
-
-            FunctionDeclaration: check,
-            VariableDeclaration(node) {
-                if (context.options[0] === "both" && node.kind === "var") {
-                    check(node);
-                }
-            }
-
-        };
-
-    }
+	meta: {
+		type: "problem",
+
+		defaultOptions: ["functions", { blockScopedFunctions: "allow" }],
+
+		docs: {
+			description:
+				"Disallow variable or `function` declarations in nested blocks",
+			recommended: false,
+			url: "https://eslint.org/docs/latest/rules/no-inner-declarations",
+		},
+
+		schema: [
+			{
+				enum: ["functions", "both"],
+			},
+			{
+				type: "object",
+				properties: {
+					blockScopedFunctions: {
+						enum: ["allow", "disallow"],
+					},
+				},
+				additionalProperties: false,
+			},
+		],
+
+		messages: {
+			moveDeclToRoot: "Move {{type}} declaration to {{body}} root.",
+		},
+	},
+
+	create(context) {
+		const both = context.options[0] === "both";
+		const { blockScopedFunctions } = context.options[1];
+
+		const sourceCode = context.sourceCode;
+		const ecmaVersion = context.languageOptions.ecmaVersion;
+
+		/**
+		 * Ensure that a given node is at a program or function body's root.
+		 * @param {ASTNode} node Declaration node to check.
+		 * @returns {void}
+		 */
+		function check(node) {
+			const parent = node.parent;
+
+			if (
+				parent.type === "BlockStatement" &&
+				validBlockStatementParent.has(parent.parent.type)
+			) {
+				return;
+			}
+
+			if (validParent.has(parent.type)) {
+				return;
+			}
+
+			context.report({
+				node,
+				messageId: "moveDeclToRoot",
+				data: {
+					type:
+						node.type === "FunctionDeclaration"
+							? "function"
+							: "variable",
+					body: getAllowedBodyDescription(node),
+				},
+			});
+		}
+
+		return {
+			FunctionDeclaration(node) {
+				const isInStrictCode = sourceCode.getScope(node).upper.isStrict;
+
+				if (
+					blockScopedFunctions === "allow" &&
+					ecmaVersion >= 2015 &&
+					isInStrictCode
+				) {
+					return;
+				}
+
+				check(node);
+			},
+			VariableDeclaration(node) {
+				if (both && node.kind === "var") {
+					check(node);
+				}
+			},
+		};
+	},
 };

package/lib/rules/no-invalid-regexp.js

@@ -10,185 +10,234 @@
 
 const RegExpValidator = require("@eslint-community/regexpp").RegExpValidator;
 const validator = new RegExpValidator();
-const validFlags = /[dgimsuvy]/gu;
+const validFlags = "dgimsuvy";
 const undefined1 = void 0;
 
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
-/** @type {import('../shared/types').Rule} */
+/** @type {import('../types').Rule.RuleModule} */
 module.exports = {
-    meta: {
-        type: "problem",
-
-        docs: {
-            description: "Disallow invalid regular expression strings in `RegExp` constructors",
-            recommended: true,
-            url: "https://eslint.org/docs/latest/rules/no-invalid-regexp"
-        },
-
-        schema: [{
-            type: "object",
-            properties: {
-                allowConstructorFlags: {
-                    type: "array",
-                    items: {
-                        type: "string"
-                    }
-                }
-            },
-            additionalProperties: false
-        }],
-
-        messages: {
-            regexMessage: "{{message}}."
-        }
-    },
-
-    create(context) {
-
-        const options = context.options[0];
-        let allowedFlags = null;
-
-        if (options && options.allowConstructorFlags) {
-            const temp = options.allowConstructorFlags.join("").replace(validFlags, "");
-
-            if (temp) {
-                allowedFlags = new RegExp(`[${temp}]`, "giu");
-            }
-        }
-
-        /**
-         * Reports error with the provided message.
-         * @param {ASTNode} node The node holding the invalid RegExp
-         * @param {string} message The message to report.
-         * @returns {void}
-         */
-        function report(node, message) {
-            context.report({
-                node,
-                messageId: "regexMessage",
-                data: { message }
-            });
-        }
-
-        /**
-         * Check if node is a string
-         * @param {ASTNode} node node to evaluate
-         * @returns {boolean} True if its a string
-         * @private
-         */
-        function isString(node) {
-            return node && node.type === "Literal" && typeof node.value === "string";
-        }
-
-        /**
-         * Gets flags of a regular expression created by the given `RegExp()` or `new RegExp()` call
-         * Examples:
-         *     new RegExp(".")         // => ""
-         *     new RegExp(".", "gu")   // => "gu"
-         *     new RegExp(".", flags)  // => null
-         * @param {ASTNode} node `CallExpression` or `NewExpression` node
-         * @returns {string|null} flags if they can be determined, `null` otherwise
-         * @private
-         */
-        function getFlags(node) {
-            if (node.arguments.length < 2) {
-                return "";
-            }
-
-            if (isString(node.arguments[1])) {
-                return node.arguments[1].value;
-            }
-
-            return null;
-        }
-
-        /**
-         * Check syntax error in a given pattern.
-         * @param {string} pattern The RegExp pattern to validate.
-         * @param {Object} flags The RegExp flags to validate.
-         * @param {boolean} [flags.unicode] The Unicode flag.
-         * @param {boolean} [flags.unicodeSets] The UnicodeSets flag.
-         * @returns {string|null} The syntax error.
-         */
-        function validateRegExpPattern(pattern, flags) {
-            try {
-                validator.validatePattern(pattern, undefined1, undefined1, flags);
-                return null;
-            } catch (err) {
-                return err.message;
-            }
-        }
-
-        /**
-         * Check syntax error in a given flags.
-         * @param {string|null} flags The RegExp flags to validate.
-         * @returns {string|null} The syntax error.
-         */
-        function validateRegExpFlags(flags) {
-            if (!flags) {
-                return null;
-            }
-            try {
-                validator.validateFlags(flags);
-            } catch {
-                return `Invalid flags supplied to RegExp constructor '${flags}'`;
-            }
-
-            /*
-             * `regexpp` checks the combination of `u` and `v` flags when parsing `Pattern` according to `ecma262`,
-             * but this rule may check only the flag when the pattern is unidentifiable, so check it here.
-             * https://tc39.es/ecma262/multipage/text-processing.html#sec-parsepattern
-             */
-            if (flags.includes("u") && flags.includes("v")) {
-                return "Regex 'u' and 'v' flags cannot be used together";
-            }
-            return null;
-        }
-
-        return {
-            "CallExpression, NewExpression"(node) {
-                if (node.callee.type !== "Identifier" || node.callee.name !== "RegExp") {
-                    return;
-                }
-
-                let flags = getFlags(node);
-
-                if (flags && allowedFlags) {
-                    flags = flags.replace(allowedFlags, "");
-                }
-
-                let message = validateRegExpFlags(flags);
-
-                if (message) {
-                    report(node, message);
-                    return;
-                }
-
-                if (!isString(node.arguments[0])) {
-                    return;
-                }
-
-                const pattern = node.arguments[0].value;
-
-                message = (
-
-                    // If flags are unknown, report the regex only if its pattern is invalid both with and without the "u" flag
-                    flags === null
-                        ? (
-                            validateRegExpPattern(pattern, { unicode: true, unicodeSets: false }) &&
-                            validateRegExpPattern(pattern, { unicode: false, unicodeSets: true }) &&
-                            validateRegExpPattern(pattern, { unicode: false, unicodeSets: false })
-                        )
-                        : validateRegExpPattern(pattern, { unicode: flags.includes("u"), unicodeSets: flags.includes("v") })
-                );
-
-                if (message) {
-                    report(node, message);
-                }
-            }
-        };
-    }
+	meta: {
+		type: "problem",
+
+		defaultOptions: [{}],
+
+		docs: {
+			description:
+				"Disallow invalid regular expression strings in `RegExp` constructors",
+			recommended: true,
+			url: "https://eslint.org/docs/latest/rules/no-invalid-regexp",
+		},
+
+		schema: [
+			{
+				type: "object",
+				properties: {
+					allowConstructorFlags: {
+						type: "array",
+						items: {
+							type: "string",
+						},
+					},
+				},
+				additionalProperties: false,
+			},
+		],
+
+		messages: {
+			regexMessage: "{{message}}.",
+		},
+	},
+
+	create(context) {
+		const [{ allowConstructorFlags }] = context.options;
+		let allowedFlags = [];
+
+		if (allowConstructorFlags) {
+			const temp = allowConstructorFlags
+				.join("")
+				.replace(new RegExp(`[${validFlags}]`, "gu"), "");
+
+			if (temp) {
+				allowedFlags = [...new Set(temp)];
+			}
+		}
+
+		/**
+		 * Reports error with the provided message.
+		 * @param {ASTNode} node The node holding the invalid RegExp
+		 * @param {string} message The message to report.
+		 * @returns {void}
+		 */
+		function report(node, message) {
+			context.report({
+				node,
+				messageId: "regexMessage",
+				data: { message },
+			});
+		}
+
+		/**
+		 * Check if node is a string
+		 * @param {ASTNode} node node to evaluate
+		 * @returns {boolean} True if its a string
+		 * @private
+		 */
+		function isString(node) {
+			return (
+				node &&
+				node.type === "Literal" &&
+				typeof node.value === "string"
+			);
+		}
+
+		/**
+		 * Gets flags of a regular expression created by the given `RegExp()` or `new RegExp()` call
+		 * Examples:
+		 *     new RegExp(".")         // => ""
+		 *     new RegExp(".", "gu")   // => "gu"
+		 *     new RegExp(".", flags)  // => null
+		 * @param {ASTNode} node `CallExpression` or `NewExpression` node
+		 * @returns {string|null} flags if they can be determined, `null` otherwise
+		 * @private
+		 */
+		function getFlags(node) {
+			if (node.arguments.length < 2) {
+				return "";
+			}
+
+			if (isString(node.arguments[1])) {
+				return node.arguments[1].value;
+			}
+
+			return null;
+		}
+
+		/**
+		 * Check syntax error in a given pattern.
+		 * @param {string} pattern The RegExp pattern to validate.
+		 * @param {Object} flags The RegExp flags to validate.
+		 * @param {boolean} [flags.unicode] The Unicode flag.
+		 * @param {boolean} [flags.unicodeSets] The UnicodeSets flag.
+		 * @returns {string|null} The syntax error.
+		 */
+		function validateRegExpPattern(pattern, flags) {
+			try {
+				validator.validatePattern(
+					pattern,
+					undefined1,
+					undefined1,
+					flags,
+				);
+				return null;
+			} catch (err) {
+				return err.message;
+			}
+		}
+
+		/**
+		 * Check syntax error in a given flags.
+		 * @param {string|null} flags The RegExp flags to validate.
+		 * @param {string|null} flagsToCheck The RegExp invalid flags.
+		 * @param {string} allFlags all valid and allowed flags.
+		 * @returns {string|null} The syntax error.
+		 */
+		function validateRegExpFlags(flags, flagsToCheck, allFlags) {
+			const duplicateFlags = [];
+
+			if (typeof flagsToCheck === "string") {
+				for (const flag of flagsToCheck) {
+					if (allFlags.includes(flag)) {
+						duplicateFlags.push(flag);
+					}
+				}
+			}
+
+			/*
+			 * `regexpp` checks the combination of `u` and `v` flags when parsing `Pattern` according to `ecma262`,
+			 * but this rule may check only the flag when the pattern is unidentifiable, so check it here.
+			 * https://tc39.es/ecma262/multipage/text-processing.html#sec-parsepattern
+			 */
+			if (flags && flags.includes("u") && flags.includes("v")) {
+				return "Regex 'u' and 'v' flags cannot be used together";
+			}
+
+			if (duplicateFlags.length > 0) {
+				return `Duplicate flags ('${duplicateFlags.join("")}') supplied to RegExp constructor`;
+			}
+
+			if (!flagsToCheck) {
+				return null;
+			}
+
+			return `Invalid flags supplied to RegExp constructor '${flagsToCheck}'`;
+		}
+
+		return {
+			"CallExpression, NewExpression"(node) {
+				if (
+					node.callee.type !== "Identifier" ||
+					node.callee.name !== "RegExp"
+				) {
+					return;
+				}
+
+				const flags = getFlags(node);
+				let flagsToCheck = flags;
+				const allFlags =
+					allowedFlags.length > 0
+						? validFlags.split("").concat(allowedFlags)
+						: validFlags.split("");
+
+				if (flags) {
+					allFlags.forEach(flag => {
+						flagsToCheck = flagsToCheck.replace(flag, "");
+					});
+				}
+
+				let message = validateRegExpFlags(
+					flags,
+					flagsToCheck,
+					allFlags,
+				);
+
+				if (message) {
+					report(node, message);
+					return;
+				}
+
+				if (!isString(node.arguments[0])) {
+					return;
+				}
+
+				const pattern = node.arguments[0].value;
+
+				message =
+					// If flags are unknown, report the regex only if its pattern is invalid both with and without the "u" flag
+					flags === null
+						? validateRegExpPattern(pattern, {
+								unicode: true,
+								unicodeSets: false,
+							}) &&
+							validateRegExpPattern(pattern, {
+								unicode: false,
+								unicodeSets: true,
+							}) &&
+							validateRegExpPattern(pattern, {
+								unicode: false,
+								unicodeSets: false,
+							})
+						: validateRegExpPattern(pattern, {
+								unicode: flags.includes("u"),
+								unicodeSets: flags.includes("v"),
+							});
+
+				if (message) {
+					report(node, message);
+				}
+			},
+		};
+	},
 };