Improve the fix logic

sindresorhus · Feb 14, 2022 · 03ba7c6 · fisker · Feb 14, 2022 · 03ba7c6
1 parent 48d6aa4
commit 03ba7c6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/rules/prefer-export-from.js b/rules/prefer-export-from.js
@@ -112,8 +112,16 @@ function getFixFunction({
 	const importDeclaration = imported.declaration;
 	const sourceNode = importDeclaration.source;
 	const sourceValue = sourceNode.value;
-	const exportDeclaration = exportDeclarations.find(({source, exportKind}) => source.value === sourceValue && exportKind !== 'type');
 	const isTypeSpecifier = imported.isType || exported.isType;
+	let exportDeclaration;
+	if (isTypeSpecifier) {
+		// Prefer put type specifier into a type export declaration, so we don't need add `type ` before specifier
+		exportDeclaration = exportDeclarations.find(({source, exportKind}) => source.value === sourceValue && exportKind === 'type');
+	}
+
+	if (!exportDeclaration) {
+		exportDeclaration = exportDeclarations.find(({source, exportKind}) => source.value === sourceValue && exportKind !== 'type');
+	}
 
 	/** @param {import('eslint').Rule.RuleFixer} fixer */
 	return function * (fixer) {
@@ -123,26 +131,28 @@ function getFixFunction({
 				`\nexport * as ${exported.text} ${getSourceAndAssertionsText(importDeclaration, sourceCode)}`,
 			);
 		} else {
-			const specifier = exported.name === imported.name
+			let specifierText = exported.name === imported.name
 				? exported.text
 				: `${imported.text} as ${exported.text}`;
 
-			const specifierWithKind = isTypeSpecifier ? `type ${specifier}` : specifier;
-
 			if (exportDeclaration) {
 				const lastSpecifier = exportDeclaration.specifiers[exportDeclaration.specifiers.length - 1];
 
+				if (isTypeSpecifier && exportDeclaration.exportKind !== 'type') {
+					specifierText = `type ${specifierText}`;
+				}
+
 				// `export {} from 'foo';`
 				if (lastSpecifier) {
-					yield fixer.insertTextAfter(lastSpecifier, `, ${specifierWithKind}`);
+					yield fixer.insertTextAfter(lastSpecifier, `, ${specifierText}`);
 				} else {
 					const openingBraceToken = sourceCode.getFirstToken(exportDeclaration, isOpeningBraceToken);
-					yield fixer.insertTextAfter(openingBraceToken, specifierWithKind);
+					yield fixer.insertTextAfter(openingBraceToken, specifierText);
 				}
 			} else {
 				yield fixer.insertTextAfter(
 					program,
-					`\nexport {${specifierWithKind}} ${getSourceAndAssertionsText(importDeclaration, sourceCode)}`,
+					`\nexport ${isTypeSpecifier ? 'type ' : ''}{${specifierText}} ${getSourceAndAssertionsText(importDeclaration, sourceCode)}`,
 				);
 			}
 		}
@@ -157,7 +167,6 @@ function getFixFunction({
 
 function getExported(identifier, context, sourceCode) {
 	const {parent} = identifier;
-	const isType = parent.exportKind === 'type' || (Boolean(parent.parent) && parent.parent.exportKind === 'type');
 	switch (parent.type) {
 		case 'ExportDefaultDeclaration':
 			return {

diff --git a/test/prefer-export-from.mjs b/test/prefer-export-from.mjs
@@ -347,6 +347,7 @@ test.typescript({
 			type AceEditor = import("ace-builds").Ace.Editor;
 			export {AceEditor};
 		`,
+		'export type { bar, foo } from "foo";',
 	],
 	invalid: [
 		{
@@ -402,19 +403,6 @@ test.typescript({
 				export { baz } from "foo";
 			`,
 		},
-		{
-			code: outdent`
-				import type { foo } from "foo";
-				export type { foo };
-				export type { bar } from "foo";
-			`,
-			errors: 1,
-			output: outdent`
-				\n
-				export type { bar } from "foo";
-				export {type foo} from "foo";
-			`,
-		},
 		{
 			code: outdent`
 				import type { foo } from "foo";
@@ -437,8 +425,8 @@ test.typescript({
 			errors: 1,
 			output: outdent`
 				\n
-				export type { bar } from "foo";
-				export { baz, type foo } from "foo";
+				export type { bar, foo } from "foo";
+				export { baz } from "foo";
 			`,
 		},
 		{
@@ -463,7 +451,7 @@ test.typescript({
 			errors: 1,
 			output: outdent`
 				\n
-				export {type foo} from 'foo';
+				export type {foo} from 'foo';
 			`,
 		},
 		{
@@ -474,7 +462,7 @@ test.typescript({
 			errors: 1,
 			output: outdent`
 				\n
-				export {type foo} from 'foo';
+				export type {foo} from 'foo';
 			`,
 		},
 		{
@@ -485,7 +473,7 @@ test.typescript({
 			errors: 1,
 			output: outdent`
 				\n
-				export {type foo} from 'foo';
+				export type {foo} from 'foo';
 			`,
 		},
 		{
@@ -496,7 +484,7 @@ test.typescript({
 			errors: 1,
 			output: outdent`
 				\n
-				export {type default} from "foo";
+				export type {default} from "foo";
 			`,
 		},
 	],