@farm.js/plugin 0.1.0-beta.20 → 0.1.0-beta.22

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/rsc/entries/client.d.ts

@@ -1,4 +1,5 @@
 import type { EntryContext } from "../types.js";
+export declare const serverFnTransportErrorClientRuntime = "function createFarmServerFnTransportError(value) {\n  const message = value && typeof value === 'object' && typeof value.message === 'string'\n    ? value.message\n    : 'Server function failed';\n  const error = new Error(message);\n\n  if (\n    value &&\n    typeof value === 'object' &&\n    value.name === 'ServerFnFailure' &&\n    typeof value.code === 'string' &&\n    Number.isInteger(value.status) &&\n    value.status >= 400 &&\n    value.status <= 599 &&\n    Object.prototype.hasOwnProperty.call(value, 'data')\n  ) {\n    error.name = 'ServerFnFailure';\n    error.code = value.code;\n    error.status = value.status;\n    error.data = value.data;\n    Object.defineProperty(error, Symbol.for('farm.server-fn.failure'), {\n      value: true,\n      enumerable: false,\n    });\n    return error;\n  }\n\n  error.name = 'ServerActionError';\n  return error;\n}";
 /**
  * Generates the browser entry file.
  *

package/dist/rsc/entries/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAiR7D"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,mCAAmC,62BA6B9C,CAAC;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAiR7D"}

package/dist/rsc/entries/client.js

@@ -1,3 +1,33 @@
+export const serverFnTransportErrorClientRuntime = `function createFarmServerFnTransportError(value) {
+  const message = value && typeof value === 'object' && typeof value.message === 'string'
+    ? value.message
+    : 'Server function failed';
+  const error = new Error(message);
+
+  if (
+    value &&
+    typeof value === 'object' &&
+    value.name === 'ServerFnFailure' &&
+    typeof value.code === 'string' &&
+    Number.isInteger(value.status) &&
+    value.status >= 400 &&
+    value.status <= 599 &&
+    Object.prototype.hasOwnProperty.call(value, 'data')
+  ) {
+    error.name = 'ServerFnFailure';
+    error.code = value.code;
+    error.status = value.status;
+    error.data = value.data;
+    Object.defineProperty(error, Symbol.for('farm.server-fn.failure'), {
+      value: true,
+      enumerable: false,
+    });
+    return error;
+  }
+
+  error.name = 'ServerActionError';
+  return error;
+}`;
 /**
  * Generates the browser entry file.
  *
@@ -45,6 +75,8 @@ import {
     let actionSetup = "";
     if (ctx.actionsEnabled) {
         actionSetup = `
+${serverFnTransportErrorClientRuntime}
+
 // Ref for payload setter (used by server action callback and refetch)
 const setPayloadRef = { current: null };
 
@@ -96,9 +128,7 @@ setServerCallback(async (id, args) => {
   applyFarmCacheInvalidations(p.returnValue?.invalidations);
   if (!p.returnValue || !p.returnValue.ok) {
     debug('Server action failed:', id);
-    const error = new Error(p.returnValue?.data?.message || 'Server function failed');
-    error.name = 'ServerActionError';
-    throw error;
+    throw createFarmServerFnTransportError(p.returnValue?.data);
   }
   return completeFarmServerQueryAction(serverQueryInvocation, p.returnValue.data);
 });

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

@@ -1 +1 @@
-{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAg7B1D"}
+{"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAs7B1D"}

package/dist/rsc/entries/rsc.js

@@ -642,8 +642,11 @@ async function handleFarmRequest(request) {
         if (request.signal.aborted) {
           return new Response(null, { status: 499, headers: { 'Cache-Control': 'no-store' } });
         }
-        console.error('[Farm.js] Server action failed:', e);
-        returnValue = { ok: false, data: sanitizeServerActionError(e) };
+        const actionError = sanitizeServerActionError(e);
+        if (actionError.name === 'ServerActionError') {
+          console.error('[Farm.js] Server action failed:', e);
+        }
+        returnValue = { ok: false, data: actionError };
         debug('Server action failed:', actionId, e);
       }
     } else {
@@ -674,10 +677,13 @@ async function handleFarmRequest(request) {
         if (request.signal.aborted) {
           return new Response(null, { status: 499, headers: { 'Cache-Control': 'no-store' } });
         }
-        console.error('[Farm.js] Form action failed:', e);
-        debug('Form action failed:', e);
-        return new Response('Server function failed', {
-          status: 500,
+        const actionError = sanitizeServerActionError(e);
+        if (actionError.name === 'ServerActionError') {
+          console.error('[Farm.js] Form action failed:', e);
+        }
+        debug('Form action failed:', actionError);
+        return new Response(actionError.message, {
+          status: actionError.name === 'ServerFnFailure' ? actionError.status : 500,
           headers: {
             'Cache-Control': 'no-store',
             'Content-Type': 'text/plain; charset=utf-8',

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;AA4B9E,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,CA0oC5E"}
+{"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;AA4B9E,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,CAyoC5E"}

package/dist/rsc/index.js

@@ -26,7 +26,7 @@ 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 { transformFarmServerFns } from "./server-fn-transform.js";
 import { transformAutomaticOptimizedBoundaries } from "./automatic-optimized-boundary.js";
 import { resolveRscBuildOutputPath } from "./build-paths.js";
@@ -848,6 +848,7 @@ import {
   createFarmDeploymentRequestHeaders,
   isFarmDeploymentMismatchResponse,
 } from '@farm.js/core/deployment';
+${serverFnTransportErrorClientRuntime}
 const farmDeploymentId = ${JSON.stringify(entryContext.deploymentId)};
 setServerCallback(async (id, args) => {
   const refs = createTemporaryReferenceSet();
@@ -874,9 +875,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);
 });
 `
                         : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.20",
+  "version": "0.1.0-beta.22",
   "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.20"
+    "@farm.js/core": "0.1.0-beta.22"
   },
   "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.20"
+    "@farm.js/core": "0.1.0-beta.22"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {