eslint 10.0.0-rc.0 → 10.0.0-rc.1

package/README.md

@@ -342,7 +342,7 @@ 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></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://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/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://vite.dev/"><img src="https://images.opencollective.com/vite/d472863/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://www.crawljobs.com/"><img src="https://images.opencollective.com/crawljobs-poland/fa43a17/logo.png" alt="CrawlJobs" height="32"></a> <a href="https://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" height="32"></a> <a href="https://www.n-ix.com/"><img src="https://images.opencollective.com/n-ix-ltd/575a7a5/logo.png" alt="N-iX Ltd" 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://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.

package/lib/rule-tester/rule-tester.js

@@ -657,14 +657,25 @@ function assertInvalidTestCase(
 /**
  * Gets the invocation location from the stack trace for later use.
  * @param {Function} relative The function before the invocation point.
- * @returns {string} The invocation location.
+ * @returns {{ sourceFile: string; sourceLine: number; sourceColumn: number; }} The invocation location.
  */
 function getInvocationLocation(relative = getInvocationLocation) {
 	const dummyObject = {};
-	Error.captureStackTrace(dummyObject, relative);
-	const { stack } = dummyObject;
-
-	return stack.split("\n")[1].replace(/.*?\(/u, "").replace(/\)$/u, "");
+	let location;
+	const { prepareStackTrace } = Error;
+	Error.prepareStackTrace = (_, [callSite]) => {
+		location = {
+			sourceFile:
+				callSite.getFileName() ??
+				`${callSite.getEvalOrigin()}, <anonymous>`,
+			sourceLine: callSite.getLineNumber() ?? 1,
+			sourceColumn: callSite.getColumnNumber() ?? 1,
+		};
+	};
+	Error.captureStackTrace(dummyObject, relative); // invoke Error.prepareStackTrace in Bun
+	void dummyObject.stack; // invoke Error.prepareStackTrace in Node.js
+	Error.prepareStackTrace = prepareStackTrace;
+	return location;
 }
 
 /**
@@ -677,14 +688,10 @@ function buildLazyTestLocationEstimator(invoker) {
 	let testLocations = null;
 	return key => {
 		if (testLocations === null) {
-			let [sourceFile, sourceLine = "1", sourceColumn = "1"] =
-				invocationLocation
-					.replace(/:\\/u, "\\\\") // Windows workaround for C:\\
-					.split(":");
-			sourceFile = sourceFile.replace(/\\\\/u, ":\\");
-			sourceLine = Number(sourceLine);
-			sourceColumn = Number(sourceColumn);
-			testLocations = { root: invocationLocation };
+			const { sourceFile, sourceLine, sourceColumn } = invocationLocation;
+			testLocations = {
+				root: `${sourceFile}:${sourceLine}:${sourceColumn}`,
+			};
 
 			if (existsSync(sourceFile)) {
 				let content = readFileSync(sourceFile, "utf8")
@@ -700,10 +707,10 @@ function buildLazyTestLocationEstimator(invoker) {
 
 				// Roots
 				const validStartIndex = content.findIndex(line =>
-					/\bvalid:/u.test(line),
+					/\bvalid\s*:/u.test(line),
 				);
 				const invalidStartIndex = content.findIndex(line =>
-					/\binvalid:/u.test(line),
+					/\binvalid\s*:/u.test(line),
 				);
 
 				testLocations.valid = `${sourceFile}:${

package/lib/rules/no-shadow.js

@@ -346,32 +346,97 @@ module.exports = {
 		}
 
 		/**
-		 * Checks if a variable is inside the initializer of scopeVar.
+		 * Finds the uppermost expression node that can evaluate to the given one.
 		 *
-		 * To avoid reporting at declarations such as `var a = function a() {};`.
-		 * But it should report `var a = function(a) {};` or `var a = function() { function a() {} };`.
-		 * @param {Object} variable The variable to check.
-		 * @param {Object} scopeVar The scope variable to look for.
-		 * @returns {boolean} Whether or not the variable is inside initializer of scopeVar.
+		 * Examples:
+		 *    If given `a` in `a || foo`, it returns the `a || foo` node.
+		 *    If given `a` in `foo ? a : bar`, it returns the `foo ? a : bar` node.
+		 *    If given `a` in `foo ? bar : (baz && a)`, it returns the `foo ? bar : (baz && a)` node.
+		 *    If given `a` in `a ? foo : bar`, it returns the `a` node.
+		 *    If given `a` in `foo(a)`, it returns the `a` node.
+		 * @param {ASTNode} expression The expression node to unwrap.
+		 * @returns {ASTNode} The uppermost ancestor that can evaluate to the given node
+		 *     or the given node if there is no such ancestor.
 		 */
-		function isOnInitializer(variable, scopeVar) {
-			const outerScope = scopeVar.scope;
-			const outerDef = scopeVar.defs[0];
-			const outer = outerDef && outerDef.parent && outerDef.parent.range;
-			const innerScope = variable.scope;
-			const innerDef = variable.defs[0];
-			const inner = innerDef && innerDef.name.range;
+		function unwrapExpression(expression) {
+			const { parent } = expression;
 
-			return (
-				outer &&
-				inner &&
-				outer[0] < inner[0] &&
-				inner[1] < outer[1] &&
-				((innerDef.type === "FunctionName" &&
-					innerDef.node.type === "FunctionExpression") ||
-					innerDef.node.type === "ClassExpression") &&
-				outerScope === innerScope.upper
-			);
+			const shouldUnwrap =
+				parent.type === "LogicalExpression" ||
+				(parent.type === "ConditionalExpression" &&
+					parent.test !== expression);
+
+			return shouldUnwrap ? unwrapExpression(parent) : expression;
+		}
+
+		/**
+		 * Checks if inner variable is the name of a function or class
+		 * that is assigned to outer variable as its initializer.
+		 *
+		 * To avoid reporting at declarations such as:
+		 *    var a = function a() {};
+		 *    var A = class A {};
+		 *    var a = foo || function a() {};
+		 *    var a = foo ? function a() {} : bar;
+		 *    var { a = function a() {} } = foo;
+		 *
+		 * But it should report at declarations such as:
+		 *    var a = function(a) {};
+		 *    var a = function() { function a() {} };
+		 *    var a = wrap(function a() {});
+		 * @param {Object} innerVariable The inner variable to check.
+		 * @param {Object} outerVariable The outer variable.
+		 * @returns {boolean} Whether or not inner variable is the name of a
+		 *   function or class that is assigned to outer variable as its initializer.
+		 */
+		function isFunctionNameInitializerException(
+			innerVariable,
+			outerVariable,
+		) {
+			const outerDef = outerVariable.defs[0];
+			const innerDef = innerVariable.defs[0];
+
+			if (!outerDef || !innerDef) {
+				return false;
+			}
+
+			if (
+				!(
+					(innerDef.type === "FunctionName" &&
+						innerDef.node.type === "FunctionExpression") ||
+					(innerDef.type === "ClassName" &&
+						innerDef.node.type === "ClassExpression")
+				)
+			) {
+				return false;
+			}
+
+			const outerIdentifier = outerDef.name;
+			let initializerNode;
+
+			if (outerIdentifier.parent.type === "VariableDeclarator") {
+				initializerNode = outerIdentifier.parent.init;
+			} else if (outerIdentifier.parent.type === "AssignmentPattern") {
+				initializerNode = outerIdentifier.parent.right;
+			}
+
+			if (!initializerNode) {
+				return false;
+			}
+
+			const nodeToCheck = innerDef.node; // FunctionExpression or ClassExpression node
+
+			// Exit early if the node to check isn't inside the initializer
+			if (
+				!(
+					initializerNode.range[0] <= nodeToCheck.range[0] &&
+					nodeToCheck.range[1] <= initializerNode.range[1]
+				)
+			) {
+				return false;
+			}
+
+			return initializerNode === unwrapExpression(nodeToCheck);
 		}
 
 		/**
@@ -577,7 +642,7 @@ module.exports = {
 					shadowed &&
 					(shadowed.identifiers.length > 0 ||
 						(builtinGlobals && "writeable" in shadowed)) &&
-					!isOnInitializer(variable, shadowed) &&
+					!isFunctionNameInitializerException(variable, shadowed) &&
 					!(
 						ignoreOnInitialization &&
 						isInitPatternNode(variable, shadowed)

package/lib/types/index.d.ts

@@ -70,6 +70,7 @@ import type {
 	SuggestedEditBase,
 	SuggestedEdit,
 	ViolationReport,
+	MessagePlaceholderData,
 } from "@eslint/core";
 
 //------------------------------------------------------------------------------
@@ -1458,7 +1459,7 @@ export namespace RuleTester {
 	interface SuggestionOutput {
 		messageId?: string;
 		desc?: string;
-		data?: Record<string, unknown> | undefined;
+		data?: MessagePlaceholderData | undefined;
 		output: string;
 	}
 
@@ -1470,7 +1471,7 @@ export namespace RuleTester {
 	interface TestCaseError {
 		message?: string | RegExp;
 		messageId?: string;
-		data?: any;
+		data?: MessagePlaceholderData | undefined;
 		line?: number | undefined;
 		column?: number | undefined;
 		endLine?: number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "10.0.0-rc.0",
+  "version": "10.0.0-rc.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "type": "commonjs",
@@ -120,9 +120,9 @@
     "cross-spawn": "^7.0.6",
     "debug": "^4.3.2",
     "escape-string-regexp": "^4.0.0",
-    "eslint-scope": "^9.0.0",
+    "eslint-scope": "^9.1.0",
     "eslint-visitor-keys": "^5.0.0",
-    "espree": "^11.0.0",
+    "espree": "^11.1.0",
     "esquery": "^1.5.0",
     "esutils": "^2.0.2",
     "fast-deep-equal": "^3.1.3",