@farm.js/plugin 0.1.0-beta.7 → 0.1.0-beta.71

package/dist/rsc/index.js

@@ -26,12 +26,15 @@ import { init as initModuleLexer, parse as parseModuleImports } from "es-module-
 import { farmEnvironmentFunctionsPlugin } from "@farm.js/core/environment/vite";
 import { generateRscEntry } from "./entries/rsc.js";
 import { generateSsrEntry } from "./entries/ssr.js";
-import { generateClientEntry } from "./entries/client.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";
 import { assertRscPackageCompatibility } from "./compatibility.js";
 import fs from "fs/promises";
 import path from "path";
+import { devServableFileExists } from "../dev-static.js";
 import { pathToFileURL } from "node:url";
 import { createRequire } from "node:module";
 // Use API and middleware plugins from @farm.js/core (require so CJS build resolves when ESM .mjs is missing)
@@ -40,6 +43,7 @@ const { farmApiPlugin, farmMiddlewarePlugin } = require_("@farm.js/core");
 const { resolveServerActionsConfig } = require_("@farm.js/core/server-action-security");
 const { normalizeFarmDeploymentId } = require_("@farm.js/core/deployment");
 const { getFarmLayerAliases, getFarmSourceRoots, resolveFarmLayers } = require_("@farm.js/core/server");
+const { searchParamsToObject } = require_("@farm.js/core/internal/production-runtime");
 export { buildRscNitro, waitForRscManifest, waitForRscOutputs } from "./nitro-build.js";
 import { registerRscNitroRuntimePackage } from "./nitro-build.js";
 export { default as nitro } from "./vite-plugin-nitro.js";
@@ -710,6 +714,42 @@ export default function farmRsc(options = {}) {
                 return null;
             },
         },
