vinext 1.0.0-beta.9 → 1.0.1

package/dist/server/app-page-element-builder.js

@@ -1,21 +1,24 @@
 import { isPromiseLike } from "../utils/promise.js";
-import { createAppPageRenderDependency, invokeAppComponent, isAppRenderSuspension, isReactOwnedAppComponent, renderAfterAppDependencies } from "./app-render-dependency.js";
-import { AppElementsWire } from "./app-elements-wire.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
+import { createAppPageRenderDependency, invokeAppComponent, isAppClientReference, isAppRenderSuspension, isReactOwnedAppComponent, renderAfterAppDependencies } from "./app-render-dependency.js";
+import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { createAppPageRenderIdentity } from "./app-page-render-identity.js";
 import { matchRoutePattern } from "../routing/route-pattern.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
+import { withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 import { prepareAppPageHead, resolveActiveParallelRouteHeadInputs } from "./app-page-head.js";
 import { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
-import { isAppPageRouteGroupSegment, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey } from "./app-page-segment-state.js";
+import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey } from "./app-page-segment-state.js";
+import { sanitizeErrorForClient } from "./app-rsc-errors.js";
+import { resolveAppPageModuleTraceSegment, traceCreateComponentTree, traceGetLayoutOrPageModule } from "./app-page-tracing.js";
 import { buildAppPageElements, createAppPageSourcePage, createAppPageTreePath, resolveAppPageLoadingModuleAtOrAbove } from "./app-page-route-wiring.js";
 import { resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport } from "./app-page-http-access-fallback-metadata.js";
+import { ClientPageRoot } from "../shims/client-page-root.js";
 import "./app-rsc-route-matching.js";
 import { resolveAppPageParentHttpAccessBoundary } from "./app-page-boundary.js";
-import { sanitizeErrorForClient } from "./app-rsc-errors.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { Suspense, createElement } from "react";
@@ -23,6 +26,21 @@ import { Suspense, createElement } from "react";
 function resolveInterceptLayoutParams(branchSegments, layoutSegments, params) {
 	return resolveAppPageBranchParams(branchSegments, layoutSegments.length, params, layoutSegments);
 }
+function traceAppPageLayoutModules(modules, routeSegments, treePositions) {
+	for (const [index, module] of modules.entries()) {
+		if (!module) continue;
+		traceGetLayoutOrPageModule(resolveAppPageModuleTraceSegment(routeSegments, treePositions?.[index] ?? 0), () => module);
+	}
+}
+function resolveInterceptLayoutTraceSegment(branchSegments, layoutSegments) {
+	return resolveAppPageModuleTraceSegment(branchSegments ?? layoutSegments, layoutSegments.length);
+}
+function traceAppPageInterceptLayoutModules(modules, branchSegments, layoutSegments) {
+	for (const [index, module] of (modules ?? []).entries()) {
+		if (!module) continue;
+		traceGetLayoutOrPageModule(resolveInterceptLayoutTraceSegment(branchSegments, layoutSegments?.[index] ?? []), () => module);
+	}
+}
 /**
 * Build the App Router element tree for a matched route.
 *
@@ -42,7 +60,7 @@ function resolveInterceptLayoutParams(branchSegments, layoutSegments, params) {
 async function buildPageElements(options) {
 	const { route, params, routePath, displayPathname = routePath, pageRequest, globalErrorModule, rootNotFoundModule, rootForbiddenModule, rootUnauthorizedModule, metadataRoutes } = options;
 	const slotParamOverrides = resolveSlotParamOverrides(route, routePath);
-	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION, observeMetadataSearchParamsAccess = false, observePageSearchParamsAccess = false, serveStreamingMetadata, isProduction = process.env.NODE_ENV === "production" } = pageRequest;
+	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION, observeMetadataSearchParamsAccess = false, observePageSearchParamsAccess = false, isForceStatic = false, serveStreamingMetadata, isProduction = process.env.NODE_ENV === "production" } = pageRequest;
 	const pageModule = route.page;
 	const isSiblingIntercept = opts?.interceptSlotKey === "__vinext_page_intercept" && !!opts?.interceptPage;
 	const effectivePageModule = isSiblingIntercept ? opts.interceptPage : pageModule;
@@ -71,17 +89,22 @@ async function buildPageElements(options) {
 			const treePosition = route.layoutTreePositions?.[0] ?? 0;
 			noExportRootLayout = createAppPageTreePath(route.routeSegments, treePosition);
 		}
-		return {
-			...AppElementsWire.createMetadataEntries({
-				interception: renderIdentity.interception,
-				interceptionContext: renderIdentity.interceptionContext,
-				layoutIds: noExportLayoutIds,
-				rootLayoutTreePath: noExportRootLayout,
-				routeId: renderIdentity.routeId,
-				sourcePage: createAppPageSourcePage(sourcePageSegments)
-			}),
-			[renderIdentity.routeId]: createElement("div", null, "Page has no default export")
-		};
+		return traceCreateComponentTree(() => {
+			traceGetLayoutOrPageModule(APP_PAGE_SEGMENT_KEY, () => effectivePageModule);
+			traceAppPageLayoutModules(route.layouts, route.routeSegments ?? [], route.layoutTreePositions);
+			if (isSiblingIntercept) traceAppPageInterceptLayoutModules(opts?.interceptLayouts, opts?.interceptBranchSegments, opts?.interceptLayoutSegments);
+			return {
+				...AppElementsWire.createMetadataEntries({
+					interception: renderIdentity.interception,
+					interceptionContext: renderIdentity.interceptionContext,
+					layoutIds: noExportLayoutIds,
+					rootLayoutTreePath: noExportRootLayout,
+					routeId: renderIdentity.routeId,
+					sourcePage: createAppPageSourcePage(sourcePageSegments)
+				}),
+				[renderIdentity.routeId]: createElement("div", null, "Page has no default export")
+			};
+		});
 	}
 	const activeParallelRouteHeadInputs = resolveActiveParallelRouteHeadInputs({
 		interceptBranchSegments: opts?.interceptBranchSegments ?? null,
@@ -110,6 +133,7 @@ async function buildPageElements(options) {
 		},
 		...opts?.interceptNotFound ? {
 			notFoundModule: opts.interceptNotFound,
+			notFoundModuleRouteSegments: (opts.interceptNotFoundBranchSegments ?? opts.interceptSourcePageSegments ?? route.routeSegments ?? []).slice(0, opts.interceptNotFoundTreePosition ?? 0),
 			notFoundParams: resolveAppPageBranchParams(opts.interceptNotFoundBranchSegments ?? opts.interceptBranchSegments ?? route.routeSegments ?? [], opts.interceptNotFoundTreePosition ?? 0, effectiveParams)
 		} : {},
 		ownerTreePosition: route.routeSegments?.length ?? 0
@@ -155,6 +179,8 @@ async function buildPageElements(options) {
 		return {
 			boundaryModule,
 			boundaryParams: boundaryModule && boundaryTreePosition != null ? resolveAppPageSegmentParams(route.routeSegments ?? [], boundaryTreePosition, effectiveParams) : {},
+			boundaryRouteSegments: (route.routeSegments ?? []).slice(0, boundaryTreePosition ?? 0),
+			errorConvention: "not-found",
 			layoutModules: route.layouts,
 			layoutTreePositions: route.layoutTreePositions,
 			parallelBranches: activeParallelRouteHeadInputs,
@@ -194,25 +220,33 @@ async function buildPageElements(options) {
 	const streamingMetadataOutlet = streamingMetadataOutletInputs.length > 0 ? Promise.all(streamingMetadataOutletInputs).then(() => null) : null;
 	streamingMetadataOutlet?.catch(() => null);
 	const pageProps = { params: makeThenableParams(effectiveParams) };
-	const hasRequestSearchParams = Object.keys(pageSearchParams).length > 0;
 	const pageTreePosition = (sourcePageSegments ?? route.routeSegments ?? []).length;
 	const hasPageLoadingBoundary = resolveAppPageLoadingModuleAtOrAbove(route, pageTreePosition) !== null || isSiblingIntercept && resolveAppPageLoadingModuleAtOrAbove({
 		loading: null,
 		loadings: opts?.interceptLoadings,
 		loadingTreePositions: opts?.interceptLoadingTreePositions
 	}, pageTreePosition) !== null;
+	const hasEmptyClientPageSearchParams = isForceStatic || isProduction && process.env.__NEXT_CONFIG_OUTPUT === "export";
 	const pageRenderDependency = EffectivePageComponent && !isReactOwnedAppComponent(EffectivePageComponent) ? createAppPageRenderDependency() : null;
 	const createPageElement = (PageComponent, props, renderDependency) => {
+		if (searchParams && isAppClientReference(PageComponent)) {
+			const { searchParams: _slotSearchParams, ...pageProps } = props;
+			return createElement(ClientPageRoot, {
+				Component: PageComponent,
+				pageProps,
+				...hasEmptyClientPageSearchParams ? { emptySearchParams: true } : {}
+			});
+		}
 		if (isReactOwnedAppComponent(PageComponent)) {
 			const invocationProps = { ...props };
-			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams, { markDynamic: hasRequestSearchParams }) : makeThenableParams(pageSearchParams);
-			return createElement(PageComponent, invocationProps);
+			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
+			return createElement(PageComponent, withUseCachePageMarker(PageComponent, invocationProps));
 		}
 		const PageInvoker = () => {
 			const invocationProps = { ...props };
 			if (searchParams) invocationProps.searchParams = observePageSearchParamsAccess ? makeObservedAppPageSearchParamsThenable(pageSearchParams) : makeThenableParams(pageSearchParams);
 			try {
-				const result = invokeAppComponent(PageComponent, invocationProps);
+				const result = invokeAppComponent(PageComponent, withUseCachePageMarker(PageComponent, invocationProps));
 				if (isPromiseLike(result)) {
 					if (renderDependency) Promise.resolve().then(() => renderDependency.release());
 					return Promise.resolve(result).then((resolvedResult) => renderDependency ? renderAfterAppDependencies(resolvedResult, renderDependency.resultDependencies) : resolvedResult);
@@ -233,11 +267,12 @@ async function buildPageElements(options) {
 	const pageSearchParamsThenable = searchParams ? makeThenableParams(pageSearchParams) : void 0;
 	const mountedSlotIds = mountedSlotsHeader ? new Set(mountedSlotsHeader.split(" ")) : null;
 	const slotOverrides = buildSlotOverrides(route, params, routePath, opts);
-	let siblingInterceptElement = isSiblingIntercept && EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps, pageRenderDependency) : null;
-	if (isSiblingIntercept && siblingInterceptElement !== null) {
+	const createSiblingInterceptElement = () => {
+		let element = isSiblingIntercept && EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps, pageRenderDependency) : null;
+		if (!isSiblingIntercept || element === null) return element;
 		const layoutIndexesByTreePosition = /* @__PURE__ */ new Map();
 		for (const [index, layoutModule] of (opts?.interceptLayouts ?? []).entries()) {
-			if (!layoutModule?.default) continue;
+			if (!layoutModule) continue;
 			const treePosition = opts?.interceptLayoutSegments?.[index]?.length ?? 0;
 			const indexes = layoutIndexesByTreePosition.get(treePosition) ?? [];
 			indexes.push(index);
@@ -254,50 +289,58 @@ async function buildPageElements(options) {
 			const treePosition = treePositions[index];
 			const loadingIndex = loadingIndexesByTreePosition.get(treePosition);
 			const LoadingComponent = loadingIndex === void 0 ? null : opts?.interceptLoadings?.[loadingIndex]?.default;
-			if (LoadingComponent) siblingInterceptElement = createElement(Suspense, { fallback: createElement(LoadingComponent) }, siblingInterceptElement);
+			if (LoadingComponent) element = createElement(Suspense, { fallback: createElement(LoadingComponent) }, element);
 			const layoutIndexes = layoutIndexesByTreePosition.get(treePosition) ?? [];
 			for (let layoutOffset = layoutIndexes.length - 1; layoutOffset >= 0; layoutOffset--) {
 				const layoutIndex = layoutIndexes[layoutOffset];
-				const LayoutComponent = opts?.interceptLayouts?.[layoutIndex]?.default;
-				if (!LayoutComponent) continue;
+				const layoutModule = opts?.interceptLayouts?.[layoutIndex];
+				if (!layoutModule) continue;
 				const interceptLayoutSegments = opts?.interceptLayoutSegments?.[layoutIndex] ?? [];
-				siblingInterceptElement = createElement(LayoutComponent, { params: makeThenableParams(resolveInterceptLayoutParams(opts?.interceptBranchSegments ?? interceptLayoutSegments, interceptLayoutSegments, effectiveParams)) }, siblingInterceptElement);
+				const LayoutComponent = traceGetLayoutOrPageModule(resolveInterceptLayoutTraceSegment(opts?.interceptBranchSegments, interceptLayoutSegments), () => layoutModule.default);
+				if (!LayoutComponent) continue;
+				const interceptLayoutParams = resolveInterceptLayoutParams(opts?.interceptBranchSegments ?? interceptLayoutSegments, interceptLayoutSegments, effectiveParams);
+				element = createElement(LayoutComponent, { params: makeThenableParams(interceptLayoutParams) }, element);
 			}
 		}
-	}
-	return buildAppPageElements({
-		element: isSiblingIntercept ? siblingInterceptElement : EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps, pageRenderDependency) : null,
-		createPageElement,
-		globalErrorModule: globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE,
-		isRscRequest,
-		interceptionId: opts?.interceptionId ?? null,
-		layoutParamAccess: options.layoutParamAccess,
-		mountedSlotIds,
-		makeThenableParams,
-		matchedParams: params,
-		pageRenderDependency,
-		metadataPlacement,
-		resolvedMetadata,
-		resolvedMetadataPathname: routePath,
-		resolvedViewport,
-		scriptNonce: options.scriptNonce,
-		streamingMetadata,
-		streamingMetadataOutlet,
-		streamingMetadataOutletSuspended: streamGeneratedHead,
-		streamingMetadataTags,
-		renderIdentity,
-		routePath,
-		semanticPageIdentity,
-		semanticInterceptionTargetRouteId: opts?.interceptTargetRouteGraphId ?? null,
-		sourcePageSegments,
-		rootNotFoundModule: rootNotFoundModule ?? null,
-		rootForbiddenModule: rootForbiddenModule ?? null,
-		rootUnauthorizedModule: rootUnauthorizedModule ?? null,
-		route,
-		searchParams: pageSearchParamsThenable,
-		slotOverrides,
-		renderMode,
-		trailingSlash: options.trailingSlash
+		return element;
+	};
+	return traceCreateComponentTree(() => {
+		if (effectivePageModule) traceGetLayoutOrPageModule(APP_PAGE_SEGMENT_KEY, () => effectivePageModule);
+		const siblingInterceptElement = createSiblingInterceptElement();
+		return buildAppPageElements({
+			element: isSiblingIntercept ? siblingInterceptElement : EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps, pageRenderDependency) : null,
+			createPageElement,
+			globalErrorModule: globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE,
+			isRscRequest,
+			interceptionId: opts?.interceptionId ?? null,
+			layoutParamAccess: options.layoutParamAccess,
+			mountedSlotIds,
+			makeThenableParams,
+			matchedParams: params,
+			pageRenderDependency,
+			metadataPlacement,
+			resolvedMetadata,
+			resolvedMetadataPathname: routePath,
+			resolvedViewport,
+			scriptNonce: options.scriptNonce,
+			streamingMetadata,
+			streamingMetadataOutlet,
+			streamingMetadataOutletSuspended: streamGeneratedHead,
+			streamingMetadataTags,
+			renderIdentity,
+			routePath,
+			semanticPageIdentity,
+			semanticInterceptionTargetRouteId: opts?.interceptTargetRouteGraphId ?? null,
+			sourcePageSegments,
+			rootNotFoundModule: rootNotFoundModule ?? null,
+			rootForbiddenModule: rootForbiddenModule ?? null,
+			rootUnauthorizedModule: rootUnauthorizedModule ?? null,
+			route,
+			searchParams: pageSearchParamsThenable,
+			slotOverrides,
+			renderMode,
+			trailingSlash: options.trailingSlash
+		});
 	});
 }
 /**

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

@@ -2,8 +2,8 @@ import { ClassificationReason } from "../build/layout-classification-types.js";
 import { LayoutFlags } from "./app-elements-wire.js";
 import "./app-elements.js";
 //#region src/server/app-page-execution.d.ts
-declare function tagAppPageMetadataError<T>(error: T): T;
-type AppPageSpecialError = {
+export declare function tagAppPageMetadataError<T>(error: T): T;
+export type AppPageSpecialError = {
   kind: "redirect";
   location: string;
   statusCode: number;
@@ -14,7 +14,7 @@ type AppPageSpecialError = {
   statusCode: number;
   fromMetadata?: boolean;
 };
-type AppPageFontPreload = {
+export type AppPageFontPreload = {
   href: string;
   type: string;
 };
@@ -83,7 +83,7 @@ type ProbeAppPageLayoutsResult = {
   response: Response | null;
   layoutFlags: LayoutFlags;
 };
-type LayoutClassificationOptions = {
+export type LayoutClassificationOptions = {
   /** Build-time classifications from segment config or module graph, keyed by layout index. */
   buildTimeClassifications?: ReadonlyMap<number, "static" | "dynamic"> | null;
   /**
@@ -133,15 +133,15 @@ type ProbeAppPageThrownErrorOptions = {
   probePage: () => unknown;
   runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;
 };
-declare function resolveAppPageSpecialError(error: unknown): AppPageSpecialError | null;
-declare function buildAppPageSpecialErrorResponse(options: BuildAppPageSpecialErrorResponseOptions): Promise<Response>;
+export declare function resolveAppPageSpecialError(error: unknown): AppPageSpecialError | null;
+export declare function buildAppPageSpecialErrorResponse(options: BuildAppPageSpecialErrorResponseOptions): Promise<Response>;
 /** See `LayoutFlags` type docblock in app-elements.ts for lifecycle. */
