rwsdk 1.0.0-alpha.2 → 1.0.0-alpha.20-test.20250929144616

package/dist/vite/runDirectivesScan.mjs

@@ -1,11 +1,14 @@
+// @ts-ignore
+import { compile } from "@mdx-js/mdx";
+import debug from "debug";
 import fsp from "node:fs/promises";
-import { hasDirective } from "./hasDirective.mjs";
 import path from "node:path";
-import debug from "debug";
-import { getViteEsbuild } from "./getViteEsbuild.mjs";
+import { INTERMEDIATES_OUTPUT_DIR } from "../lib/constants.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { externalModules } from "./constants.mjs";
-import { createViteAwareResolver, } from "./createViteAwareResolver.mjs";
+import { createViteAwareResolver } from "./createViteAwareResolver.mjs";
+import { getViteEsbuild } from "./getViteEsbuild.mjs";
+import { hasDirective } from "./hasDirective.mjs";
 const log = debug("rwsdk:vite:run-directives-scan");
 // Copied from Vite's source code.
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/shared/utils.ts
@@ -14,13 +17,47 @@ const isObject = (value) => Object.prototype.toString.call(value) === "[object O
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/utils.ts
 const externalRE = /^(https?:)?\/\//;
 const isExternalUrl = (url) => externalRE.test(url);
