eslint 9.28.0 → 9.30.0

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

@@ -4,6 +4,18 @@
  */
 "use strict";
 
+//------------------------------------------------------------------------------
+// Helpers
+//------------------------------------------------------------------------------
+
+const TYPE_NODES = new Set([
+	"TSTypeReference",
+	"TSInterfaceHeritage",
+	"TSClassImplements",
+	"TSTypeQuery",
+	"TSQualifiedName",
+]);
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -11,6 +23,8 @@
 /** @type {import('../types').Rule.RuleModule} */
 module.exports = {
 	meta: {
+		dialects: ["javascript", "typescript"],
+		language: "javascript",
 		type: "suggestion",
 
 		docs: {
@@ -100,6 +114,18 @@ module.exports = {
 			return Object.hasOwn(restrictedGlobalMessages, name);
 		}
 
+		/**
+		 * Check if the given reference occurs within a TypeScript type context.
+		 * @param {Reference} reference The variable reference to check.
+		 * @returns {boolean} Whether the reference is in a type context.
+		 * @private
+		 */
+		function isInTypeContext(reference) {
+			const parent = reference.identifier.parent;
+
+			return TYPE_NODES.has(parent.type);
+		}
+
 		return {
 			Program(node) {
 				const scope = sourceCode.getScope(node);
@@ -107,13 +133,20 @@ module.exports = {
 				// Report variables declared elsewhere (ex: variables defined as "global" by eslint)
 				scope.variables.forEach(variable => {
 					if (!variable.defs.length && isRestricted(variable.name)) {
-						variable.references.forEach(reportReference);
+						variable.references.forEach(reference => {
+							if (!isInTypeContext(reference)) {
+								reportReference(reference);
+							}
+						});
 					}
 				});
 
 				// Report variables not declared at all
 				scope.through.forEach(reference => {
-					if (isRestricted(reference.identifier.name)) {
+					if (
+						isRestricted(reference.identifier.name) &&
+						!isInTypeContext(reference)
+					) {
 						reportReference(reference);
 					}
 				});

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

@@ -40,6 +40,13 @@ module.exports = {
 						},
 						uniqueItems: true,
 					},
+					allowProperties: {
+						type: "array",
+						items: {
+							type: "string",
+						},
+						uniqueItems: true,
+					},
 					message: {
 						type: "string",
 					},
@@ -53,7 +60,10 @@ module.exports = {
 					},
 				],
 				not: {
-					required: ["allowObjects", "object"],
+					anyOf: [
+						{ required: ["allowObjects", "object"] },
+						{ required: ["allowProperties", "property"] },
+					],
 				},
 				additionalProperties: false,
 			},
@@ -63,10 +73,10 @@ module.exports = {
 		messages: {
 			restrictedObjectProperty:
 				// eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
-				"'{{objectName}}.{{propertyName}}' is restricted from being used.{{message}}",
+				"'{{objectName}}.{{propertyName}}' is restricted from being used.{{allowedPropertiesMessage}}{{message}}",
 			restrictedProperty:
 				// eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
-				"'{{propertyName}}' is restricted from being used.{{message}}",
+				"'{{propertyName}}' is restricted from being used.{{allowedObjectsMessage}}{{message}}",
 		},
 	},
 
@@ -92,6 +102,7 @@ module.exports = {
 				});
 			} else if (typeof propertyName === "undefined") {
 				globallyRestrictedObjects.set(objectName, {
+					allowProperties: option.allowProperties,
 					message: option.message,
 				});
 			} else {
@@ -106,17 +117,17 @@ module.exports = {
 		});
 
 		/**
-		 * Checks if an object name is in the allowed objects list.
-		 * @param {string} objectName The name of the object to check
-		 * @param {string[]} [allowObjects] The list of objects to allow
-		 * @returns {boolean} True if the object is allowed, false otherwise
+		 * Checks if a name is in the allowed list.
+		 * @param {string} name The name to check
+		 * @param {string[]} [allowedList] The list of allowed names
+		 * @returns {boolean} True if the name is allowed, false otherwise
 		 */
-		function isAllowedObject(objectName, allowObjects) {
-			if (!allowObjects) {
+		function isAllowed(name, allowedList) {
+			if (!allowedList) {
 				return false;
 			}
 
-			return allowObjects.includes(objectName);
+			return allowedList.includes(name);
 		}
 
 		/**
@@ -137,10 +148,17 @@ module.exports = {
 			const globalMatchedProperty =
 				globallyRestrictedProperties.get(propertyName);
 
-			if (matchedObjectProperty) {
+			if (
+				matchedObjectProperty &&
+				!isAllowed(propertyName, matchedObjectProperty.allowProperties)
+			) {
 				const message = matchedObjectProperty.message
 					? ` ${matchedObjectProperty.message}`
 					: "";
+				const allowedPropertiesMessage =
+					matchedObjectProperty.allowProperties
+						? ` Only these properties are allowed: ${matchedObjectProperty.allowProperties.join(", ")}.`
+						: "";
 
 				context.report({
 					node,
@@ -149,15 +167,19 @@ module.exports = {
 						objectName,
 						propertyName,
 						message,
+						allowedPropertiesMessage,
 					},
 				});
 			} else if (
 				globalMatchedProperty &&
-				!isAllowedObject(objectName, globalMatchedProperty.allowObjects)
+				!isAllowed(objectName, globalMatchedProperty.allowObjects)
 			) {
 				const message = globalMatchedProperty.message
 					? ` ${globalMatchedProperty.message}`
 					: "";
+				const allowedObjectsMessage = globalMatchedProperty.allowObjects
+					? ` Property '${propertyName}' is only allowed on these objects: ${globalMatchedProperty.allowObjects.join(", ")}.`
+					: "";
 
 				context.report({
 					node,
@@ -165,6 +187,7 @@ module.exports = {
 					data: {
 						propertyName,
 						message,
+						allowedObjectsMessage,
 					},
 				});
 			}

package/lib/rules/no-setter-return.js

@@ -10,33 +10,16 @@
 //------------------------------------------------------------------------------
 
 const astUtils = require("./utils/ast-utils");
-const { findVariable } = require("@eslint-community/eslint-utils");
 
 //------------------------------------------------------------------------------
 // Helpers
 //------------------------------------------------------------------------------
 
-/**
- * Determines whether the given identifier node is a reference to a global variable.
- * @param {ASTNode} node `Identifier` node to check.
- * @param {Scope} scope Scope to which the node belongs.
- * @returns {boolean} True if the identifier is a reference to a global variable.
- */
-function isGlobalReference(node, scope) {
-	const variable = findVariable(scope, node);
-
-	return (
-		variable !== null &&
-		variable.scope.type === "global" &&
-		variable.defs.length === 0
-	);
-}
-
 /**
  * Determines whether the given node is an argument of the specified global method call, at the given `index` position.
  * E.g., for given `index === 1`, this function checks for `objectName.methodName(foo, node)`, where objectName is a global variable.
  * @param {ASTNode} node The node to check.
- * @param {Scope} scope Scope to which the node belongs.
+ * @param {SourceCode} sourceCode Source code to which the node belongs.
  * @param {string} objectName Name of the global object.
  * @param {string} methodName Name of the method.
  * @param {number} index The given position.
@@ -44,7 +27,7 @@ function isGlobalReference(node, scope) {
  */
 function isArgumentOfGlobalMethodCall(
 	node,
-	scope,
+	sourceCode,
 	objectName,
 	methodName,
 	index,
@@ -59,9 +42,8 @@ function isArgumentOfGlobalMethodCall(
 			objectName,
 			methodName,
 		) &&
-		isGlobalReference(
+		sourceCode.isGlobalReference(
 			astUtils.skipChainExpression(callNode.callee).object,
-			scope,
 		)
 	);
 }
@@ -69,21 +51,21 @@ function isArgumentOfGlobalMethodCall(
 /**
  * Determines whether the given node is used as a property descriptor.
  * @param {ASTNode} node The node to check.
- * @param {Scope} scope Scope to which the node belongs.
+ * @param {SourceCode} sourceCode Source code to which the node belongs.
  * @returns {boolean} `true` if the node is a property descriptor.
  */
-function isPropertyDescriptor(node, scope) {
+function isPropertyDescriptor(node, sourceCode) {
 	if (
 		isArgumentOfGlobalMethodCall(
 			node,
-			scope,
+			sourceCode,
 			"Object",
 			"defineProperty",
 			2,
 		) ||
 		isArgumentOfGlobalMethodCall(
 			node,
-			scope,
+			sourceCode,
 			"Reflect",
 			"defineProperty",
 			2,
@@ -101,14 +83,14 @@ function isPropertyDescriptor(node, scope) {
 			grandparent.type === "ObjectExpression" &&
 			(isArgumentOfGlobalMethodCall(
 				grandparent,
-				scope,
+				sourceCode,
 				"Object",
 				"create",
 				1,
 			) ||
 				isArgumentOfGlobalMethodCall(
 					grandparent,
-					scope,
+					sourceCode,
 					"Object",
 					"defineProperties",
 					1,
@@ -124,10 +106,10 @@ function isPropertyDescriptor(node, scope) {
 /**
  * Determines whether the given function node is used as a setter function.
  * @param {ASTNode} node The node to check.
- * @param {Scope} scope Scope to which the node belongs.
+ * @param {SourceCode} sourceCode Source code to which the node belongs.
  * @returns {boolean} `true` if the node is a setter.
  */
-function isSetter(node, scope) {
+function isSetter(node, sourceCode) {
 	const parent = node.parent;
 
 	if (
@@ -144,7 +126,7 @@ function isSetter(node, scope) {
 		parent.value === node &&
 		astUtils.getStaticPropertyName(parent) === "set" &&
 		parent.parent.type === "ObjectExpression" &&
-		isPropertyDescriptor(parent.parent, scope)
+		isPropertyDescriptor(parent.parent, sourceCode)
 	) {
 		// Setter in a property descriptor
 		return true;
@@ -153,21 +135,6 @@ function isSetter(node, scope) {
 	return false;
 }
 
-/**
- * Finds function's outer scope.
- * @param {Scope} scope Function's own scope.
- * @returns {Scope} Function's outer scope.
- */
-function getOuterScope(scope) {
-	const upper = scope.upper;
-
-	if (upper.type === "function-expression-name") {
-		return upper.upper;
-	}
-
-	return upper;
-}
-
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -200,11 +167,9 @@ module.exports = {
 		 * @returns {void}
 		 */
 		function enterFunction(node) {
-			const outerScope = getOuterScope(sourceCode.getScope(node));
-
 			funcInfo = {
 				upper: funcInfo,
-				isSetter: isSetter(node, outerScope),
+				isSetter: isSetter(node, sourceCode),
 			};
 		}
 

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

@@ -33,12 +33,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "function-call-spacing",
-						url: "https://eslint.style/rules/js/function-call-spacing",
+						url: "https://eslint.style/rules/function-call-spacing",
 					},
 				},
 			],

package/lib/rules/no-tabs.js

@@ -31,12 +31,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "no-tabs",
-						url: "https://eslint.style/rules/js/no-tabs",
+						url: "https://eslint.style/rules/no-tabs",
 					},
 				},
 			],

package/lib/rules/no-trailing-spaces.js

@@ -37,12 +37,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "no-trailing-spaces",
-						url: "https://eslint.style/rules/js/no-trailing-spaces",
+						url: "https://eslint.style/rules/no-trailing-spaces",
 					},
 				},
 			],

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

@@ -1152,7 +1152,7 @@ module.exports = {
 
 				// fix for { a: { b } }
 				if (parentNode.parent.type === "ObjectPattern") {
-					// fix for unused variables in dectructured object with single property in variable decalartion and function parameter
+					// fix for unused variables in destructured object with single property in variable declaration and function parameter
 					if (parentNode.parent.properties.length === 1) {
 						return fixVariables(parentNode.parent);
 					}

package/lib/rules/no-use-before-define.js

@@ -269,6 +269,8 @@ function isClassRefInClassDecorator(variable, reference) {
 /** @type {import('../types').Rule.RuleModule} */
 module.exports = {
 	meta: {
+		dialects: ["javascript", "typescript"],
+		language: "javascript",
 		type: "problem",
 
 		docs: {

package/lib/rules/no-var.js

@@ -199,6 +199,8 @@ function hasNameDisallowedForLetDeclarations(variable) {
 module.exports = {
 	meta: {
 		type: "suggestion",
+		dialects: ["typescript", "javascript"],
+		language: "javascript",
 
 		docs: {
 			description: "Require `let` or `const` instead of `var`",
@@ -346,9 +348,19 @@ module.exports = {
 
 		return {
 			"VariableDeclaration:exit"(node) {
-				if (node.kind === "var") {
-					report(node);
+				if (node.kind !== "var") {
+					return;
 				}
+
+				if (
+					node.parent.type === "TSModuleBlock" &&
+					node.parent.parent.type === "TSModuleDeclaration" &&
+					node.parent.parent.global
+				) {
+					return;
+				}
+
+				report(node);
 			},
 		};
 	},

package/lib/rules/no-whitespace-before-property.js

@@ -29,12 +29,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "no-whitespace-before-property",
-						url: "https://eslint.style/rules/js/no-whitespace-before-property",
+						url: "https://eslint.style/rules/no-whitespace-before-property",
 					},
 				},
 			],

package/lib/rules/nonblock-statement-body-position.js

@@ -25,12 +25,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "nonblock-statement-body-position",
-						url: "https://eslint.style/rules/js/nonblock-statement-body-position",
+						url: "https://eslint.style/rules/nonblock-statement-body-position",
 					},
 				},
 			],

package/lib/rules/object-curly-newline.js

@@ -169,12 +169,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "object-curly-newline",
-						url: "https://eslint.style/rules/js/object-curly-newline",
+						url: "https://eslint.style/rules/object-curly-newline",
 					},
 				},
 			],

package/lib/rules/object-curly-spacing.js

@@ -25,12 +25,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "object-curly-spacing",
-						url: "https://eslint.style/rules/js/object-curly-spacing",
+						url: "https://eslint.style/rules/object-curly-spacing",
 					},
 				},
 			],

package/lib/rules/object-property-newline.js

@@ -24,12 +24,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "object-property-newline",
-						url: "https://eslint.style/rules/js/object-property-newline",
+						url: "https://eslint.style/rules/object-property-newline",
 					},
 				},
 			],

package/lib/rules/one-var-declaration-per-line.js

@@ -23,12 +23,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "one-var-declaration-per-line",
-						url: "https://eslint.style/rules/js/one-var-declaration-per-line",
+						url: "https://eslint.style/rules/one-var-declaration-per-line",
 					},
 				},
 			],

package/lib/rules/operator-linebreak.js

@@ -30,12 +30,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "operator-linebreak",
-						url: "https://eslint.style/rules/js/operator-linebreak",
+						url: "https://eslint.style/rules/operator-linebreak",
 					},
 				},
 			],