-declare function probeAppPageLayouts(options: ProbeAppPageLayoutsOptions): Promise<ProbeAppPageLayoutsResult>;
-declare function probeAppPageComponent(options: ProbeAppPageComponentOptions): Promise<Response | null>;
-declare function probeAppPageThrownError(options: ProbeAppPageThrownErrorOptions): Promise<unknown>;
-declare function readAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ArrayBuffer>;
-declare function bufferAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ReadableStream<Uint8Array>>;
-declare function teeAppPageRscStreamForCapture(stream: ReadableStream<Uint8Array>, shouldCapture: boolean): AppPageRscStreamCapture;
-declare function buildAppPageFontLinkHeader(preloads: readonly AppPageFontPreload[] | null | undefined): string;
+export declare function probeAppPageLayouts(options: ProbeAppPageLayoutsOptions): Promise<ProbeAppPageLayoutsResult>;
+export declare function probeAppPageComponent(options: ProbeAppPageComponentOptions): Promise<Response | null>;
+export declare function probeAppPageThrownError(options: ProbeAppPageThrownErrorOptions): Promise<unknown>;
+export declare function readAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ArrayBuffer>;
+export declare function bufferAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ReadableStream<Uint8Array>>;
+export declare function teeAppPageRscStreamForCapture(stream: ReadableStream<Uint8Array>, shouldCapture: boolean): AppPageRscStreamCapture;
+export declare function buildAppPageFontLinkHeader(preloads: readonly AppPageFontPreload[] | null | undefined): string;
 //#endregion
