@farm.js/plugin 0.1.0-beta.24 → 0.1.0-beta.26

package/dist/index.d.ts

@@ -39,5 +39,5 @@
  * })
  * ```
  */
-export declare const version = "0.1.0-beta.24";
+export declare const version = "0.1.0-beta.26";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -39,7 +39,7 @@
  * })
  * ```
  */
-export const version = "0.1.0-beta.24";
+export const version = "0.1.0-beta.26";
 // Note: Import plugins from their respective subpaths:
 // - @farm.js/plugin/rsc
 // - @farm.js/plugin/middleware

package/dist/rsc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA6B9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAiDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CA6oC5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA8B9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAiDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAgqC5E"}

package/dist/rsc/index.js

@@ -27,6 +27,7 @@ import { farmEnvironmentFunctionsPlugin } from "@farm.js/core/environment/vite";
 import { generateRscEntry } from "./entries/rsc.js";
 import { generateSsrEntry } from "./entries/ssr.js";
 import { generateClientEntry, serverFnTransportErrorClientRuntime } from "./entries/client.js";
+import { transformFarmRouteActionClients } from "./route-action-transform.js";
 import { transformFarmServerFns } from "./server-fn-transform.js";
 import { transformAutomaticOptimizedBoundaries } from "./automatic-optimized-boundary.js";
 import { resolveRscBuildOutputPath } from "./build-paths.js";
@@ -730,6 +731,24 @@ export default function farmRsc(options = {}) {
                 return { code: result.code, map: null };
             },
         },
