eslint 9.28.0 → 9.30.0

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;
 				}
 

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

@@ -0,0 +1,81 @@
+/**
+ * @fileoverview SourceCodeVisitor class
+ * @author Nicholas C. Zakas
+ */
+
+"use strict";
+
+//-----------------------------------------------------------------------------
+// Helpers
+//-----------------------------------------------------------------------------
+
+const emptyArray = Object.freeze([]);
+
+//------------------------------------------------------------------------------
+// Exports
+//------------------------------------------------------------------------------
+
+/**
+ * A structure to hold a list of functions to call for a given name.
+ * This is used to allow multiple rules to register functions for a given name
+ * without having to know about each other.
+ */
+class SourceCodeVisitor {
+	/**
+	 * The functions to call for a given name.
+	 * @type {Map<string, Function[]>}
+	 */
+	#functions = new Map();
+
+	/**
+	 * Adds a function to the list of functions to call for a given name.
+	 * @param {string} name The name of the function to call.
+	 * @param {Function} func The function to call.
+	 * @returns {void}
+	 */
+	add(name, func) {
+		if (this.#functions.has(name)) {
+			this.#functions.get(name).push(func);
+		} else {
+			this.#functions.set(name, [func]);
+		}
+	}
+
+	/**
+	 * Gets the list of functions to call for a given name.
+	 * @param {string} name The name of the function to call.
+	 * @returns {Function[]} The list of functions to call.
+	 */
+	get(name) {
+		if (this.#functions.has(name)) {
+			return this.#functions.get(name);
+		}
+
+		return emptyArray;
+	}
+
+	/**
+	 * Iterates over all names and calls the callback with the name.
+	 * @param {(name:string) => void} callback The callback to call for each name.
+	 * @returns {void}
+	 */
+	forEachName(callback) {
+		this.#functions.forEach((funcs, name) => {
+			callback(name);
+		});
+	}
+
+	/**
+	 * Calls the functions for a given name with the given arguments.
+	 * @param {string} name The name of the function to call.
+	 * @param {any[]} args The arguments to pass to the function.
+	 * @returns {void}
+	 */
+	callSync(name, ...args) {
+		if (this.#functions.has(name)) {
+			this.#functions.get(name).forEach(func => func(...args));
+		}
+	}
+}
+
+module.exports = { SourceCodeVisitor };

package/lib/rules/array-bracket-newline.js

@@ -26,12 +26,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: "array-bracket-newline",
-						url: "https://eslint.style/rules/js/array-bracket-newline",
+						url: "https://eslint.style/rules/array-bracket-newline",
 					},
 				},
 			],

package/lib/rules/array-bracket-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: "array-bracket-spacing",
-						url: "https://eslint.style/rules/js/array-bracket-spacing",
+						url: "https://eslint.style/rules/array-bracket-spacing",
 					},
 				},
 			],

package/lib/rules/array-element-newline.js

@@ -26,12 +26,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: "array-element-newline",
-						url: "https://eslint.style/rules/js/array-element-newline",
+						url: "https://eslint.style/rules/array-element-newline",
 					},
 				},
 			],

package/lib/rules/arrow-parens.js

@@ -42,12 +42,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: "arrow-parens",
-						url: "https://eslint.style/rules/js/arrow-parens",
+						url: "https://eslint.style/rules/arrow-parens",
 					},
 				},
 			],

package/lib/rules/arrow-spacing.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: "arrow-spacing",
-						url: "https://eslint.style/rules/js/arrow-spacing",
+						url: "https://eslint.style/rules/arrow-spacing",
 					},
 				},
 			],

package/lib/rules/block-spacing.js

@@ -26,12 +26,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: "block-spacing",
-						url: "https://eslint.style/rules/js/block-spacing",
+						url: "https://eslint.style/rules/block-spacing",
 					},
 				},
 			],

package/lib/rules/brace-style.js

@@ -26,12 +26,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: "brace-style",
-						url: "https://eslint.style/rules/js/brace-style",
+						url: "https://eslint.style/rules/brace-style",
 					},
 				},
 			],

package/lib/rules/class-methods-use-this.js

