vinext 0.0.55 → 0.1.0

package/dist/server/app-page-route-wiring.d.ts

@@ -1,6 +1,8 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
 import { AppElements, AppElementsInterception } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { ThenableParamsObserver } from "../shims/thenable-params.js";
+import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
 import { AppPageRenderIdentity } from "./app-page-render-identity.js";
@@ -104,7 +106,8 @@ type AppPageLayoutEntry<TModule extends AppPageModule = AppPageModule, TErrorMod
 type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   element: ReactNode;
   globalErrorModule?: TErrorModule | null;
-  makeThenableParams: (params: AppPageParams) => unknown;
+  layoutParamAccess?: AppLayoutParamAccessTracker;
+  makeThenableParams: MakeThenableParams;
   matchedParams: AppPageParams;
   metadataPlacement?: "body" | "head";
   resolvedMetadata: Metadata | null;
@@ -114,8 +117,10 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   rootNotFoundModule?: TModule | null;
   rootUnauthorizedModule?: TModule | null;
   route: AppPageRouteWiringRoute<TModule, TErrorModule>;
+  searchParams?: unknown;
   slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;
 };
+type MakeThenableParams = (params: AppPageParams, observer?: ThenableParamsObserver) => unknown;
 type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = BuildAppPageRouteElementOptions<TModule, TErrorModule> & {
   interception?: AppElementsInterception | null;
   interceptionContext?: string | null;
@@ -126,11 +131,17 @@ type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule,
   routePath: string;
 };
 declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
+declare function probeAppPageLayoutWithTracking<TModule extends AppPageModule>(options: {
+  layoutIndex: number;
+  layoutParamAccess: AppLayoutParamAccessTracker | undefined;
+  makeThenableParams: MakeThenableParams;
+  matchedParams: AppPageParams;
+  route: Pick<AppPageRouteWiringRoute<TModule>, "layoutTreePositions" | "layouts" | "routeSegments">;
+}): unknown;
 declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "errorTreePositions" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
   forbiddens?: readonly (TModule | null | undefined)[] | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
-export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, resolveAppPageChildSegments };
-//# sourceMappingURL=app-page-route-wiring.d.ts.map
+export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };

package/dist/server/app-page-route-wiring.js

@@ -1,3 +1,4 @@
+import { createAppRenderDependency, registerAppElementRenderDependencies, renderAfterAppDependencies, renderWithAppDependencyBarrier } from "./app-render-dependency.js";
 import { APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY } from "./app-elements.js";
@@ -6,12 +7,13 @@ import { AppRouterScrollTarget } from "../shims/app-router-scroll.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead, renderMetadataToHtml } from "../shims/metadata.js";
 import { Children as Children$1, ParallelSlot, Slot } from "../shims/slot.js";
-import { createAppRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier } from "./app-render-dependency.js";
-import { resolveAppPageSegmentParams } from "./app-page-params.js";
+import { resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams } from "./app-page-params.js";
+import { probeReactServerSubtree } from "./app-page-probe.js";
 import { resolveAppPageChildSegments, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey } from "./app-page-segment-state.js";
-import { Suspense } from "react";
+import { Fragment, Suspense } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-page-route-wiring.tsx
+const APP_PAGE_LAYOUT_PROBE_CHILD = /* @__PURE__ */ jsx(Fragment, {});
 function getDefaultExport(module) {
 	return module?.default ?? null;
 }
@@ -23,6 +25,38 @@ function createAppPageTreePath(routeSegments, treePosition) {
 	if (treePathSegments.length === 0) return "/";
 	return `/${treePathSegments.join("/")}`;
 }
