eslint 9.28.0 → 9.29.0

package/README.md

@@ -329,7 +329,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://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://nolebase.ayaka.io"><img src="https://avatars.githubusercontent.com/u/11081491" alt="Neko" 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://sentry.io"><img src="https://github.com/getsentry.png" alt="Sentry" height="32"></a> <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://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://nolebase.ayaka.io"><img src="https://avatars.githubusercontent.com/u/11081491" alt="Neko" 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/conf/ecma-version.js

@@ -9,7 +9,7 @@
  * The latest ECMAScript version supported by ESLint.
  * @type {number} year-based ECMAScript version
  */
-const LATEST_ECMA_VERSION = 2025;
+const LATEST_ECMA_VERSION = 2026;
 
 module.exports = {
 	LATEST_ECMA_VERSION,

package/conf/globals.js

@@ -135,6 +135,15 @@ const es2024 = {
 
 const es2025 = {
 	...es2024,
+	Float16Array: false,
+	Iterator: false,
+};
+
+const es2026 = {
+	...es2025,
+	AsyncDisposableStack: false,
+	DisposableStack: false,
+	SuppressedError: false,
 };
 
 //-----------------------------------------------------------------------------
@@ -156,4 +165,5 @@ module.exports = {
 	es2023,
 	es2024,
 	es2025,
+	es2026,
 };

package/lib/cli.js

@@ -28,13 +28,14 @@ const fs = require("node:fs"),
 	log = require("./shared/logging"),
 	RuntimeInfo = require("./shared/runtime-info"),
 	{ normalizeSeverityToString } = require("./shared/severity");
-const {
-	Legacy: { naming },
-} = require("@eslint/eslintrc");
 const { ModuleImporter } = require("@humanwhocodes/module-importer");
 const { getCacheFile } = require("./eslint/eslint-helpers");
 const { SuppressionsService } = require("./services/suppressions-service");
 const debug = require("debug")("eslint:cli");
+const {
+	normalizePackageName,
+	getShorthandName,
+} = require("./shared/naming.js");
 
 //------------------------------------------------------------------------------
 // Types
@@ -67,10 +68,7 @@ async function loadPlugins(importer, pluginNames) {
 
 	await Promise.all(
 		pluginNames.map(async pluginName => {
-			const longName = naming.normalizePackageName(
-				pluginName,
-				"eslint-plugin",
-			);
+			const longName = normalizePackageName(pluginName, "eslint-plugin");
 			const module = await importer.import(longName);
 
 			if (!("default" in module)) {
@@ -79,10 +77,7 @@ async function loadPlugins(importer, pluginNames) {
 				);
 			}
 
-			const shortName = naming.getShorthandName(
-				pluginName,
-				"eslint-plugin",
-			);
+			const shortName = getShorthandName(pluginName, "eslint-plugin");
 
 			plugins[shortName] = module.default;
 		}),

package/lib/eslint/eslint.js

@@ -15,13 +15,6 @@ const path = require("node:path");
 const { version } = require("../../package.json");
 const { Linter } = require("../linter");
 const { defaultConfig } = require("../config/default-config");
-const {
-	Legacy: {
-		ConfigOps: { getRuleSeverity },
-		ModuleResolver,
-		naming,
-	},
-} = require("@eslint/eslintrc");
 
 const {
 	findFiles,
@@ -41,6 +34,13 @@ const LintResultCache = require("../cli-engine/lint-result-cache");
 const { Retrier } = require("@humanwhocodes/retry");
 const { ConfigLoader, LegacyConfigLoader } = require("../config/config-loader");
 const { WarningService } = require("../services/warning-service");
+const { Config } = require("../config/config.js");
+const {
+	getShorthandName,
+	getNamespaceFromTerm,
+	normalizePackageName,
+} = require("../shared/naming.js");
+const { resolve } = require("../shared/relative-module-resolver.js");
 
 /*
  * This is necessary to allow overwriting writeFile for testing purposes.
@@ -160,7 +160,7 @@ function getOrFindUsedDeprecatedRules(eslint, maybeFilePath) {
 
 		if (config.rules) {
 			for (const [ruleId, ruleConf] of Object.entries(config.rules)) {
-				if (getRuleSeverity(ruleConf) === 0) {
+				if (Config.getRuleNumericSeverity(ruleConf) === 0) {
 					continue;
 				}
 				const rule = config.getRuleDefinition(ruleId);
@@ -174,7 +174,7 @@ function getOrFindUsedDeprecatedRules(eslint, maybeFilePath) {
 						replacedBy: usesNewFormat
 							? (meta.deprecated.replacedBy?.map(
 									replacement =>
-										`${replacement.plugin?.name !== void 0 ? `${naming.getShorthandName(replacement.plugin.name, "eslint-plugin")}/` : ""}${replacement.rule?.name ?? ""}`,
+										`${replacement.plugin?.name !== void 0 ? `${getShorthandName(replacement.plugin.name, "eslint-plugin")}/` : ""}${replacement.rule?.name ?? ""}`,
 								) ?? [])
 							: meta.replacedBy || [],
 						info: usesNewFormat ? meta.deprecated : void 0,
@@ -489,8 +489,7 @@ class ESLint {
 			for (const [pluginName, plugin] of Object.entries(
 				options.plugins,
 			)) {
-				plugins[naming.getShorthandName(pluginName, "eslint-plugin")] =
-					plugin;
+				plugins[getShorthandName(pluginName, "eslint-plugin")] = plugin;
 			}
 
 			defaultConfigs.push({
@@ -998,7 +997,7 @@ class ESLint {
 
 		// replace \ with / for Windows compatibility
 		const normalizedFormatName = name.replace(/\\/gu, "/");
-		const namespace = naming.getNamespaceFromTerm(normalizedFormatName);
+		const namespace = getNamespaceFromTerm(normalizedFormatName);
 
 		// grab our options
 		const { cwd } = privateMembers.get(this).options;
@@ -1010,16 +1009,13 @@ class ESLint {
 			formatterPath = path.resolve(cwd, normalizedFormatName);
 		} else {
 			try {
-				const npmFormat = naming.normalizePackageName(
+				const npmFormat = normalizePackageName(
 					normalizedFormatName,
 					"eslint-formatter",
 				);
 
 				// TODO: This is pretty dirty...would be nice to clean up at some point.
-				formatterPath = ModuleResolver.resolve(
-					npmFormat,
-					getPlaceholderPath(cwd),
-				);
+				formatterPath = resolve(npmFormat, getPlaceholderPath(cwd));
 			} catch {
 				formatterPath = path.resolve(
 					__dirname,

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

@@ -15,7 +15,6 @@ const { isCommentToken } = require("@eslint-community/eslint-utils"),
 	globals = require("../../../../conf/globals"),
 	{ directivesPattern } = require("../../../shared/directives"),
 	CodePathAnalyzer = require("../../../linter/code-path-analysis/code-path-analyzer"),
-	createEmitter = require("../../../linter/safe-emitter"),
 	{
 		ConfigCommentParser,
 		VisitNodeStep,
@@ -40,16 +39,6 @@ const { isCommentToken } = require("@eslint-community/eslint-utils"),
 
 const commentParser = new ConfigCommentParser();
 
-const CODE_PATH_EVENTS = [
-	"onCodePathStart",
-	"onCodePathEnd",
-	"onCodePathSegmentStart",
-	"onCodePathSegmentEnd",
-	"onCodePathSegmentLoop",
-	"onUnreachableCodePathSegmentStart",
-	"onUnreachableCodePathSegmentEnd",
-];
-
 /**
  * Validates that the given AST has the required information.
  * @param {ASTNode} ast The Program node of the AST to check.
@@ -240,6 +229,33 @@ function isSpaceBetween(sourceCode, first, second, checkInsideOfJSXText) {
 	return false;
 }
 
+/**
+ * Performs binary search to find the line number containing a given character index.
+ * Returns the lower bound - the index of the first element greater than the target.
+ * **Please note that the `lineStartIndices` should be sorted in ascending order**.
+ * - Time Complexity: O(log n) - Significantly faster than linear search for large files.
+ * @param {number[]} lineStartIndices Sorted array of line start indices.
+ * @param {number} target The character index to find the line number for.
+ * @returns {number} The 1-based line number for the target index.
+ * @private
+ */
+function findLineNumberBinarySearch(lineStartIndices, target) {
+	let low = 0;
+	let high = lineStartIndices.length;
+
+	while (low < high) {
+		const mid = ((low + high) / 2) | 0; // Use bitwise OR to floor the division
+
+		if (target < lineStartIndices[mid]) {
+			high = mid;
+		} else {
+			low = mid + 1;
+		}
+	}
+
+	return low;
+}
+
 //-----------------------------------------------------------------------------
 // Directive Comments
 //-----------------------------------------------------------------------------
@@ -422,6 +438,7 @@ class SourceCode extends TokenStore {
 			["scopes", new WeakMap()],
 			["vars", new Map()],
 			["configNodes", void 0],
+			["isGlobalReference", new WeakMap()],
 		]);
 
 		/**
@@ -720,9 +737,9 @@ class SourceCode extends TokenStore {
 
 	/**
 	 * Converts a source text index into a (line, column) pair.
-	 * @param {number} index The index of a character in a file
+	 * @param {number} index The index of a character in a file.
 	 * @throws {TypeError|RangeError} If non-numeric index or index out of range.
-	 * @returns {{line: number, column: number}} A {line, column} location object with a 0-indexed column
+	 * @returns {{line: number, column: number}} A {line, column} location object with 1-indexed line and 0-indexed column.
 	 * @public
 	 */
 	getLocFromIndex(index) {
@@ -757,7 +774,7 @@ class SourceCode extends TokenStore {
 		const lineNumber =
 			index >= this.lineStartIndices.at(-1)
 				? this.lineStartIndices.length
-				: this.lineStartIndices.findIndex(el => index < el);
+				: findLineNumberBinarySearch(this.lineStartIndices, index);
 
 		return {
 			line: lineNumber,
@@ -902,6 +919,41 @@ class SourceCode extends TokenStore {
 		return ancestorsStartingAtParent.reverse();
 	}
 
+	/**
+	 * 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.
+	 */
+	isGlobalReference(node) {
+		if (!node) {
+			throw new TypeError("Missing required argument: node.");
+		}
+
+		const cache = this[caches].get("isGlobalReference");
+
+		if (cache.has(node)) {
+			return cache.get(node);
+		}
+
+		if (node.type !== "Identifier") {
+			cache.set(node, false);
+			return false;
+		}
+
+		const variable = this.scopeManager.scopes[0].set.get(node.name);
+
+		if (!variable || variable.defs.length > 0) {
+			cache.set(node, false);
+			return false;
+		}
+
+		const result = variable.references.some(
+			({ identifier }) => identifier === node,
+		);
+		cache.set(node, result);
+		return result;
+	}
+
 	/**
 	 * Returns the location of the given node or token.
 	 * @param {ASTNode|Token} nodeOrToken The node or token to get the location of.
@@ -1239,7 +1291,6 @@ class SourceCode extends TokenStore {
 		 * custom parsers to return any AST, we need to ensure that the traversal
 		 * logic works for any AST.
 		 */
-		const emitter = createEmitter();
 		let analyzer = {
 			enterNode(node) {
 				steps.push(
@@ -1259,7 +1310,14 @@ class SourceCode extends TokenStore {
 					}),
 				);
 			},
-			emitter,
+			emit(eventName, args) {
+				steps.push(
+					new CallMethodStep({
+						target: eventName,
+						args,
+					}),
+				);
+			},
 		};
 
 		/*
@@ -1273,17 +1331,6 @@ class SourceCode extends TokenStore {
 		 */
 		if (this.isESTree) {
 			analyzer = new CodePathAnalyzer(analyzer);
-
-			CODE_PATH_EVENTS.forEach(eventName => {
-				emitter.on(eventName, (...args) => {
-					steps.push(
-						new CallMethodStep({
-							target: eventName,
-							args,
-						}),
-					);
-				});
-			});
 		}
 
 		/*

package/lib/linter/apply-disable-directives.js

@@ -19,9 +19,7 @@
 //------------------------------------------------------------------------------
 
 const escapeRegExp = require("escape-string-regexp");
-const {
-	Legacy: { ConfigOps },
-} = require("@eslint/eslintrc/universal");
+const { Config } = require("../config/config.js");
 
 /**
  * Compares the locations of two objects in a source file
@@ -539,7 +537,7 @@ module.exports = ({
 		configuredRules && ruleFilter
 			? new Set(
 					Object.keys(configuredRules).filter(ruleId => {
-						const severity = ConfigOps.getRuleSeverity(
+						const severity = Config.getRuleNumericSeverity(
 							configuredRules[ruleId],
 						);
 

package/lib/linter/code-path-analysis/code-path-analyzer.js

@@ -196,7 +196,7 @@ function forwardCurrentToHead(analyzer, node) {
 
 			debug.dump(`${eventName} ${currentSegment.id}`);
 
-			analyzer.emitter.emit(eventName, currentSegment, node);
+			analyzer.emit(eventName, [currentSegment, node]);
 		}
 	}
 
@@ -215,7 +215,7 @@ function forwardCurrentToHead(analyzer, node) {
 
 			debug.dump(`${eventName} ${headSegment.id}`);
 			CodePathSegment.markUsed(headSegment);
-			analyzer.emitter.emit(eventName, headSegment, node);
+			analyzer.emit(eventName, [headSegment, node]);
 		}
 	}
 }
@@ -239,7 +239,7 @@ function leaveFromCurrentSegment(analyzer, node) {
 
 		debug.dump(`${eventName} ${currentSegment.id}`);
 
-		analyzer.emitter.emit(eventName, currentSegment, node);
+		analyzer.emit(eventName, [currentSegment, node]);
 	}
 
 	state.currentSegments = [];
@@ -416,7 +416,7 @@ function processCodePathToEnter(analyzer, node) {
 
 		// Emits onCodePathStart events.
 		debug.dump(`onCodePathStart ${codePath.id}`);
-		analyzer.emitter.emit("onCodePathStart", codePath, node);
+		analyzer.emit("onCodePathStart", [codePath, node]);
 	}
 
 	/*
@@ -681,7 +681,7 @@ function postprocess(analyzer, node) {
 
 		// Emits onCodePathEnd event of this code path.
 		debug.dump(`onCodePathEnd ${codePath.id}`);
-		analyzer.emitter.emit("onCodePathEnd", codePath, node);
+		analyzer.emit("onCodePathEnd", [codePath, node]);
 		debug.dumpDot(codePath);
 
 		codePath = analyzer.codePath = analyzer.codePath.upper;
@@ -747,7 +747,7 @@ class CodePathAnalyzer {
 	 */
 	constructor(eventGenerator) {
 		this.original = eventGenerator;
-		this.emitter = eventGenerator.emitter;
+		this.emit = eventGenerator.emit;
 		this.codePath = null;
 		this.idGenerator = new IdGenerator("s");
 		this.currentNode = null;
@@ -816,12 +816,11 @@ class CodePathAnalyzer {
 			debug.dump(
 				`onCodePathSegmentLoop ${fromSegment.id} -> ${toSegment.id}`,
 			);
-			this.emitter.emit(
-				"onCodePathSegmentLoop",
+			this.emit("onCodePathSegmentLoop", [
 				fromSegment,
 				toSegment,
 				this.currentNode,
-			);
+			]);
 		}
 	}
 }

package/lib/linter/linter.js

@@ -29,8 +29,8 @@ const path = require("node:path"),
 	{ ConfigCommentParser } = require("@eslint/plugin-kit"),
 	createReportTranslator = require("./report-translator"),
 	Rules = require("./rules"),
-	createEmitter = require("./safe-emitter"),
 	SourceCodeFixer = require("./source-code-fixer"),
+	{ SourceCodeVisitor } = require("./source-code-visitor"),
 	timing = require("./timing"),
 	ruleReplacements = require("../../conf/replacements.json");
 const { FlatConfigArray } = require("../config/flat-config-array");
@@ -1175,7 +1175,7 @@ function runRules(
 	stats,
 	slots,
 ) {
-	const emitter = createEmitter();
+	const visitor = new SourceCodeVisitor();
 
 	/*
 	 * Create a frozen object with the ruleContext properties and methods that are shared by all rules.
@@ -1339,13 +1339,13 @@ function runRules(
 					? timing.time(ruleId, ruleListeners[selector], stats)
 					: ruleListeners[selector];
 
-			emitter.on(selector, addRuleErrorHandler(ruleListener));
+			visitor.add(selector, addRuleErrorHandler(ruleListener));
 		});
 	});
 
 	const traverser = SourceCodeTraverser.getInstance(language);
 
-	traverser.traverseSync(sourceCode, emitter, { steps });
+	traverser.traverseSync(sourceCode, visitor, { steps });
 
 	return lintingProblems;
 }

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

@@ -19,6 +19,7 @@ const vk = require("eslint-visitor-keys");
 /**
  * @import { ESQueryParsedSelector } from "./esquery.js";
  * @import { Language, SourceCode } from "@eslint/core";
+ * @import { SourceCodeVisitor } from "./source-code-visitor.js";
  */
 
 //-----------------------------------------------------------------------------
@@ -43,19 +44,17 @@ function compareSpecificity(a, b) {
  */
 class ESQueryHelper {
 	/**
-	 * @param {SafeEmitter} emitter
-	 * An SafeEmitter which is the destination of events. This emitter must already
-	 * have registered listeners for all of the events that it needs to listen for.
-	 * (See lib/linter/safe-emitter.js for more details on `SafeEmitter`.)
+	 * 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(emitter, esqueryOptions) {
+	constructor(visitor, esqueryOptions) {
 		/**
 		 * The emitter to use during traversal.
-		 * @type {SafeEmitter}
+		 * @type {SourceCodeVisitor}
 		 */
-		this.emitter = emitter;
+		this.visitor = visitor;
 
 		/**
 		 * The options for `esquery` to use during matching.
@@ -91,7 +90,7 @@ class ESQueryHelper {
 		 */
 		this.anyTypeExitSelectors = [];
 
-		emitter.eventNames().forEach(rawSelector => {
+		visitor.forEachName(rawSelector => {
 			const selector = parse(rawSelector);
 
 			/*
@@ -137,27 +136,26 @@ class ESQueryHelper {
 	}
 
 	/**
-	 * Checks a selector against a node, and emits it if it matches
+	 * Checks if a node matches a given selector.
 	 * @param {ASTNode} node The node to check
 	 * @param {ASTNode[]} ancestry The ancestry of the node being checked.
 	 * @param {ESQueryParsedSelector} selector An AST selector descriptor
-	 * @returns {void}
+	 * @returns {boolean} `true` if the selector matches the node, `false` otherwise
 	 */
-	#applySelector(node, ancestry, selector) {
-		if (matches(node, selector.root, ancestry, this.esqueryOptions)) {
-			this.emitter.emit(selector.source, node);
-		}
+	matches(node, ancestry, selector) {
+		return matches(node, selector.root, ancestry, this.esqueryOptions);
 	}
 
 	/**
-	 * Applies all appropriate selectors to a node, in specificity order
+	 * Calculates all appropriate selectors to a node, in specificity order
 	 * @param {ASTNode} node The node to check
 	 * @param {ASTNode[]} ancestry The ancestry of the node being checked.
 	 * @param {boolean} isExit `false` if the node is currently being entered, `true` if it's currently being exited
-	 * @returns {void}
+	 * @returns {string[]} An array of selectors that match the node.
 	 */
-	applySelectors(node, ancestry, isExit) {
+	calculateSelectors(node, ancestry, isExit) {
 		const nodeTypeKey = this.esqueryOptions?.nodeTypeKey || "type";
+		const selectors = [];
 
 		/*
 		 * Get the selectors that may match this node. First, check
@@ -189,27 +187,36 @@ class ESQueryHelper {
 			 * or if the next any type selector is more specific than the
 			 * next selector for this node type, apply the any type selector.
 			 */
-			if (
-				selectorsByNodeTypeIndex >= selectorsByNodeType.length ||
-				(anyTypeSelectorsIndex < anyTypeSelectors.length &&
-					anyTypeSelectors[anyTypeSelectorsIndex].compare(
-						selectorsByNodeType[selectorsByNodeTypeIndex],
-					) < 0)
-			) {
-				this.#applySelector(
-					node,
-					ancestry,
-					anyTypeSelectors[anyTypeSelectorsIndex++],
-				);
+			const hasMoreNodeTypeSelectors =
+				selectorsByNodeTypeIndex < selectorsByNodeType.length;
+			const hasMoreAnyTypeSelectors =
+				anyTypeSelectorsIndex < anyTypeSelectors.length;
+			const anyTypeSelector = anyTypeSelectors[anyTypeSelectorsIndex];
+			const nodeTypeSelector =
+				selectorsByNodeType[selectorsByNodeTypeIndex];
+
+			// Only compare specificity if both selectors exist
+			const isAnyTypeSelectorLessSpecific =
+				hasMoreAnyTypeSelectors &&
+				hasMoreNodeTypeSelectors &&
+				anyTypeSelector.compare(nodeTypeSelector) < 0;
+
+			if (!hasMoreNodeTypeSelectors || isAnyTypeSelectorLessSpecific) {
+				anyTypeSelectorsIndex++;
+
+				if (this.matches(node, ancestry, anyTypeSelector)) {
+					selectors.push(anyTypeSelector.source);
+				}
 			} else {
-				// otherwise apply the node type selector
-				this.#applySelector(
-					node,
-					ancestry,
-					selectorsByNodeType[selectorsByNodeTypeIndex++],
-				);
+				selectorsByNodeTypeIndex++;
+
+				if (this.matches(node, ancestry, nodeTypeSelector)) {
+					selectors.push(nodeTypeSelector.source);
+				}
 			}
 		}
+
+		return selectors;
 	}
 }
 
@@ -253,14 +260,14 @@ class SourceCodeTraverser {
 	/**
 	 * Traverses the given source code synchronously.
 	 * @param {SourceCode} sourceCode The source code to traverse.
-	 * @param {SafeEmitter} emitter The emitter to use for events.
+	 * @param {SourceCodeVisitor} visitor The emitter to use for events.
 	 * @param {Object} options Options for traversal.
 	 * @param {ReturnType<SourceCode["traverse"]>} options.steps The steps to take during traversal.
 	 * @returns {void}
 	 * @throws {Error} If an error occurs during traversal.
 	 */
-	traverseSync(sourceCode, emitter, { steps } = {}) {
-		const esquery = new ESQueryHelper(emitter, {
+	traverseSync(sourceCode, visitor, { steps } = {}) {
+		const esquery = new ESQueryHelper(visitor, {
 			visitorKeys: sourceCode.visitorKeys ?? this.#language.visitorKeys,
 			fallback: vk.getKeys,
 			matchClass: this.#language.matchesSelectorClass ?? (() => false),
@@ -274,19 +281,27 @@ class SourceCodeTraverser {
 				case STEP_KIND_VISIT: {
 					try {
 						if (step.phase === 1) {
-							esquery.applySelectors(
-								step.target,
-								currentAncestry,
-								false,
-							);
+							esquery
+								.calculateSelectors(
+									step.target,
+									currentAncestry,
+									false,
+								)
+								.forEach(selector => {
+									visitor.callSync(selector, step.target);
+								});
 							currentAncestry.unshift(step.target);
 						} else {
 							currentAncestry.shift();
-							esquery.applySelectors(
-								step.target,
-								currentAncestry,
-								true,
-							);
+							esquery
+								.calculateSelectors(
+									step.target,
+									currentAncestry,
+									true,
+								)
+								.forEach(selector => {
+									visitor.callSync(selector, step.target);
+								});
 						}
 					} catch (err) {
 						err.currentNode = step.target;
@@ -296,7 +311,7 @@ class SourceCodeTraverser {
 				}
 
 				case STEP_KIND_CALL: {
-					emitter.emit(step.target, ...step.args);
+					visitor.callSync(step.target, ...step.args);
 					break;
 				}