rwsdk 0.2.0-alpha.6-test.20250806102744 → 0.2.0-alpha.7

package/dist/runtime/lib/db/createDb.js

@@ -1,7 +1,6 @@
 import { Kysely } from "kysely";
-import { requestInfo } from "../../requestInfo/worker.js";
+import { requestInfo, waitForRequestInfo } from "../../requestInfo/worker.js";
 import { DOWorkerDialect } from "./DOWorkerDialect.js";
-const moduleLevelDbCache = new Map();
 const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     const durableObjectId = durableObjectBinding.idFromName(name);
     const stub = durableObjectBinding.get(durableObjectId);
@@ -11,23 +10,26 @@ const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     });
 };
 export function createDb(durableObjectBinding, name = "main") {
-    const getDb = () => {
-        let db = moduleLevelDbCache.get(name);
+    const cacheKey = `${durableObjectBinding}_${name}`;
+    const doCreateDb = () => {
+        if (!requestInfo.rw) {
+            throw new Error(`
+  rwsdk: A database created using createDb() was accessed before requestInfo was available.
+
+  Please make sure database access is happening in a request handler or action handler.
+  `);
+        }
+        let db = requestInfo.rw.databases.get(cacheKey);
         if (!db) {
             db = createDurableObjectDb(durableObjectBinding, name);
-            moduleLevelDbCache.set(name, db);
-        }
-        if (requestInfo.rw) {
-            if (!requestInfo.rw.databases) {
-                requestInfo.rw.databases = new Map();
-            }
-            requestInfo.rw.databases.set(name, db);
+            requestInfo.rw.databases.set(cacheKey, db);
         }
         return db;
     };
+    waitForRequestInfo().then(() => doCreateDb());
     return new Proxy({}, {
-        get(target, prop) {
-            const db = getDb();
+        get(target, prop, receiver) {
+            const db = doCreateDb();
             const value = db[prop];
             if (typeof value === "function") {
                 return value.bind(db);

package/dist/vite/findSsrSpecifiers.d.mts

@@ -1,11 +1,10 @@
 /**
- * Finds __vite_ssr_import__ and __vite_ssr_dynamic_import__ specifiers in the code.
- * @param id The file identifier for language detection.
- * @param code The code to search for SSR imports.
- * @param log Optional logger function for debug output.
- * @returns Object with arrays of static and dynamic import specifiers.
+ * Finds callsites for __vite_ssr_import__ and __vite_ssr_dynamic_import__ with their ranges.
+ * The returned ranges can be used with MagicString to overwrite the entire call expression.
  */
-export declare function findSsrImportSpecifiers(id: string, code: string, log?: (...args: any[]) => void): {
-    imports: string[];
-    dynamicImports: string[];
-};
+export declare function findSsrImportCallSites(id: string, code: string, log?: (...args: any[]) => void): Array<{
+    start: number;
+    end: number;
+    specifier: string;
+    kind: "import" | "dynamic_import";
+}>;

package/dist/vite/findSsrSpecifiers.mjs

@@ -1,67 +1,69 @@
 import { parse as sgParse, Lang as SgLang, Lang } from "@ast-grep/napi";
 import path from "path";
 /**
- * Finds __vite_ssr_import__ and __vite_ssr_dynamic_import__ specifiers in the code.
- * @param id The file identifier for language detection.
- * @param code The code to search for SSR imports.
- * @param log Optional logger function for debug output.
- * @returns Object with arrays of static and dynamic import specifiers.
+ * Finds callsites for __vite_ssr_import__ and __vite_ssr_dynamic_import__ with their ranges.
+ * The returned ranges can be used with MagicString to overwrite the entire call expression.
  */
-export function findSsrImportSpecifiers(id, code, log) {
+export function findSsrImportCallSites(id, code, log) {
     const ext = path.extname(id).toLowerCase();
     const lang = ext === ".tsx" || ext === ".jsx" ? Lang.Tsx : SgLang.TypeScript;
     const logger = process.env.VERBOSE ? (log ?? (() => { })) : () => { };
-    const imports = [];
-    const dynamicImports = [];
+    const results = [];
     try {
         const root = sgParse(lang, code);
         const patterns = [
             {
                 pattern: `__vite_ssr_import__("$SPECIFIER")`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_import__('$SPECIFIER')`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__("$SPECIFIER")`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__('$SPECIFIER')`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
             {
                 pattern: `__vite_ssr_import__("$SPECIFIER", $$$REST)`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_import__('$SPECIFIER', $$$REST)`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__("$SPECIFIER", $$$REST)`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__('$SPECIFIER', $$$REST)`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
         ];
-        for (const { pattern, list } of patterns) {
+        for (const { pattern, kind } of patterns) {
             const matches = root.root().findAll(pattern);
             for (const match of matches) {
                 const specifier = match.getMatch("SPECIFIER")?.text();
                 if (specifier) {
-                    list.push(specifier);
-                    logger(`Found SSR import specifier: %s in pattern: %s`, specifier, pattern);
+                    const range = match.range();
+                    results.push({
+                        start: range.start.index,
+                        end: range.end.index,
+                        specifier,
+                        kind,
+                    });
+                    logger(`Found SSR import callsite: %s [%s] at %d-%d`, specifier, kind, range.start.index, range.end.index);
                 }
             }
         }
     }
     catch (err) {
-        logger("Error parsing code for SSR imports: %O", err);
+        logger("Error parsing code for SSR import callsites: %O", err);
     }
-    return { imports, dynamicImports };
+    return results;
 }

package/dist/vite/ssrBridgePlugin.mjs

@@ -1,6 +1,7 @@
 import debug from "debug";
 import { SSR_BRIDGE_PATH } from "../lib/constants.mjs";
-import { findSsrImportSpecifiers } from "./findSsrSpecifiers.mjs";
+import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
+import MagicString from "magic-string";
 const log = debug("rwsdk:vite:ssr-bridge-plugin");
 export const VIRTUAL_SSR_PREFIX = "virtual:rwsdk:ssr:";
 export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
@@ -108,35 +109,27 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                         return "export default {};";
                     }
                     log("Fetched SSR module code length: %d", code?.length || 0);
-                    const { imports, dynamicImports } = findSsrImportSpecifiers(idForFetch, code || "", log);
-                    const allSpecifiers = [
-                        ...new Set([...imports, ...dynamicImports]),
-                    ].map((id) => id.startsWith("/@id/") ? id.slice("/@id/".length) : id);
-                    const switchCases = allSpecifiers
-                        .map((specifier) => `    case "${specifier}": void import("${VIRTUAL_SSR_PREFIX}${specifier}");`)
-                        .join("\n");
-                    const transformedCode = `
-await (async function(__vite_ssr_import__, __vite_ssr_dynamic_import__) {${code}})(
-  __ssrImport.bind(null, false),
-  __ssrImport.bind(null, true)
-);
-
-function __ssrImport(isDynamic, id, ...args) {
-  id = id.startsWith('/@id/') ? id.slice('/@id/'.length) : id;
-
-  switch (id) {
-${switchCases}
-  }
-
-  return isDynamic
-    ? __vite_ssr_dynamic_import__("/@id/${VIRTUAL_SSR_PREFIX}" + id, ...args)
-    : __vite_ssr_import__("/@id/${VIRTUAL_SSR_PREFIX}" + id, ...args);
-}
-`;
-                    log("Transformed SSR module code length: %d", transformedCode.length);
+                    const s = new MagicString(code || "");
+                    const callsites = findSsrImportCallSites(idForFetch, code || "", log);
+                    for (const site of callsites) {
+                        const normalized = site.specifier.startsWith("/@id/")
+                            ? site.specifier.slice("/@id/".length)
+                            : site.specifier;
+                        // context(justinvdm, 11 Aug 2025):
+                        // - We replace __vite_ssr_import__ and __vite_ssr_dynamic_import__
+                        //   with import() calls so that the module graph can be built
+                        //   correctly (vite looks for imports and import()s to build module
+                        //   graph)
+                        // - We prepend /@id/$VIRTUAL_SSR_PREFIX to the specifier so that we
+                        //   can stay within the SSR subgraph of the worker module graph
+                        const replacement = `import("/@id/${VIRTUAL_SSR_PREFIX}${normalized}")`;
+                        s.overwrite(site.start, site.end, replacement);
+                    }
+                    const out = s.toString();
+                    log("Transformed SSR module code length: %d", out.length);
                     process.env.VERBOSE &&
-                        log("Transformed SSR module code for realId=%s: %s", realId, transformedCode);
-                    return transformedCode;
+                        log("Transformed SSR module code for realId=%s: %s", realId, out);
+                    return out;
                 }
             }
             process.env.VERBOSE && log("No load handling for id=%s", id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.6-test.20250806102744",
+  "version": "0.2.0-alpha.7",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {