vinext 0.0.46 → 0.0.48

package/dist/server/app-page-params.js

@@ -1,5 +1,5 @@
 //#region src/server/app-page-params.ts
-function getSegmentParamName(segment) {
+function getAppPageSegmentParamName(segment) {
 	if (segment.startsWith("[[...") && segment.endsWith("]]") && segment.length > 7) return segment.slice(5, -2);
 	if (segment.startsWith("[...") && segment.endsWith("]") && segment.length > 5) return segment.slice(4, -1);
 	if (segment.startsWith("[") && segment.endsWith("]") && !segment.includes(".") && segment.length > 2) return segment.slice(1, -1);
@@ -14,7 +14,7 @@ function resolveAppPageSegmentParams(routeSegments, treePosition, matchedParams)
 	const end = Math.min(Math.max(treePosition, 0), segments.length);
 	for (let index = 0; index < end; index++) {
 		const segment = segments[index];
-		const paramName = getSegmentParamName(segment);
+		const paramName = getAppPageSegmentParamName(segment);
 		if (!paramName) continue;
 		const paramValue = matchedParams[paramName];
 		if (paramValue === void 0 || isEmptyOptionalCatchAll(segment, paramValue)) continue;
@@ -23,6 +23,6 @@ function resolveAppPageSegmentParams(routeSegments, treePosition, matchedParams)
 	return segmentParams;
 }
 //#endregion
-export { resolveAppPageSegmentParams };
+export { getAppPageSegmentParamName, resolveAppPageSegmentParams };
 
 //# sourceMappingURL=app-page-params.js.map

package/dist/server/app-page-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-params.js","names":[],"sources":["../../src/server/app-page-params.ts"],"sourcesContent":["import type { AppPageParams } from \"./app-page-boundary.js\";\n\nfunction getSegmentParamName(segment: string): string | null {\n  if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\") && segment.length > 7) {\n    return segment.slice(5, -2);\n  }\n\n  if (segment.startsWith(\"[...\") && segment.endsWith(\"]\") && segment.length > 5) {\n    return segment.slice(4, -1);\n  }\n\n  if (\n    segment.startsWith(\"[\") &&\n    segment.endsWith(\"]\") &&\n    !segment.includes(\".\") &&\n    segment.length > 2\n  ) {\n    return segment.slice(1, -1);\n  }\n\n  return null;\n}\n\nfunction isEmptyOptionalCatchAll(segment: string, paramValue: string | string[]): boolean {\n  return segment.startsWith(\"[[...\") && Array.isArray(paramValue) && paramValue.length === 0;\n}\n\nexport function resolveAppPageSegmentParams(\n  routeSegments: readonly string[] | null | undefined,\n  treePosition: number,\n  matchedParams: AppPageParams,\n): AppPageParams {\n  const segmentParams: AppPageParams = {};\n  const segments = routeSegments ?? [];\n  const end = Math.min(Math.max(treePosition, 0), segments.length);\n\n  for (let index = 0; index < end; index++) {\n    const segment = segments[index];\n    const paramName = getSegmentParamName(segment);\n    if (!paramName) {\n      continue;\n    }\n\n    const paramValue = matchedParams[paramName];\n    if (paramValue === undefined || isEmptyOptionalCatchAll(segment, paramValue)) {\n      continue;\n    }\n\n    segmentParams[paramName] = paramValue;\n  }\n\n  return segmentParams;\n}\n"],"mappings":";AAEA,SAAS,oBAAoB,SAAgC;AAC3D,KAAI,QAAQ,WAAW,QAAQ,IAAI,QAAQ,SAAS,KAAK,IAAI,QAAQ,SAAS,EAC5E,QAAO,QAAQ,MAAM,GAAG,GAAG;AAG7B,KAAI,QAAQ,WAAW,OAAO,IAAI,QAAQ,SAAS,IAAI,IAAI,QAAQ,SAAS,EAC1E,QAAO,QAAQ,MAAM,GAAG,GAAG;AAG7B,KACE,QAAQ,WAAW,IAAI,IACvB,QAAQ,SAAS,IAAI,IACrB,CAAC,QAAQ,SAAS,IAAI,IACtB,QAAQ,SAAS,EAEjB,QAAO,QAAQ,MAAM,GAAG,GAAG;AAG7B,QAAO;;AAGT,SAAS,wBAAwB,SAAiB,YAAwC;AACxF,QAAO,QAAQ,WAAW,QAAQ,IAAI,MAAM,QAAQ,WAAW,IAAI,WAAW,WAAW;;AAG3F,SAAgB,4BACd,eACA,cACA,eACe;CACf,MAAM,gBAA+B,EAAE;CACvC,MAAM,WAAW,iBAAiB,EAAE;CACpC,MAAM,MAAM,KAAK,IAAI,KAAK,IAAI,cAAc,EAAE,EAAE,SAAS,OAAO;AAEhE,MAAK,IAAI,QAAQ,GAAG,QAAQ,KAAK,SAAS;EACxC,MAAM,UAAU,SAAS;EACzB,MAAM,YAAY,oBAAoB,QAAQ;AAC9C,MAAI,CAAC,UACH;EAGF,MAAM,aAAa,cAAc;AACjC,MAAI,eAAe,KAAA,KAAa,wBAAwB,SAAS,WAAW,CAC1E;AAGF,gBAAc,aAAa;;AAG7B,QAAO"}
+{"version":3,"file":"app-page-params.js","names":[],"sources":["../../src/server/app-page-params.ts"],"sourcesContent":["import type { AppPageParams } from \"./app-page-boundary.js\";\n\nexport function getAppPageSegmentParamName(segment: string): string | null {\n  if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\") && segment.length > 7) {\n    return segment.slice(5, -2);\n  }\n\n  if (segment.startsWith(\"[...\") && segment.endsWith(\"]\") && segment.length > 5) {\n    return segment.slice(4, -1);\n  }\n\n  if (\n    segment.startsWith(\"[\") &&\n    segment.endsWith(\"]\") &&\n    !segment.includes(\".\") &&\n    segment.length > 2\n  ) {\n    return segment.slice(1, -1);\n  }\n\n  return null;\n}\n\nfunction isEmptyOptionalCatchAll(segment: string, paramValue: string | string[]): boolean {\n  return segment.startsWith(\"[[...\") && Array.isArray(paramValue) && paramValue.length === 0;\n}\n\nexport function resolveAppPageSegmentParams(\n  routeSegments: readonly string[] | null | undefined,\n  treePosition: number,\n  matchedParams: AppPageParams,\n): AppPageParams {\n  const segmentParams: AppPageParams = {};\n  const segments = routeSegments ?? [];\n  const end = Math.min(Math.max(treePosition, 0), segments.length);\n\n  for (let index = 0; index < end; index++) {\n    const segment = segments[index];\n    const paramName = getAppPageSegmentParamName(segment);\n    if (!paramName) {\n      continue;\n    }\n\n    const paramValue = matchedParams[paramName];\n    if (paramValue === undefined || isEmptyOptionalCatchAll(segment, paramValue)) {\n      continue;\n    }\n\n    segmentParams[paramName] = paramValue;\n  }\n\n  return segmentParams;\n}\n"],"mappings":";AAEA,SAAgB,2BAA2B,SAAgC;AACzE,KAAI,QAAQ,WAAW,QAAQ,IAAI,QAAQ,SAAS,KAAK,IAAI,QAAQ,SAAS,EAC5E,QAAO,QAAQ,MAAM,GAAG,GAAG;AAG7B,KAAI,QAAQ,WAAW,OAAO,IAAI,QAAQ,SAAS,IAAI,IAAI,QAAQ,SAAS,EAC1E,QAAO,QAAQ,MAAM,GAAG,GAAG;AAG7B,KACE,QAAQ,WAAW,IAAI,IACvB,QAAQ,SAAS,IAAI,IACrB,CAAC,QAAQ,SAAS,IAAI,IACtB,QAAQ,SAAS,EAEjB,QAAO,QAAQ,MAAM,GAAG,GAAG;AAG7B,QAAO;;AAGT,SAAS,wBAAwB,SAAiB,YAAwC;AACxF,QAAO,QAAQ,WAAW,QAAQ,IAAI,MAAM,QAAQ,WAAW,IAAI,WAAW,WAAW;;AAG3F,SAAgB,4BACd,eACA,cACA,eACe;CACf,MAAM,gBAA+B,EAAE;CACvC,MAAM,WAAW,iBAAiB,EAAE;CACpC,MAAM,MAAM,KAAK,IAAI,KAAK,IAAI,cAAc,EAAE,EAAE,SAAS,OAAO;AAEhE,MAAK,IAAI,QAAQ,GAAG,QAAQ,KAAK,SAAS;EACxC,MAAM,UAAU,SAAS;EACzB,MAAM,YAAY,2BAA2B,QAAQ;AACrD,MAAI,CAAC,UACH;EAGF,MAAM,aAAa,cAAc;AACjC,MAAI,eAAe,KAAA,KAAa,wBAAwB,SAAS,WAAW,CAC1E;AAGF,gBAAc,aAAa;;AAG7B,QAAO"}

package/dist/server/app-page-probe.d.ts

@@ -1,4 +1,4 @@
-import { LayoutFlags } from "./app-elements.js";
+import { LayoutFlags } from "./app-elements-wire.js";
 import { AppPageSpecialError, LayoutClassificationOptions } from "./app-page-execution.js";
 
 //#region src/server/app-page-probe.d.ts

package/dist/server/app-page-probe.js

@@ -22,9 +22,13 @@ async function probeAppPageBeforeRender(options) {
 			layoutFlags
 		};
 	}
