eslint 10.0.0-alpha.0 → 10.0.0-alpha.1

package/README.md

@@ -343,7 +343,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://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://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" 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://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://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/languages/js/source-code/source-code.js

@@ -8,8 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const { isCommentToken } = require("@eslint-community/eslint-utils"),
-	TokenStore = require("./token-store"),
+const TokenStore = require("./token-store"),
 	astUtils = require("../../../shared/ast-utils"),
 	Traverser = require("../../../shared/traverser"),
 	globals = require("../../../../conf/globals"),
@@ -90,21 +89,6 @@ function getGlobalsForEcmaVersion(ecmaVersion) {
 	}
 }
 
-/**
- * Check to see if its a ES6 export declaration.
- * @param {ASTNode} astNode An AST node.
- * @returns {boolean} whether the given node represents an export declaration.
- * @private
- */
-function looksLikeExport(astNode) {
-	return (
-		astNode.type === "ExportDefaultDeclaration" ||
-		astNode.type === "ExportNamedDeclaration" ||
-		astNode.type === "ExportAllDeclaration" ||
-		astNode.type === "ExportSpecifier"
-	);
-}
-
 /**
  * Merges two sorted lists into a larger sorted list in O(n) time.
  * @param {Token[]} tokens The list of tokens.
@@ -179,56 +163,6 @@ function nodesOrTokensOverlap(first, second) {
 	);
 }
 
-/**
- * Determines if two nodes or tokens have at least one whitespace character
- * between them. Order does not matter. Returns false if the given nodes or
- * tokens overlap.
- * @param {SourceCode} sourceCode The source code object.
- * @param {ASTNode|Token} first The first node or token to check between.
- * @param {ASTNode|Token} second The second node or token to check between.
- * @param {boolean} checkInsideOfJSXText If `true` is present, check inside of JSXText tokens for backward compatibility.
- * @returns {boolean} True if there is a whitespace character between
- * any of the tokens found between the two given nodes or tokens.
- * @public
- */
-function isSpaceBetween(sourceCode, first, second, checkInsideOfJSXText) {
-	if (nodesOrTokensOverlap(first, second)) {
-		return false;
-	}
-
-	const [startingNodeOrToken, endingNodeOrToken] =
-		first.range[1] <= second.range[0] ? [first, second] : [second, first];
-	const firstToken =
-		sourceCode.getLastToken(startingNodeOrToken) || startingNodeOrToken;
-	const finalToken =
-		sourceCode.getFirstToken(endingNodeOrToken) || endingNodeOrToken;
-	let currentToken = firstToken;
-
-	while (currentToken !== finalToken) {
-		const nextToken = sourceCode.getTokenAfter(currentToken, {
-			includeComments: true,
-		});
-
-		if (
-			currentToken.range[1] !== nextToken.range[0] ||
-			/*
-			 * For backward compatibility, check spaces in JSXText.
-			 * https://github.com/eslint/eslint/issues/12614
-			 */
-			(checkInsideOfJSXText &&
-				nextToken !== finalToken &&
-				nextToken.type === "JSXText" &&
-				/\s/u.test(nextToken.value))
-		) {
-			return true;
-		}
-
-		currentToken = nextToken;
-	}
-
-	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.
@@ -529,87 +463,6 @@ class SourceCode extends TokenStore {
 		return this.ast.comments;
 	}
 
-	/**
-	 * Retrieves the JSDoc comment for a given node.
-	 * @param {ASTNode} node The AST node to get the comment for.
-	 * @returns {Token|null} The Block comment token containing the JSDoc comment
-	 *      for the given node or null if not found.
-	 * @public
-	 * @deprecated
-	 */
-	getJSDocComment(node) {
-		/**
-		 * Checks for the presence of a JSDoc comment for the given node and returns it.
-		 * @param {ASTNode} astNode The AST node to get the comment for.
-		 * @returns {Token|null} The Block comment token containing the JSDoc comment
-		 *      for the given node or null if not found.
-		 * @private
-		 */
-		const findJSDocComment = astNode => {
-			const tokenBefore = this.getTokenBefore(astNode, {
-				includeComments: true,
-			});
-
-			if (
-				tokenBefore &&
-				isCommentToken(tokenBefore) &&
-				tokenBefore.type === "Block" &&
-				tokenBefore.value.charAt(0) === "*" &&
-				astNode.loc.start.line - tokenBefore.loc.end.line <= 1
-			) {
-				return tokenBefore;
-			}
-
-			return null;
-		};
-		let parent = node.parent;
-
-		switch (node.type) {
-			case "ClassDeclaration":
-			case "FunctionDeclaration":
-				return findJSDocComment(
-					looksLikeExport(parent) ? parent : node,
-				);
-
-			case "ClassExpression":
-				return findJSDocComment(parent.parent);
-
-			case "ArrowFunctionExpression":
-			case "FunctionExpression":
-				if (
-					parent.type !== "CallExpression" &&
-					parent.type !== "NewExpression"
-				) {
-					while (
-						!this.getCommentsBefore(parent).length &&
-						!/Function/u.test(parent.type) &&
-						parent.type !== "MethodDefinition" &&
-						parent.type !== "Property"
-					) {
-						parent = parent.parent;
-
-						if (!parent) {
-							break;
-						}
-					}
-
-					if (
-						parent &&
-						parent.type !== "FunctionDeclaration" &&
-						parent.type !== "Program"
-					) {
-						return findJSDocComment(parent);
-					}
-				}
-
-				return findJSDocComment(node);
-
-			// falls through
-			default:
-				return null;
-		}
-	}
-
 	/**
 	 * Gets the deepest node containing a range index.
 	 * @param {number} index Range index of the desired node.
@@ -649,24 +502,33 @@ class SourceCode extends TokenStore {
 	 * @public
 	 */
 	isSpaceBetween(first, second) {
-		return isSpaceBetween(this, first, second, false);
-	}
+		if (nodesOrTokensOverlap(first, second)) {
+			return false;
+		}
 
-	/**
-	 * Determines if two nodes or tokens have at least one whitespace character
-	 * between them. Order does not matter. Returns false if the given nodes or
-	 * tokens overlap.
-	 * For backward compatibility, this method returns true if there are
-	 * `JSXText` tokens that contain whitespaces between the two.
-	 * @param {ASTNode|Token} first The first node or token to check between.
-	 * @param {ASTNode|Token} second The second node or token to check between.
-	 * @returns {boolean} True if there is a whitespace character between
-	 * any of the tokens found between the two given nodes or tokens.
-	 * @deprecated in favor of isSpaceBetween().
-	 * @public
-	 */
-	isSpaceBetweenTokens(first, second) {
-		return isSpaceBetween(this, first, second, true);
+		const [startingNodeOrToken, endingNodeOrToken] =
+			first.range[1] <= second.range[0]
+				? [first, second]
+				: [second, first];
+		const firstToken =
+			this.getLastToken(startingNodeOrToken) || startingNodeOrToken;
+		const finalToken =
+			this.getFirstToken(endingNodeOrToken) || endingNodeOrToken;
+		let currentToken = firstToken;
+
+		while (currentToken !== finalToken) {
+			const nextToken = this.getTokenAfter(currentToken, {
+				includeComments: true,
+			});
+
+			if (currentToken.range[1] !== nextToken.range[0]) {
+				return true;
+			}
+
+			currentToken = nextToken;
+		}
+
+		return false;
 	}
 
 	/**

package/lib/languages/js/source-code/token-store/index.js

@@ -444,32 +444,6 @@ module.exports = class TokenStore {
 		).getOneToken();
 	}
 
-	/**
-	 * Gets the token that precedes a given node or token in the token stream.
-	 * This is defined for backward compatibility. Use `includeComments` option instead.
-	 * TODO: We have a plan to remove this in a future major version.
-	 * @param {ASTNode|Token|Comment} node The AST node or token.
-	 * @param {number} [skip=0] A number of tokens to skip.
-	 * @returns {Token|null} An object representing the token.
-	 * @deprecated
-	 */
-	getTokenOrCommentBefore(node, skip) {
-		return this.getTokenBefore(node, { includeComments: true, skip });
-	}
-
-	/**
-	 * Gets the token that follows a given node or token in the token stream.
-	 * This is defined for backward compatibility. Use `includeComments` option instead.
-	 * TODO: We have a plan to remove this in a future major version.
-	 * @param {ASTNode|Token|Comment} node The AST node or token.
-	 * @param {number} [skip=0] A number of tokens to skip.
-	 * @returns {Token|null} An object representing the token.
-	 * @deprecated
-	 */
-	getTokenOrCommentAfter(node, skip) {
-		return this.getTokenAfter(node, { includeComments: true, skip });
-	}
-
 	//--------------------------------------------------------------------------
 	// Gets multiple tokens.
 	//--------------------------------------------------------------------------

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

@@ -543,6 +543,16 @@ function assertTestCommonProperties(item) {
  * @throws {AssertionError} If the test case is not valid.
  */
 function assertValidTestCase(item, seenTestCases) {
+	// must not have properties of invalid test cases
+	assert.ok(
+		item.errors === void 0,
+		"Valid test case must not have 'errors' property",
+	);
+	assert.ok(
+		item.output === void 0,
+		"Valid test case must not have 'output' property",
+	);
+
 	assertTestCommonProperties(item);
 	checkDuplicateTestCase(item, seenTestCases);
 }

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

@@ -258,13 +258,13 @@ module.exports = {
 			if (astUtils.isTokenOnSameLine(first, second)) {
 				if (
 					openingBracketMustBeSpaced &&
-					!sourceCode.isSpaceBetweenTokens(first, second)
+					!sourceCode.isSpaceBetween(first, second)
 				) {
 					reportRequiredBeginningSpace(node, first);
 				}
 				if (
 					!openingBracketMustBeSpaced &&
-					sourceCode.isSpaceBetweenTokens(first, second)
+					sourceCode.isSpaceBetween(first, second)
 				) {
 					reportNoBeginningSpace(node, first);
 				}
@@ -276,13 +276,13 @@ module.exports = {
 			) {
 				if (
 					closingBracketMustBeSpaced &&
-					!sourceCode.isSpaceBetweenTokens(penultimate, last)
+					!sourceCode.isSpaceBetween(penultimate, last)
 				) {
 					reportRequiredEndingSpace(node, last);
 				}
 				if (
 					!closingBracketMustBeSpaced &&
-					sourceCode.isSpaceBetweenTokens(penultimate, last)
+					sourceCode.isSpaceBetween(penultimate, last)
 				) {
 					reportNoEndingSpace(node, last);
 				}

package/lib/rules/block-spacing.js

@@ -95,7 +95,7 @@ module.exports = {
 		function isValid(left, right) {
 			return (
 				!util.isTokenOnSameLine(left, right) ||
-				sourceCode.isSpaceBetweenTokens(left, right) === always
+				sourceCode.isSpaceBetween(left, right) === always
 			);
 		}
 

package/lib/rules/comma-spacing.js

@@ -178,10 +178,7 @@ module.exports = {
 						!commaTokensToIgnore.includes(token) &&
 						astUtils.isTokenOnSameLine(previousToken, token) &&
 						options.before !==
-							sourceCode.isSpaceBetweenTokens(
-								previousToken,
-								token,
-							)
+							sourceCode.isSpaceBetween(previousToken, token)
 					) {
 						report(token, "before", previousToken);
 					}
@@ -195,7 +192,7 @@ module.exports = {
 						!(!options.after && nextToken.type === "Line") && // special case, allow space before line comment
 						astUtils.isTokenOnSameLine(token, nextToken) &&
 						options.after !==
-							sourceCode.isSpaceBetweenTokens(token, nextToken)
+							sourceCode.isSpaceBetween(token, nextToken)
 					) {
 						report(token, "after", nextToken);
 					}

package/lib/rules/computed-property-spacing.js

@@ -203,13 +203,13 @@ module.exports = {
 				if (astUtils.isTokenOnSameLine(before, first)) {
 					if (propertyNameMustBeSpaced) {
 						if (
-							!sourceCode.isSpaceBetweenTokens(before, first) &&
+							!sourceCode.isSpaceBetween(before, first) &&
 							astUtils.isTokenOnSameLine(before, first)
 						) {
 							reportRequiredBeginningSpace(node, before);
 						}
 					} else {
-						if (sourceCode.isSpaceBetweenTokens(before, first)) {
+						if (sourceCode.isSpaceBetween(before, first)) {
 							reportNoBeginningSpace(node, before, first);
 						}
 					}
@@ -218,13 +218,13 @@ module.exports = {
 				if (astUtils.isTokenOnSameLine(last, after)) {
 					if (propertyNameMustBeSpaced) {
 						if (
-							!sourceCode.isSpaceBetweenTokens(last, after) &&
+							!sourceCode.isSpaceBetween(last, after) &&
 							astUtils.isTokenOnSameLine(last, after)
 						) {
 							reportRequiredEndingSpace(node, after);
 						}
 					} else {
-						if (sourceCode.isSpaceBetweenTokens(last, after)) {
+						if (sourceCode.isSpaceBetween(last, after)) {
 							reportNoEndingSpace(node, after, last);
 						}
 					}

package/lib/rules/keyword-spacing.js

@@ -163,7 +163,7 @@ module.exports = {
 				!isOpenParenOfTemplate(prevToken) &&
 				!tokensToIgnore.has(prevToken) &&
 				astUtils.isTokenOnSameLine(prevToken, token) &&
-				!sourceCode.isSpaceBetweenTokens(prevToken, token)
+				!sourceCode.isSpaceBetween(prevToken, token)
 			) {
 				context.report({
 					loc: token.loc,
@@ -192,7 +192,7 @@ module.exports = {
 				!isOpenParenOfTemplate(prevToken) &&
 				!tokensToIgnore.has(prevToken) &&
 				astUtils.isTokenOnSameLine(prevToken, token) &&
-				sourceCode.isSpaceBetweenTokens(prevToken, token)
+				sourceCode.isSpaceBetween(prevToken, token)
 			) {
 				context.report({
 					loc: { start: prevToken.loc.end, end: token.loc.start },
@@ -224,7 +224,7 @@ module.exports = {
 				!isCloseParenOfTemplate(nextToken) &&
 				!tokensToIgnore.has(nextToken) &&
 				astUtils.isTokenOnSameLine(token, nextToken) &&
-				!sourceCode.isSpaceBetweenTokens(token, nextToken)
+				!sourceCode.isSpaceBetween(token, nextToken)
 			) {
 				context.report({
 					loc: token.loc,
@@ -253,7 +253,7 @@ module.exports = {
 				!isCloseParenOfTemplate(nextToken) &&
 				!tokensToIgnore.has(nextToken) &&
 				astUtils.isTokenOnSameLine(token, nextToken) &&
-				sourceCode.isSpaceBetweenTokens(token, nextToken)
+				sourceCode.isSpaceBetween(token, nextToken)
 			) {
 				context.report({
 					loc: { start: token.loc.end, end: nextToken.loc.start },

package/lib/rules/no-extra-parens.js

@@ -470,7 +470,7 @@ module.exports = {
 			return (
 				rightParenToken &&
 				tokenAfterRightParen &&
-				!sourceCode.isSpaceBetweenTokens(
+				!sourceCode.isSpaceBetween(
 					rightParenToken,
 					tokenAfterRightParen,
 				) &&

package/lib/rules/no-spaced-func.js

@@ -81,7 +81,7 @@ module.exports = {
 			if (
 				parenToken &&
 				parenToken.range[1] < node.range[1] &&
-				sourceCode.isSpaceBetweenTokens(prevToken, parenToken)
+				sourceCode.isSpaceBetween(prevToken, parenToken)
 			) {
 				context.report({
 					node,

package/lib/rules/no-useless-constructor.js

@@ -185,6 +185,8 @@ module.exports = {
 	},
 
 	create(context) {
+		const { sourceCode } = context;
+
 		/**
 		 * Checks whether a node is a redundant constructor
 		 * @param {ASTNode} node node to check
@@ -211,6 +213,14 @@ module.exports = {
 			const body = node.value.body.body;
 			const ctorParams = node.value.params;
 			const superClass = node.parent.parent.superClass;
+			const parenToken = sourceCode.getFirstToken(
+				node,
+				astUtils.isOpeningParenToken,
+			);
+			const loc = {
+				start: node.loc.start,
+				end: sourceCode.getTokenBefore(parenToken).loc.end,
+			};
 
 			if (
 				superClass
@@ -218,19 +228,19 @@ module.exports = {
 					: body.length === 0
 			) {
 				context.report({
-					node,
+					loc,
 					messageId: "noUselessConstructor",
 					suggest: [
 						{
 							messageId: "removeConstructor",
 							*fix(fixer) {
 								const nextToken =
-									context.sourceCode.getTokenAfter(node);
+									sourceCode.getTokenAfter(node);
 								const addSemiColon =
 									nextToken.type === "Punctuator" &&
 									nextToken.value === "[" &&
 									astUtils.needsPrecedingSemicolon(
-										context.sourceCode,
+										sourceCode,
 										node,
 									);
 

package/lib/rules/no-whitespace-before-property.js

@@ -141,7 +141,7 @@ module.exports = {
 					leftToken = sourceCode.getTokenBefore(rightToken, 1);
 				}
 
-				if (sourceCode.isSpaceBetweenTokens(leftToken, rightToken)) {
+				if (sourceCode.isSpaceBetween(leftToken, rightToken)) {
 					reportError(node, leftToken, rightToken);
 				}
 			},

package/lib/rules/object-curly-spacing.js

@@ -204,10 +204,7 @@ module.exports = {
 		 */
 		function validateBraceSpacing(node, first, second, penultimate, last) {
 			if (astUtils.isTokenOnSameLine(first, second)) {
-				const firstSpaced = sourceCode.isSpaceBetweenTokens(
-					first,
-					second,
-				);
+				const firstSpaced = sourceCode.isSpaceBetween(first, second);
 
 				if (options.spaced && !firstSpaced) {
 					reportRequiredBeginningSpace(node, first);
@@ -236,10 +233,7 @@ module.exports = {
 						? !options.spaced
 						: options.spaced;
 
-				const lastSpaced = sourceCode.isSpaceBetweenTokens(
-					penultimate,
-					last,
-				);
+				const lastSpaced = sourceCode.isSpaceBetween(penultimate, last);
 
 				if (closingCurlyBraceMustBeSpaced && !lastSpaced) {
 					reportRequiredEndingSpace(node, last);

package/lib/rules/require-yield.js

@@ -5,6 +5,12 @@
 
 "use strict";
 
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+const astUtils = require("./utils/ast-utils");
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -29,6 +35,7 @@ module.exports = {
 
 	create(context) {
 		const stack = [];
+		const sourceCode = context.sourceCode;
 
 		/**
 		 * If the node is a generator function, start counting `yield` keywords.
@@ -55,7 +62,10 @@ module.exports = {
 			const countYield = stack.pop();
 
 			if (countYield === 0 && node.body.body.length > 0) {
-				context.report({ node, messageId: "missingYield" });
+				context.report({
+					loc: astUtils.getFunctionHeadLoc(node, sourceCode),
+					messageId: "missingYield",
+				});
 			}
 		}
 

package/lib/rules/rest-spread-spacing.js

@@ -74,10 +74,7 @@ module.exports = {
 		function checkWhiteSpace(node) {
 			const operator = sourceCode.getFirstToken(node),
 				nextToken = sourceCode.getTokenAfter(operator),
-				hasWhitespace = sourceCode.isSpaceBetweenTokens(
-					operator,
-					nextToken,
-				);
+				hasWhitespace = sourceCode.isSpaceBetween(operator, nextToken);
 			let type;
 
 			switch (node.type) {

package/lib/rules/semi-spacing.js

@@ -95,7 +95,7 @@ module.exports = {
 			return (
 				tokenBefore &&
 				astUtils.isTokenOnSameLine(tokenBefore, token) &&
-				sourceCode.isSpaceBetweenTokens(tokenBefore, token)
+				sourceCode.isSpaceBetween(tokenBefore, token)
 			);
 		}
 
@@ -110,7 +110,7 @@ module.exports = {
 			return (
 				tokenAfter &&
 				astUtils.isTokenOnSameLine(token, tokenAfter) &&
-				sourceCode.isSpaceBetweenTokens(token, tokenAfter)
+				sourceCode.isSpaceBetween(token, tokenAfter)
 			);
 		}
 

package/lib/rules/space-before-blocks.js

@@ -164,7 +164,7 @@ module.exports = {
 				!isConflicted(precedingToken, node) &&
 				astUtils.isTokenOnSameLine(precedingToken, node)
 			) {
-				const hasSpace = sourceCode.isSpaceBetweenTokens(
+				const hasSpace = sourceCode.isSpaceBetween(
 					precedingToken,
 					node,
 				);

package/lib/rules/space-before-function-paren.js

@@ -155,10 +155,7 @@ module.exports = {
 				astUtils.isOpeningParenToken,
 			);
 			const leftToken = sourceCode.getTokenBefore(rightToken);
-			const hasSpacing = sourceCode.isSpaceBetweenTokens(
-				leftToken,
-				rightToken,
-			);
+			const hasSpacing = sourceCode.isSpaceBetween(leftToken, rightToken);
 
 			if (hasSpacing && functionConfig === "never") {
 				context.report({

package/lib/rules/space-in-parens.js

@@ -153,7 +153,7 @@ module.exports = {
 		 */
 		function openerMissingSpace(openingParenToken, tokenAfterOpeningParen) {
 			if (
-				sourceCode.isSpaceBetweenTokens(
+				sourceCode.isSpaceBetween(
 					openingParenToken,
 					tokenAfterOpeningParen,
 				)
@@ -195,7 +195,7 @@ module.exports = {
 			}
 
 			if (
-				!sourceCode.isSpaceBetweenTokens(
+				!sourceCode.isSpaceBetween(
 					openingParenToken,
 					tokenAfterOpeningParen,
 				)
@@ -220,7 +220,7 @@ module.exports = {
 			closingParenToken,
 		) {
 			if (
-				sourceCode.isSpaceBetweenTokens(
+				sourceCode.isSpaceBetween(
 					tokenBeforeClosingParen,
 					closingParenToken,
 				)
@@ -261,7 +261,7 @@ module.exports = {
 			}
 
 			if (
-				!sourceCode.isSpaceBetweenTokens(
+				!sourceCode.isSpaceBetween(
 					tokenBeforeClosingParen,
 					closingParenToken,
 				)

package/lib/rules/space-infix-ops.js

@@ -87,8 +87,8 @@ module.exports = {
 			const next = sourceCode.getTokenAfter(operator);
 
 			if (
-				!sourceCode.isSpaceBetweenTokens(prev, operator) ||
-				!sourceCode.isSpaceBetweenTokens(operator, next)
+				!sourceCode.isSpaceBetween(prev, operator) ||
+				!sourceCode.isSpaceBetween(operator, next)
 			) {
 				return operator;
 			}
@@ -238,11 +238,8 @@ module.exports = {
 				const rightToken = sourceCode.getTokenAfter(operatorToken);
 
 				if (
-					!sourceCode.isSpaceBetweenTokens(
-						leftToken,
-						operatorToken,
-					) ||
-					!sourceCode.isSpaceBetweenTokens(operatorToken, rightToken)
+					!sourceCode.isSpaceBetween(leftToken, operatorToken) ||
+					!sourceCode.isSpaceBetween(operatorToken, rightToken)
 				) {
 					report(node, operatorToken);
 				}

package/lib/rules/switch-colon-spacing.js

@@ -84,7 +84,7 @@ module.exports = {
 			return (
 				astUtils.isClosingBraceToken(right) ||
 				!astUtils.isTokenOnSameLine(left, right) ||
-				sourceCode.isSpaceBetweenTokens(left, right) === expected
+				sourceCode.isSpaceBetween(left, right) === expected
 			);
 		}
 

package/lib/rules/template-tag-spacing.js

@@ -66,7 +66,7 @@ module.exports = {
 		function checkSpacing(node) {
 			const tagToken = sourceCode.getTokenBefore(node.quasi);
 			const literalToken = sourceCode.getFirstToken(node.quasi);
-			const hasWhitespace = sourceCode.isSpaceBetweenTokens(
+			const hasWhitespace = sourceCode.isSpaceBetween(
 				tagToken,
 				literalToken,
 			);

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

@@ -544,28 +544,6 @@ function negate(f) {
 	return token => !f(token);
 }
 
-/**
- * Checks whether or not a node has a `@this` tag in its comments.
- * @param {ASTNode} node A node to check.
- * @param {SourceCode} sourceCode A SourceCode instance to get comments.
- * @returns {boolean} Whether or not the node has a `@this` tag in its comments.
- */
-function hasJSDocThisTag(node, sourceCode) {
-	const jsdocComment = sourceCode.getJSDocComment(node);
-
-	if (jsdocComment && thisTagPattern.test(jsdocComment.value)) {
-		return true;
-	}
-
-	// Checks `@this` in its leading comments for callbacks,
-	// because callbacks don't have its JSDoc comment.
-	// e.g.
-	//     sinon.test(/* @this sinon.Sandbox */function() { this.spy(); });
-	return sourceCode
-		.getCommentsBefore(node)
-		.some(comment => thisTagPattern.test(comment.value));
-}
-
 /**
  * Determines if a node is surrounded by parentheses.
  * @param {SourceCode} sourceCode The ESLint source code object
@@ -725,6 +703,120 @@ function isKeywordToken(token) {
 	return token.type === "Keyword";
 }
 
+/**
+ * Check to see if its a ES6 export declaration.
+ * @param {ASTNode} astNode An AST node.
+ * @returns {boolean} whether the given node represents an export declaration.
+ * @private
+ */
+function looksLikeExport(astNode) {
+	return (
+		astNode.type === "ExportDefaultDeclaration" ||
+		astNode.type === "ExportNamedDeclaration" ||
+		astNode.type === "ExportAllDeclaration" ||
+		astNode.type === "ExportSpecifier"
+	);
+}
+
+/**
+ * Retrieves the JSDoc comment for a given node.
+ * @param {ASTNode} node The AST node to get the comment for.
+ * @param {SourceCode} sourceCode A SourceCode instance to get comments.
+ * @returns {Token|null} The Block comment token containing the JSDoc comment for the given node or null if not found.
+ * @private
+ */
+function getJSDocComment(node, sourceCode) {
+	/**
+	 * Checks for the presence of a JSDoc comment for the given node and returns it.
+	 * @param {ASTNode} astNode The AST node to get the comment for.
+	 * @returns {Token|null} The Block comment token containing the JSDoc comment for the given node or null if not found.
+	 * @private
+	 */
+	function findJSDocComment(astNode) {
+		const tokenBefore = sourceCode.getTokenBefore(astNode, {
+			includeComments: true,
+		});
+
+		if (
+			tokenBefore &&
+			isCommentToken(tokenBefore) &&
+			tokenBefore.type === "Block" &&
+			tokenBefore.value.charAt(0) === "*" &&
+			astNode.loc.start.line - tokenBefore.loc.end.line <= 1
+		) {
+			return tokenBefore;
+		}
+
+		return null;
+	}
+	let parent = node.parent;
+
+	switch (node.type) {
+		case "ClassDeclaration":
+		case "FunctionDeclaration":
+			return findJSDocComment(looksLikeExport(parent) ? parent : node);
+
+		case "ClassExpression":
+			return findJSDocComment(parent.parent);
+
+		case "ArrowFunctionExpression":
+		case "FunctionExpression":
+			if (
+				parent.type !== "CallExpression" &&
+				parent.type !== "NewExpression"
+			) {
+				while (
+					!sourceCode.getCommentsBefore(parent).length &&
+					!/Function/u.test(parent.type) &&
+					parent.type !== "MethodDefinition" &&
+					parent.type !== "Property"
+				) {
+					parent = parent.parent;
+
+					if (!parent) {
+						break;
+					}
+				}
+
+				if (
+					parent &&
+					parent.type !== "FunctionDeclaration" &&
+					parent.type !== "Program"
+				) {
+					return findJSDocComment(parent);
+				}
+			}
+
+			return findJSDocComment(node);
+
+		// falls through
+		default:
+			return null;
+	}
+}
+
+/**
+ * Checks whether or not a node has a `@this` tag in its comments.
+ * @param {ASTNode} node A node to check.
+ * @param {SourceCode} sourceCode A SourceCode instance to get comments.
+ * @returns {boolean} Whether or not the node has a `@this` tag in its comments.
+ */
+function hasJSDocThisTag(node, sourceCode) {
+	const jsdocComment = getJSDocComment(node, sourceCode);
+
+	if (jsdocComment && thisTagPattern.test(jsdocComment.value)) {
+		return true;
+	}
+
+	// Checks `@this` in its leading comments for callbacks,
+	// because callbacks don't have its JSDoc comment.
+	// e.g.
+	//     sinon.test(/* @this sinon.Sandbox */function() { this.spy(); });
+	return sourceCode
+		.getCommentsBefore(node)
+		.some(comment => thisTagPattern.test(comment.value));
+}
+
 /**
  * Gets the `(` token of the given function node.
  * @param {ASTNode} node The function node to get.

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

@@ -96,8 +96,7 @@ module.exports = {
 		 */
 		function checkSpacing(side, leftToken, rightToken) {
 			if (
-				sourceCode.isSpaceBetweenTokens(leftToken, rightToken) !==
-				mode[side]
+				sourceCode.isSpaceBetween(leftToken, rightToken) !== mode[side]
 			) {
 				const after = leftToken.value === "*";
 				const spaceRequired = mode[side];

package/lib/types/index.d.ts

@@ -281,17 +281,8 @@ export class SourceCode
 
 	getDeclaredVariables(node: ESTree.Node): Scope.Variable[];
 
-	/** @deprecated */
-	getJSDocComment(node: ESTree.Node): ESTree.Comment | null;
-
 	getNodeByRangeIndex(index: number): ESTree.Node | null;
 
-	/** @deprecated Use `isSpaceBetween()` instead. */
-	isSpaceBetweenTokens(
-		first: ESTree.Node | AST.Token,
-		second: ESTree.Node | AST.Token,
-	): boolean;
-
 	getLocFromIndex(index: number): ESTree.Position;
 
 	getIndexFromLoc(location: ESTree.Position): number;
@@ -324,18 +315,6 @@ export class SourceCode
 
 	getTokensAfter: SourceCode.UnaryCursorWithCountOptions;
 
-	/** @deprecated Use `getTokenBefore()` instead. */
-	getTokenOrCommentBefore(
-		node: ESTree.Node | AST.Token | ESTree.Comment,
-		skip?: number | undefined,
-	): AST.Token | ESTree.Comment | null;
-
-	/** @deprecated Use `getTokenAfter()` instead. */
-	getTokenOrCommentAfter(
-		node: ESTree.Node | AST.Token | ESTree.Comment,
-		skip?: number | undefined,
-	): AST.Token | ESTree.Comment | null;
-
 	getFirstTokenBetween: SourceCode.BinaryCursorWithSkipOptions;
 
 	getFirstTokensBetween: SourceCode.BinaryCursorWithCountOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-alpha.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "type": "commonjs",
@@ -108,7 +108,7 @@
   "dependencies": {
     "@eslint-community/eslint-utils": "^4.8.0",
     "@eslint-community/regexpp": "^4.12.1",
-    "@eslint/config-array": "^0.22.0",
+    "@eslint/config-array": "^0.23.0",
     "@eslint/config-helpers": "^0.5.0",
     "@eslint/core": "^1.0.0",
     "@eslint/plugin-kit": "^0.5.0",
@@ -134,7 +134,7 @@
     "imurmurhash": "^0.1.4",
     "is-glob": "^4.0.0",
     "json-stable-stringify-without-jsonify": "^1.0.1",
-    "minimatch": "^3.1.2",
+    "minimatch": "^10.1.1",
     "natural-compare": "^1.4.0",
     "optionator": "^0.9.3"
   },