+        {
+            name: "@farm.js/plugin/rsc:route-action-clients",
+            enforce: "pre",
+            transform(code, id) {
+                if (!rscEnabled || !actionsEnabled)
+                    return null;
+                const environmentName = this.environment?.name;
+                if (environmentName !== "client")
+                    return null;
+                const result = transformFarmRouteActionClients(code, id);
+                if (!result)
+                    return null;
+                return {
+                    code: result.code,
+                    map: null,
+                };
+            },
+        },
         {
             name: "@farm.js/plugin/rsc:server-fn-actions",
             enforce: "pre",

package/dist/rsc/route-action-transform.d.ts

@@ -0,0 +1,11 @@
+export type FarmRouteActionClientTransformResult = {
+    code: string;
+    routes: string[];
+};
+/**
+ * Replace a programmatic route imported by the browser with a small action-only
+ * proxy. Route loaders, components, database imports, and other server code do
+ * not enter the client graph.
+ */
+export declare function transformFarmRouteActionClients(code: string, id: string): FarmRouteActionClientTransformResult | null;
+//# sourceMappingURL=route-action-transform.d.ts.map

package/dist/rsc/route-action-transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-action-transform.d.ts","sourceRoot":"","sources":["../../src/rsc/route-action-transform.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,oCAAoC,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAcF;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,oCAAoC,GAAG,IAAI,CAqC7C"}

package/dist/rsc/route-action-transform.js

@@ -0,0 +1,369 @@
+const ROUTE_FACTORY_IMPORT_RE = /\bimport\s+(?:type\s+)?(?:[A-Za-z_$][\w$]*\s*,\s*)?(\{[^}]*\})\s+from\s*["']@farm.js\/core(?:\/routes)?["']\s*;?/g;
+const EXPORTED_ROUTE_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*\(/g;
+const IMPORT_RE = /\bimport\s+(?!type\b)([\s\S]*?)\s+from\s*(["'][^"']+["'])\s*;?/g;
+const IDENTIFIER_RE = /^[A-Za-z_$][\w$]*$/;
+const MODULE_EXT_RE = /\.[cm]?[jt]sx?$/;
+/**
+ * Replace a programmatic route imported by the browser with a small action-only
+ * proxy. Route loaders, components, database imports, and other server code do
+ * not enter the client graph.
+ */
+export function transformFarmRouteActionClients(code, id) {
+    if (!isTransformableModule(id) || !code.includes("createRoute") || !code.includes("actions")) {
+        return null;
+    }
+    const routeFactories = findRouteFactoryImportNames(code);
+    if (routeFactories.size === 0)
+        return null;
+    const routes = findActionRoutes(code, routeFactories, id);
+    if (routes.length === 0)
+        return null;
+    const importStatements = findRuntimeImports(code);
+    const requiredImports = new Set();
+    for (const route of routes) {
+        for (const action of route.actions) {
+            const statement = importStatements.get(action.local);
+            if (!statement) {
+                throw new Error(`[Farm.js] Route "${route.exportName}" action "${action.name}" in ${id} must reference ` +
+                    "a server function imported from another module. Define and export createServerFn in an actions module, then import it into the route.");
+            }
+            requiredImports.add(statement);
+        }
+    }
+    const output = [
+        ...requiredImports,
+        ...routes.map((route) => generateRouteActionProxy(route)),
+        ...findRouteDefaultExports(code, routes),
+    ].join("\n");
+    return {
+        code: `${output}\n`,
+        routes: routes.map((route) => route.exportName),
+    };
+}
+function findRouteFactoryImportNames(code) {
+    const names = new Set();
+    for (const match of code.matchAll(ROUTE_FACTORY_IMPORT_RE)) {
+        const namedImports = (match[1] ?? "").slice(1, -1).split(",");
+        for (const specifier of namedImports) {
+            const normalized = specifier.trim().replace(/^type\s+/, "");
+            const specifierMatch = normalized.match(/^createRoute(?:\s+as\s+([A-Za-z_$][\w$]*))?$/);
+            if (specifierMatch)
+                names.add(specifierMatch[1] ?? "createRoute");
+        }
+    }
+    return names;
+}
+function findActionRoutes(code, factories, id) {
+    const routes = [];
+    for (const match of code.matchAll(EXPORTED_ROUTE_RE)) {
+        const exportName = match[1];
+        const calleeName = match[2];
+        if (!exportName || !calleeName || !factories.has(calleeName))
+            continue;
+        const openParen = (match.index ?? 0) + match[0].length - 1;
+        const closeParen = findMatchingDelimiter(code, openParen, "(", ")");
+        if (closeParen === -1)
+            continue;
+        const args = splitTopLevel(code, openParen + 1, closeParen);
+        if (args.length < 2)
+            continue;
+        const pathSource = readSegment(code, args[0]);
+        if (!isQuotedString(pathSource)) {
+            throw new Error(`[Farm.js] Route "${exportName}" in ${id} must use a static string path before its actions can be imported by a Client Component.`);
+        }
+        const options = readSegment(code, args[1]);
+        if (!options.startsWith("{") || !options.endsWith("}"))
+            continue;
+        const properties = parseObjectProperties(options.slice(1, -1));
+        const actionsSource = properties.get("actions");
+        if (!actionsSource)
+            continue;
+        if (!actionsSource.startsWith("{") || !actionsSource.endsWith("}")) {
+            throw new Error(`[Farm.js] Route "${exportName}" actions in ${id} must be an object literal so Farm can generate its client proxy.`);
+        }
+        const actions = parseActionProperties(actionsSource.slice(1, -1), exportName, id);
+        if (actions.length === 0)
+            continue;
+        const defaultSource = properties.get("defaultAction");
+        const defaultAction = defaultSource
+            ? parseStringValue(defaultSource, exportName, id)
+            : actions[0].name;
+        if (!actions.some((action) => action.name === defaultAction)) {
+            throw new Error(`[Farm.js] Route "${exportName}" defaultAction "${defaultAction}" in ${id} does not match a declared action.`);
+        }
+        routes.push({ exportName, pathSource, actions, defaultAction });
+    }
+    return routes;
+}
+function parseActionProperties(source, routeName, id) {
+    const properties = parseObjectProperties(source, true);
+    const actions = [];
+    for (const [name, value] of properties) {
+        const local = value || name;
+        if (!IDENTIFIER_RE.test(name) || !IDENTIFIER_RE.test(local)) {
+            throw new Error(`[Farm.js] Route "${routeName}" actions in ${id} must use identifier entries such as { update } or { update: updateProduct }.`);
+        }
+        actions.push({ name, local });
+    }
+    return actions;
+}
+function parseObjectProperties(source, allowShorthand = false) {
+    const properties = new Map();
+    for (const segment of splitTopLevel(source, 0, source.length)) {
+        const entry = readSegment(source, segment);
+        if (!entry)
+            continue;
+        if (entry.startsWith("...")) {
+            properties.set(entry, "");
+            continue;
+        }
+        const colon = findTopLevelColon(entry);
+        if (colon === -1) {
+            if (allowShorthand)
+                properties.set(entry, "");
+            continue;
+        }
+        const keySource = entry.slice(0, colon).trim();
+        const value = entry.slice(colon + 1).trim();
+        const key = isQuotedString(keySource) ? unquote(keySource) : keySource;
+        properties.set(key, value);
+    }
+    return properties;
+}
+function findRuntimeImports(code) {
+    const imports = new Map();
+    for (const match of code.matchAll(IMPORT_RE)) {
+        const clause = (match[1] ?? "").trim();
+        const statement = match[0];
+        const namedStart = clause.indexOf("{");
+        const namedEnd = clause.lastIndexOf("}");
+        if (namedStart > -1 && namedEnd > namedStart) {
+            for (const specifier of clause.slice(namedStart + 1, namedEnd).split(",")) {
+                const normalized = specifier.trim().replace(/^type\s+/, "");
+                if (!normalized || specifier.trim().startsWith("type "))
+                    continue;
+                const parts = normalized.split(/\s+as\s+/);
+                const local = parts[1] ?? parts[0];
+                if (local && IDENTIFIER_RE.test(local))
+                    imports.set(local, statement);
+            }
+        }
+        const defaultImport = clause
+            .slice(0, namedStart === -1 ? clause.length : namedStart)
+            .replace(/,$/, "")
+            .trim();
+        if (IDENTIFIER_RE.test(defaultImport))
+            imports.set(defaultImport, statement);
+    }
+    return imports;
+}
+function generateRouteActionProxy(route) {
+    const actions = route.actions
+        .map((action) => `${JSON.stringify(action.name)}: ${action.local}`)
+        .join(", ");
+    const defaultAction = route.actions.find((action) => action.name === route.defaultAction);
+    return `export const ${route.exportName} = Object.freeze({
+  __farmRouteActionTarget: true,
+  path: ${route.pathSource},
+  actions: Object.freeze({ ${actions} }),
+  defaultAction: ${JSON.stringify(route.defaultAction)},
+  action: ${defaultAction.local},
+});`;
+}
+function findRouteDefaultExports(code, routes) {
+    const exports = [];
+    for (const route of routes) {
+        const defaultExport = new RegExp(`\\bexport\\s+default\\s+${escapeRegExp(route.exportName)}\\s*;?`);
+        if (defaultExport.test(code))
+            exports.push(`export default ${route.exportName};`);
+    }
+    return exports;
+}
+function splitTopLevel(source, start, end) {
+    const segments = [];
+    let segmentStart = start;
+    let parens = 0;
+    let braces = 0;
+    let brackets = 0;
+    let quote = null;
+    let escaped = false;
+    let lineComment = false;
+    let blockComment = false;
+    for (let index = start; index < end; index++) {
+        const char = source[index];
+        const next = source[index + 1];
+        if (lineComment) {
+            if (char === "\n" || char === "\r")
+                lineComment = false;
+            continue;
+        }
+        if (blockComment) {
+            if (char === "*" && next === "/") {
+                blockComment = false;
+                index++;
+            }
+            continue;
+        }
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (char === "\\")
+                escaped = true;
+            else if (char === quote)
+                quote = null;
+            continue;
+        }
+        if (char === "/" && next === "/") {
+            lineComment = true;
+            index++;
+            continue;
+        }
+        if (char === "/" && next === "*") {
+            blockComment = true;
+            index++;
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === "(")
+            parens++;
+        else if (char === ")")
+            parens--;
+        else if (char === "{")
+            braces++;
+        else if (char === "}")
+            braces--;
+        else if (char === "[")
+            brackets++;
+        else if (char === "]")
+            brackets--;
+        else if (char === "," && parens === 0 && braces === 0 && brackets === 0) {
+            segments.push([segmentStart, index]);
+            segmentStart = index + 1;
+        }
+    }
+    segments.push([segmentStart, end]);
+    return segments;
+}
+function findTopLevelColon(source) {
+    const segments = splitTopLevel(source, 0, source.length);
+    if (segments.length !== 1)
+        return -1;
+    let parens = 0;
+    let braces = 0;
+    let brackets = 0;
+    let quote = null;
+    let escaped = false;
+    for (let index = 0; index < source.length; index++) {
+        const char = source[index];
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (char === "\\")
+                escaped = true;
+            else if (char === quote)
+                quote = null;
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === "(")
+            parens++;
+        else if (char === ")")
+            parens--;
+        else if (char === "{")
+            braces++;
+        else if (char === "}")
+            braces--;
+        else if (char === "[")
+            brackets++;
+        else if (char === "]")
+            brackets--;
+        else if (char === ":" && parens === 0 && braces === 0 && brackets === 0)
+            return index;
+    }
+    return -1;
+}
+function findMatchingDelimiter(source, openIndex, open, close) {
+    let depth = 0;
+    let quote = null;
+    let lineComment = false;
+    let blockComment = false;
+    let escaped = false;
+    for (let index = openIndex; index < source.length; index++) {
+        const char = source[index];
+        const next = source[index + 1];
+        if (lineComment) {
+            if (char === "\n" || char === "\r")
+                lineComment = false;
+            continue;
+        }
+        if (blockComment) {
+            if (char === "*" && next === "/") {
+                blockComment = false;
+                index++;
+            }
+            continue;
+        }
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (char === "\\")
+                escaped = true;
+            else if (char === quote)
+                quote = null;
+            continue;
+        }
+        if (char === "/" && next === "/") {
+            lineComment = true;
+            index++;
+            continue;
+        }
+        if (char === "/" && next === "*") {
+            blockComment = true;
+            index++;
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === open)
+            depth++;
+        else if (char === close && --depth === 0)
+            return index;
+    }
+    return -1;
+}
+function readSegment(source, segment) {
+    return source.slice(segment[0], segment[1]).trim();
+}
+function parseStringValue(source, routeName, id) {
+    if (!isQuotedString(source)) {
+        throw new Error(`[Farm.js] Route "${routeName}" defaultAction in ${id} must be a static string.`);
+    }
+    return unquote(source);
+}
+function isQuotedString(value) {
+    return (value.length >= 2 &&
+        ((value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))));
+}
+function unquote(value) {
+    const quote = value[0];
+    const body = value.slice(1, -1);
+    if (quote === '"')
+        return JSON.parse(value);
+    return body.replace(/\\'/g, "'").replace(/\\\\/g, "\\");
+}
+function isTransformableModule(id) {
+    const cleanId = id.split("?", 1)[0];
+    return MODULE_EXT_RE.test(cleanId) && !/\.d\.[cm]?ts$/.test(cleanId);
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.24",
+  "version": "0.1.0-beta.26",
   "description": "Official plugins for Farm.js framework",
   "license": "MIT",
   "author": "Farm.js Team",
@@ -61,7 +61,7 @@
     "nitro": "3.0.1-alpha.0",
     "picocolors": "^1.0.0",
     "rsc-html-stream": "^0.0.4",
-    "@farm.js/core": "0.1.0-beta.24"
+    "@farm.js/core": "0.1.0-beta.26"
   },
   "devDependencies": {
     "@types/node": "^20.19.21",
@@ -82,7 +82,7 @@
     "react-dom": "19.2.8",
     "react-server-dom-webpack": "19.2.8",
     "vite": ">=6.0.0",
-    "@farm.js/core": "0.1.0-beta.24"
+    "@farm.js/core": "0.1.0-beta.26"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {