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

package/dist/vite/findSpecifiers.mjs

@@ -1,4 +1,4 @@
-import { parse as sgParse, Lang as SgLang, Lang } from "@ast-grep/napi";
+import { Lang, Lang as SgLang, parse as sgParse } from "@ast-grep/napi";
 import path from "path";
 // These patterns are used to match import statements in code for SSR transformations.
 export const IMPORT_PATTERNS = [
@@ -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, expect, it } from "vitest";
+import { findExports, findImportSpecifiers } 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.mjs

@@ -1,4 +1,4 @@
-import { parse as sgParse, Lang as SgLang, Lang } from "@ast-grep/napi";
+import { Lang, Lang as SgLang, parse as sgParse } from "@ast-grep/napi";
 import path from "path";
 /**
  * Finds callsites for __vite_ssr_import__ and __vite_ssr_dynamic_import__ with their ranges.

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

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

package/dist/vite/findSsrSpecifiers.test.mjs

@@ -0,0 +1,99 @@
+import { describe, expect, it } from "vitest";
+import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
+describe("findSsrImportCallSites", () => {
+    it("should find __vite_ssr_import__ with double quotes", () => {
+        const code = `const a = __vite_ssr_import__("module-a");`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 41,
+            specifier: "module-a",
+            kind: "import",
+        });
+    });
+    it("should find __vite_ssr_import__ with single quotes", () => {
+        const code = `const a = __vite_ssr_import__('module-a');`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 41,
+            specifier: "module-a",
+            kind: "import",
+        });
+    });
+    it("should find __vite_ssr_dynamic_import__ with double quotes", () => {
+        const code = `const a = __vite_ssr_dynamic_import__("module-a");`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 49,
+            specifier: "module-a",
+            kind: "dynamic_import",
+        });
+    });
+    it("should find __vite_ssr_dynamic_import__ with single quotes", () => {
+        const code = `const a = __vite_ssr_dynamic_import__('module-a');`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 49,
+            specifier: "module-a",
+            kind: "dynamic_import",
+        });
+    });
+    it("should find calls with additional arguments", () => {
+        const code = `const a = __vite_ssr_import__('module-a', { ssr: true });`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 56,
+            specifier: "module-a",
+            kind: "import",
+        });
+    });
+    it("should find a mix of different calls", () => {
+        const code = `
+      const a = __vite_ssr_import__("module-a");
+      const b = __vite_ssr_dynamic_import__('module-b');
+    `;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(2);
+        expect(results).toEqual(expect.arrayContaining([
+            {
+                start: 17,
+                end: 48,
+                specifier: "module-a",
+                kind: "import",
+            },
+            {
+                start: 66,
+                end: 105,
+                specifier: "module-b",
+                kind: "dynamic_import",
+            },
+        ]));
+    });
+    it("should return correct ranges for replacement", () => {
+        const code = `__vite_ssr_import__("module-a")`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        const { start, end } = results[0];
+        expect(code.substring(start, end)).toBe('__vite_ssr_import__("module-a")');
+    });
+    it("should return an empty array when no calls are found", () => {
+        const code = `import a from "module-a";`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(0);
+    });
+    it("should handle tsx files correctly", () => {
+        const code = `const a = () => <div>{__vite_ssr_import__("module-a")}</div>;`;
+        const results = findSsrImportCallSites("test.tsx", code);
+        expect(results).toHaveLength(1);
+        expect(results[0].specifier).toBe("module-a");
+    });
+});

package/dist/vite/getViteEsbuild.mjs

@@ -1,5 +1,5 @@
-import path from "node:path";
 import { createRequire } from "node:module";
+import path from "node:path";
 const require = createRequire(import.meta.url);
 export async function getViteEsbuild(projectRootDir) {
     const vitePath = require.resolve("vite/package.json", {

package/dist/vite/hasDirective.d.mts

@@ -1,7 +1,10 @@
 /**
  * Efficiently checks if a React directive (e.g., "use server", "use client")
- * is present in the code. Optimized for performance with a two-step approach:
- * 1. Quick string search to see if directive exists anywhere
- * 2. Line-by-line check only if the directive might be present
+ * is present in the code.
+ *
+ * This function is optimized for performance by only checking the first few
+ * lines of the code, as directives must appear at the very top of a file.
+ * It handles comments, whitespace, and any valid directive prologue
+ * (e.g., "use strict").
  */
 export declare function hasDirective(code: string, directive: string): boolean;

package/dist/vite/hasDirective.mjs

