vinext 0.1.7 → 0.2.0

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

@@ -2,6 +2,7 @@ import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders }
 import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVersion } from "./artifact-compatibility.js";
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { peekDynamicUsage } from "../shims/headers.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
 import { buildAppPageHtmlResponse, buildAppPageRscResponse, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy } from "./app-page-response.js";
 import { buildAppPageFontLinkHeader, readAppPageBinaryStream, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
@@ -248,8 +249,11 @@ function wrapRscResponseForDevErrorReporting(response, consumeInvalidDynamicUsag
 	});
 }
 async function renderAppPageLifecycle(options) {
+	const configuredProbePageBeforeRender = options.probePageBeforeRender ?? options.isRscRequest;
+	const probePageBeforeRender = options.isRscRequest || configuredProbePageBeforeRender && !(options.peekDynamicUsage?.() ?? false);
 	const preRenderResult = await probeAppPageBeforeRender({
 		hasLoadingBoundary: options.hasLoadingBoundary,
+		probePageBeforeRender,
 		skipProbes: options.pprFallbackShellSignal !== void 0,
 		layoutCount: options.layoutCount,
 		probeLayoutAt(layoutIndex) {
@@ -311,6 +315,7 @@ async function renderAppPageLifecycle(options) {
 	const outgoingElement = AppElementsWire.encodeOutgoingPayload({
 		element: options.element,
 		layoutFlags,
+		...options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic ? { dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds } : {},
 		...artifactCompatibility ? { artifactCompatibility } : {},
 		renderObservation: payloadRenderObservation,
 		skipDisposition: options.isRscRequest ? skipDisposition : void 0
@@ -424,18 +429,33 @@ async function renderAppPageLifecycle(options) {
 		getStyles: options.getFontStyles
 	});
 	const fontLinkHeader = buildAppPageFontLinkHeader(fontData.preloads);
+	let dynamicUsedDuringHtmlRender = false;
 	let renderEnd;
 	const htmlRender = await renderAppPageHtmlStreamWithRecovery({
 		onShellRendered() {
 			if (!options.isProduction) renderEnd = performance.now();
 		},
 		renderErrorBoundaryResponse(error) {
-			return options.renderErrorBoundaryResponse(rscErrorTracker.getCapturedError() ?? error);
+			const capturedRscError = rscErrorTracker.getCapturedError();
+			return options.renderErrorBoundaryResponse(capturedRscError ?? error, capturedRscError === null ? "ssr" : "rsc");
 		},
 		async renderHtmlStream() {
 			const ssrHandler = await options.loadSsrHandler();
 			return renderAppPageHtmlStream({
 				capturedRscDataRef,
+				getInitialNavigationCacheMetadata: () => {
+					let kind;
+					if (options.isForceStatic) kind = "static";
+					else if (options.isForceDynamic || dynamicUsedDuringHtmlRender || peekDynamicUsage()) kind = "dynamic";
+					else {
+						const observation = options.peekRenderObservationState?.();
+						kind = observation && (observation.dynamicFetches.length > 0 || observation.requestApis.length > 0) ? "dynamic" : "static";
+					}
+					return {
+						kind,
+						...kind === "dynamic" && options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !shouldCaptureRscForCacheMetadata ? { dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds } : {}
+					};
+				},
 				fontData,
 				hasCustomGlobalError: options.hasCustomGlobalError,
 				navigationContext: options.getNavigationContext(),
@@ -462,7 +482,7 @@ async function renderAppPageLifecycle(options) {
 	if (!htmlStream) throw new Error("[vinext] Expected an HTML stream when no fallback response was returned");
 	const linkHeader = buildAppPageLinkHeader(htmlRender.linkHeader, fontLinkHeader, options.reactMaxHeadersLength);
 	if (options.isPrerender === true) await htmlRender.metadataReady;
-	if (options.hasLoadingBoundary) {
+	if (options.hasLoadingBoundary || !probePageBeforeRender) {
 		const captured = rscErrorTracker.getCapturedSpecialError();
 		if (captured) {
 			const specialError = resolveAppPageSpecialError(captured);
@@ -480,11 +500,13 @@ async function renderAppPageLifecycle(options) {
 			revalidateSeconds
 		}));
 	}
+	let dynamicUsedDuringRender = options.consumeDynamicUsage();
+	dynamicUsedDuringHtmlRender = dynamicUsedDuringRender;
 	const draftCookie = options.getDraftModeCookieHeader();
-	const dynamicUsedDuringRender = options.consumeDynamicUsage();
 	let dynamicUsedBeforeContextCleanup = dynamicUsedDuringRender;
 	const safeHtmlStream = deferUntilStreamConsumed(htmlStream, () => {
 		dynamicUsedBeforeContextCleanup = dynamicUsedBeforeContextCleanup || options.consumeDynamicUsage();
+		dynamicUsedDuringHtmlRender = dynamicUsedBeforeContextCleanup;
 		options.clearRequestContext();
 	});
 	const htmlResponsePolicy = resolveAppPageHtmlResponsePolicy({
@@ -575,6 +597,7 @@ async function renderAppPageLifecycle(options) {
 			isrRscKey: options.isrRscKey,
 			isrSet: options.isrSet,
 			interceptionContext: options.interceptionContext,
+			omitPendingDynamicCacheState: options.omitPendingDynamicCacheState,
 			preserveClientResponseHeaders: !htmlResponsePolicy.shouldWriteToCache,
 			expireSeconds,
 			revalidateSeconds,

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

@@ -12,8 +12,20 @@ type GenerateStaticParamsModule = {
 };
 type GenerateStaticParamsSource = {
   generateStaticParams: GenerateStaticParams;
+  paramAliases?: Readonly<Record<string, string>>;
+  paramPatternParts?: readonly string[];
+  routePatternParts?: readonly string[];
   parentParamNames: readonly string[];
 };
+type ParallelGenerateStaticParamsBranch = {
+  configLayouts?: readonly (GenerateStaticParamsModule | null | undefined)[] | null;
+  configLayoutTreePositions?: readonly number[] | null;
+  layout?: GenerateStaticParamsModule | null;
+  page?: GenerateStaticParamsModule | null;
+  paramNames?: readonly string[] | null;
+  patternParts?: readonly string[] | null;
+  routeSegments?: readonly string[] | null;
+};
 type ValidateAppPageDynamicParamsOptions = {
   clearRequestContext: () => void;
   enforceStaticParamsOnly: boolean;
@@ -25,6 +37,8 @@ type ResolveAppPageGenerateStaticParamsSourcesOptions = {
   layouts?: readonly (GenerateStaticParamsModule | null | undefined)[];
   layoutTreePositions?: readonly number[];
   page?: GenerateStaticParamsModule | null;
+  parallelBranches?: readonly (ParallelGenerateStaticParamsBranch | null | undefined)[];
+  routePatternParts?: readonly string[];
   routeSegments: readonly string[];
 };
 type BuildAppPageElementOptions<TElement> = {
@@ -40,8 +54,11 @@ type BuildAppPageElementResult<TElement> = {
 };
 type AppPageInterceptMatch<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
+  interceptLayoutSegments?: readonly (readonly string[])[] | null;
+  interceptBranchSegments?: readonly string[] | null;
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   matchedParams: AppPageParams;
+  sourceMatchedParams?: AppPageParams;
   page: TPage;
   __pageLoader?: (() => Promise<TPage>) | null;
   __loadState?: {
@@ -88,7 +105,10 @@ type ResolveAppPageInterceptionRerenderTargetResult<TRoute, TInterceptOpts> = {
 type ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts> = ResolveAppPageInterceptionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>;
 type ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts> = ResolveAppPageInterceptionRerenderTargetResult<TRoute, TInterceptOpts>;
 type ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement> = {
-  buildPageElement: (route: TRoute, params: AppPageParams, interceptOpts: TInterceptOpts | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker) => Promise<TElement>;
+  buildPageElement: (route: TRoute, params: AppPageParams, interceptOpts: TInterceptOpts | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker, buildOptions?: {
+    observeMetadataSearchParamsAccess?: boolean;
+    observePageSearchParamsAccess?: boolean;
+  }) => Promise<TElement>;
   cleanPathname: string;
   currentRoute: TRoute;
   findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;
@@ -98,6 +118,7 @@ type ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement> = {
   layoutParamAccess?: AppLayoutParamAccessTracker;
   resolveNavigationParams: (route: TRoute, params: AppPageParams, pathname: string, interceptOpts: TInterceptOpts) => AppPageParams;
   renderInterceptResponse: (route: TRoute, element: TElement) => Promise<Response> | Response;
+  resolveSearchParams?: (route: TRoute, searchParams: URLSearchParams) => Awaitable<URLSearchParams>;
   searchParams: URLSearchParams;
   setNavigationContext: (context: {
     params: AppPageParams;

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

@@ -1,5 +1,6 @@
 import { notFoundResponse } from "./http-error-responses.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
+import { matchRoutePattern } from "../routing/route-pattern.js";
 import { getAppPageSegmentParamName } from "./app-page-params.js";
 import { loadAppInterceptLayouts } from "./app-route-module-loader.js";
 //#region src/server/app-page-request.ts
@@ -11,6 +12,31 @@ function pickRouteParams(matchedParams, routeParamNames) {
 	}
 	return params;
 }
+function remapRouteParams(matchedParams, source) {
+	if (source.paramPatternParts && source.routePatternParts) {
+		const urlParts = [];
+		for (const part of source.routePatternParts) {
+			if (!part.startsWith(":")) {
+				urlParts.push(part);
+				continue;
+			}
+			const value = matchedParams[part.slice(1).replace(/[+*]$/, "")];
+			if (Array.isArray(value)) urlParts.push(...value.map(encodeURIComponent));
+			else if (value !== void 0) urlParts.push(encodeURIComponent(value));
+		}
+		const slotParams = matchRoutePattern(urlParts, source.paramPatternParts);
+		if (slotParams) return slotParams;
+	}
+	if (!source.paramAliases) return matchedParams;
+	const params = { ...matchedParams };
+	for (const [routeParamName, sourceParamName] of Object.entries(source.paramAliases)) {
+		const value = matchedParams[routeParamName];
+		if (value === void 0) continue;
+		delete params[routeParamName];
+		params[sourceParamName] = value;
+	}
+	return params;
+}
 function collectParentParamNames(routeSegments, boundaryPosition) {
 	const limit = Math.max(0, Math.min(boundaryPosition, routeSegments.length));
 	const names = [];
@@ -23,6 +49,16 @@ function collectParentParamNames(routeSegments, boundaryPosition) {
 function getLayoutGenerateStaticParamsBoundary(layoutTreePosition) {
 	return (layoutTreePosition ?? 0) - 1;
 }
+function getParallelParentParamNames(routeParamNames, branch, boundaryPosition) {
+	const slotParamNames = branch.paramNames ?? routeParamNames;
+	const branchParamNames = collectParentParamNames(branch.routeSegments ?? [], boundaryPosition);
+	const branchParamNameSet = new Set((branch.routeSegments ?? []).flatMap((segment) => {
+		const name = getAppPageSegmentParamName(segment);
+		return name ? [name] : [];
+	}));
+	const ownerParamNames = slotParamNames.filter((name) => !branchParamNameSet.has(name));
+	return [...new Set([...ownerParamNames, ...branchParamNames])];
+}
 function resolveAppPageGenerateStaticParamsSources(options) {
 	const sources = [];
 	options.layouts?.forEach((layout, index) => {
@@ -36,6 +72,33 @@ function resolveAppPageGenerateStaticParamsSources(options) {
 		generateStaticParams: options.page.generateStaticParams,
 		parentParamNames: collectParentParamNames(options.routeSegments, Math.max(0, options.routeSegments.length - 1))
 	});
+	const routeParamNames = options.routeSegments.flatMap((segment) => {
+		const name = getAppPageSegmentParamName(segment);
+		return name ? [name] : [];
+	});
+	for (const parallelBranch of options.parallelBranches ?? []) {
+		if (!parallelBranch) continue;
+		const slotParamNames = parallelBranch.paramNames ?? routeParamNames;
+		const paramAliases = Object.fromEntries(routeParamNames.flatMap((routeParamName, index) => {
+			const slotParamName = slotParamNames[index];
+			return slotParamName && slotParamName !== routeParamName ? [[routeParamName, slotParamName]] : [];
+		}));
+		const addParallelSource = (module, boundaryPosition) => {
+			if (typeof module?.generateStaticParams !== "function") return;
+			sources.push({
+				generateStaticParams: module.generateStaticParams,
+				...Object.keys(paramAliases).length > 0 ? { paramAliases } : {},
+				...parallelBranch.patternParts ? { paramPatternParts: parallelBranch.patternParts } : {},
+				...options.routePatternParts ? { routePatternParts: options.routePatternParts } : {},
+				parentParamNames: getParallelParentParamNames(routeParamNames, parallelBranch, boundaryPosition)
+			});
+		};
+		addParallelSource(parallelBranch.layout, -1);
+		parallelBranch.configLayouts?.forEach((layout, index) => {
+			addParallelSource(layout, getLayoutGenerateStaticParamsBoundary(parallelBranch.configLayoutTreePositions?.[index]));
+		});
+		addParallelSource(parallelBranch.page, Math.max(0, (parallelBranch.routeSegments?.length ?? 0) - 1));
+	}
 	return sources;
 }
 function areStaticParamsAllowed(params, staticParams) {
@@ -44,8 +107,9 @@ function areStaticParamsAllowed(params, staticParams) {
 		const value = params[key];
 		const staticValue = staticParamSet[key];
 		if (staticValue === void 0) return true;
-		if (Array.isArray(value)) return JSON.stringify(value) === JSON.stringify(staticValue);
-		if (typeof staticValue === "string" || typeof staticValue === "number" || typeof staticValue === "boolean") return String(value) === String(staticValue);
+		if (Array.isArray(value)) return Array.isArray(staticValue) && value.length === staticValue.length && value.every((part, index) => typeof staticValue[index] === "string" ? part.toLowerCase() === staticValue[index].toLowerCase() : part === staticValue[index]);
+		if (typeof staticValue === "string") return value.toLowerCase() === staticValue.toLowerCase();
+		if (typeof staticValue === "number" || typeof staticValue === "boolean") return String(value) === String(staticValue);
 		return JSON.stringify(value) === JSON.stringify(staticValue);
 	}));
 }
@@ -67,8 +131,9 @@ async function validateAppPageDynamicParams(options) {
 		return notFoundResponse();
 	}
 	for (const source of generateStaticParamsSources) {
-		const staticParams = await runWithFetchDedupe(() => source.generateStaticParams({ params: pickRouteParams(options.params, source.parentParamNames) }));
-		if (Array.isArray(staticParams) && !areStaticParamsAllowed(options.params, staticParams)) {
+		const sourceParams = remapRouteParams(options.params, source);
+		const staticParams = await runWithFetchDedupe(() => source.generateStaticParams({ params: pickRouteParams(sourceParams, source.parentParamNames) }));
+		if (Array.isArray(staticParams) && !areStaticParamsAllowed(sourceParams, staticParams)) {
 			options.clearRequestContext();
 			return notFoundResponse();
 		}
@@ -97,7 +162,7 @@ async function resolveAppPageInterceptMatch(options) {
 	return {
 		interceptOpts: options.toInterceptOpts(interceptState.intercept),
 		matchedParams: interceptState.intercept.matchedParams,
-		sourceParams: pickRouteParams(interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute)),
+		sourceParams: pickRouteParams(interceptState.intercept.sourceMatchedParams ?? interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute)),
 		sourceRoute: interceptState.sourceRoute
 	};
 }
@@ -145,12 +210,18 @@ async function resolveAppPageInterceptionRerenderTarget(options) {
 		isRscRequest: options.isRscRequest,
 		toInterceptOpts: options.toInterceptOpts
 	});
-	if (interceptState.kind === "source-route") return {
-		interceptOpts: options.toInterceptOpts(interceptState.intercept),
-		navigationParams: interceptState.intercept.matchedParams,
-		params: pickRouteParams(interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute)),
-		route: interceptState.sourceRoute
-	};
+	if (interceptState.kind === "source-route") {
+		const sourceMatchedParams = interceptState.intercept.sourceMatchedParams ?? interceptState.intercept.matchedParams;
+		return {
+			interceptOpts: options.toInterceptOpts(interceptState.intercept),
+			navigationParams: {
+				...sourceMatchedParams,
+				...interceptState.intercept.matchedParams
+			},
+			params: pickRouteParams(sourceMatchedParams, options.getRouteParamNames(interceptState.sourceRoute)),
+			route: interceptState.sourceRoute
+		};
+	}
 	return {
 		interceptOpts: interceptState.kind === "current-route" ? options.toInterceptOpts(interceptState.intercept) : void 0,
 		navigationParams: options.currentParams,
@@ -174,13 +245,19 @@ async function resolveAppPageIntercept(options) {
 	if (interceptState.kind === "source-route") {
 		const renderRoute = interceptState.sourceRoute;
 		const interceptOpts = options.toInterceptOpts(interceptState.intercept);
-		const renderParams = pickRouteParams(interceptState.intercept.matchedParams, options.getRouteParamNames(interceptState.sourceRoute));
+		const sourceMatchedParams = interceptState.intercept.sourceMatchedParams ?? interceptState.intercept.matchedParams;
+		const navigationParams = {
+			...sourceMatchedParams,
+			...interceptState.intercept.matchedParams
+		};
+		const renderSearchParams = options.resolveSearchParams ? await options.resolveSearchParams(renderRoute, options.searchParams) : options.searchParams;
+		const renderParams = pickRouteParams(sourceMatchedParams, options.getRouteParamNames(interceptState.sourceRoute));
 		options.setNavigationContext({
-			params: options.resolveNavigationParams(renderRoute, interceptState.intercept.matchedParams, options.cleanPathname, interceptOpts),
+			params: options.resolveNavigationParams(renderRoute, navigationParams, options.cleanPathname, interceptOpts),
 			pathname: options.cleanPathname,
-			searchParams: options.searchParams
+			searchParams: renderSearchParams
 		});
-		const interceptElement = await options.buildPageElement(renderRoute, renderParams, interceptOpts, options.searchParams, options.layoutParamAccess);
+		const interceptElement = await options.buildPageElement(renderRoute, renderParams, interceptOpts, renderSearchParams, options.layoutParamAccess);
 		return {
 			interceptOpts: void 0,
 			response: await options.renderInterceptResponse(renderRoute, interceptElement)

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

@@ -1,10 +1,10 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
-import { AppElements, AppElementsInterception } from "./app-elements-wire.js";
+import { AppElements, AppElementsInterception, AppElementsSlotBinding } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
+import { Metadata, Viewport } from "../shims/metadata.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";
 import { resolveAppPageChildSegments } from "./app-page-segment-state.js";
 import { ComponentType, ReactNode } from "react";
@@ -31,6 +31,8 @@ type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErro
   /** Graph-owned semantic slot identity. */id?: string | null; /** Slot prop name passed to the owning layout (e.g. "modal" from @modal). */
   name: string;
   default?: TModule | null;
+  configLayouts?: readonly (TModule | null | undefined)[] | null;
+  configLayoutTreePositions?: readonly number[] | null;
   error?: TErrorModule | null;
   layout?: TModule | null;
   layoutIndex: number;
@@ -62,10 +64,16 @@ type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErr
   unauthorized?: TModule | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
   routeSegments?: readonly string[];
+  childrenRouteSegments?: readonly string[] | null;
   /**
    * Keyed by stable slot id (name + owner path), not necessarily the slot prop name.
    */
   slots?: Readonly<Record<string, AppPageRouteWiringSlot<TModule, TErrorModule>>> | null;
+  childrenSlot?: {
+    id: string;
+    ownerTreePath: string;
+    state: AppElementsSlotBinding["state"];
+  } | null;
   /**
    * Static sibling segment names at each dynamic URL level for this route. Used
    * by the client router to determine if a cached prefetch of the dynamic
@@ -83,6 +91,8 @@ type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErr
   templates?: readonly (TModule | null | undefined)[] | null;
 };
 type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {
+  branchSegments?: readonly string[] | null;
+  layoutSegments?: readonly (readonly string[])[] | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   /**
    * The page module to render for this slot. Optional — when omitted, the
@@ -92,6 +102,7 @@ type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {
   pageModule?: TModule | null;
   params?: AppPageParams;
   props?: Readonly<Record<string, unknown>>;
+  routeSegments?: readonly string[] | null;
 };
 type AppPageLayoutEntry<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   errorModule?: TErrorModule | null | undefined;
@@ -118,6 +129,7 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   rootNotFoundModule?: TModule | null;
   rootUnauthorizedModule?: TModule | null;
   route: AppPageRouteWiringRoute<TModule, TErrorModule>;
+  createPageElement?: (component: AppPageComponent, props: Readonly<Record<string, unknown>>) => ReactNode;
   searchParams?: unknown;
   slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;
 };

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

@@ -8,14 +8,17 @@ 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 { resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams } from "./app-page-params.js";
+import { resolveAppPageBranchParams, 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 { APP_PAGE_SEGMENT_KEY, resolveAppPageChildSegments, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey } from "./app-page-segment-state.js";
 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, {});
 const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
+function resolveSlotLayoutParams(routeSegments, treePosition, params) {
+	return resolveAppPageBranchParams(routeSegments, treePosition, params);
+}
 function getDefaultExport(module) {
 	return module?.default ?? null;
 }
@@ -90,6 +93,10 @@ function createAppPageTemplateEntries(route) {
 function createAppPageSourcePage(routeSegments) {
 	return `/${[...routeSegments ?? [], "page"].join("/")}`;
 }
+function resolveAppPageLayoutSegmentProviderSegments(routeSegments, treePosition, params) {
+	const segments = resolveAppPageChildSegments(routeSegments, treePosition, params);
+	return segments.at(-1) === "__PAGE__" ? segments.slice(0, -1) : segments;
+}
 function createAppPageErrorEntries(route) {
 	return (route.errorPaths ?? route.errors ?? []).flatMap((errorModule, index) => {
 		if (!errorModule) return [];
@@ -101,7 +108,7 @@ function createAppPageErrorEntries(route) {
 		}];
 	});
 }
-function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, getEffectiveSlotParams) {
+function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, getEffectiveSlotParams, resolveSlotOverride) {
 	const parallelSlots = {};
 	for (const [slotKey, slot] of Object.entries(route.slots ?? {})) {
 		const slotName = slot.name;
@@ -109,8 +116,10 @@ function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, get
 		if (targetIndex !== layoutIndex) continue;
 		const slotId = resolveAppPageSlotId(slot, layoutEntries[targetIndex]?.treePath ?? "/");
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
+		const routeSegments = resolveSlotOverride(slotKey, slotName)?.routeSegments ?? slot.routeSegments;
 		parallelSlots[slotName] = /* @__PURE__ */ jsx(LayoutSegmentProvider, {
-			segmentMap: { children: slot.routeSegments ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams) : [] },
+			providerId: slotId,
+			segmentMap: { children: routeSegments ? resolveAppPageLayoutSegmentProviderSegments(routeSegments, 0, slotParams) : [] },
 			children: /* @__PURE__ */ jsx(Slot, { id: slotId })
 		});
 	}
@@ -128,6 +137,14 @@ function resolveAppPageSlotBindingState(slot, override) {
 }
 function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride, options) {
 	const bindings = [];
+	if (route.childrenSlot) {
+		const ownerLayoutId = layoutEntries.find((layoutEntry) => layoutEntry.treePath === route.childrenSlot?.ownerTreePath)?.id;
+		bindings.push({
+			ownerLayoutId: ownerLayoutId ?? null,
+			slotId: route.childrenSlot.id,
+			state: route.childrenSlot.state
+		});
+	}
 	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;
@@ -170,6 +187,7 @@ function buildAppPageElements(options) {
 	const routeResetKey = resolveAppPageRouteStateKey(routeSegments, options.matchedParams);
 	const routeId = renderIdentity?.routeId ?? AppElementsWire.encodeRouteId(options.routePath, interceptionContext);
 	const pageId = renderIdentity?.pageId ?? AppElementsWire.encodePageId(options.routePath, interceptionContext);
+	const pageElementId = options.route.childrenSlot?.id ?? pageId;
 	const layoutEntries = createAppPageLayoutEntries(options.route);
 	const templateEntries = createAppPageTemplateEntries(options.route);
 	const errorEntries = createAppPageErrorEntries(options.route);
@@ -243,19 +261,13 @@ function buildAppPageElements(options) {
 	const routeLoadingComponent = getDefaultExport(options.route.loading);
 	const isPrefetchLoadingShell = renderMode === APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
 	if (isPrefetchLoadingShell && routeLoadingComponent !== null) elements[APP_PREFETCH_LOADING_SHELL_MARKER_KEY] = "LoadingBoundary";
-	elements[pageId] = isPrefetchLoadingShell ? null : renderAfterAppDependencies(options.element, pageDependencies);
+	elements[pageElementId] = isPrefetchLoadingShell ? null : renderAfterAppDependencies(options.element, pageDependencies);
 	for (const templateEntry of templateEntries) {
 		const templateComponent = getDefaultExport(templateEntry.templateModule);
 		if (!templateComponent) continue;
 		const TemplateComponent = templateComponent;
 		const templateDependency = templateDependenciesById.get(templateEntry.id);
-		const templateElement = templateDependency ? renderWithAppDependencyBarrier(/* @__PURE__ */ jsx(TemplateComponent, {
-			params: options.matchedParams,
-			children: /* @__PURE__ */ jsx(Children$1, {})
-		}), templateDependency) : /* @__PURE__ */ jsx(TemplateComponent, {
-			params: options.matchedParams,
-			children: /* @__PURE__ */ jsx(Children$1, {})
-		});
+		const templateElement = templateDependency ? renderWithAppDependencyBarrier(/* @__PURE__ */ jsx(TemplateComponent, { children: /* @__PURE__ */ jsx(Children$1, {}) }), templateDependency) : /* @__PURE__ */ jsx(TemplateComponent, { children: /* @__PURE__ */ jsx(Children$1, {}) });
 		elements[templateEntry.id] = renderAfterAppDependencies(templateElement, templateDependenciesBeforeById.get(templateEntry.id) ?? []);
 	}
 	for (let index = 0; index < layoutEntries.length; index++) {
@@ -293,7 +305,9 @@ function buildAppPageElements(options) {
 		const slotId = resolveAppPageSlotId(slot, layoutEntries[targetIndex]?.treePath ?? "/");
 		const slotOverride = resolveSlotOverride(slotKey, slotName);
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
-		const slotResetKey = resolveAppPageRouteStateKey(slot.routeSegments ?? [], slotParams);
+		const slotRouteSegments = slotOverride?.routeSegments ?? slot.routeSegments ?? [];
+		const slotOwnerParams = resolveAppPageSegmentParams(options.route.routeSegments, layoutEntries[targetIndex]?.treePosition ?? 0, options.matchedParams);
+		const slotResetKey = resolveAppPageRouteStateKey(slotRouteSegments, slotParams);
 		const overrideOrPageComponent = getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);
 		const defaultComponent = getDefaultExport(slot.default);
 		if (!overrideOrPageComponent && defaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
@@ -302,23 +316,40 @@ function buildAppPageElements(options) {
 			elements[slotId] = AppElementsWire.unmatchedSlotValue;
 			continue;
 		}
-		const slotThenableParams = options.makeThenableParams(slotParams);
-		const slotProps = { params: slotThenableParams };
+		const slotProps = { params: options.makeThenableParams(slotParams) };
 		if (options.searchParams !== void 0) slotProps.searchParams = options.searchParams;
 		if (slotOverride?.props) Object.assign(slotProps, slotOverride.props);
-		let slotElement = /* @__PURE__ */ jsx(slotComponent, { ...slotProps });
+		let slotElement = options.createPageElement ? options.createPageElement(slotComponent, slotProps) : (() => {
+			return /* @__PURE__ */ jsx(slotComponent, { ...slotProps });
+		})();
+		const hasSlotTreeOverride = slotOverride?.pageModule != null || slotOverride?.layoutModules !== void 0;
 		const interceptLayouts = slotOverride?.layoutModules ?? [];
 		for (let layoutIndex = interceptLayouts.length - 1; layoutIndex >= 0; layoutIndex--) {
 			const interceptLayoutComponent = getDefaultExport(interceptLayouts[layoutIndex]);
 			if (!interceptLayoutComponent) continue;
-			slotElement = /* @__PURE__ */ jsx(interceptLayoutComponent, {
-				params: slotThenableParams,
+			const InterceptLayoutComponent = interceptLayoutComponent;
+			const interceptLayoutParams = resolveSlotLayoutParams(slotOverride?.branchSegments ?? slotRouteSegments, slotOverride?.layoutSegments?.[layoutIndex]?.length ?? slotRouteSegments.length, slotParams);
+			slotElement = /* @__PURE__ */ jsx(InterceptLayoutComponent, {
+				params: options.makeThenableParams(interceptLayoutParams),
+				children: slotElement
+			});
+		}
+		if (!hasSlotTreeOverride) for (let layoutIndex = (slot.configLayouts?.length ?? 0) - 1; layoutIndex >= 0; layoutIndex--) {
+			const nestedLayoutComponent = getDefaultExport(slot.configLayouts?.[layoutIndex]);
+			if (!nestedLayoutComponent) continue;
+			const NestedLayoutComponent = nestedLayoutComponent;
+			const nestedLayoutParams = resolveSlotLayoutParams(slotRouteSegments, slot.configLayoutTreePositions?.[layoutIndex] ?? 0, slotParams);
+			slotElement = /* @__PURE__ */ jsx(NestedLayoutComponent, {
+				params: options.makeThenableParams({
+					...slotOwnerParams,
+					...nestedLayoutParams
+				}),
 				children: slotElement
 			});
 		}
-		const slotLayoutComponent = getDefaultExport(slot.layout);
+		const slotLayoutComponent = overrideOrPageComponent ? getDefaultExport(slot.layout) : null;
 		if (slotLayoutComponent) slotElement = /* @__PURE__ */ jsx(slotLayoutComponent, {
-			params: slotThenableParams,
+			params: options.makeThenableParams(slotOwnerParams),
 			children: slotElement
 		});
 		const slotLoadingComponent = getDefaultExport(slot.loading);
@@ -335,8 +366,9 @@ function buildAppPageElements(options) {
 		elements[slotId] = renderAfterAppDependencies(slotElement, targetIndex >= 0 ? slotDependenciesByLayoutIndex[targetIndex] ?? [] : []);
 	}
 	let routeChildren = /* @__PURE__ */ jsx(LayoutSegmentProvider, {
-		segmentMap: { children: [] },
-		children: /* @__PURE__ */ jsx(Slot, { id: pageId })
+		providerId: pageElementId,
+		segmentMap: { children: [APP_PAGE_SEGMENT_KEY] },
+		children: /* @__PURE__ */ jsx(Slot, { id: pageElementId })
 	});
 	if (isPrefetchLoadingShell) if (routeLoadingComponent === null) routeChildren = null;
 	else routeChildren = /* @__PURE__ */ jsx(routeLoadingComponent, {});
@@ -416,18 +448,22 @@ function buildAppPageElements(options) {
 		}
 		const layoutHasElement = getDefaultExport(layoutEntry.layoutModule) !== null;
 		const layoutIndex = layoutIndicesByTreePosition.get(treePosition) ?? -1;
-		const segmentMap = { children: resolveAppPageChildSegments(routeSegments, layoutEntry.treePosition, options.matchedParams) };
+		const segmentMap = { children: resolveAppPageLayoutSegmentProviderSegments(options.route.childrenRouteSegments ?? routeSegments, layoutEntry.treePosition, options.matchedParams) };
 		for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {
 			const slotName = slot.name;
 			if ((slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1) !== layoutIndex) continue;
 			const slotParams = getEffectiveSlotParams(slotKey, slotName);
-			segmentMap[slotName] = slot.routeSegments ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams) : [];
+			const slotOverride = resolveSlotOverride(slotKey, slotName);
+			if (!(getDefaultExport(slotOverride?.pageModule) !== null || getDefaultExport(slot.page) !== null) && options.isRscRequest && options.mountedSlotIds?.has(resolveAppPageSlotId(slot, layoutEntry.treePath))) continue;
+			const slotRouteSegments = slotOverride?.routeSegments ?? slot.routeSegments;
+			segmentMap[slotName] = slotRouteSegments ? resolveAppPageLayoutSegmentProviderSegments(slotRouteSegments, 0, slotParams) : [];
 		}
 		routeChildren = /* @__PURE__ */ jsx(LayoutSegmentProvider, {
+			providerId: layoutEntry.id,
 			segmentMap,
 			children: layoutHasElement ? /* @__PURE__ */ jsx(Slot, {
 				id: layoutEntry.id,
-				parallelSlots: createAppPageParallelSlotEntries(layoutIndex, layoutEntries, options.route, getEffectiveSlotParams),
+				parallelSlots: createAppPageParallelSlotEntries(layoutIndex, layoutEntries, options.route, getEffectiveSlotParams, resolveSlotOverride),
 				children: segmentChildren
 			}) : segmentChildren
 		});

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

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

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

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

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

@@ -1,9 +1,10 @@
 import { AppPageParams } from "./app-page-boundary.js";
 
 //#region src/server/app-page-segment-state.d.ts
+declare const APP_PAGE_SEGMENT_KEY = "__PAGE__";
 declare function resolveAppPageChildSegments(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string[];
 declare function resolveAppPageSegmentStateKey(routeSegments: readonly string[], treePosition: number, params: AppPageParams): 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 };
+export { APP_PAGE_SEGMENT_KEY, resolveAppPageChildSegments, resolveAppPageLeafSegmentStateKey, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey };