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

package/dist/vite/createDirectiveLookupPlugin.mjs

@@ -2,6 +2,33 @@ import MagicString from "magic-string";
 import path from "path";
 import debug from "debug";
 import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
+export function generateLookupMap({ files, isDev, kind, exportName, }) {
+    const s = new MagicString(`
+export const ${exportName} = {
+  ${Array.from(files)
+        .map((file) => {
+        if (file.includes("node_modules") && isDev) {
+            const barrelPath = kind === "client"
+                ? VENDOR_CLIENT_BARREL_EXPORT_PATH
+                : VENDOR_SERVER_BARREL_EXPORT_PATH;
+            return `
+  "${file}": () => import("${barrelPath}").then(m => m.default["${file}"]),
+`;
+        }
+        else {
+            return `
+  "${file}": () => import("${file}"),
+`;
+        }
+    })
+        .join("")}
+};
+`);
+    return {
+        code: s.toString(),
+        map: s.generateMap(),
+    };
+}
 export const createDirectiveLookupPlugin = async ({ projectRootDir, files, config, }) => {
     const debugNamespace = `rwsdk:vite:${config.pluginName}`;
     const log = debug(debugNamespace);
@@ -121,35 +148,12 @@ export const createDirectiveLookupPlugin = async ({ projectRootDir, files, confi
                 log("Loading %s module with %d files", config.virtualModuleName, files.size);
                 const environment = this.environment?.name || "client";
                 log("Current environment: %s, isDev: %s", environment, isDev);
-                const s = new MagicString(`
-export const ${config.exportName} = {
-  ${Array.from(files)
-                    .map((file) => {
-                    if (file.includes("node_modules") && isDev) {
-                        const barrelPath = config.kind === "client"
-                            ? VENDOR_CLIENT_BARREL_EXPORT_PATH
-                            : VENDOR_SERVER_BARREL_EXPORT_PATH;
-                        return `
-  "${file}": () => import("${barrelPath}").then(m => m.default["${file}"]),
-`;
-                    }
-                    else {
-                        return `
-  "${file}": () => import("${file}"),
-`;
-                    }
-                })
-                    .join("")}
-};
-`);
-                const code = s.toString();
-                const map = s.generateMap();
-                log("Generated virtual module code length: %d", code.length);
-                process.env.VERBOSE && log("Generated virtual module code: %s", code);
-                return {
-                    code,
-                    map,
-                };
+                return generateLookupMap({
+                    files,
+                    isDev,
+                    kind: config.kind,
+                    exportName: config.exportName,
+                });
             }
         },
     };

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

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

package/dist/vite/createDirectiveLookupPlugin.test.mjs

@@ -0,0 +1,40 @@
+import { describe, it, expect } from "vitest";
+import { generateLookupMap } from "./createDirectiveLookupPlugin.mjs";
+import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
+describe("generateLookupMap", () => {
+    const files = new Set([
+        "src/app.js",
+        "node_modules/lib-a/index.js",
+        "src/component.tsx",
+    ]);
+    it("should generate correct map for client in dev", () => {
+        const result = generateLookupMap({
+            files,
+            isDev: true,
+            kind: "client",
+            exportName: "clientLookup",
+        });
+        expect(result.code).toContain("export const clientLookup = {");
+        expect(result.code).toContain(`"src/app.js": () => import("src/app.js")`);
+        expect(result.code).toContain(`"node_modules/lib-a/index.js": () => import("${VENDOR_CLIENT_BARREL_EXPORT_PATH}").then(m => m.default["node_modules/lib-a/index.js"])`);
+    });
+    it("should generate correct map for server in dev", () => {
+        const result = generateLookupMap({
+            files,
+            isDev: true,
+            kind: "server",
+            exportName: "serverLookup",
+        });
+        expect(result.code).toContain("export const serverLookup = {");
+        expect(result.code).toContain(`"node_modules/lib-a/index.js": () => import("${VENDOR_SERVER_BARREL_EXPORT_PATH}").then(m => m.default["node_modules/lib-a/index.js"])`);
+    });
+    it("should generate correct map for prod (isDev: false)", () => {
+        const result = generateLookupMap({
+            files,
+            isDev: false,
+            kind: "client",
+            exportName: "clientLookup",
+        });
+        expect(result.code).toContain(`"node_modules/lib-a/index.js": () => import("node_modules/lib-a/index.js")`);
+    });
+});

