rwsdk 0.1.0-alpha.1 → 0.1.0-alpha.3

package/dist/runtime/entries/clientSSR.d.ts

@@ -0,0 +1 @@
+export * from "../lib/streams/consumeEventStream";

package/dist/runtime/entries/clientSSR.js

@@ -0,0 +1 @@
+export * from "../lib/streams/consumeEventStream";

package/dist/vite/configPlugin.mjs

@@ -113,10 +113,6 @@ export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname
             server: {
                 hmr: true,
             },
-            resolve: {
-                conditions: ["workerd"],
-                alias: [],
-            },
             builder: {
                 buildApp: async (builder) => {
                     // note(justinvdm, 27 May 2025): **Ordering is important**:

package/dist/vite/directivesPlugin.d.mts

@@ -0,0 +1,6 @@
+import { Plugin } from "vite";
+export declare const directivesPlugin: ({ projectRootDir, clientFiles, serverFiles, }: {
+    projectRootDir: string;
+    clientFiles: Set<string>;
+    serverFiles: Set<string>;
+}) => Plugin;

package/dist/vite/directivesPlugin.mjs

@@ -0,0 +1,80 @@
+import debug from "debug";
+import { transformClientComponents } from "./transformClientComponents.mjs";
+import { transformServerFunctions } from "./transformServerFunctions.mjs";
+import { normalizeModulePath } from "./normalizeModulePath.mjs";
+const log = debug("rwsdk:vite:rsc-directives-plugin");
+const verboseLog = debug("verbose:rwsdk:vite:rsc-directives-plugin");
+export const directivesPlugin = ({ projectRootDir, clientFiles, serverFiles, }) => ({
+    name: "rwsdk:rsc-directives",
+    async transform(code, id) {
+        verboseLog("Transform called for id=%s, environment=%s", id, this.environment.name);
+        const normalizedId = normalizeModulePath(projectRootDir, id);
+        const clientResult = await transformClientComponents(code, normalizedId, {
+            environmentName: this.environment.name,
+            clientFiles,
+        });
+        if (clientResult) {
+            log("Client component transformation successful for id=%s", id);
+            return {
+                code: clientResult.code,
+                map: clientResult.map,
+            };
+        }
+        const serverResult = transformServerFunctions(code, normalizedId, this.environment.name, serverFiles);
+        if (serverResult) {
+            log("Server function transformation successful for id=%s", id);
+            return {
+                code: serverResult.code,
+                map: serverResult.map,
+            };
+        }
+        verboseLog("No transformation applied for id=%s", id);
+    },
+    configEnvironment(env, config) {
+        log("Configuring environment: env=%s", env);
+        config.optimizeDeps ??= {};
+        config.optimizeDeps.esbuildOptions ??= {};
+        config.optimizeDeps.esbuildOptions.plugins ??= [];
+        config.optimizeDeps.esbuildOptions.plugins.push({
+            name: "rsc-directives-esbuild-transform",
+            setup(build) {
+                log("Setting up esbuild plugin for environment: %s", env);
+                build.onLoad({ filter: /.*\.js$/ }, async (args) => {
+                    verboseLog("Esbuild onLoad called for path=%s", args.path);
+                    const fs = await import("node:fs/promises");
+                    const path = await import("node:path");
+                    let code;
+                    try {
+                        code = await fs.readFile(args.path, "utf-8");
+                    }
+                    catch {
+                        verboseLog("Failed to read file: %s", args.path);
+                        return undefined;
+                    }
+                    const clientResult = await transformClientComponents(code, normalizeModulePath(projectRootDir, args.path), {
+                        environmentName: env,
+                        clientFiles,
+                        isEsbuild: true,
+                    });
+                    if (clientResult) {
+                        log("Esbuild client component transformation successful for path=%s", args.path);
+                        return {
+                            contents: clientResult.code,
+                            loader: path.extname(args.path).slice(1),
+                        };
+                    }
+                    const serverResult = transformServerFunctions(code, normalizeModulePath(projectRootDir, args.path), env, serverFiles);
+                    if (serverResult) {
+                        log("Esbuild server function transformation successful for path=%s", args.path);
+                        return {
+                            contents: serverResult.code,
+                            loader: path.extname(args.path).slice(1),
+                        };
+                    }
+                    verboseLog("Esbuild no transformation applied for path=%s", args.path);
+                });
+            },
+        });
+        log("Environment configuration complete for env=%s", env);
+    },
+});

package/dist/vite/redwoodPlugin.mjs

@@ -2,7 +2,7 @@ import { resolve } from "node:path";
 import reactPlugin from "@vitejs/plugin-react";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { transformJsxScriptTagsPlugin } from "./transformJsxScriptTagsPlugin.mjs";
-import { rscDirectivesPlugin } from "./rscDirectivesPlugin.mjs";
+import { directivesPlugin } from "./directivesPlugin.mjs";
 import { useClientLookupPlugin } from "./useClientLookupPlugin.mjs";
 import { useServerLookupPlugin } from "./useServerLookupPlugin.mjs";
 import { miniflarePlugin } from "./miniflarePlugin.mjs";
@@ -56,7 +56,7 @@ export const redwoodPlugin = async (options = {}) => {
             configPath: options.configPath ?? (await findWranglerConfig(projectRootDir)),
         }),
         reactPlugin(),
-        rscDirectivesPlugin({
+        directivesPlugin({
             projectRootDir,
             clientFiles,
             serverFiles,

package/dist/vite/transformClientComponents.mjs

@@ -48,13 +48,17 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     const sourceFile = project.createSourceFile(normalizedId + ".ts", code);
     const exportInfos = [];
     let defaultExportInfo;
+    // Helper to get the computed local name (with alias suffix if present)
+    function getComputedLocalName(info) {
+        return `${info.local}${info.alias ? `_${info.alias}` : ""}`;
+    }
     // Helper to add export info
-    function addExport(local, exported, isDefault, statementIdx) {
+    function addExport(local, exported, isDefault, statementIdx, alias) {
         if (isDefault) {
             defaultExportInfo = { local, exported, isDefault, statementIdx };
         }
         else {
-            exportInfos.push({ local, exported, isDefault, statementIdx });
+            exportInfos.push({ local, exported, isDefault, statementIdx, alias });
         }
     }
     // Walk through statements in order to collect export information
@@ -106,13 +110,10 @@ export async function transformClientComponents(code, normalizedId, ctx) {
             const namedExports = stmt.getNamedExports();
             if (namedExports.length > 0) {
                 namedExports.forEach((exp) => {
-                    const local = exp.getAliasNode()
-                        ? exp.getNameNode().getText()
-                        : exp.getName();
-                    const exported = exp.getAliasNode()
-                        ? exp.getAliasNode().getText()
-                        : exp.getName();
-                    addExport(local, exported, exported === "default", idx);
+                    const alias = exp.getAliasNode()?.getText();
+                    const local = alias ? exp.getNameNode().getText() : exp.getName();
+                    const exported = alias ? alias : exp.getName();
+                    addExport(local, exported, exported === "default", idx, alias);
                 });
             }
             return;
@@ -148,14 +149,18 @@ export async function transformClientComponents(code, normalizedId, ctx) {
         moduleSpecifier: "rwsdk/worker",
         namedImports: [{ name: "registerClientReference" }],
     });
-    // Add registerClientReference assignments for named exports in order
-    for (const info of exportInfos) {
-        log(":isEsbuild=%s: Registering client reference for named export: %s as %s", !!ctx.isEsbuild, info.local, info.exported);
-        sourceFile.addStatements(`const ${info.local} = registerClientReference("${normalizedId}", "${info.exported}");`);
+    // Compute unique computed local names first
+    const computedLocalNames = new Map(exportInfos.map((info) => [getComputedLocalName(info), info]));
+    // Add registerClientReference assignments for unique names
+    for (const [computedLocalName, correspondingInfo] of computedLocalNames) {
+        log(":isEsbuild=%s: Registering client reference for named export: %s as %s", !!ctx.isEsbuild, correspondingInfo.local, correspondingInfo.exported);
+        sourceFile.addStatements(`const ${computedLocalName} = registerClientReference("${normalizedId}", "${correspondingInfo.exported}");`);
     }
     // Add grouped export statement for named exports (preserving order and alias)
     if (exportInfos.length > 0) {
-        const exportNames = exportInfos.map((e) => e.local === e.exported ? e.local : `${e.local} as ${e.exported}`);
+        const exportNames = Array.from(computedLocalNames.entries()).map(([computedLocalName, correspondingInfo]) => correspondingInfo.local === correspondingInfo.exported
+            ? computedLocalName
+            : `${computedLocalName} as ${correspondingInfo.exported}`);
         log(":isEsbuild=%s: Exporting named exports: %O", !!ctx.isEsbuild, exportNames);
         sourceFile.addStatements(`export { ${exportNames.join(", ")} };`);
     }

package/dist/vite/transformClientComponents.test.mjs

@@ -85,8 +85,8 @@ export { Fourth as AnotherName }`)) ?? "").toEqual(`import { registerClientRefer
 const First = registerClientReference("/test/file.tsx", "First");
 const Second = registerClientReference("/test/file.tsx", "Second");
 const Third = registerClientReference("/test/file.tsx", "Third");
-const Fourth = registerClientReference("/test/file.tsx", "AnotherName");
-export { First, Second, Third, Fourth as AnotherName };
+const Fourth_AnotherName = registerClientReference("/test/file.tsx", "AnotherName");
+export { First, Second, Third, Fourth_AnotherName as AnotherName };
 export default registerClientReference("/test/file.tsx", "default");
 `);
     });
@@ -199,8 +199,8 @@ const MyComponent = () => {
 }
 
 export { MyComponent as CustomName }`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const MyComponent = registerClientReference("/test/file.tsx", "CustomName");
-export { MyComponent as CustomName };
+const MyComponent_CustomName = registerClientReference("/test/file.tsx", "CustomName");
+export { MyComponent_CustomName as CustomName };
 `);
     });
     it("correctly processes multiple component exports", async () => {
@@ -229,6 +229,20 @@ const Component = registerClientReference("/test/file.tsx", "Component");
 const data = registerClientReference("/test/file.tsx", "data");
 const helper = registerClientReference("/test/file.tsx", "helper");
 export { Component, data, helper };
+`);
+    });
+    it("transforms multiple exports aliases for the same component", async () => {
+        expect((await transform(`"use client"
+
+export const Slot = () => {
+  return jsx('div', { children: 'Slot' });
+}
+
+export { Slot, Slot as Root }
+`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
+const Slot = registerClientReference("/test/file.tsx", "Slot");
+const Slot_Root = registerClientReference("/test/file.tsx", "Root");
+export { Slot, Slot_Root as Root };
 `);
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.3",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -22,6 +22,7 @@
     },
     "./client": {
       "react-server": "./dist/runtime/entries/no-react-server.js",
+      "workerd": "./dist/runtime/entries/clientSSR.js",
       "types": "./dist/runtime/entries/client.d.ts",
       "default": "./dist/runtime/entries/client.js"
     },