eslint 9.28.0 → 9.30.0

package/lib/rules/jsx-quotes.js

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

package/lib/rules/key-spacing.js

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

package/lib/rules/keyword-spacing.js

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

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

package/lib/rules/linebreak-style.js

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

package/lib/rules/lines-around-comment.js

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

package/lib/rules/lines-around-directive.js

@@ -62,12 +62,12 @@ module.exports = {
 					message: "The new rule moved to a plugin.",
 					url: "https://eslint.org/docs/latest/rules/padding-line-between-statements#examples",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "padding-line-between-statements",
-						url: "https://eslint.style/rules/js/padding-line-between-statements",
+						url: "https://eslint.style/rules/padding-line-between-statements",
 					},
 				},
 			],

package/lib/rules/lines-between-class-members.js

@@ -44,12 +44,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: "lines-between-class-members",
-						url: "https://eslint.style/rules/js/lines-between-class-members",
+						url: "https://eslint.style/rules/lines-between-class-members",
 					},
 				},
 			],

package/lib/rules/max-len.js

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

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

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

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

package/lib/rules/new-parens.js

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

package/lib/rules/newline-after-var.js

@@ -48,12 +48,12 @@ module.exports = {
 					message: "The new rule moved to a plugin.",
 					url: "https://eslint.org/docs/latest/rules/padding-line-between-statements#examples",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "padding-line-between-statements",
-						url: "https://eslint.style/rules/js/padding-line-between-statements",
+						url: "https://eslint.style/rules/padding-line-between-statements",
 					},
 				},
 			],

package/lib/rules/newline-before-return.js

@@ -36,12 +36,12 @@ module.exports = {
 					message: "The new rule moved to a plugin.",
 					url: "https://eslint.org/docs/latest/rules/padding-line-between-statements#examples",
 					plugin: {
-						name: "@stylistic/eslint-plugin-js",
-						url: "https://eslint.style/packages/js",
+						name: "@stylistic/eslint-plugin",
+						url: "https://eslint.style",
 					},
 					rule: {
 						name: "padding-line-between-statements",
-						url: "https://eslint.style/rules/js/padding-line-between-statements",
+						url: "https://eslint.style/rules/padding-line-between-statements",
 					},
 				},
 			],

package/lib/rules/newline-per-chained-call.js

@@ -27,12 +27,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: "newline-per-chained-call",
-						url: "https://eslint.style/rules/js/newline-per-chained-call",
+						url: "https://eslint.style/rules/newline-per-chained-call",
 					},
 				},
 			],

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

package/lib/rules/no-duplicate-imports.js