-export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, }) => {
-    console.log("\n🔍 Scanning for 'use client' and 'use server' directives...");
+export async function resolveModuleWithEnvironment({ path, importer, importerEnv, clientResolver, workerResolver, }) {
+    const resolver = importerEnv === "client" ? clientResolver : workerResolver;
+    return new Promise((resolvePromise) => {
+        resolver({}, importer || "", path, {}, (err, result) => {
+            if (!err && result) {
+                resolvePromise({ id: result });
+            }
+            else {
+                if (err) {
+                    const errorMessage = err.message || String(err);
+                    if (errorMessage.includes("Package path . is not exported")) {
+                        log("Package exports error for %s, marking as external", path);
+                    }
+                    else {
+                        log("Resolution failed for %s: %s", path, errorMessage);
+                    }
+                }
+                resolvePromise(null);
+            }
+        });
+    });
+}
+export function classifyModule({ contents, inheritedEnv, }) {
+    let moduleEnv = inheritedEnv;
+    const isClient = hasDirective(contents, "use client");
+    const isServer = hasDirective(contents, "use server");
+    if (isClient) {
+        moduleEnv = "client";
+    }
+    else if (isServer) {
+        moduleEnv = "worker";
+    }
+    return { moduleEnv, isClient, isServer };
+}
+export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
+    deferredLog("\n… (rwsdk) Scanning for 'use client' and 'use server' directives...");
     // Set environment variable to indicate scanning is in progress
     process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE = "true";
     try {
         const esbuild = await getViteEsbuild(rootConfig.root);
-        const input = environments.worker.config.build.rollupOptions?.input;
+        const input = initialEntries ?? environments.worker.config.build.rollupOptions?.input;
         let entries;
         if (Array.isArray(input)) {
             entries = input;
@@ -38,7 +75,9 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             log("No entries found for directives scan in worker environment, skipping.");
             return;
         }
-        const absoluteEntries = entries.map((entry) => path.resolve(rootConfig.root, entry));
+        // Filter out virtual modules since they can't be scanned by esbuild
+        const realEntries = entries.filter((entry) => !entry.includes("virtual:"));
+        const absoluteEntries = realEntries.map((entry) => path.resolve(rootConfig.root, entry));
         log("Starting directives scan for worker environment with entries:", absoluteEntries);
         const workerResolver = createViteAwareResolver(rootConfig, environments.worker);
         const clientResolver = createViteAwareResolver(rootConfig, environments.client);
@@ -57,7 +96,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             setup(build) {
                 // Match Vite's behavior by externalizing assets and special queries.
                 // This prevents esbuild from trying to bundle them, which would fail.
-                const scriptFilter = /\.(c|m)?[jt]sx?$/;
+                const scriptFilter = /\.(c|m)?[jt]sx?$|\.mdx$/;
                 const specialQueryFilter = /[?&](?:url|raw|worker|sharedworker|inline)\b/;
                 // This regex is used to identify if a path has any file extension.
                 const hasExtensionRegex = /\.[^/]+$/;
@@ -87,17 +126,12 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         /\.(m|c)?[jt]sx?$/.test(args.importer)) {
                         try {
                             const importerContents = await readFileWithCache(args.importer);
-                            if (hasDirective(importerContents, "use client")) {
-                                importerEnv = "client";
-                                log("Pre-detected importer 'use client' in:", args.importer);
-                            }
-                            else if (hasDirective(importerContents, "use server")) {
-                                importerEnv = "worker";
-                                log("Pre-detected importer 'use server' in:", args.importer);
-                            }
-                            else {
-                                importerEnv = "worker"; // Default for entry points
-                            }
+                            const classification = classifyModule({
+                                contents: importerContents,
+                                inheritedEnv: "worker", // Default for entry points
+                            });
+                            importerEnv = classification.moduleEnv;
+                            log("Pre-detected importer environment in:", args.importer, "as", importerEnv);
                             moduleEnvironments.set(args.importer, importerEnv);
                         }
                         catch (e) {
@@ -109,25 +143,12 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         importerEnv = "worker"; // Default for entry points or non-script files
                     }
                     log("Importer:", args.importer, "environment:", importerEnv);
-                    const resolver = importerEnv === "client" ? clientResolver : workerResolver;
-                    const resolved = await new Promise((resolve) => {
-                        resolver({}, args.importer || rootConfig.root, args.path, {}, (err, result) => {
-                            if (!err && result) {
-                                resolve({ id: result });
-                            }
-                            else {
-                                if (err) {
-                                    const errorMessage = err.message || String(err);
-                                    if (errorMessage.includes("Package path . is not exported")) {
-                                        log("Package exports error for %s, marking as external", args.path);
-                                    }
-                                    else {
-                                        log("Resolution failed for %s: %s", args.path, errorMessage);
-                                    }
-                                }
-                                resolve(null);
-                            }
-                        });
+                    const resolved = await resolveModuleWithEnvironment({
+                        path: args.path,
+                        importer: args.importer,
+                        importerEnv,
+                        clientResolver,
+                        workerResolver,
                     });
                     log("Resolution result:", resolved);
                     const resolvedPath = resolved?.id;
@@ -143,7 +164,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                     log("Marking as external:", args.path, "resolved to:", resolvedPath);
                     return { external: true };
                 });
-                build.onLoad({ filter: /\.(m|c)?[jt]sx?$/ }, async (args) => {
+                build.onLoad({ filter: /\.(m|c)?[jt]sx?$|\.mdx$/ }, async (args) => {
                     log("onLoad called for:", args.path);
                     if (!args.path.startsWith("/") ||
                         args.path.includes("virtual:") ||
@@ -156,33 +177,52 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         return null;
                     }
                     try {
-                        const contents = await readFileWithCache(args.path);
+                        const originalContents = await readFileWithCache(args.path);
                         const inheritedEnv = args.pluginData?.inheritedEnv || "worker";
-                        let currentEnv = inheritedEnv;
-                        const isClient = hasDirective(contents, "use client");
-                        const isServer = hasDirective(contents, "use server");
-                        // A file's own directive takes precedence over the inherited environment.
-                        if (isClient) {
-                            currentEnv = "client";
-                        }
-                        else if (isServer) {
-                            // `else if` handles cases where a file might have both directives.
-                            // "use client" takes precedence.
-                            currentEnv = "worker";
-                        }
+                        const { moduleEnv, isClient, isServer } = classifyModule({
+                            contents: originalContents,
+                            inheritedEnv,
+                        });
                         // Store the definitive environment for this module, so it can be used when it becomes an importer.
-                        moduleEnvironments.set(args.path, currentEnv);
-                        log("Set environment for", args.path, "to", currentEnv);
+                        const realPath = await fsp.realpath(args.path);
+                        moduleEnvironments.set(realPath, moduleEnv);
+                        log("Set environment for", realPath, "to", moduleEnv);
                         // Finally, populate the output sets if the file has a directive.
                         if (isClient) {
-                            log("Discovered 'use client' in:", args.path);
-                            clientFiles.add(normalizeModulePath(args.path, rootConfig.root));
+                            log("Discovered 'use client' in:", realPath);
+                            clientFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
                         if (isServer) {
-                            log("Discovered 'use server' in:", args.path);
-                            serverFiles.add(normalizeModulePath(args.path, rootConfig.root));
+                            log("Discovered 'use server' in:", realPath);
+                            serverFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
-                        return { contents, loader: "default" };
+                        let code;
+                        let loader;
+                        if (args.path.endsWith(".mdx")) {
+                            const result = await compile(originalContents, {
+                                jsx: true,
+                                jsxImportSource: "react",
+                            });
+                            code = String(result.value);
+                            loader = "tsx";
+                        }
+                        else if (/\.(m|c)?tsx$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "tsx";
+                        }
+                        else if (/\.(m|c)?ts$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "ts";
+                        }
+                        else if (/\.(m|c)?jsx$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "jsx";
+                        }
+                        else {
+                            code = originalContents;
+                            loader = "js";
+                        }
+                        return { contents: code, loader };
                     }
                     catch (e) {
                         log("Could not read file during scan, skipping:", args.path, e);
@@ -195,6 +235,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             entryPoints: absoluteEntries,
             bundle: true,
             write: false,
+            outdir: path.join(INTERMEDIATES_OUTPUT_DIR, "directive-scan"),
             platform: "node",
             format: "esm",
             logLevel: "silent",
@@ -207,6 +248,13 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
     finally {
         // Always clear the scanning flag when done
         delete process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE;
-        console.log("✅ Scan complete.");
+        deferredLog("✔ (rwsdk) Done scanning for 'use client' and 'use server' directives.");
+        process.env.VERBOSE &&
+            log("Client/server files after scanning: client=%O, server=%O", Array.from(clientFiles), Array.from(serverFiles));
     }
 };
+const deferredLog = (message) => {
+    setTimeout(() => {
+        console.log(message);
+    }, 500);
+};

package/dist/vite/runDirectivesScan.test.d.mts

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

package/dist/vite/runDirectivesScan.test.mjs

@@ -0,0 +1,73 @@
+import { describe, expect, it, vi } from "vitest";
+import { classifyModule, resolveModuleWithEnvironment, } from "./runDirectivesScan.mjs";
+describe("runDirectivesScan helpers", () => {
+    describe("resolveModuleWithEnvironment", () => {
+        it("should use the client resolver when importerEnv is 'client'", async () => {
+            const clientResolver = vi.fn((_a, _b, _c, _d, cb) => cb(null, "/resolved/client"));
+            const workerResolver = vi.fn();
+            const result = await resolveModuleWithEnvironment({
+                path: "test-path",
+                importerEnv: "client",
+                clientResolver,
+                workerResolver,
+            });
+            expect(clientResolver).toHaveBeenCalled();
+            expect(workerResolver).not.toHaveBeenCalled();
+            expect(result).toEqual({ id: "/resolved/client" });
+        });
+        it("should use the worker resolver when importerEnv is 'worker'", async () => {
+            const clientResolver = vi.fn();
+            const workerResolver = vi.fn((_a, _b, _c, _d, cb) => cb(null, "/resolved/worker"));
+            const result = await resolveModuleWithEnvironment({
+                path: "test-path",
+                importerEnv: "worker",
+                clientResolver,
+                workerResolver,
+            });
+            expect(workerResolver).toHaveBeenCalled();
+            expect(clientResolver).not.toHaveBeenCalled();
+            expect(result).toEqual({ id: "/resolved/worker" });
+        });
+        it("should return null on resolution error", async () => {
+            const clientResolver = vi.fn((_a, _b, _c, _d, cb) => cb(new Error("Resolution failed")));
+            const workerResolver = vi.fn();
+            const result = await resolveModuleWithEnvironment({
+                path: "test-path",
+                importerEnv: "client",
+                clientResolver,
+                workerResolver,
+            });
+            expect(result).toBeNull();
+        });
+    });
+    describe("classifyModule", () => {
+        it("should return 'client' if 'use client' directive is present", () => {
+            const contents = `'use client';\nconsole.log('hello');`;
+            const result = classifyModule({ contents, inheritedEnv: "worker" });
+            expect(result.moduleEnv).toBe("client");
+            expect(result.isClient).toBe(true);
+            expect(result.isServer).toBe(false);
+        });
+        it("should return 'worker' if 'use server' directive is present", () => {
+            const contents = `"use server";\nexport default () => {};`;
+            const result = classifyModule({ contents, inheritedEnv: "client" });
+            expect(result.moduleEnv).toBe("worker");
+            expect(result.isClient).toBe(false);
+            expect(result.isServer).toBe(true);
+        });
+        it("should prioritize 'use client' over 'use server'", () => {
+            const contents = `'use client';\n'use server';\nconsole.log('hello');`;
+            const result = classifyModule({ contents, inheritedEnv: "worker" });
+            expect(result.moduleEnv).toBe("client");
+            expect(result.isClient).toBe(true);
+            expect(result.isServer).toBe(false);
+        });
+        it("should return the inherited environment if no directive is present", () => {
+            const contents = `console.log('no directive');`;
+            const result = classifyModule({ contents, inheritedEnv: "worker" });
+            expect(result.moduleEnv).toBe("worker");
+            expect(result.isClient).toBe(false);
+            expect(result.isServer).toBe(false);
+        });
+    });
+});

package/dist/vite/ssrBridgePlugin.mjs

@@ -1,7 +1,7 @@
 import debug from "debug";
-import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
-import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
 import MagicString from "magic-string";
+import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
+import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
 const log = debug("rwsdk:vite:ssr-bridge-plugin");
 export const VIRTUAL_SSR_PREFIX = "virtual:rwsdk:ssr:";
 export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
@@ -34,7 +34,8 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                         build.onResolve({ filter: /.*$/ }, (args) => {
                             process.env.VERBOSE &&
                                 log("Esbuild onResolve called for path=%s, args=%O", args.path, args);
-                            if (args.path === "rwsdk/__ssr_bridge") {
+                            if (args.path === "rwsdk/__ssr_bridge" ||
+                                args.path.startsWith(VIRTUAL_SSR_PREFIX)) {
                                 log("Marking as external: %s", args.path);
                                 return {
                                     path: args.path,
@@ -77,6 +78,12 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
             }
             else {
                 // In build mode, the behavior depends on the build pass
+                if (id.startsWith(VIRTUAL_SSR_PREFIX)) {
+                    if (this.environment.name === "worker") {
+                        log("Virtual SSR module case (build-worker pass): resolving to external");
+                        return { id, external: true };
+                    }
+                }
                 if (id === "rwsdk/__ssr_bridge" && this.environment.name === "worker") {
                     if (process.env.RWSDK_BUILD_PASS === "worker") {
                         // First pass: resolve to a temporary, external path

package/dist/vite/transformClientComponents.mjs

@@ -1,11 +1,12 @@
-import MagicString from "magic-string";
 import debug from "debug";
-import { hasDirective } from "./hasDirective.mjs";
+import MagicString from "magic-string";
 import { findExports } from "./findSpecifiers.mjs";
+import { hasDirective } from "./hasDirective.mjs";
 const logVite = debug("rwsdk:vite:transform-client-components:vite");
 const logEsbuild = debug("rwsdk:vite:transform-client-components:esbuild");
 export async function transformClientComponents(code, normalizedId, ctx) {
-    if (!hasDirective(code, "use client")) {
+    if (!ctx.clientFiles?.has(normalizedId) &&
+        !hasDirective(code, "use client")) {
         return;
     }
     const log = ctx.isEsbuild ? logEsbuild : logVite;
@@ -76,13 +77,14 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     // 4. Non-SSR files: replace all implementation with registerClientReference logic
     // Generate completely new code for worker/client environments
     const s = new MagicString("");
-    // Add import declaration
+    s.append('import { ssrLoadModule } from "rwsdk/__ssr_bridge";\n');
     s.append('import { registerClientReference } from "rwsdk/worker";\n');
+    s.append(`const SSRModule = await ssrLoadModule("${normalizedId}");\n`);
     // Compute unique computed local names first
     const computedLocalNames = new Map(processedExports.map((info) => [getComputedLocalName(info), info]));
     // Add registerClientReference assignments for unique names
     for (const [computedLocalName, correspondingInfo] of computedLocalNames) {
-        s.append(`const ${computedLocalName} = registerClientReference("${normalizedId}", "${correspondingInfo.exported}");\n`);
+        s.append(`const ${computedLocalName} = registerClientReference(SSRModule, "${normalizedId}", "${correspondingInfo.exported}");\n`);
     }
     // Add grouped export statement for named exports (preserving order and alias)
     if (processedExports.length > 0) {
@@ -94,7 +96,7 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     // Add default export if present
     if (defaultExportInfo) {
         log(":isEsbuild=%s: Registering client reference for default export: %s", !!ctx.isEsbuild, defaultExportInfo.exported);
-        s.append(`export default registerClientReference("${normalizedId}", "${defaultExportInfo.exported}");\n`);
+        s.append(`export default registerClientReference(SSRModule, "${normalizedId}", "${defaultExportInfo.exported}");\n`);
     }
     const sourceMap = s.generateMap({
         source: normalizedId,