@so1ve/eslint-plugin 3.20.2 → 3.21.0

package/dist/index.js

@@ -239,6 +239,32 @@ var no_import_promises_as_default = rule$7;
 //#endregion
 //#region src/rules/no-inline-type-import.ts
 const RULE_NAME$5 = "no-inline-type-import";
+function generateImportsText(specifiers) {
+	let text = "{ ";
+	const texts = [];
+	for (const s of specifiers) {
+		const importedName = s.imported.type === AST_NODE_TYPES.Identifier ? s.imported.name : s.imported.raw;
+		texts.push(importedName === s.local.name ? s.local.name : `${importedName} as ${s.local.name}`);
+	}
+	text += texts.join(", ");
+	text += " }";
+	return text;
+}
+function generateTypeImportText(typeSpecifiers) {
+	let text = "type ";
+	text += generateImportsText(typeSpecifiers);
+	return text;
+}
+function generateValueImportText(defaultImportSpecifier, valueSpecifiers) {
+	const hasValueImport = valueSpecifiers.length > 0;
+	let text = "";
+	if (defaultImportSpecifier) {
+		text += defaultImportSpecifier.local.name;
+		if (hasValueImport) text += ", ";
+	}
+	if (hasValueImport) text += generateImportsText(valueSpecifiers);
+	return text;
+}
 const rule$6 = createEslintRule({
 	name: RULE_NAME$5,
 	meta: {
@@ -254,42 +280,19 @@ const rule$6 = createEslintRule({
 		const typeSpecifiers = specifiers.filter((s) => s.type === AST_NODE_TYPES.ImportSpecifier && s.importKind === "type");
 		const valueSpecifiers = specifiers.filter((s) => s.type === AST_NODE_TYPES.ImportSpecifier && s.importKind === "value");
 		const defaultImportSpecifier = specifiers.find((s) => s.type === AST_NODE_TYPES.ImportDefaultSpecifier);
-		if (typeSpecifiers.length > 0) if (valueSpecifiers.length > 0) context.report({
+		const hasDefaultImport = !!defaultImportSpecifier;
+		const hasTypeImport = typeSpecifiers.length > 0;
+		const hasValueImport = valueSpecifiers.length > 0;
+		if (!hasTypeImport) return;
+		const texts = [];
+		texts.push(generateTypeImportText(typeSpecifiers));
+		if (hasDefaultImport || hasValueImport) texts.push(generateValueImportText(defaultImportSpecifier, valueSpecifiers));
+		const textToReport = texts.map((text) => `import ${text} from "${node.source.value}";`).join("\n");
+		context.report({
 			node,
 			messageId: "noInlineTypeImport",
 			fix(fixer) {
-				const typeSpecifiersText = typeSpecifiers.map((s) => {
-					if (s.type === AST_NODE_TYPES.ImportSpecifier) {
-						const importedName = s.imported.type === AST_NODE_TYPES.Identifier ? s.imported.name : s.imported.value;
-						return importedName === s.local.name ? s.local.name : `${importedName} as ${s.local.name}`;
-					}
-					return s.local.name;
-				}).join(", ");
-				const valueSpecifiersText = valueSpecifiers.map((s) => {
-					if (s.type === AST_NODE_TYPES.ImportSpecifier) {
-						const importedName = s.imported.type === AST_NODE_TYPES.Identifier ? s.imported.name : s.imported.value;
-						return importedName === s.local.name ? s.local.name : `${importedName} as ${s.local.name}`;
-					}
-					return s.local.name;
-				}).join(", ");
-				const defaultImportSpecifierText = defaultImportSpecifier?.local.name;
-				const defaultAndValueSpecifiersText = defaultImportSpecifier ? `import ${defaultImportSpecifierText}, { ${valueSpecifiersText} } from "${node.source.value}";` : `import { ${valueSpecifiersText} } from "${node.source.value}";`;
-				const texts = [`import type { ${typeSpecifiersText} } from "${node.source.value}";`, defaultAndValueSpecifiersText];
-				return fixer.replaceText(node, texts.join("\n"));
-			}
-		});
-		else context.report({
-			node,
-			messageId: "noInlineTypeImport",
-			fix(fixer) {
-				const typeSpecifiersText = typeSpecifiers.map((s) => {
-					if (s.type === AST_NODE_TYPES.ImportSpecifier) {
-						const importedName = s.imported.type === AST_NODE_TYPES.Identifier ? s.imported.name : s.imported.value;
-						return importedName === s.local.name ? s.local.name : `${importedName} as ${s.local.name}`;
-					}
-					return s.local.name;
-				}).join(", ");
-				return fixer.replaceText(node, `import type { ${typeSpecifiersText} } from "${node.source.value}";`);
+				return fixer.replaceText(node, textToReport);
 			}
 		});
 	} })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-plugin",
-  "version": "3.20.2",
+  "version": "3.21.0",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "type": "module",
   "keywords": [