+        {
+            name: "@farm.js/plugin/rsc:automatic-optimized-boundary",
+            enforce: "post",
+            transform(code, id) {
+                if (!rscEnabled || !optimizedBoundaryEnabled)
+                    return null;
+                const environmentName = this.environment?.name;
+                if (environmentName !== "rsc")
+                    return null;
+                const result = transformAutomaticOptimizedBoundaries(code, id);
+                if (!result)
+                    return null;
+                if (debug) {
+                    console.log(`[Farm.js] Added ${result.boundaryCount} automatic optimized-boundary candidate${result.boundaryCount === 1 ? "" : "s"} in ${id}`);
+                }
+                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",
@@ -829,6 +869,7 @@ import {
   createFarmDeploymentRequestHeaders,
   isFarmDeploymentMismatchResponse,
 } from '@farm.js/core/deployment';
+${serverFnTransportErrorClientRuntime}
 const farmDeploymentId = ${JSON.stringify(entryContext.deploymentId)};
 setServerCallback(async (id, args) => {
   const refs = createTemporaryReferenceSet();
@@ -855,9 +896,7 @@ setServerCallback(async (id, args) => {
   if (!res.ok) throw new Error('Server action failed: ' + res.status);
   const p = await createFromReadableStream(res.body, { temporaryReferences: refs });
   if (p?.returnValue?.ok) return p.returnValue.data;
-  const error = new Error(p?.returnValue?.data?.message || 'Server function failed');
-  error.name = 'ServerActionError';
-  throw error;
+  throw createFarmServerFnTransportError(p?.returnValue?.data);
 });
 `
                         : "";
@@ -925,12 +964,16 @@ if (document.readyState === 'loading') {
                         const url = req.url || "/";
                         const pathname = url.split("?")[0];
                         const method = req.method || "GET";
+                        // Dotted paths only skip RSC rendering when they map to a real
+                        // file on disk — route segments may legitimately contain dots.
                         if (pathname.startsWith("/@") ||
                             pathname.startsWith("/__") ||
                             pathname.startsWith("/node_modules") ||
                             pathname.startsWith("/src/") ||
                             pathname.startsWith("/api/") ||
-                            (pathname.includes(".") && !pathname.endsWith("/"))) {
+                            (pathname.includes(".") &&
+                                !pathname.endsWith("/") &&
+                                devServableFileExists(pathname, [server.config.publicDir, server.config.root]))) {
                             return next();
                         }
                         const startTime = Date.now();
@@ -1112,7 +1155,7 @@ if (document.readyState === 'loading') {
                             const Layout = layoutModule?.default;
                             // Parse URL params (basic dynamic route support)
                             const params = {};
-                            const searchParams = Object.fromEntries(new URLSearchParams(url.split("?")[1] || ""));
+                            const searchParams = searchParamsToObject(new URL(url, `http://${req.headers.host || "localhost:3000"}`).searchParams);
                             // Render the page with middleware data
                             const pageProps = {
                                 params,

package/dist/rsc/nitro-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA+DD,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqMhF"}
+{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA+DD,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8MhF"}

package/dist/rsc/nitro-build.js

@@ -271,7 +271,15 @@ export async function buildRscNitro(options) {
         },
         // Externalize rsc/ssr so we don't bundle (they reference Vite-generated manifest). We copy dist into server output after build.
         rollupConfig: {
-            external: (id) => id.includes("../dist/") || id.includes("dist/rsc") || id.includes("dist/ssr"),
+            external: (id) => {
+                // Ids reach this predicate in both separator forms on Windows, and matching
+                // only the POSIX one makes the same module external in one pass and not in
+                // the next, which Rollup rejects.
+                const normalized = id.split("\\").join("/");
+                return (normalized.includes("../dist/") ||
+                    normalized.includes("dist/rsc") ||
+                    normalized.includes("dist/ssr"));
+            },
         },
         compatibilityDate: "2024-12-01",
         minify: true,

package/dist/rsc/optimized-boundary.d.ts

@@ -1,6 +1,6 @@
 import { type RenderOptions, type StrataDocument } from "@farming-labs/strata";
 import { type StaticFragmentBoundary, type StaticFragmentProps } from "@farming-labs/strata/react-server";
-import type { ReactElement } from "react";
+import { type ReactElement } from "react";
 export type { RenderOptions, StrataDocument, StrataElement, StrataNode, StrataTag, StrataText, } from "@farming-labs/strata";
 export interface OptimizedBoundaryProps extends Omit<StaticFragmentProps, "content"> {
     /**
@@ -10,6 +10,14 @@ export interface OptimizedBoundaryProps extends Omit<StaticFragmentProps, "conte
     document: StrataDocument;
     renderOptions?: RenderOptions;
 }
+/**
+ * Internal compiler target for automatic optimized boundaries. This helper is
+ * deliberately fail-open: any unsupported or unsafe tree returns the original
+ * React element unchanged.
+ *
+ * @internal
+ */
+export declare function _optimizeBoundary(element: ReactElement): ReactElement;
 /**
  * Render a typed host-only document with the optimized native runtime and
  * place it inside an opaque React-owned boundary.

package/dist/rsc/optimized-boundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optimized-boundary.d.ts","sourceRoot":"","sources":["../../src/rsc/optimized-boundary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,YAAY,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,UAAU,EACV,SAAS,EACT,UAAU,GACX,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,sBAAuB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;IAClF;;;OAGG;IACH,QAAQ,EAAE,cAAc,CAAC;IACzB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,aAAa,EACb,GAAG,KAAK,EACT,EAAE,sBAAsB,GAAG,YAAY,CAMvC;AAED,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"optimized-boundary.d.ts","sourceRoot":"","sources":["../../src/rsc/optimized-boundary.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,cAAc,EAIpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAA2C,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAEnF,YAAY,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,UAAU,EACV,SAAS,EACT,UAAU,GACX,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,sBAAuB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;IAClF;;;OAGG;IACH,QAAQ,EAAE,cAAc,CAAC;IACzB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAiND;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,YAAY,CAsBrE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,aAAa,EACb,GAAG,KAAK,EACT,EAAE,sBAAsB,GAAG,YAAY,CAMvC;AAED,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAC"}

package/dist/rsc/optimized-boundary.js

@@ -1,5 +1,233 @@
-import { render } from "@farming-labs/strata";
+import { render, } from "@farming-labs/strata";
 import { StaticFragment, } from "@farming-labs/strata/react-server";
+import { createElement, Fragment, isValidElement } from "react";
+const AUTOMATIC_MIN_NODES = 8;
+const AUTOMATIC_MIN_BYTES = 256;
+const AUTOMATIC_BOUNDARIES = new Set([
+    "article",
+    "aside",
+    "div",
+    "footer",
+    "header",
+    "main",
+    "nav",
+    "section",
+    "span",
+]);
+const STRATA_TAGS = new Set([
+    "a",
+    "abbr",
+    "address",
+    "article",
+    "aside",
+    "b",
+    "blockquote",
+    "br",
+    "caption",
+    "cite",
+    "code",
+    "col",
+    "colgroup",
+    "dd",
+    "del",
+    "details",
+    "dfn",
+    "div",
+    "dl",
+    "dt",
+    "em",
+    "figcaption",
+    "figure",
+    "footer",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "header",
+    "hr",
+    "i",
+    "img",
+    "ins",
+    "kbd",
+    "li",
+    "main",
+    "mark",
+    "nav",
+    "ol",
+    "p",
+    "pre",
+    "q",
+    "s",
+    "samp",
+    "section",
+    "small",
+    "span",
+    "strong",
+    "sub",
+    "summary",
+    "sup",
+    "table",
+    "tbody",
+    "td",
+    "tfoot",
+    "th",
+    "thead",
+    "time",
+    "tr",
+    "u",
+    "ul",
+    "var",
+    "wbr",
+]);
+const BOOLEAN_ATTRIBUTES = new Set(["hidden", "reversed"]);
+const ATTRIBUTE_NAMES = {
+    className: "class",
+    colSpan: "colspan",
+    dateTime: "datetime",
+    rowSpan: "rowspan",
+};
+function AutomaticOptimizedBoundary({ document, fallback, ...props }) {
+    let content;
+    try {
+        content = render(document);
+    }
+    catch {
+        return fallback;
+    }
+    if (content.nodeCount < AUTOMATIC_MIN_NODES && content.bytes < AUTOMATIC_MIN_BYTES) {
+        return fallback;
+    }
+    return StaticFragment({ ...props, content });
+}
+function attributeValue(name, value) {
+    if (value === null || value === undefined)
+        return undefined;
+    if (typeof value === "string" || typeof value === "number" || typeof value === "bigint") {
+        return String(value);
+    }
+    if (typeof value !== "boolean")
+        return null;
+    if (name.startsWith("aria-") || name.startsWith("data-"))
+        return String(value);
+    if (BOOLEAN_ATTRIBUTES.has(name))
+        return value ? "" : undefined;
+    return null;
+}
+function convertAttributes(tag, props) {
+    const attributes = {};
+    for (const [reactName, rawValue] of Object.entries(props)) {
+        if (reactName === "children")
+            continue;
+        if (reactName === "dangerouslySetInnerHTML" ||
+            reactName === "ref" ||
+            reactName === "style" ||
+            reactName === "suppressHydrationWarning" ||
+            /^on[A-Z]/.test(reactName)) {
+            return null;
+        }
+        const name = ATTRIBUTE_NAMES[reactName] || reactName;
+        const value = attributeValue(name, rawValue);
+        if (value === null)
+            return null;
+        if (value !== undefined)
+            attributes[name] = value;
+    }
+    return Object.keys(attributes).length > 0 ? attributes : {};
+}
+function automaticDocumentFromElement(element) {
+    const rootProps = element.props;
+    const children = [];
+    if (!appendStrataNodes(rootProps.children, children))
+        return null;
+    return { type: "document", ...(children.length > 0 ? { children } : {}) };
+}
+function appendStrataNodes(value, output) {
+    if (value === null || value === undefined || typeof value === "boolean")
+        return true;
+    if (typeof value === "string" || typeof value === "number" || typeof value === "bigint") {
+        output.push({ type: "text", value: String(value) });
+        return true;
+    }
+    if (Array.isArray(value)) {
+        for (const child of value) {
+            if (!appendStrataNodes(child, output))
+                return false;
+        }
+        return true;
+    }
+    if (!isValidElement(value))
+        return false;
+    const element = value;
+    const props = element.props;
+    if (element.type === Fragment)
+        return appendStrataNodes(props.children, output);
+    if (element.type === OptimizedBoundary || element.type === AutomaticOptimizedBoundary) {
+        const boundary = props.as ?? "div";
+        if (typeof boundary !== "string" || !STRATA_TAGS.has(boundary))
+            return false;
+        const { as: _as, document: _document, fallback: _fallback, ...boundaryProps } = props;
+        const attributes = convertAttributes(boundary, boundaryProps);
+        if (!attributes)
+            return false;
+        const document = props.document;
+        if (!document || document.type !== "document")
+            return false;
+        output.push({
+            type: "element",
+            tag: boundary,
+            ...(Object.keys(attributes).length > 0 ? { attributes } : {}),
+            ...(document.children?.length ? { children: document.children } : {}),
+        });
+        return true;
+    }
+    if (typeof element.type !== "string" || !STRATA_TAGS.has(element.type)) {
+        return false;
+    }
+    const tag = element.type;
+    const attributes = convertAttributes(tag, props);
+    if (!attributes)
+        return false;
+    const children = [];
+    if (!appendStrataNodes(props.children, children))
+        return false;
+    output.push({
+        type: "element",
+        tag,
+        ...(Object.keys(attributes).length > 0 ? { attributes } : {}),
+        ...(children.length > 0 ? { children } : {}),
+    });
+    return true;
+}
+/**
+ * Internal compiler target for automatic optimized boundaries. This helper is
+ * deliberately fail-open: any unsupported or unsafe tree returns the original
+ * React element unchanged.
+ *
+ * @internal
+ */
+export function _optimizeBoundary(element) {
+    if (!isValidElement(element) ||
+        typeof element.type !== "string" ||
+        !AUTOMATIC_BOUNDARIES.has(element.type)) {
+        return element;
+    }
+    const props = element.props;
+    if (props.dangerouslySetInnerHTML !== undefined || props.ref !== undefined)
+        return element;
+    const document = automaticDocumentFromElement(element);
+    if (!document)
+        return element;
+    const { children: _children, ...boundaryProps } = props;
+    return createElement(AutomaticOptimizedBoundary, {
+        ...boundaryProps,
+        ...(element.key !== null ? { key: element.key } : {}),
+        as: element.type,
+        document,
+        fallback: element,
+    });
+}
 /**
  * Render a typed host-only document with the optimized native runtime and
  * place it inside an opaque React-owned boundary.

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"}