package/lib/rules/padded-blocks.js

@@ -30,12 +30,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "padded-blocks",
-						url: "https://eslint.style/rules/js/padded-blocks",
+						url: "https://eslint.style/rules/padded-blocks",
 					},
 				},
 			],

package/lib/rules/padding-line-between-statements.js

@@ -400,12 +400,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "padding-line-between-statements",
-						url: "https://eslint.style/rules/js/padding-line-between-statements",
+						url: "https://eslint.style/rules/padding-line-between-statements",
 					},
 				},
 			],

package/lib/rules/prefer-regex-literals.js

@@ -14,7 +14,6 @@ const {
 	CALL,
 	CONSTRUCT,
 	ReferenceTracker,
-	findVariable,
 } = require("@eslint-community/eslint-utils");
 const {
 	RegExpValidator,
@@ -167,22 +166,6 @@ module.exports = {
 		const [{ disallowRedundantWrapping }] = context.options;
 		const sourceCode = context.sourceCode;
 
-		/**
-		 * Determines whether the given identifier node is a reference to a global variable.
-		 * @param {ASTNode} node `Identifier` node to check.
-		 * @returns {boolean} True if the identifier is a reference to a global variable.
-		 */
-		function isGlobalReference(node) {
-			const scope = sourceCode.getScope(node);
-			const variable = findVariable(scope, node);
-
-			return (
-				variable !== null &&
-				variable.scope.type === "global" &&
-				variable.defs.length === 0
-			);
-		}
-
 		/**
 		 * Determines whether the given node is a String.raw`` tagged template expression
 		 * with a static template literal.
@@ -193,7 +176,7 @@ module.exports = {
 			return (
 				node.type === "TaggedTemplateExpression" &&
 				astUtils.isSpecificMemberAccess(node.tag, "String", "raw") &&
-				isGlobalReference(
+				sourceCode.isGlobalReference(
 					astUtils.skipChainExpression(node.tag).object,
 				) &&
 				astUtils.isStaticTemplateLiteral(node.quasi)

package/lib/rules/quote-props.js

@@ -31,12 +31,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "quote-props",
-						url: "https://eslint.style/rules/js/quote-props",
+						url: "https://eslint.style/rules/quote-props",
 					},
 				},
 			],

package/lib/rules/quotes.js

@@ -108,12 +108,12 @@ module.exports = {
 						"ESLint Stylistic now maintains deprecated stylistic core rules.",
 					url: "https://eslint.style/guide/migration",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "quotes",
-						url: "https://eslint.style/rules/js/quotes",
+						url: "https://eslint.style/rules/quotes",
 					},
 				},
 			],