eslint 9.29.0 → 9.30.1

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

@@ -66,6 +66,20 @@ function isImportExportCanBeMerged(node1, node2) {
 	const importExportType1 = getImportExportType(node1);
 	const importExportType2 = getImportExportType(node2);
 
+	if (
+		(node1.importKind === "type" || node1.exportKind === "type") &&
+		(node2.importKind === "type" || node2.exportKind === "type")
+	) {
+		const isDefault1 = importExportType1 === "ImportDefaultSpecifier";
+		const isDefault2 = importExportType2 === "ImportDefaultSpecifier";
+		const isNamed1 = isImportExportSpecifier(importExportType1, "named");
+		const isNamed2 = isImportExportSpecifier(importExportType2, "named");
+
+		if ((isDefault1 && isNamed2) || (isDefault2 && isNamed1)) {
+			return false;
+		}
+	}
+
 	if (
 		(importExportType1 === "ExportAll" &&
 			importExportType2 !== "ExportAll" &&
@@ -91,13 +105,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 +170,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 +179,7 @@ function checkAndReport(
 	modules,
 	declarationType,
 	includeExports,
+	allowSeparateTypeImports,
 ) {
 	const module = getModule(node);
 
@@ -157,19 +193,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 +256,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 +264,7 @@ function handleImportsExports(
 	modules,
 	declarationType,
 	includeExports,
+	allowSeparateTypeImports,
 ) {
 	return function (node) {
 		const module = getModule(node);
@@ -214,6 +276,7 @@ function handleImportsExports(
 				modules,
 				declarationType,
 				includeExports,
+				allowSeparateTypeImports,
 			);
 			const currentNode = { node, declarationType };
 			let nodes = [currentNode];
@@ -231,11 +294,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 +318,9 @@ module.exports = {
 					includeExports: {
 						type: "boolean",
 					},
+					allowSeparateTypeImports: {
+						type: "boolean",
+					},
 				},
 				additionalProperties: false,
 			},
@@ -266,7 +335,7 @@ module.exports = {
 	},
 
 	create(context) {
-		const [{ includeExports }] = context.options;
+		const [{ includeExports, allowSeparateTypeImports }] = context.options;
 		const modules = new Map();
 		const handlers = {
 			ImportDeclaration: handleImportsExports(
@@ -274,6 +343,7 @@ module.exports = {
 				modules,
 				"import",
 				includeExports,
+				allowSeparateTypeImports,
 			),
 		};
 
@@ -283,12 +353,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-restricted-properties.js

@@ -73,10 +73,10 @@ module.exports = {
 		messages: {
 			restrictedObjectProperty:
 				// eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
-				"'{{objectName}}.{{propertyName}}' is restricted from being used.{{message}}",
+				"'{{objectName}}.{{propertyName}}' is restricted from being used.{{allowedPropertiesMessage}}{{message}}",
 			restrictedProperty:
 				// eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
-				"'{{propertyName}}' is restricted from being used.{{message}}",
+				"'{{propertyName}}' is restricted from being used.{{allowedObjectsMessage}}{{message}}",
 		},
 	},
 
@@ -155,6 +155,10 @@ module.exports = {
 				const message = matchedObjectProperty.message
 					? ` ${matchedObjectProperty.message}`
 					: "";
+				const allowedPropertiesMessage =
+					matchedObjectProperty.allowProperties
+						? ` Only these properties are allowed: ${matchedObjectProperty.allowProperties.join(", ")}.`
+						: "";
 
 				context.report({
 					node,
@@ -163,6 +167,7 @@ module.exports = {
 						objectName,
 						propertyName,
 						message,
+						allowedPropertiesMessage,
 					},
 				});
 			} else if (
@@ -172,6 +177,9 @@ module.exports = {
 				const message = globalMatchedProperty.message
 					? ` ${globalMatchedProperty.message}`
 					: "";
+				const allowedObjectsMessage = globalMatchedProperty.allowObjects
+					? ` Property '${propertyName}' is only allowed on these objects: ${globalMatchedProperty.allowObjects.join(", ")}.`
+					: "";
 
 				context.report({
 					node,
@@ -179,6 +187,7 @@ module.exports = {
 					data: {
 						propertyName,
 						message,
+						allowedObjectsMessage,
 					},
 				});
 			}

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

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

package/lib/rules/no-trailing-spaces.js

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

package/lib/rules/no-unused-vars.js

@@ -1152,7 +1152,7 @@ module.exports = {
 
 				// fix for { a: { b } }
 				if (parentNode.parent.type === "ObjectPattern") {
-					// fix for unused variables in dectructured object with single property in variable decalartion and function parameter
+					// fix for unused variables in destructured object with single property in variable declaration and function parameter
 					if (parentNode.parent.properties.length === 1) {
 						return fixVariables(parentNode.parent);
 					}

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

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

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

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

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

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

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