address review

import-js · Sep 4, 2022 · 2df9be6 · 2df9be6
1 parent ac4960c
commit 2df9be6
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 13 deletions.
diff --git a/src/rules/consistent-type-specifier-style.js b/src/rules/consistent-type-specifier-style.js
@@ -1,5 +1,9 @@
 import docsUrl from '../docsUrl';
 
+function isComma(token) {
+  return token.type === 'Punctuator' && token.value === ',';
+}
+
 module.exports = {
   meta: {
     type: 'suggestion',
@@ -24,6 +28,7 @@ module.exports = {
       return {
         ImportDeclaration(node) {
           if (node.importKind === 'value' || node.importKind == null) {
+            // top-level value / unknown is valid
             return;
           }
 
@@ -220,8 +225,3 @@ module.exports = {
     };
   },
 };
-
-function isComma(token) {
-  return token.type === 'Punctuator' && token.value === ',';
-}
-
diff --git a/tests/src/rules/consistent-type-specifier-style.js b/tests/src/rules/consistent-type-specifier-style.js
@@ -8,14 +8,88 @@ const COMMON_TESTS = {
     //
     // always valid
     //
-    test({ code: "import Foo from 'Foo';" }),
-    test({ code: "import type Foo from 'Foo';" }),
-    test({ code: "import { Foo } from 'Foo';" }),
-    test({ code: "import { Foo as Bar } from 'Foo';" }),
-    test({ code: "import * as Foo from 'Foo';" }),
-    test({ code: "import 'Foo';" }),
-    test({ code: "import {} from 'Foo';" }),
-    test({ code: "import type {} from 'Foo';" }),
+    // prefer-inline
+    test({
+      code: "import Foo from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import type Foo from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import { Foo } from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import { Foo as Bar } from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import * as Foo from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import {} from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    test({
+      code: "import type {} from 'Foo';",
+      options: ['prefer-inline'],
+    }),
+    // prefer-top-level
+    test({
+      code: "import Foo from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import type Foo from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import { Foo } from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import { Foo as Bar } from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import * as Foo from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import {} from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+    test({
+      code: "import type {} from 'Foo';",
+      options: ['prefer-top-level'],
+    }),
+
+    //
+    // prefer-inline
+    //
+    {
+      code: "import { type Foo } from 'Foo';",
+      options: ['prefer-inline'],
+    },
+    {
+      code: "import { type Foo as Bar } from 'Foo';",
+      options: ['prefer-inline'],
+    },
+    {
+      code: "import { type Foo, type Bar, Baz, Bam } from 'Foo';",
+      options: ['prefer-inline'],
+    },
 
     //
     // prefer-top-level