Fix parsing npm: specifiers with paths

Author: alexgleason

src/prefixPlugin.ts

@@ -22,8 +22,13 @@ export default function denoPrefixPlugin(
         const resolved = await resolveDeno(id, root);
         if (resolved === null) return;
 
+        const match = resolved.id.match(/^(@?[^@/]+)(?:@?([^@/]+))?(\/.+)?$/);
+        if (!match) return;
+
+        const [, pkg, _version, path = ''] = match;
+
         // TODO: Resolving custom versions is not supported at the moment
-        const actual = resolved.id.slice(0, resolved.id.indexOf("@"));
+        const actual = pkg + path;
         const result = await this.resolve(actual);
         return result ?? actual;
       } else if (id.startsWith("http:") || id.startsWith("https:")) {

src/resolver.ts

@@ -126,7 +126,7 @@ export async function resolveDeno(
     };
   } else if (mod.kind === "npm") {
     return {
-      id: mod.npmPackage,
+      id: mod.specifier.replace(/^npm:\//, ""),
       kind: mod.kind,
       loader: null,
       dependencies: [],

tests/fixture/jsx.tsx

@@ -0,0 +1,10 @@
+/** @jsxRuntime automatic */
+/** @jsxImportSource npm:preact@^10.24.0 */
+
+function App() {
+  return <div>hello world</div>;
+}
+
+App();
+
+console.log("it works");

tests/fixture/vite.config.ts

@@ -27,6 +27,7 @@ export default defineConfig({
         inlineNpm: "inlineNpm.ts",
         inlineJsr: "inlineJsr.ts",
         inlineHttp: "inlineHttp.ts",
+        jsx: "jsx.tsx",
         resolveInRootDir: "resolveInRootDir.ts",
       },
     },

tests/plugin.test.ts

@@ -66,4 +66,8 @@ describe("Deno plugin", () => {
   it("resolve to file in root dir", async () => {
     await runTest(`resolveInRootDir.js`);
   });
+
+  it("resolves @jsxImportSource with npm: prefix", async () => {
+    await runTest(`jsx.js`);
+  });
 });