vinext 0.0.45 → 0.0.46

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

@@ -0,0 +1,32 @@
+import { NextI18nConfig } from "../config/next-config.js";
+import { MiddlewareModule } from "./middleware-runtime.js";
+
+//#region src/server/app-middleware.d.ts
+type AppMiddlewareContext = {
+  headers: Headers | null;
+  requestHeaders: Headers | null;
+  status: number | null;
+};
+type ApplyAppMiddlewareOptions = {
+  basePath?: string;
+  cleanPathname: string;
+  context: AppMiddlewareContext;
+  i18nConfig?: NextI18nConfig | null;
+  isProxy: boolean;
+  module: MiddlewareModule;
+  request: Request;
+};
+type ApplyAppMiddlewareResult = {
+  kind: "continue";
+  cleanPathname: string;
+  search: string | null;
+} | {
+  kind: "response";
+  response: Response;
+};
+declare function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean;
+declare function proxyExternalMiddlewareRewrite(request: Request, rewriteUrl: string, context: AppMiddlewareContext): Promise<Response>;
+declare function applyAppMiddleware(options: ApplyAppMiddlewareOptions): Promise<ApplyAppMiddlewareResult>;
+//#endregion
+export { AppMiddlewareContext, ApplyAppMiddlewareOptions, ApplyAppMiddlewareResult, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
+//# sourceMappingURL=app-middleware.d.ts.map

package/dist/server/app-middleware.js

@@ -0,0 +1,147 @@
+import { buildRequestHeadersFromMiddlewareResponse } from "./middleware-request-headers.js";
+import { isExternalUrl, proxyExternalRequest } from "../config/config-matchers.js";
+import { processMiddlewareHeaders } from "./request-pipeline.js";
+import { executeMiddleware } from "./middleware-runtime.js";
+import { applyMiddlewareRequestHeaders, setHeadersContext } from "../shims/headers.js";
+import { setNavigationContext } from "../shims/navigation.js";
+import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+//#region src/server/app-middleware.ts
+function isForwardedMiddlewareContext(value) {
+	return !!value && typeof value === "object";
+}
+function appendForwardedHeader(headers, value) {
+	if (!Array.isArray(value) || value.length < 2) return;
+	const key = value[0];
+	const headerValue = value[1];
+	if (typeof key === "string" && typeof headerValue === "string") headers.append(key, headerValue);
+}
+function responseFromMiddlewareRedirect(result) {
+	if (result.response) return result.response;
+	const headers = new Headers(result.responseHeaders);
+	if (result.redirectUrl) headers.set("Location", result.redirectUrl);
+	return new Response(null, {
+		status: result.redirectStatus ?? 307,
+		headers
+	});
+}
+function isExternalMiddlewareRewrite(rewriteUrl, request) {
+	return new URL(rewriteUrl, request.url).origin !== new URL(request.url).origin;
+}
+function requestWithMiddlewareRequestHeaders(request, middlewareHeaders) {
+	const nextHeaders = middlewareHeaders ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders) : null;
+	if (!nextHeaders) return request;
+	const init = {
+		method: request.method,
+		headers: nextHeaders,
+		body: request.body
+	};
+	if (request.body) Object.defineProperty(init, "duplex", {
+		value: "half",
+		enumerable: true
+	});
+	return new Request(request.url, init);
+}
+async function proxyExternalMiddlewareRewrite(request, rewriteUrl, context) {
+	const proxyRequest = requestWithMiddlewareRequestHeaders(request, context.requestHeaders ?? context.headers);
+	setHeadersContext(null);
+	setNavigationContext(null);
+	const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);
+	if (!context.headers) return proxyResponse;
+	const middlewareHeaders = new Headers(context.headers);
+	processMiddlewareHeaders(middlewareHeaders);
+	const headers = new Headers(proxyResponse.headers);
+	mergeMiddlewareResponseHeaders(headers, middlewareHeaders);
+	return new Response(proxyResponse.body, {
+		status: proxyResponse.status,
+		statusText: proxyResponse.statusText,
+		headers
+	});
+}
+function applyForwardedMiddlewareContext(request, context) {
+	if (process.env.NODE_ENV === "production") return { applied: false };
+	const header = request.headers.get("x-vinext-mw-ctx");
+	if (!header) return { applied: false };
+	try {
+		const data = JSON.parse(header);
+		if (!isForwardedMiddlewareContext(data)) return { applied: false };
+		if (Array.isArray(data.h) && data.h.length > 0) {
+			context.headers = new Headers();
+			for (const entry of data.h) appendForwardedHeader(context.headers, entry);
+		}
+		if (typeof data.s === "number") context.status = data.s;
+		if (typeof data.r === "string" && data.r.length > 0) return {
+			applied: true,
+			rewriteUrl: data.r
+		};
+		return { applied: true };
+	} catch (e) {
+		console.error("[vinext] Failed to parse forwarded middleware context:", e);
+		return { applied: false };
+	}
+}
+async function applyAppMiddleware(options) {
+	const forwarded = applyForwardedMiddlewareContext(options.request, options.context);
+	let cleanPathname = options.cleanPathname;
+	let search = null;
+	if (forwarded.rewriteUrl) try {
+		if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, options.request)) return {
+			kind: "response",
+			response: await proxyExternalMiddlewareRewrite(options.request, forwarded.rewriteUrl, options.context)
+		};
+		const rewriteParsed = new URL(forwarded.rewriteUrl, options.request.url);
+		cleanPathname = rewriteParsed.pathname;
+		search = rewriteParsed.search;
+	} catch (e) {
+		console.error("[vinext] Failed to apply forwarded middleware rewrite:", e);
+		forwarded.applied = false;
+	}
+	if (!forwarded.applied) {
+		const result = await executeMiddleware({
+			basePath: options.basePath,
+			i18nConfig: options.i18nConfig,
+			isProxy: options.isProxy,
+			module: options.module,
+			normalizedPathname: cleanPathname,
+			request: options.request
+		});
+		if (!result.continue) {
+			if (result.redirectUrl) return {
+				kind: "response",
+				response: responseFromMiddlewareRedirect(result)
+			};
+			if (result.response) return {
+				kind: "response",
+				response: result.response
+			};
+			return {
+				kind: "response",
+				response: new Response("Internal Server Error", { status: 500 })
+			};
+		}
+		if (result.responseHeaders) options.context.headers = new Headers(result.responseHeaders);
+		if (result.rewriteUrl) {
+			if (result.rewriteStatus !== void 0) options.context.status = result.rewriteStatus;
+			if (isExternalUrl(result.rewriteUrl)) return {
+				kind: "response",
+				response: await proxyExternalMiddlewareRewrite(options.request, result.rewriteUrl, options.context)
+			};
+			const rewriteParsed = new URL(result.rewriteUrl, options.request.url);
+			cleanPathname = rewriteParsed.pathname;
+			search = rewriteParsed.search;
+		}
+	}
+	if (options.context.headers) {
+		options.context.requestHeaders = new Headers(options.context.headers);
+		applyMiddlewareRequestHeaders(options.context.headers);
+		processMiddlewareHeaders(options.context.headers);
+	}
+	return {
+		kind: "continue",
+		cleanPathname,
+		search
+	};
+}
+//#endregion
+export { applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite };
+
+//# sourceMappingURL=app-middleware.js.map

