vinext 1.0.0-beta.1 → 1.0.0-beta.3

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

@@ -4,14 +4,18 @@ 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 { resolveAppPageBranchParams } from "./app-page-params.js";
-import { resolveActiveParallelRouteHeadInputs, resolveAppPageHead } from "./app-page-head.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 { buildAppPageElements, createAppPageSourcePage, createAppPageTreePath } from "./app-page-route-wiring.js";
+import { resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport } from "./app-page-http-access-fallback-metadata.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 "./app-rsc-route-matching.js";
-import { createElement } from "react";
+import { Suspense, createElement } from "react";
 //#region src/server/app-page-element-builder.ts
 function resolveInterceptLayoutParams(branchSegments, layoutSegments, params) {
 	return resolveAppPageBranchParams(branchSegments, layoutSegments.length, params, layoutSegments);
@@ -41,7 +45,7 @@ function isReactOwnedPageComponent(component) {
 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 } = pageRequest;
+	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION, observeMetadataSearchParamsAccess = false, observePageSearchParamsAccess = 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;
@@ -76,38 +80,116 @@ async function buildPageElements(options) {
 			[renderIdentity.routeId]: createElement("div", null, "Page has no default export")
 		};
 	}
-	const { hasDynamicMetadata, metadata: resolvedMetadata, pageSearchParams, viewport: resolvedViewport } = await resolveAppPageHead({
-		applyFileBasedMetadata: options.applyFileBasedMetadata,
-		basePath: options.basePath ?? "",
-		layoutModules: route.layouts,
+	const activeParallelRouteHeadInputs = resolveActiveParallelRouteHeadInputs({
+		interceptBranchSegments: opts?.interceptBranchSegments ?? null,
+		interceptLayouts: opts?.interceptLayouts ?? null,
+		interceptLayoutSegments: opts?.interceptLayoutSegments ?? null,
+		interceptNotFoundBranchSegments: opts?.interceptNotFoundBranchSegments ?? null,
+		interceptNotFound: opts?.interceptNotFound ?? null,
+		interceptNotFoundTreePosition: opts?.interceptNotFoundTreePosition ?? null,
+		interceptPage: opts?.interceptPage ?? null,
+		interceptParams: opts?.interceptParams ?? null,
+		interceptSlotKey: opts?.interceptSlotKey ?? null,
+		interceptSourcePageSegments: opts?.interceptSourcePageSegments ?? null,
 		layoutTreePositions: route.layoutTreePositions,
-		metadataRoutes,
-		pageModule: isSiblingIntercept ? null : effectivePageModule ?? null,
-		parallelRoutes: [...resolveActiveParallelRouteHeadInputs({
-			interceptBranchSegments: opts?.interceptBranchSegments ?? null,
-			interceptLayouts: opts?.interceptLayouts ?? null,
-			interceptLayoutSegments: opts?.interceptLayoutSegments ?? null,
-			interceptPage: opts?.interceptPage ?? null,
-			interceptParams: opts?.interceptParams ?? null,
-			interceptSlotKey: opts?.interceptSlotKey ?? null,
-			layoutTreePositions: route.layoutTreePositions,
-			params,
-			routeSegments: route.routeSegments ?? [],
-			slotParams: slotParamOverrides,
-			slots: route.slots ?? null
-		}), ...isSiblingIntercept ? [{
+		params,
+		routeSegments: route.routeSegments ?? [],
+		slotParams: slotParamOverrides,
+		slots: route.slots ?? null
+	});
+	const primaryParallelRouteHeadInput = isSiblingIntercept ? {
+		head: {
 			layoutModules: opts?.interceptLayouts ?? [],
 			layoutParams: (opts?.interceptLayoutSegments ?? []).map((segments) => resolveInterceptLayoutParams(opts?.interceptBranchSegments ?? segments, segments, effectiveParams)),
 			pageModule: effectivePageModule ?? null,
 			params: effectiveParams,
 			routeSegments: opts?.interceptSourcePageSegments ?? route.routeSegments ?? []
-		}] : []],
+		},
+		...opts?.interceptNotFound ? {
+			notFoundModule: opts.interceptNotFound,
+			notFoundParams: resolveAppPageBranchParams(opts.interceptNotFoundBranchSegments ?? opts.interceptBranchSegments ?? route.routeSegments ?? [], opts.interceptNotFoundTreePosition ?? 0, effectiveParams)
+		} : {},
+		ownerTreePosition: route.routeSegments?.length ?? 0
+	} : null;
+	const parallelRoutes = [...primaryParallelRouteHeadInput ? [primaryParallelRouteHeadInput.head] : [], ...activeParallelRouteHeadInputs.map((input) => input.head)];
+	const metadataSearchParamsObserver = observeMetadataSearchParamsAccess ? createAppPageSearchParamsObserver() : void 0;
+	const preparedHead = prepareAppPageHead({
+		applyFileBasedMetadata: options.applyFileBasedMetadata,
+		basePath: options.basePath ?? "",
+		layoutModules: route.layouts,
+		layoutTreePositions: route.layoutTreePositions,
+		metadataRoutes,
+		pageModule: isSiblingIntercept ? null : effectivePageModule ?? null,
+		parallelRoutes,
 		params: effectiveParams,
 		routePath: route.pattern,
 		routeSegments: route.routeSegments ?? null,
 		searchParams,
-		searchParamsObserver: observeMetadataSearchParamsAccess ? createAppPageSearchParamsObserver() : void 0
+		searchParamsObserver: metadataSearchParamsObserver
 	});
+	const { hasDynamicMetadata, pageSearchParams } = preparedHead;
+	const streamGeneratedHead = serveStreamingMetadata ?? shouldServeStreamingMetadata(pageRequest.request.headers.get("user-agent") ?? "", options.htmlLimitedBots);
+	const metadataPlacement = hasDynamicMetadata && streamGeneratedHead ? "body" : "head";
+	const shouldDeferMetadata = metadataPlacement === "body";
+	const streamingMetadata = shouldDeferMetadata ? isProduction ? preparedHead.metadata.catch((error) => {
+		throw sanitizeErrorForClient(error, "production");
+	}) : preparedHead.metadata : null;
+	streamingMetadata?.catch(() => null);
+	const resolveNotFoundFallbackPlanOptions = () => {
+		const routeBoundaryModule = route.notFound;
+		const parentBoundary = resolveAppPageParentHttpAccessBoundary({
+			layoutIndex: route.layouts.length,
+			rootForbiddenModule,
+			rootNotFoundModule,
+			rootUnauthorizedModule,
+			routeForbiddenModules: route.forbiddens,
+			routeNotFoundModules: route.notFounds,
+			routeUnauthorizedModules: route.unauthorizeds,
+			statusCode: 404
+		});
+		const boundaryModule = routeBoundaryModule ?? parentBoundary.module;
+		const boundaryTreePosition = routeBoundaryModule ? route.notFoundTreePosition : parentBoundary.layoutIndex === null ? null : route.layoutTreePositions?.[parentBoundary.layoutIndex];
+		return {
+			boundaryModule,
+			boundaryParams: boundaryModule && boundaryTreePosition != null ? resolveAppPageSegmentParams(route.routeSegments ?? [], boundaryTreePosition, effectiveParams) : {},
+			layoutModules: route.layouts,
+			layoutTreePositions: route.layoutTreePositions,
+			parallelBranches: activeParallelRouteHeadInputs,
+			params: effectiveParams,
+			primaryParallelBranch: primaryParallelRouteHeadInput,
+			routeSegments: route.routeSegments ?? null
+		};
+	};
+	let viewportErrorOutlet = null;
+	let metadataErrorOutlet = null;
+	const resolveMetadataErrorTags = async (error) => {
+		if (resolveAppPageSpecialError(error)?.kind !== "http-access-fallback") return null;
+		return resolveHttpAccessFallbackMetadata({
+			applyFileBasedMetadata: options.applyFileBasedMetadata,
+			basePath: options.basePath ?? "",
+			...resolveNotFoundFallbackPlanOptions(),
+			metadataRoutes,
+			routePath: route.pattern
+		}).catch(() => null);
+	};
+	const [resolvedMetadata, resolvedViewport] = await Promise.all([shouldDeferMetadata ? Promise.resolve(null) : preparedHead.metadata.catch((error) => {
+		metadataErrorOutlet = Promise.reject(isProduction ? sanitizeErrorForClient(error, "production") : error);
+		metadataErrorOutlet.catch(() => null);
+		return resolveMetadataErrorTags(error);
+	}), preparedHead.viewport.catch(async (error) => {
+		const specialError = resolveAppPageSpecialError(error);
+		viewportErrorOutlet = Promise.reject(isProduction ? sanitizeErrorForClient(error, "production") : error);
+		viewportErrorOutlet.catch(() => null);
+		return specialError?.kind === "http-access-fallback" ? resolveHttpAccessFallbackViewport(resolveNotFoundFallbackPlanOptions()).catch(() => ({})) : {};
+	})]);
+	const streamingMetadataTags = shouldDeferMetadata ? preparedHead.metadata.catch(resolveMetadataErrorTags) : null;
+	const streamingMetadataOutletInputs = [
+		streamingMetadata,
+		metadataErrorOutlet,
+		viewportErrorOutlet
+	].filter((promise) => promise !== null).map((promise) => Promise.resolve(promise));
+	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 createPageElement = (PageComponent, props) => {
@@ -127,13 +209,36 @@ 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);
-	const metadataPlacement = hasDynamicMetadata && (serveStreamingMetadata ?? shouldServeStreamingMetadata(pageRequest.request.headers.get("user-agent") ?? "", options.htmlLimitedBots)) ? "body" : "head";
 	let siblingInterceptElement = isSiblingIntercept && EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps) : null;
-	if (isSiblingIntercept && siblingInterceptElement !== null && opts?.interceptLayouts?.length) for (let i = opts.interceptLayouts.length - 1; i >= 0; i--) {
-		const LayoutComponent = opts.interceptLayouts[i]?.default;
-		if (LayoutComponent) {
-			const interceptLayoutSegments = opts.interceptLayoutSegments?.[i] ?? [];
-			siblingInterceptElement = createElement(LayoutComponent, { params: makeThenableParams(resolveInterceptLayoutParams(opts.interceptBranchSegments ?? interceptLayoutSegments, interceptLayoutSegments, effectiveParams)) }, siblingInterceptElement);
+	if (isSiblingIntercept && siblingInterceptElement !== null) {
+		const layoutIndexesByTreePosition = /* @__PURE__ */ new Map();
+		for (const [index, layoutModule] of (opts?.interceptLayouts ?? []).entries()) {
+			if (!layoutModule?.default) continue;
+			const treePosition = opts?.interceptLayoutSegments?.[index]?.length ?? 0;
+			const indexes = layoutIndexesByTreePosition.get(treePosition) ?? [];
+			indexes.push(index);
+			layoutIndexesByTreePosition.set(treePosition, indexes);
+		}
+		const loadingIndexesByTreePosition = /* @__PURE__ */ new Map();
+		for (const [index, loadingModule] of (opts?.interceptLoadings ?? []).entries()) {
+			if (!loadingModule?.default) continue;
+			const treePosition = opts?.interceptLoadingTreePositions?.[index];
+			if (treePosition !== void 0) loadingIndexesByTreePosition.set(treePosition, index);
+		}
+		const treePositions = Array.from(/* @__PURE__ */ new Set([...layoutIndexesByTreePosition.keys(), ...loadingIndexesByTreePosition.keys()])).sort((left, right) => left - right);
+		for (let index = treePositions.length - 1; index >= 0; index--) {
+			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);
+			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 interceptLayoutSegments = opts?.interceptLayoutSegments?.[layoutIndex] ?? [];
+				siblingInterceptElement = createElement(LayoutComponent, { params: makeThenableParams(resolveInterceptLayoutParams(opts?.interceptBranchSegments ?? interceptLayoutSegments, interceptLayoutSegments, effectiveParams)) }, siblingInterceptElement);
+			}
 		}
 	}
 	return buildAppPageElements({
@@ -149,6 +254,10 @@ async function buildPageElements(options) {
 		resolvedMetadata,
 		resolvedMetadataPathname: routePath,
 		resolvedViewport,
+		streamingMetadata,
+		streamingMetadataOutlet,
+		streamingMetadataOutletSuspended: streamGeneratedHead,
+		streamingMetadataTags,
 		renderIdentity,
 		routePath,
 		sourcePageSegments,
@@ -182,6 +291,8 @@ function buildSlotOverrides(route, routeParams, routePath, opts) {
 		branchSegments: opts.interceptBranchSegments ?? null,
 		layoutModules: opts.interceptLayouts || null,
 		layoutSegments: opts.interceptLayoutSegments ?? null,
+		loadingModules: opts.interceptLoadings || null,
+		loadingTreePositions: opts.interceptLoadingTreePositions ?? null,
 		pageModule: opts.interceptPage,
 		params: opts.interceptParams || routeParams,
 		routeSegments: resolveInterceptedSlotSegments(opts.interceptSourcePageSegments, opts.interceptSlotKey)
@@ -293,4 +404,4 @@ function collectParamNameSet(params) {
 	return set;
 }
 //#endregion
-export { buildPageElements, resolveAppPageNavigationParams, resolveInterceptedSlotSegments };
+export { buildPageElements, resolveAppPageNavigationParams, resolveInterceptedSlotSegments, resolveSlotParamOverrides };

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

@@ -1,13 +1,21 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
-import { Metadata, Viewport } from "../shims/metadata.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> = {
+  /** Preserve an empty result as the most specific file-metadata source. */includeWhenEmpty?: boolean;
+  module: TModule;
+  params: AppPageParams;
+  routeSegments: readonly string[];
+  searchParams?: AppPageSearchParams;
+  searchParamsObserver?: ThenableParamsObserver;
+};
 type AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   layoutParams?: readonly AppPageParams[] | null;
   layoutModule?: TModule | null;
@@ -17,11 +25,19 @@ type AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadMod
   params?: AppPageParams | null;
   routeSegments?: readonly string[] | null;
 };
+type ActiveParallelRouteHeadInput<TModule extends AppPageHeadModule = AppPageHeadModule> = {
+  head: AppPageHeadParallelRoute<TModule>;
+  notFoundModule?: TModule | null;
+  notFoundParams?: AppPageParams | null;
+  ownerTreePosition: number;
+};
 type AppPageHeadSlot<TModule extends AppPageHeadModule = AppPageHeadModule> = {
   configLayouts?: readonly (TModule | null | undefined)[] | null;
   configLayoutTreePositions?: readonly number[] | null;
   layout?: TModule | null;
   layoutIndex?: number;
+  notFound?: TModule | null;
+  notFoundTreePosition?: number | null;
   page?: TModule | null;
   routeSegments?: readonly string[] | null;
 };
@@ -30,8 +46,12 @@ type ResolveActiveParallelRouteHeadInputsOptions<TModule extends AppPageHeadModu
   interceptBranchSegments?: readonly string[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptPage?: TModule | null;
+  interceptNotFoundBranchSegments?: readonly string[] | null;
+  interceptNotFound?: TModule | null;
+  interceptNotFoundTreePosition?: number | null;
   interceptParams?: AppPageParams | null;
   interceptSlotKey?: string | null;
+  interceptSourcePageSegments?: readonly string[] | null;
   layoutTreePositions?: readonly number[] | null;
   params: AppPageParams;
   routeSegments: readonly string[];
@@ -59,19 +79,51 @@ type ResolveAppPageHeadOptions<TModule extends AppPageHeadModule = AppPageHeadMo
   searchParams?: URLSearchParams | null;
   searchParamsObserver?: ThenableParamsObserver;
 };
+type AppPageMetadataOutputOptions = {
+  applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;
+  basePath?: string;
+  fallbackOnFileMetadataError?: boolean;
+  metadataRoutes: readonly MetadataFileRoute[];
+  params: AppPageParams;
+  routePath: string;
+  routeSegments?: readonly string[] | null;
+};
+type ResolveOrderedAppPageMetadataOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = AppPageMetadataOutputOptions & {
+  sources: readonly OrderedAppPageMetadataSource<TModule>[];
+};
 type ResolveAppPageHeadResult = {
   hasDynamicMetadata: boolean;
   hasSearchParams: boolean;
   metadata: Metadata | null;
   pageSearchParams: AppPageSearchParams;
-  viewport: Viewport;
+  viewport: ResolvedViewport;
+};
+type PreparedAppPageHead = Omit<ResolveAppPageHeadResult, "metadata" | "viewport"> & {
+  metadata: Promise<Metadata | null>;
+  viewport: Promise<ResolvedViewport>;
 };
 type AppPageSearchParamsCollection = {
   hasSearchParams: boolean;
   pageSearchParams: AppPageSearchParams;
 };
-declare function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHeadModule>(options: ResolveActiveParallelRouteHeadInputsOptions<TModule>): AppPageHeadParallelRoute<TModule>[];
+declare function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHeadModule>(options: ResolveActiveParallelRouteHeadInputsOptions<TModule>): ActiveParallelRouteHeadInput<TModule>[];
 declare function collectAppPageSearchParams(searchParams: URLSearchParams | null | undefined): AppPageSearchParamsCollection;
+/**
+ * Resolve an explicit metadata-source sequence.
+ *
+ * Route-specific conventions own source selection and ordering. This resolver
+ * 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>;
+/**
+ * Start metadata and viewport resolution without coupling their completion.
+ *
+ * Live document renders can place the metadata promise behind Suspense while
+ * 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 { AppPageSearchParams, ApplyAppPageFileBasedMetadata, collectAppPageSearchParams, resolveActiveParallelRouteHeadInputs, resolveAppPageHead };
+export { ActiveParallelRouteHeadInput, AppPageHeadModule, AppPageHeadParallelRoute, AppPageSearchParams, ApplyAppPageFileBasedMetadata, OrderedAppPageMetadataSource, PreparedAppPageHead, ResolveAppPageHeadResult, ResolveOrderedAppPageMetadataOptions, collectAppPageSearchParams, prepareAppPageHead, resolveActiveParallelRouteHeadInputs, resolveAppPageHead, resolveOrderedAppPageMetadata };