@@ -111,6 +111,7 @@ module.exports = {
 			switch (node.type) {
 				case "MethodDefinition":
 					return !node.static && node.kind !== "constructor";
+				case "AccessorProperty":
 				case "PropertyDefinition":
 					return !node.static && enforceForClassFields;
 				default:
@@ -218,6 +219,8 @@ module.exports = {
 			/*
 			 * Class field value are implicit functions.
 			 */
+			"AccessorProperty > *.key:exit": pushContext,
+			"AccessorProperty:exit": popContext,
 			"PropertyDefinition > *.key:exit": pushContext,
 			"PropertyDefinition:exit": popContext,
 
@@ -233,6 +236,10 @@ module.exports = {
 			ThisExpression: markThisUsed,
 			Super: markThisUsed,
 			...(enforceForClassFields && {
+				"AccessorProperty > ArrowFunctionExpression.value":
+					enterFunction,
+				"AccessorProperty > ArrowFunctionExpression.value:exit":
+					exitFunction,
 				"PropertyDefinition > ArrowFunctionExpression.value":
 					enterFunction,
 				"PropertyDefinition > ArrowFunctionExpression.value:exit":

package/lib/rules/comma-dangle.js

@@ -85,12 +85,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: "comma-dangle",
-						url: "https://eslint.style/rules/js/comma-dangle",
+						url: "https://eslint.style/rules/comma-dangle",
 					},
 				},
 			],

package/lib/rules/comma-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: "comma-spacing",
-						url: "https://eslint.style/rules/js/comma-spacing",
+						url: "https://eslint.style/rules/comma-spacing",
 					},
 				},
 			],

package/lib/rules/comma-style.js

@@ -26,12 +26,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: "comma-style",
-						url: "https://eslint.style/rules/js/comma-style",
+						url: "https://eslint.style/rules/comma-style",
 					},
 				},
 			],

package/lib/rules/computed-property-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: "computed-property-spacing",
-						url: "https://eslint.style/rules/js/computed-property-spacing",
+						url: "https://eslint.style/rules/computed-property-spacing",
 					},
 				},
 			],

package/lib/rules/dot-location.js

@@ -26,12 +26,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: "dot-location",
-						url: "https://eslint.style/rules/js/dot-location",
+						url: "https://eslint.style/rules/dot-location",
 					},
 				},
 			],

package/lib/rules/eol-last.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: "eol-last",
-						url: "https://eslint.style/rules/js/eol-last",
+						url: "https://eslint.style/rules/eol-last",
 					},
 				},
 			],

package/lib/rules/func-call-spacing.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: "function-call-spacing",
-						url: "https://eslint.style/rules/js/function-call-spacing",
+						url: "https://eslint.style/rules/function-call-spacing",
 					},
 				},
 			],

package/lib/rules/function-call-argument-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: "function-call-argument-newline",
-						url: "https://eslint.style/rules/js/function-call-argument-newline",
+						url: "https://eslint.style/rules/function-call-argument-newline",
 					},
 				},
 			],

package/lib/rules/function-paren-newline.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: "function-paren-newline",
-						url: "https://eslint.style/rules/js/function-paren-newline",
+						url: "https://eslint.style/rules/function-paren-newline",
 					},
 				},
 			],

package/lib/rules/generator-star-spacing.js

@@ -40,12 +40,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: "generator-star-spacing",
-						url: "https://eslint.style/rules/js/generator-star-spacing",
+						url: "https://eslint.style/rules/generator-star-spacing",
 					},
 				},
 			],

package/lib/rules/implicit-arrow-linebreak.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: "implicit-arrow-linebreak",
-						url: "https://eslint.style/rules/js/implicit-arrow-linebreak",
+						url: "https://eslint.style/rules/implicit-arrow-linebreak",
 					},
 				},
 			],

package/lib/rules/indent-legacy.js

@@ -41,12 +41,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: "indent",
-						url: "https://eslint.style/rules/js/indent",
+						url: "https://eslint.style/rules/indent",
 					},
 				},
 			],

package/lib/rules/indent.js

@@ -519,12 +519,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: "indent",
-						url: "https://eslint.style/rules/js/indent",
+						url: "https://eslint.style/rules/indent",
 					},
 				},
 			],