package/dist/server/app-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-middleware.js","names":[],"sources":["../../src/server/app-middleware.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { isExternalUrl, proxyExternalRequest } from \"../config/config-matchers.js\";\nimport { applyMiddlewareRequestHeaders, setHeadersContext } from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { buildRequestHeadersFromMiddlewareResponse } from \"./middleware-request-headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { executeMiddleware, type MiddlewareModule } from \"./middleware-runtime.js\";\nimport { processMiddlewareHeaders } from \"./request-pipeline.js\";\n\nexport type AppMiddlewareContext = {\n  headers: Headers | null;\n  requestHeaders: Headers | null;\n  status: number | null;\n};\n\nexport type ApplyAppMiddlewareOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  context: AppMiddlewareContext;\n  i18nConfig?: NextI18nConfig | null;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  request: Request;\n};\n\nexport type ApplyAppMiddlewareResult =\n  | {\n      kind: \"continue\";\n      cleanPathname: string;\n      search: string | null;\n    }\n  | {\n      kind: \"response\";\n      response: Response;\n    };\n\ntype ForwardedMiddlewareContext = {\n  h?: unknown;\n  r?: unknown;\n  s?: unknown;\n};\n\nfunction isForwardedMiddlewareContext(value: unknown): value is ForwardedMiddlewareContext {\n  return !!value && typeof value === \"object\";\n}\n\nfunction appendForwardedHeader(headers: Headers, value: unknown): void {\n  if (!Array.isArray(value) || value.length < 2) return;\n  const key = value[0];\n  const headerValue = value[1];\n  if (typeof key === \"string\" && typeof headerValue === \"string\") {\n    headers.append(key, headerValue);\n  }\n}\n\nfunction responseFromMiddlewareRedirect(result: {\n  redirectStatus?: number;\n  redirectUrl?: string;\n  response?: Response;\n  responseHeaders?: Headers;\n}): Response {\n  if (result.response) return result.response;\n\n  const headers = new Headers(result.responseHeaders);\n  if (result.redirectUrl) {\n    headers.set(\"Location\", result.redirectUrl);\n  }\n  return new Response(null, {\n    status: result.redirectStatus ?? 307,\n    headers,\n  });\n}\n\nexport function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean {\n  const rewriteParsed = new URL(rewriteUrl, request.url);\n  return rewriteParsed.origin !== new URL(request.url).origin;\n}\n\nfunction requestWithMiddlewareRequestHeaders(\n  request: Request,\n  middlewareHeaders: Headers | null,\n): Request {\n  const nextHeaders = middlewareHeaders\n    ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders)\n    : null;\n  if (!nextHeaders) return request;\n\n  const init: RequestInit = {\n    method: request.method,\n    headers: nextHeaders,\n    body: request.body,\n  };\n  if (request.body) {\n    Object.defineProperty(init, \"duplex\", { value: \"half\", enumerable: true });\n  }\n\n  return new Request(request.url, init);\n}\n\nexport async function proxyExternalMiddlewareRewrite(\n  request: Request,\n  rewriteUrl: string,\n  context: AppMiddlewareContext,\n): Promise<Response> {\n  const proxyRequest = requestWithMiddlewareRequestHeaders(\n    request,\n    context.requestHeaders ?? context.headers,\n  );\n  setHeadersContext(null);\n  setNavigationContext(null);\n\n  const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);\n  if (!context.headers) return proxyResponse;\n\n  const middlewareHeaders = new Headers(context.headers);\n  processMiddlewareHeaders(middlewareHeaders);\n  const headers = new Headers(proxyResponse.headers);\n  mergeMiddlewareResponseHeaders(headers, middlewareHeaders);\n  return new Response(proxyResponse.body, {\n    status: proxyResponse.status,\n    statusText: proxyResponse.statusText,\n    headers,\n  });\n}\n\nfunction applyForwardedMiddlewareContext(\n  request: Request,\n  context: AppMiddlewareContext,\n): { applied: boolean; rewriteUrl?: string } {\n  if (process.env.NODE_ENV === \"production\") {\n    return { applied: false };\n  }\n\n  const header = request.headers.get(\"x-vinext-mw-ctx\");\n  if (!header) return { applied: false };\n\n  try {\n    const data = JSON.parse(header);\n    if (!isForwardedMiddlewareContext(data)) return { applied: false };\n\n    if (Array.isArray(data.h) && data.h.length > 0) {\n      context.headers = new Headers();\n      for (const entry of data.h) {\n        appendForwardedHeader(context.headers, entry);\n      }\n    }\n    if (typeof data.s === \"number\") {\n      context.status = data.s;\n    }\n    if (typeof data.r === \"string\" && data.r.length > 0) {\n      return { applied: true, rewriteUrl: data.r };\n    }\n    return { applied: true };\n  } catch (e) {\n    console.error(\"[vinext] Failed to parse forwarded middleware context:\", e);\n    return { applied: false };\n  }\n}\n\nexport async function applyAppMiddleware(\n  options: ApplyAppMiddlewareOptions,\n): Promise<ApplyAppMiddlewareResult> {\n  const forwarded = applyForwardedMiddlewareContext(options.request, options.context);\n  let cleanPathname = options.cleanPathname;\n  let search: string | null = null;\n\n  if (forwarded.rewriteUrl) {\n    try {\n      if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, options.request)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            options.request,\n            forwarded.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(forwarded.rewriteUrl, options.request.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    } catch (e) {\n      console.error(\"[vinext] Failed to apply forwarded middleware rewrite:\", e);\n      forwarded.applied = false;\n    }\n  }\n\n  if (!forwarded.applied) {\n    const result = await executeMiddleware({\n      basePath: options.basePath,\n      i18nConfig: options.i18nConfig,\n      isProxy: options.isProxy,\n      module: options.module,\n      normalizedPathname: cleanPathname,\n      request: options.request,\n    });\n\n    if (!result.continue) {\n      if (result.redirectUrl) {\n        return { kind: \"response\", response: responseFromMiddlewareRedirect(result) };\n      }\n      if (result.response) {\n        return { kind: \"response\", response: result.response };\n      }\n      return { kind: \"response\", response: new Response(\"Internal Server Error\", { status: 500 }) };\n    }\n\n    if (result.responseHeaders) {\n      options.context.headers = new Headers(result.responseHeaders);\n    }\n\n    if (result.rewriteUrl) {\n      if (result.rewriteStatus !== undefined) {\n        options.context.status = result.rewriteStatus;\n      }\n      if (isExternalUrl(result.rewriteUrl)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            options.request,\n            result.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(result.rewriteUrl, options.request.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    }\n  }\n\n  if (options.context.headers) {\n    options.context.requestHeaders = new Headers(options.context.headers);\n    applyMiddlewareRequestHeaders(options.context.headers);\n    processMiddlewareHeaders(options.context.headers);\n  }\n\n  return { kind: \"continue\", cleanPathname, search };\n}\n"],"mappings":"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"}

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

@@ -1,3 +1,4 @@
+import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppElements } from "./app-elements.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
@@ -36,6 +37,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   loadSsrHandler: () => Promise<AppPageSsrHandler>;
   makeThenableParams: (params: AppPageParams) => unknown;
   middlewareContext: AppPageMiddlewareContext;
+  metadataRoutes: MetadataFileRoute[];
   renderToReadableStream: (element: ReactNode | AppElements, options: {
     onError: AppPageBoundaryOnError;
   }) => ReadableStream<Uint8Array>;

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

