fix(storage, database): import connector libs from their real specifier

Author: pi0

package.json

@@ -71,7 +71,7 @@
   "dependencies": {
     "consola": "^3.4.2",
     "crossws": "^0.4.12",
-    "db0": "^0.4.0",
+    "db0": "^0.4.1",
     "env-runner": "^0.2.1",
     "h3": "^2.0.1-rc.30",
     "hookable": "^6.1.1",
@@ -81,7 +81,7 @@
     "rou3": "^0.9.2",
     "srvx": "^1.0.2",
     "unenv": "^2.0.0-rc.24",
-    "unstorage": "^2.0.0-alpha.9"
+    "unstorage": "^2.0.0-alpha.10"
   },
   "devDependencies": {
     "@apphosting/common": "^0.0.9",

pnpm-lock.yaml

@@ -48,7 +48,7 @@ function genConnectorOptions(nitro: Nitro, connection: DatabaseConnection) {
         connection.options[dep.option] === undefined &&
         isDepInstalled(dep.name, nitro.options.rootDir)
     )
-    .map((dep) => `${dep.option}: () => import(${JSON.stringify(dep.name)})`);
+    .map((dep) => `${dep.option}: () => import(${JSON.stringify(dep.import || dep.name)})`);
 
   const options = JSON.stringify(connection.options);
   return libs.length > 0 ? `{ ...${options}, ${libs.join(", ")} }` : options;

src/build/virtual/database.ts

@@ -50,7 +50,7 @@ function genDriverOptions(nitro: Nitro, mount: ReturnType<typeof resolveStorageM
         mount.options[dep.option] === undefined &&
         isDepInstalled(dep.name, nitro.options.rootDir)
     )
-    .map((dep) => `${dep.option}: () => import(${JSON.stringify(dep.name)})`);
+    .map((dep) => `${dep.option}: () => import(${JSON.stringify(dep.import || dep.name)})`);
 
   const options = JSON.stringify(mount.options);
   return libs.length > 0 ? `{ ...${options}, ${libs.join(", ")} }` : options;

src/build/virtual/storage.ts

@@ -86,6 +86,8 @@ export interface LibDep {
   option: string;
   /** Package name. */
   name: string;
+  /** Import specifier, if it differs from the package name (e.g. `mysql2/promise`). */
+  import?: string;
   /** Supported version range. */
   version?: string;
   /** Only required for some of the features. */

src/utils/dep.ts

@@ -54,6 +54,16 @@ describe("virtual/database template", () => {
     expect(template).toContain(`options: { ...{"url":"postgres://"}, lib: () => import("pg") }`);
   });
 
+  it("uses the connector import specifier when it differs from the package name", () => {
+    installedDeps.add("mysql2");
+    const template = database(
+      createNitroStub({ default: { connector: "mysql2", options: { host: "localhost" } } })
+    ).template();
+    expect(template).toContain(
+      `options: { ...{"host":"localhost"}, lib: () => import("mysql2/promise") }`
+    );
+  });
+
   it("does not provide `lib` for dependencies that are not installed", () => {
     const template = database(
       createNitroStub({ default: { connector: "postgresql", options: { url: "postgres://" } } })

test/unit/virtual-database.test.ts

@@ -1,7 +1,18 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import type { Nitro } from "nitro/types";
 
-import storage from "../../src/build/virtual/storage.ts";
+const mockedDeps = new Set<string>();
+
+vi.mock("../../src/utils/dep.ts", async (importOriginal) => {
+  const original = await importOriginal<typeof import("../../src/utils/dep.ts")>();
+  return {
+    ...original,
+    isDepInstalled: (id: string, dir: string) =>
+      mockedDeps.has(id) || original.isDepInstalled(id, dir),
+  };
+});
+
+const { default: storage } = await import("../../src/build/virtual/storage.ts");
 
 function createNitroStub(
   tracingChannel: Nitro["options"]["tracingChannel"],
@@ -49,6 +60,18 @@ describe("virtual/storage template", () => {
     );
   });
 
+  it("uses the driver import specifier when it differs from the package name", () => {
+    mockedDeps.add("uploadthing");
+    try {
+      const template = storage(
+        createNitroStub(undefined, { "/files": { driver: "uploadthing", token: "x" } })
+      ).template();
+      expect(template).toContain(`lib: () => import("uploadthing/server")`);
+    } finally {
+      mockedDeps.clear();
+    }
+  });
+
   it("does not provide `lib` for dependencies that are not installed", () => {
     const template = storage(
       createNitroStub(undefined, { "/cache": { driver: "redis", base: "cache" } })