Fixed edge case in imports rule

Author: joshwilsonvu

docs/imports.md

@@ -35,6 +35,16 @@ console.log("hi");
 import { createSignal, Component } from "solid-js";
 console.log("hi");
 
+import { createSignal } from "solid-js/web";
+import "solid-js";
+// after eslint --fix:
+import { createSignal } from "solid-js";
+ 
+import { createSignal } from "solid-js/web";
+import {} from "solid-js";
+// after eslint --fix:
+import { createSignal } from "solid-js";
+ 
 import { createEffect } from "solid-js/web";
 import { render } from "solid-js";
 // after eslint --fix:

src/utils.ts

@@ -127,11 +127,16 @@ export function appendImports(
     return fixer.insertTextAfter(otherSpecifier, `, { ${identifiersString} }`);
   }
   if (importNode.specifiers.length === 0) {
-    // import 'source' => import { B, C, D } from 'source'
-    const importToken = sourceCode.getFirstToken(importNode);
-    return importToken
-      ? fixer.insertTextAfter(importToken, ` { ${identifiersString} } from`)
-      : null;
+    const [importToken, maybeBrace] = sourceCode.getFirstTokens(importNode, { count: 2 });
+    if (maybeBrace?.value === "{") {
+      // import {} from 'source' => import { B, C, D } from 'source'
+      return fixer.insertTextAfter(maybeBrace, ` ${identifiersString} `);
+    } else {
+      // import 'source' => import { B, C, D } from 'source'
+      return importToken
+        ? fixer.insertTextAfter(importToken, ` { ${identifiersString} } from`)
+        : null;
+    }
   }
   return null;
 }

test/rules/imports.test.ts

@@ -58,6 +58,30 @@ import { createSignal, Component } from "solid-js";
 console.log('hi');`,
       parser: require.resolve("@typescript-eslint/parser"),
     },
+    {
+      code: `import { createSignal } from "solid-js/web";
+import "solid-js";`,
+      errors: [
+        {
+          messageId: "prefer-source",
+          data: { name: "createSignal", source: "solid-js" },
+        },
+      ],
+      output: `
+import { createSignal } from "solid-js";`,
+    },
+    {
+      code: `import { createSignal } from "solid-js/web";
+import {} from "solid-js";`,
+      errors: [
+        {
+          messageId: "prefer-source",
+          data: { name: "createSignal", source: "solid-js" },
+        },
+      ],
+      output: `
+import { createSignal } from "solid-js";`,
+    },
     // Two-part fix, output here is first pass...
     {
       code: `import { createEffect } from "solid-js/web";