rwsdk 0.1.15 → 0.1.17-test.20250715200658

package/dist/runtime/imports/client.js

@@ -5,7 +5,7 @@ export const loadModule = memoize(async (id) => {
         return await import(/* @vite-ignore */ id);
     }
     else {
-        const { useClientLookup } = await import("virtual:use-client-lookup");
+        const { useClientLookup } = await import("virtual:use-client-lookup.js");
         const moduleFn = useClientLookup[id];
         if (!moduleFn) {
             throw new Error(`(client) No module found for '${id}' in module lookup for "use client" directive`);

package/dist/runtime/imports/ssr.js

@@ -1,6 +1,6 @@
 import memoize from "lodash/memoize";
 export const ssrLoadModule = memoize(async (id) => {
-    const { useClientLookup } = await import("virtual:use-client-lookup");
+    const { useClientLookup } = await import("virtual:use-client-lookup.js");
     const moduleFn = useClientLookup[id];
     if (!moduleFn) {
         throw new Error(`(ssr) No module found for '${id}' in module lookup for "use client" directive`);

package/dist/runtime/imports/worker.js

@@ -2,7 +2,7 @@ import memoize from "lodash/memoize";
 import { requestInfo } from "../requestInfo/worker";
 import { ssrWebpackRequire as baseSsrWebpackRequire } from "rwsdk/__ssr_bridge";
 export const loadServerModule = memoize(async (id) => {
-    const { useServerLookup } = await import("virtual:use-server-lookup");
+    const { useServerLookup } = await import("virtual:use-server-lookup.js");
     const moduleFn = useServerLookup[id];
     if (!moduleFn) {
         throw new Error(`(worker) No module found for '${id}' in module lookup for "use server" directive`);

package/dist/runtime/register/ssr.js

@@ -1,7 +1,7 @@
 import memoize from "lodash/memoize";
 import { createServerReference as baseCreateServerReference } from "react-server-dom-webpack/client.edge";
 export const loadServerModule = memoize(async (id) => {
-    const { useServerLookup } = await import("virtual:use-server-lookup");
+    const { useServerLookup } = await import("virtual:use-server-lookup.js");
     const moduleFn = useServerLookup[id];
     if (!moduleFn) {
         throw new Error(`(worker) No module found for '${id}' in module lookup for "use server" directive`);

package/dist/vite/createDirectiveLookupPlugin.mjs

@@ -150,12 +150,12 @@ export const createDirectiveLookupPlugin = async ({ projectRootDir, files, confi
                     const escapedVirtualModuleName = config.virtualModuleName.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
                     const escapedPrefixedModuleName = `/@id/${config.virtualModuleName}`.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
                     build.onResolve({
-                        filter: new RegExp(`^(${escapedVirtualModuleName}|${escapedPrefixedModuleName})$`),
+                        filter: new RegExp(`^(${escapedVirtualModuleName}|${escapedPrefixedModuleName})\.js$`),
                     }, () => {
                         process.env.VERBOSE &&
                             log("Esbuild onResolve: marking %s as external", config.virtualModuleName);
                         return {
-                            path: config.virtualModuleName,
+                            path: `${config.virtualModuleName}.js`,
                             external: true,
                         };
                     });
@@ -184,13 +184,11 @@ export const createDirectiveLookupPlugin = async ({ projectRootDir, files, confi
         },
         resolveId(source) {
             process.env.VERBOSE && log("Resolving id=%s", source);
-            if (source === config.virtualModuleName ||
-                source === `/@id/${config.virtualModuleName}` ||
-                source === `/@id/${config.virtualModuleName}.js`) {
+            if (source === `${config.virtualModuleName}.js`) {
                 log("Resolving %s module", config.virtualModuleName);
                 // context(justinvdm, 16 Jun 2025): Include .js extension
                 // so it goes through vite processing chain
-                return `${config.virtualModuleName}.js`;
+                return source;
             }
             process.env.VERBOSE && log("No resolution for id=%s", source);
         },

package/dist/vite/findSsrSpecifiers.mjs

@@ -32,6 +32,22 @@ export function findSsrImportSpecifiers(id, code, log) {
                 pattern: `__vite_ssr_dynamic_import__('$SPECIFIER')`,
                 list: dynamicImports,
             },
+            {
+                pattern: `__vite_ssr_import__("$SPECIFIER", $$$REST)`,
+                list: imports,
+            },
+            {
+                pattern: `__vite_ssr_import__('$SPECIFIER', $$$REST)`,
+                list: imports,
+            },
+            {
+                pattern: `__vite_ssr_dynamic_import__("$SPECIFIER", $$$REST)`,
+                list: dynamicImports,
+            },
+            {
+                pattern: `__vite_ssr_dynamic_import__('$SPECIFIER', $$$REST)`,
+                list: dynamicImports,
+            },
         ];
         for (const { pattern, list } of patterns) {
             const matches = root.root().findAll(pattern);

package/dist/vite/miniflareHMRPlugin.mjs

@@ -32,13 +32,50 @@ const hasEntryAsAncestor = (module, entryFile, seen = new Set()) => {
     }
     return false;
 };
+const isInUseClientGraph = ({ file, clientFiles, server, }) => {
+    const id = normalizeModulePath(server.config.root, file);
+    if (clientFiles.has(id)) {
+        return true;
+    }
+    const modules = server.environments.client.moduleGraph.getModulesByFile(file);
+    if (!modules) {
+        return false;
+    }
+    for (const m of modules) {
+        for (const importer of m.importers) {
+            if (importer.file &&
+                isInUseClientGraph({ file: importer.file, clientFiles, server })) {
+                return true;
+            }
+        }
+    }
+    return false;
+};
 export const miniflareHMRPlugin = (givenOptions) => [
     {
         name: "rwsdk:miniflare-hmr",
         async hotUpdate(ctx) {
             const { clientFiles, serverFiles, viteEnvironment: { name: environment }, workerEntryPathname: entry, } = givenOptions;
             if (process.env.VERBOSE) {
-                this.environment.logger.info(`Hot update: (env=${this.environment.name}) ${ctx.file}\nModule graph:\n\n${dumpFullModuleGraph(ctx.server, this.environment.name)}`);
+                log(`Hot update: (env=${this.environment.name}) ${ctx.file}\nModule graph:\n\n${dumpFullModuleGraph(ctx.server, this.environment.name)}`);
+            }
+            if (!isJsFile(ctx.file) && !ctx.file.endsWith(".css")) {
+                return;
+            }
+            if (this.environment.name === "ssr") {
+                log("SSR update, invalidating recursively", ctx.file);
+                const isUseClientUpdate = isInUseClientGraph({
+                    file: ctx.file,
+                    clientFiles,
+                    server: ctx.server,
+                });
+                if (!isUseClientUpdate) {
+                    return [];
+                }
+                invalidateModule(ctx.server, "ssr", ctx.file);
+                invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX +
+                    normalizeModulePath(givenOptions.rootDir, ctx.file));
+                return [];
             }
             if (!["client", environment].includes(this.environment.name)) {
                 return [];
@@ -77,33 +114,34 @@ export const miniflareHMRPlugin = (givenOptions) => [
             }
             // todo(justinvdm, 12 Dec 2024): Skip client references
             const modules = Array.from(ctx.server.environments[environment].moduleGraph.getModulesByFile(ctx.file) ?? []);
-            const isWorkerUpdate = ctx.file === entry ||
-                modules.some((module) => hasEntryAsAncestor(module, entry));
-            // The worker doesnt need an update
-            // => Short circuit HMR
-            if (!isWorkerUpdate) {
-                return [];
-            }
+            const isWorkerUpdate = Boolean(modules);
             // The worker needs an update, but this is the client environment
             // => Notify for HMR update of any css files imported by in worker, that are also in the client module graph
             // Why: There may have been changes to css classes referenced, which might css modules to change
             if (this.environment.name === "client") {
-                for (const [_, module] of ctx.server.environments[environment]
-                    .moduleGraph.idToModuleMap) {
-                    // todo(justinvdm, 13 Dec 2024): We check+update _all_ css files in worker module graph,
-                    // but it could just be a subset of css files that are actually affected, depending
-                    // on the importers and imports of the changed file. We should be smarter about this.
-                    if (module.file && module.file.endsWith(".css")) {
-                        const clientModules = ctx.server.environments.client.moduleGraph.getModulesByFile(module.file);
-                        for (const clientModule of clientModules ?? []) {
-                            invalidateModule(ctx.server, "client", clientModule);
+                if (isWorkerUpdate) {
+                    for (const [_, module] of ctx.server.environments[environment]
+                        .moduleGraph.idToModuleMap) {
+                        // todo(justinvdm, 13 Dec 2024): We check+update _all_ css files in worker module graph,
+                        // but it could just be a subset of css files that are actually affected, depending
+                        // on the importers and imports of the changed file. We should be smarter about this.
+                        if (module.file && module.file.endsWith(".css")) {
+                            const clientModules = ctx.server.environments.client.moduleGraph.getModulesByFile(module.file);
+                            for (const clientModule of clientModules ?? []) {
+                                invalidateModule(ctx.server, "client", clientModule);
+                            }
                         }
                     }
                 }
-                // context(justinvdm, 10 Jul 2025): If this isn't a file with a client
-                // directive or a css file, we shouldn't invalidate anything else to
-                // avoid full page reload
-                return hasClientDirective || ctx.file.endsWith(".css") ? undefined : [];
+                const isUseClientUpdate = isInUseClientGraph({
+                    file: ctx.file,
+                    clientFiles,
+                    server: ctx.server,
+                });
+                if (!isUseClientUpdate && !ctx.file.endsWith(".css")) {
+                    return [];
+                }
+                return ctx.modules;
             }
             // The worker needs an update, and the hot check is for the worker environment
             // => Notify for custom RSC-based HMR update, then short circuit HMR

package/dist/vite/ssrBridgePlugin.mjs

@@ -93,22 +93,35 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                     process.env.VERBOSE &&
                         log("Fetch module result: id=%s, result=%O", realId, result);
                     const code = "code" in result ? result.code : undefined;
+                    if (realId.endsWith(".css")) {
+                        process.env.VERBOSE &&
+                            log("Not a JS file, returning code: %s", code);
+                        return code ?? "";
+                    }
                     log("Fetched SSR module code length: %d", code?.length || 0);
                     const { imports, dynamicImports } = findSsrImportSpecifiers(realId, code || "", log);
-                    const allSpecifiers = [...new Set([...imports, ...dynamicImports])];
+                    const allSpecifiers = [
+                        ...new Set([...imports, ...dynamicImports]),
+                    ].map((id) => id.startsWith("/@id/") ? id.slice("/@id/".length) : id);
                     const switchCases = allSpecifiers
-                        .map((specifier) => `    case "${specifier}": return import("${VIRTUAL_SSR_PREFIX}${specifier}");`)
+                        .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}})(
-  (id, ...args) => {ssrImport(id); return __vite_ssr_import__('/@id/${VIRTUAL_SSR_PREFIX}' + id, ...args);},
-  (id, ...args) => {ssrImport(id); return __vite_ssr_dynamic_import__('/@id/${VIRTUAL_SSR_PREFIX}' + id, ...args);}
+  __ssrImport.bind(null, false),
+  __ssrImport.bind(null, true)
 );
 
-function ssrImport(id) {
+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);

package/package.json

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

package/dist/runtime/lib/db/typeInference/builders/table.d.ts

@@ -1,10 +0,0 @@
-import { SqlToTsType, ExecutedBuilder, Prettify } from "../utils";
-import { ColumnDefinitionBuilder } from "./columnDefinition";
-export interface TableBuilder<TName extends string, TSchema extends Record<string, any> = {}> {
-    readonly __tableName: TName;
-    readonly __schema: TSchema;
-    addColumn<K extends string, T extends string>(name: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>>): TableBuilder<TName, Prettify<TSchema & Record<K, SqlToTsType<T>>>>;
-    temporary(): this;
-    ifNotExists(): this;
-    execute(): Promise<ExecutedBuilder<this>>;
-}

package/dist/runtime/lib/db/typeInference/builders/table.js

@@ -1 +0,0 @@
-export {};

package/dist/vite/invalidateClientModule.d.mts

@@ -1,2 +0,0 @@
-import type { ViteDevServer } from "vite";
-export declare const invalidateClientModule: (devServer: ViteDevServer, filePath: string) => void;

package/dist/vite/invalidateClientModule.mjs

@@ -1,8 +0,0 @@
-import { invalidateModule } from "./invalidateModule.mjs";
-import { normalizeModulePath } from "./normalizeModulePath.mjs";
-import { VIRTUAL_SSR_PREFIX } from "./ssrBridgePlugin.mjs";
-export const invalidateClientModule = (devServer, filePath) => {
-    invalidateModule(devServer, "ssr", filePath);
-    invalidateModule(devServer, "client", filePath);
-    invalidateModule(devServer, "worker", VIRTUAL_SSR_PREFIX + normalizeModulePath(devServer.config.root, filePath));
-};

package/dist/vite/invalidateModule copy.d.mts

@@ -1,2 +0,0 @@
-import type { ViteDevServer } from "vite";
-export declare const invalidateModule: (devServer: ViteDevServer, environment: string, id: string) => void;

package/dist/vite/invalidateModule copy.mjs

@@ -1,14 +0,0 @@
-import debug from "debug";
-const log = debug("rwsdk:vite:invalidate-module");
-const verboseLog = debug("verbose:rwsdk:vite:invalidate-module");
-export const invalidateModule = (devServer, environment, id) => {
-    const [rawId, _query] = id.split("?");
-    log("Invalidating module: id=%s, environment=%s", id, environment);
-    const moduleNode = devServer?.environments[environment]?.moduleGraph.idToModuleMap.get(rawId);
-    if (moduleNode) {
-        devServer?.environments[environment]?.moduleGraph.invalidateModule(moduleNode);
-    }
-    else {
-        verboseLog("Module not found: id=%s, environment=%s", id, environment);
-    }
-};

package/dist/vite/invalidateSSRModule.d.mts

@@ -1,2 +0,0 @@
-import type { ViteDevServer } from "vite";
-export declare const invalidateSSRModule: (devServer: ViteDevServer, filePath: string) => void;

package/dist/vite/invalidateSSRModule.mjs

@@ -1,7 +0,0 @@
-import { invalidateModule } from "./invalidateModule.mjs";
-import { normalizeModulePath } from "./normalizeModulePath.mjs";
-import { VIRTUAL_SSR_PREFIX } from "./ssrBridgePlugin.mjs";
-export const invalidateSSRModule = (devServer, filePath) => {
-    invalidateModule(devServer, "ssr", filePath);
-    invalidateModule(devServer, "worker", VIRTUAL_SSR_PREFIX + normalizeModulePath(devServer.config.root, filePath));
-};

package/dist/vite/isJsFile.d.ts

@@ -1 +0,0 @@
-export declare function isJsFile(filepath: string): boolean;

package/dist/vite/isJsFile.js

@@ -1,3 +0,0 @@
-export function isJsFile(filepath) {
-    return /\.(m|c)?(j|t)s(x)?$/.test(filepath);
-}

package/dist/vite/mode.d.mts

@@ -1,5 +0,0 @@
-import { ConfigEnv } from "vite";
-type Mode = "development" | "production";
-export declare const resolveMode: (env: ConfigEnv) => Mode;
-export declare const ensureMode: () => Mode;
-export {};

package/dist/vite/mode.mjs

@@ -1,25 +0,0 @@
-import debug from "debug";
-const log = debug("rwsdk:vite:mode");
-const initialNodeEnv = process.env.NODE_ENV;
-let mode;
-export const resolveMode = (env) => {
-    if (mode) {
-        return mode;
-    }
-    if (initialNodeEnv) {
-        mode = initialNodeEnv === "development" ? "development" : "production";
-        log(`Resolved mode: %s (from initial NODE_ENV=%s)`, mode, initialNodeEnv);
-    }
-    else {
-        mode =
-            env.command === "serve" || env.isPreview ? "development" : "production";
-        log(`Resolved mode: %s (env.command=%s, env.isPreview=%s)`, mode, env.isPreview, env.command);
-    }
-    return mode;
-};
-export const ensureMode = () => {
-    if (mode === undefined) {
-        throw new Error("RedwoodSDK: mode is not resolved yet");
-    }
-    return mode;
-};

package/dist/vite/modePlugin.d.mts

@@ -1,2 +0,0 @@
-import { Plugin } from "vite";
-export declare function modePlugin(): Plugin;

package/dist/vite/modePlugin.mjs

@@ -1,10 +0,0 @@
-import { resolveMode } from "./mode.mjs";
-export function modePlugin() {
-    return {
-        name: "rwsdk:mode",
-        enforce: "pre",
-        config(_, env) {
-            resolveMode(env);
-        },
-    };
-}