package/dist/vite/directiveModulesDevPlugin.d.mts

@@ -1,6 +1,9 @@
 import { Plugin } from "vite";
-export declare const directiveModulesDevPlugin: ({ clientFiles, serverFiles, projectRootDir, }: {
+export declare const generateVendorBarrelContent: (files: Set<string>, projectRootDir: string) => string;
+export declare const generateAppBarrelContent: (files: Set<string>, projectRootDir: string) => string;
+export declare const directiveModulesDevPlugin: ({ clientFiles, serverFiles, projectRootDir, workerEntryPathname, }: {
     clientFiles: Set<string>;
     serverFiles: Set<string>;
     projectRootDir: string;
+    workerEntryPathname: string;
 }) => Plugin;

package/dist/vite/directiveModulesDevPlugin.mjs

@@ -4,7 +4,7 @@ import { writeFileSync, mkdirSync, mkdtempSync } from "node:fs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { VENDOR_CLIENT_BARREL_PATH, VENDOR_SERVER_BARREL_PATH, VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
 import { runDirectivesScan } from "./runDirectivesScan.mjs";
-const generateVendorBarrelContent = (files, projectRootDir) => {
+export const generateVendorBarrelContent = (files, projectRootDir) => {
     const imports = [...files]
         .filter((file) => file.includes("node_modules"))
         .map((file, i) => `import * as M${i} from '${normalizeModulePath(file, projectRootDir, {
@@ -19,7 +19,7 @@ const generateVendorBarrelContent = (files, projectRootDir) => {
         "\n};";
     return `${imports}\n\n${exports}`;
 };
-const generateAppBarrelContent = (files, projectRootDir, barrelFilePath) => {
+export const generateAppBarrelContent = (files, projectRootDir) => {
     return [...files]
         .filter((file) => !file.includes("node_modules"))
         .map((file) => {
@@ -30,7 +30,7 @@ const generateAppBarrelContent = (files, projectRootDir, barrelFilePath) => {
     })
         .join("\n");
 };
-export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRootDir, }) => {
+export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRootDir, workerEntryPathname, }) => {
     const { promise: scanPromise, resolve: resolveScanPromise } = Promise.withResolvers();
     const tempDir = mkdtempSync(path.join(os.tmpdir(), "rwsdk-"));
     const APP_CLIENT_BARREL_PATH = path.join(tempDir, "app-client-barrel.js");
@@ -47,6 +47,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                 environments: server.environments,
                 clientFiles,
                 serverFiles,
+                entries: [workerEntryPathname],
             }).then(() => {
                 // context(justinvdm, 11 Sep 2025): For vendor barrels, we write the
                 // files directly to disk after the scan. For app barrels, we use a
@@ -83,7 +84,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                 env.optimizeDeps.include ??= [];
                 const entries = (env.optimizeDeps.entries = castArray(env.optimizeDeps.entries ?? []));
                 env.optimizeDeps.include.push(VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH);
-                if (envName === "client") {
+                if (envName === "client" || envName === "ssr") {
                     entries.push(APP_CLIENT_BARREL_PATH);
                 }
                 else if (envName === "worker") {
@@ -129,7 +130,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                         build.onLoad({ filter: /.*/, namespace: "rwsdk-app-barrel-ns" }, (args) => {
                             const isServerBarrel = args.path.includes("app-server-barrel");
                             const files = isServerBarrel ? serverFiles : clientFiles;
-                            const content = generateAppBarrelContent(files, projectRootDir, args.path);
+                            const content = generateAppBarrelContent(files, projectRootDir);
                             return {
                                 contents: content,
                                 loader: "js",

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

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

package/dist/vite/directiveModulesDevPlugin.test.mjs

@@ -0,0 +1,59 @@
+import { describe, it, expect } from "vitest";
+import { generateVendorBarrelContent, generateAppBarrelContent, } from "./directiveModulesDevPlugin.mjs";
+describe("directiveModulesDevPlugin helpers", () => {
+    const projectRootDir = "/Users/test/project";
+    describe("generateVendorBarrelContent", () => {
+        it("should generate correct content for vendor files", () => {
+            const files = new Set([
+                "node_modules/lib-a/index.js",
+                "src/app.js",
+                "node_modules/lib-b/component.tsx",
+            ]);
+            const content = generateVendorBarrelContent(files, projectRootDir);
+            const expected = `import * as M0 from '${projectRootDir}/node_modules/lib-a/index.js';
+import * as M1 from '${projectRootDir}/node_modules/lib-b/component.tsx';
+
+export default {
+  '/node_modules/lib-a/index.js': M0,
+  '/node_modules/lib-b/component.tsx': M1,
+};`;
+            expect(content).toEqual(expected);
+        });
+        it("should return empty content if no vendor files", () => {
+            const files = new Set(["src/app.js", "src/component.tsx"]);
+            const content = generateVendorBarrelContent(files, projectRootDir);
+            expect(content).toEqual("\n\nexport default {\n\n};");
+        });
+        it("should handle an empty file set", () => {
+            const files = new Set();
+            const content = generateVendorBarrelContent(files, projectRootDir);
+            expect(content).toEqual("\n\nexport default {\n\n};");
+        });
+    });
+    describe("generateAppBarrelContent", () => {
+        it("should generate correct content for app files", () => {
+            const files = new Set([
+                "src/app.js",
+                "node_modules/lib-a/index.js",
+                "src/component.tsx",
+            ]);
+            const content = generateAppBarrelContent(files, projectRootDir);
+            const expected = `import "${projectRootDir}/src/app.js";
+import "${projectRootDir}/src/component.tsx";`;
+            expect(content).toEqual(expected);
+        });
+        it("should return empty content if no app files", () => {
+            const files = new Set([
+                "node_modules/lib-a/index.js",
+                "node_modules/lib-b/component.tsx",
+            ]);
+            const content = generateAppBarrelContent(files, projectRootDir);
+            expect(content).toEqual("");
+        });
+        it("should handle an empty file set", () => {
+            const files = new Set();
+            const content = generateAppBarrelContent(files, projectRootDir);
+            expect(content).toEqual("");
+        });
+    });
+});

package/dist/vite/directivesPlugin.d.mts

@@ -1,4 +1,5 @@
 import { Plugin } from "vite";
+export declare const getLoader: (filePath: string) => "jsx" | "js" | "ts" | "tsx";
 export declare const directivesPlugin: ({ projectRootDir, clientFiles, serverFiles, }: {
     projectRootDir: string;
     clientFiles: Set<string>;

package/dist/vite/directivesPlugin.mjs

@@ -5,7 +5,7 @@ import { transformClientComponents } from "./transformClientComponents.mjs";
 import { transformServerFunctions } from "./transformServerFunctions.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:rsc-directives-plugin");
-const getLoader = (filePath) => {
+export const getLoader = (filePath) => {
     const ext = path.extname(filePath).slice(1);
     switch (ext) {
         case "mjs":

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

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

package/dist/vite/directivesPlugin.test.mjs

@@ -0,0 +1,24 @@
+import { describe, it, expect } from "vitest";
+import { getLoader } from "./directivesPlugin.mjs";
+describe("getLoader", () => {
+    const testCases = [
+        { path: "file.js", expected: "js" },
+        { path: "file.mjs", expected: "js" },
+        { path: "file.cjs", expected: "js" },
+        { path: "file.ts", expected: "ts" },
+        { path: "file.mts", expected: "ts" },
+        { path: "file.cts", expected: "ts" },
+        { path: "file.jsx", expected: "jsx" },
+        { path: "file.tsx", expected: "tsx" },
+        { path: "/path/to/component.ts", expected: "ts" },
+        { path: "../relative/path.jsx", expected: "jsx" },
+        { path: "file.css", expected: "js" }, // default case
+        { path: "file.json", expected: "js" }, // default case
+        { path: "file", expected: "js" }, // no extension
+    ];
+    testCases.forEach(({ path, expected }) => {
+        it(`should return "${expected}" for "${path}"`, () => {
+            expect(getLoader(path)).toBe(expected);
+        });
+    });
+});

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

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

package/dist/vite/ensureAliasArray.test.mjs

@@ -0,0 +1,71 @@
+import { describe, it, expect } from "vitest";
+import { ensureAliasArray } from "./ensureAliasArray.mjs";
+describe("ensureAliasArray", () => {
+    it("should create resolve and alias array if resolve is undefined", () => {
+        const config = {};
+        const result = ensureAliasArray(config);
+        expect(result).toEqual([]);
+        expect(config.resolve?.alias).toEqual([]);
+        expect(result).toBe(config.resolve?.alias);
+    });
+    it("should create alias array if alias is undefined", () => {
+        const config = { resolve: {} };
+        const result = ensureAliasArray(config);
+        expect(result).toEqual([]);
+        expect(config.resolve?.alias).toEqual([]);
+        expect(result).toBe(config.resolve?.alias);
+    });
+    it("should convert an alias object to an array", () => {
+        const config = {
+            resolve: {
+                alias: {
+                    find: "/replacement",
+                    another: "/another-replacement",
+                },
+            },
+        };
+        const result = ensureAliasArray(config);
+        const expected = [
+            { find: "find", replacement: "/replacement" },
+            { find: "another", replacement: "/another-replacement" },
+        ];
+        expect(result).toEqual(expected);
+        expect(config.resolve?.alias).toEqual(expected);
+        expect(result).toBe(config.resolve?.alias);
+    });
+    it("should return a clone of an existing alias array", () => {
+        const originalAlias = [{ find: "find", replacement: "/replacement" }];
+        const config = {
+            resolve: {
+                alias: originalAlias,
+            },
+        };
+        const result = ensureAliasArray(config);
+        expect(result).toEqual(originalAlias);
+        expect(result).not.toBe(originalAlias);
+        expect(config.resolve?.alias).toEqual(originalAlias);
+        expect(config.resolve?.alias).not.toBe(originalAlias);
+    });
+    it("should handle an empty alias object", () => {
+        const config = {
+            resolve: {
+                alias: {},
+            },
+        };
+        const result = ensureAliasArray(config);
+        expect(result).toEqual([]);
+        expect(config.resolve?.alias).toEqual([]);
+    });
+    it("should handle an empty alias array", () => {
+        const config = {
+            resolve: {
+                alias: [],
+            },
+        };
+        const originalAlias = config.resolve?.alias;
+        const result = ensureAliasArray(config);
+        expect(result).toEqual([]);
+        expect(config.resolve?.alias).toEqual([]);
+        expect(result).not.toBe(originalAlias);
+    });
+});

package/dist/vite/findSpecifiers.mjs

@@ -178,7 +178,8 @@ export function findExports(id, code, log) {
                         });
                         logger("Found default export: %s", name);
                     }
-                    else if (matchText.includes("export {")) {
+                    else if (matchText.includes("export {") &&
+                        !match.getMatch("MODULE")) {
                         // Local export declaration
                         const exportListMatch = matchText.match(/export\s*\{\s*([^}]+)\s*\}/);
                         if (exportListMatch) {

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

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

package/dist/vite/findSpecifiers.test.mjs

@@ -0,0 +1,202 @@
+import { describe, it, expect } from "vitest";
+import { findImportSpecifiers, findExports } from "./findSpecifiers.mjs";
+function dedupeImports(imports) {
+    const seen = new Set();
+    return imports.filter((imp) => {
+        const key = `${imp.s}:${imp.e}`;
+        if (seen.has(key)) {
+            return false;
+        }
+        seen.add(key);
+        return true;
+    });
+}
+describe("findSpecifiers", () => {
+    describe("findImportSpecifiers", () => {
+        it("should find various import types", () => {
+            const code = `
+        import { a } from "module-a";
+        import b from 'module-b';
+        import * as c from "module-c";
+        import "module-d";
+        const e = import('module-e');
+        const f = require("module-f");
+      `;
+            const results = findImportSpecifiers("test.ts", code, []);
+            const specifiers = dedupeImports(results).map((r) => r.raw);
+            expect(specifiers).toEqual([
+                "module-a",
+                "module-c",
+                "module-b",
+                "module-d",
+                "module-e",
+                "module-f",
+            ]);
+        });
+        it("should find re-exports", () => {
+            const code = `
+        export { a } from "module-a";
+        export * from 'module-b';
+      `;
+            const results = findImportSpecifiers("test.ts", code, []);
+            const specifiers = dedupeImports(results).map((r) => r.raw);
+            expect(specifiers).toEqual(["module-a", "module-b"]);
+        });
+        it("should ignore specified patterns", () => {
+            const code = `
+        import { a } from "module-a";
+        import b from 'module-b';
+        import c from "ignored-module";
+      `;
+            const results = findImportSpecifiers("test.ts", code, [/ignored/]);
+            const specifiers = dedupeImports(results).map((r) => r.raw);
+            expect(specifiers).toEqual(["module-a", "module-b"]);
+        });
+        it("should ignore virtual modules", () => {
+            const code = `import a from "virtual:my-virtual-module";`;
+            const results = findImportSpecifiers("test.ts", code, []);
+            expect(results).toHaveLength(0);
+        });
+        it("should ignore __rwsdknossr modules", () => {
+            const code = `import a from "some-module?__rwsdknossr";`;
+            const results = findImportSpecifiers("test.ts", code, []);
+            expect(results).toHaveLength(0);
+        });
+        it("should handle tsx files", () => {
+            const code = `
+        import React from 'react';
+        const App = () => <div>Hello</div>;
+        export default App;
+      `;
+            const results = findImportSpecifiers("test.tsx", code, []);
+            const specifiers = dedupeImports(results).map((r) => r.raw);
+            expect(specifiers).toEqual(["react"]);
+        });
+        it("should return correct positions", () => {
+            const code = `import { a } from "module-a";`;
+            const results = findImportSpecifiers("test.ts", code, []);
+            const deduped = dedupeImports(results);
+            expect(deduped).toHaveLength(1);
+            expect(deduped[0].s).toBe(19);
+            expect(deduped[0].e).toBe(27);
+            expect(code.substring(deduped[0].s, deduped[0].e)).toBe("module-a");
+        });
+    });
+    describe("findExports", () => {
+        it("should find named exports (const, let, function)", () => {
+            const code = `
+        export const a = 1;
+        export let b = 2;
+        export function c() {}
+        export async function d() {}
+      `;
+            const results = findExports("test.ts", code);
+            expect(results).toEqual([
+                { name: "a", isDefault: false },
+                { name: "b", isDefault: false },
+                { name: "c", isDefault: false },
+                { name: "d", isDefault: false },
+            ]);
+        });
+        it("should find default exports", () => {
+            const code = `
+        export default function myFunc() {}
+        const b = 1;
+        export default b;
+      `;
+            const results = findExports("test.ts", code);
+            expect(results).toEqual([
+                { name: "myFunc", isDefault: true },
+                { name: "default", isDefault: true },
+            ]);
+        });
+        it("should find export declarations", () => {
+            const code = `
+        const a = 1;
+        const b = 2;
+        export { a, b as c };
+      `;
+            const results = findExports("test.ts", code);
+            expect(results).toEqual([
+                {
+                    name: "a",
+                    isDefault: false,
+                    alias: undefined,
+                    originalName: "a",
+                },
+                {
+                    name: "c",
+                    isDefault: false,
+                    alias: "c",
+                    originalName: "b",
+                },
+            ]);
+        });
+        it("should find re-exports", () => {
+            const code = `
+        export { a, b as c } from 'module-a';
+        export { default as d } from 'module-b';
+      `;
+            const results = findExports("test.ts", code);
+            expect(results).toEqual([
+                {
+                    name: "a",
+                    isDefault: false,
+                    alias: undefined,
+                    originalName: "a",
+                    isReExport: true,
+                    moduleSpecifier: "module-a",
+                },
+                {
+                    name: "c",
+                    isDefault: false,
+                    alias: "c",
+                    originalName: "b",
+                    isReExport: true,
+                    moduleSpecifier: "module-a",
+                },
+                {
+                    name: "d",
+                    isDefault: true,
+                    alias: "d",
+                    originalName: "default",
+                    isReExport: true,
+                    moduleSpecifier: "module-b",
+                },
+                {
+                    alias: undefined,
+                    isDefault: false,
+                    name: "a",
+                    originalName: "a",
+                },
+                {
+                    alias: "c",
+                    isDefault: false,
+                    name: "c",
+                    originalName: "b",
+                },
+                {
+                    alias: "d",
+                    isDefault: true,
+                    name: "d",
+                    originalName: "default",
+                },
+            ]);
+        });
+        it("should handle mixed exports", () => {
+            const code = `
+        export const a = 1;
+        export default function b() {}
+        const c = 3;
+        export { c };
+      `;
+            const results = findExports("test.tsx", code);
+            expect(results).toEqual([
+                { name: "a", isDefault: false },
+                { name: "b", isDefault: true },
+                { isDefault: true, name: "default" },
+                { name: "c", isDefault: false, originalName: "c", alias: undefined },
+            ]);
+        });
+    });
+});

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

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