@rangojs/router 0.17.0 → 0.18.0

package/src/rsc/full-payload.ts

@@ -13,6 +13,7 @@ import type { RscPayload } from "./types.js";
 import type { HandlerContext } from "./handler-context.js";
 import type { RequestContext } from "../server/request-context.js";
 import type { HandleStore } from "../server/handle-store.js";
+import type { Theme } from "../theme/types.js";
 import { gateTransitions } from "./transition-gate.js";
 import { resolvedHandleStream } from "../handles/deferred-resolution.js";
 
@@ -71,7 +72,30 @@ export function buildFullPayload(
       // entry knows whether to wrap hydration in React.StrictMode. Partial
       // (navigation) payloads omit it by design; StrictMode is decided once.
       strictMode: ctx.router.strictMode,
-      initialTheme: reqCtx.theme,
+      initialTheme: payloadInitialTheme(reqCtx),
     },
   };
 }
+
+/**
+ * The theme a document payload carries as `metadata.initialTheme` (the
+ * ThemeProvider's first state), read with no identity guard: it is the
+ * router's own read, not handler code (#971).
+ *
+ * A shell capture carries the no-cookie default, not the capturing visitor's
+ * theme. The shell and its ShellCacheEntry.initialTheme serve every visitor,
+ * and ThemeProvider re-syncs only from an explicitly stored theme, so a
+ * visitor with none kept the capturer's `useTheme().theme` for the page's
+ * lifetime. A visitor with a stored theme gets it pre-paint (theme script)
+ * and in the provider after mount.
+ */
+export function payloadInitialTheme(
+  reqCtx: Pick<
+    RequestContext<any>,
+    "_themeConfig" | "_shellCaptureRun" | "_readTheme"
+  >,
+): Theme | undefined {
+  const config = reqCtx._themeConfig;
+  if (!config) return undefined;
+  return reqCtx._shellCaptureRun ? config.defaultTheme : reqCtx._readTheme();
+}

package/src/rsc/handler.ts

@@ -31,6 +31,7 @@ import {
 } from "./helpers.js";
 import { renderRscFlightStage, renderRscResponse } from "./render-pipeline.js";
 import { guardOutgoingRedirect } from "./redirect-guard.js";
+import { payloadInitialTheme } from "./full-payload.js";
 import {
   resolveSoftRedirectUrl,
   resolveExternalRedirect,
@@ -85,6 +86,7 @@ import {
   ORIGIN_CHECK_PHASE_BY_MODE,
 } from "./origin-guard.js";
 import { handleRscRendering } from "./rsc-rendering.js";
+import { withoutShellMissMarker } from "./shell-serve.js";
 import {
   withTimeout,
   isTimeoutEnabled,
@@ -436,10 +438,16 @@ export function createRSCHandler<
   };
 
   return async function handler(
-    request: Request,
+    incomingRequest: Request,
     input: RouterRequestInput<TEnv> = {},
   ): Promise<Response> {
     const handlerStart = performance.now();
+    // A degraded PPR HIT's reload carries the forced-MISS marker: keep only
+    // the flag (set on the request context below) and drop the marker before
+    // anything reads the request, so middleware, handlers, loaders, cache
+    // keys and the SSR search seed see the URL the visitor asked for.
+    const unmarkedRequest = withoutShellMissMarker(incomingRequest);
+    const request = unmarkedRequest ?? incomingRequest;
     // Create the metrics store at handler start so handler:total has startTime=0
     // and all metrics are relative to the request entry point.
     const earlyMetricsStore = router.debugPerformance
@@ -566,6 +574,7 @@ export function createRSCHandler<
       stateCookieName: router.resolvedStateCookieName,
       version,
     });
+    if (unmarkedRequest) requestContext._shellForcedMiss = true;
     // Gate on the SAME enabled-semantics withTimeout uses (isTimeoutEnabled):
     // a `renderStartMs: 0` / negative opt-out disables the timeout, so the
     // driver's cursor bookkeeping (which only the timeout reads) must be off too.