+function readFiniteRevalidateSeconds(module) {
+	const revalidate = module?.revalidate;
+	return typeof revalidate === "number" && Number.isFinite(revalidate) && revalidate > 0 ? revalidate : null;
+}
+function recordLayoutSkipObservationScope(options) {
+	options.layoutParamAccess?.recordLayoutParamScope(options.layoutId, resolveAppPageSegmentParamScopeKeys(options.routeSegments, options.treePosition));
+	const revalidateSeconds = readFiniteRevalidateSeconds(options.layoutModule);
+	if (revalidateSeconds !== null) options.layoutParamAccess?.recordLayoutFiniteRevalidate(options.layoutId, revalidateSeconds);
+}
+function probeAppPageLayoutWithTracking(options) {
+	const treePosition = options.route.layoutTreePositions?.[options.layoutIndex] ?? 0;
+	const treePath = createAppPageTreePath(options.route.routeSegments, treePosition);
+	const layoutId = AppElementsWire.encodeLayoutId(treePath);
+	const probe = () => {
+		const layoutModule = options.route.layouts[options.layoutIndex];
+		const LayoutComponent = getDefaultExport(layoutModule);
+		if (!LayoutComponent) return null;
+		recordLayoutSkipObservationScope({
+			layoutId,
+			layoutModule,
+			layoutParamAccess: options.layoutParamAccess,
+			routeSegments: options.route.routeSegments,
+			treePosition
+		});
+		const layoutParams = resolveAppPageSegmentParams(options.route.routeSegments, treePosition, options.matchedParams);
+		return probeReactServerSubtree(/* @__PURE__ */ jsx(LayoutComponent, {
+			params: options.makeThenableParams(layoutParams, options.layoutParamAccess?.createThenableParamsObserver(layoutId)),
+			children: APP_PAGE_LAYOUT_PROBE_CHILD
+		}));
+	};
+	return options.layoutParamAccess ? options.layoutParamAccess.runLayoutProbe(layoutId, probe) : probe();
+}
 function createAppPageLayoutEntries(route) {
 	return route.layouts.map((layoutModule, index) => {
 		const treePosition = route.layoutTreePositions?.[index] ?? 0;
@@ -87,16 +121,20 @@ function resolveAppPageSlotBindingState(slot, override) {
 	if (getDefaultExport(slot.default)) return "default";
 	return "unmatched";
 }
-function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride) {
+function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride, options) {
 	const bindings = [];
 	for (const [slotKey, slot] of Object.entries(route.slots ?? {})) {
 		const layoutEntry = layoutEntries[slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1] ?? null;
 		const ownerLayoutId = layoutEntry?.id ?? null;
 		const override = resolveSlotOverride(slotKey, slot.name);
+		const slotId = resolveAppPageSlotId(slot, layoutEntry?.treePath ?? "/");
+		const state = resolveAppPageSlotBindingState(slot, override);
+		const activeRouteId = state === "active" ? options.interception?.slotId === slotId ? options.interception.targetRouteId : AppElementsWire.encodeRouteId(options.routePath, null) : null;
 		bindings.push({
+			...activeRouteId !== null ? { activeRouteId } : {},
 			ownerLayoutId,
-			slotId: resolveAppPageSlotId(slot, layoutEntry?.treePath ?? "/"),
-			state: resolveAppPageSlotBindingState(slot, override)
+			slotId,
+			state
 		});
 	}
 	return normalizeAppElementsSlotBindings(bindings, { layoutIds: layoutEntries.map((entry) => entry.id) });
@@ -139,6 +177,7 @@ function buildAppPageElements(options) {
 	const layoutIndicesByTreePosition = /* @__PURE__ */ new Map();
 	for (let index = 0; index < layoutEntries.length; index++) layoutIndicesByTreePosition.set(layoutEntries[index].treePosition, index);
 	const layoutDependenciesByIndex = /* @__PURE__ */ new Map();
+	const renderDependenciesByElementId = /* @__PURE__ */ new Map();
 	const layoutDependenciesBefore = [];
 	const slotDependenciesByLayoutIndex = [];
 	const templateDependenciesById = /* @__PURE__ */ new Map();
@@ -166,7 +205,11 @@ function buildAppPageElements(options) {
 		layoutIds: options.route.ids?.layouts ?? layoutEntries.map((entry) => entry.id),
 		rootLayoutTreePath,
 		routeId,
-		slotBindings: createAppPageSlotBindings(options.route, layoutEntries, resolveSlotOverride)
+		slotBindings: createAppPageSlotBindings(options.route, layoutEntries, resolveSlotOverride, {
+			interception: renderIdentity?.interception ?? options.interception ?? null,
+			interceptionContext,
+			routePath: options.routePath
+		})
 	}) };
 	if (options.route.staticSiblings && options.route.staticSiblings.length > 0) elements[APP_STATIC_SIBLINGS_KEY] = options.route.staticSiblings;
 	const getEffectiveSlotParams = (slotKey, slotName) => resolveSlotOverride(slotKey, slotName)?.params ?? options.matchedParams;
@@ -178,6 +221,7 @@ function buildAppPageElements(options) {
 			if (getDefaultExport(layoutEntry.layoutModule)) {
 				const layoutDependency = createAppRenderDependency();
 				layoutDependenciesByIndex.set(layoutIndex, layoutDependency);
+				renderDependenciesByElementId.set(layoutEntry.id, layoutDependency);
 				pageDependencies.push(layoutDependency);
 			}
 			slotDependenciesByLayoutIndex[layoutIndex] = [...pageDependencies];
@@ -211,7 +255,15 @@ function buildAppPageElements(options) {
 		const layoutEntry = layoutEntries[index];
 		const layoutComponent = getDefaultExport(layoutEntry.layoutModule);
 		if (!layoutComponent) continue;
-		const layoutProps = { params: options.makeThenableParams(resolveAppPageSegmentParams(options.route.routeSegments, layoutEntry.treePosition, options.matchedParams)) };
+		const layoutParams = resolveAppPageSegmentParams(options.route.routeSegments, layoutEntry.treePosition, options.matchedParams);
+		recordLayoutSkipObservationScope({
+			layoutId: layoutEntry.id,
+			layoutModule: layoutEntry.layoutModule,
+			layoutParamAccess: options.layoutParamAccess,
+			routeSegments: options.route.routeSegments,
+			treePosition: layoutEntry.treePosition
+		});
+		const layoutProps = { params: options.makeThenableParams(layoutParams, options.layoutParamAccess?.createThenableParamsObserver(layoutEntry.id)) };
 		for (const slot of Object.values(options.route.slots ?? {})) {
 			const slotName = slot.name;
 			if ((slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1) !== index) continue;
@@ -245,6 +297,7 @@ function buildAppPageElements(options) {
 		}
 		const slotThenableParams = options.makeThenableParams(slotParams);
 		const slotProps = { params: slotThenableParams };
+		if (options.searchParams !== void 0) slotProps.searchParams = options.searchParams;
 		if (slotOverride?.props) Object.assign(slotProps, slotOverride.props);
 		let slotElement = /* @__PURE__ */ jsx(slotComponent, { ...slotProps });
 		const interceptLayouts = slotOverride?.layoutModules ?? [];
@@ -381,9 +434,8 @@ function buildAppPageElements(options) {
 		routeChildren,
 		createAppPageRouteBodyMetadata(options.resolvedMetadata, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement)
 	] });
+	registerAppElementRenderDependencies(elements, renderDependenciesByElementId);
 	return elements;
 }
 //#endregion
-export { buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, resolveAppPageChildSegments };
-
-//# sourceMappingURL=app-page-route-wiring.js.map
+export { buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };

package/dist/server/app-page-search-params-observation.d.ts

@@ -0,0 +1,10 @@
+import { ThenableParams } from "../shims/thenable-params.js";
+import { AppPageSearchParams } from "./app-page-head.js";
+
+//#region src/server/app-page-search-params-observation.d.ts
+type AppPageSearchParamsObservationOptions = {
+  observeReactPromiseStatus?: boolean;
+};
+declare function makeObservedAppPageSearchParamsThenable(pageSearchParams: AppPageSearchParams, options?: AppPageSearchParamsObservationOptions): ThenableParams<AppPageSearchParams>;
+//#endregion
+export { makeObservedAppPageSearchParamsThenable };

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

@@ -0,0 +1,20 @@
+import { markDynamicUsage, markRenderRequestApiUsage, throwIfInsideCacheScope } from "../shims/headers.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
+//#region src/server/app-page-search-params-observation.ts
+function markAppPageSearchParamsAccess() {
+	throwIfInsideCacheScope("searchParams");
+	markDynamicUsage();
+	markRenderRequestApiUsage("searchParams");
+}
+function makeObservedAppPageSearchParamsThenable(pageSearchParams, options = {}) {
+	const observer = { observeParamAccess() {
+		markAppPageSearchParamsAccess();
+	} };
+	if (options.observeReactPromiseStatus === true) return makeThenableParams(pageSearchParams, {
+		...observer,
+		observeReactPromiseStatus: true
+	});
+	return makeThenableParams(pageSearchParams, observer);
+}
+//#endregion
+export { makeObservedAppPageSearchParamsThenable };

package/dist/server/app-page-segment-state.d.ts

@@ -6,5 +6,4 @@ declare function resolveAppPageSegmentStateKey(routeSegments: readonly string[],
 declare function resolveAppPageRouteStateKey(routeSegments: readonly string[], params: AppPageParams): string;
 declare function resolveAppPageLeafSegmentStateKey(routeSegments: readonly string[], params: AppPageParams): string;
 //#endregion
-export { resolveAppPageChildSegments, resolveAppPageLeafSegmentStateKey, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey };
-//# sourceMappingURL=app-page-segment-state.d.ts.map
+export { resolveAppPageChildSegments, resolveAppPageLeafSegmentStateKey, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey };

package/dist/server/app-page-segment-state.js

@@ -1,10 +1,5 @@
+import { isCatchAllSegment, isOptionalCatchAllSegment } from "../routing/utils.js";
 //#region src/server/app-page-segment-state.ts
-function isOptionalCatchAllSegment(segment) {
-	return segment.startsWith("[[...") && segment.endsWith("]]") && segment.length > 7;
-}
-function isCatchAllSegment(segment) {
-	return segment.startsWith("[...") && segment.endsWith("]") && segment.length > 5;
-}
 function isDynamicSegment(segment) {
 	return segment.startsWith("[") && segment.endsWith("]") && !segment.includes(".");
 }
@@ -83,5 +78,3 @@ function resolveAppPageLeafSegmentStateKey(routeSegments, params) {
 }
 //#endregion
 export { resolveAppPageChildSegments, resolveAppPageLeafSegmentStateKey, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey };
-
-//# sourceMappingURL=app-page-segment-state.js.map

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

@@ -1,3 +1,4 @@
+import { NavigationContext } from "../shims/navigation.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { RootParams } from "../shims/root-params.js";
 import { ReactFormState } from "react-dom/client";
@@ -13,8 +14,14 @@ type CreateAppPageFontDataOptions = {
   getPreloads: () => AppPageFontPreload[];
   getStyles: () => string[];
 };
+type AppSsrRenderResult = {
+  htmlStream: ReadableStream<Uint8Array>;
+  metadataReady: Promise<void>;
+  capturedRscData: Promise<ArrayBuffer> | null;
+};
+declare function isAppSsrRenderResult(value: unknown): value is AppSsrRenderResult;
 type AppPageSsrHandler = {
-  handleSsr: (rscStream: ReadableStream<Uint8Array>, navigationContext: unknown, fontData: AppPageFontData, options?: {
+  handleSsr: (rscStream: ReadableStream<Uint8Array>, navigationContext: NavigationContext | null, fontData: AppPageFontData, options?: {
     formState?: ReactFormState | null;
     scriptNonce?: string;
     basePath?: string;
@@ -28,13 +35,14 @@ type AppPageSsrHandler = {
     capturedRscDataRef?: {
       value: Promise<ArrayBuffer> | null;
     }; /** When true, wait for the full React tree before emitting bytes. */
-    waitForAllReady?: boolean;
-  }) => Promise<ReadableStream<Uint8Array>>;
+    waitForAllReady?: boolean; /** Dev-only: original server error to surface in the browser overlay. */
+    initialDevServerError?: unknown;
+  }) => Promise<ReadableStream<Uint8Array> | AppSsrRenderResult>;
 };
 type RenderAppPageHtmlStreamOptions = {
   fontData: AppPageFontData;
   formState?: ReactFormState | null;
-  navigationContext: unknown;
+  navigationContext: NavigationContext | null;
   rscStream: ReadableStream<Uint8Array>;
   scriptNonce?: string;
   basePath?: string;
@@ -52,7 +60,8 @@ type RenderAppPageHtmlStreamOptions = {
   capturedRscDataRef?: {
     value: Promise<ArrayBuffer> | null;
   }; /** When true, wait for the full React tree before emitting bytes. */
-  waitForAllReady?: boolean;
+  waitForAllReady?: boolean; /** Dev-only: original server error to surface in the browser overlay. */
+  initialDevServerError?: unknown;
 };
 type RenderAppPageHtmlResponseOptions = {
   clearRequestContext: () => void;
@@ -64,11 +73,13 @@ type RenderAppPageHtmlResponseOptions = {
 type AppPageHtmlStreamRecoveryResult = {
   htmlStream: ReadableStream<Uint8Array> | null;
   response: Response | null;
+  metadataReady: Promise<void>;
+  capturedRscData: Promise<ArrayBuffer> | null;
 };
 type RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError> = {
   onShellRendered?: () => void;
   renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;
-  renderHtmlStream: () => Promise<ReadableStream<Uint8Array>>;
+  renderHtmlStream: () => Promise<ReadableStream<Uint8Array> | AppSsrRenderResult>;
   renderSpecialErrorResponse: (specialError: TSpecialError) => Promise<Response>;
   resolveSpecialError: (error: unknown) => TSpecialError | null;
 };
@@ -88,7 +99,7 @@ type ShouldRerenderAppPageWithGlobalErrorOptions = {
   hasLocalBoundary: boolean;
 };
 declare function createAppPageFontData(options: CreateAppPageFontDataOptions): AppPageFontData;
-declare function renderAppPageHtmlStream(options: RenderAppPageHtmlStreamOptions): Promise<ReadableStream<Uint8Array>>;
+declare function renderAppPageHtmlStream(options: RenderAppPageHtmlStreamOptions): Promise<AppSsrRenderResult>;
 /**
  * Wraps a stream so that `onFlush` is called when the last byte has been read
  * by the downstream consumer (i.e. when the HTTP layer finishes draining the
@@ -102,5 +113,4 @@ declare function renderAppPageHtmlStreamWithRecovery<TSpecialError>(options: Ren
 declare function createAppPageRscErrorTracker(baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown): AppPageRscErrorTracker;
 declare function shouldRerenderAppPageWithGlobalError(options: ShouldRerenderAppPageWithGlobalErrorOptions): boolean;
 //#endregion
-export { AppPageFontData, AppPageSsrHandler, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError };
-//# sourceMappingURL=app-page-stream.d.ts.map
+export { AppPageFontData, AppPageSsrHandler, AppSsrRenderResult, createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, isAppSsrRenderResult, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError };

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

@@ -2,6 +2,18 @@ import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 //#region src/server/app-page-stream.ts
+function isAppSsrRenderResult(value) {
+	return typeof value === "object" && value !== null && "htmlStream" in value && "metadataReady" in value;
+}
+const resolvedMetadataReady = Promise.resolve();
+function normalizeAppSsrRenderResult(raw, fallbackCapturedRscData = null) {
+	if (isAppSsrRenderResult(raw)) return raw;
+	return {
+		htmlStream: raw,
+		metadataReady: resolvedMetadataReady,
+		capturedRscData: fallbackCapturedRscData
+	};
+}
 function createAppPageFontData(options) {
 	return {
 		links: options.getLinks(),
@@ -18,9 +30,10 @@ async function renderAppPageHtmlStream(options) {
 		rootParams: options.rootParams,
 		sideStream: options.sideStream,
 		capturedRscDataRef: options.capturedRscDataRef,
-		waitForAllReady: options.waitForAllReady
+		waitForAllReady: options.waitForAllReady,
+		initialDevServerError: options.initialDevServerError
 	};
-	return options.ssrHandler.handleSsr(options.rscStream, options.navigationContext, options.fontData, ssrOptions);
+	return normalizeAppSsrRenderResult(await options.ssrHandler.handleSsr(options.rscStream, options.navigationContext, options.fontData, ssrOptions), options.capturedRscDataRef?.value ?? null);
 }
 /**
 * Wraps a stream so that `onFlush` is called when the last byte has been read
@@ -58,7 +71,8 @@ function deferUntilStreamConsumed(stream, onFlush) {
 	});
 }
 async function renderAppPageHtmlResponse(options) {
-	const safeStream = deferUntilStreamConsumed(await renderAppPageHtmlStream(options), () => {
+	const { htmlStream } = await renderAppPageHtmlStream(options);
+	const safeStream = deferUntilStreamConsumed(htmlStream, () => {
 		options.clearRequestContext();
 	});
 	const headers = new Headers({
@@ -75,22 +89,28 @@ async function renderAppPageHtmlResponse(options) {
 }
 async function renderAppPageHtmlStreamWithRecovery(options) {
 	try {
-		const htmlStream = await options.renderHtmlStream();
+		const { htmlStream, metadataReady, capturedRscData } = normalizeAppSsrRenderResult(await options.renderHtmlStream());
 		options.onShellRendered?.();
 		return {
 			htmlStream,
-			response: null
+			response: null,
+			metadataReady,
+			capturedRscData
 		};
 	} catch (error) {
 		const specialError = options.resolveSpecialError(error);
 		if (specialError) return {
 			htmlStream: null,
-			response: await options.renderSpecialErrorResponse(specialError)
+			response: await options.renderSpecialErrorResponse(specialError),
+			metadataReady: resolvedMetadataReady,
+			capturedRscData: null
 		};
 		const boundaryResponse = await options.renderErrorBoundaryResponse(error);
 		if (boundaryResponse) return {
 			htmlStream: null,
-			response: boundaryResponse
+			response: boundaryResponse,
+			metadataReady: resolvedMetadataReady,
+			capturedRscData: null
 		};
 		throw error;
 	}
@@ -117,6 +137,4 @@ function shouldRerenderAppPageWithGlobalError(options) {
 	return Boolean(options.capturedError) && !options.hasLocalBoundary;
 }
 //#endregion
-export { createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError };
-
-//# sourceMappingURL=app-page-stream.js.map
+export { createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, isAppSsrRenderResult, renderAppPageHtmlResponse, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError };

package/dist/server/app-pages-bridge.d.ts

@@ -0,0 +1,25 @@
+import { AppMiddlewareContext } from "./app-middleware.js";
+
+//#region src/server/app-pages-bridge.d.ts
+type PagesEntry = {
+  handleApiRoute?: (request: Request, url: string) => Promise<Response> | Response;
+  renderPage?: (request: Request, url: string, query: Record<string, unknown>, parsedUrl: unknown, middlewareRequestHeaders?: Headers | null) => Promise<Response> | Response;
+};
+type RenderPagesFallbackDependencies = {
+  loadPagesEntry: () => Promise<PagesEntry> | PagesEntry;
+  buildRequestHeaders: (requestHeaders: Headers, middlewareRequestHeaders: Headers) => Headers | null;
+  decodePathParams: (pathname: string) => string;
+  applyRouteHandlerMiddlewareContext: (response: Response, middlewareContext: AppMiddlewareContext) => Response;
+};
+type RenderPagesFallbackOptions = {
+  isRscRequest: boolean;
+  middlewareContext: AppMiddlewareContext;
+  request: Request;
+  url: URL;
+};
+/**
+ * Fallback handler to route App Router requests to the Pages Router when no App Router route matches.
+ */
+declare function renderPagesFallback(options: RenderPagesFallbackOptions, dependencies: RenderPagesFallbackDependencies): Promise<Response | null>;
+//#endregion
+export { PagesEntry, renderPagesFallback };

package/dist/server/app-pages-bridge.js

@@ -0,0 +1,34 @@
+//#region src/server/app-pages-bridge.ts
+/**
+* Fallback handler to route App Router requests to the Pages Router when no App Router route matches.
+*/
+async function renderPagesFallback(options, dependencies) {
+	const { isRscRequest, middlewareContext, request, url } = options;
+	const { loadPagesEntry, buildRequestHeaders, decodePathParams, applyRouteHandlerMiddlewareContext } = dependencies;
+	if (isRscRequest) return null;
+	const pagesEntry = await loadPagesEntry();
+	const pagesRequestHeaders = middlewareContext.requestHeaders ? buildRequestHeaders(request.headers, middlewareContext.requestHeaders) : null;
+	let pagesRequest = request;
+	if (pagesRequestHeaders) {
+		const pagesRequestInit = {
+			method: request.method,
+			headers: pagesRequestHeaders
+		};
+		if (request.method !== "GET" && request.method !== "HEAD") {
+			pagesRequestInit.body = request.body;
+			pagesRequestInit.duplex = "half";
+		}
+		pagesRequest = new Request(request.url, pagesRequestInit);
+	}
+	const pagesUrl = decodePathParams(url.pathname) + (url.search || "");
+	const pagesPathname = url.pathname;
+	if (pagesPathname.startsWith("/api/") || pagesPathname === "/api") {
+		if (typeof pagesEntry.handleApiRoute !== "function") return null;
+		return applyRouteHandlerMiddlewareContext(await pagesEntry.handleApiRoute(pagesRequest, pagesUrl), middlewareContext);
+	}
+	if (typeof pagesEntry.renderPage !== "function") return null;
+	const pagesRes = await pagesEntry.renderPage(pagesRequest, pagesUrl, {}, void 0, middlewareContext.requestHeaders);
+	return pagesRes.status !== 404 ? pagesRes : null;
+}
+//#endregion
+export { renderPagesFallback };

package/dist/server/app-post-middleware-context.d.ts

@@ -12,5 +12,4 @@ import { RequestContext } from "../config/config-matchers.js";
  */
 declare function buildPostMwRequestContext(request: Request): RequestContext;
 //#endregion
-export { buildPostMwRequestContext };
-//# sourceMappingURL=app-post-middleware-context.d.ts.map
+export { buildPostMwRequestContext };

package/dist/server/app-post-middleware-context.js

@@ -24,5 +24,3 @@ function buildPostMwRequestContext(request) {
 }
 //#endregion
 export { buildPostMwRequestContext };
-
-//# sourceMappingURL=app-post-middleware-context.js.map

package/dist/server/app-ppr-fallback-shell.d.ts

@@ -0,0 +1,21 @@
+//#region src/server/app-ppr-fallback-shell.d.ts
+type AppPprFallbackShellRoute = {
+  params: readonly string[];
+  pattern: string;
+  rootParamNames?: readonly string[] | null;
+};
+type AppPprFallbackShell = {
+  fallbackParamNames: readonly string[];
+  pathname: string;
+  params: Record<string, string | string[]>;
+};
+declare function createAppPprFallbackShell(route: AppPprFallbackShellRoute, matchedParams: Record<string, string | string[]>): AppPprFallbackShell | null;
+declare function createAppPprFallbackShells(route: AppPprFallbackShellRoute, matchedParams: Record<string, string | string[]>): AppPprFallbackShell[];
+declare function rewriteAppPprFallbackShellHtmlNavigation(options: {
+  html: string;
+  params: Record<string, string | string[]>;
+  pathname: string;
+  searchParams: URLSearchParams;
+}): string;
+//#endregion
+export { createAppPprFallbackShell, createAppPprFallbackShells, rewriteAppPprFallbackShellHtmlNavigation };

package/dist/server/app-ppr-fallback-shell.js

@@ -0,0 +1,82 @@
+import { createInlineScriptTag } from "./html.js";
+import { createNavigationRuntimeRscMetadataScript } from "./app-ssr-stream.js";
+//#region src/server/app-ppr-fallback-shell.ts
+function routeRootParamNames(route) {
+	return new Set(route.rootParamNames ?? []);
+}
+function placeholderForParam(part, paramName) {
+	if (part.endsWith("+")) return [`[...${paramName}]`];
+	if (part.endsWith("*")) return [`[[...${paramName}]]`];
+	return `[${paramName}]`;
+}
+function pushParamValue(segments, value) {
+	if (Array.isArray(value)) {
+		if (value.length === 0) return false;
+		segments.push(...value.map((item) => encodeURIComponent(item)));
+		return true;
+	}
+	if (typeof value !== "string") return false;
+	segments.push(encodeURIComponent(value));
+	return true;
+}
+function createAppPprFallbackShell(route, matchedParams) {
+	return createAppPprFallbackShells(route, matchedParams).at(-1) ?? null;
+}
+function createAppPprFallbackShells(route, matchedParams) {
+	const rootParamNames = routeRootParamNames(route);
+	if (rootParamNames.size === 0) return [];
+	let minKeptParamCount = 0;
+	for (const rootParamName of rootParamNames) {
+		const rootParamIndex = route.params.indexOf(rootParamName);
+		if (rootParamIndex === -1 || matchedParams[rootParamName] === void 0) return [];
+		minKeptParamCount = Math.max(minKeptParamCount, rootParamIndex + 1);
+	}
+	if (minKeptParamCount >= route.params.length) return [];
+	const shells = [];
+	for (let keptParamCount = route.params.length - 1; keptParamCount >= minKeptParamCount; keptParamCount--) {
+		const keptParamNames = new Set(route.params.slice(0, keptParamCount));
+		const fallbackParamNames = route.params.filter((name) => !keptParamNames.has(name));
+		if (fallbackParamNames.length === 0) continue;
+		const fallbackParamNameSet = new Set(fallbackParamNames);
+		const segments = [];
+		const fallbackParams = {};
+		let isValidShell = true;
+		for (const part of route.pattern.split("/").filter(Boolean)) {
+			if (part.startsWith(":")) {
+				const paramName = part.endsWith("+") || part.endsWith("*") ? part.slice(1, -1) : part.slice(1);
+				if (fallbackParamNameSet.has(paramName)) {
+					const placeholder = placeholderForParam(part, paramName);
+					segments.push(...Array.isArray(placeholder) ? placeholder : [placeholder]);
+					fallbackParams[paramName] = placeholder;
+					continue;
+				}
+				const value = matchedParams[paramName];
+				if (!pushParamValue(segments, value)) {
+					isValidShell = false;
+					break;
+				}
+				fallbackParams[paramName] = value;
+				continue;
+			}
+			segments.push(part);
+		}
+		if (!isValidShell) continue;
+		shells.push({
+			fallbackParamNames,
+			pathname: "/" + segments.join("/"),
+			params: fallbackParams
+		});
+	}
+	return shells;
+}
+function rewriteAppPprFallbackShellHtmlNavigation(options) {
+	const metadataScript = createInlineScriptTag(createNavigationRuntimeRscMetadataScript(options.params, {
+		pathname: options.pathname,
+		searchParams: [...options.searchParams.entries()]
+	}));
+	const headCloseIndex = options.html.indexOf("</head>");
+	if (headCloseIndex !== -1) return options.html.slice(0, headCloseIndex) + metadataScript + options.html.slice(headCloseIndex);
+	return metadataScript + options.html;
+}
+//#endregion
+export { createAppPprFallbackShell, createAppPprFallbackShells, rewriteAppPprFallbackShellHtmlNavigation };

package/dist/server/app-prerender-endpoints.d.ts

@@ -15,5 +15,4 @@ type HandleAppPrerenderEndpointOptions = {
 };
 declare function handleAppPrerenderEndpoint(request: Request, options: HandleAppPrerenderEndpointOptions): Promise<Response | null>;
 //#endregion
-export { handleAppPrerenderEndpoint };
-//# sourceMappingURL=app-prerender-endpoints.d.ts.map
+export { handleAppPrerenderEndpoint };

package/dist/server/app-prerender-endpoints.js

@@ -93,5 +93,3 @@ function isStringArray(value) {
 }
 //#endregion
 export { handleAppPrerenderEndpoint };
-
-//# sourceMappingURL=app-prerender-endpoints.js.map

package/dist/server/app-prerender-static-params.d.ts

@@ -4,6 +4,20 @@ import { RootParams } from "../shims/root-params.js";
 type GenerateStaticParamsFunction = (input: {
   params: RootParams;
 }) => unknown;
+/**
+ * Build a prerender `generateStaticParams` resolver for one route pattern.
+ *
+ * `sources` may mix eager functions (layout `generateStaticParams`, which stay
+ * eagerly imported) and lazy `{ load }` page sources (code-split page modules).
+ * Lazy sources are imported once on first invocation. The returned resolver:
+ *
+ *  - returns `null` when, after resolving every source, no `generateStaticParams`
+ *    export exists for the pattern — the sentinel the prerender driver uses to
+ *    skip the route (or error under `output: export`);
+ *  - otherwise composes all sources into the cartesian set of param objects.
+ *
+ * Returns `null` (no resolver) only when the pattern has zero sources at all.
+ */
 declare function createAppPrerenderStaticParamsResolver(sources: readonly unknown[], rootParamNames?: readonly string[]): GenerateStaticParamsFunction | null;
 type CallAppPrerenderStaticParamsOptions = {
   fn: GenerateStaticParamsFunction;
@@ -13,5 +27,4 @@ type CallAppPrerenderStaticParamsOptions = {
 };
 declare function callAppPrerenderStaticParams(options: CallAppPrerenderStaticParamsOptions): Promise<unknown>;
 //#endregion
-export { callAppPrerenderStaticParams, createAppPrerenderStaticParamsResolver };
-//# sourceMappingURL=app-prerender-static-params.d.ts.map
+export { callAppPrerenderStaticParams, createAppPrerenderStaticParamsResolver };