@rangojs/router 0.26.6 → 0.28.0

package/src/rsc/json-route-result.ts

@@ -1,10 +1,6 @@
 /**
- * Shared serialization for `json()` response-route results.
- *
- * Kept in its own lightweight module (depends only on `errors.js`) so the
- * `dispatch()` testing primitive can import it WITHOUT dragging in
- * `response-route-handler.ts`'s heavy runtime graph, which transitively reaches
- * a Vite virtual module and breaks a plain (non-Vite) vitest import.
+ * Serialization for `json()` response-route results (depends only on
+ * `errors.js`).
  */
 
 import { RouterError } from "../errors.js";
@@ -16,9 +12,9 @@ import { RouterError } from "../errors.js";
  * the RSC pipeline awaits nested promises but this path does not. Throwing
  * `RESPONSE_NOT_SERIALIZABLE` makes the failure loud.
  *
- * Shared by the production response-route handler and the `dispatch()` testing
- * primitive so a `dispatch` json test of a forgotten await fails exactly where
- * production 500s, instead of going green.
+ * The `dispatch()` testing primitive runs the same response-route handler, so
+ * a `dispatch` json test of a forgotten await fails exactly where production
+ * 500s, instead of going green.
  */
 export function stringifyJsonRouteResult(result: unknown): string {
   return JSON.stringify(result, (_key, value) => {

package/src/rsc/loader-fetch.ts

@@ -37,6 +37,7 @@ import {
   finalizeResponse,
 } from "./helpers.js";
 import type { HandlerContext } from "./handler-context.js";
+import { WIRE } from "../wire-params.js";
 
 export interface LoaderErrorMeta<TEnv> {
   request: Request;
@@ -138,10 +139,10 @@ export async function handleLoaderFetch<TEnv>(
   variables: Record<string, any>,
   routeParams?: Record<string, string>,
 ): Promise<Response> {
-  const loaderId = url.searchParams.get("_rsc_loader");
+  const loaderId = url.searchParams.get(WIRE.loader);
 
   if (!loaderId) {
-    return createResponseWithMergedHeaders("Missing _rsc_loader parameter", {
+    return createResponseWithMergedHeaders(`Missing ${WIRE.loader} parameter`, {
       status: 400,
     });
   }
@@ -192,10 +193,10 @@ export async function handleLoaderFetch<TEnv>(
         // Preserves File objects and binary data.
         loaderFormData = await request.formData();
         // Extract params if provided via the special field
-        const paramsField = loaderFormData.get("_rsc_loader_params");
+        const paramsField = loaderFormData.get(WIRE.loaderParams);
         if (typeof paramsField === "string") {
           loaderParams = JSON.parse(paramsField);
-          loaderFormData.delete("_rsc_loader_params");
+          loaderFormData.delete(WIRE.loaderParams);
         }
       } else if (contentType.includes("application/json")) {
         const jsonBody = (await request.json()) as {
@@ -211,7 +212,7 @@ export async function handleLoaderFetch<TEnv>(
       });
     }
   } else {
-    const loaderParamsJson = url.searchParams.get("_rsc_loader_params");
+    const loaderParamsJson = url.searchParams.get(WIRE.loaderParams);
     if (loaderParamsJson) {
       try {
         loaderParams = JSON.parse(loaderParamsJson);

package/src/rsc/progressive-enhancement.ts

@@ -17,6 +17,7 @@ import { createSsrHtmlStage } from "./ssr-setup.js";
 import type { MiddlewareFn } from "../router/middleware.js";
 import { executeMiddleware } from "../router/middleware.js";
 import { observePhase, PHASES } from "../router/instrument.js";
+import { getRequestId, setRequestId } from "../router/telemetry.js";
 import { attachTransitionWhen } from "./attach-transition-when.js";
 import { payloadInitialTheme, payloadLocation } from "./full-payload.js";
 import { resolvedHandleStream } from "../handles/deferred-resolution.js";
@@ -322,6 +323,10 @@ async function rerenderAfterFormAction<TEnv>(
       method: "GET",
       headers,
     });
+    // A new Request: keep the visitor's telemetry id.
+    if (ctx.router.telemetry) {
+      setRequestId(renderRequest, getRequestId(request));
+    }
 
     // JS/PE parity: this is an action's revalidation render, so mark it BEFORE
     // matching — a stale `foregroundOnAction` cache entry must re-execute in the