@@ -662,6 +671,9 @@ export function createRSCHandler<
         // the host; it never reads or wraps response.body. A downstream throw
         // skips it entirely (no response exists to hand off).
         return observePhase(PHASES.response, (responseSpan) => {
+          // Header and cookie writes from here on (a streaming loader or
+          // render) no longer reach the response.
+          requestContext._responseSent = true;
           let response: Response;
           if (hasMiddleware) {
             if (
@@ -1355,7 +1367,7 @@ export function createRSCHandler<
               themeConfig: router.themeConfig,
               warmupEnabled: router.warmupEnabled,
               strictMode: router.strictMode,
-              initialTheme: getRequestContext().theme,
+              initialTheme: payloadInitialTheme(getRequestContext()),
             },
           };
 

package/src/rsc/progressive-enhancement.ts

@@ -15,6 +15,7 @@ import type { MiddlewareFn } from "../router/middleware.js";
 import { executeMiddleware } from "../router/middleware.js";
 import { observePhase, PHASES } from "../router/instrument.js";
 import { gateTransitions } from "./transition-gate.js";
+import { payloadInitialTheme } from "./full-payload.js";
 import { resolvedHandleStream } from "../handles/deferred-resolution.js";
 import type { RscPayload, ReactFormState } from "./types.js";
 import {
@@ -444,7 +445,7 @@ function renderPeResponse<TEnv>(
       themeConfig: ctx.router.themeConfig,
       warmupEnabled: ctx.router.warmupEnabled,
       strictMode: ctx.router.strictMode,
-      initialTheme: getRequestContext().theme,
+      initialTheme: payloadInitialTheme(getRequestContext()),
     },
   };
 
@@ -646,7 +647,7 @@ function renderPeErrorResponse<TEnv>(
       themeConfig: ctx.router.themeConfig,
       warmupEnabled: ctx.router.warmupEnabled,
       strictMode: ctx.router.strictMode,
-      initialTheme: getRequestContext().theme,
+      initialTheme: payloadInitialTheme(getRequestContext()),
     },
   };
 

package/src/rsc/response-cache-serve.ts

@@ -105,7 +105,10 @@ export async function serveResponseRouteWithCache(
   // the host-namespacing and search-normalization rules cannot drift.
   let cacheKey = `response:${responseType}:${cacheKeyBase(url.host, url.pathname, url.searchParams, undefined, reqCtx._searchParamsFilter)}`;
 
-  // Priority 1: route-level key() (full override). Priority 2: store-level
+  // Priority 1: route-level key() (full override): the key() results of every
+  // cache() enclosing the route, composed like the segment record key
+  // (CacheScope.resolveKeyFrom, #970), so a nested cache() never shares an
+  // entry across the enclosing partitions. Priority 2: store-level
   // keyGenerator (modifies the default key).
   //
   // A CONFIGURED key()/keyGenerator that THROWS must DEGRADE TO A MISS, not fall
@@ -114,13 +117,13 @@ export async function serveResponseRouteWithCache(
   // would cache PERSONALIZED output under it and serve it cross-user (cache
   // poisoning). Mirrors the segment-cache behavior (cache-scope.ts lookupRoute):
   // a throwing key degrades to a cache miss, never a collision onto the default
-  // slot. The no-key default path is left untouched (the broad key is correct
-  // when no key is configured).
+  // slot, and so does a key() with no ambient request context to run in
+  // (resolveKeyFrom rejects). The no-key default path is left untouched (the
+  // broad key is correct when no key is configured).
   let keyResolutionFailed = false;
-  if (cacheScope.config !== false && cacheScope.config.key) {
+  if (cacheScope.keyFns.length > 0) {
     try {
-      const customKey = await cacheScope.config.key(reqCtx);
-      cacheKey = `response:${customKey}`;
+      cacheKey = `response:${await cacheScope.resolveKeyFrom(cacheKey)}`;
     } catch (error) {
       keyResolutionFailed = true;
       reportCacheError(