fix: backports import-js#3033

SukkaW · Sep 4, 2024 · b068d54 · b068d54
1 parent ceb8e65
commit b068d54
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/.changeset/weak-shirts-smell.md b/.changeset/weak-shirts-smell.md
@@ -0,0 +1,5 @@
+---
+"eslint-plugin-import-x": patch
+---
+
+Fix `no-duplicates` for TypeScript, backports https://github.com/import-js/eslint-plugin-import/pull/3033
diff --git a/src/rules/no-duplicates.ts b/src/rules/no-duplicates.ts
@@ -200,6 +200,32 @@ function getFix(
 
     const fixes = []
 
+    if (shouldAddSpecifiers && preferInline && first.importKind === 'type') {
+      // `import type {a} from './foo'` → `import {type a} from './foo'`
+      const typeIdentifierToken = tokens.find(
+        token => token.type === 'Identifier' && token.value === 'type',
+      )
+      if (typeIdentifierToken) {
+        fixes.push(
+          fixer.removeRange([
+            typeIdentifierToken.range[0],
+            typeIdentifierToken.range[1] + 1,
+          ]),
+        )
+      }
+
+      for (const identifier of tokens.filter(token =>
+        firstExistingIdentifiers.has(token.value),
+      )) {
+        fixes.push(
+          fixer.replaceTextRange(
+            [identifier.range[0], identifier.range[1]],
+            `type ${identifier.value}`,
+          ),
+        )
+      }
+    }
+
     if (openBrace == null && shouldAddSpecifiers && shouldAddDefault()) {
       // `import './foo'` → `import def, {...} from './foo'`
       fixes.push(

diff --git a/test/rules/no-duplicates.spec.ts b/test/rules/no-duplicates.spec.ts
@@ -757,6 +757,24 @@ describe('TypeScript', () => {
               },
             ],
           }),
+          test({
+            code: "import type {x} from 'foo'; import {type y} from 'foo'",
+            ...parserConfig,
+            options: [{ 'prefer-inline': true }],
+            output: `import {type x,type y} from 'foo'; `,
+            errors: [
+              {
+                line: 1,
+                column: 22,
+                message: "'foo' imported multiple times.",
+              },
+              {
+                line: 1,
+                column: 50,
+                message: "'foo' imported multiple times.",
+              },
+            ],
+          }),
           test({
             code: "import {type x} from 'foo'; import type {y} from 'foo'",
             ...parserConfig,