eslint 9.32.0 → 9.33.0

package/README.md

@@ -328,7 +328,7 @@ to get your logo on our READMEs and [website](https://eslint.org/sponsors).
 <p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="128"></a></p><h3>Gold Sponsors</h3>
 <p><a href="https://qlty.sh/"><img src="https://images.opencollective.com/qltysh/33d157d/logo.png" alt="Qlty Software" height="96"></a> <a href="https://trunk.io/"><img src="https://images.opencollective.com/trunkio/fb92d60/avatar.png" alt="trunk.io" height="96"></a> <a href="https://shopify.engineering/"><img src="https://avatars.githubusercontent.com/u/8085" alt="Shopify" height="96"></a></p><h3>Silver Sponsors</h3>
 <p><a href="https://vite.dev/"><img src="https://images.opencollective.com/vite/e6d15e1/logo.png" alt="Vite" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://americanexpress.io"><img src="https://avatars.githubusercontent.com/u/3853301" alt="American Express" height="64"></a> <a href="https://stackblitz.com"><img src="https://avatars.githubusercontent.com/u/28635252" alt="StackBlitz" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://sentry.io"><img src="https://github.com/getsentry.png" alt="Sentry" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104" alt="Nx" height="32"></a> <a href="https://opensource.mercedes-benz.com/"><img src="https://avatars.githubusercontent.com/u/34240465" alt="Mercedes-Benz Group" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="LambdaTest" height="32"></a></p>
+<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104" alt="Nx" height="32"></a> <a href="https://opensource.mercedes-benz.com/"><img src="https://avatars.githubusercontent.com/u/34240465" alt="Mercedes-Benz Group" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="LambdaTest" height="32"></a></p>
 <h3>Technology Sponsors</h3>
 Technology sponsors allow us to use their products and services for free as part of a contribution to the open source ecosystem and our work.
 <p><a href="https://netlify.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/netlify-icon.svg" alt="Netlify" height="32"></a> <a href="https://algolia.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/algolia-icon.svg" alt="Algolia" height="32"></a> <a href="https://1password.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/1password-icon.svg" alt="1Password" height="32"></a></p>

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

@@ -4,6 +4,12 @@
  */
 "use strict";
 
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+const astUtils = require("./utils/ast-utils");
+
 //------------------------------------------------------------------------------
 // Helpers
 //------------------------------------------------------------------------------
@@ -16,10 +22,34 @@ const TYPE_NODES = new Set([
 	"TSQualifiedName",
 ]);
 
+const GLOBAL_OBJECTS = new Set(["globalThis", "self", "window"]);
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
+const arrayOfGlobals = {
+	type: "array",
+	items: {
+		oneOf: [
+			{
+				type: "string",
+			},
+			{
+				type: "object",
+				properties: {
+					name: { type: "string" },
+					message: { type: "string" },
+				},
+				required: ["name"],
+				additionalProperties: false,
+			},
+		],
+	},
+	uniqueItems: true,
+	minItems: 0,
+};
+
 /** @type {import('../types').Rule.RuleModule} */
 module.exports = {
 	meta: {
@@ -34,25 +64,33 @@ module.exports = {
 		},
 
 		schema: {
-			type: "array",
-			items: {
-				oneOf: [
-					{
-						type: "string",
-					},
-					{
-						type: "object",
-						properties: {
-							name: { type: "string" },
-							message: { type: "string" },
+			anyOf: [
+				arrayOfGlobals,
+				{
+					type: "array",
+					items: [
+						{
+							type: "object",
+							properties: {
+								globals: arrayOfGlobals,
+								checkGlobalObject: {
+									type: "boolean",
+								},
+								globalObjects: {
+									type: "array",
+									items: {
+										type: "string",
+									},
+									uniqueItems: true,
+								},
+							},
+							required: ["globals"],
+							additionalProperties: false,
 						},
-						required: ["name"],
-						additionalProperties: false,
-					},
-				],
-			},
-			uniqueItems: true,
-			minItems: 0,
+					],
+					additionalItems: false,
+				},
+			],
 		},
 
 		messages: {
@@ -63,14 +101,33 @@ module.exports = {
 	},
 
 	create(context) {
-		const sourceCode = context.sourceCode;
+		const { sourceCode, options } = context;
+
+		const isGlobalsObject =
+			typeof options[0] === "object" &&
+			Object.hasOwn(options[0], "globals");
+
+		const restrictedGlobals = isGlobalsObject
+			? options[0].globals
+			: options;
+		const checkGlobalObject = isGlobalsObject
+			? options[0].checkGlobalObject
+			: false;
+		const userGlobalObjects = isGlobalsObject
+			? options[0].globalObjects || []
+			: [];
+
+		const globalObjects = new Set([
+			...GLOBAL_OBJECTS,
+			...userGlobalObjects,
+		]);
 
 		// If no globals are restricted, we don't need to do anything
-		if (context.options.length === 0) {
+		if (restrictedGlobals.length === 0) {
 			return {};
 		}
 
-		const restrictedGlobalMessages = context.options.reduce(
+		const restrictedGlobalMessages = restrictedGlobals.reduce(
 			(memo, option) => {
 				if (typeof option === "string") {
 					memo[option] = null;
@@ -151,6 +208,59 @@ module.exports = {
 					}
 				});
 			},
+
+			"Program:exit"(node) {
+				if (!checkGlobalObject) {
+					return;
+				}
+
+				const globalScope = sourceCode.getScope(node);
+				globalObjects.forEach(globalObjectName => {
+					const variable = astUtils.getVariableByName(
+						globalScope,
+						globalObjectName,
+					);
+
+					if (!variable) {
+						return;
+					}
+
+					variable.references.forEach(reference => {
+						const identifier = reference.identifier;
+						let parent = identifier.parent;
+
+						// To detect code like `window.window.Promise`.
+						while (
+							astUtils.isSpecificMemberAccess(
+								parent,
+								null,
+								globalObjectName,
+							)
+						) {
+							parent = parent.parent;
+						}
+
+						const propertyName =
+							astUtils.getStaticPropertyName(parent);
+						if (propertyName && isRestricted(propertyName)) {
+							const customMessage =
+								restrictedGlobalMessages[propertyName];
+							const messageId = customMessage
+								? "customMessage"
+								: "defaultMessage";
+
+							context.report({
+								node: parent.property,
+								messageId,
+								data: {
+									name: propertyName,
+									customMessage,
+								},
+							});
+						}
+					});
+				});
+			},
 		};
 	},
 };

package/lib/rules/one-var.js

@@ -64,6 +64,12 @@ module.exports = {
 							const: {
 								enum: ["always", "never", "consecutive"],
 							},
+							using: {
+								enum: ["always", "never", "consecutive"],
+							},
+							awaitUsing: {
+								enum: ["always", "never", "consecutive"],
+							},
 						},
 						additionalProperties: false,
 					},
@@ -112,6 +118,8 @@ module.exports = {
 			options.var = { uninitialized: mode, initialized: mode };
 			options.let = { uninitialized: mode, initialized: mode };
 			options.const = { uninitialized: mode, initialized: mode };
+			options.using = { uninitialized: mode, initialized: mode };
+			options.awaitUsing = { uninitialized: mode, initialized: mode };
 		} else if (typeof mode === "object") {
 			// options configuration is an object
 			options.separateRequires = !!mode.separateRequires;
@@ -121,15 +129,27 @@ module.exports = {
 				uninitialized: mode.const,
 				initialized: mode.const,
 			};
+			options.using = {
+				uninitialized: mode.using,
+				initialized: mode.using,
+			};
+			options.awaitUsing = {
+				uninitialized: mode.awaitUsing,
+				initialized: mode.awaitUsing,
+			};
 			if (Object.hasOwn(mode, "uninitialized")) {
 				options.var.uninitialized = mode.uninitialized;
 				options.let.uninitialized = mode.uninitialized;
 				options.const.uninitialized = mode.uninitialized;
+				options.using.uninitialized = mode.uninitialized;
+				options.awaitUsing.uninitialized = mode.uninitialized;
 			}
 			if (Object.hasOwn(mode, "initialized")) {
 				options.var.initialized = mode.initialized;
 				options.let.initialized = mode.initialized;
 				options.const.initialized = mode.initialized;
+				options.using.initialized = mode.initialized;
+				options.awaitUsing.initialized = mode.initialized;
 			}
 		}
 
@@ -151,6 +171,8 @@ module.exports = {
 			blockStack.push({
 				let: { initialized: false, uninitialized: false },
 				const: { initialized: false, uninitialized: false },
+				using: { initialized: false, uninitialized: false },
+				awaitUsing: { initialized: false, uninitialized: false },
 			});
 		}
 
@@ -199,7 +221,7 @@ module.exports = {
 
 		/**
 		 * Records whether initialized/uninitialized/required variables are defined in current scope.
-		 * @param {string} statementType node.kind, one of: "var", "let", or "const"
+		 * @param {string} statementType one of: "var", "let", "const", "using", or "awaitUsing"
 		 * @param {ASTNode[]} declarations List of declarations
 		 * @param {Object} currentScope The scope being investigated
 		 * @returns {void}
@@ -234,7 +256,7 @@ module.exports = {
 
 		/**
 		 * Determines the current scope (function or block)
-		 * @param {string} statementType node.kind, one of: "var", "let", or "const"
+		 * @param {string} statementType one of: "var", "let", "const", "using", or "awaitUsing"
 		 * @returns {Object} The scope associated with statementType
 		 */
 		function getCurrentScope(statementType) {
@@ -246,6 +268,10 @@ module.exports = {
 				currentScope = blockStack.at(-1).let;
 			} else if (statementType === "const") {
 				currentScope = blockStack.at(-1).const;
+			} else if (statementType === "using") {
+				currentScope = blockStack.at(-1).using;
+			} else if (statementType === "awaitUsing") {
+				currentScope = blockStack.at(-1).awaitUsing;
 			}
 			return currentScope;
 		}
@@ -271,7 +297,7 @@ module.exports = {
 
 		/**
 		 * Determines if there is more than one var statement in the current scope.
-		 * @param {string} statementType node.kind, one of: "var", "let", or "const"
+		 * @param {string} statementType one of: "var", "let", "const", "using", or "awaitUsing"
 		 * @param {ASTNode[]} declarations List of declarations
 		 * @returns {boolean} Returns true if it is the first var declaration, false if not.
 		 * @private
@@ -333,24 +359,27 @@ module.exports = {
 			);
 			const previousNode = body[currentIndex - 1];
 
-			return fixer => {
-				const type = sourceCode.getTokenBefore(declaration);
-				const prevSemi = sourceCode.getTokenBefore(type);
-				const res = [];
+			return function* joinDeclarationsFixer(fixer) {
+				const type = sourceCode.getFirstToken(declaration.parent);
+				const beforeType = sourceCode.getTokenBefore(type);
 
 				if (
 					previousNode &&
-					previousNode.kind === sourceCode.getText(type)
+					previousNode.kind === declaration.parent.kind
 				) {
-					if (prevSemi.value === ";") {
-						res.push(fixer.replaceText(prevSemi, ","));
+					if (beforeType.value === ";") {
+						yield fixer.replaceText(beforeType, ",");
 					} else {
-						res.push(fixer.insertTextAfter(prevSemi, ","));
+						yield fixer.insertTextAfter(beforeType, ",");
+					}
+
+					if (declaration.parent.kind === "await using") {
+						const usingToken = sourceCode.getTokenAfter(type);
+						yield fixer.remove(usingToken);
 					}
-					res.push(fixer.replaceText(type, ""));
-				}
 
-				return res;
+					yield fixer.replaceText(type, "");
+				}
 			};
 		}
 
@@ -440,7 +469,10 @@ module.exports = {
 									tokenAfterDeclarator.range[0],
 									lastComment.range[0],
 								],
-								`;${sourceCode.text.slice(tokenAfterDeclarator.range[1], lastComment.range[0])}${exportPlacement}${declaration.kind} `,
+								`;${sourceCode.text.slice(
+									tokenAfterDeclarator.range[1],
+									lastComment.range[0],
+								)}${exportPlacement}${declaration.kind} `,
 							);
 						}
 
@@ -461,8 +493,9 @@ module.exports = {
 		function checkVariableDeclaration(node) {
 			const parent = node.parent;
 			const type = node.kind;
+			const key = type === "await using" ? "awaitUsing" : type;
 
-			if (!options[type]) {
+			if (!options[key]) {
 				return;
 			}
 
@@ -471,7 +504,7 @@ module.exports = {
 			const mixedRequires =
 				declarations.some(isRequire) && !declarations.every(isRequire);
 
-			if (options[type].initialized === MODE_ALWAYS) {
+			if (options[key].initialized === MODE_ALWAYS) {
 				if (options.separateRequires && mixedRequires) {
 					context.report({
 						node,
@@ -508,8 +541,8 @@ module.exports = {
 					);
 
 					if (
-						options[type].initialized === MODE_CONSECUTIVE &&
-						options[type].uninitialized === MODE_CONSECUTIVE
+						options[key].initialized === MODE_CONSECUTIVE &&
+						options[key].uninitialized === MODE_CONSECUTIVE
 					) {
 						context.report({
 							node,
@@ -520,7 +553,7 @@ module.exports = {
 							fix: joinDeclarations(declarations),
 						});
 					} else if (
-						options[type].initialized === MODE_CONSECUTIVE &&
+						options[key].initialized === MODE_CONSECUTIVE &&
 						declarationCounts.initialized > 0 &&
 						previousDeclCounts.initialized > 0
 					) {
@@ -533,7 +566,7 @@ module.exports = {
 							fix: joinDeclarations(declarations),
 						});
 					} else if (
-						options[type].uninitialized === MODE_CONSECUTIVE &&
+						options[key].uninitialized === MODE_CONSECUTIVE &&
 						declarationCounts.uninitialized > 0 &&
 						previousDeclCounts.uninitialized > 0
 					) {
@@ -550,10 +583,10 @@ module.exports = {
 			}
 
 			// always
-			if (!hasOnlyOneStatement(type, declarations)) {
+			if (!hasOnlyOneStatement(key, declarations)) {
 				if (
-					options[type].initialized === MODE_ALWAYS &&
-					options[type].uninitialized === MODE_ALWAYS
+					options[key].initialized === MODE_ALWAYS &&
+					options[key].uninitialized === MODE_ALWAYS
 				) {
 					context.report({
 						node,
@@ -565,7 +598,7 @@ module.exports = {
 					});
 				} else {
 					if (
-						options[type].initialized === MODE_ALWAYS &&
+						options[key].initialized === MODE_ALWAYS &&
 						declarationCounts.initialized > 0
 					) {
 						context.report({
@@ -578,7 +611,7 @@ module.exports = {
 						});
 					}
 					if (
-						options[type].uninitialized === MODE_ALWAYS &&
+						options[key].uninitialized === MODE_ALWAYS &&
 						declarationCounts.uninitialized > 0
 					) {
 						if (
@@ -608,8 +641,8 @@ module.exports = {
 
 				if (totalDeclarations > 1) {
 					if (
-						options[type].initialized === MODE_NEVER &&
-						options[type].uninitialized === MODE_NEVER
+						options[key].initialized === MODE_NEVER &&
+						options[key].uninitialized === MODE_NEVER
 					) {
 						// both initialized and uninitialized
 						context.report({
@@ -621,7 +654,7 @@ module.exports = {
 							fix: splitDeclarations(node),
 						});
 					} else if (
-						options[type].initialized === MODE_NEVER &&
+						options[key].initialized === MODE_NEVER &&
 						declarationCounts.initialized > 0
 					) {
 						// initialized
@@ -634,7 +667,7 @@ module.exports = {
 							fix: splitDeclarations(node),
 						});
 					} else if (
-						options[type].uninitialized === MODE_NEVER &&
+						options[key].uninitialized === MODE_NEVER &&
 						declarationCounts.uninitialized > 0
 					) {
 						// uninitialized

package/lib/types/rules.d.ts

@@ -3403,13 +3403,26 @@ export interface ESLintRules extends Linter.RulesRecord {
 	 */
 	"no-restricted-globals": Linter.RuleEntry<
 		[
-			...Array<
-				| string
-				| {
-						name: string;
-						message?: string | undefined;
-				  }
-			>,
+			...(
+				| Array<
+						| string
+						| {
+								name: string;
+								message?: string | undefined;
+						  }
+				  >
+				| Array<{
+						globals: Array<
+							| string
+							| {
+									name: string;
+									message?: string | undefined;
+							  }
+						>;
+						checkGlobalObject?: boolean;
+						globalObjects?: string[];
+				  }>
+			),
 		]
 	>;
 
@@ -4509,7 +4522,7 @@ export interface ESLintRules extends Linter.RulesRecord {
 						 */
 						separateRequires: boolean;
 					} & Record<
-						"var" | "let" | "const",
+						"var" | "let" | "const" | "using" | "awaitUsing",
 						"always" | "never" | "consecutive"
 					>
 			  >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "9.32.0",
+  "version": "9.33.0",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "type": "commonjs",
@@ -107,11 +107,11 @@
     "@eslint-community/eslint-utils": "^4.2.0",
     "@eslint-community/regexpp": "^4.12.1",
     "@eslint/config-array": "^0.21.0",
-    "@eslint/config-helpers": "^0.3.0",
-    "@eslint/core": "^0.15.0",
+    "@eslint/config-helpers": "^0.3.1",
+    "@eslint/core": "^0.15.2",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "9.32.0",
-    "@eslint/plugin-kit": "^0.3.4",
+    "@eslint/js": "9.33.0",
+    "@eslint/plugin-kit": "^0.3.5",
     "@humanfs/node": "^0.16.6",
     "@humanwhocodes/module-importer": "^1.0.1",
     "@humanwhocodes/retry": "^0.4.2",