fix(eslint-plugin): [no-restricted-imports] allow inline type qualifi…

…ers when `allowTypeImports` enabled (#7379) Co-authored-by: Josh Goldberg ✨ <git@joshuakgoldberg.com>
typescript-eslint · Aug 5, 2023 · cc9a46d · cc9a46d
1 parent 4087f48
commit cc9a46d
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 3 deletions.
diff --git a/packages/eslint-plugin/src/rules/no-restricted-imports.ts b/packages/eslint-plugin/src/rules/no-restricted-imports.ts
@@ -1,4 +1,5 @@
 import type { TSESTree } from '@typescript-eslint/utils';
+import { AST_NODE_TYPES } from '@typescript-eslint/utils';
 import type {
   JSONSchema4AnyOfSchema,
   JSONSchema4ArraySchema,
@@ -269,8 +270,15 @@ export default createRule<Options, MessageIds>({
     }
 
     return {
-      ImportDeclaration(node): void {
-        if (node.importKind === 'type') {
+      ImportDeclaration(node: TSESTree.ImportDeclaration): void {
+        if (
+          node.importKind === 'type' ||
+          node.specifiers.every(
+            specifier =>
+              specifier.type === AST_NODE_TYPES.ImportSpecifier &&
+              specifier.importKind === 'type',
+          )
+        ) {
           const importSource = node.source.value.trim();
           if (
             !isAllowedTypeImportPath(importSource) &&
@@ -287,7 +295,10 @@ export default createRule<Options, MessageIds>({
           source: NonNullable<TSESTree.ExportNamedDeclaration['source']>;
         },
       ): void {
-        if (node.exportKind === 'type') {
+        if (
+          node.exportKind === 'type' ||
+          node.specifiers.every(specifier => specifier.exportKind === 'type')
+        ) {
           const importSource = node.source.value.trim();
           if (
             !isAllowedTypeImportPath(importSource) &&

diff --git a/packages/eslint-plugin/tests/rules/no-restricted-imports.test.ts b/packages/eslint-plugin/tests/rules/no-restricted-imports.test.ts
@@ -254,6 +254,36 @@ import type { foo } from 'import2/private/bar';
         },
       ],
     },
+    {
+      code: "import { type Bar } from 'import-foo';",
+      options: [
+        {
+          paths: [
+            {
+              name: 'import-foo',
+              importNames: ['Bar'],
+              message: 'Please use Bar from /import-bar/baz/ instead.',
+              allowTypeImports: true,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { type Bar } from 'import-foo';",
+      options: [
+        {
+          paths: [
+            {
+              name: 'import-foo',
+              importNames: ['Bar'],
+              message: 'Please use Bar from /import-bar/baz/ instead.',
+              allowTypeImports: true,
+            },
+          ],
+        },
+      ],
+    },
   ],
   invalid: [
     {
@@ -586,5 +616,55 @@ import type { foo } from 'import2/private/bar';
         },
       ],
     },
+    {
+      code: "import { Bar, type Baz } from 'import-foo';",
+      options: [
+        {
+          paths: [
+            {
+              name: 'import-foo',
+              importNames: ['Bar', 'Baz'],
+              message: 'Please use Bar and Baz from /import-bar/baz/ instead.',
+              allowTypeImports: true,
+            },
+          ],
+        },
+      ],
+      errors: [
+        {
+          messageId: 'importNameWithCustomMessage',
+          type: AST_NODE_TYPES.ImportDeclaration,
+        },
+        {
+          messageId: 'importNameWithCustomMessage',
+          type: AST_NODE_TYPES.ImportDeclaration,
+        },
+      ],
+    },
+    {
+      code: "export { Bar, type Baz } from 'import-foo';",
+      options: [
+        {
+          paths: [
+            {
+              name: 'import-foo',
+              importNames: ['Bar', 'Baz'],
+              message: 'Please use Bar and Baz from /import-bar/baz/ instead.',
+              allowTypeImports: true,
+            },
+          ],
+        },
+      ],
+      errors: [
+        {
+          messageId: 'importNameWithCustomMessage',
+          type: AST_NODE_TYPES.ExportNamedDeclaration,
+        },
+        {
+          messageId: 'importNameWithCustomMessage',
+          type: AST_NODE_TYPES.ExportNamedDeclaration,
+        },
+      ],
+    },
   ],
 });