fix(no-wildcard-imports): add test case for mix-and-match

Author: joshblack

src/rules/__tests__/no-wildcard-imports.test.js

@@ -119,8 +119,37 @@ ruleTester.run('no-wildcard-imports', rule, {
       ],
     },
 
+    // Test mixed imports
+    {
+      code: `import {Dialog, type DialogProps} from '@primer/react/lib-esm/Dialog/Dialog'`,
+      output: `import {Dialog} from '@primer/react/experimental'
+import type {DialogProps} from '@primer/react/experimental'`,
+      errors: [
+        {
+          messageId: 'wildcardMigration',
+          data: {
+            wildcardEntrypoint: '@primer/react/lib-esm/Dialog/Dialog',
+          },
+        },
+      ],
+    },
+
     // Test migrations
 
+    // Test helpers ------------------------------------------------------------
+    {
+      code: `import '@primer/react/lib-esm/utils/test-helpers'`,
+      output: `import '@primer/react/test-helpers'`,
+      errors: [
+        {
+          messageId: 'wildcardMigration',
+          data: {
+            wildcardEntrypoint: '@primer/react/lib-esm/utils/test-helpers',
+          },
+        },
+      ],
+    },
+
     // Components --------------------------------------------------------------
     {
       code: `import {ButtonBase} from '@primer/react/lib-esm/Button/ButtonBase';

src/rules/no-wildcard-imports.js

@@ -28,6 +28,20 @@ const wildcardImports = new Map([
       },
     ],
   ],
+  [
+    '@primer/react/lib-esm/Dialog',
+    [
+      {
+        name: 'Dialog',
+        from: '@primer/react/experimental',
+      },
+      {
+        name: 'DialogHeaderProps',
+        from: '@primer/react/experimental',
+        type: 'type',
+      },
+    ],
+  ],
   [
     '@primer/react/lib-esm/Dialog/Dialog',
     [
@@ -40,6 +54,16 @@ const wildcardImports = new Map([
         from: '@primer/react/experimental',
         type: 'type',
       },
+      {
+        name: 'DialogProps',
+        from: '@primer/react/experimental',
+        type: 'type',
+      },
+      {
+        name: 'DialogButtonProps',
+        from: '@primer/react/experimental',
+        type: 'type',
+      },
     ],
   ],
   [
@@ -245,6 +269,20 @@ module.exports = {
           return
         }
 
+        if (node.source.value === '@primer/react/lib-esm/utils/test-helpers') {
+          context.report({
+            node,
+            messageId: 'wildcardMigration',
+            data: {
+              wildcardEntrypoint: node.source.value,
+            },
+            fix(fixer) {
+              return fixer.replaceText(node.source, `'@primer/react/test-helpers'`)
+            },
+          })
+          return
+        }
+
         const wildcardImportMigrations = wildcardImports.get(node.source.value)
         if (!wildcardImportMigrations) {
           context.report({
@@ -353,7 +391,7 @@ module.exports = {
               yield fixer.replaceText(node, `import {${specifiers.join(', ')}} from '${entrypoint}'`)
 
               if (typeSpecifiers.length > 0) {
-                const specifiers = valueSpecifiers.map(([imported, local]) => {
+                const specifiers = typeSpecifiers.map(([imported, local]) => {
                   if (imported !== local) {
                     return `${imported} as ${local}`
                   }