one bugfix with trailing commas

import-js · Feb 19, 2023 · 4d5d116 · 4d5d116
1 parent 806a0f8
commit 4d5d116
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 7 deletions.
diff --git a/src/rules/no-duplicates.js b/src/rules/no-duplicates.js
@@ -92,23 +92,24 @@ function getInlineTypeFix(nodes, sourceCode) {
   return fixer => {
     const fixes = [];
 
-    // if (!semver.satisfies(typescriptPkg.version, '>= 4.5')) {
-    //   throw new Error('Your version of TypeScript does not support inline type imports.');
-    // }
-
     // push to first import
     let [firstImport, ...rest] = nodes;
-    const valueImport = nodes.find((n) => n.specifiers.every((spec) => spec.importKind === 'value')) || nodes.find((n) => n.specifiers.some((spec) => spec.type === 'ImportDefaultSpecifier'));
+    // const valueImport = nodes.find((n) => n.specifiers.every((spec) => spec.importKind === 'value')) || nodes.find((n) => n.specifiers.some((spec) => spec.type === 'ImportDefaultSpecifier'));
+    const valueImport = nodes.find((n) => n.specifiers.some((spec) => spec.type === 'ImportDefaultSpecifier'));
     if (valueImport) {
       firstImport = valueImport;
       rest = nodes.filter((n) => n !== firstImport);
     }
 
     const nodeTokens = sourceCode.getTokens(firstImport);
     // we are moving the rest of the Type or Inline Type imports here.
-    const nodeClosingBrace = nodeTokens.find(token => isPunctuator(token, '}'));
-    // const preferInline = context.options[0] && context.options[0]['prefer-inline'];
+    const nodeClosingBraceIndex = nodeTokens.findIndex(token => isPunctuator(token, '}'));
+    const nodeClosingBrace = nodeTokens[nodeClosingBraceIndex];
+    const tokenBeforeClosingBrace = nodeTokens[nodeClosingBraceIndex - 1];
     if (nodeClosingBrace) {
+      if (rest.length && isComma(tokenBeforeClosingBrace)) {
+        fixes.push(fixer.remove(tokenBeforeClosingBrace));
+      }
       rest.forEach((node) => {
         // these will be all Type imports, no Value specifiers
         // then add inline type specifiers to importKind === 'type' import

diff --git a/tests/src/rules/no-duplicates.js b/tests/src/rules/no-duplicates.js
@@ -614,6 +614,23 @@ context('TypeScript', function () {
             },
           ],
         }),
+        test({
+          code: "import {type x} from './foo'; import {y} from './foo'",
+          ...parserConfig,
+          output: `import {type x, y} from './foo'; `,
+          errors: [
+            {
+              line: 1,
+              column: 22,
+              message: "'./foo' imported multiple times.",
+            },
+            {
+              line: 1,
+              column: 47,
+              message: "'./foo' imported multiple times.",
+            },
+          ],
+        }),
       ].concat(!tsVersionSatisfies('>= 4.5') || !typescriptEslintParserSatisfies('>= 5.7.0') ? [] : [
         // without prefer-inline, will dedupe with type import kind
         test({
@@ -1018,6 +1035,24 @@ context('TypeScript', function () {
             },
           ],
         }),
+        test({
+          code: "import { type C, } from './foo';import {AValue, BValue, } from './foo';",
+          ...parserConfig,
+          options: [{ 'prefer-inline': true }],
+          output: "import { type C , AValue, BValue} from './foo';",
+          errors: [
+            {
+              line: 1,
+              column: 25,
+              message: "'./foo' imported multiple times.",
+            },
+            {
+              line: 1,
+              column: 64,
+              message: "'./foo' imported multiple times.",
+            },
+          ],
+        }),
       ]);
 
       ruleTester.run('no-duplicates', rule, {