+	if (options.hasLoadingBoundary) return {
+		response: null,
+		layoutFlags
+	};
 	return {
 		response: await probeAppPageComponent({
-			awaitAsyncResult: !options.hasLoadingBoundary,
+			awaitAsyncResult: true,
 			async onError(pageError) {
 				const specialError = options.resolveSpecialError(pageError);
 				if (specialError) return options.renderPageSpecialError(specialError);

package/dist/server/app-page-probe.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-probe.js","names":[],"sources":["../../src/server/app-page-probe.ts"],"sourcesContent":["import {\n  probeAppPageComponent,\n  probeAppPageLayouts,\n  type AppPageSpecialError,\n  type LayoutClassificationOptions,\n  type LayoutFlags,\n} from \"./app-page-execution.js\";\n\ntype ProbeAppPageBeforeRenderResult = {\n  response: Response | null;\n  layoutFlags: LayoutFlags;\n};\n\ntype ProbeAppPageBeforeRenderOptions = {\n  hasLoadingBoundary: boolean;\n  layoutCount: number;\n  probeLayoutAt: (layoutIndex: number) => unknown;\n  probePage: () => unknown;\n  renderLayoutSpecialError: (\n    specialError: AppPageSpecialError,\n    layoutIndex: number,\n  ) => Promise<Response>;\n  renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => AppPageSpecialError | null;\n  runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;\n  /** When provided, enables per-layout static/dynamic classification. */\n  classification?: LayoutClassificationOptions | null;\n};\n\nexport async function probeAppPageBeforeRender(\n  options: ProbeAppPageBeforeRenderOptions,\n): Promise<ProbeAppPageBeforeRenderResult> {\n  let layoutFlags: LayoutFlags = {};\n\n  // Layouts render before their children in Next.js, so layout-level special\n  // errors must be handled before probing the page component itself.\n  if (options.layoutCount > 0) {\n    const layoutProbeResult = await probeAppPageLayouts({\n      layoutCount: options.layoutCount,\n      async onLayoutError(layoutError, layoutIndex) {\n        const specialError = options.resolveSpecialError(layoutError);\n        if (!specialError) {\n          return null;\n        }\n\n        return options.renderLayoutSpecialError(specialError, layoutIndex);\n      },\n      probeLayoutAt: options.probeLayoutAt,\n      runWithSuppressedHookWarning(probe) {\n        return options.runWithSuppressedHookWarning(probe);\n      },\n      classification: options.classification,\n    });\n\n    layoutFlags = layoutProbeResult.layoutFlags;\n\n    if (layoutProbeResult.response) {\n      return { response: layoutProbeResult.response, layoutFlags };\n    }\n  }\n\n  // Server Components are functions, so we can probe the page ahead of stream\n  // creation and only turn special throws into immediate responses.\n  const pageResponse = await probeAppPageComponent({\n    awaitAsyncResult: !options.hasLoadingBoundary,\n    async onError(pageError) {\n      const specialError = options.resolveSpecialError(pageError);\n      if (specialError) {\n        return options.renderPageSpecialError(specialError);\n      }\n\n      // Non-special probe failures (for example use() outside React's render\n      // cycle or client references executing on the server) are expected here.\n      // The real RSC/SSR render path will surface those properly below.\n      return null;\n    },\n    probePage: options.probePage,\n    runWithSuppressedHookWarning(probe) {\n      return options.runWithSuppressedHookWarning(probe);\n    },\n  });\n\n  return { response: pageResponse, layoutFlags };\n}\n"],"mappings":";;AA6BA,eAAsB,yBACpB,SACyC;CACzC,IAAI,cAA2B,EAAE;AAIjC,KAAI,QAAQ,cAAc,GAAG;EAC3B,MAAM,oBAAoB,MAAM,oBAAoB;GAClD,aAAa,QAAQ;GACrB,MAAM,cAAc,aAAa,aAAa;IAC5C,MAAM,eAAe,QAAQ,oBAAoB,YAAY;AAC7D,QAAI,CAAC,aACH,QAAO;AAGT,WAAO,QAAQ,yBAAyB,cAAc,YAAY;;GAEpE,eAAe,QAAQ;GACvB,6BAA6B,OAAO;AAClC,WAAO,QAAQ,6BAA6B,MAAM;;GAEpD,gBAAgB,QAAQ;GACzB,CAAC;AAEF,gBAAc,kBAAkB;AAEhC,MAAI,kBAAkB,SACpB,QAAO;GAAE,UAAU,kBAAkB;GAAU;GAAa;;AAyBhE,QAAO;EAAE,UAnBY,MAAM,sBAAsB;GAC/C,kBAAkB,CAAC,QAAQ;GAC3B,MAAM,QAAQ,WAAW;IACvB,MAAM,eAAe,QAAQ,oBAAoB,UAAU;AAC3D,QAAI,aACF,QAAO,QAAQ,uBAAuB,aAAa;AAMrD,WAAO;;GAET,WAAW,QAAQ;GACnB,6BAA6B,OAAO;AAClC,WAAO,QAAQ,6BAA6B,MAAM;;GAErD,CAAC;EAE+B;EAAa"}
+{"version":3,"file":"app-page-probe.js","names":[],"sources":["../../src/server/app-page-probe.ts"],"sourcesContent":["import {\n  probeAppPageComponent,\n  probeAppPageLayouts,\n  type AppPageSpecialError,\n  type LayoutClassificationOptions,\n  type LayoutFlags,\n} from \"./app-page-execution.js\";\n\ntype ProbeAppPageBeforeRenderResult = {\n  response: Response | null;\n  layoutFlags: LayoutFlags;\n};\n\ntype ProbeAppPageBeforeRenderOptions = {\n  hasLoadingBoundary: boolean;\n  layoutCount: number;\n  probeLayoutAt: (layoutIndex: number) => unknown;\n  probePage: () => unknown;\n  renderLayoutSpecialError: (\n    specialError: AppPageSpecialError,\n    layoutIndex: number,\n  ) => Promise<Response>;\n  renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => AppPageSpecialError | null;\n  runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;\n  /** When provided, enables per-layout static/dynamic classification. */\n  classification?: LayoutClassificationOptions | null;\n};\n\nexport async function probeAppPageBeforeRender(\n  options: ProbeAppPageBeforeRenderOptions,\n): Promise<ProbeAppPageBeforeRenderResult> {\n  let layoutFlags: LayoutFlags = {};\n\n  // Layouts render before their children in Next.js, so layout-level special\n  // errors must be handled before probing the page component itself.\n  if (options.layoutCount > 0) {\n    const layoutProbeResult = await probeAppPageLayouts({\n      layoutCount: options.layoutCount,\n      async onLayoutError(layoutError, layoutIndex) {\n        const specialError = options.resolveSpecialError(layoutError);\n        if (!specialError) {\n          return null;\n        }\n\n        return options.renderLayoutSpecialError(specialError, layoutIndex);\n      },\n      probeLayoutAt: options.probeLayoutAt,\n      runWithSuppressedHookWarning(probe) {\n        return options.runWithSuppressedHookWarning(probe);\n      },\n      classification: options.classification,\n    });\n\n    layoutFlags = layoutProbeResult.layoutFlags;\n\n    if (layoutProbeResult.response) {\n      return { response: layoutProbeResult.response, layoutFlags };\n    }\n  }\n\n  // When a route-level loading.tsx is present, the page renders inside a\n  // route-level Suspense boundary, so a thrown redirect()/notFound() during\n  // page render becomes an error inside that boundary. We can't catch it\n  // here without serializing on the page promise — which would defeat the\n  // streaming benefit of loading.tsx for slow non-redirecting pages.\n  //\n  // Recovery for the redirect/notFound case happens later in\n  // renderAppPageLifecycle: rscErrorTracker captures the digest from React's\n  // onError callback, and a short race window after shell-ready lets the\n  // lifecycle swap the response to a 307/404 before bytes are flushed.\n  // This mirrors Next.js's \"until-first-byte-is-flushed\" swap behavior.\n  if (options.hasLoadingBoundary) {\n    return { response: null, layoutFlags };\n  }\n\n  // Server Components are functions, so we can probe the page ahead of stream\n  // creation and only turn special throws into immediate responses.\n  const pageResponse = await probeAppPageComponent({\n    awaitAsyncResult: true,\n    async onError(pageError) {\n      const specialError = options.resolveSpecialError(pageError);\n      if (specialError) {\n        return options.renderPageSpecialError(specialError);\n      }\n\n      // Non-special probe failures (for example use() outside React's render\n      // cycle or client references executing on the server) are expected here.\n      // The real RSC/SSR render path will surface those properly below.\n      return null;\n    },\n    probePage: options.probePage,\n    runWithSuppressedHookWarning(probe) {\n      return options.runWithSuppressedHookWarning(probe);\n    },\n  });\n\n  return { response: pageResponse, layoutFlags };\n}\n"],"mappings":";;AA6BA,eAAsB,yBACpB,SACyC;CACzC,IAAI,cAA2B,EAAE;AAIjC,KAAI,QAAQ,cAAc,GAAG;EAC3B,MAAM,oBAAoB,MAAM,oBAAoB;GAClD,aAAa,QAAQ;GACrB,MAAM,cAAc,aAAa,aAAa;IAC5C,MAAM,eAAe,QAAQ,oBAAoB,YAAY;AAC7D,QAAI,CAAC,aACH,QAAO;AAGT,WAAO,QAAQ,yBAAyB,cAAc,YAAY;;GAEpE,eAAe,QAAQ;GACvB,6BAA6B,OAAO;AAClC,WAAO,QAAQ,6BAA6B,MAAM;;GAEpD,gBAAgB,QAAQ;GACzB,CAAC;AAEF,gBAAc,kBAAkB;AAEhC,MAAI,kBAAkB,SACpB,QAAO;GAAE,UAAU,kBAAkB;GAAU;GAAa;;AAehE,KAAI,QAAQ,mBACV,QAAO;EAAE,UAAU;EAAM;EAAa;AAwBxC,QAAO;EAAE,UAnBY,MAAM,sBAAsB;GAC/C,kBAAkB;GAClB,MAAM,QAAQ,WAAW;IACvB,MAAM,eAAe,QAAQ,oBAAoB,UAAU;AAC3D,QAAI,aACF,QAAO,QAAQ,uBAAuB,aAAa;AAMrD,WAAO;;GAET,WAAW,QAAQ;GACnB,6BAA6B,OAAO;AAClC,WAAO,QAAQ,6BAA6B,MAAM;;GAErD,CAAC;EAE+B;EAAa"}

package/dist/server/app-page-render.d.ts

@@ -1,5 +1,5 @@
 import { CachedAppPageValue } from "../shims/cache.js";
-import { AppOutgoingElements } from "./app-elements.js";
+import { AppOutgoingElements } from "./app-elements-wire.js";
 import { AppPageFontPreload, AppPageSpecialError, LayoutClassificationOptions } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
@@ -8,9 +8,10 @@ import { ReactNode } from "react";
 //#region src/server/app-page-render.d.ts
 type AppPageBoundaryOnError = (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
 type AppPageDebugLogger = (event: string, detail: string) => void;
-type AppPageCacheSetter = (key: string, data: CachedAppPageValue, revalidateSeconds: number, tags: string[]) => Promise<void>;
+type AppPageCacheSetter = (key: string, data: CachedAppPageValue, revalidateSeconds: number, tags: string[], expireSeconds?: number) => Promise<void>;
 type AppPageRequestCacheLife = {
   revalidate?: number;
+  expire?: number;
 };
 type RenderAppPageLifecycleOptions = {
   cleanPathname: string;
@@ -24,12 +25,14 @@ type RenderAppPageLifecycleOptions = {
   getNavigationContext: () => unknown;
   getPageTags: () => string[];
   getRequestCacheLife: () => AppPageRequestCacheLife | null;
+  peekRequestCacheLife?: () => AppPageRequestCacheLife | null;
   getDraftModeCookieHeader: () => string | null | undefined;
   handlerStart: number;
   hasLoadingBoundary: boolean;
   isDynamicError: boolean;
   isForceDynamic: boolean;
   isForceStatic: boolean;
+  isPrerender?: boolean;
   isProduction: boolean;
   isRscRequest: boolean;
   isrDebug?: AppPageDebugLogger;
@@ -42,6 +45,7 @@ type RenderAppPageLifecycleOptions = {
   params: Record<string, unknown>;
   probeLayoutAt: (layoutIndex: number) => unknown;
   probePage: () => unknown;
+  expireSeconds?: number;
   revalidateSeconds: number | null;
   renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;
   renderLayoutSpecialError: (specialError: AppPageSpecialError, layoutIndex: number) => Promise<Response>;

package/dist/server/app-page-render.js

@@ -1,4 +1,6 @@
-import { buildOutgoingAppPayload } from "./app-elements.js";
+import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVersion } from "./artifact-compatibility.js";
+import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError } from "./app-page-stream.js";
 import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse } from "./app-page-cache.js";
 import { buildAppPageFontLinkHeader, readAppPageBinaryStream, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
@@ -14,6 +16,36 @@ function buildResponseTiming(options) {
 		responseKind: options.responseKind
 	};
 }
+function readRequestCacheLifeForPrerender(options) {
+	return options.peekRequestCacheLife?.() ?? options.getRequestCacheLife();
+}
+function applyRequestCacheLife(options) {
+	let revalidateSeconds = options.revalidateSeconds;
+	let expireSeconds = options.expireSeconds;
+	const requestCacheLife = options.requestCacheLife;
+	if (requestCacheLife?.revalidate !== void 0) revalidateSeconds = revalidateSeconds === null ? requestCacheLife.revalidate : Math.min(revalidateSeconds, requestCacheLife.revalidate);
+	if (requestCacheLife?.expire !== void 0) expireSeconds = requestCacheLife.expire;
+	return {
+		expireSeconds,
+		revalidateSeconds
+	};
+}
+function readRootBoundaryId(element) {
+	const rootLayoutTreePath = element[AppElementsWire.keys.rootLayout];
+	return typeof rootLayoutTreePath === "string" ? rootLayoutTreePath : null;
+}
+function createAppPageArtifactCompatibility(element, routePattern) {
+	if (!isAppElementsRecord(element)) return;
+	const rootBoundaryId = readRootBoundaryId(element);
+	return createArtifactCompatibilityEnvelope({
+		graphVersion: createArtifactCompatibilityGraphVersion({
+			routePattern,
+			rootBoundaryId
+		}),
+		deploymentVersion: process.env.__VINEXT_BUILD_ID ?? null,
+		rootBoundaryId
+	});
+}
 /**
 * Wraps an RSC response body to report invalid dynamic usage errors after the
 * stream is fully consumed. In dev mode, errors from cookies()/headers() inside
@@ -81,19 +113,31 @@ async function renderAppPageLifecycle(options) {
 	});
 	if (preRenderResult.response) return preRenderResult.response;
 	const layoutFlags = preRenderResult.layoutFlags;
-	const outgoingElement = buildOutgoingAppPayload({
+	const artifactCompatibility = createAppPageArtifactCompatibility(options.element, options.routePattern);
+	const outgoingElement = AppElementsWire.encodeOutgoingPayload({
 		element: options.element,
-		layoutFlags
+		layoutFlags,
+		...artifactCompatibility ? { artifactCompatibility } : {}
 	});
 	const compileEnd = options.isProduction ? void 0 : performance.now();
 	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(options.cleanPathname, options.routePattern));
 	const rscStream = options.renderToReadableStream(outgoingElement, { onError: rscErrorTracker.onRenderError });
 	let revalidateSeconds = options.revalidateSeconds;
-	const rscCapture = teeAppPageRscStreamForCapture(rscStream, options.isProduction && revalidateSeconds !== null && revalidateSeconds > 0 && revalidateSeconds !== Infinity && !options.isForceDynamic);
+	let expireSeconds = options.expireSeconds;
+	const shouldCaptureRscForCacheMetadata = (options.isProduction || options.isPrerender === true) && (revalidateSeconds === null || revalidateSeconds > 0 && revalidateSeconds !== Infinity) && !options.isForceDynamic;
+	const rscCapture = teeAppPageRscStreamForCapture(rscStream, shouldCaptureRscForCacheMetadata);
 	const rscForResponse = rscCapture.ssrStream;
 	const capturedRscDataRef = { value: null };
 	if (rscCapture.sideStream && options.isRscRequest) capturedRscDataRef.value = readAppPageBinaryStream(rscCapture.sideStream);
 	if (options.isRscRequest) {
+		if (options.isPrerender === true) {
+			await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);
+			({expireSeconds, revalidateSeconds} = applyRequestCacheLife({
+				expireSeconds,
+				requestCacheLife: readRequestCacheLifeForPrerender(options),
+				revalidateSeconds
+			}));
+		}
 		const dynamicUsedDuringBuild = options.consumeDynamicUsage();
 		const rscResponsePolicy = resolveAppPageRscResponsePolicy({
 			dynamicUsedDuringBuild,
@@ -101,6 +145,7 @@ async function renderAppPageLifecycle(options) {
 			isForceDynamic: options.isForceDynamic,
 			isForceStatic: options.isForceStatic,
 			isProduction: options.isProduction,
+			expireSeconds,
 			revalidateSeconds
 		});
 		const rscResponse = buildAppPageRscResponse(rscForResponse, {
@@ -116,18 +161,23 @@ async function renderAppPageLifecycle(options) {
 			})
 		});
 		return finalizeAppPageRscCacheResponse(!options.isProduction && rscResponse.body && options.consumeInvalidDynamicUsageError ? wrapRscResponseForDevErrorReporting(rscResponse, options.consumeInvalidDynamicUsageError) : rscResponse, {
-			capturedRscDataPromise: options.isProduction ? capturedRscDataRef.value : null,
+			capturedRscDataPromise: options.isProduction && shouldCaptureRscForCacheMetadata ? capturedRscDataRef.value : null,
 			cleanPathname: options.cleanPathname,
 			consumeDynamicUsage: options.consumeDynamicUsage,
 			dynamicUsedDuringBuild,
 			getPageTags() {
 				return options.getPageTags();
 			},
+			getRequestCacheLife() {
+				return options.getRequestCacheLife();
+			},
 			isrDebug: options.isrDebug,
 			isrRscKey: options.isrRscKey,
 			isrSet: options.isrSet,
 			mountedSlotsHeader: options.mountedSlotsHeader,
-			revalidateSeconds: revalidateSeconds ?? 0,
+			preserveClientResponseHeaders: rscResponsePolicy.cacheState !== "MISS",
+			expireSeconds,
+			revalidateSeconds,
 			waitUntil(promise) {
 				options.waitUntil?.(promise);
 			}
@@ -167,6 +217,16 @@ async function renderAppPageLifecycle(options) {
 	if (htmlRender.response) return htmlRender.response;
 	const htmlStream = htmlRender.htmlStream;
 	if (!htmlStream) throw new Error("[vinext] Expected an HTML stream when no fallback response was returned");
+	if (options.hasLoadingBoundary) {
+		const captured = rscErrorTracker.getCapturedSpecialError();
+		if (captured) {
+			const specialError = resolveAppPageSpecialError(captured);
+			if (specialError) {
+				htmlStream.cancel().catch(() => {});
+				return options.renderPageSpecialError(specialError);
+			}
+		}
+	}
 	if (shouldRerenderAppPageWithGlobalError({
 		capturedError: rscErrorTracker.getCapturedError(),
 		hasLocalBoundary: options.routeHasLocalBoundary
@@ -174,11 +234,19 @@ async function renderAppPageLifecycle(options) {
 		const cleanResponse = await options.renderErrorBoundaryResponse(rscErrorTracker.getCapturedError());
 		if (cleanResponse) return cleanResponse;
 	}
+	if (options.isPrerender === true) {
+		await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);
+		({expireSeconds, revalidateSeconds} = applyRequestCacheLife({
+			expireSeconds,
+			requestCacheLife: readRequestCacheLifeForPrerender(options),
+			revalidateSeconds
+		}));
+	}
 	const draftCookie = options.getDraftModeCookieHeader();
 	const dynamicUsedDuringRender = options.consumeDynamicUsage();
-	const requestCacheLife = options.getRequestCacheLife();
-	if (requestCacheLife?.revalidate !== void 0 && revalidateSeconds === null) revalidateSeconds = requestCacheLife.revalidate;
+	let dynamicUsedBeforeContextCleanup = dynamicUsedDuringRender;
 	const safeHtmlStream = deferUntilStreamConsumed(htmlStream, () => {
+		dynamicUsedBeforeContextCleanup = dynamicUsedBeforeContextCleanup || options.consumeDynamicUsage();
 		options.clearRequestContext();
 	});
 	const htmlResponsePolicy = resolveAppPageHtmlResponsePolicy({
@@ -188,6 +256,7 @@ async function renderAppPageLifecycle(options) {
 		isForceDynamic: options.isForceDynamic,
 		isForceStatic: options.isForceStatic,
 		isProduction: options.isProduction,
+		expireSeconds,
 		revalidateSeconds
 	});
 	const htmlResponseTiming = buildResponseTiming({
@@ -197,28 +266,41 @@ async function renderAppPageLifecycle(options) {
 		renderEnd,
 		responseKind: "html"
 	});
-	if (htmlResponsePolicy.shouldWriteToCache) return finalizeAppPageHtmlCacheResponse(buildAppPageHtmlResponse(safeHtmlStream, {
-		draftCookie,
-		fontLinkHeader,
-		middlewareContext: options.middlewareContext,
-		policy: htmlResponsePolicy,
-		timing: htmlResponseTiming
-	}), {
-		capturedRscDataPromise: capturedRscDataRef.value,
-		cleanPathname: options.cleanPathname,
-		consumeDynamicUsage: options.consumeDynamicUsage,
-		getPageTags() {
-			return options.getPageTags();
-		},
-		isrDebug: options.isrDebug,
-		isrHtmlKey: options.isrHtmlKey,
-		isrRscKey: options.isrRscKey,
-		isrSet: options.isrSet,
-		revalidateSeconds: revalidateSeconds ?? 0,
-		waitUntil(cachePromise) {
-			options.waitUntil?.(cachePromise);
-		}
-	});
+	const shouldSpeculativelyWriteCache = options.isProduction && shouldCaptureRscForCacheMetadata && revalidateSeconds === null && !options.isDynamicError && !options.isForceStatic && !options.scriptNonce && !dynamicUsedDuringRender;
+	if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {
+		const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {
+			draftCookie,
+			fontLinkHeader,
+			middlewareContext: options.middlewareContext,
+			policy: htmlResponsePolicy,
+			timing: htmlResponseTiming
+		});
+		if (options.isPrerender === true) return isrResponse;
+		return finalizeAppPageHtmlCacheResponse(isrResponse, {
+			capturedDynamicUsageBeforeContextCleanup() {
+				return dynamicUsedBeforeContextCleanup;
+			},
+			capturedRscDataPromise: capturedRscDataRef.value,
+			cleanPathname: options.cleanPathname,
+			consumeDynamicUsage: options.consumeDynamicUsage,
+			getPageTags() {
+				return options.getPageTags();
+			},
+			getRequestCacheLife() {
+				return options.getRequestCacheLife();
+			},
+			isrDebug: options.isrDebug,
+			isrHtmlKey: options.isrHtmlKey,
+			isrRscKey: options.isrRscKey,
+			isrSet: options.isrSet,
+			preserveClientResponseHeaders: !htmlResponsePolicy.shouldWriteToCache,
+			expireSeconds,
+			revalidateSeconds,
+			waitUntil(cachePromise) {
+				options.waitUntil?.(cachePromise);
+			}
+		});
+	}
 	return buildAppPageHtmlResponse(safeHtmlStream, {
 		draftCookie,
 		fontLinkHeader,
@@ -227,6 +309,12 @@ async function renderAppPageLifecycle(options) {
 		timing: htmlResponseTiming
 	});
 }
+async function settleCapturedRscRenderForCacheMetadata(capturedRscDataPromise) {
+	if (!capturedRscDataPromise) return;
+	try {
+		await capturedRscDataPromise;
+	} catch {}
+}
 //#endregion
 export { renderAppPageLifecycle };
 

package/dist/server/app-page-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-render.js","names":[],"sources":["../../src/server/app-page-render.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport type { CachedAppPageValue } from \"vinext/shims/cache\";\nimport { buildOutgoingAppPayload, type AppOutgoingElements } from \"./app-elements.js\";\nimport {\n  finalizeAppPageHtmlCacheResponse,\n  finalizeAppPageRscCacheResponse,\n} from \"./app-page-cache.js\";\nimport {\n  buildAppPageFontLinkHeader,\n  readAppPageBinaryStream,\n  resolveAppPageSpecialError,\n  teeAppPageRscStreamForCapture,\n  type AppPageFontPreload,\n  type AppPageSpecialError,\n  type LayoutClassificationOptions,\n} from \"./app-page-execution.js\";\nimport { probeAppPageBeforeRender } from \"./app-page-probe.js\";\nimport {\n  buildAppPageHtmlResponse,\n  buildAppPageRscResponse,\n  resolveAppPageHtmlResponsePolicy,\n  resolveAppPageRscResponsePolicy,\n  type AppPageMiddlewareContext,\n  type AppPageResponseTiming,\n} from \"./app-page-response.js\";\nimport {\n  createAppPageFontData,\n  createAppPageRscErrorTracker,\n  deferUntilStreamConsumed,\n  renderAppPageHtmlStream,\n  renderAppPageHtmlStreamWithRecovery,\n  shouldRerenderAppPageWithGlobalError,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\ntype AppPageDebugLogger = (event: string, detail: string) => void;\ntype AppPageCacheSetter = (\n  key: string,\n  data: CachedAppPageValue,\n  revalidateSeconds: number,\n  tags: string[],\n) => Promise<void>;\n\ntype AppPageRequestCacheLife = {\n  revalidate?: number;\n};\n\ntype RenderAppPageLifecycleOptions = {\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  consumeDynamicUsage: () => boolean;\n  /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */\n  consumeInvalidDynamicUsageError?: () => unknown;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  getPageTags: () => string[];\n  getRequestCacheLife: () => AppPageRequestCacheLife | null;\n  getDraftModeCookieHeader: () => string | null | undefined;\n  handlerStart: number;\n  hasLoadingBoundary: boolean;\n  isDynamicError: boolean;\n  isForceDynamic: boolean;\n  isForceStatic: boolean;\n  isProduction: boolean;\n  isRscRequest: boolean;\n  isrDebug?: AppPageDebugLogger;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  layoutCount: number;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  middlewareContext: AppPageMiddlewareContext;\n  params: Record<string, unknown>;\n  probeLayoutAt: (layoutIndex: number) => unknown;\n  probePage: () => unknown;\n  revalidateSeconds: number | null;\n  renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;\n  renderLayoutSpecialError: (\n    specialError: AppPageSpecialError,\n    layoutIndex: number,\n  ) => Promise<Response>;\n  renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  renderToReadableStream: (\n    element: ReactNode | AppOutgoingElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  routeHasLocalBoundary: boolean;\n  routePattern: string;\n  runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;\n  scriptNonce?: string;\n  mountedSlotsHeader?: string | null;\n  waitUntil?: (promise: Promise<void>) => void;\n  element: ReactNode | Readonly<Record<string, ReactNode>>;\n  classification?: LayoutClassificationOptions | null;\n};\n\nfunction buildResponseTiming(\n  options: Pick<RenderAppPageLifecycleOptions, \"handlerStart\" | \"isProduction\"> & {\n    compileEnd?: number;\n    renderEnd?: number;\n    responseKind: AppPageResponseTiming[\"responseKind\"];\n  },\n): AppPageResponseTiming | undefined {\n  if (options.isProduction) {\n    return undefined;\n  }\n\n  return {\n    compileEnd: options.compileEnd,\n    handlerStart: options.handlerStart,\n    renderEnd: options.renderEnd,\n    responseKind: options.responseKind,\n  };\n}\n\n/**\n * Wraps an RSC response body to report invalid dynamic usage errors after the\n * stream is fully consumed. In dev mode, errors from cookies()/headers() inside\n * \"use cache\" may be caught by user try/catch and silently swallowed — this\n * wrapper waits for the stream to drain and surfaces any recorded error to the\n * terminal (and, via HMR, the browser dev overlay).\n * Ported from Next.js: https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689\n */\nfunction wrapRscResponseForDevErrorReporting(\n  response: Response,\n  consumeInvalidDynamicUsageError: () => unknown,\n): Response {\n  const originalBody = response.body;\n  if (!originalBody) return response;\n\n  let consumed = false;\n  const onConsumed = () => {\n    if (consumed) return;\n    consumed = true;\n    const error = consumeInvalidDynamicUsageError();\n    if (error) {\n      console.error(\"[vinext] Invalid dynamic usage:\", error);\n    }\n  };\n\n  const cleanup = new TransformStream<Uint8Array, Uint8Array>({\n    flush() {\n      onConsumed();\n    },\n  });\n\n  const piped = originalBody.pipeThrough(cleanup);\n  const reader = piped.getReader();\n  const wrappedStream = new ReadableStream<Uint8Array>({\n    pull(controller) {\n      return reader.read().then(\n        ({ done, value }) => {\n          if (done) {\n            controller.close();\n          } else {\n            controller.enqueue(value);\n          }\n        },\n        (streamError) => {\n          onConsumed();\n          controller.error(streamError);\n        },\n      );\n    },\n    cancel(reason) {\n      onConsumed();\n      return reader.cancel(reason);\n    },\n  });\n\n  return new Response(wrappedStream, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: response.headers,\n  });\n}\n\nexport async function renderAppPageLifecycle(\n  options: RenderAppPageLifecycleOptions,\n): Promise<Response> {\n  const preRenderResult = await probeAppPageBeforeRender({\n    hasLoadingBoundary: options.hasLoadingBoundary,\n    layoutCount: options.layoutCount,\n    probeLayoutAt(layoutIndex) {\n      return options.probeLayoutAt(layoutIndex);\n    },\n    probePage() {\n      return options.probePage();\n    },\n    renderLayoutSpecialError(specialError, layoutIndex) {\n      return options.renderLayoutSpecialError(specialError, layoutIndex);\n    },\n    renderPageSpecialError(specialError) {\n      return options.renderPageSpecialError(specialError);\n    },\n    resolveSpecialError: resolveAppPageSpecialError,\n    runWithSuppressedHookWarning(probe) {\n      return options.runWithSuppressedHookWarning(probe);\n    },\n    classification: options.classification,\n  });\n  if (preRenderResult.response) {\n    return preRenderResult.response;\n  }\n\n  const layoutFlags = preRenderResult.layoutFlags;\n\n  // Render the CANONICAL element. The outgoing payload carries per-layout\n  // static/dynamic flags under `__layoutFlags` so the client can later tell\n  // which layouts are safe to skip on subsequent navigations.\n  const outgoingElement = buildOutgoingAppPayload({\n    element: options.element,\n    layoutFlags,\n  });\n\n  const compileEnd = options.isProduction ? undefined : performance.now();\n  const baseOnError = options.createRscOnErrorHandler(options.cleanPathname, options.routePattern);\n  const rscErrorTracker = createAppPageRscErrorTracker(baseOnError);\n  const rscStream = options.renderToReadableStream(outgoingElement, {\n    onError: rscErrorTracker.onRenderError,\n  });\n\n  let revalidateSeconds = options.revalidateSeconds;\n  const rscCapture = teeAppPageRscStreamForCapture(\n    rscStream,\n    options.isProduction &&\n      revalidateSeconds !== null &&\n      revalidateSeconds > 0 &&\n      revalidateSeconds !== Infinity &&\n      !options.isForceDynamic,\n  );\n  const rscForResponse = rscCapture.ssrStream;\n\n  // When the fused tee (#981) is active, the sideStream carries both the embed\n  // transform AND the raw RSC byte accumulation. For RSC requests, we consume\n  // the sideStream directly. For HTML requests, handleSsr creates an embed\n  // transform from it and fills capturedRscDataRef. The ref object is threaded\n  // through so .value is read lazily after handleSsr completes.\n  const capturedRscDataRef: { value: Promise<ArrayBuffer> | null } = { value: null };\n  if (rscCapture.sideStream && options.isRscRequest) {\n    capturedRscDataRef.value = readAppPageBinaryStream(rscCapture.sideStream);\n  }\n\n  if (options.isRscRequest) {\n    const dynamicUsedDuringBuild = options.consumeDynamicUsage();\n    const rscResponsePolicy = resolveAppPageRscResponsePolicy({\n      dynamicUsedDuringBuild,\n      isDynamicError: options.isDynamicError,\n      isForceDynamic: options.isForceDynamic,\n      isForceStatic: options.isForceStatic,\n      isProduction: options.isProduction,\n      revalidateSeconds,\n    });\n    const rscResponse = buildAppPageRscResponse(rscForResponse, {\n      middlewareContext: options.middlewareContext,\n      mountedSlotsHeader: options.mountedSlotsHeader,\n      params: options.params,\n      policy: rscResponsePolicy,\n      timing: buildResponseTiming({\n        compileEnd,\n        handlerStart: options.handlerStart,\n        isProduction: options.isProduction,\n        responseKind: \"rsc\",\n      }),\n    });\n\n    // In dev mode, wrap the RSC response body to forward invalid dynamic usage\n    // errors after the stream is consumed. This mirrors Next.js behavior where\n    // workStore.invalidDynamicUsageError is checked after the accumulated chunks\n    // promise resolves (app-render.tsx generateDynamicFlightRenderResultWithStagesInDev).\n    // Ported from Next.js: https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689\n    //\n    // Note: This only covers RSC responses (client-side navigations). The HTML path\n    // (initial page loads) intentionally defers this coverage — the error is still\n    // thrown through the RSC pipeline and captured by rscErrorTracker.onRenderError\n    // if uncaught by user code. Full parity with Next.js would require checking\n    // invalidDynamicUsageError after SSR rendering, which is deferred as out of scope\n    // for this PR focused on client-side navigations.\n    const devRscResponse =\n      !options.isProduction && rscResponse.body && options.consumeInvalidDynamicUsageError\n        ? wrapRscResponseForDevErrorReporting(rscResponse, options.consumeInvalidDynamicUsageError)\n        : rscResponse;\n\n    return finalizeAppPageRscCacheResponse(devRscResponse, {\n      capturedRscDataPromise: options.isProduction ? capturedRscDataRef.value : null,\n      cleanPathname: options.cleanPathname,\n      consumeDynamicUsage: options.consumeDynamicUsage,\n      dynamicUsedDuringBuild,\n      getPageTags() {\n        return options.getPageTags();\n      },\n      isrDebug: options.isrDebug,\n      isrRscKey: options.isrRscKey,\n      isrSet: options.isrSet,\n      mountedSlotsHeader: options.mountedSlotsHeader,\n      revalidateSeconds: revalidateSeconds ?? 0,\n      waitUntil(promise) {\n        options.waitUntil?.(promise);\n      },\n    });\n  }\n\n  const fontData = createAppPageFontData({\n    getLinks: options.getFontLinks,\n    getPreloads: options.getFontPreloads,\n    getStyles: options.getFontStyles,\n  });\n  const fontLinkHeader = buildAppPageFontLinkHeader(fontData.preloads);\n  let renderEnd: number | undefined;\n\n  const htmlRender = await renderAppPageHtmlStreamWithRecovery({\n    onShellRendered() {\n      if (!options.isProduction) {\n        renderEnd = performance.now();\n      }\n    },\n    renderErrorBoundaryResponse(error) {\n      return options.renderErrorBoundaryResponse(error);\n    },\n    async renderHtmlStream() {\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlStream({\n        capturedRscDataRef,\n        fontData,\n        navigationContext: options.getNavigationContext(),\n        rscStream: rscForResponse,\n        scriptNonce: options.scriptNonce,\n        sideStream: rscCapture.sideStream,\n        ssrHandler,\n      });\n    },\n    renderSpecialErrorResponse(specialError) {\n      return options.renderPageSpecialError(specialError);\n    },\n    resolveSpecialError: resolveAppPageSpecialError,\n  });\n  if (htmlRender.response) {\n    return htmlRender.response;\n  }\n  const htmlStream = htmlRender.htmlStream;\n  if (!htmlStream) {\n    throw new Error(\"[vinext] Expected an HTML stream when no fallback response was returned\");\n  }\n\n  if (\n    shouldRerenderAppPageWithGlobalError({\n      capturedError: rscErrorTracker.getCapturedError(),\n      hasLocalBoundary: options.routeHasLocalBoundary,\n    })\n  ) {\n    const cleanResponse = await options.renderErrorBoundaryResponse(\n      rscErrorTracker.getCapturedError(),\n    );\n    if (cleanResponse) {\n      return cleanResponse;\n    }\n  }\n\n  // Eagerly read values that must be captured before the stream is consumed.\n  const draftCookie = options.getDraftModeCookieHeader();\n  const dynamicUsedDuringRender = options.consumeDynamicUsage();\n  const requestCacheLife = options.getRequestCacheLife();\n  if (requestCacheLife?.revalidate !== undefined && revalidateSeconds === null) {\n    revalidateSeconds = requestCacheLife.revalidate;\n  }\n\n  // Defer clearRequestContext() until the HTML stream is fully consumed by the\n  // HTTP layer. The RSC/SSR pipeline is lazy — Server Components execute while\n  // the response body is being pulled, not when the stream handle is returned.\n  // Clearing the context synchronously here would race those executions, causing\n  // headers()/cookies() to see a null context on warm (module-cached) requests.\n  // See: https://github.com/cloudflare/vinext/issues/660\n  const safeHtmlStream = deferUntilStreamConsumed(htmlStream, () => {\n    options.clearRequestContext();\n  });\n\n  const htmlResponsePolicy = resolveAppPageHtmlResponsePolicy({\n    dynamicUsedDuringRender,\n    hasScriptNonce: Boolean(options.scriptNonce),\n    isDynamicError: options.isDynamicError,\n    isForceDynamic: options.isForceDynamic,\n    isForceStatic: options.isForceStatic,\n    isProduction: options.isProduction,\n    revalidateSeconds,\n  });\n  const htmlResponseTiming = buildResponseTiming({\n    compileEnd,\n    handlerStart: options.handlerStart,\n    isProduction: options.isProduction,\n    renderEnd,\n    responseKind: \"html\",\n  });\n\n  if (htmlResponsePolicy.shouldWriteToCache) {\n    const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {\n      draftCookie,\n      fontLinkHeader,\n      middlewareContext: options.middlewareContext,\n      policy: htmlResponsePolicy,\n      timing: htmlResponseTiming,\n    });\n    return finalizeAppPageHtmlCacheResponse(isrResponse, {\n      capturedRscDataPromise: capturedRscDataRef.value,\n      cleanPathname: options.cleanPathname,\n      consumeDynamicUsage: options.consumeDynamicUsage,\n      getPageTags() {\n        return options.getPageTags();\n      },\n      isrDebug: options.isrDebug,\n      isrHtmlKey: options.isrHtmlKey,\n      isrRscKey: options.isrRscKey,\n      isrSet: options.isrSet,\n      revalidateSeconds: revalidateSeconds ?? 0,\n      waitUntil(cachePromise) {\n        options.waitUntil?.(cachePromise);\n      },\n    });\n  }\n\n  return buildAppPageHtmlResponse(safeHtmlStream, {\n    draftCookie,\n    fontLinkHeader,\n    middlewareContext: options.middlewareContext,\n    policy: htmlResponsePolicy,\n    timing: htmlResponseTiming,\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-render.js","names":[],"sources":["../../src/server/app-page-render.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport type { CachedAppPageValue } from \"vinext/shims/cache\";\nimport { AppElementsWire, isAppElementsRecord, type AppOutgoingElements } from \"./app-elements.js\";\nimport {\n  finalizeAppPageHtmlCacheResponse,\n  finalizeAppPageRscCacheResponse,\n} from \"./app-page-cache.js\";\nimport {\n  buildAppPageFontLinkHeader,\n  readAppPageBinaryStream,\n  resolveAppPageSpecialError,\n  teeAppPageRscStreamForCapture,\n  type AppPageFontPreload,\n  type AppPageSpecialError,\n  type LayoutClassificationOptions,\n} from \"./app-page-execution.js\";\nimport { probeAppPageBeforeRender } from \"./app-page-probe.js\";\nimport {\n  buildAppPageHtmlResponse,\n  buildAppPageRscResponse,\n  resolveAppPageHtmlResponsePolicy,\n  resolveAppPageRscResponsePolicy,\n  type AppPageMiddlewareContext,\n  type AppPageResponseTiming,\n} from \"./app-page-response.js\";\nimport {\n  createAppPageFontData,\n  createAppPageRscErrorTracker,\n  deferUntilStreamConsumed,\n  renderAppPageHtmlStream,\n  renderAppPageHtmlStreamWithRecovery,\n  shouldRerenderAppPageWithGlobalError,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport {\n  createArtifactCompatibilityEnvelope,\n  createArtifactCompatibilityGraphVersion,\n  type ArtifactCompatibilityEnvelope,\n} from \"./artifact-compatibility.js\";\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\ntype AppPageDebugLogger = (event: string, detail: string) => void;\ntype AppPageCacheSetter = (\n  key: string,\n  data: CachedAppPageValue,\n  revalidateSeconds: number,\n  tags: string[],\n  expireSeconds?: number,\n) => Promise<void>;\n\ntype AppPageRequestCacheLife = {\n  revalidate?: number;\n  expire?: number;\n};\n\ntype RenderAppPageLifecycleOptions = {\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  consumeDynamicUsage: () => boolean;\n  /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */\n  consumeInvalidDynamicUsageError?: () => unknown;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  getPageTags: () => string[];\n  getRequestCacheLife: () => AppPageRequestCacheLife | null;\n  peekRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  getDraftModeCookieHeader: () => string | null | undefined;\n  handlerStart: number;\n  hasLoadingBoundary: boolean;\n  isDynamicError: boolean;\n  isForceDynamic: boolean;\n  isForceStatic: boolean;\n  isPrerender?: boolean;\n  isProduction: boolean;\n  isRscRequest: boolean;\n  isrDebug?: AppPageDebugLogger;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  layoutCount: number;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  middlewareContext: AppPageMiddlewareContext;\n  params: Record<string, unknown>;\n  probeLayoutAt: (layoutIndex: number) => unknown;\n  probePage: () => unknown;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;\n  renderLayoutSpecialError: (\n    specialError: AppPageSpecialError,\n    layoutIndex: number,\n  ) => Promise<Response>;\n  renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  renderToReadableStream: (\n    element: ReactNode | AppOutgoingElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  routeHasLocalBoundary: boolean;\n  routePattern: string;\n  runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;\n  scriptNonce?: string;\n  mountedSlotsHeader?: string | null;\n  waitUntil?: (promise: Promise<void>) => void;\n  element: ReactNode | Readonly<Record<string, ReactNode>>;\n  classification?: LayoutClassificationOptions | null;\n};\n\nfunction buildResponseTiming(\n  options: Pick<RenderAppPageLifecycleOptions, \"handlerStart\" | \"isProduction\"> & {\n    compileEnd?: number;\n    renderEnd?: number;\n    responseKind: AppPageResponseTiming[\"responseKind\"];\n  },\n): AppPageResponseTiming | undefined {\n  if (options.isProduction) {\n    return undefined;\n  }\n\n  return {\n    compileEnd: options.compileEnd,\n    handlerStart: options.handlerStart,\n    renderEnd: options.renderEnd,\n    responseKind: options.responseKind,\n  };\n}\n\nfunction readRequestCacheLifeForPrerender(\n  options: Pick<RenderAppPageLifecycleOptions, \"getRequestCacheLife\" | \"peekRequestCacheLife\">,\n): AppPageRequestCacheLife | null {\n  // Prefer the non-destructive reader so prerender.ts can consume metadata\n  // after the handler returns. The consume fallback supports older entry glue\n  // and is only safe because this path reads at most once per prerender.\n  return options.peekRequestCacheLife?.() ?? options.getRequestCacheLife();\n}\n\nfunction applyRequestCacheLife(options: {\n  expireSeconds?: number;\n  requestCacheLife: AppPageRequestCacheLife | null;\n  revalidateSeconds: number | null;\n}): { expireSeconds?: number; revalidateSeconds: number | null } {\n  let revalidateSeconds = options.revalidateSeconds;\n  let expireSeconds = options.expireSeconds;\n  const requestCacheLife = options.requestCacheLife;\n\n  if (requestCacheLife?.revalidate !== undefined) {\n    revalidateSeconds =\n      revalidateSeconds === null\n        ? requestCacheLife.revalidate\n        : Math.min(revalidateSeconds, requestCacheLife.revalidate);\n  }\n  if (requestCacheLife?.expire !== undefined) {\n    // cacheLife() supplies the effective hard-expire ceiling for this render,\n    // so it replaces the config fallback instead of min-merging with it.\n    expireSeconds = requestCacheLife.expire;\n  }\n\n  return { expireSeconds, revalidateSeconds };\n}\n\nfunction readRootBoundaryId(element: Readonly<Record<string, unknown>>): string | null {\n  const rootLayoutTreePath = element[AppElementsWire.keys.rootLayout];\n  return typeof rootLayoutTreePath === \"string\" ? rootLayoutTreePath : null;\n}\n\nfunction createAppPageArtifactCompatibility(\n  element: ReactNode | Readonly<Record<string, ReactNode>>,\n  routePattern: string,\n): ArtifactCompatibilityEnvelope | undefined {\n  if (!isAppElementsRecord(element)) {\n    return undefined;\n  }\n\n  const rootBoundaryId = readRootBoundaryId(element);\n  return createArtifactCompatibilityEnvelope({\n    graphVersion: createArtifactCompatibilityGraphVersion({\n      routePattern,\n      rootBoundaryId,\n    }),\n    deploymentVersion: process.env.__VINEXT_BUILD_ID ?? null,\n    rootBoundaryId,\n  });\n}\n\n/**\n * Wraps an RSC response body to report invalid dynamic usage errors after the\n * stream is fully consumed. In dev mode, errors from cookies()/headers() inside\n * \"use cache\" may be caught by user try/catch and silently swallowed — this\n * wrapper waits for the stream to drain and surfaces any recorded error to the\n * terminal (and, via HMR, the browser dev overlay).\n * Ported from Next.js: https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689\n */\nfunction wrapRscResponseForDevErrorReporting(\n  response: Response,\n  consumeInvalidDynamicUsageError: () => unknown,\n): Response {\n  const originalBody = response.body;\n  if (!originalBody) return response;\n\n  let consumed = false;\n  const onConsumed = () => {\n    if (consumed) return;\n    consumed = true;\n    const error = consumeInvalidDynamicUsageError();\n    if (error) {\n      console.error(\"[vinext] Invalid dynamic usage:\", error);\n    }\n  };\n\n  const cleanup = new TransformStream<Uint8Array, Uint8Array>({\n    flush() {\n      onConsumed();\n    },\n  });\n\n  const piped = originalBody.pipeThrough(cleanup);\n  const reader = piped.getReader();\n  const wrappedStream = new ReadableStream<Uint8Array>({\n    pull(controller) {\n      return reader.read().then(\n        ({ done, value }) => {\n          if (done) {\n            controller.close();\n          } else {\n            controller.enqueue(value);\n          }\n        },\n        (streamError) => {\n          onConsumed();\n          controller.error(streamError);\n        },\n      );\n    },\n    cancel(reason) {\n      onConsumed();\n      return reader.cancel(reason);\n    },\n  });\n\n  return new Response(wrappedStream, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: response.headers,\n  });\n}\n\nexport async function renderAppPageLifecycle(\n  options: RenderAppPageLifecycleOptions,\n): Promise<Response> {\n  const preRenderResult = await probeAppPageBeforeRender({\n    hasLoadingBoundary: options.hasLoadingBoundary,\n    layoutCount: options.layoutCount,\n    probeLayoutAt(layoutIndex) {\n      return options.probeLayoutAt(layoutIndex);\n    },\n    probePage() {\n      return options.probePage();\n    },\n    renderLayoutSpecialError(specialError, layoutIndex) {\n      return options.renderLayoutSpecialError(specialError, layoutIndex);\n    },\n    renderPageSpecialError(specialError) {\n      return options.renderPageSpecialError(specialError);\n    },\n    resolveSpecialError: resolveAppPageSpecialError,\n    runWithSuppressedHookWarning(probe) {\n      return options.runWithSuppressedHookWarning(probe);\n    },\n    classification: options.classification,\n  });\n  if (preRenderResult.response) {\n    return preRenderResult.response;\n  }\n\n  const layoutFlags = preRenderResult.layoutFlags;\n\n  // Render the CANONICAL element. The outgoing payload carries per-layout\n  // static/dynamic flags under `__layoutFlags` so the client can later tell\n  // which layouts are safe to skip on subsequent navigations.\n  const artifactCompatibility = createAppPageArtifactCompatibility(\n    options.element,\n    options.routePattern,\n  );\n  const outgoingElement = AppElementsWire.encodeOutgoingPayload({\n    element: options.element,\n    layoutFlags,\n    ...(artifactCompatibility ? { artifactCompatibility } : {}),\n  });\n\n  const compileEnd = options.isProduction ? undefined : performance.now();\n  const baseOnError = options.createRscOnErrorHandler(options.cleanPathname, options.routePattern);\n  const rscErrorTracker = createAppPageRscErrorTracker(baseOnError);\n  const rscStream = options.renderToReadableStream(outgoingElement, {\n    onError: rscErrorTracker.onRenderError,\n  });\n\n  let revalidateSeconds = options.revalidateSeconds;\n  let expireSeconds = options.expireSeconds;\n  const shouldCaptureRscForCacheMetadata =\n    (options.isProduction || options.isPrerender === true) &&\n    (revalidateSeconds === null || (revalidateSeconds > 0 && revalidateSeconds !== Infinity)) &&\n    !options.isForceDynamic;\n  const rscCapture = teeAppPageRscStreamForCapture(rscStream, shouldCaptureRscForCacheMetadata);\n  const rscForResponse = rscCapture.ssrStream;\n\n  // When the fused tee (#981) is active, the sideStream carries both the embed\n  // transform AND the raw RSC byte accumulation. For RSC requests, we consume\n  // the sideStream directly. For HTML requests, handleSsr creates an embed\n  // transform from it and fills capturedRscDataRef. The ref object is threaded\n  // through so .value is read lazily after handleSsr completes.\n  const capturedRscDataRef: { value: Promise<ArrayBuffer> | null } = { value: null };\n  if (rscCapture.sideStream && options.isRscRequest) {\n    capturedRscDataRef.value = readAppPageBinaryStream(rscCapture.sideStream);\n  }\n\n  if (options.isRscRequest) {\n    if (options.isPrerender === true) {\n      await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);\n      ({ expireSeconds, revalidateSeconds } = applyRequestCacheLife({\n        expireSeconds,\n        requestCacheLife: readRequestCacheLifeForPrerender(options),\n        revalidateSeconds,\n      }));\n    }\n\n    const dynamicUsedDuringBuild = options.consumeDynamicUsage();\n    const rscResponsePolicy = resolveAppPageRscResponsePolicy({\n      dynamicUsedDuringBuild,\n      isDynamicError: options.isDynamicError,\n      isForceDynamic: options.isForceDynamic,\n      isForceStatic: options.isForceStatic,\n      isProduction: options.isProduction,\n      expireSeconds,\n      revalidateSeconds,\n    });\n    const rscResponse = buildAppPageRscResponse(rscForResponse, {\n      middlewareContext: options.middlewareContext,\n      mountedSlotsHeader: options.mountedSlotsHeader,\n      params: options.params,\n      policy: rscResponsePolicy,\n      timing: buildResponseTiming({\n        compileEnd,\n        handlerStart: options.handlerStart,\n        isProduction: options.isProduction,\n        responseKind: \"rsc\",\n      }),\n    });\n\n    // In dev mode, wrap the RSC response body to forward invalid dynamic usage\n    // errors after the stream is consumed. This mirrors Next.js behavior where\n    // workStore.invalidDynamicUsageError is checked after the accumulated chunks\n    // promise resolves (app-render.tsx generateDynamicFlightRenderResultWithStagesInDev).\n    // Ported from Next.js: https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689\n    //\n    // Note: This only covers RSC responses (client-side navigations). The HTML path\n    // (initial page loads) intentionally defers this coverage — the error is still\n    // thrown through the RSC pipeline and captured by rscErrorTracker.onRenderError\n    // if uncaught by user code. Full parity with Next.js would require checking\n    // invalidDynamicUsageError after SSR rendering, which is deferred as out of scope\n    // for this PR focused on client-side navigations.\n    const devRscResponse =\n      !options.isProduction && rscResponse.body && options.consumeInvalidDynamicUsageError\n        ? wrapRscResponseForDevErrorReporting(rscResponse, options.consumeInvalidDynamicUsageError)\n        : rscResponse;\n\n    return finalizeAppPageRscCacheResponse(devRscResponse, {\n      capturedRscDataPromise:\n        options.isProduction && shouldCaptureRscForCacheMetadata ? capturedRscDataRef.value : null,\n      cleanPathname: options.cleanPathname,\n      consumeDynamicUsage: options.consumeDynamicUsage,\n      dynamicUsedDuringBuild,\n      getPageTags() {\n        return options.getPageTags();\n      },\n      getRequestCacheLife() {\n        return options.getRequestCacheLife();\n      },\n      isrDebug: options.isrDebug,\n      isrRscKey: options.isrRscKey,\n      isrSet: options.isrSet,\n      mountedSlotsHeader: options.mountedSlotsHeader,\n      preserveClientResponseHeaders: rscResponsePolicy.cacheState !== \"MISS\",\n      expireSeconds,\n      revalidateSeconds,\n      waitUntil(promise) {\n        options.waitUntil?.(promise);\n      },\n    });\n  }\n\n  const fontData = createAppPageFontData({\n    getLinks: options.getFontLinks,\n    getPreloads: options.getFontPreloads,\n    getStyles: options.getFontStyles,\n  });\n  const fontLinkHeader = buildAppPageFontLinkHeader(fontData.preloads);\n  let renderEnd: number | undefined;\n\n  const htmlRender = await renderAppPageHtmlStreamWithRecovery({\n    onShellRendered() {\n      if (!options.isProduction) {\n        renderEnd = performance.now();\n      }\n    },\n    renderErrorBoundaryResponse(error) {\n      return options.renderErrorBoundaryResponse(error);\n    },\n    async renderHtmlStream() {\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlStream({\n        capturedRscDataRef,\n        fontData,\n        navigationContext: options.getNavigationContext(),\n        rscStream: rscForResponse,\n        scriptNonce: options.scriptNonce,\n        sideStream: rscCapture.sideStream,\n        ssrHandler,\n      });\n    },\n    renderSpecialErrorResponse(specialError) {\n      return options.renderPageSpecialError(specialError);\n    },\n    resolveSpecialError: resolveAppPageSpecialError,\n  });\n  if (htmlRender.response) {\n    return htmlRender.response;\n  }\n  const htmlStream = htmlRender.htmlStream;\n  if (!htmlStream) {\n    throw new Error(\"[vinext] Expected an HTML stream when no fallback response was returned\");\n  }\n\n  // Routes with a route-level Suspense boundary (loading.tsx) skip the page\n  // probe — the page render happens once, inside the RSC stream. Mirror\n  // Next.js's `app-render.tsx:4293` catch shape: by the time the SSR shell\n  // promise has resolved, any redirect()/notFound() throw whose async work\n  // settles in microtasks during shell rendering has already fired through\n  // React's onError and been captured by the tracker. Convert that to a\n  // 307/404 before any bytes are flushed.\n  //\n  // Late rejections — ones that settle after macrotask boundaries (real\n  // I/O, setTimeout, etc.) — fall through to the streamed body, exactly\n  // as Next.js does. The digest survives in the Flight payload for the\n  // client router to consume.\n  if (options.hasLoadingBoundary) {\n    const captured = rscErrorTracker.getCapturedSpecialError();\n    if (captured) {\n      const specialError = resolveAppPageSpecialError(captured);\n      if (specialError) {\n        void htmlStream.cancel().catch(() => {});\n        return options.renderPageSpecialError(specialError);\n      }\n    }\n  }\n\n  if (\n    shouldRerenderAppPageWithGlobalError({\n      capturedError: rscErrorTracker.getCapturedError(),\n      hasLocalBoundary: options.routeHasLocalBoundary,\n    })\n  ) {\n    const cleanResponse = await options.renderErrorBoundaryResponse(\n      rscErrorTracker.getCapturedError(),\n    );\n    if (cleanResponse) {\n      return cleanResponse;\n    }\n  }\n\n  // Eagerly read values that must be captured before the stream is consumed.\n  if (options.isPrerender === true) {\n    await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);\n    ({ expireSeconds, revalidateSeconds } = applyRequestCacheLife({\n      expireSeconds,\n      requestCacheLife: readRequestCacheLifeForPrerender(options),\n      revalidateSeconds,\n    }));\n  }\n  const draftCookie = options.getDraftModeCookieHeader();\n  const dynamicUsedDuringRender = options.consumeDynamicUsage();\n  let dynamicUsedBeforeContextCleanup = dynamicUsedDuringRender;\n\n  // Defer clearRequestContext() until the HTML stream is fully consumed by the\n  // HTTP layer. The RSC/SSR pipeline is lazy — Server Components execute while\n  // the response body is being pulled, not when the stream handle is returned.\n  // Clearing the context synchronously here would race those executions, causing\n  // headers()/cookies() to see a null context on warm (module-cached) requests.\n  // See: https://github.com/cloudflare/vinext/issues/660\n  const safeHtmlStream = deferUntilStreamConsumed(htmlStream, () => {\n    dynamicUsedBeforeContextCleanup =\n      dynamicUsedBeforeContextCleanup || options.consumeDynamicUsage();\n    options.clearRequestContext();\n  });\n\n  const htmlResponsePolicy = resolveAppPageHtmlResponsePolicy({\n    dynamicUsedDuringRender,\n    hasScriptNonce: Boolean(options.scriptNonce),\n    isDynamicError: options.isDynamicError,\n    isForceDynamic: options.isForceDynamic,\n    isForceStatic: options.isForceStatic,\n    isProduction: options.isProduction,\n    expireSeconds,\n    revalidateSeconds,\n  });\n  const htmlResponseTiming = buildResponseTiming({\n    compileEnd,\n    handlerStart: options.handlerStart,\n    isProduction: options.isProduction,\n    renderEnd,\n    responseKind: \"html\",\n  });\n\n  const shouldSpeculativelyWriteCache =\n    options.isProduction &&\n    shouldCaptureRscForCacheMetadata &&\n    revalidateSeconds === null &&\n    !options.isDynamicError &&\n    !options.isForceStatic &&\n    !options.scriptNonce &&\n    !dynamicUsedDuringRender;\n\n  if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {\n    const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {\n      draftCookie,\n      fontLinkHeader,\n      middlewareContext: options.middlewareContext,\n      policy: htmlResponsePolicy,\n      timing: htmlResponseTiming,\n    });\n\n    if (options.isPrerender === true) {\n      return isrResponse;\n    }\n\n    return finalizeAppPageHtmlCacheResponse(isrResponse, {\n      capturedDynamicUsageBeforeContextCleanup() {\n        return dynamicUsedBeforeContextCleanup;\n      },\n      capturedRscDataPromise: capturedRscDataRef.value,\n      cleanPathname: options.cleanPathname,\n      consumeDynamicUsage: options.consumeDynamicUsage,\n      getPageTags() {\n        return options.getPageTags();\n      },\n      getRequestCacheLife() {\n        return options.getRequestCacheLife();\n      },\n      isrDebug: options.isrDebug,\n      isrHtmlKey: options.isrHtmlKey,\n      isrRscKey: options.isrRscKey,\n      isrSet: options.isrSet,\n      preserveClientResponseHeaders: !htmlResponsePolicy.shouldWriteToCache,\n      expireSeconds,\n      revalidateSeconds,\n      waitUntil(cachePromise) {\n        options.waitUntil?.(cachePromise);\n      },\n    });\n  }\n\n  return buildAppPageHtmlResponse(safeHtmlStream, {\n    draftCookie,\n    fontLinkHeader,\n    middlewareContext: options.middlewareContext,\n    policy: htmlResponsePolicy,\n    timing: htmlResponseTiming,\n  });\n}\n\nasync function settleCapturedRscRenderForCacheMetadata(\n  capturedRscDataPromise: Promise<ArrayBuffer> | null,\n): Promise<void> {\n  if (!capturedRscDataPromise) {\n    return;\n  }\n\n  try {\n    await capturedRscDataPromise;\n  } catch {\n    // The response stream and cache-write path own render error propagation.\n    // This pre-read only makes \"use cache\" metadata available before headers\n    // and ISR seed metadata are finalized.\n  }\n}\n"],"mappings":"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"}

package/dist/server/app-page-request.d.ts

@@ -2,16 +2,29 @@ import { AppPageSpecialError } from "./app-page-execution.js";
 
 //#region src/server/app-page-request.d.ts
 type AppPageParams = Record<string, string | string[]>;
+type GenerateStaticParams = (args: {
+  params: AppPageParams;
+}) => unknown;
+type GenerateStaticParamsModule = {
+  generateStaticParams?: GenerateStaticParams | null;
+};
+type GenerateStaticParamsSource = {
+  generateStaticParams: GenerateStaticParams;
+  parentParamNames: readonly string[];
+};
 type ValidateAppPageDynamicParamsOptions = {
   clearRequestContext: () => void;
   enforceStaticParamsOnly: boolean;
-  generateStaticParams?: ((args: {
-    params: AppPageParams;
-  }) => unknown) | null;
+  generateStaticParams?: GenerateStaticParams | GenerateStaticParamsSource | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[] | null;
   isDynamicRoute: boolean;
-  logGenerateStaticParamsError?: (error: unknown) => void;
   params: AppPageParams;
 };
+type ResolveAppPageGenerateStaticParamsSourcesOptions = {
+  layouts?: readonly (GenerateStaticParamsModule | null | undefined)[];
+  layoutTreePositions?: readonly number[];
+  page?: GenerateStaticParamsModule | null;
+  routeSegments: readonly string[];
+};
 type BuildAppPageElementOptions<TElement> = {
   buildPageElement: () => Promise<TElement>;
   renderErrorBoundaryPage: (error: unknown) => Promise<Response | null>;
@@ -80,6 +93,7 @@ type ResolveAppPageInterceptResult<TInterceptOpts> = {
   interceptOpts: TInterceptOpts | undefined;
   response: Response | null;
 };
+declare function resolveAppPageGenerateStaticParamsSources(options: ResolveAppPageGenerateStaticParamsSourcesOptions): GenerateStaticParamsSource[];
 declare function validateAppPageDynamicParams(options: ValidateAppPageDynamicParamsOptions): Promise<Response | null>;
 /**
  * Pure: decides whether the incoming request should re-render an intercepted
@@ -102,5 +116,5 @@ declare function resolveAppPageActionRerenderTarget<TRoute, TPage, TInterceptOpt
 declare function resolveAppPageIntercept<TRoute, TPage, TInterceptOpts, TElement>(options: ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement>): Promise<ResolveAppPageInterceptResult<TInterceptOpts>>;
 declare function buildAppPageElement<TElement>(options: BuildAppPageElementOptions<TElement>): Promise<BuildAppPageElementResult<TElement>>;
 //#endregion
-export { buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageIntercept, resolveAppPageInterceptMatch, validateAppPageDynamicParams };
+export { ValidateAppPageDynamicParamsOptions, buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageGenerateStaticParamsSources, resolveAppPageIntercept, resolveAppPageInterceptMatch, validateAppPageDynamicParams };
 //# sourceMappingURL=app-page-request.d.ts.map

package/dist/server/app-page-request.js

@@ -1,3 +1,5 @@
+import { notFoundResponse } from "./http-error-responses.js";
+import { getAppPageSegmentParamName } from "./app-page-params.js";
 //#region src/server/app-page-request.ts
 function pickRouteParams(matchedParams, routeParamNames) {
 	const params = {};
@@ -7,6 +9,33 @@ function pickRouteParams(matchedParams, routeParamNames) {
 	}
 	return params;
 }
+function collectParentParamNames(routeSegments, boundaryPosition) {
+	const limit = Math.max(0, Math.min(boundaryPosition, routeSegments.length));
+	const names = [];
+	for (const segment of routeSegments.slice(0, limit)) {
+		const name = getAppPageSegmentParamName(segment);
+		if (name && !names.includes(name)) names.push(name);
+	}
+	return names;
+}
+function getLayoutGenerateStaticParamsBoundary(layoutTreePosition) {
+	return (layoutTreePosition ?? 0) - 1;
+}
+function resolveAppPageGenerateStaticParamsSources(options) {
+	const sources = [];
+	options.layouts?.forEach((layout, index) => {
+		if (typeof layout?.generateStaticParams !== "function") return;
+		sources.push({
+			generateStaticParams: layout.generateStaticParams,
+			parentParamNames: collectParentParamNames(options.routeSegments, getLayoutGenerateStaticParamsBoundary(options.layoutTreePositions?.[index]))
+		});
+	});
+	if (typeof options.page?.generateStaticParams === "function") sources.push({
+		generateStaticParams: options.page.generateStaticParams,
+		parentParamNames: collectParentParamNames(options.routeSegments, Math.max(0, options.routeSegments.length - 1))
+	});
+	return sources;
+}
 function areStaticParamsAllowed(params, staticParams) {
 	const paramKeys = Object.keys(params);
 	return staticParams.some((staticParamSet) => paramKeys.every((key) => {
@@ -18,16 +47,29 @@ function areStaticParamsAllowed(params, staticParams) {
 		return JSON.stringify(value) === JSON.stringify(staticValue);
 	}));
 }
+function normalizeGenerateStaticParams(generateStaticParams) {
+	return (Array.isArray(generateStaticParams) ? generateStaticParams : [generateStaticParams]).flatMap((source) => {
+		if (typeof source === "function") return [{
+			generateStaticParams: source,
+			parentParamNames: []
+		}];
+		if (typeof source?.generateStaticParams === "function") return [source];
+		return [];
+	});
+}
 async function validateAppPageDynamicParams(options) {
-	if (!options.enforceStaticParamsOnly || !options.isDynamicRoute || typeof options.generateStaticParams !== "function") return null;
-	try {
-		const staticParams = await options.generateStaticParams({ params: options.params });
+	if (!options.enforceStaticParamsOnly || !options.isDynamicRoute) return null;
+	const generateStaticParamsSources = normalizeGenerateStaticParams(options.generateStaticParams);
+	if (generateStaticParamsSources.length === 0) {
+		options.clearRequestContext();
+		return notFoundResponse();
+	}
+	for (const source of generateStaticParamsSources) {
+		const staticParams = await source.generateStaticParams({ params: pickRouteParams(options.params, source.parentParamNames) });
 		if (Array.isArray(staticParams) && !areStaticParamsAllowed(options.params, staticParams)) {
 			options.clearRequestContext();
-			return new Response("Not Found", { status: 404 });
+			return notFoundResponse();
 		}
-	} catch (error) {
-		options.logGenerateStaticParamsError?.(error);
 	}
 	return null;
 }
@@ -144,6 +186,6 @@ async function buildAppPageElement(options) {
 	}
 }
 //#endregion
-export { buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageIntercept, resolveAppPageInterceptMatch, validateAppPageDynamicParams };
+export { buildAppPageElement, resolveAppPageActionRerenderTarget, resolveAppPageGenerateStaticParamsSources, resolveAppPageIntercept, resolveAppPageInterceptMatch, validateAppPageDynamicParams };
 
 //# sourceMappingURL=app-page-request.js.map