vinext 1.2.1 → 1.3.1

package/dist/server/app-client-reference-preloader.js

@@ -1,44 +1,82 @@
+import { shareIsolatePromise } from "./isolate-shared-promise.js";
 //#region src/server/app-client-reference-preloader.ts
 const resolvedPreload = Promise.resolve();
+/**
+* The client references a render of `routePattern` preloads, or of no route
+* when it is null, and those it streams.
+* Undefined, meaning every reference, without a plan or a route to look up,
+* or for a pattern the plan doesn't know.
+*/
+function resolveRouteClientReferences(plan, routePattern) {
+	if (!plan || routePattern === void 0) return void 0;
+	let files;
+	if (routePattern === null) files = plan.routeless;
+	else if (Object.hasOwn(plan.routes, routePattern)) files = plan.routes[routePattern];
+	else return;
+	const indices = new Set(plan.always);
+	for (const file of files) for (const index of plan.files[file]) indices.add(index);
+	const asyncIndices = new Set(plan.async);
+	const references = [];
+	const streamed = [];
+	for (const index of indices) {
+		const id = plan.references[index];
+		references.push(id);
+		if (asyncIndices.has(index)) streamed.push(id);
+	}
+	return {
+		references,
+		streamed
+	};
+}
 function createClientReferencePreloader(options) {
 	let allReferencesPreloaded = false;
 	let allReferencesPreloadPromise = null;
 	const preloadedReferences = /* @__PURE__ */ new Set();
 	const referencePreloadPromises = /* @__PURE__ */ new Map();
 	function preloadReference(id, clientRequire) {
-		if (preloadedReferences.has(id)) return resolvedPreload;
 		const existing = referencePreloadPromises.get(id);
 		if (existing) return existing;
-		const preloadPromise = clientRequire(id).catch((error) => {
+		const loading = clientRequire(id);
+		const preloadPromise = shareIsolatePromise(loading.then((value) => {
+			loading.status = "fulfilled";
+			loading.value = value;
+		}, (error) => {
+			loading.status = "rejected";
+			loading.reason = error;
+			throw error;
+		}).catch((error) => {
 			options.onPreloadError?.(id, error);
 		}).then(() => {
 			preloadedReferences.add(id);
 		}).finally(() => {
 			referencePreloadPromises.delete(id);
-		});
+		}));
 		referencePreloadPromises.set(id, preloadPromise);
 		return preloadPromise;
 	}
-	function preloadReferenceSet(referenceIds, refs, clientRequire) {
+	function preloadReferenceSet(referenceIds, refs, clientRequire, streamedIds) {
 		const pending = [];
-		for (const id of referenceIds) if (Object.hasOwn(refs, id)) pending.push(preloadReference(id, clientRequire));
+		for (const id of referenceIds) if (Object.hasOwn(refs, id) && !preloadedReferences.has(id)) {
+			const loading = preloadReference(id, clientRequire);
+			if (!streamedIds?.has(id)) pending.push(loading);
+		}
 		if (pending.length === 0) return resolvedPreload;
 		return Promise.all(pending).then(() => {});
 	}
-	return { preload(referenceIds) {
+	return { preload(referenceIds, streamedIds) {
 		const refs = options.getReferences();
 		const clientRequire = options.getClientRequire();
 		if (!refs || !clientRequire) return resolvedPreload;
-		if (referenceIds) return preloadReferenceSet(referenceIds, refs, clientRequire);
+		if (referenceIds) return preloadReferenceSet(referenceIds, refs, clientRequire, streamedIds);
 		if (allReferencesPreloaded) return resolvedPreload;
 		if (allReferencesPreloadPromise) return allReferencesPreloadPromise;
-		allReferencesPreloadPromise = preloadReferenceSet(Object.keys(refs), refs, clientRequire).then(() => {
+		allReferencesPreloadPromise = shareIsolatePromise(preloadReferenceSet(Object.keys(refs), refs, clientRequire).then(() => {
 			allReferencesPreloaded = true;
 		}).finally(() => {
 			allReferencesPreloadPromise = null;
-		});
+		}));
 		return allReferencesPreloadPromise;
 	} };
 }
 //#endregion
-export { createClientReferencePreloader };
+export { createClientReferencePreloader, resolveRouteClientReferences };

package/dist/server/app-elements-wire.d.ts

@@ -183,4 +183,5 @@ export declare function buildOutgoingAppPayload(input: {
 }): ReactNode | AppOutgoingElements;
 export declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 export declare const AppElementsWire: AppElementsWireCodec;
-//#endregion
+//#endregion
+export {};

package/dist/server/app-elements.d.ts

@@ -1,6 +1,8 @@
 import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsBfcacheSegmentIdentities, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 //#region src/server/app-elements.d.ts
 export declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
+/** Prefix of the element that streams a route's generateMetadata() tags in the body. */
+export declare const APP_STREAMING_METADATA_BODY_ID_PREFIX = "__vinext_streaming_metadata_body:";
 export declare function getMountedSlotIds(elements: AppElements): string[];
 export declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 export declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;

package/dist/server/app-elements.js

@@ -2,6 +2,8 @@ import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 //#region src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
+/** Prefix of the element that streams a route's generateMetadata() tags in the body. */
+const APP_STREAMING_METADATA_BODY_ID_PREFIX = "__vinext_streaming_metadata_body:";
 function getMountedSlotIds(elements) {
 	return Object.keys(elements).filter((key) => {
 		const value = elements[key];
@@ -16,4 +18,4 @@ function resolveVisitedResponseInterceptionContext(requestInterceptionContext, p
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_BFCACHE_SEGMENT_IDENTITIES_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_SEGMENTS_KEY, APP_STATIC_SIBLINGS_KEY, APP_STREAMING_METADATA_BODY_ID_PREFIX, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

package/dist/server/app-fallback-renderer.d.ts

@@ -6,7 +6,7 @@ import "../shims/navigation.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
-import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageFallbackRouteHead, ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
@@ -95,13 +95,20 @@ type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   renderHttpAccessFallback: (route: AppPageBoundaryRoute<TModule> | null, statusCode: number, isRscRequest: boolean, request: Request, opts: {
     boundaryComponent?: AppPageComponent | null;
     boundaryModule?: TModule | null;
+    /** Boundary whose metadata the head uses, when not `boundaryModule`. */
+    headBoundaryModule?: TModule | null;
+    /** Layouts whose metadata the head uses, when more than `layouts`. */
+    headLayouts?: readonly (TModule | null | undefined)[] | null;
     intercept?: AppPageInterceptOptions<TModule> | null;
     /** The document may be stored, so it must not carry the request's query. */
     isCacheCandidate?: boolean;
     layouts?: readonly (TModule | null | undefined)[] | null;
     matchedParams?: AppPageParams;
+    /** The route's render threw the signal, so the document keeps the route's head. */
+    routeHead?: AppPageFallbackRouteHead | null;
   }, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;
   renderNotFound: (route: AppPageBoundaryRoute<TModule> | null, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;
 };
 export declare function createAppFallbackRenderer<TModule extends AppPageModule>(options: AppFallbackRendererOptions<TModule>): AppFallbackRenderer<TModule>;
-//#endregion
+//#endregion
+export {};

package/dist/server/app-fallback-renderer.js

@@ -1,9 +1,10 @@
 import { runOutsideRequestScopes } from "../shims/internal/als-registry.js";
+import { shareIsolatePromise } from "./isolate-shared-promise.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
-import { DEFAULT_NOT_FOUND_MODULE } from "./default-not-found-module.js";
+import { DEFAULT_NOT_FOUND_MODULE } from "./default-http-access-fallback-modules.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
 	headers: null,
@@ -17,7 +18,7 @@ function createAppFallbackRenderer(options) {
 	let globalNotFoundModulePromise = null;
 	function resolveGlobalNotFoundModule() {
 		if (!loadGlobalNotFoundModule) return null;
-		if (globalNotFoundModulePromise === null) globalNotFoundModulePromise = runOutsideRequestScopes(() => Promise.resolve().then(loadGlobalNotFoundModule));
+		if (globalNotFoundModulePromise === null) globalNotFoundModulePromise = shareIsolatePromise(runOutsideRequestScopes(() => Promise.resolve().then(loadGlobalNotFoundModule)));
 		return globalNotFoundModulePromise;
 	}
 	return {
@@ -85,6 +86,8 @@ function createAppFallbackRenderer(options) {
 				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
+				headBoundaryModule: opts?.headBoundaryModule ?? null,
+				headLayoutModules: useGlobalNotFound ? [] : opts?.headLayouts ?? null,
 				intercept: opts?.intercept ?? null,
 				isCacheCandidate: opts?.isCacheCandidate,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
@@ -103,6 +106,7 @@ function createAppFallbackRenderer(options) {
 				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
 				route: useGlobalNotFound ? null : route,
+				routeHead: opts?.routeHead ?? null,
 				routePathname: callContext?.routePathname,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,

package/dist/server/app-history-state.d.ts

@@ -104,4 +104,5 @@ export declare function resolveHistoryTraversalIntent(options: {
   currentHistoryIndex: number | null;
   historyState: unknown;
 }): HistoryTraversalIntent;
-//#endregion
+//#endregion
+export {};

package/dist/server/app-inline-css-client.d.ts

@@ -2,4 +2,5 @@
 type InlineCssStylesheetLinkElement = Pick<HTMLLinkElement, "getAttribute" | "hasAttribute">;
 export declare function isInlineCssStylesheetLinkElement(link: InlineCssStylesheetLinkElement): boolean;
 export declare function removeStylesheetLinksCoveredByInlineCss(): void;
-//#endregion
+//#endregion
+export {};

package/dist/server/app-layout-param-observation.d.ts

@@ -38,4 +38,5 @@ export type StaticLayoutObservationSkipRejection = Readonly<{
 export declare function getStaticLayoutObservationSkipRejection(observation: AppLayoutParamAccessObservation): StaticLayoutObservationSkipRejection | null;
 export declare function isAppLayoutObservationUnsafeForStaticReuse(observation: AppLayoutParamAccessObservation): boolean;
 export declare function createAppLayoutParamAccessTracker(): AppLayoutParamAccessTracker;
-//#endregion
+//#endregion
+export {};

package/dist/server/app-metadata-tracing.d.ts

@@ -9,4 +9,5 @@ export declare function createGenerateMetadataSpanDescriptor(moduleRoute: string
   readonly name: `generateMetadata ${string}`;
   readonly type: "ResolveMetadata.generateMetadata";
 };
-//#endregion
+//#endregion
+export {};

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

@@ -50,6 +50,12 @@ export type ApplyAppMiddlewareResult = {
   search: string | null;
 } | {
   kind: "response";
+  /**
+   * True when `response` proxies a middleware external rewrite. It carries
+   * middleware's headers, and the caller still stages next.config headers
+   * beneath them.
+   */
+  externalRewrite?: boolean;
   /** Present on real middleware results; optional for older generated callers. */
   matched?: boolean;
   /** True when this pathname can match middleware for some request context. */

package/dist/server/app-middleware.js

@@ -6,7 +6,7 @@ import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
 import { executeMiddleware } from "./middleware-runtime.js";
 import { applyMiddlewareRequestHeaders, setHeadersContext } from "../shims/headers.js";
-import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import { mergeMiddlewareResponseHeaders, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
 import { setNavigationContext } from "../shims/navigation-context-accessors.js";
 //#region src/server/app-middleware.ts
 const FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);
@@ -92,19 +92,15 @@ async function proxyExternalMiddlewareRewrite(request, rewriteUrl, context) {
 	const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);
 	const headers = new Headers(proxyResponse.headers);
 	processMiddlewareHeaders(headers);
-	if (!context.headers) return new Response(proxyResponse.body, {
-		status: proxyResponse.status,
-		statusText: proxyResponse.statusText,
-		headers
-	});
-	const middlewareHeaders = new Headers(context.headers);
+	const stagedHeaders = new Headers();
+	const middlewareHeaders = new Headers(context.headers ?? void 0);
 	processMiddlewareHeaders(middlewareHeaders);
-	mergeMiddlewareResponseHeaders(headers, middlewareHeaders);
-	return new Response(proxyResponse.body, {
+	mergeMiddlewareResponseHeaders(stagedHeaders, middlewareHeaders);
+	return withExternalRewriteResponseHeaders(new Response(proxyResponse.body, {
 		status: proxyResponse.status,
 		statusText: proxyResponse.statusText,
 		headers
-	});
+	}), stagedHeaders, middlewareHeaders.getSetCookie());
 }
 function validationResponseWithMiddlewareHeaders(response, context) {
 	if (!context.headers) return response;
@@ -171,6 +167,7 @@ async function applyAppMiddleware(options) {
 			const externalRequest = options.externalRewriteRequest ?? options.request;
 			return {
 				kind: "response",
+				externalRewrite: true,
 				matched,
 				pathnameEligible,
 				response: await proxyExternalMiddlewareRewrite(externalRequest, forwarded.rewriteUrl, options.context)
@@ -248,6 +245,7 @@ async function applyAppMiddleware(options) {
 				const externalRequest = options.externalRewriteRequest ?? options.request;
 				return {
 					kind: "response",
+					externalRewrite: true,
 					matched,
 					pathnameEligible,
 					response: await proxyExternalMiddlewareRewrite(externalRequest, result.rewriteUrl, options.context)

package/dist/server/app-optimistic-routing.d.ts

@@ -1,11 +1,9 @@
-import { RouteManifest, RouteManifestRoute } from "../routing/app-route-graph.js";
+import { BrowserRouteManifest, BrowserRouteManifestRoute } from "../routing/browser-route-manifest.js";
+import { OptimisticRouteTrieMatch } from "../routing/optimistic-route-trie.js";
 import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
 //#region src/server/app-optimistic-routing.d.ts
-type OptimisticRouteMatch = {
-  params: Record<string, string | string[]>;
-  route: RouteManifestRoute;
-};
+type OptimisticRouteMatch = OptimisticRouteTrieMatch<BrowserRouteManifestRoute>;
 export type OptimisticRouteTemplate = {
   elements: AppElements;
   mountedSlotsHeader: string | null;
@@ -34,12 +32,12 @@ export declare function getOptimisticPrefetchSourceKey(options: {
 export declare function matchOptimisticRouteManifestRoute(options: {
   basePath: string;
   href: string;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
 }): OptimisticRouteMatch | null;
 export declare function resolveOptimisticNavigationParamsForHref(options: {
   basePath: string;
   href: string;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
 }): Record<string, string | string[]> | null;
 export declare function createOptimisticRouteTemplate(options: {
   allowLoadingShell?: boolean;
@@ -48,9 +46,25 @@ export declare function createOptimisticRouteTemplate(options: {
   href: string;
   interceptionContext: string | null;
   mountedSlotsHeader: string | null;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
 }): OptimisticRouteTemplate | null;
 export declare function createOptimisticRouteElements(template: OptimisticRouteTemplate): AppElements;
+/**
+ * The optimistic shell reveals the prefetch's streamed metadata, such as its
+ * title. React won't hide revealed content again in a transition, so while the
+ * authoritative payload's own metadata streams, its whole commit, page
+ * included, would wait for it. Render that metadata in a new boundary whose
+ * fallback is the shell's instead, so the page commits as it streams and the
+ * prefetched title stays until the payload's arrives. Next.js likewise renders
+ * the prefetched head until the dynamic one resolves (`Head` in app-router.tsx).
+ *
+ * A payload streams at most one route's metadata. The shell's may carry
+ * another concrete route id, since a template learned for one set of params
+ * is reused for others. `navigationKey` remounts the boundary on every
+ * navigation, so one that already revealed an earlier navigation's metadata
+ * can't hold back the next, as Next.js keys `Head` by its vary path.
+ */
+export declare function keepOptimisticStreamingMetadata(elements: AppElements, optimisticElements: AppElements, navigationKey: string): AppElements;
 /**
  * A loading-shell prefetch stops at the first loading boundary, so layouts
  * below that boundary are present in the route metadata but absent from the
@@ -63,7 +77,7 @@ export declare function canCommitOptimisticRouteTemplate(options: {
   currentElements: AppElements;
   currentLayoutIds: readonly string[];
   currentParams: Readonly<Record<string, string | string[]>>;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
   targetRouteParams: Readonly<Record<string, string | string[]>>;
   targetUrlParts: readonly string[];
   template: OptimisticRouteTemplate;
@@ -73,7 +87,8 @@ export declare function resolveOptimisticNavigationPayload(options: {
   href: string;
   interceptionContext: string | null;
   mountedSlotsHeader: string | null;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
   templates: ReadonlyMap<string, OptimisticRouteTemplate>;
 }): OptimisticNavigationPayload | null;
-//#endregion
+//#endregion
+export {};

package/dist/server/app-optimistic-routing.js

@@ -1,7 +1,8 @@
 import { isUnknownRecord } from "../utils/record.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
+import { decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";
+import { buildOptimisticRouteTrie, matchOptimisticRouteTrie } from "../routing/optimistic-route-trie.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId } from "./bfcache-identity.js";
@@ -17,61 +18,8 @@ function getOptimisticRouteTemplateKey(options) {
 function getOptimisticPrefetchSourceKey(options) {
 	return `${options.cacheKey}\0${options.interceptionContext ?? ""}\0${options.mountedSlotsHeader ?? ""}`;
 }
-function createNode() {
-	return {
-		catchAllChild: null,
-		dynamicChild: null,
-		optionalCatchAllChild: null,
-		route: null,
-		staticChildren: /* @__PURE__ */ new Map()
-	};
-}
 function buildRouteTrie(routeManifest) {
-	const root = createNode();
-	for (const route of routeManifest.segmentGraph.routes.values()) {
-		let node = root;
-		const parts = route.patternParts;
-		if (parts.length === 0) {
-			node.route ??= route;
-			continue;
-		}
-		for (const [index, part] of parts.entries()) {
-			const isTerminal = index === parts.length - 1;
-			if (part.startsWith(":") && part.endsWith("+")) {
-				if (isTerminal && node.catchAllChild === null) node.catchAllChild = {
-					paramName: part.slice(1, -1),
-					route
-				};
-				break;
-			}
-			if (part.startsWith(":") && part.endsWith("*")) {
-				if (isTerminal && node.optionalCatchAllChild === null) node.optionalCatchAllChild = {
-					paramName: part.slice(1, -1),
-					route
-				};
-				break;
-			}
-			if (part.startsWith(":")) {
-				const paramName = part.slice(1);
-				if (node.dynamicChild === null) node.dynamicChild = {
-					node: createNode(),
-					paramName
-				};
-				else if (node.dynamicChild.paramName !== paramName && import.meta.env.DEV) console.warn(`[vinext] Optimistic route trie found conflicting dynamic segments at the same level: :${node.dynamicChild.paramName} vs ${part}`);
-				node = node.dynamicChild.node;
-				if (isTerminal) node.route ??= route;
-				continue;
-			}
-			let staticChild = node.staticChildren.get(part);
-			if (staticChild === void 0) {
-				staticChild = createNode();
-				node.staticChildren.set(part, staticChild);
-			}
-			node = staticChild;
-			if (isTerminal) node.route ??= route;
-		}
-	}
-	return root;
+	return buildOptimisticRouteTrie(routeManifest.segmentGraph.routes.values(), import.meta.env.DEV ? (existingParamName, part) => console.warn(`[vinext] Optimistic route trie found conflicting dynamic segments at the same level: :${existingParamName} vs ${part}`) : void 0);
 }
 function getRouteTrie(routeManifest) {
 	const existing = routeTrieCache.get(routeManifest);
@@ -80,45 +28,6 @@ function getRouteTrie(routeManifest) {
 	routeTrieCache.set(routeManifest, trie);
 	return trie;
 }
-function matchNode(node, urlParts, index, entries) {
-	if (index === urlParts.length) {
-		if (node.route !== null) return {
-			route: node.route,
-			params: buildParams(entries)
-		};
-		if (node.optionalCatchAllChild !== null) return {
-			route: node.optionalCatchAllChild.route,
-			params: buildParams(entries)
-		};
-		return null;
-	}
-	const segment = urlParts[index];
-	const staticChild = node.staticChildren.get(segment);
-	if (staticChild !== void 0) return matchNode(staticChild, urlParts, index + 1, entries);
-	if (node.dynamicChild !== null) {
-		entries.push([node.dynamicChild.paramName, segment]);
-		const match = matchNode(node.dynamicChild.node, urlParts, index + 1, entries);
-		if (match !== null) return match;
-		entries.pop();
-	}
-	if (node.catchAllChild !== null) {
-		const params = buildParams(entries);
-		params[node.catchAllChild.paramName] = urlParts.slice(index);
-		return {
-			route: node.catchAllChild.route,
-			params
-		};
-	}
-	if (node.optionalCatchAllChild !== null) {
-		const params = buildParams(entries);
-		params[node.optionalCatchAllChild.paramName] = urlParts.slice(index);
-		return {
-			route: node.optionalCatchAllChild.route,
-			params
-		};
-	}
-	return null;
-}
 function hrefToRouteParts(href, basePath) {
 	let url;
 	try {
@@ -138,7 +47,7 @@ function hrefToRouteParts(href, basePath) {
 function matchOptimisticRouteManifestRoute(options) {
 	const urlParts = hrefToRouteParts(options.href, options.basePath);
 	if (urlParts === null) return null;
-	const match = matchNode(getRouteTrie(options.routeManifest), urlParts.normalized, 0, []);
+	const match = matchOptimisticRouteTrie(getRouteTrie(options.routeManifest), urlParts.normalized);
 	if (match === null) return null;
 	decodeMatchedParams(match.params);
 	return match;
@@ -294,6 +203,39 @@ function createOptimisticRouteElements(template) {
 	for (const pageElementId of template.pageElementIds) elements[pageElementId] = createElement(OptimisticRouteSegment);
 	return elements;
 }
+function findStreamingMetadataBody(elements) {
+	for (const id of Object.keys(elements)) if (id.startsWith("__vinext_streaming_metadata_body:")) return id;
+	return null;
+}
+/**
+* The optimistic shell reveals the prefetch's streamed metadata, such as its
+* title. React won't hide revealed content again in a transition, so while the
+* authoritative payload's own metadata streams, its whole commit, page
+* included, would wait for it. Render that metadata in a new boundary whose
+* fallback is the shell's instead, so the page commits as it streams and the
+* prefetched title stays until the payload's arrives. Next.js likewise renders
+* the prefetched head until the dynamic one resolves (`Head` in app-router.tsx).
+*
+* A payload streams at most one route's metadata. The shell's may carry
+* another concrete route id, since a template learned for one set of params
+* is reused for others. `navigationKey` remounts the boundary on every
+* navigation, so one that already revealed an earlier navigation's metadata
+* can't hold back the next, as Next.js keys `Head` by its vary path.
+*/
+function keepOptimisticStreamingMetadata(elements, optimisticElements, navigationKey) {
+	const id = findStreamingMetadataBody(elements);
+	const optimisticId = findStreamingMetadataBody(optimisticElements);
+	if (id === null || optimisticId === null) return elements;
+	const optimisticMetadata = optimisticElements[optimisticId];
+	if (optimisticMetadata == null) return elements;
+	return {
+		...elements,
+		[id]: createElement(Suspense, {
+			fallback: optimisticMetadata,
+			key: navigationKey
+		}, elements[id])
+	};
+}
 /**
 * A loading-shell prefetch stops at the first loading boundary, so layouts
 * below that boundary are present in the route metadata but absent from the
@@ -369,4 +311,4 @@ function resolveOptimisticNavigationPayload(options) {
 	};
 }
 //#endregion
-export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload };
+export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload };

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

@@ -6,7 +6,7 @@ import "../shims/navigation.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
-import { ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
+import { AppPageFallbackRouteHead, ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
 import { AppPageInterceptOptions } from "./app-page-element-builder.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
@@ -30,9 +30,17 @@ export type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule>
   notFound?: TModule | null;
   notFounds?: readonly (TModule | null | undefined)[] | null;
   notFoundTreePosition?: number | null;
+  page?: TModule | null;
   params?: AppPageParams;
   pattern?: string;
   routeSegments?: readonly string[];
+  childrenSlot?: AppPageRouteWiringRoute<TModule>["childrenSlot"];
+  segmentForbiddens?: readonly (TModule | null | undefined)[] | null;
+  segmentForbiddenTreePositions?: readonly number[] | null;
+  segmentNotFounds?: readonly (TModule | null | undefined)[] | null;
+  segmentNotFoundTreePositions?: readonly number[] | null;
+  segmentUnauthorizeds?: readonly (TModule | null | undefined)[] | null;
+  segmentUnauthorizedTreePositions?: readonly number[] | null;
   slots?: AppPageRouteWiringRoute<TModule>["slots"];
   unauthorized?: TModule | null;
   unauthorizedTreePosition?: number | null;
@@ -88,12 +96,21 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
 type RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {
   boundaryComponent?: AppPageComponent | null;
   boundaryModule?: TModule | null;
+  /** Boundary whose metadata the head uses, when not the rendered boundary. */
+  headBoundaryModule?: TModule | null;
+  /** Layouts whose metadata the head uses, when more than render around the boundary. */
+  headLayoutModules?: readonly (TModule | null | undefined)[] | null;
   intercept?: AppPageInterceptOptions<TModule> | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
   matchedParams: AppPageParams;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
   rootUnauthorizedModule?: TModule | null;
+  /**
+   * The matched route's render threw the signal, so the document keeps the
+   * route's own head rather than the boundary convention's.
+   */
+  routeHead?: AppPageFallbackRouteHead | null;
   /** Normalized, basePath-free application pathname used for route matching. */
   routePathname?: string;
   route?: AppPageBoundaryRoute<TModule> | null;
@@ -116,4 +133,5 @@ type RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageMo
 } & AppPageBoundaryRenderCommonOptions<TModule>;
 export declare function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(options: RenderAppPageHttpAccessFallbackOptions<TModule>): Promise<Response | null>;
 export declare function renderAppPageErrorBoundary<TModule extends AppPageModule>(options: RenderAppPageErrorBoundaryOptions<TModule>): Promise<Response | null>;
-//#endregion
+//#endregion
+export {};