@@ -91,13 +91,33 @@ function isImportExportCanBeMerged(node1, node2) {
  * Returns a boolean if we should report (import|export).
  * @param {ASTNode} node A node to be reported or not.
  * @param {[ASTNode]} previousNodes An array contains previous nodes of the module imported or exported.
+ * @param {boolean} allowSeparateTypeImports Whether to allow separate type and value imports.
  * @returns {boolean} True if the (import|export) should be reported.
  */
-function shouldReportImportExport(node, previousNodes) {
+function shouldReportImportExport(
+	node,
+	previousNodes,
+	allowSeparateTypeImports,
+) {
 	let i = 0;
 
 	while (i < previousNodes.length) {
-		if (isImportExportCanBeMerged(node, previousNodes[i])) {
+		const previousNode = previousNodes[i];
+
+		if (allowSeparateTypeImports) {
+			const isTypeNode =
+				node.importKind === "type" || node.exportKind === "type";
+			const isTypePrevious =
+				previousNode.importKind === "type" ||
+				previousNode.exportKind === "type";
+
+			if (isTypeNode !== isTypePrevious) {
+				i++;
+				continue;
+			}
+		}
+
+		if (isImportExportCanBeMerged(node, previousNode)) {
 			return true;
 		}
 		i++;
@@ -136,6 +156,7 @@ function getModule(node) {
  * @param {Map} modules A Map object contains as a key a module name and as value an array contains objects, each object contains a node and a declaration type.
  * @param {string} declarationType A declaration type can be an import or export.
  * @param {boolean} includeExports Whether or not to check for exports in addition to imports.
+ * @param {boolean} allowSeparateTypeImports Whether to allow separate type and value imports.
  * @returns {void} No return value.
  */
 function checkAndReport(
@@ -144,6 +165,7 @@ function checkAndReport(
 	modules,
 	declarationType,
 	includeExports,
+	allowSeparateTypeImports,
 ) {
 	const module = getModule(node);
 
@@ -157,19 +179,43 @@ function checkAndReport(
 			exportNodes = getNodesByDeclarationType(previousNodes, "export");
 		}
 		if (declarationType === "import") {
-			if (shouldReportImportExport(node, importNodes)) {
+			if (
+				shouldReportImportExport(
+					node,
+					importNodes,
+					allowSeparateTypeImports,
+				)
+			) {
 				messagesIds.push("import");
 			}
 			if (includeExports) {
-				if (shouldReportImportExport(node, exportNodes)) {
+				if (
+					shouldReportImportExport(
+						node,
+						exportNodes,
+						allowSeparateTypeImports,
+					)
+				) {
 					messagesIds.push("importAs");
 				}
 			}
 		} else if (declarationType === "export") {
-			if (shouldReportImportExport(node, exportNodes)) {
+			if (
+				shouldReportImportExport(
+					node,
+					exportNodes,
+					allowSeparateTypeImports,
+				)
+			) {
 				messagesIds.push("export");
 			}
-			if (shouldReportImportExport(node, importNodes)) {
+			if (
+				shouldReportImportExport(
+					node,
+					importNodes,
+					allowSeparateTypeImports,
+				)
+			) {
 				messagesIds.push("exportAs");
 			}
 		}
@@ -196,6 +242,7 @@ function checkAndReport(
  * @param {Map} modules A Map object contains as a key a module name and as value an array contains objects, each object contains a node and a declaration type.
  * @param {string} declarationType A declaration type can be an import or export.
  * @param {boolean} includeExports Whether or not to check for exports in addition to imports.
+ * @param {boolean} allowSeparateTypeImports Whether to allow separate type and value imports.
  * @returns {nodeCallback} A function passed to ESLint to handle the statement.
  */
 function handleImportsExports(
@@ -203,6 +250,7 @@ function handleImportsExports(
 	modules,
 	declarationType,
 	includeExports,
+	allowSeparateTypeImports,
 ) {
 	return function (node) {
 		const module = getModule(node);
@@ -214,6 +262,7 @@ function handleImportsExports(
 				modules,
 				declarationType,
 				includeExports,
+				allowSeparateTypeImports,
 			);
 			const currentNode = { node, declarationType };
 			let nodes = [currentNode];
@@ -231,11 +280,14 @@ function handleImportsExports(
 /** @type {import('../types').Rule.RuleModule} */
 module.exports = {
 	meta: {
+		dialects: ["javascript", "typescript"],
+		language: "javascript",
 		type: "problem",
 
 		defaultOptions: [
 			{
 				includeExports: false,
+				allowSeparateTypeImports: false,
 			},
 		],
 
@@ -252,6 +304,9 @@ module.exports = {
 					includeExports: {
 						type: "boolean",
 					},
+					allowSeparateTypeImports: {
+						type: "boolean",
+					},
 				},
 				additionalProperties: false,
 			},
@@ -266,7 +321,7 @@ module.exports = {
 	},
 
 	create(context) {
-		const [{ includeExports }] = context.options;
+		const [{ includeExports, allowSeparateTypeImports }] = context.options;
 		const modules = new Map();
 		const handlers = {
 			ImportDeclaration: handleImportsExports(
@@ -274,6 +329,7 @@ module.exports = {
 				modules,
 				"import",
 				includeExports,
+				allowSeparateTypeImports,
 			),
 		};
 
@@ -283,12 +339,14 @@ module.exports = {
 				modules,
 				"export",
 				includeExports,
+				allowSeparateTypeImports,
 			);
 			handlers.ExportAllDeclaration = handleImportsExports(
 				context,
 				modules,
 				"export",
 				includeExports,
+				allowSeparateTypeImports,
 			);
 		}
 		return handlers;

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

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

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

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

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

package/lib/rules/no-mixed-operators.js

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

package/lib/rules/no-mixed-spaces-and-tabs.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: "no-mixed-spaces-and-tabs",
-						url: "https://eslint.style/rules/js/no-mixed-spaces-and-tabs",
+						url: "https://eslint.style/rules/no-mixed-spaces-and-tabs",
 					},
 				},
 			],

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

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

package/lib/rules/no-promise-executor-return.js

@@ -9,7 +9,6 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const { findVariable } = require("@eslint-community/eslint-utils");
 const astUtils = require("./utils/ast-utils");
 
 //------------------------------------------------------------------------------
@@ -21,43 +20,13 @@ const functionTypesToCheck = new Set([
 	"FunctionExpression",
 ]);
 
-/**
- * Determines whether the given identifier node is a reference to a global variable.
- * @param {ASTNode} node `Identifier` node to check.
- * @param {Scope} scope Scope to which the node belongs.
- * @returns {boolean} True if the identifier is a reference to a global variable.
- */
-function isGlobalReference(node, scope) {
-	const variable = findVariable(scope, node);
-
-	return (
-		variable !== null &&
-		variable.scope.type === "global" &&
-		variable.defs.length === 0
-	);
-}
-
-/**
- * Finds function's outer scope.
- * @param {Scope} scope Function's own scope.
- * @returns {Scope} Function's outer scope.
- */
-function getOuterScope(scope) {
-	const upper = scope.upper;
-
-	if (upper.type === "function-expression-name") {
-		return upper.upper;
-	}
-	return upper;
-}
-
 /**
  * Determines whether the given function node is used as a Promise executor.
  * @param {ASTNode} node The node to check.
- * @param {Scope} scope Function's own scope.
+ * @param {SourceCode} sourceCode Source code to which the node belongs.
  * @returns {boolean} `true` if the node is a Promise executor.
  */
-function isPromiseExecutor(node, scope) {
+function isPromiseExecutor(node, sourceCode) {
 	const parent = node.parent;
 
 	return (
@@ -65,7 +34,7 @@ function isPromiseExecutor(node, scope) {
 		parent.arguments[0] === node &&
 		parent.callee.type === "Identifier" &&
 		parent.callee.name === "Promise" &&
-		isGlobalReference(parent.callee, getOuterScope(scope))
+		sourceCode.isGlobalReference(parent.callee)
 	);
 }
 
@@ -203,7 +172,7 @@ module.exports = {
 					upper: funcInfo,
 					shouldCheck:
 						functionTypesToCheck.has(node.type) &&
-						isPromiseExecutor(node, sourceCode.getScope(node)),
+						isPromiseExecutor(node, sourceCode),
 				};
 
 				if (