-export { AppPageFontPreload, AppPageSpecialError, LayoutClassificationOptions, type LayoutFlags, bufferAppPageBinaryStream, buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, probeAppPageThrownError, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };
+export type { LayoutFlags };

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

@@ -199,11 +199,13 @@ async function probeAppPageLayouts(options) {
 					if (errorResponse) return errorResponse;
 					const observationDynamic = cls.isLayoutObservationDynamic?.(layoutId) === true;
 					layoutFlags[layoutId] = buildTimeResult === "dynamic" || observationDynamic ? "d" : "s";
-					if (cls.debugClassification) if (observationDynamic && buildTimeResult === "static") cls.debugClassification(layoutId, {
-						layer: "runtime-probe",
-						outcome: "dynamic"
-					});
-					else cls.debugClassification(layoutId, cls.buildTimeReasons?.get(layoutIndex) ?? { layer: "no-classifier" });
+					if (cls.debugClassification) {
+						if (observationDynamic && buildTimeResult === "static") cls.debugClassification(layoutId, {
+							layer: "runtime-probe",
+							outcome: "dynamic"
+						});
+						else cls.debugClassification(layoutId, cls.buildTimeReasons?.get(layoutIndex) ?? { layer: "no-classifier" });
+					}
 					continue;
 				}
 				if (cls) {
@@ -257,8 +259,10 @@ async function probeAppPageComponent(options) {
 		const outcome = await runWithConnectionProbe(async () => {
 			try {
 				const pageResult = options.probePage();
-				if (isPromiseLike(pageResult)) if (options.awaitAsyncResult) await pageResult;
-				else Promise.resolve(pageResult).catch(() => {});
+				if (isPromiseLike(pageResult)) {
+					if (options.awaitAsyncResult) await pageResult;
+					else Promise.resolve(pageResult).catch(() => {});
+				}
 			} catch (error) {
 				return options.onError(error);
 			}

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

@@ -4,30 +4,34 @@ import { ThenableParamsObserver } from "../shims/thenable-params.js";
 import { Metadata, ResolvedViewport } from "../shims/metadata.js";
 import { applyFileBasedMetadata } from "./file-based-metadata.js";
 //#region src/server/app-page-head.d.ts
-type AppPageSearchParams = Record<string, string | string[]>;
-type AppPageHeadModule = Record<string, unknown>;
-type ApplyAppPageFileBasedMetadata = typeof applyFileBasedMetadata;
-type OrderedAppPageMetadataSource<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+export type AppPageSearchParams = Record<string, string | string[]>;
+export type AppPageHeadModule = Record<string, unknown>;
+export type ApplyAppPageFileBasedMetadata = typeof applyFileBasedMetadata;
+export type OrderedAppPageMetadataSource<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   /** Preserve an empty result as the most specific file-metadata source. */
   includeWhenEmpty?: boolean;
   module: TModule;
+  moduleRoute: string;
   params: AppPageParams;
   routeSegments: readonly string[];
   searchParams?: AppPageSearchParams;
   searchParamsObserver?: ThenableParamsObserver;
 };
-type AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+export type AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   layoutParams?: readonly AppPageParams[] | null;
   layoutModule?: TModule | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   layoutTreePositions?: readonly number[] | null;
+  moduleRoutePrefixSegments?: readonly string[] | null;
+  moduleRouteSegments?: readonly string[] | null;
   pageModule?: TModule | null;
   params?: AppPageParams | null;
   routeSegments?: readonly string[] | null;
 };
-type ActiveParallelRouteHeadInput<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+export type ActiveParallelRouteHeadInput<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   head: AppPageHeadParallelRoute<TModule>;
   notFoundModule?: TModule | null;
+  notFoundModuleRouteSegments?: readonly string[] | null;
   notFoundParams?: AppPageParams | null;
   ownerTreePosition: number;
 };
@@ -88,17 +92,17 @@ type AppPageMetadataOutputOptions = {
   routePath: string;
   routeSegments?: readonly string[] | null;
 };
-type ResolveOrderedAppPageMetadataOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = AppPageMetadataOutputOptions & {
+export type ResolveOrderedAppPageMetadataOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = AppPageMetadataOutputOptions & {
   sources: readonly OrderedAppPageMetadataSource<TModule>[];
 };
-type ResolveAppPageHeadResult = {
+export type ResolveAppPageHeadResult = {
   hasDynamicMetadata: boolean;
   hasSearchParams: boolean;
   metadata: Metadata | null;
   pageSearchParams: AppPageSearchParams;
   viewport: ResolvedViewport;
 };
-type PreparedAppPageHead = Omit<ResolveAppPageHeadResult, "metadata" | "viewport"> & {
+export type PreparedAppPageHead = Omit<ResolveAppPageHeadResult, "metadata" | "viewport"> & {
   metadata: Promise<Metadata | null>;
   viewport: Promise<ResolvedViewport>;
 };
@@ -106,8 +110,8 @@ type AppPageSearchParamsCollection = {
   hasSearchParams: boolean;
   pageSearchParams: AppPageSearchParams;
 };
-declare function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHeadModule>(options: ResolveActiveParallelRouteHeadInputsOptions<TModule>): ActiveParallelRouteHeadInput<TModule>[];
-declare function collectAppPageSearchParams(searchParams: URLSearchParams | null | undefined): AppPageSearchParamsCollection;
+export declare function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHeadModule>(options: ResolveActiveParallelRouteHeadInputsOptions<TModule>): ActiveParallelRouteHeadInput<TModule>[];
+export declare function collectAppPageSearchParams(searchParams: URLSearchParams | null | undefined): AppPageSearchParamsCollection;
 /**
  * Resolve an explicit metadata-source sequence.
  *
@@ -115,8 +119,8 @@ declare function collectAppPageSearchParams(searchParams: URLSearchParams | null
  * only supplies each source with its accumulated parent, merges the results,
  * and applies file-based metadata at the end.
  */
-declare function resolveOrderedAppPageMetadata<TModule extends AppPageHeadModule>(options: ResolveOrderedAppPageMetadataOptions<TModule>): Promise<Metadata | null>;
-declare function resolveAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): Promise<ResolveAppPageHeadResult>;
+export declare function resolveOrderedAppPageMetadata<TModule extends AppPageHeadModule>(options: ResolveOrderedAppPageMetadataOptions<TModule>): Promise<Metadata | null>;
+export declare function resolveAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): Promise<ResolveAppPageHeadResult>;
 /**
  * Start metadata and viewport resolution without coupling their completion.
  *
@@ -124,6 +128,5 @@ declare function resolveAppPageHead<TModule extends AppPageHeadModule>(options:
  * still waiting for viewport tags before the shell is emitted. Blocking
  * callers use {@link resolveAppPageHead} and observe the same result as before.
  */
-declare function prepareAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): PreparedAppPageHead;
-//#endregion
-export { ActiveParallelRouteHeadInput, AppPageHeadModule, AppPageHeadParallelRoute, AppPageSearchParams, ApplyAppPageFileBasedMetadata, OrderedAppPageMetadataSource, PreparedAppPageHead, ResolveAppPageHeadResult, ResolveOrderedAppPageMetadataOptions, collectAppPageSearchParams, prepareAppPageHead, resolveActiveParallelRouteHeadInputs, resolveAppPageHead, resolveOrderedAppPageMetadata };
+export declare function prepareAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): PreparedAppPageHead;
+//#endregion

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