@@ -1,9 +1,10 @@
 import { APP_INTERCEPTION_CONTEXT_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, createAppPayloadRouteId } from "./app-elements.js";
 import { ErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
-import { MetadataHead, ViewportHead, mergeMetadata, mergeViewport, resolveModuleMetadata, resolveModuleViewport } from "../shims/metadata.js";
+import { MetadataHead, ViewportHead } from "../shims/metadata.js";
 import { createAppPageLayoutEntries } from "./app-page-route-wiring.js";
 import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
+import { resolveAppPageHead } from "./app-page-head.js";
 import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { createAppPageFontData, renderAppPageHtmlResponse } from "./app-page-stream.js";
 import { Fragment, createElement } from "react";
@@ -11,33 +12,6 @@ import { Fragment, createElement } from "react";
 function getDefaultExport(module) {
 	return module?.default ?? null;
 }
-async function resolveAppPageLayoutHead(layoutModules, params) {
-	const filteredLayouts = layoutModules.filter(Boolean);
-	const layoutMetadataPromises = [];
-	let accumulatedMetadata = Promise.resolve({});
-	for (let index = 0; index < filteredLayouts.length; index++) {
-		const parentForLayout = accumulatedMetadata;
-		const metadataPromise = resolveModuleMetadata(filteredLayouts[index], params, void 0, parentForLayout).catch((error) => {
-			console.error("[vinext] Layout generateMetadata() failed:", error);
-			return null;
-		});
-		layoutMetadataPromises.push(metadataPromise);
-		accumulatedMetadata = metadataPromise.then(async (metadataResult) => {
-			if (metadataResult) return mergeMetadata([await parentForLayout, metadataResult]);
-			return parentForLayout;
-		});
-	}
-	const [metadataResults, viewportResults] = await Promise.all([Promise.all(layoutMetadataPromises), Promise.all(filteredLayouts.map((layoutModule) => resolveModuleViewport(layoutModule, params).catch((error) => {
-		console.error("[vinext] Layout generateViewport() failed:", error);
-		return null;
-	})))]);
-	const metadataList = metadataResults.filter(Boolean);
-	const viewportList = viewportResults.filter(Boolean);
-	return {
-		metadata: metadataList.length > 0 ? mergeMetadata(metadataList) : null,
-		viewport: mergeViewport(viewportList)
-	};
-}
 function wrapRenderedBoundaryElement(options) {
 	return wrapAppPageBoundaryElement({
 		element: options.element,
@@ -82,6 +56,18 @@ function resolveAppPageBoundaryRootLayoutTreePath(route) {
 	}
 	return null;
 }
+function resolveHttpAccessFallbackHeadRouteSegments(route, layoutModules) {
+	if (!route?.routeSegments) return;
+	if (!route.layouts || layoutModules.length >= route.layouts.length) return route.routeSegments;
+	const lastIncludedLayoutIndex = layoutModules.length - 1;
+	if (lastIncludedLayoutIndex < 0) return [];
+	const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;
+	return route.routeSegments.slice(0, segmentCount);
+}
+function resolveHttpAccessFallbackHeadLayoutTreePositions(route, layoutModules) {
+	if (!route?.layouts || layoutModules.length >= route.layouts.length) return route?.layoutTreePositions;
+	return route.layoutTreePositions?.slice(0, layoutModules.length);
+}
 function createAppPageBoundaryRscPayload(options) {
 	const routeId = createAppPayloadRouteId(options.pathname, null);
 	return {
@@ -140,7 +126,15 @@ async function renderAppPageHttpAccessFallback(options) {
 	});
 	if (!boundaryComponent) return null;
 	const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
-	const { metadata, viewport } = await resolveAppPageLayoutHead(layoutModules, options.matchedParams);
+	const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);
+	const { metadata, viewport } = await resolveAppPageHead({
+		layoutModules,
+		layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
+		metadataRoutes: options.metadataRoutes,
+		params: options.matchedParams,
+		routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,
+		routeSegments
+	});
 	const headElements = [createElement("meta", {
 		charSet: "utf-8",
 		key: "charset"
@@ -191,8 +185,34 @@ async function renderAppPageErrorBoundary(options) {
 	const errorObject = options.sanitizeErrorForClient(rawError);
 	const matchedParams = options.matchedParams ?? options.route?.params ?? {};
 	const layoutModules = options.route?.layouts ?? options.rootLayouts;
+	const pathname = new URL(options.requestUrl).pathname;
+	const headElements = [createElement("meta", {
+		charSet: "utf-8",
+		key: "charset"
+	})];
+	if (!errorBoundary.isGlobalError) try {
+		const { metadata, viewport } = await resolveAppPageHead({
+			fallbackOnFileMetadataError: true,
+			layoutModules,
+			layoutTreePositions: options.route?.layoutTreePositions,
+			metadataRoutes: options.metadataRoutes,
+			params: matchedParams,
+			routePath: options.route?.pattern ?? pathname,
+			routeSegments: options.route?.routeSegments
+		});
+		if (metadata) headElements.push(createElement(MetadataHead, {
+			key: "metadata",
+			metadata
+		}));
+		headElements.push(createElement(ViewportHead, {
+			key: "viewport",
+			viewport
+		}));
+	} catch (error) {
+		console.error(`[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`, error);
+	}
 	const element = wrapRenderedBoundaryElement({
-		element: createElement(errorBoundary.component, { error: errorObject }),
+		element: createElement(Fragment, null, ...headElements, createElement(errorBoundary.component, { error: errorObject })),
 		globalErrorModule: options.globalErrorModule,
 		includeGlobalErrorBoundary: !errorBoundary.isGlobalError,
 		isRscRequest: options.isRscRequest,

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"../shims/client-hook-error.js\";\nimport { ErrorBoundary } from \"../shims/error-boundary.js\";\nimport { LayoutSegmentProvider } from \"../shims/layout-segment-context.js\";\nimport {\n  MetadataHead,\n  ViewportHead,\n  mergeMetadata,\n  mergeViewport,\n  resolveModuleMetadata,\n  resolveModuleViewport,\n  type Metadata,\n  type Viewport,\n} from \"../shims/metadata.js\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport {\n  renderAppPageBoundaryResponse,\n  resolveAppPageErrorBoundary,\n  resolveAppPageHttpAccessBoundaryComponent,\n  wrapAppPageBoundaryElement,\n  type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n  createAppPageFontData,\n  renderAppPageHtmlResponse,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport {\n  APP_INTERCEPTION_CONTEXT_KEY,\n  APP_ROOT_LAYOUT_KEY,\n  APP_ROUTE_KEY,\n  createAppPayloadRouteId,\n  type AppElements,\n} from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n  element: ReactNode;\n  pathname: string;\n  route?: AppPageBoundaryRoute<TModule> | null;\n};\n\ntype AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n  error?: TModule | null;\n  errors?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts?: readonly (TModule | null | undefined)[];\n  notFound?: TModule | null;\n  params?: AppPageParams;\n  pattern?: string;\n  routeSegments?: readonly string[];\n  unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  isRscRequest: boolean;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  middlewareContext: AppPageMiddlewareContext;\n  renderToReadableStream: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  requestUrl: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootLayouts: readonly (TModule | null | undefined)[];\n  scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n  boundaryComponent?: AppPageComponent | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  matchedParams: AppPageParams;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n  error: unknown;\n  matchedParams?: AppPageParams | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nasync function resolveAppPageLayoutHead<TModule extends AppPageModule>(\n  layoutModules: readonly (TModule | null | undefined)[],\n  params: AppPageParams,\n): Promise<{ metadata: Metadata | null; viewport: Viewport }> {\n  const filteredLayouts = layoutModules.filter(Boolean) as TModule[];\n  const layoutMetadataPromises: Promise<Metadata | null>[] = [];\n  let accumulatedMetadata = Promise.resolve<Metadata>({});\n\n  for (let index = 0; index < filteredLayouts.length; index++) {\n    const parentForLayout = accumulatedMetadata;\n    const metadataPromise = resolveModuleMetadata(\n      filteredLayouts[index],\n      params,\n      undefined,\n      parentForLayout,\n    ).catch((error) => {\n      console.error(\"[vinext] Layout generateMetadata() failed:\", error);\n      return null;\n    });\n    layoutMetadataPromises.push(metadataPromise);\n    accumulatedMetadata = metadataPromise.then(async (metadataResult) => {\n      if (metadataResult) {\n        return mergeMetadata([await parentForLayout, metadataResult]);\n      }\n      return parentForLayout;\n    });\n  }\n\n  const [metadataResults, viewportResults] = await Promise.all([\n    Promise.all(layoutMetadataPromises),\n    Promise.all(\n      filteredLayouts.map((layoutModule) =>\n        resolveModuleViewport(layoutModule, params).catch((error) => {\n          console.error(\"[vinext] Layout generateViewport() failed:\", error);\n          return null;\n        }),\n      ),\n    ),\n  ]);\n\n  const metadataList = metadataResults.filter(Boolean) as Metadata[];\n  const viewportList = viewportResults.filter(Boolean) as Viewport[];\n\n  return {\n    metadata: metadataList.length > 0 ? mergeMetadata(metadataList) : null,\n    viewport: mergeViewport(viewportList),\n  };\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n  options: Pick<\n    AppPageBoundaryRenderCommonOptions<TModule>,\n    \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n  > & {\n    element: ReactNode;\n    includeGlobalErrorBoundary: boolean;\n    layoutModules: readonly (TModule | null | undefined)[];\n    layoutTreePositions?: readonly number[] | null;\n    matchedParams: AppPageParams;\n    routeSegments?: readonly string[];\n    skipLayoutWrapping?: boolean;\n  },\n): ReactNode {\n  return wrapAppPageBoundaryElement({\n    element: options.element,\n    getDefaultExport,\n    globalErrorComponent: getDefaultExport(options.globalErrorModule),\n    includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n    isRscRequest: options.isRscRequest,\n    layoutModules: options.layoutModules,\n    layoutTreePositions: options.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    renderErrorBoundary(GlobalErrorComponent, children) {\n      return createElement(ErrorBoundary, {\n        fallback: GlobalErrorComponent,\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n      });\n    },\n    renderLayout(LayoutComponent, children, asyncParams) {\n      return createElement(LayoutComponent as AppPageComponent, {\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n        params: asyncParams,\n      });\n    },\n    renderLayoutSegmentProvider(segmentMap, children) {\n      return createElement(\n        // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n        LayoutSegmentProvider as ComponentType<any>,\n        { segmentMap },\n        children,\n      );\n    },\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.routeSegments ?? [],\n    skipLayoutWrapping: options.skipLayoutWrapping,\n  });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n  if (route?.layouts) {\n    const rootLayoutEntry = createAppPageLayoutEntries({\n      errors: route.errors,\n      layoutTreePositions: route.layoutTreePositions,\n      layouts: route.layouts,\n      notFounds: null,\n      routeSegments: route.routeSegments,\n    })[0];\n\n    if (rootLayoutEntry) {\n      return rootLayoutEntry.treePath;\n    }\n  }\n\n  // Without route tree metadata we cannot derive a canonical root layout tree path.\n  // Returning null keeps boundary payloads soft-navigation compatible.\n  return null;\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n  options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n  const routeId = createAppPayloadRouteId(options.pathname, null);\n\n  return {\n    [APP_INTERCEPTION_CONTEXT_KEY]: null,\n    [APP_ROUTE_KEY]: routeId,\n    [APP_ROOT_LAYOUT_KEY]: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n    [routeId]: options.element,\n  };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n  options: AppPageBoundaryRenderCommonOptions<TModule> & {\n    element: ReactNode;\n    layoutModules: readonly (TModule | null | undefined)[];\n    route?: AppPageBoundaryRoute<TModule> | null;\n    routePattern?: string;\n    status: number;\n  },\n): Promise<Response> {\n  const pathname = new URL(options.requestUrl).pathname;\n  const payload = createAppPageBoundaryRscPayload({\n    element: options.element,\n    pathname,\n    route: options.route,\n  });\n\n  return renderAppPageBoundaryResponse({\n    async createHtmlResponse(rscStream, responseStatus) {\n      const fontData = createAppPageFontData({\n        getLinks: options.getFontLinks,\n        getPreloads: options.getFontPreloads,\n        getStyles: options.getFontStyles,\n      });\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlResponse({\n        clearRequestContext: options.clearRequestContext,\n        fontData,\n        fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n        middlewareHeaders: options.middlewareContext.headers,\n        navigationContext: options.getNavigationContext(),\n        rscStream,\n        scriptNonce: options.scriptNonce,\n        ssrHandler,\n        status: responseStatus,\n      });\n    },\n    createRscOnErrorHandler() {\n      return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n    },\n    element: payload,\n    isRscRequest: options.isRscRequest,\n    middlewareHeaders: options.middlewareContext.headers,\n    renderToReadableStream: options.renderToReadableStream,\n    status: options.status,\n  });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n  options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n  const boundaryComponent =\n    options.boundaryComponent ??\n    resolveAppPageHttpAccessBoundaryComponent({\n      getDefaultExport,\n      rootForbiddenModule: options.rootForbiddenModule,\n      rootNotFoundModule: options.rootNotFoundModule,\n      rootUnauthorizedModule: options.rootUnauthorizedModule,\n      routeForbiddenModule: options.route?.forbidden,\n      routeNotFoundModule: options.route?.notFound,\n      routeUnauthorizedModule: options.route?.unauthorized,\n      statusCode: options.statusCode,\n    });\n  if (!boundaryComponent) {\n    return null;\n  }\n\n  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n  const { metadata, viewport } = await resolveAppPageLayoutHead(\n    layoutModules,\n    options.matchedParams,\n  );\n\n  const headElements: ReactNode[] = [\n    createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n    createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n  ];\n  if (metadata) {\n    headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n  }\n  headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: true,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: options.statusCode,\n  });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n  options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n  const errorBoundary = resolveAppPageErrorBoundary({\n    getDefaultExport,\n    globalErrorModule: options.globalErrorModule,\n    layoutErrorModules: options.route?.errors,\n    pageErrorModule: options.route?.error,\n  });\n  if (!errorBoundary.component) {\n    return null;\n  }\n\n  const rawError =\n    options.error instanceof Error ? options.error : new Error(String(options.error));\n  rewriteClientHookError(rawError);\n  const errorObject = options.sanitizeErrorForClient(rawError);\n  const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n  const layoutModules = options.route?.layouts ?? options.rootLayouts;\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(errorBoundary.component, {\n      error: errorObject,\n    }),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping: errorBoundary.isGlobalError,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: 200,\n  });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n  /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n  const match = error.message.match(_clientHookPattern);\n  if (match) {\n    error.message = buildClientHookErrorMessage(`${match[1]}()`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"vinext/shims/client-hook-error\";\nimport { ErrorBoundary } from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead } from \"vinext/shims/metadata\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport { resolveAppPageHead } from \"./app-page-head.js\";\nimport {\n  renderAppPageBoundaryResponse,\n  resolveAppPageErrorBoundary,\n  resolveAppPageHttpAccessBoundaryComponent,\n  wrapAppPageBoundaryElement,\n  type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n  createAppPageFontData,\n  renderAppPageHtmlResponse,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport {\n  APP_INTERCEPTION_CONTEXT_KEY,\n  APP_ROOT_LAYOUT_KEY,\n  APP_ROUTE_KEY,\n  createAppPayloadRouteId,\n  type AppElements,\n} from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n  element: ReactNode;\n  pathname: string;\n  route?: AppPageBoundaryRoute<TModule> | null;\n};\n\ntype AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n  error?: TModule | null;\n  errors?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts?: readonly (TModule | null | undefined)[];\n  notFound?: TModule | null;\n  params?: AppPageParams;\n  pattern?: string;\n  routeSegments?: readonly string[];\n  unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  isRscRequest: boolean;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  middlewareContext: AppPageMiddlewareContext;\n  metadataRoutes: MetadataFileRoute[];\n  renderToReadableStream: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  requestUrl: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootLayouts: readonly (TModule | null | undefined)[];\n  scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n  boundaryComponent?: AppPageComponent | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  matchedParams: AppPageParams;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n  error: unknown;\n  matchedParams?: AppPageParams | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n  options: Pick<\n    AppPageBoundaryRenderCommonOptions<TModule>,\n    \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n  > & {\n    element: ReactNode;\n    includeGlobalErrorBoundary: boolean;\n    layoutModules: readonly (TModule | null | undefined)[];\n    layoutTreePositions?: readonly number[] | null;\n    matchedParams: AppPageParams;\n    routeSegments?: readonly string[];\n    skipLayoutWrapping?: boolean;\n  },\n): ReactNode {\n  return wrapAppPageBoundaryElement({\n    element: options.element,\n    getDefaultExport,\n    globalErrorComponent: getDefaultExport(options.globalErrorModule),\n    includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n    isRscRequest: options.isRscRequest,\n    layoutModules: options.layoutModules,\n    layoutTreePositions: options.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    renderErrorBoundary(GlobalErrorComponent, children) {\n      return createElement(ErrorBoundary, {\n        fallback: GlobalErrorComponent,\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n      });\n    },\n    renderLayout(LayoutComponent, children, asyncParams) {\n      return createElement(LayoutComponent as AppPageComponent, {\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n        params: asyncParams,\n      });\n    },\n    renderLayoutSegmentProvider(segmentMap, children) {\n      return createElement(\n        // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n        LayoutSegmentProvider as ComponentType<any>,\n        { segmentMap },\n        children,\n      );\n    },\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.routeSegments ?? [],\n    skipLayoutWrapping: options.skipLayoutWrapping,\n  });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n  if (route?.layouts) {\n    const rootLayoutEntry = createAppPageLayoutEntries({\n      errors: route.errors,\n      layoutTreePositions: route.layoutTreePositions,\n      layouts: route.layouts,\n      notFounds: null,\n      routeSegments: route.routeSegments,\n    })[0];\n\n    if (rootLayoutEntry) {\n      return rootLayoutEntry.treePath;\n    }\n  }\n\n  // Without route tree metadata we cannot derive a canonical root layout tree path.\n  // Returning null keeps boundary payloads soft-navigation compatible.\n  return null;\n}\n\nfunction resolveHttpAccessFallbackHeadRouteSegments<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly string[] | undefined {\n  if (!route?.routeSegments) {\n    return undefined;\n  }\n\n  if (!route.layouts || layoutModules.length >= route.layouts.length) {\n    return route.routeSegments;\n  }\n\n  const lastIncludedLayoutIndex = layoutModules.length - 1;\n  if (lastIncludedLayoutIndex < 0) {\n    return [];\n  }\n\n  const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;\n  return route.routeSegments.slice(0, segmentCount);\n}\n\nfunction resolveHttpAccessFallbackHeadLayoutTreePositions<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly number[] | null | undefined {\n  if (!route?.layouts || layoutModules.length >= route.layouts.length) {\n    return route?.layoutTreePositions;\n  }\n\n  return route.layoutTreePositions?.slice(0, layoutModules.length);\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n  options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n  const routeId = createAppPayloadRouteId(options.pathname, null);\n\n  return {\n    [APP_INTERCEPTION_CONTEXT_KEY]: null,\n    [APP_ROUTE_KEY]: routeId,\n    [APP_ROOT_LAYOUT_KEY]: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n    [routeId]: options.element,\n  };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n  options: AppPageBoundaryRenderCommonOptions<TModule> & {\n    element: ReactNode;\n    layoutModules: readonly (TModule | null | undefined)[];\n    route?: AppPageBoundaryRoute<TModule> | null;\n    routePattern?: string;\n    status: number;\n  },\n): Promise<Response> {\n  const pathname = new URL(options.requestUrl).pathname;\n  const payload = createAppPageBoundaryRscPayload({\n    element: options.element,\n    pathname,\n    route: options.route,\n  });\n\n  return renderAppPageBoundaryResponse({\n    async createHtmlResponse(rscStream, responseStatus) {\n      const fontData = createAppPageFontData({\n        getLinks: options.getFontLinks,\n        getPreloads: options.getFontPreloads,\n        getStyles: options.getFontStyles,\n      });\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlResponse({\n        clearRequestContext: options.clearRequestContext,\n        fontData,\n        fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n        middlewareHeaders: options.middlewareContext.headers,\n        navigationContext: options.getNavigationContext(),\n        rscStream,\n        scriptNonce: options.scriptNonce,\n        ssrHandler,\n        status: responseStatus,\n      });\n    },\n    createRscOnErrorHandler() {\n      return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n    },\n    element: payload,\n    isRscRequest: options.isRscRequest,\n    middlewareHeaders: options.middlewareContext.headers,\n    renderToReadableStream: options.renderToReadableStream,\n    status: options.status,\n  });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n  options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n  const boundaryComponent =\n    options.boundaryComponent ??\n    resolveAppPageHttpAccessBoundaryComponent({\n      getDefaultExport,\n      rootForbiddenModule: options.rootForbiddenModule,\n      rootNotFoundModule: options.rootNotFoundModule,\n      rootUnauthorizedModule: options.rootUnauthorizedModule,\n      routeForbiddenModule: options.route?.forbidden,\n      routeNotFoundModule: options.route?.notFound,\n      routeUnauthorizedModule: options.route?.unauthorized,\n      statusCode: options.statusCode,\n    });\n  if (!boundaryComponent) {\n    return null;\n  }\n\n  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n  const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);\n  const { metadata, viewport } = await resolveAppPageHead({\n    layoutModules,\n    layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(\n      options.route,\n      layoutModules,\n    ),\n    metadataRoutes: options.metadataRoutes,\n    params: options.matchedParams,\n    routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,\n    routeSegments,\n  });\n\n  const headElements: ReactNode[] = [\n    createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n    createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n  ];\n  if (metadata) {\n    headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n  }\n  headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: true,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: options.statusCode,\n  });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n  options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n  const errorBoundary = resolveAppPageErrorBoundary({\n    getDefaultExport,\n    globalErrorModule: options.globalErrorModule,\n    layoutErrorModules: options.route?.errors,\n    pageErrorModule: options.route?.error,\n  });\n  if (!errorBoundary.component) {\n    return null;\n  }\n\n  const rawError =\n    options.error instanceof Error ? options.error : new Error(String(options.error));\n  rewriteClientHookError(rawError);\n  const errorObject = options.sanitizeErrorForClient(rawError);\n  const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n  const layoutModules = options.route?.layouts ?? options.rootLayouts;\n  const pathname = new URL(options.requestUrl).pathname;\n\n  const headElements: ReactNode[] = [createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" })];\n  if (!errorBoundary.isGlobalError) {\n    try {\n      const { metadata, viewport } = await resolveAppPageHead({\n        fallbackOnFileMetadataError: true,\n        layoutModules,\n        layoutTreePositions: options.route?.layoutTreePositions,\n        metadataRoutes: options.metadataRoutes,\n        params: matchedParams,\n        routePath: options.route?.pattern ?? pathname,\n        routeSegments: options.route?.routeSegments,\n      });\n      if (metadata) {\n        headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n      }\n      headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n    } catch (error) {\n      console.error(\n        `[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`,\n        error,\n      );\n    }\n  }\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(\n      Fragment,\n      null,\n      ...headElements,\n      createElement(errorBoundary.component, {\n        error: errorObject,\n      }),\n    ),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping: errorBoundary.isGlobalError,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: 200,\n  });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n  /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n  const match = error.message.match(_clientHookPattern);\n  if (match) {\n    error.message = buildClientHookErrorMessage(`${match[1]}()`);\n  }\n}\n"],"mappings":"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"}

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

@@ -10,6 +10,16 @@ type ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {
   routeUnauthorizedModule?: TModule | null;
   statusCode: number;
 };
+type ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {
+  layoutIndex: number;
+  rootForbiddenModule?: TModule | null;
+  rootNotFoundModule?: TModule | null;
+  rootUnauthorizedModule?: TModule | null;
+  routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;
+  routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;
+  routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;
+  statusCode: number;
+};
 type ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {
   getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;
   globalErrorModule?: TModule | null;
@@ -52,9 +62,10 @@ type RenderAppPageBoundaryResponseOptions<TElement> = {
   status: number;
 };
 declare function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>): TComponent | null;
+declare function resolveAppPageParentHttpAccessBoundaryModule<TModule>(options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>): TModule | null;
 declare function resolveAppPageErrorBoundary<TModule, TComponent>(options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>): ResolveAppPageErrorBoundaryResult<TComponent>;
 declare function wrapAppPageBoundaryElement<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>(options: WrapAppPageBoundaryElementOptions<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>): TElement;
 declare function renderAppPageBoundaryResponse<TElement>(options: RenderAppPageBoundaryResponseOptions<TElement>): Promise<Response>;
 //#endregion
-export { AppPageParams, renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement };
+export { AppPageParams, renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
 //# sourceMappingURL=app-page-boundary.d.ts.map

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

@@ -1,3 +1,4 @@
+import { resolveAppPageSegmentParams } from "./app-page-params.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-boundary.ts
 function resolveAppPageHttpAccessBoundaryComponent(options) {
@@ -7,6 +8,22 @@ function resolveAppPageHttpAccessBoundaryComponent(options) {
 	else boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;
 	return options.getDefaultExport(boundaryModule) ?? null;
 }
+function resolveAppPageParentHttpAccessBoundaryModule(options) {
+	let routeModules = options.routeNotFoundModules;
+	let rootModule = options.rootNotFoundModule;
+	if (options.statusCode === 403) {
+		routeModules = options.routeForbiddenModules;
+		rootModule = options.rootForbiddenModule;
+	} else if (options.statusCode === 401) {
+		routeModules = options.routeUnauthorizedModules;
+		rootModule = options.rootUnauthorizedModule;
+	}
+	if (routeModules) for (let index = options.layoutIndex - 1; index >= 0; index--) {
+		const module = routeModules[index];
+		if (module) return module;
+	}
+	return rootModule ?? null;
+}
 function resolveAppPageErrorBoundary(options) {
 	const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);
 	if (pageErrorComponent) return {
@@ -28,17 +45,15 @@ function resolveAppPageErrorBoundary(options) {
 }
 function wrapAppPageBoundaryElement(options) {
 	let element = options.element;
-	if (!options.skipLayoutWrapping) {
-		const asyncParams = options.makeThenableParams(options.matchedParams);
-		for (let index = options.layoutModules.length - 1; index >= 0; index--) {
-			const layoutComponent = options.getDefaultExport(options.layoutModules[index]);
-			if (!layoutComponent) continue;
-			element = options.renderLayout(layoutComponent, element, asyncParams);
-			if (options.isRscRequest && options.renderLayoutSegmentProvider && options.resolveChildSegments) {
-				const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;
-				const childSegments = options.resolveChildSegments(options.routeSegments ?? [], treePosition, options.matchedParams);
-				element = options.renderLayoutSegmentProvider({ children: childSegments }, element);
-			}
+	if (!options.skipLayoutWrapping) for (let index = options.layoutModules.length - 1; index >= 0; index--) {
+		const layoutComponent = options.getDefaultExport(options.layoutModules[index]);
+		if (!layoutComponent) continue;
+		const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;
+		const asyncParams = options.makeThenableParams(resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams));
+		element = options.renderLayout(layoutComponent, element, asyncParams);
+		if (options.isRscRequest && options.renderLayoutSegmentProvider && options.resolveChildSegments) {
+			const childSegments = options.resolveChildSegments(options.routeSegments ?? [], treePosition, options.matchedParams);
+			element = options.renderLayoutSegmentProvider({ children: childSegments }, element);
 		}
 	}
 	if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) element = options.renderErrorBoundary(options.globalErrorComponent, element);
@@ -60,6 +75,6 @@ async function renderAppPageBoundaryResponse(options) {
 	return options.createHtmlResponse(rscStream, options.status);
 }
 //#endregion
-export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, wrapAppPageBoundaryElement };
+export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageParentHttpAccessBoundaryModule, wrapAppPageBoundaryElement };
 
 //# sourceMappingURL=app-page-boundary.js.map

package/dist/server/app-page-boundary.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-boundary.js","names":[],"sources":["../../src/server/app-page-boundary.ts"],"sourcesContent":["import { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\n\nexport type AppPageParams = Record<string, string | string[]>;\n\ntype ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModule?: TModule | null;\n  routeNotFoundModule?: TModule | null;\n  routeUnauthorizedModule?: TModule | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  globalErrorModule?: TModule | null;\n  layoutErrorModules?: readonly (TModule | null | undefined)[] | null;\n  pageErrorModule?: TModule | null;\n};\n\ntype ResolveAppPageErrorBoundaryResult<TComponent> = {\n  component: TComponent | null;\n  isGlobalError: boolean;\n};\n\ntype WrapAppPageBoundaryElementOptions<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n> = {\n  element: TElement;\n  getDefaultExport: (\n    module: TLayoutModule | null | undefined,\n  ) => TLayoutComponent | null | undefined;\n  globalErrorComponent?: TGlobalErrorComponent | null;\n  includeGlobalErrorBoundary: boolean;\n  isRscRequest: boolean;\n  layoutModules: readonly (TLayoutModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  renderErrorBoundary: (component: TGlobalErrorComponent, children: TElement) => TElement;\n  renderLayout: (component: TLayoutComponent, children: TElement, params: unknown) => TElement;\n  renderLayoutSegmentProvider?: (\n    segmentMap: { children: TChildSegments },\n    children: TElement,\n  ) => TElement;\n  resolveChildSegments?: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => TChildSegments;\n  routeSegments?: readonly string[];\n  skipLayoutWrapping?: boolean;\n};\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype RenderAppPageBoundaryResponseOptions<TElement> = {\n  createHtmlResponse: (rscStream: ReadableStream<Uint8Array>, status: number) => Promise<Response>;\n  createRscOnErrorHandler: () => AppPageBoundaryOnError;\n  element: TElement;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  renderToReadableStream: (\n    element: TElement,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  status: number;\n};\n\nexport function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(\n  options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>,\n): TComponent | null {\n  let boundaryModule: TModule | null | undefined;\n\n  if (options.statusCode === 403) {\n    boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;\n  } else {\n    boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;\n  }\n\n  return options.getDefaultExport(boundaryModule) ?? null;\n}\n\nexport function resolveAppPageErrorBoundary<TModule, TComponent>(\n  options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>,\n): ResolveAppPageErrorBoundaryResult<TComponent> {\n  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);\n  if (pageErrorComponent) {\n    return {\n      component: pageErrorComponent,\n      isGlobalError: false,\n    };\n  }\n\n  if (options.layoutErrorModules) {\n    for (let index = options.layoutErrorModules.length - 1; index >= 0; index--) {\n      const layoutErrorComponent = options.getDefaultExport(options.layoutErrorModules[index]);\n      if (layoutErrorComponent) {\n        return {\n          component: layoutErrorComponent,\n          isGlobalError: false,\n        };\n      }\n    }\n  }\n\n  const globalErrorComponent = options.getDefaultExport(options.globalErrorModule);\n  return {\n    component: globalErrorComponent ?? null,\n    isGlobalError: Boolean(globalErrorComponent),\n  };\n}\n\nexport function wrapAppPageBoundaryElement<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n>(\n  options: WrapAppPageBoundaryElementOptions<\n    TElement,\n    TLayoutModule,\n    TLayoutComponent,\n    TChildSegments,\n    TGlobalErrorComponent\n  >,\n): TElement {\n  let element = options.element;\n\n  if (!options.skipLayoutWrapping) {\n    const asyncParams = options.makeThenableParams(options.matchedParams);\n\n    for (let index = options.layoutModules.length - 1; index >= 0; index--) {\n      const layoutComponent = options.getDefaultExport(options.layoutModules[index]);\n      if (!layoutComponent) {\n        continue;\n      }\n\n      element = options.renderLayout(layoutComponent, element, asyncParams);\n\n      if (\n        options.isRscRequest &&\n        options.renderLayoutSegmentProvider &&\n        options.resolveChildSegments\n      ) {\n        const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;\n        const childSegments = options.resolveChildSegments(\n          options.routeSegments ?? [],\n          treePosition,\n          options.matchedParams,\n        );\n        element = options.renderLayoutSegmentProvider({ children: childSegments }, element);\n      }\n    }\n  }\n\n  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) {\n    element = options.renderErrorBoundary(options.globalErrorComponent, element);\n  }\n\n  return element;\n}\n\nexport async function renderAppPageBoundaryResponse<TElement>(\n  options: RenderAppPageBoundaryResponseOptions<TElement>,\n): Promise<Response> {\n  const rscStream = options.renderToReadableStream(options.element, {\n    onError: options.createRscOnErrorHandler(),\n  });\n\n  if (options.isRscRequest) {\n    // Do NOT clear request-scoped context here. RSC responses are consumed lazily\n    // by the client, so headers()/cookies() and async server components still need\n    // their ALS-backed state while the stream is being read.\n    const headers = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: \"RSC, Accept\",\n    });\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n    return new Response(rscStream, {\n      status: options.status,\n      headers,\n    });\n  }\n\n  return options.createHtmlResponse(rscStream, options.status);\n}\n"],"mappings":";;AA+EA,SAAgB,0CACd,SACmB;CACnB,IAAI;AAEJ,KAAI,QAAQ,eAAe,IACzB,kBAAiB,QAAQ,wBAAwB,QAAQ;UAChD,QAAQ,eAAe,IAChC,kBAAiB,QAAQ,2BAA2B,QAAQ;KAE5D,kBAAiB,QAAQ,uBAAuB,QAAQ;AAG1D,QAAO,QAAQ,iBAAiB,eAAe,IAAI;;AAGrD,SAAgB,4BACd,SAC+C;CAC/C,MAAM,qBAAqB,QAAQ,iBAAiB,QAAQ,gBAAgB;AAC5E,KAAI,mBACF,QAAO;EACL,WAAW;EACX,eAAe;EAChB;AAGH,KAAI,QAAQ,mBACV,MAAK,IAAI,QAAQ,QAAQ,mBAAmB,SAAS,GAAG,SAAS,GAAG,SAAS;EAC3E,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,mBAAmB,OAAO;AACxF,MAAI,qBACF,QAAO;GACL,WAAW;GACX,eAAe;GAChB;;CAKP,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,kBAAkB;AAChF,QAAO;EACL,WAAW,wBAAwB;EACnC,eAAe,QAAQ,qBAAqB;EAC7C;;AAGH,SAAgB,2BAOd,SAOU;CACV,IAAI,UAAU,QAAQ;AAEtB,KAAI,CAAC,QAAQ,oBAAoB;EAC/B,MAAM,cAAc,QAAQ,mBAAmB,QAAQ,cAAc;AAErE,OAAK,IAAI,QAAQ,QAAQ,cAAc,SAAS,GAAG,SAAS,GAAG,SAAS;GACtE,MAAM,kBAAkB,QAAQ,iBAAiB,QAAQ,cAAc,OAAO;AAC9E,OAAI,CAAC,gBACH;AAGF,aAAU,QAAQ,aAAa,iBAAiB,SAAS,YAAY;AAErE,OACE,QAAQ,gBACR,QAAQ,+BACR,QAAQ,sBACR;IACA,MAAM,eAAe,QAAQ,sBAAsB,QAAQ,oBAAoB,SAAS;IACxF,MAAM,gBAAgB,QAAQ,qBAC5B,QAAQ,iBAAiB,EAAE,EAC3B,cACA,QAAQ,cACT;AACD,cAAU,QAAQ,4BAA4B,EAAE,UAAU,eAAe,EAAE,QAAQ;;;;AAKzF,KAAI,QAAQ,gBAAgB,QAAQ,8BAA8B,QAAQ,qBACxE,WAAU,QAAQ,oBAAoB,QAAQ,sBAAsB,QAAQ;AAG9E,QAAO;;AAGT,eAAsB,8BACpB,SACmB;CACnB,MAAM,YAAY,QAAQ,uBAAuB,QAAQ,SAAS,EAChE,SAAS,QAAQ,yBAAyB,EAC3C,CAAC;AAEF,KAAI,QAAQ,cAAc;EAIxB,MAAM,UAAU,IAAI,QAAQ;GAC1B,gBAAgB;GAChB,MAAM;GACP,CAAC;AACF,iCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,SAAO,IAAI,SAAS,WAAW;GAC7B,QAAQ,QAAQ;GAChB;GACD,CAAC;;AAGJ,QAAO,QAAQ,mBAAmB,WAAW,QAAQ,OAAO"}
+{"version":3,"file":"app-page-boundary.js","names":[],"sources":["../../src/server/app-page-boundary.ts"],"sourcesContent":["import { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\nexport type AppPageParams = Record<string, string | string[]>;\n\ntype ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModule?: TModule | null;\n  routeNotFoundModule?: TModule | null;\n  routeUnauthorizedModule?: TModule | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {\n  layoutIndex: number;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;\n  routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;\n  routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  globalErrorModule?: TModule | null;\n  layoutErrorModules?: readonly (TModule | null | undefined)[] | null;\n  pageErrorModule?: TModule | null;\n};\n\ntype ResolveAppPageErrorBoundaryResult<TComponent> = {\n  component: TComponent | null;\n  isGlobalError: boolean;\n};\n\ntype WrapAppPageBoundaryElementOptions<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n> = {\n  element: TElement;\n  getDefaultExport: (\n    module: TLayoutModule | null | undefined,\n  ) => TLayoutComponent | null | undefined;\n  globalErrorComponent?: TGlobalErrorComponent | null;\n  includeGlobalErrorBoundary: boolean;\n  isRscRequest: boolean;\n  layoutModules: readonly (TLayoutModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  renderErrorBoundary: (component: TGlobalErrorComponent, children: TElement) => TElement;\n  renderLayout: (component: TLayoutComponent, children: TElement, params: unknown) => TElement;\n  renderLayoutSegmentProvider?: (\n    segmentMap: { children: TChildSegments },\n    children: TElement,\n  ) => TElement;\n  resolveChildSegments?: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => TChildSegments;\n  routeSegments?: readonly string[];\n  skipLayoutWrapping?: boolean;\n};\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype RenderAppPageBoundaryResponseOptions<TElement> = {\n  createHtmlResponse: (rscStream: ReadableStream<Uint8Array>, status: number) => Promise<Response>;\n  createRscOnErrorHandler: () => AppPageBoundaryOnError;\n  element: TElement;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  renderToReadableStream: (\n    element: TElement,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  status: number;\n};\n\nexport function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(\n  options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>,\n): TComponent | null {\n  let boundaryModule: TModule | null | undefined;\n\n  if (options.statusCode === 403) {\n    boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;\n  } else {\n    boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;\n  }\n\n  return options.getDefaultExport(boundaryModule) ?? null;\n}\n\nexport function resolveAppPageParentHttpAccessBoundaryModule<TModule>(\n  options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>,\n): TModule | null {\n  let routeModules = options.routeNotFoundModules;\n  let rootModule = options.rootNotFoundModule;\n\n  if (options.statusCode === 403) {\n    routeModules = options.routeForbiddenModules;\n    rootModule = options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    routeModules = options.routeUnauthorizedModules;\n    rootModule = options.rootUnauthorizedModule;\n  }\n\n  if (routeModules) {\n    for (let index = options.layoutIndex - 1; index >= 0; index--) {\n      const module = routeModules[index];\n      if (module) {\n        return module;\n      }\n    }\n  }\n\n  return rootModule ?? null;\n}\n\nexport function resolveAppPageErrorBoundary<TModule, TComponent>(\n  options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>,\n): ResolveAppPageErrorBoundaryResult<TComponent> {\n  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);\n  if (pageErrorComponent) {\n    return {\n      component: pageErrorComponent,\n      isGlobalError: false,\n    };\n  }\n\n  if (options.layoutErrorModules) {\n    for (let index = options.layoutErrorModules.length - 1; index >= 0; index--) {\n      const layoutErrorComponent = options.getDefaultExport(options.layoutErrorModules[index]);\n      if (layoutErrorComponent) {\n        return {\n          component: layoutErrorComponent,\n          isGlobalError: false,\n        };\n      }\n    }\n  }\n\n  const globalErrorComponent = options.getDefaultExport(options.globalErrorModule);\n  return {\n    component: globalErrorComponent ?? null,\n    isGlobalError: Boolean(globalErrorComponent),\n  };\n}\n\nexport function wrapAppPageBoundaryElement<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n>(\n  options: WrapAppPageBoundaryElementOptions<\n    TElement,\n    TLayoutModule,\n    TLayoutComponent,\n    TChildSegments,\n    TGlobalErrorComponent\n  >,\n): TElement {\n  let element = options.element;\n\n  if (!options.skipLayoutWrapping) {\n    for (let index = options.layoutModules.length - 1; index >= 0; index--) {\n      const layoutComponent = options.getDefaultExport(options.layoutModules[index]);\n      if (!layoutComponent) {\n        continue;\n      }\n\n      const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;\n      const asyncParams = options.makeThenableParams(\n        resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams),\n      );\n      element = options.renderLayout(layoutComponent, element, asyncParams);\n\n      if (\n        options.isRscRequest &&\n        options.renderLayoutSegmentProvider &&\n        options.resolveChildSegments\n      ) {\n        const childSegments = options.resolveChildSegments(\n          options.routeSegments ?? [],\n          treePosition,\n          options.matchedParams,\n        );\n        element = options.renderLayoutSegmentProvider({ children: childSegments }, element);\n      }\n    }\n  }\n\n  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) {\n    element = options.renderErrorBoundary(options.globalErrorComponent, element);\n  }\n\n  return element;\n}\n\nexport async function renderAppPageBoundaryResponse<TElement>(\n  options: RenderAppPageBoundaryResponseOptions<TElement>,\n): Promise<Response> {\n  const rscStream = options.renderToReadableStream(options.element, {\n    onError: options.createRscOnErrorHandler(),\n  });\n\n  if (options.isRscRequest) {\n    // Do NOT clear request-scoped context here. RSC responses are consumed lazily\n    // by the client, so headers()/cookies() and async server components still need\n    // their ALS-backed state while the stream is being read.\n    const headers = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: \"RSC, Accept\",\n    });\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n    return new Response(rscStream, {\n      status: options.status,\n      headers,\n    });\n  }\n\n  return options.createHtmlResponse(rscStream, options.status);\n}\n"],"mappings":";;;AA2FA,SAAgB,0CACd,SACmB;CACnB,IAAI;AAEJ,KAAI,QAAQ,eAAe,IACzB,kBAAiB,QAAQ,wBAAwB,QAAQ;UAChD,QAAQ,eAAe,IAChC,kBAAiB,QAAQ,2BAA2B,QAAQ;KAE5D,kBAAiB,QAAQ,uBAAuB,QAAQ;AAG1D,QAAO,QAAQ,iBAAiB,eAAe,IAAI;;AAGrD,SAAgB,6CACd,SACgB;CAChB,IAAI,eAAe,QAAQ;CAC3B,IAAI,aAAa,QAAQ;AAEzB,KAAI,QAAQ,eAAe,KAAK;AAC9B,iBAAe,QAAQ;AACvB,eAAa,QAAQ;YACZ,QAAQ,eAAe,KAAK;AACrC,iBAAe,QAAQ;AACvB,eAAa,QAAQ;;AAGvB,KAAI,aACF,MAAK,IAAI,QAAQ,QAAQ,cAAc,GAAG,SAAS,GAAG,SAAS;EAC7D,MAAM,SAAS,aAAa;AAC5B,MAAI,OACF,QAAO;;AAKb,QAAO,cAAc;;AAGvB,SAAgB,4BACd,SAC+C;CAC/C,MAAM,qBAAqB,QAAQ,iBAAiB,QAAQ,gBAAgB;AAC5E,KAAI,mBACF,QAAO;EACL,WAAW;EACX,eAAe;EAChB;AAGH,KAAI,QAAQ,mBACV,MAAK,IAAI,QAAQ,QAAQ,mBAAmB,SAAS,GAAG,SAAS,GAAG,SAAS;EAC3E,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,mBAAmB,OAAO;AACxF,MAAI,qBACF,QAAO;GACL,WAAW;GACX,eAAe;GAChB;;CAKP,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,kBAAkB;AAChF,QAAO;EACL,WAAW,wBAAwB;EACnC,eAAe,QAAQ,qBAAqB;EAC7C;;AAGH,SAAgB,2BAOd,SAOU;CACV,IAAI,UAAU,QAAQ;AAEtB,KAAI,CAAC,QAAQ,mBACX,MAAK,IAAI,QAAQ,QAAQ,cAAc,SAAS,GAAG,SAAS,GAAG,SAAS;EACtE,MAAM,kBAAkB,QAAQ,iBAAiB,QAAQ,cAAc,OAAO;AAC9E,MAAI,CAAC,gBACH;EAGF,MAAM,eAAe,QAAQ,sBAAsB,QAAQ,oBAAoB,SAAS;EACxF,MAAM,cAAc,QAAQ,mBAC1B,4BAA4B,QAAQ,eAAe,cAAc,QAAQ,cAAc,CACxF;AACD,YAAU,QAAQ,aAAa,iBAAiB,SAAS,YAAY;AAErE,MACE,QAAQ,gBACR,QAAQ,+BACR,QAAQ,sBACR;GACA,MAAM,gBAAgB,QAAQ,qBAC5B,QAAQ,iBAAiB,EAAE,EAC3B,cACA,QAAQ,cACT;AACD,aAAU,QAAQ,4BAA4B,EAAE,UAAU,eAAe,EAAE,QAAQ;;;AAKzF,KAAI,QAAQ,gBAAgB,QAAQ,8BAA8B,QAAQ,qBACxE,WAAU,QAAQ,oBAAoB,QAAQ,sBAAsB,QAAQ;AAG9E,QAAO;;AAGT,eAAsB,8BACpB,SACmB;CACnB,MAAM,YAAY,QAAQ,uBAAuB,QAAQ,SAAS,EAChE,SAAS,QAAQ,yBAAyB,EAC3C,CAAC;AAEF,KAAI,QAAQ,cAAc;EAIxB,MAAM,UAAU,IAAI,QAAQ;GAC1B,gBAAgB;GAChB,MAAM;GACP,CAAC;AACF,iCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,SAAO,IAAI,SAAS,WAAW;GAC7B,QAAQ,QAAQ;GAChB;GACD,CAAC;;AAGJ,QAAO,QAAQ,mBAAmB,WAAW,QAAQ,OAAO"}

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

@@ -34,6 +34,7 @@ type ReadAppPageCacheResponseOptions = {
 type FinalizeAppPageHtmlCacheResponseOptions = {
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
+  consumeDynamicUsage: () => boolean;
   getPageTags: () => string[];
   isrDebug?: AppPageDebugLogger;
   isrHtmlKey: (pathname: string) => string;
@@ -55,10 +56,12 @@ type ScheduleAppPageRscCacheWriteOptions = {
   revalidateSeconds: number;
   waitUntil?: (promise: Promise<void>) => void;
 };
+declare function buildAppPageCacheTags(pathname: string, extraTags: readonly string[]): string[];
 declare function buildAppPageCachedResponse(cachedValue: CachedAppPageValue, options: BuildAppPageCachedResponseOptions): Response | null;
 declare function readAppPageCacheResponse(options: ReadAppPageCacheResponseOptions): Promise<Response | null>;
 declare function finalizeAppPageHtmlCacheResponse(response: Response, options: FinalizeAppPageHtmlCacheResponseOptions): Response;
+declare function finalizeAppPageRscCacheResponse(response: Response, options: ScheduleAppPageRscCacheWriteOptions): Response;
 declare function scheduleAppPageRscCacheWrite(options: ScheduleAppPageRscCacheWriteOptions): boolean;
 //#endregion
-export { buildAppPageCachedResponse, finalizeAppPageHtmlCacheResponse, readAppPageCacheResponse, scheduleAppPageRscCacheWrite };
+export { buildAppPageCacheTags, buildAppPageCachedResponse, finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, readAppPageCacheResponse, scheduleAppPageRscCacheWrite };
 //# sourceMappingURL=app-page-cache.d.ts.map