eslint 9.38.0 → 9.39.1

package/README.md

@@ -342,8 +342,8 @@ to get your logo on our READMEs and [website](https://eslint.org/sponsors).
 <h3>Platinum Sponsors</h3>
 <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://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" height="32"></a> <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://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://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/2d6c3b6/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://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/eslint/eslint.js

@@ -17,6 +17,7 @@ const { pathToFileURL } = require("node:url");
 const { SHARE_ENV, Worker } = require("node:worker_threads");
 const { version } = require("../../package.json");
 const { defaultConfig } = require("../config/default-config");
+const timing = require("../linter/timing");
 
 const {
 	createDebug,
@@ -503,6 +504,11 @@ async function runWorkers(
 					worstNetLintingRatio,
 					netLintingRatio,
 				);
+
+				if (timing.enabled && indexedResults.timings) {
+					timing.mergeData(indexedResults.timings);
+				}
+
 				for (const result of indexedResults) {
 					const { index } = result;
 					delete result.index;
@@ -522,7 +528,17 @@ async function runWorkers(
 	for (let index = 0; index < workerCount; ++index) {
 		promises[index] = new Promise(workerExecutor);
 	}
-	await Promise.all(promises);
+
+	try {
+		await Promise.all(promises);
+	} catch (error) {
+		/*
+		 * If any worker fails, suppress timing display in the main thread
+		 * to avoid printing partial or misleading timing output.
+		 */
+		timing.disableDisplay();
+		throw error;
+	}
 
 	if (worstNetLintingRatio < LOW_NET_LINTING_RATIO) {
 		warnOnLowNetLintingRatio();

package/lib/eslint/worker.js

@@ -29,6 +29,7 @@ const {
 	processOptions,
 } = require("./eslint-helpers");
 const { WarningService } = require("../services/warning-service");
+const timing = require("../linter/timing");
 
 const depsLoadedTime = hrtimeBigint();
 
@@ -39,7 +40,7 @@ const depsLoadedTime = hrtimeBigint();
 /** @typedef {import("../types").ESLint.LintResult} LintResult */
 /** @typedef {import("../types").ESLint.Options} ESLintOptions */
 /** @typedef {LintResult & { index?: number; }} IndexedLintResult */
-/** @typedef {IndexedLintResult[] & { netLintingDuration: bigint; }} WorkerLintResults */
+/** @typedef {IndexedLintResult[] & { netLintingDuration: bigint; timings?: Record<string, number>; }} WorkerLintResults */
 /**
  * @typedef {Object} WorkerData - Data passed to the worker thread.
  * @property {ESLintOptions | string} eslintOptionsOrURL - The unprocessed ESLint options or the URL of the options module.
@@ -57,6 +58,12 @@ const debug = createDebug(`eslint:worker:thread-${threadId}`);
 // Main
 //------------------------------------------------------------------------------
 
+/*
+ * Prevent timing module from printing profiling output from worker threads.
+ * The main thread is responsible for displaying any aggregated timings.
+ */
+timing.disableDisplay();
+
 debug("Dependencies loaded in %t", depsLoadedTime - startTime);
 
 (async () => {
@@ -158,5 +165,9 @@ debug("Dependencies loaded in %t", depsLoadedTime - startTime);
 	indexedResults.netLintingDuration =
 		lintingDuration - loadConfigTotalDuration - readFileCounter.duration;
 
+	if (timing.enabled) {
+		indexedResults.timings = timing.getData();
+	}
+
 	parentPort.postMessage(indexedResults);
 })();

package/lib/languages/js/source-code/source-code.js

@@ -1303,7 +1303,7 @@ class SourceCode extends TokenStore {
 					new VisitNodeStep({
 						target: node,
 						phase: 1,
-						args: [node, node.parent],
+						args: [node],
 					}),
 				);
 			},
@@ -1312,7 +1312,7 @@ class SourceCode extends TokenStore {
 					new VisitNodeStep({
 						target: node,
 						phase: 2,
-						args: [node, node.parent],
+						args: [node],
 					}),
 				);
 			},

package/lib/linter/file-report.js

@@ -426,7 +426,7 @@ function validateSuggestions(suggest, messages) {
 
 			if (typeof suggestion.fix !== "function") {
 				throw new TypeError(
-					`context.report() called with a suggest option without a fix function. See: ${suggestion}`,
+					`context.report() called with a suggest option without a fix function. See: ${JSON.stringify(suggestion, null, 2)}`,
 				);
 			}
 		});

package/lib/linter/source-code-traverser.js

@@ -17,8 +17,9 @@ const vk = require("eslint-visitor-keys");
 //-----------------------------------------------------------------------------
 
 /**
- * @import { ESQueryParsedSelector } from "./esquery.js";
  * @import { Language, SourceCode } from "@eslint/core";
+ * @import { ESQueryOptions } from "esquery";
+ * @import { ESQueryParsedSelector } from "./esquery.js";
  * @import { SourceCodeVisitor } from "./source-code-visitor.js";
  */
 
@@ -47,11 +48,10 @@ class ESQueryHelper {
 	 * Creates a new instance.
 	 * @param {SourceCodeVisitor} visitor The visitor containing the functions to call.
 	 * @param {ESQueryOptions} esqueryOptions `esquery` options for traversing custom nodes.
-	 * @returns {NodeEventGenerator} new instance
 	 */
 	constructor(visitor, esqueryOptions) {
 		/**
-		 * The emitter to use during traversal.
+		 * The visitor to use during traversal.
 		 * @type {SourceCodeVisitor}
 		 */
 		this.visitor = visitor;
@@ -288,7 +288,10 @@ class SourceCodeTraverser {
 									false,
 								)
 								.forEach(selector => {
-									visitor.callSync(selector, step.target);
+									visitor.callSync(
+										selector,
+										...(step.args ?? [step.target]),
+									);
 								});
 							currentAncestry.unshift(step.target);
 						} else {
@@ -300,7 +303,10 @@ class SourceCodeTraverser {
 									true,
 								)
 								.forEach(selector => {
-									visitor.callSync(selector, step.target);
+									visitor.callSync(
+										selector,
+										...(step.args ?? [step.target]),
+									);
 								});
 						}
 					} catch (err) {

package/lib/linter/timing.js

@@ -131,6 +131,7 @@ function display(data) {
 /* c8 ignore next */
 module.exports = (function () {
 	const data = Object.create(null);
+	let displayEnabled = true;
 
 	/**
 	 * Time the run
@@ -158,9 +159,42 @@ module.exports = (function () {
 		};
 	}
 
+	/**
+	 * Returns a shallow copy of the collected timings data.
+	 * @returns {Record<string, number>} mapping of ruleId to total time in ms
+	 */
+	function getData() {
+		return { ...data };
+	}
+
+	/**
+	 * Merges rule timing totals collected elsewhere into this process' totals.
+	 * @param {Record<string, number>} dataToMerge mapping of ruleId to total time in ms
+	 * @returns {void}
+	 */
+	function mergeData(dataToMerge) {
+		for (const [key, value] of Object.entries(dataToMerge)) {
+			if (typeof data[key] === "undefined") {
+				data[key] = 0;
+			}
+			data[key] += value;
+		}
+	}
+
+	/**
+	 * Disables printing of timing data on process exit.
+	 * Intended for worker threads or non-main contexts.
+	 * @returns {void}
+	 */
+	function disableDisplay() {
+		displayEnabled = false;
+	}
+
 	if (enabled) {
 		process.on("exit", () => {
-			display(data);
+			if (displayEnabled && Object.keys(data).length > 0) {
+				display(data);
+			}
 		});
 	}
 
@@ -168,5 +202,8 @@ module.exports = (function () {
 		time,
 		enabled,
 		getListSize,
+		getData,
+		mergeData,
+		disableDisplay,
 	};
 })();

package/lib/rules/complexity.js

@@ -68,6 +68,7 @@ module.exports = {
 	},
 
 	create(context) {
+		const sourceCode = context.sourceCode;
 		const option = context.options[0];
 		let threshold = THRESHOLD_DEFAULT;
 		let VARIANT = "classic";
@@ -177,12 +178,10 @@ module.exports = {
 						name = "class field initializer";
 					} else if (codePath.origin === "class-static-block") {
 						name = "class static block";
+						loc = sourceCode.getFirstToken(node).loc;
 					} else {
 						name = astUtils.getFunctionNameWithKind(node);
-						loc = astUtils.getFunctionHeadLoc(
-							node,
-							context.sourceCode,
-						);
+						loc = astUtils.getFunctionHeadLoc(node, sourceCode);
 					}
 
 					context.report({

package/lib/rules/for-direction.js

@@ -46,7 +46,10 @@ module.exports = {
 		 */
 		function report(node) {
 			context.report({
-				node,
+				loc: {
+					start: node.loc.start,
+					end: sourceCode.getTokenBefore(node.body).loc.end,
+				},
 				messageId: "incorrectDirection",
 			});
 		}

package/lib/rules/no-dupe-args.js

@@ -5,6 +5,12 @@
 
 "use strict";
 
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+const astUtils = require("./utils/ast-utils");
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -58,10 +64,15 @@ module.exports = {
 
 				// Checks and reports duplications.
 				const defs = variable.defs.filter(isParameter);
+				const loc = {
+					start: astUtils.getOpeningParenOfParams(node, sourceCode)
+						.loc.start,
+					end: sourceCode.getTokenBefore(node.body).loc.end,
+				};
 
 				if (defs.length >= 2) {
 					context.report({
-						node,
+						loc,
 						messageId: "unexpected",
 						data: { name: variable.name },
 					});

package/lib/rules/no-dupe-class-members.js

@@ -106,7 +106,7 @@ module.exports = {
 
 				if (isDuplicate) {
 					context.report({
-						node,
+						loc: node.key.loc,
 						messageId: "unexpected",
 						data: { name },
 					});

package/lib/rules/object-shorthand.js

@@ -19,6 +19,86 @@ const OPTIONS = {
 //------------------------------------------------------------------------------
 const astUtils = require("./utils/ast-utils");
 
+//--------------------------------------------------------------------------
+// Helpers
+//--------------------------------------------------------------------------
+const CTOR_PREFIX_REGEX = /[^_$0-9]/u;
+const JSDOC_COMMENT_REGEX = /^\s*\*/u;
+
+/**
+ * Determines if the first character of the name is a capital letter.
+ * @param {string} name The name of the node to evaluate.
+ * @returns {boolean} True if the first character of the property name is a capital letter, false if not.
+ * @private
+ */
+function isConstructor(name) {
+	const match = CTOR_PREFIX_REGEX.exec(name);
+
+	// Not a constructor if name has no characters apart from '_', '$' and digits e.g. '_', '$$', '_8'
+	if (!match) {
+		return false;
+	}
+
+	const firstChar = name.charAt(match.index);
+
+	return firstChar === firstChar.toUpperCase();
+}
+
+/**
+ * Determines if the property can have a shorthand form.
+ * @param {ASTNode} property Property AST node
+ * @returns {boolean} True if the property can have a shorthand form
+ * @private
+ */
+function canHaveShorthand(property) {
+	return (
+		property.kind !== "set" &&
+		property.kind !== "get" &&
+		property.type !== "SpreadElement" &&
+		property.type !== "SpreadProperty" &&
+		property.type !== "ExperimentalSpreadProperty"
+	);
+}
+
+/**
+ * Checks whether a node is a string literal.
+ * @param {ASTNode} node Any AST node.
+ * @returns {boolean} `true` if it is a string literal.
+ */
+function isStringLiteral(node) {
+	return node.type === "Literal" && typeof node.value === "string";
+}
+
+/**
+ * Determines if the property is a shorthand or not.
+ * @param {ASTNode} property Property AST node
+ * @returns {boolean} True if the property is considered shorthand, false if not.
+ * @private
+ */
+function isShorthand(property) {
+	// property.method is true when `{a(){}}`.
+	return property.shorthand || property.method;
+}
+
+/**
+ * Determines if the property's key and method or value are named equally.
+ * @param {ASTNode} property Property AST node
+ * @returns {boolean} True if the key and value are named equally, false if not.
+ * @private
+ */
+function isRedundant(property) {
+	const value = property.value;
+
+	if (value.type === "FunctionExpression") {
+		return !value.id; // Only anonymous should be shorthand method.
+	}
+	if (value.type === "Identifier") {
+		return astUtils.getStaticPropertyName(property) === value.name;
+	}
+
+	return false;
+}
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -139,86 +219,6 @@ module.exports = {
 		const AVOID_EXPLICIT_RETURN_ARROWS = !!PARAMS.avoidExplicitReturnArrows;
 		const sourceCode = context.sourceCode;
 
-		//--------------------------------------------------------------------------
-		// Helpers
-		//--------------------------------------------------------------------------
-
-		const CTOR_PREFIX_REGEX = /[^_$0-9]/u;
-
-		/**
-		 * Determines if the first character of the name is a capital letter.
-		 * @param {string} name The name of the node to evaluate.
-		 * @returns {boolean} True if the first character of the property name is a capital letter, false if not.
-		 * @private
-		 */
-		function isConstructor(name) {
-			const match = CTOR_PREFIX_REGEX.exec(name);
-
-			// Not a constructor if name has no characters apart from '_', '$' and digits e.g. '_', '$$', '_8'
-			if (!match) {
-				return false;
-			}
-
-			const firstChar = name.charAt(match.index);
-
-			return firstChar === firstChar.toUpperCase();
-		}
-
-		/**
-		 * Determines if the property can have a shorthand form.
-		 * @param {ASTNode} property Property AST node
-		 * @returns {boolean} True if the property can have a shorthand form
-		 * @private
-		 */
-		function canHaveShorthand(property) {
-			return (
-				property.kind !== "set" &&
-				property.kind !== "get" &&
-				property.type !== "SpreadElement" &&
-				property.type !== "SpreadProperty" &&
-				property.type !== "ExperimentalSpreadProperty"
-			);
-		}
-
-		/**
-		 * Checks whether a node is a string literal.
-		 * @param {ASTNode} node Any AST node.
-		 * @returns {boolean} `true` if it is a string literal.
-		 */
-		function isStringLiteral(node) {
-			return node.type === "Literal" && typeof node.value === "string";
-		}
-
-		/**
-		 * Determines if the property is a shorthand or not.
-		 * @param {ASTNode} property Property AST node
-		 * @returns {boolean} True if the property is considered shorthand, false if not.
-		 * @private
-		 */
-		function isShorthand(property) {
-			// property.method is true when `{a(){}}`.
-			return property.shorthand || property.method;
-		}
-
-		/**
-		 * Determines if the property's key and method or value are named equally.
-		 * @param {ASTNode} property Property AST node
-		 * @returns {boolean} True if the key and value are named equally, false if not.
-		 * @private
-		 */
-		function isRedundant(property) {
-			const value = property.value;
-
-			if (value.type === "FunctionExpression") {
-				return !value.id; // Only anonymous should be shorthand method.
-			}
-			if (value.type === "Identifier") {
-				return astUtils.getStaticPropertyName(property) === value.name;
-			}
-
-			return false;
-		}
-
 		/**
 		 * Ensures that an object's properties are consistently shorthand, or not shorthand at all.
 		 * @param {ASTNode} node Property AST node
@@ -582,6 +582,19 @@ module.exports = {
 					node.key.name === node.value.name &&
 					APPLY_TO_PROPS
 				) {
+					// Skip if there are JSDoc comments inside the property (e.g., JSDoc type annotations)
+					const comments = sourceCode.getCommentsInside(node);
+					if (
+						comments.some(
+							comment =>
+								comment.type === "Block" &&
+								JSDOC_COMMENT_REGEX.test(comment.value) &&
+								comment.value.includes("@type"),
+						)
+					) {
+						return;
+					}
+
 					// {x: x} should be written as {x}
 					context.report({
 						node,
@@ -606,6 +619,18 @@ module.exports = {
 						return;
 					}
 
+					const comments = sourceCode.getCommentsInside(node);
+					if (
+						comments.some(
+							comment =>
+								comment.type === "Block" &&
+								comment.value.startsWith("*") &&
+								comment.value.includes("@type"),
+						)
+					) {
+						return;
+					}
+
 					// {"x": x} should be written as {x}
 					context.report({
 						node,

package/lib/rules/utils/ast-utils.js

@@ -2729,4 +2729,5 @@ module.exports = {
 	isStartOfExpressionStatement,
 	needsPrecedingSemicolon,
 	isImportAttributeKey,
+	getOpeningParenOfParams,
 };