@@ -1,7 +1,9 @@
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
+import { searchParamsToRecord } from "../utils/query.js";
 import { mergeMetadataEntries, mergeViewport, postProcessMetadata, resolveModuleMetadata as resolveModuleMetadata$1, resolveModuleViewport } from "../shims/metadata.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { tagAppPageMetadataError } from "./app-page-execution.js";
+import { createAppMetadataModuleRoute, traceGenerateMetadata } from "./app-metadata-tracing.js";
 //#region src/server/app-page-head.ts
 /**
 * Wrapped {@link _resolveModuleMetadata} that tags any thrown error with the
@@ -15,9 +17,9 @@ import { tagAppPageMetadataError } from "./app-page-execution.js";
 * See https://github.com/cloudflare/vinext/issues/1347
 * and Next.js test/e2e/app-dir/metadata-streaming.
 */
-async function resolveModuleMetadata(...args) {
+async function resolveModuleMetadata(moduleRoute, ...args) {
 	try {
-		return await resolveModuleMetadata$1(...args);
+		return await (typeof args[0].generateMetadata === "function" ? traceGenerateMetadata(moduleRoute, () => resolveModuleMetadata$1(...args)) : resolveModuleMetadata$1(...args));
 	} catch (error) {
 		throw tagAppPageMetadataError(error);
 	}
@@ -25,6 +27,7 @@ async function resolveModuleMetadata(...args) {
 function resolveActiveParallelRouteHeadInputs(options) {
 	return Object.entries(options.slots ?? {}).map(([slotKey, slot]) => {
 		const ownerTreePosition = options.layoutTreePositions?.[slot.layoutIndex ?? 0] ?? 0;
+		const ownerRouteSegments = options.routeSegments.slice(0, ownerTreePosition);
 		const ownerParams = resolveAppPageSegmentParams(options.routeSegments, ownerTreePosition, options.params);
 		const slotParams = options.slotParams?.[slotKey] ?? options.params;
 		const notFoundParams = slot.notFound ? {
@@ -35,6 +38,8 @@ function resolveActiveParallelRouteHeadInputs(options) {
 			const interceptLayouts = options.interceptLayouts ?? [];
 			const inheritedSlotNotFound = slot.notFoundTreePosition === 0 ? slot.notFound ?? null : null;
 			const interceptNotFound = options.interceptNotFound ?? inheritedSlotNotFound;
+			const interceptRouteSegments = options.interceptSourcePageSegments ?? options.routeSegments;
+			const interceptNotFoundRouteSegments = options.interceptNotFound ? (options.interceptNotFoundBranchSegments ?? interceptRouteSegments).slice(0, options.interceptNotFoundTreePosition ?? 0) : [...ownerRouteSegments, ...(slot.routeSegments ?? []).slice(0, slot.notFoundTreePosition ?? 0)];
 			const interceptNotFoundParams = interceptNotFound ? {
 				...ownerParams,
 				...resolveParallelLayoutParams(options.interceptNotFoundBranchSegments ?? options.interceptBranchSegments ?? options.routeSegments, options.interceptNotFound ? options.interceptNotFoundTreePosition ?? 0 : slot.notFoundTreePosition ?? 0, options.interceptParams ?? options.params)
@@ -52,15 +57,18 @@ function resolveActiveParallelRouteHeadInputs(options) {
 					layoutTreePositions: [...slot.layout ? [0] : [], ...interceptLayouts.filter(isPresent).map(() => options.routeSegments.length)],
 					pageModule: options.interceptPage,
 					params: options.interceptParams ?? options.params,
-					routeSegments: options.interceptSourcePageSegments ?? options.routeSegments
+					routeSegments: interceptRouteSegments
 				},
 				...interceptNotFound ? {
 					notFoundModule: interceptNotFound,
+					notFoundModuleRouteSegments: interceptNotFoundRouteSegments,
 					notFoundParams: interceptNotFoundParams
 				} : {},
 				ownerTreePosition
 			};
 		}
+		const slotRouteSegments = slot.routeSegments ?? options.routeSegments;
+		const moduleRouteSegments = slot.routeSegments ?? [];
 		return {
 			head: {
 				layoutModules: [slot.layout, ...slot.configLayouts ?? []].filter(isPresent),
@@ -71,10 +79,13 @@ function resolveActiveParallelRouteHeadInputs(options) {
 				layoutTreePositions: [...slot.layout ? [0] : [], ...slot.configLayoutTreePositions ?? []],
 				pageModule: slot.page,
 				params: slotParams,
-				routeSegments: slot.routeSegments ?? options.routeSegments
+				...ownerRouteSegments.length > 0 ? { moduleRoutePrefixSegments: ownerRouteSegments } : {},
+				...slot.routeSegments ? {} : { moduleRouteSegments },
+				routeSegments: slotRouteSegments
 			},
 			...slot.notFound ? {
 				notFoundModule: slot.notFound,
+				notFoundModuleRouteSegments: [...ownerRouteSegments, ...moduleRouteSegments.slice(0, slot.notFoundTreePosition ?? 0)],
 				notFoundParams
 			} : {},
 			ownerTreePosition
@@ -91,23 +102,9 @@ function hasGenerateMetadata(module) {
 	return typeof module?.generateMetadata === "function";
 }
 function collectAppPageSearchParams(searchParams) {
-	const pageSearchParams = Object.create(null);
-	let hasSearchParams = false;
-	searchParams?.forEach((value, key) => {
-		hasSearchParams = true;
-		const currentValue = pageSearchParams[key];
-		if (Array.isArray(currentValue)) {
-			pageSearchParams[key] = [...currentValue, value];
-			return;
-		}
-		if (currentValue !== void 0) {
-			pageSearchParams[key] = [currentValue, value];
-			return;
-		}
-		pageSearchParams[key] = value;
-	});
+	const pageSearchParams = searchParamsToRecord(searchParams);
 	return {
-		hasSearchParams,
+		hasSearchParams: Object.keys(pageSearchParams).length > 0,
 		pageSearchParams
 	};
 }
@@ -154,7 +151,7 @@ async function resolveLayoutMetadata(layoutInputs, params, routeSegments) {
 	for (const layoutInput of layoutInputs) {
 		const parentForLayout = accumulatedMetadata;
 		const layoutParams = resolveAppPageSegmentParams(routeSegments, layoutInput.treePosition, params);
-		const metadataPromise = resolveModuleMetadata(layoutInput.module, layoutParams, void 0, parentForLayout);
+		const metadataPromise = resolveModuleMetadata(createAppMetadataModuleRoute(routeSegments.slice(0, layoutInput.treePosition), "layout"), layoutInput.module, layoutParams, void 0, parentForLayout);
 		layoutMetadataPromises.push(metadataPromise);
 		metadataPromise.catch(() => null);
 		accumulatedMetadata = metadataPromise.then(async (metadataResult) => {
@@ -194,6 +191,8 @@ function parallelRouteHasDynamicMetadata(parallelRoute) {
 async function resolveParallelRouteMetadata(parallelRoute, fallbackParams, fallbackRouteSegments, pageSearchParams, parent, searchParamsObserver) {
 	const params = parallelRoute.params ?? fallbackParams;
 	const routeSegments = parallelRoute.routeSegments ?? fallbackRouteSegments;
+	const moduleRoutePrefixSegments = parallelRoute.moduleRoutePrefixSegments ?? [];
+	const moduleRouteSegments = parallelRoute.moduleRouteSegments ?? routeSegments;
 	const metadataResults = [];
 	const metadataSources = [];
 	let accumulatedMetadata = parent;
@@ -201,7 +200,8 @@ async function resolveParallelRouteMetadata(parallelRoute, fallbackParams, fallb
 	const layoutTreePositions = parallelRoute.layoutTreePositions ?? [];
 	const layoutParams = parallelRoute.layoutParams ?? [];
 	for (const [index, layoutModule] of layoutModules.entries()) {
-		const layoutMetadata = await resolveModuleMetadata(layoutModule, layoutParams[index] ?? resolveParallelLayoutParams(routeSegments, layoutTreePositions[index] ?? 0, params), void 0, accumulatedMetadata);
+		const currentLayoutParams = layoutParams[index] ?? resolveParallelLayoutParams(routeSegments, layoutTreePositions[index] ?? 0, params);
+		const layoutMetadata = await resolveModuleMetadata(createAppMetadataModuleRoute([...moduleRoutePrefixSegments, ...moduleRouteSegments.slice(0, layoutTreePositions[index] ?? 0)], "layout"), layoutModule, currentLayoutParams, void 0, accumulatedMetadata);
 		metadataResults.push(layoutMetadata);
 		metadataSources.push({
 			metadata: layoutMetadata,
@@ -213,7 +213,7 @@ async function resolveParallelRouteMetadata(parallelRoute, fallbackParams, fallb
 		}
 	}
 	if (parallelRoute.pageModule) {
-		const pageMetadata = await resolveModuleMetadata(parallelRoute.pageModule, params, pageSearchParams, accumulatedMetadata, searchParamsObserver);
+		const pageMetadata = await resolveModuleMetadata(createAppMetadataModuleRoute([...moduleRoutePrefixSegments, ...moduleRouteSegments], "page"), parallelRoute.pageModule, params, pageSearchParams, accumulatedMetadata, searchParamsObserver);
 		metadataResults.push(pageMetadata);
 		metadataSources.push({
 			metadata: pageMetadata,
@@ -267,7 +267,7 @@ function resolveOrderedAppPageMetadata(options) {
 		let accumulatedEntriesPromise = Promise.resolve([]);
 		for (const source of options.sources) {
 			const parentPromise = accumulatedEntriesPromise.then((entries) => entries.length > 0 ? mergeMetadataEntries(entries) : {});
-			const metadataPromise = resolveModuleMetadata(source.module, source.params, source.searchParams, parentPromise, source.searchParamsObserver);
+			const metadataPromise = resolveModuleMetadata(source.moduleRoute, source.module, source.params, source.searchParams, parentPromise, source.searchParamsObserver);
 			metadataPromises.push(metadataPromise);
 			metadataPromise.catch(() => null);
 			accumulatedEntriesPromise = Promise.all([accumulatedEntriesPromise, metadataPromise]).then(([entries, metadata]) => metadata ? [...entries, { metadata }] : entries);
@@ -317,7 +317,7 @@ function prepareAppPageHeadInner(options) {
 	layoutMetadataResultsForParent.catch(() => null);
 	const pageParentPromise = layoutMetadataResultsForParent.then((metadataResults) => metadataResults.length > 0 ? mergeMetadataEntries(metadataResults.map((metadata) => ({ metadata }))) : {});
 	pageParentPromise.catch(() => null);
-	const pageMetadataPromise = options.pageModule ? resolveModuleMetadata(options.pageModule, options.params, pageSearchParams, pageParentPromise, options.searchParamsObserver) : Promise.resolve(null);
+	const pageMetadataPromise = options.pageModule ? resolveModuleMetadata(createAppMetadataModuleRoute(routeSegments, "page"), options.pageModule, options.params, pageSearchParams, pageParentPromise, options.searchParamsObserver) : Promise.resolve(null);
 	const parallelRoutes = options.parallelRoutes ?? [];
 	const parallelRouteMetadataPromise = Promise.all(parallelRoutes.map((parallelRoute) => resolveParallelRouteMetadata(parallelRoute, options.params, routeSegments, pageSearchParams, pageParentPromise, options.searchParamsObserver)));
 	const parallelRouteViewportPromises = [];

package/dist/server/app-page-http-access-fallback-metadata.d.ts

@@ -6,8 +6,10 @@ import { ActiveParallelRouteHeadInput, AppPageHeadModule, ApplyAppPageFileBasedM
 type HttpAccessFallbackMetadataPlanOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   boundaryModule?: TModule | null;
   boundaryParams: AppPageParams;
+  boundaryRouteSegments?: readonly string[] | null;
   /** Whether active branches may replace the fallback with their local not-found convention. */
   branchNotFoundConventions?: boolean;
+  errorConvention: "forbidden" | "not-found" | "unauthorized";
   layoutModules: readonly (TModule | null | undefined)[];
   layoutTreePositions?: readonly number[] | null;
   parallelBranches?: readonly ActiveParallelRouteHeadInput<TModule>[] | null;
@@ -22,8 +24,7 @@ type ResolveHttpAccessFallbackMetadataOptions<TModule extends AppPageHeadModule
   metadataRoutes: readonly MetadataFileRoute[];
   routePath: string;
 };
-declare function createHttpAccessFallbackMetadataPlan<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): OrderedAppPageMetadataSource<TModule>[];
-declare function resolveHttpAccessFallbackMetadata<TModule extends AppPageHeadModule>(options: ResolveHttpAccessFallbackMetadataOptions<TModule>): Promise<Metadata | null>;
-declare function resolveHttpAccessFallbackViewport<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): Promise<ResolvedViewport>;
-//#endregion
-export { createHttpAccessFallbackMetadataPlan, resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport };
+export declare function createHttpAccessFallbackMetadataPlan<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): OrderedAppPageMetadataSource<TModule>[];
+export declare function resolveHttpAccessFallbackMetadata<TModule extends AppPageHeadModule>(options: ResolveHttpAccessFallbackMetadataOptions<TModule>): Promise<Metadata | null>;
+export declare function resolveHttpAccessFallbackViewport<TModule extends AppPageHeadModule>(options: HttpAccessFallbackMetadataPlanOptions<TModule>): Promise<ResolvedViewport>;
+//#endregion