@timber-js/app 0.2.0-alpha.94 → 0.2.0-alpha.95

package/dist/server/action-handler.d.ts

@@ -44,15 +44,24 @@ export declare function isActionRequest(req: Request): boolean;
 /**
  * Signal from handleFormAction to re-render the page with flash data instead of redirecting.
  *
- * Carries `setCookieHeaders` snapshotted from the action's request-context ALS
- * scope so the rerender pipeline (which establishes its own fresh cookie jar)
- * can append them to the final HTML response. Without this, cookies set inside
- * the action via `defineCookie().setCookie()` are silently dropped on the
- * no-JS validation-failure path. See LOCAL-740.
+ * Carries two cookie-related snapshots taken before the action's ALS scope
+ * exits, so the rerender pipeline (which establishes its own fresh cookie
+ * jar from the original request) doesn't lose the action's mutations:
+ *
+ *   - `setCookieHeaders`: serialized Set-Cookie headers to append to the
+ *     final HTML response. Without this, cookies set inside the action are
+ *     silently dropped from the response. See TIM-836 (LOCAL-740).
+ *
+ *   - `cookieHeader`: the post-action read-your-own-writes view of the
+ *     cookie jar, serialized as a `Cookie:` request header. The rerender
+ *     pipeline uses this to clone the request before re-rendering, so the
+ *     page server components see the action's cookie writes immediately
+ *     instead of the stale pre-action state. See TIM-837.
  */
 export interface FormRerender {
     rerender: FormFlashData;
     setCookieHeaders: string[];
+    cookieHeader: string;
 }
 /**
  * Handle a server action request.

package/dist/server/action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-handler.d.ts","sourceRoot":"","sources":["../../src/server/action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AASH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAiB,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAOtE,OAAO,EAAwC,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE/F,OAAO,EAIL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMrD,4CAA4C;AAC5C,MAAM,WAAW,oBAAoB;IACnC,0BAA0B;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,gDAAgD;IAChD,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAQD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAarD;AAID;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,aAAa,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,QAAQ,GAAG,YAAY,GAAG,IAAI,CAAC,CAgEzC"}
+{"version":3,"file":"action-handler.d.ts","sourceRoot":"","sources":["../../src/server/action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AASH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAiB,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAQtE,OAAO,EAAwC,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE/F,OAAO,EAIL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMrD,4CAA4C;AAC5C,MAAM,WAAW,oBAAoB;IACnC,0BAA0B;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,gDAAgD;IAChD,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAQD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAarD;AAuBD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,aAAa,CAAC;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,QAAQ,GAAG,YAAY,GAAG,IAAI,CAAC,CAmEzC"}

package/dist/server/rsc-entry/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/rsc-entry/index.ts"],"names":[],"mappings":"AAuBA,OAAO,uCAAuC,CAAC;AA0C/C,OAAO,EAKL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AAoCtB;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,mBAAmB,EAAE,KAAK,IAAI,GACtF,IAAI,CAEN;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAE5E;AA4jBD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAInE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;8BAnTrC,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC;AAqThD,wBAAiE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/rsc-entry/index.ts"],"names":[],"mappings":"AAuBA,OAAO,uCAAuC,CAAC;AA0C/C,OAAO,EAKL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AAoCtB;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,mBAAmB,EAAE,KAAK,IAAI,GACtF,IAAI,CAEN;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAE5E;AAklBD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAInE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;8BAzUrC,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC;AA2UhD,wBAAiE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.94",
+  "version": "0.2.0-alpha.95",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/server/action-handler.ts

@@ -26,6 +26,7 @@ import {
   runWithRequestContext,
   setMutableCookieContext,
   getSetCookieHeaders,
+  getCookiesForSsr,
 } from './request-context.js';
 import { handleActionError } from './action-client.js';
 import { enforceBodyLimits, enforceFieldLimit, type BodyLimitsConfig } from './body-limits.js';
@@ -89,18 +90,46 @@ export function isActionRequest(req: Request): boolean {
 
 // ─── Handler ──────────────────────────────────────────────────────────────
 
+/**
+ * Serialize a `Map<string, string>` of cookie name → value as a `Cookie:`
+ * request header value. Format: `name1=value1; name2=value2`. Matches the
+ * format `parseCookieHeader` in `request-context.ts` reads with, so the
+ * rerender pipeline can parse it back into the same RYW state.
+ *
+ * Used to thread the post-action cookie state from the action's ALS scope
+ * into the rerender pipeline's fresh ALS scope. Cookies marked for deletion
+ * are already absent from `getCookiesForSsr()`'s map, so they naturally drop
+ * out of the synthesized header. See TIM-837.
+ */
+function serializeCookieMapAsHeader(cookies: Map<string, string>): string {
+  const parts: string[] = [];
+  for (const [name, value] of cookies) {
+    parts.push(`${name}=${value}`);
+  }
+  return parts.join('; ');
+}
+
 /**
  * Signal from handleFormAction to re-render the page with flash data instead of redirecting.
  *
- * Carries `setCookieHeaders` snapshotted from the action's request-context ALS
- * scope so the rerender pipeline (which establishes its own fresh cookie jar)
- * can append them to the final HTML response. Without this, cookies set inside
- * the action via `defineCookie().setCookie()` are silently dropped on the
- * no-JS validation-failure path. See LOCAL-740.
+ * Carries two cookie-related snapshots taken before the action's ALS scope
+ * exits, so the rerender pipeline (which establishes its own fresh cookie
+ * jar from the original request) doesn't lose the action's mutations:
+ *
+ *   - `setCookieHeaders`: serialized Set-Cookie headers to append to the
+ *     final HTML response. Without this, cookies set inside the action are
+ *     silently dropped from the response. See TIM-836 (LOCAL-740).
+ *
+ *   - `cookieHeader`: the post-action read-your-own-writes view of the
+ *     cookie jar, serialized as a `Cookie:` request header. The rerender
+ *     pipeline uses this to clone the request before re-rendering, so the
+ *     page server components see the action's cookie writes immediately
+ *     instead of the stale pre-action state. See TIM-837.
  */
 export interface FormRerender {
   rerender: FormFlashData;
   setCookieHeaders: string[];
+  cookieHeader: string;
 }
 
 /**
@@ -173,6 +202,9 @@ export async function handleActionRequest(
       }
     } else if (result && 'rerender' in result) {
       result.setCookieHeaders = getSetCookieHeaders();
+      // Snapshot the post-action RYW cookie state so the rerender pipeline
+      // can re-parse it into a fresh ALS scope. See TIM-837.
+      result.cookieHeader = serializeCookieMapAsHeader(getCookiesForSsr());
     }
     return result;
   });
@@ -359,6 +391,7 @@ async function handleFormAction(
       },
       // Filled in by handleActionRequest before the ALS scope exits.
       setCookieHeaders: [],
+      cookieHeader: '',
     };
   }
 
@@ -388,6 +421,7 @@ async function handleFormAction(
     );
   }
 
-  // setCookieHeaders is filled in by handleActionRequest before the ALS scope exits.
-  return { rerender: actionResult, setCookieHeaders: [] };
+  // setCookieHeaders + cookieHeader are filled in by handleActionRequest
+  // before the ALS scope exits.
+  return { rerender: actionResult, setCookieHeaders: [], cookieHeader: '' };
 }

package/src/server/rsc-entry/index.ts

@@ -446,11 +446,33 @@ async function createRequestHandler(manifest: typeof routeManifest, runtimeConfi
           // Re-render the page with the action result as flash data.
           // Server components read it via getFormFlash() and pass it to
           // client form components as the initial useActionState value.
-          const response = await runWithFormFlash(formRerender.rerender, () => pipeline(req));
+          //
+          // Build a synthetic GET request for the rerender pipeline:
+          //   - Same URL (so route matching lands on the same page)
+          //   - Cookie header replaced with the post-action RYW snapshot
+          //     so server components see the action's writes (TIM-837)
+          //   - Method GET because the rerender is conceptually a page
+          //     render, not a re-POST. The pipeline doesn't branch on
+          //     method for page rendering, and constructing a POST without
+          //     a body is awkward across Request implementations.
+          const rerenderHeaders = new Headers(req.headers);
+          if (formRerender.cookieHeader) {
+            rerenderHeaders.set('cookie', formRerender.cookieHeader);
+          } else {
+            rerenderHeaders.delete('cookie');
+          }
+          const rerenderReq = new Request(req.url, {
+            method: 'GET',
+            headers: rerenderHeaders,
+          });
+          const response = await runWithFormFlash(formRerender.rerender, () =>
+            pipeline(rerenderReq)
+          );
           // Apply Set-Cookie headers snapshotted from the action's ALS scope.
           // The pipeline above runs in its own request context with a fresh
           // cookie jar, so cookies set inside the action would otherwise be
-          // silently dropped on the no-JS rerender path. See LOCAL-740.
+          // silently dropped on the no-JS rerender path. See TIM-836
+          // (LOCAL-740).
           for (const value of formRerender.setCookieHeaders) {
             response.headers.append('Set-Cookie', value);
           }