@@ -1,54 +1,70 @@
 /**
  * Efficiently checks if a React directive (e.g., "use server", "use client")
- * is present in the code. Optimized for performance with a two-step approach:
- * 1. Quick string search to see if directive exists anywhere
- * 2. Line-by-line check only if the directive might be present
+ * is present in the code.
+ *
+ * This function is optimized for performance by only checking the first few
+ * lines of the code, as directives must appear at the very top of a file.
+ * It handles comments, whitespace, and any valid directive prologue
+ * (e.g., "use strict").
  */
 export function hasDirective(code, directive) {
-    // Quick performance check: if directive doesn't exist anywhere, skip line checking
-    const singleQuoteDirective = `'${directive}'`;
-    const doubleQuoteDirective = `"${directive}"`;
-    if (!code.includes(singleQuoteDirective) &&
-        !code.includes(doubleQuoteDirective)) {
-        return false;
-    }
-    // Split into lines and check each one
-    const lines = code.split("\n");
+    const lines = code.slice(0, 512).split("\n"); // Check first ~512 chars
     let inMultiLineComment = false;
+    let foundUseClient = false;
+    let foundTargetDirective = false;
+    const doubleQuoteDirective = `"${directive}"`;
+    const singleQuoteDirective = `'${directive}'`;
+    const doubleQuoteUseClient = `"use client"`;
+    const singleQuoteUseClient = `'use client'`;
     for (const line of lines) {
         const trimmedLine = line.trim();
-        // Skip empty lines
         if (trimmedLine.length === 0) {
             continue;
         }
-        // Handle multi-line comments
-        if (trimmedLine.startsWith("/*")) {
-            inMultiLineComment = true;
-            // Check if the comment ends on the same line
+        if (inMultiLineComment) {
             if (trimmedLine.includes("*/")) {
                 inMultiLineComment = false;
             }
             continue;
         }
-        if (inMultiLineComment) {
-            // Check if this line ends the multi-line comment
-            if (trimmedLine.includes("*/")) {
-                inMultiLineComment = false;
+        if (trimmedLine.startsWith("/*")) {
+            if (!trimmedLine.includes("*/")) {
+                inMultiLineComment = true;
             }
             continue;
         }
-        // Skip single-line comments
         if (trimmedLine.startsWith("//")) {
             continue;
         }
-        // Check if this line starts with the directive
+        const cleanedLine = trimmedLine.endsWith(";")
+            ? trimmedLine.slice(0, -1)
+            : trimmedLine;
+        if (trimmedLine.startsWith(doubleQuoteUseClient) ||
+            trimmedLine.startsWith(singleQuoteUseClient)) {
+            foundUseClient = true;
+            if (directive === "use client") {
+                return true;
+            }
+        }
         if (trimmedLine.startsWith(doubleQuoteDirective) ||
             trimmedLine.startsWith(singleQuoteDirective)) {
-            return true;
+            foundTargetDirective = true;
+            if (directive !== "use server") {
+                return true;
+            }
         }
-        // If we hit a non-empty, non-comment line that's not a directive, we can stop
-        // (directives must be at the top of the file/scope, after comments)
+        // Any other string literal is part of a valid directive prologue.
+        // We can continue searching.
+        if (trimmedLine.startsWith('"') || trimmedLine.startsWith("'")) {
+            continue;
+        }
+        // If we encounter any other non-directive, non-comment, non-string-literal
+        // line of code, the directive prologue is over. Stop.
         break;
     }
-    return false;
+    // If looking for 'use server' and 'use client' was found, return false (client takes priority)
+    if (directive === "use server" && foundUseClient) {
+        return false;
+    }
+    return foundTargetDirective;
 }

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

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

package/dist/vite/hasDirective.test.mjs

@@ -0,0 +1,107 @@
+import { describe, expect, it } from "vitest";
+import { hasDirective } from "./hasDirective.mjs";
+describe("hasDirective", () => {
+    it('should find "use client" directive', () => {
+        const code = `"use client"; import React from "react";`;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it('should find "use server" directive', () => {
+        const code = `'use server'; export async function myAction() {}`;
+        expect(hasDirective(code, "use server")).toBe(true);
+    });
+    it("should not find a directive that is not there", () => {
+        const code = `import React from "react";`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it('should find "use client" directive with single quotes', () => {
+        const code = `'use client'; import React from "react";`;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it("should find directive when preceded by comments and whitespace", () => {
+        const code = `
+      // This is a client component
+      /* And here is another comment */
+
+      "use client";
+      import React from 'react';
+      export default () => <div>Hello</div>;
+    `;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it('should find "use client" directive when preceded by "use strict"', () => {
+        const code = `
+      "use strict";
+      "use client";
+      import React from 'react';
+      export default () => <div>Hello</div>;
+    `;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it('should find "use server" directive when preceded by "use strict" and comments', () => {
+        const code = `
+      // server stuff
+      "use strict";
+      /* another comment */
+      "use server";
+      export async function myAction() {}
+    `;
+        expect(hasDirective(code, "use server")).toBe(true);
+    });
+    it("should find directive when preceded by another string literal directive", () => {
+        const code = `
+      "use awesome"; // Some other directive
+      "use client";
+      import React from 'react';
+      export default () => <div>Hello</div>;
+    `;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it("should return false if no directive is present", () => {
+        const code = `import React from "react";
+    export default () => <div>Hello</div>;`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should return false if the directive is commented out", () => {
+        const code = `// "use client";
+    import React from "react";
+    export default () => <div>Hello</div>;`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should return false if the directive appears after code", () => {
+        const code = `import React from "react";
+    "use client";
+    export default () => <div>Hello</div>;`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should handle multi-line comments correctly", () => {
+        const code = `
+      /*
+       * "use client";
+       */
+      import React from "react";
+    `;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should handle code with no whitespace", () => {
+        const code = `"use client";import React from "react";`;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it("should handle empty code", () => {
+        const code = "";
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should handle code with only whitespace", () => {
+        const code = "  \n\t  ";
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should handle files with only comments", () => {
+        const code = `// comment 1
+    /* comment 2 */`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should prioritize 'use client' over 'use server'", () => {
+        const code = `'use client';\n'use server';\nconsole.log('hello');`;
+        expect(hasDirective(code, "use client")).toBe(true);
+        expect(hasDirective(code, "use server")).toBe(false);
+    });
+});

package/dist/vite/index.d.mts

@@ -1 +1 @@
-export { type RedwoodPluginOptions, redwoodPlugin as redwood, } from "./redwoodPlugin.mjs";
+export { redwoodPlugin as redwood, type RedwoodPluginOptions, } from "./redwoodPlugin.mjs";

package/dist/vite/invalidateCacheIfPrismaClientChanged.mjs

@@ -1,6 +1,6 @@
-import { resolve } from "node:path";
-import { remove, pathExists } from "fs-extra";
+import { pathExists, remove } from "fs-extra";
 import { stat } from "node:fs/promises";
+import { resolve } from "node:path";
 export const invalidateCacheIfPrismaClientChanged = async ({ projectRootDir, }) => {
     const viteDepsCachePath = resolve(projectRootDir, "node_modules", ".vite", `deps_worker`, `@prisma_client.js`);
     // Get mtimes for comparison

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

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

package/dist/vite/isJsFile.test.mjs

@@ -0,0 +1,38 @@
+import { describe, expect, it } from "vitest";
+import { isJsFile } from "./isJsFile.mjs";
+describe("isJsFile", () => {
+    const matchingExtensions = [
+        "file.js",
+        "file.jsx",
+        "file.ts",
+        "file.tsx",
+        "file.mjs",
+        "file.mts",
+        "file.cjs",
+        "file.cts",
+        "/path/to/component.js",
+        "../relative/path.tsx",
+    ];
+    const nonMatchingExtensions = [
+        "file.css",
+        "file.html",
+        "file.json",
+        "file.txt",
+        "file.js.map",
+        "file_js",
+        "filejs",
+        "",
+        "no-extension",
+        "/path/to/image.png",
+    ];
+    matchingExtensions.forEach((filepath) => {
+        it(`should return true for "${filepath}"`, () => {
+            expect(isJsFile(filepath)).toBe(true);
+        });
+    });
+    nonMatchingExtensions.forEach((filepath) => {
+        it(`should return false for "${filepath}"`, () => {
+            expect(isJsFile(filepath)).toBe(false);
+        });
+    });
+});

package/dist/vite/{reactConditionsResolverPlugin.d.mts → knownDepsResolverPlugin.d.mts}

@@ -1,6 +1,6 @@
-import { Plugin } from "vite";
 import enhancedResolve from "enhanced-resolve";
-export declare const ENV_REACT_IMPORTS: {
+import { Plugin } from "vite";
+export declare const ENV_PREDEFINED_IMPORTS: {
     worker: string[];
     ssr: string[];
     client: string[];
@@ -10,6 +10,6 @@ export declare const ENV_RESOLVERS: {
     worker: enhancedResolve.ResolveFunction;
     client: enhancedResolve.ResolveFunction;
 };
-export declare const reactConditionsResolverPlugin: ({ projectRootDir, }: {
+export declare const knownDepsResolverPlugin: ({ projectRootDir, }: {
     projectRootDir: string;
 }) => Plugin[];