vinext 0.0.47 → 0.0.49

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

@@ -1,4 +1,5 @@
-import { APP_INTERCEPTION_CONTEXT_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, createAppPayloadPageId, createAppPayloadRouteId } from "./app-elements.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
@@ -26,7 +27,7 @@ function createAppPageLayoutEntries(route) {
 		return {
 			errorModule: route.errors?.[index] ?? null,
 			forbiddenModule: route.forbiddens?.[index] ?? null,
-			id: `layout:${treePath}`,
+			id: AppElementsWire.encodeLayoutId(treePath),
 			layoutModule,
 			notFoundModule: route.notFounds?.[index] ?? null,
 			unauthorizedModule: route.unauthorizeds?.[index] ?? null,
@@ -40,7 +41,7 @@ function createAppPageTemplateEntries(route) {
 		const treePosition = route.templateTreePositions?.[index] ?? 0;
 		const treePath = createAppPageTreePath(route.routeSegments, treePosition);
 		return {
-			id: `template:${treePath}`,
+			id: AppElementsWire.encodeTemplateId(treePath),
 			templateModule,
 			treePath,
 			treePosition
@@ -92,7 +93,7 @@ function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, get
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
 		parallelSlots[slotName] = /* @__PURE__ */ jsx(LayoutSegmentProvider, {
 			segmentMap: { children: slot.routeSegments ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams) : [] },
-			children: /* @__PURE__ */ jsx(Slot, { id: `slot:${slotName}:${treePath}` })
+			children: /* @__PURE__ */ jsx(Slot, { id: AppElementsWire.encodeSlotId(slotName, treePath) })
 		});
 	}
 	return Object.keys(parallelSlots).length > 0 ? parallelSlots : void 0;
@@ -105,10 +106,9 @@ function createAppPageRouteHead(metadata, viewport) {
 	] });
 }
 function buildAppPageElements(options) {
-	const elements = {};
 	const interceptionContext = options.interceptionContext ?? null;
-	const routeId = createAppPayloadRouteId(options.routePath, interceptionContext);
-	const pageId = createAppPayloadPageId(options.routePath, interceptionContext);
+	const routeId = AppElementsWire.encodeRouteId(options.routePath, interceptionContext);
+	const pageId = AppElementsWire.encodePageId(options.routePath, interceptionContext);
 	const layoutEntries = createAppPageLayoutEntries(options.route);
 	const templateEntries = createAppPageTemplateEntries(options.route);
 	const layoutEntriesByTreePosition = /* @__PURE__ */ new Map();
@@ -124,6 +124,11 @@ function buildAppPageElements(options) {
 	const templateDependenciesBeforeById = /* @__PURE__ */ new Map();
 	const pageDependencies = [];
 	const rootLayoutTreePath = layoutEntries[0]?.treePath ?? null;
+	const elements = { ...AppElementsWire.createMetadataEntries({
+		interceptionContext,
+		rootLayoutTreePath,
+		routeId
+	}) };
 	const slotNameCounts = /* @__PURE__ */ new Map();
 	for (const slot of Object.values(options.route.slots ?? {})) {
 		const slotName = slot.name;
@@ -155,9 +160,6 @@ function buildAppPageElements(options) {
 		templateDependenciesBeforeById.set(templateEntry.id, [...pageDependencies]);
 		pageDependencies.push(templateDependency);
 	}
-	elements[APP_ROUTE_KEY] = routeId;
-	elements[APP_INTERCEPTION_CONTEXT_KEY] = interceptionContext;
-	elements[APP_ROOT_LAYOUT_KEY] = rootLayoutTreePath;
 	elements[pageId] = renderAfterAppDependencies(options.element, pageDependencies);
 	for (const templateEntry of templateEntries) {
 		const templateComponent = getDefaultExport(templateEntry.templateModule);
@@ -197,7 +199,8 @@ function buildAppPageElements(options) {
 	for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {
 		const slotName = slot.name;
 		const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;
-		const slotId = `slot:${slotName}:${layoutEntries[targetIndex]?.treePath ?? "/"}`;
+		const treePath = layoutEntries[targetIndex]?.treePath ?? "/";
+		const slotId = AppElementsWire.encodeSlotId(slotName, treePath);
 		const slotOverride = resolveSlotOverride(slotKey, slotName);
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
 		const overrideOrPageComponent = getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);
@@ -205,7 +208,7 @@ function buildAppPageElements(options) {
 		if (!overrideOrPageComponent && defaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
 		const slotComponent = overrideOrPageComponent ?? defaultComponent;
 		if (!slotComponent) {
-			elements[slotId] = APP_UNMATCHED_SLOT_WIRE_VALUE;
+			elements[slotId] = AppElementsWire.unmatchedSlotValue;
 			continue;
 		}
 		const slotThenableParams = options.makeThenableParams(slotParams);

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-route-wiring.js","names":["Children"],"sources":["../../src/server/app-page-route-wiring.tsx"],"sourcesContent":["import { Suspense, type ComponentType, type ReactNode } from \"react\";\nimport {\n  APP_INTERCEPTION_CONTEXT_KEY,\n  APP_ROOT_LAYOUT_KEY,\n  APP_ROUTE_KEY,\n  APP_UNMATCHED_SLOT_WIRE_VALUE,\n  createAppPayloadPageId,\n  createAppPayloadRouteId,\n  type AppElements,\n} from \"./app-elements.js\";\nimport {\n  ErrorBoundary,\n  ForbiddenBoundary,\n  NotFoundBoundary,\n  UnauthorizedBoundary,\n} from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead, type Metadata, type Viewport } from \"vinext/shims/metadata\";\nimport { Children, ParallelSlot, Slot } from \"vinext/shims/slot\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport {\n  createAppRenderDependency,\n  renderAfterAppDependencies,\n  renderWithAppDependencyBarrier,\n  type AppRenderDependency,\n} from \"./app-render-dependency.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\ntype AppPageComponentProps = {\n  children?: ReactNode;\n  error?: unknown;\n  params?: unknown;\n  reset?: () => void;\n} & Record<string, unknown>;\n\ntype AppPageComponent = ComponentType<AppPageComponentProps>;\ntype AppPageErrorComponent = ComponentType<{ error: unknown; reset: () => void }>;\n\nexport type AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\n\nexport type AppPageErrorModule = Record<string, unknown> & {\n  default?: AppPageErrorComponent | null | undefined;\n};\n\ntype AppPageRouteWiringSlot<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  /** Slot prop name passed to the owning layout (e.g. \"modal\" from @modal). */\n  name: string;\n  default?: TModule | null;\n  error?: TErrorModule | null;\n  layout?: TModule | null;\n  layoutIndex: number;\n  loading?: TModule | null;\n  page?: TModule | null;\n  routeSegments?: readonly string[] | null;\n  /**\n   * Full URL pattern parts for the slot's mirrored sub-page. Set when the\n   * slot's params may differ from the route's (e.g. inherited slot whose\n   * dynamic markers have different names than the route's). The runtime\n   * matches the request URL against these parts to extract slot params.\n   */\n  slotPatternParts?: readonly string[] | null;\n  /** Param names captured by `slotPatternParts`, in order. */\n  slotParamNames?: readonly string[] | null;\n};\n\nexport type AppPageRouteWiringRoute<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  error?: TErrorModule | null;\n  errors?: readonly (TErrorModule | null | undefined)[] | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts: readonly (TModule | null | undefined)[];\n  loading?: TModule | null;\n  notFound?: TModule | null;\n  notFounds?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  forbiddens?: readonly (TModule | null | undefined)[] | null;\n  unauthorized?: TModule | null;\n  unauthorizeds?: readonly (TModule | null | undefined)[] | null;\n  routeSegments?: readonly string[];\n  /**\n   * Keyed by stable slot id (name + owner path), not necessarily the slot prop name.\n   */\n  slots?: Readonly<Record<string, AppPageRouteWiringSlot<TModule, TErrorModule>>> | null;\n  templateTreePositions?: readonly number[] | null;\n  templates?: readonly (TModule | null | undefined)[] | null;\n};\n\nexport type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  /**\n   * The page module to render for this slot. Optional — when omitted, the\n   * slot's existing `page` is used (e.g. when the override only changes the\n   * slot's `params` for an inherited mirror with distinct param names).\n   */\n  pageModule?: TModule | null;\n  params?: AppPageParams;\n  props?: Readonly<Record<string, unknown>>;\n};\n\ntype AppPageLayoutEntry<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  errorModule?: TErrorModule | null | undefined;\n  forbiddenModule?: TModule | null | undefined;\n  id: string;\n  layoutModule?: TModule | null | undefined;\n  notFoundModule?: TModule | null | undefined;\n  unauthorizedModule?: TModule | null | undefined;\n  treePath: string;\n  treePosition: number;\n};\n\ntype BuildAppPageRouteElementOptions<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  element: ReactNode;\n  globalErrorModule?: TErrorModule | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  resolvedMetadata: Metadata | null;\n  resolvedViewport: Viewport;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route: AppPageRouteWiringRoute<TModule, TErrorModule>;\n  slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;\n};\n\ntype BuildAppPageElementsOptions<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = BuildAppPageRouteElementOptions<TModule, TErrorModule> & {\n  interceptionContext?: string | null;\n  isRscRequest?: boolean;\n  mountedSlotIds?: ReadonlySet<string> | null;\n  routePath: string;\n};\n\ntype AppPageTemplateEntry<TModule extends AppPageModule = AppPageModule> = {\n  id: string;\n  templateModule?: TModule | null | undefined;\n  treePath: string;\n  treePosition: number;\n};\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction getErrorBoundaryExport<TModule extends AppPageErrorModule>(\n  module: TModule | null | undefined,\n): AppPageErrorComponent | null {\n  return module?.default ?? null;\n}\n\nexport function createAppPageTreePath(\n  routeSegments: readonly string[] | null | undefined,\n  treePosition: number,\n): string {\n  const treePathSegments = routeSegments?.slice(0, treePosition) ?? [];\n  if (treePathSegments.length === 0) {\n    return \"/\";\n  }\n  return `/${treePathSegments.join(\"/\")}`;\n}\n\nexport function createAppPageLayoutEntries<\n  TModule extends AppPageModule,\n  TErrorModule extends AppPageErrorModule,\n>(\n  route: Pick<\n    AppPageRouteWiringRoute<TModule, TErrorModule>,\n    \"errors\" | \"layoutTreePositions\" | \"layouts\" | \"notFounds\" | \"routeSegments\"\n  > & {\n    forbiddens?: readonly (TModule | null | undefined)[] | null;\n    unauthorizeds?: readonly (TModule | null | undefined)[] | null;\n  },\n): AppPageLayoutEntry<TModule, TErrorModule>[] {\n  return route.layouts.map((layoutModule, index) => {\n    const treePosition = route.layoutTreePositions?.[index] ?? 0;\n    const treePath = createAppPageTreePath(route.routeSegments, treePosition);\n    return {\n      errorModule: route.errors?.[index] ?? null,\n      forbiddenModule: route.forbiddens?.[index] ?? null,\n      id: `layout:${treePath}`,\n      layoutModule,\n      notFoundModule: route.notFounds?.[index] ?? null,\n      unauthorizedModule: route.unauthorizeds?.[index] ?? null,\n      treePath,\n      treePosition,\n    };\n  });\n}\n\nfunction createAppPageTemplateEntries<TModule extends AppPageModule>(\n  route: Pick<\n    AppPageRouteWiringRoute<TModule>,\n    \"routeSegments\" | \"templateTreePositions\" | \"templates\"\n  >,\n): AppPageTemplateEntry<TModule>[] {\n  return (route.templates ?? []).map((templateModule, index) => {\n    const treePosition = route.templateTreePositions?.[index] ?? 0;\n    const treePath = createAppPageTreePath(route.routeSegments, treePosition);\n    return {\n      id: `template:${treePath}`,\n      templateModule,\n      treePath,\n      treePosition,\n    };\n  });\n}\n\nexport function resolveAppPageChildSegments(\n  routeSegments: readonly string[],\n  treePosition: number,\n  params: AppPageParams,\n): string[] {\n  const rawSegments = routeSegments.slice(treePosition);\n  const resolvedSegments: string[] = [];\n\n  for (const segment of rawSegments) {\n    if (\n      segment.startsWith(\"[[...\") &&\n      segment.endsWith(\"]]\") &&\n      segment.length > \"[[...x]]\".length - 1\n    ) {\n      const paramName = segment.slice(5, -2);\n      const paramValue = params[paramName];\n      if (Array.isArray(paramValue) && paramValue.length === 0) {\n        continue;\n      }\n      if (paramValue === undefined) {\n        continue;\n      }\n      resolvedSegments.push(Array.isArray(paramValue) ? paramValue.join(\"/\") : paramValue);\n      continue;\n    }\n\n    if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) {\n      const paramName = segment.slice(4, -1);\n      const paramValue = params[paramName];\n      if (Array.isArray(paramValue)) {\n        resolvedSegments.push(paramValue.join(\"/\"));\n        continue;\n      }\n      resolvedSegments.push(paramValue ?? segment);\n      continue;\n    }\n\n    if (segment.startsWith(\"[\") && segment.endsWith(\"]\") && !segment.includes(\".\")) {\n      const paramName = segment.slice(1, -1);\n      const paramValue = params[paramName];\n      resolvedSegments.push(\n        Array.isArray(paramValue) ? paramValue.join(\"/\") : (paramValue ?? segment),\n      );\n      continue;\n    }\n\n    resolvedSegments.push(segment);\n  }\n\n  return resolvedSegments;\n}\n\nfunction resolveAppPageVisibleSegments(\n  routeSegments: readonly string[],\n  params: AppPageParams,\n): string[] {\n  const resolvedSegments = resolveAppPageChildSegments(routeSegments, 0, params);\n  return resolvedSegments.filter((segment) => !(segment.startsWith(\"(\") && segment.endsWith(\")\")));\n}\n\nfunction resolveAppPageTemplateKey(\n  routeSegments: readonly string[],\n  treePosition: number,\n  params: AppPageParams,\n): string {\n  const visibleSegments = resolveAppPageVisibleSegments(routeSegments.slice(treePosition), params);\n  return visibleSegments[0] ?? \"\";\n}\n\nfunction createAppPageParallelSlotEntries<\n  TModule extends AppPageModule,\n  TErrorModule extends AppPageErrorModule,\n>(\n  layoutIndex: number,\n  layoutEntries: readonly AppPageLayoutEntry<TModule, TErrorModule>[],\n  route: AppPageRouteWiringRoute<TModule, TErrorModule>,\n  getEffectiveSlotParams: (slotKey: string, slotName: string) => AppPageParams,\n): Readonly<Record<string, ReactNode>> | undefined {\n  const parallelSlots: Record<string, ReactNode> = {};\n\n  for (const [slotKey, slot] of Object.entries(route.slots ?? {})) {\n    const slotName = slot.name;\n    const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n    if (targetIndex !== layoutIndex) {\n      continue;\n    }\n\n    const layoutEntry = layoutEntries[targetIndex];\n    const treePath = layoutEntry?.treePath ?? \"/\";\n    const slotParams = getEffectiveSlotParams(slotKey, slotName);\n    const slotSegments = slot.routeSegments\n      ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams)\n      : [];\n    parallelSlots[slotName] = (\n      <LayoutSegmentProvider segmentMap={{ children: slotSegments }}>\n        <Slot id={`slot:${slotName}:${treePath}`} />\n      </LayoutSegmentProvider>\n    );\n  }\n\n  return Object.keys(parallelSlots).length > 0 ? parallelSlots : undefined;\n}\n\nfunction createAppPageRouteHead(metadata: Metadata | null, viewport: Viewport): ReactNode {\n  return (\n    <>\n      <meta charSet=\"utf-8\" />\n      {metadata ? <MetadataHead metadata={metadata} /> : null}\n      <ViewportHead viewport={viewport} />\n    </>\n  );\n}\n\nexport function buildAppPageElements<\n  TModule extends AppPageModule,\n  TErrorModule extends AppPageErrorModule,\n>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements {\n  const elements: Record<string, ReactNode | string | null> = {};\n  const interceptionContext = options.interceptionContext ?? null;\n  const routeId = createAppPayloadRouteId(options.routePath, interceptionContext);\n  const pageId = createAppPayloadPageId(options.routePath, interceptionContext);\n  const layoutEntries = createAppPageLayoutEntries(options.route);\n  const templateEntries = createAppPageTemplateEntries(options.route);\n  const layoutEntriesByTreePosition = new Map<number, AppPageLayoutEntry<TModule, TErrorModule>>();\n  const templateEntriesByTreePosition = new Map<number, AppPageTemplateEntry<TModule>>();\n  for (const layoutEntry of layoutEntries) {\n    layoutEntriesByTreePosition.set(layoutEntry.treePosition, layoutEntry);\n  }\n  for (const templateEntry of templateEntries) {\n    templateEntriesByTreePosition.set(templateEntry.treePosition, templateEntry);\n  }\n  const layoutIndicesByTreePosition = new Map<number, number>();\n  for (let index = 0; index < layoutEntries.length; index++) {\n    layoutIndicesByTreePosition.set(layoutEntries[index].treePosition, index);\n  }\n  const layoutDependenciesByIndex = new Map<number, AppRenderDependency>();\n  const layoutDependenciesBefore: AppRenderDependency[][] = [];\n  const slotDependenciesByLayoutIndex: AppRenderDependency[][] = [];\n  const templateDependenciesById = new Map<string, AppRenderDependency>();\n  const templateDependenciesBeforeById = new Map<string, AppRenderDependency[]>();\n  const pageDependencies: AppRenderDependency[] = [];\n  const rootLayoutTreePath = layoutEntries[0]?.treePath ?? null;\n  const slotNameCounts = new Map<string, number>();\n  for (const slot of Object.values(options.route.slots ?? {})) {\n    const slotName = slot.name;\n    slotNameCounts.set(slotName, (slotNameCounts.get(slotName) ?? 0) + 1);\n  }\n  const orderedTreePositions = Array.from(\n    new Set<number>([\n      ...layoutEntries.map((entry) => entry.treePosition),\n      ...templateEntries.map((entry) => entry.treePosition),\n    ]),\n  ).sort((left, right) => left - right);\n  const resolveSlotOverride = (slotKey: string, slotName: string) => {\n    const overrideByKey = options.slotOverrides?.[slotKey];\n    if (overrideByKey) {\n      return overrideByKey;\n    }\n\n    // Legacy callers may still provide overrides by slot prop name.\n    // Only allow that fallback when it is unambiguous.\n    if (slotKey === slotName || (slotNameCounts.get(slotName) ?? 0) === 1) {\n      return options.slotOverrides?.[slotName];\n    }\n\n    return undefined;\n  };\n  const getEffectiveSlotParams = (slotKey: string, slotName: string): AppPageParams =>\n    resolveSlotOverride(slotKey, slotName)?.params ?? options.matchedParams;\n\n  for (const treePosition of orderedTreePositions) {\n    const layoutIndex = layoutIndicesByTreePosition.get(treePosition);\n    if (layoutIndex !== undefined) {\n      const layoutEntry = layoutEntries[layoutIndex];\n      layoutDependenciesBefore[layoutIndex] = [...pageDependencies];\n      if (getDefaultExport(layoutEntry.layoutModule)) {\n        const layoutDependency = createAppRenderDependency();\n        layoutDependenciesByIndex.set(layoutIndex, layoutDependency);\n        pageDependencies.push(layoutDependency);\n      }\n      slotDependenciesByLayoutIndex[layoutIndex] = [...pageDependencies];\n    }\n\n    const templateEntry = templateEntriesByTreePosition.get(treePosition);\n    if (!templateEntry || !getDefaultExport(templateEntry.templateModule)) {\n      continue;\n    }\n\n    const templateDependency = createAppRenderDependency();\n    templateDependenciesById.set(templateEntry.id, templateDependency);\n    templateDependenciesBeforeById.set(templateEntry.id, [...pageDependencies]);\n    pageDependencies.push(templateDependency);\n  }\n\n  elements[APP_ROUTE_KEY] = routeId;\n  elements[APP_INTERCEPTION_CONTEXT_KEY] = interceptionContext;\n  elements[APP_ROOT_LAYOUT_KEY] = rootLayoutTreePath;\n  elements[pageId] = renderAfterAppDependencies(options.element, pageDependencies);\n\n  for (const templateEntry of templateEntries) {\n    const templateComponent = getDefaultExport(templateEntry.templateModule);\n    if (!templateComponent) {\n      continue;\n    }\n    const TemplateComponent = templateComponent;\n    const templateDependency = templateDependenciesById.get(templateEntry.id);\n    const templateElement = templateDependency ? (\n      renderWithAppDependencyBarrier(\n        <TemplateComponent params={options.matchedParams}>\n          <Children />\n        </TemplateComponent>,\n        templateDependency,\n      )\n    ) : (\n      <TemplateComponent params={options.matchedParams}>\n        <Children />\n      </TemplateComponent>\n    );\n    elements[templateEntry.id] = renderAfterAppDependencies(\n      templateElement,\n      templateDependenciesBeforeById.get(templateEntry.id) ?? [],\n    );\n  }\n\n  for (let index = 0; index < layoutEntries.length; index++) {\n    const layoutEntry = layoutEntries[index];\n    const layoutComponent = getDefaultExport(layoutEntry.layoutModule);\n    if (!layoutComponent) {\n      continue;\n    }\n\n    const layoutProps: Record<string, unknown> = {\n      params: options.makeThenableParams(\n        resolveAppPageSegmentParams(\n          options.route.routeSegments,\n          layoutEntry.treePosition,\n          options.matchedParams,\n        ),\n      ),\n    };\n\n    for (const slot of Object.values(options.route.slots ?? {})) {\n      const slotName = slot.name;\n      const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n      if (targetIndex !== index) {\n        continue;\n      }\n      layoutProps[slotName] = <ParallelSlot name={slotName} />;\n    }\n\n    const LayoutComponent = layoutComponent;\n    const layoutDependency = layoutDependenciesByIndex.get(index);\n    const layoutElement = layoutDependency ? (\n      renderWithAppDependencyBarrier(\n        <LayoutComponent {...layoutProps}>\n          <Children />\n        </LayoutComponent>,\n        layoutDependency,\n      )\n    ) : (\n      <LayoutComponent {...layoutProps}>\n        <Children />\n      </LayoutComponent>\n    );\n    elements[layoutEntry.id] = renderAfterAppDependencies(\n      layoutElement,\n      layoutDependenciesBefore[index] ?? [],\n    );\n  }\n\n  for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {\n    const slotName = slot.name;\n    const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n    const treePath = layoutEntries[targetIndex]?.treePath ?? \"/\";\n    const slotId = `slot:${slotName}:${treePath}`;\n    const slotOverride = resolveSlotOverride(slotKey, slotName);\n    const slotParams = getEffectiveSlotParams(slotKey, slotName);\n    const overrideOrPageComponent =\n      getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);\n    const defaultComponent = getDefaultExport(slot.default);\n\n    // On soft nav (RSC): omit key when only default.tsx exists and the slot is\n    // already mounted on the client. Absent key means the browser retains prior\n    // slot content rather than replacing it. When the slot is not yet mounted\n    // (first entry into this layout), include the key so default.tsx renders.\n    if (\n      !overrideOrPageComponent &&\n      defaultComponent &&\n      options.isRscRequest &&\n      options.mountedSlotIds?.has(slotId)\n    ) {\n      continue;\n    }\n\n    const slotComponent = overrideOrPageComponent ?? defaultComponent;\n\n    if (!slotComponent) {\n      elements[slotId] = APP_UNMATCHED_SLOT_WIRE_VALUE;\n      continue;\n    }\n\n    const slotThenableParams = options.makeThenableParams(slotParams);\n    const slotProps: Record<string, unknown> = {\n      params: slotThenableParams,\n    };\n    if (slotOverride?.props) {\n      Object.assign(slotProps, slotOverride.props);\n    }\n\n    const SlotComponent = slotComponent;\n    let slotElement: ReactNode = <SlotComponent {...slotProps} />;\n    const interceptLayouts = slotOverride?.layoutModules ?? [];\n\n    for (let layoutIndex = interceptLayouts.length - 1; layoutIndex >= 0; layoutIndex--) {\n      const interceptLayoutComponent = getDefaultExport(interceptLayouts[layoutIndex]);\n      if (!interceptLayoutComponent) {\n        continue;\n      }\n      const InterceptLayoutComponent = interceptLayoutComponent;\n      slotElement = (\n        <InterceptLayoutComponent params={slotThenableParams}>\n          {slotElement}\n        </InterceptLayoutComponent>\n      );\n    }\n\n    const slotLayoutComponent = getDefaultExport(slot.layout);\n    if (slotLayoutComponent) {\n      const SlotLayoutComponent = slotLayoutComponent;\n      slotElement = (\n        <SlotLayoutComponent params={slotThenableParams}>{slotElement}</SlotLayoutComponent>\n      );\n    }\n\n    const slotLoadingComponent = getDefaultExport(slot.loading);\n    if (slotLoadingComponent) {\n      const SlotLoadingComponent = slotLoadingComponent;\n      slotElement = <Suspense fallback={<SlotLoadingComponent />}>{slotElement}</Suspense>;\n    }\n\n    const slotErrorComponent = getErrorBoundaryExport(slot.error);\n    if (slotErrorComponent) {\n      slotElement = <ErrorBoundary fallback={slotErrorComponent}>{slotElement}</ErrorBoundary>;\n    }\n\n    elements[slotId] = renderAfterAppDependencies(\n      slotElement,\n      targetIndex >= 0 ? (slotDependenciesByLayoutIndex[targetIndex] ?? []) : [],\n    );\n  }\n\n  let routeChildren: ReactNode = (\n    <LayoutSegmentProvider segmentMap={{ children: [] }}>\n      <Slot id={pageId} />\n    </LayoutSegmentProvider>\n  );\n\n  const routeLoadingComponent = getDefaultExport(options.route.loading);\n  if (routeLoadingComponent) {\n    const RouteLoadingComponent = routeLoadingComponent;\n    routeChildren = <Suspense fallback={<RouteLoadingComponent />}>{routeChildren}</Suspense>;\n  }\n\n  const lastLayoutErrorModule =\n    options.route.errors && options.route.errors.length > 0\n      ? options.route.errors[options.route.errors.length - 1]\n      : null;\n  // Next.js nesting (outer to inner): Error > Unauthorized > Forbidden > NotFound > children.\n  // Building bottom-up means NotFoundBoundary must wrap first, then Forbidden, Unauthorized, Error.\n  const notFoundComponent =\n    getDefaultExport(options.route.notFound) ?? getDefaultExport(options.rootNotFoundModule);\n  if (notFoundComponent) {\n    const NotFoundComponent = notFoundComponent;\n    routeChildren = (\n      <NotFoundBoundary fallback={<NotFoundComponent />}>{routeChildren}</NotFoundBoundary>\n    );\n  }\n\n  const forbiddenComponent =\n    getDefaultExport(options.route.forbidden) ?? getDefaultExport(options.rootForbiddenModule);\n  if (forbiddenComponent) {\n    const ForbiddenComponent = forbiddenComponent;\n    routeChildren = (\n      <ForbiddenBoundary fallback={<ForbiddenComponent />}>{routeChildren}</ForbiddenBoundary>\n    );\n  }\n\n  const unauthorizedComponent =\n    getDefaultExport(options.route.unauthorized) ??\n    getDefaultExport(options.rootUnauthorizedModule);\n  if (unauthorizedComponent) {\n    const UnauthorizedComponent = unauthorizedComponent;\n    routeChildren = (\n      <UnauthorizedBoundary fallback={<UnauthorizedComponent />}>\n        {routeChildren}\n      </UnauthorizedBoundary>\n    );\n  }\n\n  const pageErrorComponent = getErrorBoundaryExport(options.route.error);\n  if (pageErrorComponent && options.route.error !== lastLayoutErrorModule) {\n    routeChildren = <ErrorBoundary fallback={pageErrorComponent}>{routeChildren}</ErrorBoundary>;\n  }\n\n  for (let index = orderedTreePositions.length - 1; index >= 0; index--) {\n    const treePosition = orderedTreePositions[index];\n    let segmentChildren: ReactNode = routeChildren;\n    const layoutEntry = layoutEntriesByTreePosition.get(treePosition);\n    const templateEntry = templateEntriesByTreePosition.get(treePosition);\n\n    // Next.js nesting per segment (outer to inner): Layout > Template > Error > Unauthorized > Forbidden > NotFound > children.\n    // Building bottom-up means NotFoundBoundary must wrap the leaf subtree first,\n    // then ErrorBoundary, then Template, with the Layout slot outermost.\n    if (layoutEntry) {\n      const layoutNotFoundComponent = getDefaultExport(layoutEntry.notFoundModule);\n      if (layoutNotFoundComponent) {\n        const LayoutNotFoundComponent = layoutNotFoundComponent;\n        segmentChildren = (\n          <NotFoundBoundary fallback={<LayoutNotFoundComponent />}>\n            {segmentChildren}\n          </NotFoundBoundary>\n        );\n      }\n\n      const layoutForbiddenComponent = getDefaultExport(layoutEntry.forbiddenModule);\n      if (layoutForbiddenComponent) {\n        const LayoutForbiddenComponent = layoutForbiddenComponent;\n        segmentChildren = (\n          <ForbiddenBoundary fallback={<LayoutForbiddenComponent />}>\n            {segmentChildren}\n          </ForbiddenBoundary>\n        );\n      }\n\n      const layoutUnauthorizedComponent = getDefaultExport(layoutEntry.unauthorizedModule);\n      if (layoutUnauthorizedComponent) {\n        const LayoutUnauthorizedComponent = layoutUnauthorizedComponent;\n        segmentChildren = (\n          <UnauthorizedBoundary fallback={<LayoutUnauthorizedComponent />}>\n            {segmentChildren}\n          </UnauthorizedBoundary>\n        );\n      }\n\n      const layoutErrorComponent = getErrorBoundaryExport(layoutEntry.errorModule);\n      if (layoutErrorComponent) {\n        segmentChildren = (\n          <ErrorBoundary fallback={layoutErrorComponent}>{segmentChildren}</ErrorBoundary>\n        );\n      }\n    }\n\n    if (templateEntry && getDefaultExport(templateEntry.templateModule)) {\n      segmentChildren = (\n        <Slot\n          id={templateEntry.id}\n          key={resolveAppPageTemplateKey(\n            options.route.routeSegments ?? [],\n            templateEntry.treePosition,\n            options.matchedParams,\n          )}\n        >\n          {segmentChildren}\n        </Slot>\n      );\n    }\n\n    if (!layoutEntry) {\n      routeChildren = segmentChildren;\n      continue;\n    }\n    const layoutHasElement = getDefaultExport(layoutEntry.layoutModule) !== null;\n    const layoutIndex = layoutIndicesByTreePosition.get(treePosition) ?? -1;\n    const segmentMap: { children: string[] } & Record<string, string[]> = {\n      children: resolveAppPageChildSegments(\n        options.route.routeSegments ?? [],\n        layoutEntry.treePosition,\n        options.matchedParams,\n      ),\n    };\n    for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {\n      const slotName = slot.name;\n      const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n      if (targetIndex !== layoutIndex) {\n        continue;\n      }\n      const slotParams = getEffectiveSlotParams(slotKey, slotName);\n      segmentMap[slotName] = slot.routeSegments\n        ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams)\n        : [];\n    }\n\n    routeChildren = (\n      <LayoutSegmentProvider segmentMap={segmentMap}>\n        {layoutHasElement ? (\n          <Slot\n            id={layoutEntry.id}\n            parallelSlots={createAppPageParallelSlotEntries(\n              layoutIndex,\n              layoutEntries,\n              options.route,\n              getEffectiveSlotParams,\n            )}\n          >\n            {segmentChildren}\n          </Slot>\n        ) : (\n          segmentChildren\n        )}\n      </LayoutSegmentProvider>\n    );\n  }\n\n  const globalErrorComponent = getErrorBoundaryExport(options.globalErrorModule);\n  if (globalErrorComponent) {\n    routeChildren = <ErrorBoundary fallback={globalErrorComponent}>{routeChildren}</ErrorBoundary>;\n  }\n\n  elements[routeId] = (\n    <>\n      {createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport)}\n      {routeChildren}\n    </>\n  );\n\n  return elements;\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-route-wiring.js","names":["Children"],"sources":["../../src/server/app-page-route-wiring.tsx"],"sourcesContent":["import { Suspense, type ComponentType, type ReactNode } from \"react\";\nimport { AppElementsWire, type AppElements } from \"./app-elements.js\";\nimport {\n  ErrorBoundary,\n  ForbiddenBoundary,\n  NotFoundBoundary,\n  UnauthorizedBoundary,\n} from \"vinext/shims/error-boundary\";\nimport type { AppRouteSemanticIds } from \"../routing/app-route-graph.js\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead, type Metadata, type Viewport } from \"vinext/shims/metadata\";\nimport { Children, ParallelSlot, Slot } from \"vinext/shims/slot\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport {\n  createAppRenderDependency,\n  renderAfterAppDependencies,\n  renderWithAppDependencyBarrier,\n  type AppRenderDependency,\n} from \"./app-render-dependency.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\ntype AppPageComponentProps = {\n  children?: ReactNode;\n  error?: unknown;\n  params?: unknown;\n  reset?: () => void;\n} & Record<string, unknown>;\n\ntype AppPageComponent = ComponentType<AppPageComponentProps>;\ntype AppPageErrorComponent = ComponentType<{ error: unknown; reset: () => void }>;\n\nexport type AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\n\nexport type AppPageErrorModule = Record<string, unknown> & {\n  default?: AppPageErrorComponent | null | undefined;\n};\n\ntype AppPageRouteWiringSlot<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  /** Graph-owned semantic slot identity. */\n  id?: string | null;\n  /** Slot prop name passed to the owning layout (e.g. \"modal\" from @modal). */\n  name: string;\n  default?: TModule | null;\n  error?: TErrorModule | null;\n  layout?: TModule | null;\n  layoutIndex: number;\n  loading?: TModule | null;\n  page?: TModule | null;\n  routeSegments?: readonly string[] | null;\n  /**\n   * Full URL pattern parts for the slot's mirrored sub-page. Set when the\n   * slot's params may differ from the route's (e.g. inherited slot whose\n   * dynamic markers have different names than the route's). The runtime\n   * matches the request URL against these parts to extract slot params.\n   */\n  slotPatternParts?: readonly string[] | null;\n  /** Param names captured by `slotPatternParts`, in order. */\n  slotParamNames?: readonly string[] | null;\n};\n\nexport type AppPageRouteWiringRoute<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  ids?: AppRouteSemanticIds | null;\n  error?: TErrorModule | null;\n  errors?: readonly (TErrorModule | null | undefined)[] | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts: readonly (TModule | null | undefined)[];\n  loading?: TModule | null;\n  notFound?: TModule | null;\n  notFounds?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  forbiddens?: readonly (TModule | null | undefined)[] | null;\n  unauthorized?: TModule | null;\n  unauthorizeds?: readonly (TModule | null | undefined)[] | null;\n  routeSegments?: readonly string[];\n  /**\n   * Keyed by stable slot id (name + owner path), not necessarily the slot prop name.\n   */\n  slots?: Readonly<Record<string, AppPageRouteWiringSlot<TModule, TErrorModule>>> | null;\n  templateTreePositions?: readonly number[] | null;\n  templates?: readonly (TModule | null | undefined)[] | null;\n};\n\nexport type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  /**\n   * The page module to render for this slot. Optional — when omitted, the\n   * slot's existing `page` is used (e.g. when the override only changes the\n   * slot's `params` for an inherited mirror with distinct param names).\n   */\n  pageModule?: TModule | null;\n  params?: AppPageParams;\n  props?: Readonly<Record<string, unknown>>;\n};\n\ntype AppPageLayoutEntry<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  errorModule?: TErrorModule | null | undefined;\n  forbiddenModule?: TModule | null | undefined;\n  id: string;\n  layoutModule?: TModule | null | undefined;\n  notFoundModule?: TModule | null | undefined;\n  unauthorizedModule?: TModule | null | undefined;\n  treePath: string;\n  treePosition: number;\n};\n\ntype BuildAppPageRouteElementOptions<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = {\n  element: ReactNode;\n  globalErrorModule?: TErrorModule | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  resolvedMetadata: Metadata | null;\n  resolvedViewport: Viewport;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route: AppPageRouteWiringRoute<TModule, TErrorModule>;\n  slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;\n};\n\ntype BuildAppPageElementsOptions<\n  TModule extends AppPageModule = AppPageModule,\n  TErrorModule extends AppPageErrorModule = AppPageErrorModule,\n> = BuildAppPageRouteElementOptions<TModule, TErrorModule> & {\n  interceptionContext?: string | null;\n  isRscRequest?: boolean;\n  mountedSlotIds?: ReadonlySet<string> | null;\n  routePath: string;\n};\n\ntype AppPageTemplateEntry<TModule extends AppPageModule = AppPageModule> = {\n  id: string;\n  templateModule?: TModule | null | undefined;\n  treePath: string;\n  treePosition: number;\n};\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction getErrorBoundaryExport<TModule extends AppPageErrorModule>(\n  module: TModule | null | undefined,\n): AppPageErrorComponent | null {\n  return module?.default ?? null;\n}\n\nexport function createAppPageTreePath(\n  routeSegments: readonly string[] | null | undefined,\n  treePosition: number,\n): string {\n  const treePathSegments = routeSegments?.slice(0, treePosition) ?? [];\n  if (treePathSegments.length === 0) {\n    return \"/\";\n  }\n  return `/${treePathSegments.join(\"/\")}`;\n}\n\nexport function createAppPageLayoutEntries<\n  TModule extends AppPageModule,\n  TErrorModule extends AppPageErrorModule,\n>(\n  route: Pick<\n    AppPageRouteWiringRoute<TModule, TErrorModule>,\n    \"errors\" | \"layoutTreePositions\" | \"layouts\" | \"notFounds\" | \"routeSegments\"\n  > & {\n    forbiddens?: readonly (TModule | null | undefined)[] | null;\n    unauthorizeds?: readonly (TModule | null | undefined)[] | null;\n  },\n): AppPageLayoutEntry<TModule, TErrorModule>[] {\n  return route.layouts.map((layoutModule, index) => {\n    const treePosition = route.layoutTreePositions?.[index] ?? 0;\n    const treePath = createAppPageTreePath(route.routeSegments, treePosition);\n    return {\n      errorModule: route.errors?.[index] ?? null,\n      forbiddenModule: route.forbiddens?.[index] ?? null,\n      id: AppElementsWire.encodeLayoutId(treePath),\n      layoutModule,\n      notFoundModule: route.notFounds?.[index] ?? null,\n      unauthorizedModule: route.unauthorizeds?.[index] ?? null,\n      treePath,\n      treePosition,\n    };\n  });\n}\n\nfunction createAppPageTemplateEntries<TModule extends AppPageModule>(\n  route: Pick<\n    AppPageRouteWiringRoute<TModule>,\n    \"routeSegments\" | \"templateTreePositions\" | \"templates\"\n  >,\n): AppPageTemplateEntry<TModule>[] {\n  return (route.templates ?? []).map((templateModule, index) => {\n    const treePosition = route.templateTreePositions?.[index] ?? 0;\n    const treePath = createAppPageTreePath(route.routeSegments, treePosition);\n    return {\n      id: AppElementsWire.encodeTemplateId(treePath),\n      templateModule,\n      treePath,\n      treePosition,\n    };\n  });\n}\n\nexport function resolveAppPageChildSegments(\n  routeSegments: readonly string[],\n  treePosition: number,\n  params: AppPageParams,\n): string[] {\n  const rawSegments = routeSegments.slice(treePosition);\n  const resolvedSegments: string[] = [];\n\n  for (const segment of rawSegments) {\n    if (\n      segment.startsWith(\"[[...\") &&\n      segment.endsWith(\"]]\") &&\n      segment.length > \"[[...x]]\".length - 1\n    ) {\n      const paramName = segment.slice(5, -2);\n      const paramValue = params[paramName];\n      if (Array.isArray(paramValue) && paramValue.length === 0) {\n        continue;\n      }\n      if (paramValue === undefined) {\n        continue;\n      }\n      resolvedSegments.push(Array.isArray(paramValue) ? paramValue.join(\"/\") : paramValue);\n      continue;\n    }\n\n    if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) {\n      const paramName = segment.slice(4, -1);\n      const paramValue = params[paramName];\n      if (Array.isArray(paramValue)) {\n        resolvedSegments.push(paramValue.join(\"/\"));\n        continue;\n      }\n      resolvedSegments.push(paramValue ?? segment);\n      continue;\n    }\n\n    if (segment.startsWith(\"[\") && segment.endsWith(\"]\") && !segment.includes(\".\")) {\n      const paramName = segment.slice(1, -1);\n      const paramValue = params[paramName];\n      resolvedSegments.push(\n        Array.isArray(paramValue) ? paramValue.join(\"/\") : (paramValue ?? segment),\n      );\n      continue;\n    }\n\n    resolvedSegments.push(segment);\n  }\n\n  return resolvedSegments;\n}\n\nfunction resolveAppPageVisibleSegments(\n  routeSegments: readonly string[],\n  params: AppPageParams,\n): string[] {\n  const resolvedSegments = resolveAppPageChildSegments(routeSegments, 0, params);\n  return resolvedSegments.filter((segment) => !(segment.startsWith(\"(\") && segment.endsWith(\")\")));\n}\n\nfunction resolveAppPageTemplateKey(\n  routeSegments: readonly string[],\n  treePosition: number,\n  params: AppPageParams,\n): string {\n  const visibleSegments = resolveAppPageVisibleSegments(routeSegments.slice(treePosition), params);\n  return visibleSegments[0] ?? \"\";\n}\n\nfunction createAppPageParallelSlotEntries<\n  TModule extends AppPageModule,\n  TErrorModule extends AppPageErrorModule,\n>(\n  layoutIndex: number,\n  layoutEntries: readonly AppPageLayoutEntry<TModule, TErrorModule>[],\n  route: AppPageRouteWiringRoute<TModule, TErrorModule>,\n  getEffectiveSlotParams: (slotKey: string, slotName: string) => AppPageParams,\n): Readonly<Record<string, ReactNode>> | undefined {\n  const parallelSlots: Record<string, ReactNode> = {};\n\n  for (const [slotKey, slot] of Object.entries(route.slots ?? {})) {\n    const slotName = slot.name;\n    const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n    if (targetIndex !== layoutIndex) {\n      continue;\n    }\n\n    const layoutEntry = layoutEntries[targetIndex];\n    const treePath = layoutEntry?.treePath ?? \"/\";\n    const slotParams = getEffectiveSlotParams(slotKey, slotName);\n    const slotSegments = slot.routeSegments\n      ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams)\n      : [];\n    parallelSlots[slotName] = (\n      <LayoutSegmentProvider segmentMap={{ children: slotSegments }}>\n        <Slot id={AppElementsWire.encodeSlotId(slotName, treePath)} />\n      </LayoutSegmentProvider>\n    );\n  }\n\n  return Object.keys(parallelSlots).length > 0 ? parallelSlots : undefined;\n}\n\nfunction createAppPageRouteHead(metadata: Metadata | null, viewport: Viewport): ReactNode {\n  return (\n    <>\n      <meta charSet=\"utf-8\" />\n      {metadata ? <MetadataHead metadata={metadata} /> : null}\n      <ViewportHead viewport={viewport} />\n    </>\n  );\n}\n\nexport function buildAppPageElements<\n  TModule extends AppPageModule,\n  TErrorModule extends AppPageErrorModule,\n>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements {\n  const interceptionContext = options.interceptionContext ?? null;\n  const routeId = AppElementsWire.encodeRouteId(options.routePath, interceptionContext);\n  const pageId = AppElementsWire.encodePageId(options.routePath, interceptionContext);\n  const layoutEntries = createAppPageLayoutEntries(options.route);\n  const templateEntries = createAppPageTemplateEntries(options.route);\n  const layoutEntriesByTreePosition = new Map<number, AppPageLayoutEntry<TModule, TErrorModule>>();\n  const templateEntriesByTreePosition = new Map<number, AppPageTemplateEntry<TModule>>();\n  for (const layoutEntry of layoutEntries) {\n    layoutEntriesByTreePosition.set(layoutEntry.treePosition, layoutEntry);\n  }\n  for (const templateEntry of templateEntries) {\n    templateEntriesByTreePosition.set(templateEntry.treePosition, templateEntry);\n  }\n  const layoutIndicesByTreePosition = new Map<number, number>();\n  for (let index = 0; index < layoutEntries.length; index++) {\n    layoutIndicesByTreePosition.set(layoutEntries[index].treePosition, index);\n  }\n  const layoutDependenciesByIndex = new Map<number, AppRenderDependency>();\n  const layoutDependenciesBefore: AppRenderDependency[][] = [];\n  const slotDependenciesByLayoutIndex: AppRenderDependency[][] = [];\n  const templateDependenciesById = new Map<string, AppRenderDependency>();\n  const templateDependenciesBeforeById = new Map<string, AppRenderDependency[]>();\n  const pageDependencies: AppRenderDependency[] = [];\n  const rootLayoutTreePath = layoutEntries[0]?.treePath ?? null;\n  const elements: Record<string, ReactNode | string | null> = {\n    ...AppElementsWire.createMetadataEntries({\n      interceptionContext,\n      rootLayoutTreePath,\n      routeId,\n    }),\n  };\n  const slotNameCounts = new Map<string, number>();\n  for (const slot of Object.values(options.route.slots ?? {})) {\n    const slotName = slot.name;\n    slotNameCounts.set(slotName, (slotNameCounts.get(slotName) ?? 0) + 1);\n  }\n  const orderedTreePositions = Array.from(\n    new Set<number>([\n      ...layoutEntries.map((entry) => entry.treePosition),\n      ...templateEntries.map((entry) => entry.treePosition),\n    ]),\n  ).sort((left, right) => left - right);\n  const resolveSlotOverride = (slotKey: string, slotName: string) => {\n    const overrideByKey = options.slotOverrides?.[slotKey];\n    if (overrideByKey) {\n      return overrideByKey;\n    }\n\n    // Legacy callers may still provide overrides by slot prop name.\n    // Only allow that fallback when it is unambiguous.\n    if (slotKey === slotName || (slotNameCounts.get(slotName) ?? 0) === 1) {\n      return options.slotOverrides?.[slotName];\n    }\n\n    return undefined;\n  };\n  const getEffectiveSlotParams = (slotKey: string, slotName: string): AppPageParams =>\n    resolveSlotOverride(slotKey, slotName)?.params ?? options.matchedParams;\n\n  for (const treePosition of orderedTreePositions) {\n    const layoutIndex = layoutIndicesByTreePosition.get(treePosition);\n    if (layoutIndex !== undefined) {\n      const layoutEntry = layoutEntries[layoutIndex];\n      layoutDependenciesBefore[layoutIndex] = [...pageDependencies];\n      if (getDefaultExport(layoutEntry.layoutModule)) {\n        const layoutDependency = createAppRenderDependency();\n        layoutDependenciesByIndex.set(layoutIndex, layoutDependency);\n        pageDependencies.push(layoutDependency);\n      }\n      slotDependenciesByLayoutIndex[layoutIndex] = [...pageDependencies];\n    }\n\n    const templateEntry = templateEntriesByTreePosition.get(treePosition);\n    if (!templateEntry || !getDefaultExport(templateEntry.templateModule)) {\n      continue;\n    }\n\n    const templateDependency = createAppRenderDependency();\n    templateDependenciesById.set(templateEntry.id, templateDependency);\n    templateDependenciesBeforeById.set(templateEntry.id, [...pageDependencies]);\n    pageDependencies.push(templateDependency);\n  }\n\n  elements[pageId] = renderAfterAppDependencies(options.element, pageDependencies);\n\n  for (const templateEntry of templateEntries) {\n    const templateComponent = getDefaultExport(templateEntry.templateModule);\n    if (!templateComponent) {\n      continue;\n    }\n    const TemplateComponent = templateComponent;\n    const templateDependency = templateDependenciesById.get(templateEntry.id);\n    const templateElement = templateDependency ? (\n      renderWithAppDependencyBarrier(\n        <TemplateComponent params={options.matchedParams}>\n          <Children />\n        </TemplateComponent>,\n        templateDependency,\n      )\n    ) : (\n      <TemplateComponent params={options.matchedParams}>\n        <Children />\n      </TemplateComponent>\n    );\n    elements[templateEntry.id] = renderAfterAppDependencies(\n      templateElement,\n      templateDependenciesBeforeById.get(templateEntry.id) ?? [],\n    );\n  }\n\n  for (let index = 0; index < layoutEntries.length; index++) {\n    const layoutEntry = layoutEntries[index];\n    const layoutComponent = getDefaultExport(layoutEntry.layoutModule);\n    if (!layoutComponent) {\n      continue;\n    }\n\n    const layoutProps: Record<string, unknown> = {\n      params: options.makeThenableParams(\n        resolveAppPageSegmentParams(\n          options.route.routeSegments,\n          layoutEntry.treePosition,\n          options.matchedParams,\n        ),\n      ),\n    };\n\n    for (const slot of Object.values(options.route.slots ?? {})) {\n      const slotName = slot.name;\n      const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n      if (targetIndex !== index) {\n        continue;\n      }\n      layoutProps[slotName] = <ParallelSlot name={slotName} />;\n    }\n\n    const LayoutComponent = layoutComponent;\n    const layoutDependency = layoutDependenciesByIndex.get(index);\n    const layoutElement = layoutDependency ? (\n      renderWithAppDependencyBarrier(\n        <LayoutComponent {...layoutProps}>\n          <Children />\n        </LayoutComponent>,\n        layoutDependency,\n      )\n    ) : (\n      <LayoutComponent {...layoutProps}>\n        <Children />\n      </LayoutComponent>\n    );\n    elements[layoutEntry.id] = renderAfterAppDependencies(\n      layoutElement,\n      layoutDependenciesBefore[index] ?? [],\n    );\n  }\n\n  for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {\n    const slotName = slot.name;\n    const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n    const treePath = layoutEntries[targetIndex]?.treePath ?? \"/\";\n    const slotId = AppElementsWire.encodeSlotId(slotName, treePath);\n    const slotOverride = resolveSlotOverride(slotKey, slotName);\n    const slotParams = getEffectiveSlotParams(slotKey, slotName);\n    const overrideOrPageComponent =\n      getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);\n    const defaultComponent = getDefaultExport(slot.default);\n\n    // On soft nav (RSC): omit key when only default.tsx exists and the slot is\n    // already mounted on the client. Absent key means the browser retains prior\n    // slot content rather than replacing it. When the slot is not yet mounted\n    // (first entry into this layout), include the key so default.tsx renders.\n    if (\n      !overrideOrPageComponent &&\n      defaultComponent &&\n      options.isRscRequest &&\n      options.mountedSlotIds?.has(slotId)\n    ) {\n      continue;\n    }\n\n    const slotComponent = overrideOrPageComponent ?? defaultComponent;\n\n    if (!slotComponent) {\n      elements[slotId] = AppElementsWire.unmatchedSlotValue;\n      continue;\n    }\n\n    const slotThenableParams = options.makeThenableParams(slotParams);\n    const slotProps: Record<string, unknown> = {\n      params: slotThenableParams,\n    };\n    if (slotOverride?.props) {\n      Object.assign(slotProps, slotOverride.props);\n    }\n\n    const SlotComponent = slotComponent;\n    let slotElement: ReactNode = <SlotComponent {...slotProps} />;\n    const interceptLayouts = slotOverride?.layoutModules ?? [];\n\n    for (let layoutIndex = interceptLayouts.length - 1; layoutIndex >= 0; layoutIndex--) {\n      const interceptLayoutComponent = getDefaultExport(interceptLayouts[layoutIndex]);\n      if (!interceptLayoutComponent) {\n        continue;\n      }\n      const InterceptLayoutComponent = interceptLayoutComponent;\n      slotElement = (\n        <InterceptLayoutComponent params={slotThenableParams}>\n          {slotElement}\n        </InterceptLayoutComponent>\n      );\n    }\n\n    const slotLayoutComponent = getDefaultExport(slot.layout);\n    if (slotLayoutComponent) {\n      const SlotLayoutComponent = slotLayoutComponent;\n      slotElement = (\n        <SlotLayoutComponent params={slotThenableParams}>{slotElement}</SlotLayoutComponent>\n      );\n    }\n\n    const slotLoadingComponent = getDefaultExport(slot.loading);\n    if (slotLoadingComponent) {\n      const SlotLoadingComponent = slotLoadingComponent;\n      slotElement = <Suspense fallback={<SlotLoadingComponent />}>{slotElement}</Suspense>;\n    }\n\n    const slotErrorComponent = getErrorBoundaryExport(slot.error);\n    if (slotErrorComponent) {\n      slotElement = <ErrorBoundary fallback={slotErrorComponent}>{slotElement}</ErrorBoundary>;\n    }\n\n    elements[slotId] = renderAfterAppDependencies(\n      slotElement,\n      targetIndex >= 0 ? (slotDependenciesByLayoutIndex[targetIndex] ?? []) : [],\n    );\n  }\n\n  let routeChildren: ReactNode = (\n    <LayoutSegmentProvider segmentMap={{ children: [] }}>\n      <Slot id={pageId} />\n    </LayoutSegmentProvider>\n  );\n\n  const routeLoadingComponent = getDefaultExport(options.route.loading);\n  if (routeLoadingComponent) {\n    const RouteLoadingComponent = routeLoadingComponent;\n    routeChildren = <Suspense fallback={<RouteLoadingComponent />}>{routeChildren}</Suspense>;\n  }\n\n  const lastLayoutErrorModule =\n    options.route.errors && options.route.errors.length > 0\n      ? options.route.errors[options.route.errors.length - 1]\n      : null;\n  // Next.js nesting (outer to inner): Error > Unauthorized > Forbidden > NotFound > children.\n  // Building bottom-up means NotFoundBoundary must wrap first, then Forbidden, Unauthorized, Error.\n  const notFoundComponent =\n    getDefaultExport(options.route.notFound) ?? getDefaultExport(options.rootNotFoundModule);\n  if (notFoundComponent) {\n    const NotFoundComponent = notFoundComponent;\n    routeChildren = (\n      <NotFoundBoundary fallback={<NotFoundComponent />}>{routeChildren}</NotFoundBoundary>\n    );\n  }\n\n  const forbiddenComponent =\n    getDefaultExport(options.route.forbidden) ?? getDefaultExport(options.rootForbiddenModule);\n  if (forbiddenComponent) {\n    const ForbiddenComponent = forbiddenComponent;\n    routeChildren = (\n      <ForbiddenBoundary fallback={<ForbiddenComponent />}>{routeChildren}</ForbiddenBoundary>\n    );\n  }\n\n  const unauthorizedComponent =\n    getDefaultExport(options.route.unauthorized) ??\n    getDefaultExport(options.rootUnauthorizedModule);\n  if (unauthorizedComponent) {\n    const UnauthorizedComponent = unauthorizedComponent;\n    routeChildren = (\n      <UnauthorizedBoundary fallback={<UnauthorizedComponent />}>\n        {routeChildren}\n      </UnauthorizedBoundary>\n    );\n  }\n\n  const pageErrorComponent = getErrorBoundaryExport(options.route.error);\n  if (pageErrorComponent && options.route.error !== lastLayoutErrorModule) {\n    routeChildren = <ErrorBoundary fallback={pageErrorComponent}>{routeChildren}</ErrorBoundary>;\n  }\n\n  for (let index = orderedTreePositions.length - 1; index >= 0; index--) {\n    const treePosition = orderedTreePositions[index];\n    let segmentChildren: ReactNode = routeChildren;\n    const layoutEntry = layoutEntriesByTreePosition.get(treePosition);\n    const templateEntry = templateEntriesByTreePosition.get(treePosition);\n\n    // Next.js nesting per segment (outer to inner): Layout > Template > Error > Unauthorized > Forbidden > NotFound > children.\n    // Building bottom-up means NotFoundBoundary must wrap the leaf subtree first,\n    // then ErrorBoundary, then Template, with the Layout slot outermost.\n    if (layoutEntry) {\n      const layoutNotFoundComponent = getDefaultExport(layoutEntry.notFoundModule);\n      if (layoutNotFoundComponent) {\n        const LayoutNotFoundComponent = layoutNotFoundComponent;\n        segmentChildren = (\n          <NotFoundBoundary fallback={<LayoutNotFoundComponent />}>\n            {segmentChildren}\n          </NotFoundBoundary>\n        );\n      }\n\n      const layoutForbiddenComponent = getDefaultExport(layoutEntry.forbiddenModule);\n      if (layoutForbiddenComponent) {\n        const LayoutForbiddenComponent = layoutForbiddenComponent;\n        segmentChildren = (\n          <ForbiddenBoundary fallback={<LayoutForbiddenComponent />}>\n            {segmentChildren}\n          </ForbiddenBoundary>\n        );\n      }\n\n      const layoutUnauthorizedComponent = getDefaultExport(layoutEntry.unauthorizedModule);\n      if (layoutUnauthorizedComponent) {\n        const LayoutUnauthorizedComponent = layoutUnauthorizedComponent;\n        segmentChildren = (\n          <UnauthorizedBoundary fallback={<LayoutUnauthorizedComponent />}>\n            {segmentChildren}\n          </UnauthorizedBoundary>\n        );\n      }\n\n      const layoutErrorComponent = getErrorBoundaryExport(layoutEntry.errorModule);\n      if (layoutErrorComponent) {\n        segmentChildren = (\n          <ErrorBoundary fallback={layoutErrorComponent}>{segmentChildren}</ErrorBoundary>\n        );\n      }\n    }\n\n    if (templateEntry && getDefaultExport(templateEntry.templateModule)) {\n      segmentChildren = (\n        <Slot\n          id={templateEntry.id}\n          key={resolveAppPageTemplateKey(\n            options.route.routeSegments ?? [],\n            templateEntry.treePosition,\n            options.matchedParams,\n          )}\n        >\n          {segmentChildren}\n        </Slot>\n      );\n    }\n\n    if (!layoutEntry) {\n      routeChildren = segmentChildren;\n      continue;\n    }\n    const layoutHasElement = getDefaultExport(layoutEntry.layoutModule) !== null;\n    const layoutIndex = layoutIndicesByTreePosition.get(treePosition) ?? -1;\n    const segmentMap: { children: string[] } & Record<string, string[]> = {\n      children: resolveAppPageChildSegments(\n        options.route.routeSegments ?? [],\n        layoutEntry.treePosition,\n        options.matchedParams,\n      ),\n    };\n    for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {\n      const slotName = slot.name;\n      const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;\n      if (targetIndex !== layoutIndex) {\n        continue;\n      }\n      const slotParams = getEffectiveSlotParams(slotKey, slotName);\n      segmentMap[slotName] = slot.routeSegments\n        ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams)\n        : [];\n    }\n\n    routeChildren = (\n      <LayoutSegmentProvider segmentMap={segmentMap}>\n        {layoutHasElement ? (\n          <Slot\n            id={layoutEntry.id}\n            parallelSlots={createAppPageParallelSlotEntries(\n              layoutIndex,\n              layoutEntries,\n              options.route,\n              getEffectiveSlotParams,\n            )}\n          >\n            {segmentChildren}\n          </Slot>\n        ) : (\n          segmentChildren\n        )}\n      </LayoutSegmentProvider>\n    );\n  }\n\n  const globalErrorComponent = getErrorBoundaryExport(options.globalErrorModule);\n  if (globalErrorComponent) {\n    routeChildren = <ErrorBoundary fallback={globalErrorComponent}>{routeChildren}</ErrorBoundary>;\n  }\n\n  elements[routeId] = (\n    <>\n      {createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport)}\n      {routeChildren}\n    </>\n  );\n\n  return elements;\n}\n"],"mappings":";;;;;;;;;;;AAsJA,SAAS,iBACP,QACyB;AACzB,QAAO,QAAQ,WAAW;;AAG5B,SAAS,uBACP,QAC8B;AAC9B,QAAO,QAAQ,WAAW;;AAG5B,SAAgB,sBACd,eACA,cACQ;CACR,MAAM,mBAAmB,eAAe,MAAM,GAAG,aAAa,IAAI,EAAE;AACpE,KAAI,iBAAiB,WAAW,EAC9B,QAAO;AAET,QAAO,IAAI,iBAAiB,KAAK,IAAI;;AAGvC,SAAgB,2BAId,OAO6C;AAC7C,QAAO,MAAM,QAAQ,KAAK,cAAc,UAAU;EAChD,MAAM,eAAe,MAAM,sBAAsB,UAAU;EAC3D,MAAM,WAAW,sBAAsB,MAAM,eAAe,aAAa;AACzE,SAAO;GACL,aAAa,MAAM,SAAS,UAAU;GACtC,iBAAiB,MAAM,aAAa,UAAU;GAC9C,IAAI,gBAAgB,eAAe,SAAS;GAC5C;GACA,gBAAgB,MAAM,YAAY,UAAU;GAC5C,oBAAoB,MAAM,gBAAgB,UAAU;GACpD;GACA;GACD;GACD;;AAGJ,SAAS,6BACP,OAIiC;AACjC,SAAQ,MAAM,aAAa,EAAE,EAAE,KAAK,gBAAgB,UAAU;EAC5D,MAAM,eAAe,MAAM,wBAAwB,UAAU;EAC7D,MAAM,WAAW,sBAAsB,MAAM,eAAe,aAAa;AACzE,SAAO;GACL,IAAI,gBAAgB,iBAAiB,SAAS;GAC9C;GACA;GACA;GACD;GACD;;AAGJ,SAAgB,4BACd,eACA,cACA,QACU;CACV,MAAM,cAAc,cAAc,MAAM,aAAa;CACrD,MAAM,mBAA6B,EAAE;AAErC,MAAK,MAAM,WAAW,aAAa;AACjC,MACE,QAAQ,WAAW,QAAQ,IAC3B,QAAQ,SAAS,KAAK,IACtB,QAAQ,SAAS,GACjB;GAEA,MAAM,aAAa,OADD,QAAQ,MAAM,GAAG,GAAG;AAEtC,OAAI,MAAM,QAAQ,WAAW,IAAI,WAAW,WAAW,EACrD;AAEF,OAAI,eAAe,KAAA,EACjB;AAEF,oBAAiB,KAAK,MAAM,QAAQ,WAAW,GAAG,WAAW,KAAK,IAAI,GAAG,WAAW;AACpF;;AAGF,MAAI,QAAQ,WAAW,OAAO,IAAI,QAAQ,SAAS,IAAI,EAAE;GAEvD,MAAM,aAAa,OADD,QAAQ,MAAM,GAAG,GAAG;AAEtC,OAAI,MAAM,QAAQ,WAAW,EAAE;AAC7B,qBAAiB,KAAK,WAAW,KAAK,IAAI,CAAC;AAC3C;;AAEF,oBAAiB,KAAK,cAAc,QAAQ;AAC5C;;AAGF,MAAI,QAAQ,WAAW,IAAI,IAAI,QAAQ,SAAS,IAAI,IAAI,CAAC,QAAQ,SAAS,IAAI,EAAE;GAE9E,MAAM,aAAa,OADD,QAAQ,MAAM,GAAG,GAAG;AAEtC,oBAAiB,KACf,MAAM,QAAQ,WAAW,GAAG,WAAW,KAAK,IAAI,GAAI,cAAc,QACnE;AACD;;AAGF,mBAAiB,KAAK,QAAQ;;AAGhC,QAAO;;AAGT,SAAS,8BACP,eACA,QACU;AAEV,QADyB,4BAA4B,eAAe,GAAG,OAAO,CACtD,QAAQ,YAAY,EAAE,QAAQ,WAAW,IAAI,IAAI,QAAQ,SAAS,IAAI,EAAE;;AAGlG,SAAS,0BACP,eACA,cACA,QACQ;AAER,QADwB,8BAA8B,cAAc,MAAM,aAAa,EAAE,OAAO,CACzE,MAAM;;AAG/B,SAAS,iCAIP,aACA,eACA,OACA,wBACiD;CACjD,MAAM,gBAA2C,EAAE;AAEnD,MAAK,MAAM,CAAC,SAAS,SAAS,OAAO,QAAQ,MAAM,SAAS,EAAE,CAAC,EAAE;EAC/D,MAAM,WAAW,KAAK;EACtB,MAAM,cAAc,KAAK,eAAe,IAAI,KAAK,cAAc,cAAc,SAAS;AACtF,MAAI,gBAAgB,YAClB;EAIF,MAAM,WADc,cAAc,cACJ,YAAY;EAC1C,MAAM,aAAa,uBAAuB,SAAS,SAAS;AAI5D,gBAAc,YACZ,oBAAC,uBAAD;GAAuB,YAAY,EAAE,UAJlB,KAAK,gBACtB,4BAA4B,KAAK,eAAe,GAAG,WAAW,GAC9D,EAAE,EAEyD;aAC3D,oBAAC,MAAD,EAAM,IAAI,gBAAgB,aAAa,UAAU,SAAS,EAAI,CAAA;GACxC,CAAA;;AAI5B,QAAO,OAAO,KAAK,cAAc,CAAC,SAAS,IAAI,gBAAgB,KAAA;;AAGjE,SAAS,uBAAuB,UAA2B,UAA+B;AACxF,QACE,qBAAA,YAAA,EAAA,UAAA;EACE,oBAAC,QAAD,EAAM,SAAQ,SAAU,CAAA;EACvB,WAAW,oBAAC,cAAD,EAAwB,UAAY,CAAA,GAAG;EACnD,oBAAC,cAAD,EAAwB,UAAY,CAAA;EACnC,EAAA,CAAA;;AAIP,SAAgB,qBAGd,SAA0E;CAC1E,MAAM,sBAAsB,QAAQ,uBAAuB;CAC3D,MAAM,UAAU,gBAAgB,cAAc,QAAQ,WAAW,oBAAoB;CACrF,MAAM,SAAS,gBAAgB,aAAa,QAAQ,WAAW,oBAAoB;CACnF,MAAM,gBAAgB,2BAA2B,QAAQ,MAAM;CAC/D,MAAM,kBAAkB,6BAA6B,QAAQ,MAAM;CACnE,MAAM,8CAA8B,IAAI,KAAwD;CAChG,MAAM,gDAAgC,IAAI,KAA4C;AACtF,MAAK,MAAM,eAAe,cACxB,6BAA4B,IAAI,YAAY,cAAc,YAAY;AAExE,MAAK,MAAM,iBAAiB,gBAC1B,+BAA8B,IAAI,cAAc,cAAc,cAAc;CAE9E,MAAM,8CAA8B,IAAI,KAAqB;AAC7D,MAAK,IAAI,QAAQ,GAAG,QAAQ,cAAc,QAAQ,QAChD,6BAA4B,IAAI,cAAc,OAAO,cAAc,MAAM;CAE3E,MAAM,4CAA4B,IAAI,KAAkC;CACxE,MAAM,2BAAoD,EAAE;CAC5D,MAAM,gCAAyD,EAAE;CACjE,MAAM,2CAA2B,IAAI,KAAkC;CACvE,MAAM,iDAAiC,IAAI,KAAoC;CAC/E,MAAM,mBAA0C,EAAE;CAClD,MAAM,qBAAqB,cAAc,IAAI,YAAY;CACzD,MAAM,WAAsD,EAC1D,GAAG,gBAAgB,sBAAsB;EACvC;EACA;EACA;EACD,CAAC,EACH;CACD,MAAM,iCAAiB,IAAI,KAAqB;AAChD,MAAK,MAAM,QAAQ,OAAO,OAAO,QAAQ,MAAM,SAAS,EAAE,CAAC,EAAE;EAC3D,MAAM,WAAW,KAAK;AACtB,iBAAe,IAAI,WAAW,eAAe,IAAI,SAAS,IAAI,KAAK,EAAE;;CAEvE,MAAM,uBAAuB,MAAM,KACjC,IAAI,IAAY,CACd,GAAG,cAAc,KAAK,UAAU,MAAM,aAAa,EACnD,GAAG,gBAAgB,KAAK,UAAU,MAAM,aAAa,CACtD,CAAC,CACH,CAAC,MAAM,MAAM,UAAU,OAAO,MAAM;CACrC,MAAM,uBAAuB,SAAiB,aAAqB;EACjE,MAAM,gBAAgB,QAAQ,gBAAgB;AAC9C,MAAI,cACF,QAAO;AAKT,MAAI,YAAY,aAAa,eAAe,IAAI,SAAS,IAAI,OAAO,EAClE,QAAO,QAAQ,gBAAgB;;CAKnC,MAAM,0BAA0B,SAAiB,aAC/C,oBAAoB,SAAS,SAAS,EAAE,UAAU,QAAQ;AAE5D,MAAK,MAAM,gBAAgB,sBAAsB;EAC/C,MAAM,cAAc,4BAA4B,IAAI,aAAa;AACjE,MAAI,gBAAgB,KAAA,GAAW;GAC7B,MAAM,cAAc,cAAc;AAClC,4BAAyB,eAAe,CAAC,GAAG,iBAAiB;AAC7D,OAAI,iBAAiB,YAAY,aAAa,EAAE;IAC9C,MAAM,mBAAmB,2BAA2B;AACpD,8BAA0B,IAAI,aAAa,iBAAiB;AAC5D,qBAAiB,KAAK,iBAAiB;;AAEzC,iCAA8B,eAAe,CAAC,GAAG,iBAAiB;;EAGpE,MAAM,gBAAgB,8BAA8B,IAAI,aAAa;AACrE,MAAI,CAAC,iBAAiB,CAAC,iBAAiB,cAAc,eAAe,CACnE;EAGF,MAAM,qBAAqB,2BAA2B;AACtD,2BAAyB,IAAI,cAAc,IAAI,mBAAmB;AAClE,iCAA+B,IAAI,cAAc,IAAI,CAAC,GAAG,iBAAiB,CAAC;AAC3E,mBAAiB,KAAK,mBAAmB;;AAG3C,UAAS,UAAU,2BAA2B,QAAQ,SAAS,iBAAiB;AAEhF,MAAK,MAAM,iBAAiB,iBAAiB;EAC3C,MAAM,oBAAoB,iBAAiB,cAAc,eAAe;AACxE,MAAI,CAAC,kBACH;EAEF,MAAM,oBAAoB;EAC1B,MAAM,qBAAqB,yBAAyB,IAAI,cAAc,GAAG;EACzE,MAAM,kBAAkB,qBACtB,+BACE,oBAAC,mBAAD;GAAmB,QAAQ,QAAQ;aACjC,oBAACA,YAAD,EAAY,CAAA;GACM,CAAA,EACpB,mBACD,GAED,oBAAC,mBAAD;GAAmB,QAAQ,QAAQ;aACjC,oBAACA,YAAD,EAAY,CAAA;GACM,CAAA;AAEtB,WAAS,cAAc,MAAM,2BAC3B,iBACA,+BAA+B,IAAI,cAAc,GAAG,IAAI,EAAE,CAC3D;;AAGH,MAAK,IAAI,QAAQ,GAAG,QAAQ,cAAc,QAAQ,SAAS;EACzD,MAAM,cAAc,cAAc;EAClC,MAAM,kBAAkB,iBAAiB,YAAY,aAAa;AAClE,MAAI,CAAC,gBACH;EAGF,MAAM,cAAuC,EAC3C,QAAQ,QAAQ,mBACd,4BACE,QAAQ,MAAM,eACd,YAAY,cACZ,QAAQ,cACT,CACF,EACF;AAED,OAAK,MAAM,QAAQ,OAAO,OAAO,QAAQ,MAAM,SAAS,EAAE,CAAC,EAAE;GAC3D,MAAM,WAAW,KAAK;AAEtB,QADoB,KAAK,eAAe,IAAI,KAAK,cAAc,cAAc,SAAS,OAClE,MAClB;AAEF,eAAY,YAAY,oBAAC,cAAD,EAAc,MAAM,UAAY,CAAA;;EAG1D,MAAM,kBAAkB;EACxB,MAAM,mBAAmB,0BAA0B,IAAI,MAAM;EAC7D,MAAM,gBAAgB,mBACpB,+BACE,oBAAC,iBAAD;GAAiB,GAAI;aACnB,oBAACA,YAAD,EAAY,CAAA;GACI,CAAA,EAClB,iBACD,GAED,oBAAC,iBAAD;GAAiB,GAAI;aACnB,oBAACA,YAAD,EAAY,CAAA;GACI,CAAA;AAEpB,WAAS,YAAY,MAAM,2BACzB,eACA,yBAAyB,UAAU,EAAE,CACtC;;AAGH,MAAK,MAAM,CAAC,SAAS,SAAS,OAAO,QAAQ,QAAQ,MAAM,SAAS,EAAE,CAAC,EAAE;EACvE,MAAM,WAAW,KAAK;EACtB,MAAM,cAAc,KAAK,eAAe,IAAI,KAAK,cAAc,cAAc,SAAS;EACtF,MAAM,WAAW,cAAc,cAAc,YAAY;EACzD,MAAM,SAAS,gBAAgB,aAAa,UAAU,SAAS;EAC/D,MAAM,eAAe,oBAAoB,SAAS,SAAS;EAC3D,MAAM,aAAa,uBAAuB,SAAS,SAAS;EAC5D,MAAM,0BACJ,iBAAiB,cAAc,WAAW,IAAI,iBAAiB,KAAK,KAAK;EAC3E,MAAM,mBAAmB,iBAAiB,KAAK,QAAQ;AAMvD,MACE,CAAC,2BACD,oBACA,QAAQ,gBACR,QAAQ,gBAAgB,IAAI,OAAO,CAEnC;EAGF,MAAM,gBAAgB,2BAA2B;AAEjD,MAAI,CAAC,eAAe;AAClB,YAAS,UAAU,gBAAgB;AACnC;;EAGF,MAAM,qBAAqB,QAAQ,mBAAmB,WAAW;EACjE,MAAM,YAAqC,EACzC,QAAQ,oBACT;AACD,MAAI,cAAc,MAChB,QAAO,OAAO,WAAW,aAAa,MAAM;EAI9C,IAAI,cAAyB,oBADP,eACO,EAAe,GAAI,WAAa,CAAA;EAC7D,MAAM,mBAAmB,cAAc,iBAAiB,EAAE;AAE1D,OAAK,IAAI,cAAc,iBAAiB,SAAS,GAAG,eAAe,GAAG,eAAe;GACnF,MAAM,2BAA2B,iBAAiB,iBAAiB,aAAa;AAChF,OAAI,CAAC,yBACH;AAGF,iBACE,oBAF+B,0BAE/B;IAA0B,QAAQ;cAC/B;IACwB,CAAA;;EAI/B,MAAM,sBAAsB,iBAAiB,KAAK,OAAO;AACzD,MAAI,oBAEF,eACE,oBAF0B,qBAE1B;GAAqB,QAAQ;aAAqB;GAAkC,CAAA;EAIxF,MAAM,uBAAuB,iBAAiB,KAAK,QAAQ;AAC3D,MAAI,qBAEF,eAAc,oBAAC,UAAD;GAAU,UAAU,oBADL,sBACK,EAAwB,CAAA;aAAG;GAAuB,CAAA;EAGtF,MAAM,qBAAqB,uBAAuB,KAAK,MAAM;AAC7D,MAAI,mBACF,eAAc,oBAAC,eAAD;GAAe,UAAU;aAAqB;GAA4B,CAAA;AAG1F,WAAS,UAAU,2BACjB,aACA,eAAe,IAAK,8BAA8B,gBAAgB,EAAE,GAAI,EAAE,CAC3E;;CAGH,IAAI,gBACF,oBAAC,uBAAD;EAAuB,YAAY,EAAE,UAAU,EAAE,EAAE;YACjD,oBAAC,MAAD,EAAM,IAAI,QAAU,CAAA;EACE,CAAA;CAG1B,MAAM,wBAAwB,iBAAiB,QAAQ,MAAM,QAAQ;AACrE,KAAI,sBAEF,iBAAgB,oBAAC,UAAD;EAAU,UAAU,oBADN,uBACM,EAAyB,CAAA;YAAG;EAAyB,CAAA;CAG3F,MAAM,wBACJ,QAAQ,MAAM,UAAU,QAAQ,MAAM,OAAO,SAAS,IAClD,QAAQ,MAAM,OAAO,QAAQ,MAAM,OAAO,SAAS,KACnD;CAGN,MAAM,oBACJ,iBAAiB,QAAQ,MAAM,SAAS,IAAI,iBAAiB,QAAQ,mBAAmB;AAC1F,KAAI,kBAEF,iBACE,oBAAC,kBAAD;EAAkB,UAAU,oBAFJ,mBAEI,EAAqB,CAAA;YAAG;EAAiC,CAAA;CAIzF,MAAM,qBACJ,iBAAiB,QAAQ,MAAM,UAAU,IAAI,iBAAiB,QAAQ,oBAAoB;AAC5F,KAAI,mBAEF,iBACE,oBAAC,mBAAD;EAAmB,UAAU,oBAFJ,oBAEI,EAAsB,CAAA;YAAG;EAAkC,CAAA;CAI5F,MAAM,wBACJ,iBAAiB,QAAQ,MAAM,aAAa,IAC5C,iBAAiB,QAAQ,uBAAuB;AAClD,KAAI,sBAEF,iBACE,oBAAC,sBAAD;EAAsB,UAAU,oBAFJ,uBAEI,EAAyB,CAAA;YACtD;EACoB,CAAA;CAI3B,MAAM,qBAAqB,uBAAuB,QAAQ,MAAM,MAAM;AACtE,KAAI,sBAAsB,QAAQ,MAAM,UAAU,sBAChD,iBAAgB,oBAAC,eAAD;EAAe,UAAU;YAAqB;EAA8B,CAAA;AAG9F,MAAK,IAAI,QAAQ,qBAAqB,SAAS,GAAG,SAAS,GAAG,SAAS;EACrE,MAAM,eAAe,qBAAqB;EAC1C,IAAI,kBAA6B;EACjC,MAAM,cAAc,4BAA4B,IAAI,aAAa;EACjE,MAAM,gBAAgB,8BAA8B,IAAI,aAAa;AAKrE,MAAI,aAAa;GACf,MAAM,0BAA0B,iBAAiB,YAAY,eAAe;AAC5E,OAAI,wBAEF,mBACE,oBAAC,kBAAD;IAAkB,UAAU,oBAFE,yBAEF,EAA2B,CAAA;cACpD;IACgB,CAAA;GAIvB,MAAM,2BAA2B,iBAAiB,YAAY,gBAAgB;AAC9E,OAAI,yBAEF,mBACE,oBAAC,mBAAD;IAAmB,UAAU,oBAFE,0BAEF,EAA4B,CAAA;cACtD;IACiB,CAAA;GAIxB,MAAM,8BAA8B,iBAAiB,YAAY,mBAAmB;AACpF,OAAI,4BAEF,mBACE,oBAAC,sBAAD;IAAsB,UAAU,oBAFE,6BAEF,EAA+B,CAAA;cAC5D;IACoB,CAAA;GAI3B,MAAM,uBAAuB,uBAAuB,YAAY,YAAY;AAC5E,OAAI,qBACF,mBACE,oBAAC,eAAD;IAAe,UAAU;cAAuB;IAAgC,CAAA;;AAKtF,MAAI,iBAAiB,iBAAiB,cAAc,eAAe,CACjE,mBACE,oBAAC,MAAD;GACE,IAAI,cAAc;aAOjB;GACI,EAPA,0BACH,QAAQ,MAAM,iBAAiB,EAAE,EACjC,cAAc,cACd,QAAQ,cACT,CAGI;AAIX,MAAI,CAAC,aAAa;AAChB,mBAAgB;AAChB;;EAEF,MAAM,mBAAmB,iBAAiB,YAAY,aAAa,KAAK;EACxE,MAAM,cAAc,4BAA4B,IAAI,aAAa,IAAI;EACrE,MAAM,aAAgE,EACpE,UAAU,4BACR,QAAQ,MAAM,iBAAiB,EAAE,EACjC,YAAY,cACZ,QAAQ,cACT,EACF;AACD,OAAK,MAAM,CAAC,SAAS,SAAS,OAAO,QAAQ,QAAQ,MAAM,SAAS,EAAE,CAAC,EAAE;GACvE,MAAM,WAAW,KAAK;AAEtB,QADoB,KAAK,eAAe,IAAI,KAAK,cAAc,cAAc,SAAS,OAClE,YAClB;GAEF,MAAM,aAAa,uBAAuB,SAAS,SAAS;AAC5D,cAAW,YAAY,KAAK,gBACxB,4BAA4B,KAAK,eAAe,GAAG,WAAW,GAC9D,EAAE;;AAGR,kBACE,oBAAC,uBAAD;GAAmC;aAChC,mBACC,oBAAC,MAAD;IACE,IAAI,YAAY;IAChB,eAAe,iCACb,aACA,eACA,QAAQ,OACR,uBACD;cAEA;IACI,CAAA,GAEP;GAEoB,CAAA;;CAI5B,MAAM,uBAAuB,uBAAuB,QAAQ,kBAAkB;AAC9E,KAAI,qBACF,iBAAgB,oBAAC,eAAD;EAAe,UAAU;YAAuB;EAA8B,CAAA;AAGhG,UAAS,WACP,qBAAA,YAAA,EAAA,UAAA,CACG,uBAAuB,QAAQ,kBAAkB,QAAQ,iBAAiB,EAC1E,cACA,EAAA,CAAA;AAGL,QAAO"}

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

@@ -52,6 +52,13 @@ type RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError> = {
 };
 type AppPageRscErrorTracker = {
   getCapturedError: () => unknown;
+  /**
+   * Returns a NEXT_REDIRECT or NEXT_HTTP_ERROR_FALLBACK error captured during
+   * the RSC render. Read after the SSR shell promise resolves to swap a
+   * 307/404 in place of the streamed body when redirect()/notFound() throws
+   * synchronously inside a route-level Suspense boundary (loading.tsx).
+   */
+  getCapturedSpecialError: () => unknown;
   onRenderError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
 };
 type ShouldRerenderAppPageWithGlobalErrorOptions = {

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

@@ -1,3 +1,4 @@
+import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-stream.ts
 function createAppPageFontData(options) {
@@ -56,7 +57,7 @@ async function renderAppPageHtmlResponse(options) {
 	});
 	const headers = new Headers({
 		"Content-Type": "text/html; charset=utf-8",
-		Vary: "RSC, Accept"
+		Vary: VINEXT_RSC_VARY_HEADER
 	});
 	if (options.fontLinkHeader) headers.set("Link", options.fontLinkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
@@ -89,12 +90,18 @@ async function renderAppPageHtmlStreamWithRecovery(options) {
 }
 function createAppPageRscErrorTracker(baseOnError) {
 	let capturedError = null;
+	let capturedSpecialError = null;
 	return {
 		getCapturedError() {
 			return capturedError;
 		},
+		getCapturedSpecialError() {
+			return capturedSpecialError;
+		},
 		onRenderError(error, requestInfo, errorContext) {
-			if (!(error && typeof error === "object" && "digest" in error)) capturedError = error;
+			if (error && typeof error === "object" && "digest" in error) {
+				if (capturedSpecialError === null) capturedSpecialError = error;
+			} else capturedError = error;
 			return baseOnError(error, requestInfo, errorContext);
 		}
 	};

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-stream.js","names":[],"sources":["../../src/server/app-page-stream.ts"],"sourcesContent":["import type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\n\nexport type AppPageFontData = {\n  links: string[];\n  preloads: readonly AppPageFontPreload[];\n  styles: string[];\n};\n\ntype CreateAppPageFontDataOptions = {\n  getLinks: () => string[];\n  getPreloads: () => AppPageFontPreload[];\n  getStyles: () => string[];\n};\n\nexport type AppPageSsrHandler = {\n  handleSsr: (\n    rscStream: ReadableStream<Uint8Array>,\n    navigationContext: unknown,\n    fontData: AppPageFontData,\n    options?: {\n      scriptNonce?: string;\n      sideStream?: ReadableStream<Uint8Array>;\n      capturedRscDataRef?: { value: Promise<ArrayBuffer> | null };\n    },\n  ) => Promise<ReadableStream<Uint8Array>>;\n};\n\ntype RenderAppPageHtmlStreamOptions = {\n  fontData: AppPageFontData;\n  navigationContext: unknown;\n  rscStream: ReadableStream<Uint8Array>;\n  scriptNonce?: string;\n  ssrHandler: AppPageSsrHandler;\n  /** Pre-split side stream for fused embed+capture (#981). When set,\n   *  handleSsr skips its internal tee and accumulates raw RSC bytes. */\n  sideStream?: ReadableStream<Uint8Array>;\n  /** Out-parameter filled with accumulated raw RSC bytes after stream consumption. */\n  capturedRscDataRef?: { value: Promise<ArrayBuffer> | null };\n};\n\ntype RenderAppPageHtmlResponseOptions = {\n  clearRequestContext: () => void;\n  fontLinkHeader?: string;\n  middlewareHeaders?: Headers | null;\n  status: number;\n} & RenderAppPageHtmlStreamOptions;\n\ntype AppPageHtmlStreamRecoveryResult = {\n  htmlStream: ReadableStream<Uint8Array> | null;\n  response: Response | null;\n};\n\ntype RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError> = {\n  onShellRendered?: () => void;\n  renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;\n  renderHtmlStream: () => Promise<ReadableStream<Uint8Array>>;\n  renderSpecialErrorResponse: (specialError: TSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => TSpecialError | null;\n};\n\ntype AppPageRscErrorTracker = {\n  getCapturedError: () => unknown;\n  onRenderError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;\n};\n\ntype ShouldRerenderAppPageWithGlobalErrorOptions = {\n  capturedError: unknown;\n  hasLocalBoundary: boolean;\n};\n\nexport function createAppPageFontData(options: CreateAppPageFontDataOptions): AppPageFontData {\n  return {\n    links: options.getLinks(),\n    preloads: options.getPreloads(),\n    styles: options.getStyles(),\n  };\n}\n\nexport async function renderAppPageHtmlStream(\n  options: RenderAppPageHtmlStreamOptions,\n): Promise<ReadableStream<Uint8Array>> {\n  const ssrOptions = {\n    scriptNonce: options.scriptNonce,\n    sideStream: options.sideStream,\n    capturedRscDataRef: options.capturedRscDataRef,\n  };\n\n  return options.ssrHandler.handleSsr(\n    options.rscStream,\n    options.navigationContext,\n    options.fontData,\n    ssrOptions,\n  );\n}\n\n/**\n * Wraps a stream so that `onFlush` is called when the last byte has been read\n * by the downstream consumer (i.e. when the HTTP layer finishes draining the\n * response body). This is the correct place to clear per-request context,\n * because the RSC/SSR pipeline is lazy — components execute while the stream\n * is being consumed, not when the stream handle is first obtained.\n */\nexport function deferUntilStreamConsumed(\n  stream: ReadableStream<Uint8Array>,\n  onFlush: () => void,\n): ReadableStream<Uint8Array> {\n  let called = false;\n  const once = () => {\n    if (!called) {\n      called = true;\n      onFlush();\n    }\n  };\n\n  const cleanup = new TransformStream<Uint8Array, Uint8Array>({\n    flush() {\n      once();\n    },\n  });\n\n  const piped = stream.pipeThrough(cleanup);\n\n  // Wrap with a ReadableStream so we can intercept cancel() — the TransformStream\n  // Transformer interface does not expose a cancel hook in the Web Streams spec.\n  const reader = piped.getReader();\n  return new ReadableStream<Uint8Array>({\n    pull(controller) {\n      return reader.read().then(\n        ({ done, value }) => {\n          if (done) {\n            controller.close();\n          } else {\n            controller.enqueue(value);\n          }\n        },\n        (error) => {\n          once();\n          controller.error(error);\n        },\n      );\n    },\n    cancel(reason) {\n      // Stream cancelled before fully consumed (e.g. client disconnected).\n      // Still clear per-request context to avoid leaks.\n      once();\n      return reader.cancel(reason);\n    },\n  });\n}\n\nexport async function renderAppPageHtmlResponse(\n  options: RenderAppPageHtmlResponseOptions,\n): Promise<Response> {\n  const htmlStream = await renderAppPageHtmlStream(options);\n\n  // Defer clearRequestContext() until the stream is fully consumed by the HTTP\n  // layer. Calling it synchronously here would race the lazy RSC/SSR pipeline:\n  // components execute while the stream is being pulled, not when the handle\n  // is first returned. See: https://github.com/cloudflare/vinext/issues/660\n  const safeStream = deferUntilStreamConsumed(htmlStream, () => {\n    options.clearRequestContext();\n  });\n\n  const headers = new Headers({\n    \"Content-Type\": \"text/html; charset=utf-8\",\n    Vary: \"RSC, Accept\",\n  });\n\n  if (options.fontLinkHeader) {\n    headers.set(\"Link\", options.fontLinkHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n  return new Response(safeStream, {\n    status: options.status,\n    headers,\n  });\n}\n\nexport async function renderAppPageHtmlStreamWithRecovery<TSpecialError>(\n  options: RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError>,\n): Promise<AppPageHtmlStreamRecoveryResult> {\n  try {\n    const htmlStream = await options.renderHtmlStream();\n    options.onShellRendered?.();\n    return {\n      htmlStream,\n      response: null,\n    };\n  } catch (error) {\n    const specialError = options.resolveSpecialError(error);\n    if (specialError) {\n      return {\n        htmlStream: null,\n        response: await options.renderSpecialErrorResponse(specialError),\n      };\n    }\n\n    const boundaryResponse = await options.renderErrorBoundaryResponse(error);\n    if (boundaryResponse) {\n      return {\n        htmlStream: null,\n        response: boundaryResponse,\n      };\n    }\n\n    throw error;\n  }\n}\n\nexport function createAppPageRscErrorTracker(\n  baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown,\n): AppPageRscErrorTracker {\n  let capturedError: unknown = null;\n\n  return {\n    getCapturedError() {\n      return capturedError;\n    },\n    onRenderError(error, requestInfo, errorContext) {\n      if (!(error && typeof error === \"object\" && \"digest\" in error)) {\n        capturedError = error;\n      }\n      return baseOnError(error, requestInfo, errorContext);\n    },\n  };\n}\n\nexport function shouldRerenderAppPageWithGlobalError(\n  options: ShouldRerenderAppPageWithGlobalErrorOptions,\n): boolean {\n  return Boolean(options.capturedError) && !options.hasLocalBoundary;\n}\n"],"mappings":";;AAuEA,SAAgB,sBAAsB,SAAwD;AAC5F,QAAO;EACL,OAAO,QAAQ,UAAU;EACzB,UAAU,QAAQ,aAAa;EAC/B,QAAQ,QAAQ,WAAW;EAC5B;;AAGH,eAAsB,wBACpB,SACqC;CACrC,MAAM,aAAa;EACjB,aAAa,QAAQ;EACrB,YAAY,QAAQ;EACpB,oBAAoB,QAAQ;EAC7B;AAED,QAAO,QAAQ,WAAW,UACxB,QAAQ,WACR,QAAQ,mBACR,QAAQ,UACR,WACD;;;;;;;;;AAUH,SAAgB,yBACd,QACA,SAC4B;CAC5B,IAAI,SAAS;CACb,MAAM,aAAa;AACjB,MAAI,CAAC,QAAQ;AACX,YAAS;AACT,YAAS;;;CAIb,MAAM,UAAU,IAAI,gBAAwC,EAC1D,QAAQ;AACN,QAAM;IAET,CAAC;CAMF,MAAM,SAJQ,OAAO,YAAY,QAAQ,CAIpB,WAAW;AAChC,QAAO,IAAI,eAA2B;EACpC,KAAK,YAAY;AACf,UAAO,OAAO,MAAM,CAAC,MAClB,EAAE,MAAM,YAAY;AACnB,QAAI,KACF,YAAW,OAAO;QAElB,YAAW,QAAQ,MAAM;OAG5B,UAAU;AACT,UAAM;AACN,eAAW,MAAM,MAAM;KAE1B;;EAEH,OAAO,QAAQ;AAGb,SAAM;AACN,UAAO,OAAO,OAAO,OAAO;;EAE/B,CAAC;;AAGJ,eAAsB,0BACpB,SACmB;CAOnB,MAAM,aAAa,yBANA,MAAM,wBAAwB,QAAQ,QAMK;AAC5D,UAAQ,qBAAqB;GAC7B;CAEF,MAAM,UAAU,IAAI,QAAQ;EAC1B,gBAAgB;EAChB,MAAM;EACP,CAAC;AAEF,KAAI,QAAQ,eACV,SAAQ,IAAI,QAAQ,QAAQ,eAAe;AAG7C,gCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,QAAO,IAAI,SAAS,YAAY;EAC9B,QAAQ,QAAQ;EAChB;EACD,CAAC;;AAGJ,eAAsB,oCACpB,SAC0C;AAC1C,KAAI;EACF,MAAM,aAAa,MAAM,QAAQ,kBAAkB;AACnD,UAAQ,mBAAmB;AAC3B,SAAO;GACL;GACA,UAAU;GACX;UACM,OAAO;EACd,MAAM,eAAe,QAAQ,oBAAoB,MAAM;AACvD,MAAI,aACF,QAAO;GACL,YAAY;GACZ,UAAU,MAAM,QAAQ,2BAA2B,aAAa;GACjE;EAGH,MAAM,mBAAmB,MAAM,QAAQ,4BAA4B,MAAM;AACzE,MAAI,iBACF,QAAO;GACL,YAAY;GACZ,UAAU;GACX;AAGH,QAAM;;;AAIV,SAAgB,6BACd,aACwB;CACxB,IAAI,gBAAyB;AAE7B,QAAO;EACL,mBAAmB;AACjB,UAAO;;EAET,cAAc,OAAO,aAAa,cAAc;AAC9C,OAAI,EAAE,SAAS,OAAO,UAAU,YAAY,YAAY,OACtD,iBAAgB;AAElB,UAAO,YAAY,OAAO,aAAa,aAAa;;EAEvD;;AAGH,SAAgB,qCACd,SACS;AACT,QAAO,QAAQ,QAAQ,cAAc,IAAI,CAAC,QAAQ"}
+{"version":3,"file":"app-page-stream.js","names":[],"sources":["../../src/server/app-page-stream.ts"],"sourcesContent":["import type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\n\nexport type AppPageFontData = {\n  links: string[];\n  preloads: readonly AppPageFontPreload[];\n  styles: string[];\n};\n\ntype CreateAppPageFontDataOptions = {\n  getLinks: () => string[];\n  getPreloads: () => AppPageFontPreload[];\n  getStyles: () => string[];\n};\n\nexport type AppPageSsrHandler = {\n  handleSsr: (\n    rscStream: ReadableStream<Uint8Array>,\n    navigationContext: unknown,\n    fontData: AppPageFontData,\n    options?: {\n      scriptNonce?: string;\n      sideStream?: ReadableStream<Uint8Array>;\n      capturedRscDataRef?: { value: Promise<ArrayBuffer> | null };\n    },\n  ) => Promise<ReadableStream<Uint8Array>>;\n};\n\ntype RenderAppPageHtmlStreamOptions = {\n  fontData: AppPageFontData;\n  navigationContext: unknown;\n  rscStream: ReadableStream<Uint8Array>;\n  scriptNonce?: string;\n  ssrHandler: AppPageSsrHandler;\n  /** Pre-split side stream for fused embed+capture (#981). When set,\n   *  handleSsr skips its internal tee and accumulates raw RSC bytes. */\n  sideStream?: ReadableStream<Uint8Array>;\n  /** Out-parameter filled with accumulated raw RSC bytes after stream consumption. */\n  capturedRscDataRef?: { value: Promise<ArrayBuffer> | null };\n};\n\ntype RenderAppPageHtmlResponseOptions = {\n  clearRequestContext: () => void;\n  fontLinkHeader?: string;\n  middlewareHeaders?: Headers | null;\n  status: number;\n} & RenderAppPageHtmlStreamOptions;\n\ntype AppPageHtmlStreamRecoveryResult = {\n  htmlStream: ReadableStream<Uint8Array> | null;\n  response: Response | null;\n};\n\ntype RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError> = {\n  onShellRendered?: () => void;\n  renderErrorBoundaryResponse: (error: unknown) => Promise<Response | null>;\n  renderHtmlStream: () => Promise<ReadableStream<Uint8Array>>;\n  renderSpecialErrorResponse: (specialError: TSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => TSpecialError | null;\n};\n\ntype AppPageRscErrorTracker = {\n  getCapturedError: () => unknown;\n  /**\n   * Returns a NEXT_REDIRECT or NEXT_HTTP_ERROR_FALLBACK error captured during\n   * the RSC render. Read after the SSR shell promise resolves to swap a\n   * 307/404 in place of the streamed body when redirect()/notFound() throws\n   * synchronously inside a route-level Suspense boundary (loading.tsx).\n   */\n  getCapturedSpecialError: () => unknown;\n  onRenderError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;\n};\n\ntype ShouldRerenderAppPageWithGlobalErrorOptions = {\n  capturedError: unknown;\n  hasLocalBoundary: boolean;\n};\n\nexport function createAppPageFontData(options: CreateAppPageFontDataOptions): AppPageFontData {\n  return {\n    links: options.getLinks(),\n    preloads: options.getPreloads(),\n    styles: options.getStyles(),\n  };\n}\n\nexport async function renderAppPageHtmlStream(\n  options: RenderAppPageHtmlStreamOptions,\n): Promise<ReadableStream<Uint8Array>> {\n  const ssrOptions = {\n    scriptNonce: options.scriptNonce,\n    sideStream: options.sideStream,\n    capturedRscDataRef: options.capturedRscDataRef,\n  };\n\n  return options.ssrHandler.handleSsr(\n    options.rscStream,\n    options.navigationContext,\n    options.fontData,\n    ssrOptions,\n  );\n}\n\n/**\n * Wraps a stream so that `onFlush` is called when the last byte has been read\n * by the downstream consumer (i.e. when the HTTP layer finishes draining the\n * response body). This is the correct place to clear per-request context,\n * because the RSC/SSR pipeline is lazy — components execute while the stream\n * is being consumed, not when the stream handle is first obtained.\n */\nexport function deferUntilStreamConsumed(\n  stream: ReadableStream<Uint8Array>,\n  onFlush: () => void,\n): ReadableStream<Uint8Array> {\n  let called = false;\n  const once = () => {\n    if (!called) {\n      called = true;\n      onFlush();\n    }\n  };\n\n  const cleanup = new TransformStream<Uint8Array, Uint8Array>({\n    flush() {\n      once();\n    },\n  });\n\n  const piped = stream.pipeThrough(cleanup);\n\n  // Wrap with a ReadableStream so we can intercept cancel() — the TransformStream\n  // Transformer interface does not expose a cancel hook in the Web Streams spec.\n  const reader = piped.getReader();\n  return new ReadableStream<Uint8Array>({\n    pull(controller) {\n      return reader.read().then(\n        ({ done, value }) => {\n          if (done) {\n            controller.close();\n          } else {\n            controller.enqueue(value);\n          }\n        },\n        (error) => {\n          once();\n          controller.error(error);\n        },\n      );\n    },\n    cancel(reason) {\n      // Stream cancelled before fully consumed (e.g. client disconnected).\n      // Still clear per-request context to avoid leaks.\n      once();\n      return reader.cancel(reason);\n    },\n  });\n}\n\nexport async function renderAppPageHtmlResponse(\n  options: RenderAppPageHtmlResponseOptions,\n): Promise<Response> {\n  const htmlStream = await renderAppPageHtmlStream(options);\n\n  // Defer clearRequestContext() until the stream is fully consumed by the HTTP\n  // layer. Calling it synchronously here would race the lazy RSC/SSR pipeline:\n  // components execute while the stream is being pulled, not when the handle\n  // is first returned. See: https://github.com/cloudflare/vinext/issues/660\n  const safeStream = deferUntilStreamConsumed(htmlStream, () => {\n    options.clearRequestContext();\n  });\n\n  const headers = new Headers({\n    \"Content-Type\": \"text/html; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.fontLinkHeader) {\n    headers.set(\"Link\", options.fontLinkHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n  return new Response(safeStream, {\n    status: options.status,\n    headers,\n  });\n}\n\nexport async function renderAppPageHtmlStreamWithRecovery<TSpecialError>(\n  options: RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError>,\n): Promise<AppPageHtmlStreamRecoveryResult> {\n  try {\n    const htmlStream = await options.renderHtmlStream();\n    options.onShellRendered?.();\n    return {\n      htmlStream,\n      response: null,\n    };\n  } catch (error) {\n    const specialError = options.resolveSpecialError(error);\n    if (specialError) {\n      return {\n        htmlStream: null,\n        response: await options.renderSpecialErrorResponse(specialError),\n      };\n    }\n\n    const boundaryResponse = await options.renderErrorBoundaryResponse(error);\n    if (boundaryResponse) {\n      return {\n        htmlStream: null,\n        response: boundaryResponse,\n      };\n    }\n\n    throw error;\n  }\n}\n\nexport function createAppPageRscErrorTracker(\n  baseOnError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown,\n): AppPageRscErrorTracker {\n  let capturedError: unknown = null;\n  let capturedSpecialError: unknown = null;\n\n  return {\n    getCapturedError() {\n      return capturedError;\n    },\n    getCapturedSpecialError() {\n      return capturedSpecialError;\n    },\n    onRenderError(error, requestInfo, errorContext) {\n      if (error && typeof error === \"object\" && \"digest\" in error) {\n        // Errors with a digest are signal throws (NEXT_REDIRECT,\n        // NEXT_NOT_FOUND, NEXT_HTTP_ERROR_FALLBACK). They're not real\n        // failures — keep the first one so the lifecycle can swap a\n        // 307/404 in place of a streamed \"Switched to client rendering\"\n        // body for routes with a route-level Suspense boundary.\n        if (capturedSpecialError === null) {\n          capturedSpecialError = error;\n        }\n      } else {\n        capturedError = error;\n      }\n      return baseOnError(error, requestInfo, errorContext);\n    },\n  };\n}\n\nexport function shouldRerenderAppPageWithGlobalError(\n  options: ShouldRerenderAppPageWithGlobalErrorOptions,\n): boolean {\n  return Boolean(options.capturedError) && !options.hasLocalBoundary;\n}\n"],"mappings":";;;AA+EA,SAAgB,sBAAsB,SAAwD;AAC5F,QAAO;EACL,OAAO,QAAQ,UAAU;EACzB,UAAU,QAAQ,aAAa;EAC/B,QAAQ,QAAQ,WAAW;EAC5B;;AAGH,eAAsB,wBACpB,SACqC;CACrC,MAAM,aAAa;EACjB,aAAa,QAAQ;EACrB,YAAY,QAAQ;EACpB,oBAAoB,QAAQ;EAC7B;AAED,QAAO,QAAQ,WAAW,UACxB,QAAQ,WACR,QAAQ,mBACR,QAAQ,UACR,WACD;;;;;;;;;AAUH,SAAgB,yBACd,QACA,SAC4B;CAC5B,IAAI,SAAS;CACb,MAAM,aAAa;AACjB,MAAI,CAAC,QAAQ;AACX,YAAS;AACT,YAAS;;;CAIb,MAAM,UAAU,IAAI,gBAAwC,EAC1D,QAAQ;AACN,QAAM;IAET,CAAC;CAMF,MAAM,SAJQ,OAAO,YAAY,QAAQ,CAIpB,WAAW;AAChC,QAAO,IAAI,eAA2B;EACpC,KAAK,YAAY;AACf,UAAO,OAAO,MAAM,CAAC,MAClB,EAAE,MAAM,YAAY;AACnB,QAAI,KACF,YAAW,OAAO;QAElB,YAAW,QAAQ,MAAM;OAG5B,UAAU;AACT,UAAM;AACN,eAAW,MAAM,MAAM;KAE1B;;EAEH,OAAO,QAAQ;AAGb,SAAM;AACN,UAAO,OAAO,OAAO,OAAO;;EAE/B,CAAC;;AAGJ,eAAsB,0BACpB,SACmB;CAOnB,MAAM,aAAa,yBANA,MAAM,wBAAwB,QAAQ,QAMK;AAC5D,UAAQ,qBAAqB;GAC7B;CAEF,MAAM,UAAU,IAAI,QAAQ;EAC1B,gBAAgB;EAChB,MAAM;EACP,CAAC;AAEF,KAAI,QAAQ,eACV,SAAQ,IAAI,QAAQ,QAAQ,eAAe;AAG7C,gCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,QAAO,IAAI,SAAS,YAAY;EAC9B,QAAQ,QAAQ;EAChB;EACD,CAAC;;AAGJ,eAAsB,oCACpB,SAC0C;AAC1C,KAAI;EACF,MAAM,aAAa,MAAM,QAAQ,kBAAkB;AACnD,UAAQ,mBAAmB;AAC3B,SAAO;GACL;GACA,UAAU;GACX;UACM,OAAO;EACd,MAAM,eAAe,QAAQ,oBAAoB,MAAM;AACvD,MAAI,aACF,QAAO;GACL,YAAY;GACZ,UAAU,MAAM,QAAQ,2BAA2B,aAAa;GACjE;EAGH,MAAM,mBAAmB,MAAM,QAAQ,4BAA4B,MAAM;AACzE,MAAI,iBACF,QAAO;GACL,YAAY;GACZ,UAAU;GACX;AAGH,QAAM;;;AAIV,SAAgB,6BACd,aACwB;CACxB,IAAI,gBAAyB;CAC7B,IAAI,uBAAgC;AAEpC,QAAO;EACL,mBAAmB;AACjB,UAAO;;EAET,0BAA0B;AACxB,UAAO;;EAET,cAAc,OAAO,aAAa,cAAc;AAC9C,OAAI,SAAS,OAAO,UAAU,YAAY,YAAY;QAMhD,yBAAyB,KAC3B,wBAAuB;SAGzB,iBAAgB;AAElB,UAAO,YAAY,OAAO,aAAa,aAAa;;EAEvD;;AAGH,SAAgB,qCACd,SACS;AACT,QAAO,QAAQ,QAAQ,cAAc,IAAI,CAAC,QAAQ"}

package/dist/server/app-prerender-endpoints.js

@@ -1,3 +1,4 @@
+import { notFoundResponse } from "./http-error-responses.js";
 import { callAppPrerenderStaticParams } from "./app-prerender-static-params.js";
 //#region src/server/app-prerender-endpoints.ts
 const STATIC_PARAMS_ENDPOINT = "/__vinext/prerender/static-params";
@@ -12,7 +13,7 @@ async function handleAppPrerenderEndpoint(request, options) {
 	return null;
 }
 async function handleStaticParamsEndpoint(request, options) {
-	if (!isEnabled(options)) return new Response("Not Found", { status: 404 });
+	if (!isEnabled(options)) return notFoundResponse();
 	const url = new URL(request.url);
 	const pattern = url.searchParams.get("pattern");
 	if (!pattern) return new Response("missing pattern", { status: 400 });
@@ -30,7 +31,7 @@ async function handleStaticParamsEndpoint(request, options) {
 	}
 }
 async function handlePagesStaticPathsEndpoint(request, options) {
-	if (!isEnabled(options)) return new Response("Not Found", { status: 404 });
+	if (!isEnabled(options)) return notFoundResponse();
 	const url = new URL(request.url);
 	const pattern = url.searchParams.get("pattern");
 	if (!pattern) return new Response("missing pattern", { status: 400 });

package/dist/server/app-prerender-endpoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-prerender-endpoints.js","names":[],"sources":["../../src/server/app-prerender-endpoints.ts"],"sourcesContent":["import { callAppPrerenderStaticParams } from \"./app-prerender-static-params.js\";\nimport type { RootParams } from \"vinext/shims/root-params\";\n\ntype GenerateStaticParams = (args: { params: RootParams }) => unknown;\n\ntype AppPrerenderStaticParamsMap = Record<string, GenerateStaticParams | null | undefined>;\ntype RootParamNamesMap = Record<string, readonly string[] | undefined>;\n\ntype AppPrerenderPageRoute = {\n  pattern: string;\n  module?: {\n    getStaticPaths?: (opts: { locales: string[]; defaultLocale: string }) => unknown;\n  };\n};\n\ntype HandleAppPrerenderEndpointOptions = {\n  isPrerenderEnabled?: () => boolean;\n  loadPagesRoutes?: () => Promise<unknown>;\n  pathname: string;\n  rootParamNamesByPattern?: RootParamNamesMap;\n  staticParamsMap: AppPrerenderStaticParamsMap;\n};\n\nconst STATIC_PARAMS_ENDPOINT = \"/__vinext/prerender/static-params\";\nconst PAGES_STATIC_PATHS_ENDPOINT = \"/__vinext/prerender/pages-static-paths\";\nconst JSON_HEADERS = { \"content-type\": \"application/json\" };\n\nexport async function handleAppPrerenderEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response | null> {\n  if (options.pathname === STATIC_PARAMS_ENDPOINT) {\n    return handleStaticParamsEndpoint(request, options);\n  }\n\n  if (options.pathname === PAGES_STATIC_PATHS_ENDPOINT) {\n    if (!options.loadPagesRoutes) return null;\n    return handlePagesStaticPathsEndpoint(request, options);\n  }\n\n  return null;\n}\n\nasync function handleStaticParamsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return new Response(\"Not Found\", { status: 404 });\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  const generateStaticParams = options.staticParamsMap[pattern];\n  if (typeof generateStaticParams !== \"function\") {\n    return jsonNullResponse();\n  }\n\n  try {\n    const params = parseParentParams(url.searchParams.get(\"parentParams\"));\n    const result = await callAppPrerenderStaticParams({\n      fn: generateStaticParams,\n      params,\n      pattern,\n      rootParamNamesByPattern: options.rootParamNamesByPattern ?? {},\n    });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nasync function handlePagesStaticPathsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return new Response(\"Not Found\", { status: 404 });\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  try {\n    const pageRoutes = await options.loadPagesRoutes?.();\n    const route = findPageRoute(pageRoutes, pattern);\n    const getStaticPaths = route?.module?.getStaticPaths;\n    if (typeof getStaticPaths !== \"function\") {\n      return jsonNullResponse();\n    }\n\n    const locales = parseLocales(url.searchParams.get(\"locales\"));\n    const defaultLocale = url.searchParams.get(\"defaultLocale\") ?? \"\";\n    const result = await getStaticPaths({ locales, defaultLocale });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nfunction isEnabled(options: HandleAppPrerenderEndpointOptions): boolean {\n  return options.isPrerenderEnabled?.() ?? false;\n}\n\nfunction jsonResponse(body: unknown, status = 200): Response {\n  return new Response(JSON.stringify(body), {\n    headers: JSON_HEADERS,\n    status,\n  });\n}\n\nfunction jsonNullResponse(): Response {\n  return new Response(\"null\", {\n    headers: JSON_HEADERS,\n    status: 200,\n  });\n}\n\nfunction parseParentParams(raw: string | null): RootParams {\n  if (!raw) return {};\n\n  const value = JSON.parse(raw);\n  if (!isPlainObject(value)) return {};\n\n  const params: RootParams = {};\n  for (const [key, paramValue] of Object.entries(value)) {\n    if (typeof paramValue === \"string\" || paramValue === undefined || isStringArray(paramValue)) {\n      params[key] = paramValue;\n    }\n  }\n  return params;\n}\n\nfunction parseLocales(raw: string | null): string[] {\n  if (!raw) return [];\n\n  const value = JSON.parse(raw);\n  if (!Array.isArray(value)) return [];\n\n  return value.filter((locale) => typeof locale === \"string\");\n}\n\nfunction findPageRoute(value: unknown, pattern: string): AppPrerenderPageRoute | undefined {\n  if (!Array.isArray(value)) return undefined;\n\n  for (const route of value) {\n    if (isPageRoute(route) && route.pattern === pattern) {\n      return route;\n    }\n  }\n\n  return undefined;\n}\n\nfunction isPageRoute(value: unknown): value is AppPrerenderPageRoute {\n  if (!isPlainObject(value) || typeof value.pattern !== \"string\") return false;\n  if (value.module === undefined) return true;\n  if (!isPlainObject(value.module)) return false;\n\n  return (\n    value.module.getStaticPaths === undefined || typeof value.module.getStaticPaths === \"function\"\n  );\n}\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction isStringArray(value: unknown): value is string[] {\n  return Array.isArray(value) && value.every((item) => typeof item === \"string\");\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-prerender-endpoints.js","names":[],"sources":["../../src/server/app-prerender-endpoints.ts"],"sourcesContent":["import { callAppPrerenderStaticParams } from \"./app-prerender-static-params.js\";\nimport { notFoundResponse } from \"./http-error-responses.js\";\nimport type { RootParams } from \"vinext/shims/root-params\";\n\ntype GenerateStaticParams = (args: { params: RootParams }) => unknown;\n\ntype AppPrerenderStaticParamsMap = Record<string, GenerateStaticParams | null | undefined>;\ntype RootParamNamesMap = Record<string, readonly string[] | undefined>;\n\ntype AppPrerenderPageRoute = {\n  pattern: string;\n  module?: {\n    getStaticPaths?: (opts: { locales: string[]; defaultLocale: string }) => unknown;\n  };\n};\n\ntype HandleAppPrerenderEndpointOptions = {\n  isPrerenderEnabled?: () => boolean;\n  loadPagesRoutes?: () => Promise<unknown>;\n  pathname: string;\n  rootParamNamesByPattern?: RootParamNamesMap;\n  staticParamsMap: AppPrerenderStaticParamsMap;\n};\n\nconst STATIC_PARAMS_ENDPOINT = \"/__vinext/prerender/static-params\";\nconst PAGES_STATIC_PATHS_ENDPOINT = \"/__vinext/prerender/pages-static-paths\";\nconst JSON_HEADERS = { \"content-type\": \"application/json\" };\n\nexport async function handleAppPrerenderEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response | null> {\n  if (options.pathname === STATIC_PARAMS_ENDPOINT) {\n    return handleStaticParamsEndpoint(request, options);\n  }\n\n  if (options.pathname === PAGES_STATIC_PATHS_ENDPOINT) {\n    if (!options.loadPagesRoutes) return null;\n    return handlePagesStaticPathsEndpoint(request, options);\n  }\n\n  return null;\n}\n\nasync function handleStaticParamsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return notFoundResponse();\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  const generateStaticParams = options.staticParamsMap[pattern];\n  if (typeof generateStaticParams !== \"function\") {\n    return jsonNullResponse();\n  }\n\n  try {\n    const params = parseParentParams(url.searchParams.get(\"parentParams\"));\n    const result = await callAppPrerenderStaticParams({\n      fn: generateStaticParams,\n      params,\n      pattern,\n      rootParamNamesByPattern: options.rootParamNamesByPattern ?? {},\n    });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nasync function handlePagesStaticPathsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return notFoundResponse();\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  try {\n    const pageRoutes = await options.loadPagesRoutes?.();\n    const route = findPageRoute(pageRoutes, pattern);\n    const getStaticPaths = route?.module?.getStaticPaths;\n    if (typeof getStaticPaths !== \"function\") {\n      return jsonNullResponse();\n    }\n\n    const locales = parseLocales(url.searchParams.get(\"locales\"));\n    const defaultLocale = url.searchParams.get(\"defaultLocale\") ?? \"\";\n    const result = await getStaticPaths({ locales, defaultLocale });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nfunction isEnabled(options: HandleAppPrerenderEndpointOptions): boolean {\n  return options.isPrerenderEnabled?.() ?? false;\n}\n\nfunction jsonResponse(body: unknown, status = 200): Response {\n  return new Response(JSON.stringify(body), {\n    headers: JSON_HEADERS,\n    status,\n  });\n}\n\nfunction jsonNullResponse(): Response {\n  return new Response(\"null\", {\n    headers: JSON_HEADERS,\n    status: 200,\n  });\n}\n\nfunction parseParentParams(raw: string | null): RootParams {\n  if (!raw) return {};\n\n  const value = JSON.parse(raw);\n  if (!isPlainObject(value)) return {};\n\n  const params: RootParams = {};\n  for (const [key, paramValue] of Object.entries(value)) {\n    if (typeof paramValue === \"string\" || paramValue === undefined || isStringArray(paramValue)) {\n      params[key] = paramValue;\n    }\n  }\n  return params;\n}\n\nfunction parseLocales(raw: string | null): string[] {\n  if (!raw) return [];\n\n  const value = JSON.parse(raw);\n  if (!Array.isArray(value)) return [];\n\n  return value.filter((locale) => typeof locale === \"string\");\n}\n\nfunction findPageRoute(value: unknown, pattern: string): AppPrerenderPageRoute | undefined {\n  if (!Array.isArray(value)) return undefined;\n\n  for (const route of value) {\n    if (isPageRoute(route) && route.pattern === pattern) {\n      return route;\n    }\n  }\n\n  return undefined;\n}\n\nfunction isPageRoute(value: unknown): value is AppPrerenderPageRoute {\n  if (!isPlainObject(value) || typeof value.pattern !== \"string\") return false;\n  if (value.module === undefined) return true;\n  if (!isPlainObject(value.module)) return false;\n\n  return (\n    value.module.getStaticPaths === undefined || typeof value.module.getStaticPaths === \"function\"\n  );\n}\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction isStringArray(value: unknown): value is string[] {\n  return Array.isArray(value) && value.every((item) => typeof item === \"string\");\n}\n"],"mappings":"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"}

package/dist/server/app-route-handler-cache.js

@@ -1,3 +1,4 @@
+import { makeThenableParams } from "../shims/thenable-params.js";
 import { markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { applyRouteHandlerMiddlewareContext, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
 import { runAppRouteHandler } from "./app-route-handler-execution.js";
@@ -38,7 +39,7 @@ async function readAppRouteHandlerCacheResponse(options) {
 						handlerFn: options.handlerFn,
 						i18n: options.i18n,
 						markDynamicUsage: options.markDynamicUsage,
-						params: options.params,
+						params: makeThenableParams(options.params),
 						request: new Request(options.requestUrl, { method: "GET" }),
 						routePattern: options.routePattern,
 						setHeadersAccessPhase: options.setHeadersAccessPhase

package/dist/server/app-route-handler-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-route-handler-cache.js","names":[],"sources":["../../src/server/app-route-handler-cache.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport type { HeadersAccessPhase } from \"vinext/shims/headers\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport type { RouteHandlerMiddlewareContext } from \"./app-route-handler-response.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  assertSupportedAppRouteHandlerResponse,\n  buildAppRouteCacheValue,\n  buildRouteHandlerCachedResponse,\n} from \"./app-route-handler-response.js\";\nimport { markKnownDynamicAppRoute } from \"./app-route-handler-runtime.js\";\nimport {\n  runAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteDynamicUsageFn,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type MarkAppRouteDynamicUsageFn,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype RouteHandlerRevalidationContextRunner = (renderFn: () => Promise<void>) => Promise<void>;\n\ntype ReadAppRouteHandlerCacheOptions = {\n  basePath?: string;\n  buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  consumeDynamicUsage: AppRouteDynamicUsageFn;\n  dynamicConfig?: string;\n  getCollectedFetchTags: () => string[];\n  handlerFn: AppRouteHandlerFunction;\n  i18n?: NextI18nConfig | null;\n  isAutoHead: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  markDynamicUsage: MarkAppRouteDynamicUsageFn;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  params: AppRouteParams;\n  requestUrl: string;\n  revalidateSearchParams: URLSearchParams;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  routePattern: string;\n  runInRevalidationContext: RouteHandlerRevalidationContextRunner;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n  setNavigationContext: (\n    context: {\n      pathname: string;\n      searchParams: URLSearchParams;\n      params: AppRouteParams;\n    } | null,\n  ) => void;\n};\n\nfunction getCachedAppRouteValue(entry: ISRCacheEntry | null) {\n  return entry?.value.value && entry.value.value.kind === \"APP_ROUTE\" ? entry.value.value : null;\n}\n\nexport async function readAppRouteHandlerCacheResponse(\n  options: ReadAppRouteHandlerCacheOptions,\n): Promise<Response | null> {\n  const routeKey = options.isrRouteKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(routeKey);\n    const cachedValue = getCachedAppRouteValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      options.isrDebug?.(\"HIT (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(cachedValue, {\n          cacheState: \"HIT\",\n          cacheControl: cached?.value.cacheControl,\n          expireSeconds: options.expireSeconds,\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const staleValue = cachedValue;\n      const revalidateSearchParams = new URLSearchParams(options.revalidateSearchParams);\n\n      options.scheduleBackgroundRegeneration(routeKey, async () => {\n        await options.runInRevalidationContext(async () => {\n          options.setNavigationContext({\n            pathname: options.cleanPathname,\n            searchParams: revalidateSearchParams,\n            params: options.params,\n          });\n\n          const { dynamicUsedInHandler, response } = await runAppRouteHandler({\n            basePath: options.basePath,\n            consumeDynamicUsage: options.consumeDynamicUsage,\n            dynamicConfig: options.dynamicConfig,\n            handlerFn: options.handlerFn,\n            i18n: options.i18n,\n            markDynamicUsage: options.markDynamicUsage,\n            params: options.params,\n            request: new Request(options.requestUrl, { method: \"GET\" }),\n            routePattern: options.routePattern,\n            setHeadersAccessPhase: options.setHeadersAccessPhase,\n          });\n\n          options.setNavigationContext(null);\n          assertSupportedAppRouteHandlerResponse(response);\n\n          if (dynamicUsedInHandler) {\n            markKnownDynamicAppRoute(options.routePattern);\n            options.isrDebug?.(\"route regen skipped (dynamic usage)\", options.cleanPathname);\n            return;\n          }\n\n          const routeTags = options.buildPageCacheTags(\n            options.cleanPathname,\n            options.getCollectedFetchTags(),\n          );\n          const routeCacheValue = await buildAppRouteCacheValue(response);\n          await options.isrSet(\n            routeKey,\n            routeCacheValue,\n            options.revalidateSeconds,\n            routeTags,\n            options.expireSeconds,\n          );\n          options.isrDebug?.(\"route regen complete\", routeKey);\n        });\n      });\n\n      options.isrDebug?.(\"STALE (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(staleValue, {\n          cacheState: \"STALE\",\n          cacheControl: cached.value.cacheControl,\n          expireSeconds: options.expireSeconds,\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n  } catch (routeCacheError) {\n    console.error(\"[vinext] ISR route cache read error:\", routeCacheError);\n  }\n\n  return null;\n}\n"],"mappings":";;;;AA4DA,SAAS,uBAAuB,OAA6B;AAC3D,QAAO,OAAO,MAAM,SAAS,MAAM,MAAM,MAAM,SAAS,cAAc,MAAM,MAAM,QAAQ;;AAG5F,eAAsB,iCACpB,SAC0B;CAC1B,MAAM,WAAW,QAAQ,YAAY,QAAQ,cAAc;AAE3D,KAAI;EACF,MAAM,SAAS,MAAM,QAAQ,OAAO,SAAS;EAC7C,MAAM,cAAc,uBAAuB,OAAO;AAElD,MAAI,eAAe,CAAC,QAAQ,SAAS;AACnC,WAAQ,WAAW,eAAe,QAAQ,cAAc;AACxD,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,aAAa;IAC3C,YAAY;IACZ,cAAc,QAAQ,MAAM;IAC5B,eAAe,QAAQ;IACvB,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;AAGH,MAAI,QAAQ,WAAW,aAAa;GAClC,MAAM,aAAa;GACnB,MAAM,yBAAyB,IAAI,gBAAgB,QAAQ,uBAAuB;AAElF,WAAQ,+BAA+B,UAAU,YAAY;AAC3D,UAAM,QAAQ,yBAAyB,YAAY;AACjD,aAAQ,qBAAqB;MAC3B,UAAU,QAAQ;MAClB,cAAc;MACd,QAAQ,QAAQ;MACjB,CAAC;KAEF,MAAM,EAAE,sBAAsB,aAAa,MAAM,mBAAmB;MAClE,UAAU,QAAQ;MAClB,qBAAqB,QAAQ;MAC7B,eAAe,QAAQ;MACvB,WAAW,QAAQ;MACnB,MAAM,QAAQ;MACd,kBAAkB,QAAQ;MAC1B,QAAQ,QAAQ;MAChB,SAAS,IAAI,QAAQ,QAAQ,YAAY,EAAE,QAAQ,OAAO,CAAC;MAC3D,cAAc,QAAQ;MACtB,uBAAuB,QAAQ;MAChC,CAAC;AAEF,aAAQ,qBAAqB,KAAK;AAClC,4CAAuC,SAAS;AAEhD,SAAI,sBAAsB;AACxB,+BAAyB,QAAQ,aAAa;AAC9C,cAAQ,WAAW,uCAAuC,QAAQ,cAAc;AAChF;;KAGF,MAAM,YAAY,QAAQ,mBACxB,QAAQ,eACR,QAAQ,uBAAuB,CAChC;KACD,MAAM,kBAAkB,MAAM,wBAAwB,SAAS;AAC/D,WAAM,QAAQ,OACZ,UACA,iBACA,QAAQ,mBACR,WACA,QAAQ,cACT;AACD,aAAQ,WAAW,wBAAwB,SAAS;MACpD;KACF;AAEF,WAAQ,WAAW,iBAAiB,QAAQ,cAAc;AAC1D,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,YAAY;IAC1C,YAAY;IACZ,cAAc,OAAO,MAAM;IAC3B,eAAe,QAAQ;IACvB,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;UAEI,iBAAiB;AACxB,UAAQ,MAAM,wCAAwC,gBAAgB;;AAGxE,QAAO"}
+{"version":3,"file":"app-route-handler-cache.js","names":[],"sources":["../../src/server/app-route-handler-cache.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport type { HeadersAccessPhase } from \"vinext/shims/headers\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport type { RouteHandlerMiddlewareContext } from \"./app-route-handler-response.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  assertSupportedAppRouteHandlerResponse,\n  buildAppRouteCacheValue,\n  buildRouteHandlerCachedResponse,\n} from \"./app-route-handler-response.js\";\nimport { markKnownDynamicAppRoute } from \"./app-route-handler-runtime.js\";\nimport { makeThenableParams } from \"vinext/shims/thenable-params\";\nimport {\n  runAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteDynamicUsageFn,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type MarkAppRouteDynamicUsageFn,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype RouteHandlerRevalidationContextRunner = (renderFn: () => Promise<void>) => Promise<void>;\n\ntype ReadAppRouteHandlerCacheOptions = {\n  basePath?: string;\n  buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  consumeDynamicUsage: AppRouteDynamicUsageFn;\n  dynamicConfig?: string;\n  getCollectedFetchTags: () => string[];\n  handlerFn: AppRouteHandlerFunction;\n  i18n?: NextI18nConfig | null;\n  isAutoHead: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  markDynamicUsage: MarkAppRouteDynamicUsageFn;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  params: AppRouteParams;\n  requestUrl: string;\n  revalidateSearchParams: URLSearchParams;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  routePattern: string;\n  runInRevalidationContext: RouteHandlerRevalidationContextRunner;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n  setNavigationContext: (\n    context: {\n      pathname: string;\n      searchParams: URLSearchParams;\n      params: AppRouteParams;\n    } | null,\n  ) => void;\n};\n\nfunction getCachedAppRouteValue(entry: ISRCacheEntry | null) {\n  return entry?.value.value && entry.value.value.kind === \"APP_ROUTE\" ? entry.value.value : null;\n}\n\nexport async function readAppRouteHandlerCacheResponse(\n  options: ReadAppRouteHandlerCacheOptions,\n): Promise<Response | null> {\n  const routeKey = options.isrRouteKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(routeKey);\n    const cachedValue = getCachedAppRouteValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      options.isrDebug?.(\"HIT (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(cachedValue, {\n          cacheState: \"HIT\",\n          cacheControl: cached?.value.cacheControl,\n          expireSeconds: options.expireSeconds,\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const staleValue = cachedValue;\n      const revalidateSearchParams = new URLSearchParams(options.revalidateSearchParams);\n\n      options.scheduleBackgroundRegeneration(routeKey, async () => {\n        await options.runInRevalidationContext(async () => {\n          options.setNavigationContext({\n            pathname: options.cleanPathname,\n            searchParams: revalidateSearchParams,\n            params: options.params,\n          });\n\n          const { dynamicUsedInHandler, response } = await runAppRouteHandler({\n            basePath: options.basePath,\n            consumeDynamicUsage: options.consumeDynamicUsage,\n            dynamicConfig: options.dynamicConfig,\n            handlerFn: options.handlerFn,\n            i18n: options.i18n,\n            markDynamicUsage: options.markDynamicUsage,\n            params: makeThenableParams(options.params),\n            request: new Request(options.requestUrl, { method: \"GET\" }),\n            routePattern: options.routePattern,\n            setHeadersAccessPhase: options.setHeadersAccessPhase,\n          });\n\n          options.setNavigationContext(null);\n          assertSupportedAppRouteHandlerResponse(response);\n\n          if (dynamicUsedInHandler) {\n            markKnownDynamicAppRoute(options.routePattern);\n            options.isrDebug?.(\"route regen skipped (dynamic usage)\", options.cleanPathname);\n            return;\n          }\n\n          const routeTags = options.buildPageCacheTags(\n            options.cleanPathname,\n            options.getCollectedFetchTags(),\n          );\n          const routeCacheValue = await buildAppRouteCacheValue(response);\n          await options.isrSet(\n            routeKey,\n            routeCacheValue,\n            options.revalidateSeconds,\n            routeTags,\n            options.expireSeconds,\n          );\n          options.isrDebug?.(\"route regen complete\", routeKey);\n        });\n      });\n\n      options.isrDebug?.(\"STALE (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(staleValue, {\n          cacheState: \"STALE\",\n          cacheControl: cached.value.cacheControl,\n          expireSeconds: options.expireSeconds,\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n  } catch (routeCacheError) {\n    console.error(\"[vinext] ISR route cache read error:\", routeCacheError);\n  }\n\n  return null;\n}\n"],"mappings":";;;;;AA6DA,SAAS,uBAAuB,OAA6B;AAC3D,QAAO,OAAO,MAAM,SAAS,MAAM,MAAM,MAAM,SAAS,cAAc,MAAM,MAAM,QAAQ;;AAG5F,eAAsB,iCACpB,SAC0B;CAC1B,MAAM,WAAW,QAAQ,YAAY,QAAQ,cAAc;AAE3D,KAAI;EACF,MAAM,SAAS,MAAM,QAAQ,OAAO,SAAS;EAC7C,MAAM,cAAc,uBAAuB,OAAO;AAElD,MAAI,eAAe,CAAC,QAAQ,SAAS;AACnC,WAAQ,WAAW,eAAe,QAAQ,cAAc;AACxD,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,aAAa;IAC3C,YAAY;IACZ,cAAc,QAAQ,MAAM;IAC5B,eAAe,QAAQ;IACvB,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;AAGH,MAAI,QAAQ,WAAW,aAAa;GAClC,MAAM,aAAa;GACnB,MAAM,yBAAyB,IAAI,gBAAgB,QAAQ,uBAAuB;AAElF,WAAQ,+BAA+B,UAAU,YAAY;AAC3D,UAAM,QAAQ,yBAAyB,YAAY;AACjD,aAAQ,qBAAqB;MAC3B,UAAU,QAAQ;MAClB,cAAc;MACd,QAAQ,QAAQ;MACjB,CAAC;KAEF,MAAM,EAAE,sBAAsB,aAAa,MAAM,mBAAmB;MAClE,UAAU,QAAQ;MAClB,qBAAqB,QAAQ;MAC7B,eAAe,QAAQ;MACvB,WAAW,QAAQ;MACnB,MAAM,QAAQ;MACd,kBAAkB,QAAQ;MAC1B,QAAQ,mBAAmB,QAAQ,OAAO;MAC1C,SAAS,IAAI,QAAQ,QAAQ,YAAY,EAAE,QAAQ,OAAO,CAAC;MAC3D,cAAc,QAAQ;MACtB,uBAAuB,QAAQ;MAChC,CAAC;AAEF,aAAQ,qBAAqB,KAAK;AAClC,4CAAuC,SAAS;AAEhD,SAAI,sBAAsB;AACxB,+BAAyB,QAAQ,aAAa;AAC9C,cAAQ,WAAW,uCAAuC,QAAQ,cAAc;AAChF;;KAGF,MAAM,YAAY,QAAQ,mBACxB,QAAQ,eACR,QAAQ,uBAAuB,CAChC;KACD,MAAM,kBAAkB,MAAM,wBAAwB,SAAS;AAC/D,WAAM,QAAQ,OACZ,UACA,iBACA,QAAQ,mBACR,WACA,QAAQ,cACT;AACD,aAAQ,WAAW,wBAAwB,SAAS;MACpD;KACF;AAEF,WAAQ,WAAW,iBAAiB,QAAQ,cAAc;AAC1D,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,YAAY;IAC1C,YAAY;IACZ,cAAc,OAAO,MAAM;IAC3B,eAAe,QAAQ;IACvB,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;UAEI,iBAAiB;AACxB,UAAQ,MAAM,wCAAwC,gBAAgB;;AAGxE,QAAO"}

package/dist/server/app-route-handler-dispatch.js

@@ -4,7 +4,8 @@ import { reportRequestError } from "./instrumentation.js";
 import { consumeDynamicUsage, getAndClearPendingCookies, getDraftModeCookieHeader, markDynamicUsage, setHeadersAccessPhase } from "../shims/headers.js";
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { setNavigationContext } from "../shims/navigation.js";
-import { isKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
+import { isKnownDynamicAppRoute, isValidHTTPMethod } from "./app-route-handler-runtime.js";
 import { getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, resolveAppRouteHandlerMethod, shouldReadAppRouteHandlerCache } from "./app-route-handler-policy.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
@@ -15,10 +16,6 @@ import { readAppRouteHandlerCacheResponse } from "./app-route-handler-cache.js";
 function isAppRouteHandlerFunction(value) {
 	return typeof value === "function";
 }
-function makeThenableParams(params) {
-	const plain = { ...params };
-	return Object.assign(Promise.resolve(plain), plain);
-}
 function buildRouteHandlerPageCacheTags(pathname, extraTags, routeSegments) {
 	return buildPageCacheTags(pathname, extraTags, routeSegments, "route");
 }
@@ -45,6 +42,10 @@ async function dispatchAppRouteHandler(options) {
 	const isDevelopment = options.isDevelopment ?? process.env.NODE_ENV === "development";
 	const isProduction = options.isProduction ?? process.env.NODE_ENV === "production";
 	if (hasAppRouteHandlerDefaultExport(handler) && isDevelopment) console.error("[vinext] Detected default export in route handler " + route.pattern + ". Export a named export for each HTTP method instead.");
+	if (!isValidHTTPMethod(method)) {
+		options.clearRequestContext();
+		return applyRouteHandlerMiddlewareContext(new Response(null, { status: 400 }), options.middlewareContext);
+	}
 	const { allowHeaderForOptions, handlerFn, isAutoHead, shouldAutoRespondToOptions } = resolveAppRouteHandlerMethod(handler, method);
 	if (shouldAutoRespondToOptions) {
 		options.clearRequestContext();

package/dist/server/app-route-handler-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-route-handler-dispatch.js","names":[],"sources":["../../src/server/app-route-handler-dispatch.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport {\n  getCollectedFetchTags,\n  ensureFetchPatch,\n  setCurrentFetchSoftTags,\n} from \"vinext/shims/fetch-cache\";\nimport {\n  consumeDynamicUsage,\n  getAndClearPendingCookies,\n  getDraftModeCookieHeader,\n  markDynamicUsage,\n  setHeadersAccessPhase,\n} from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { getRequestExecutionContext } from \"vinext/shims/request-context\";\nimport { createRequestContext, runWithRequestContext } from \"vinext/shims/unified-request-context\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport {\n  getAppRouteHandlerRevalidateSeconds,\n  hasAppRouteHandlerDefaultExport,\n  resolveAppRouteHandlerMethod,\n  shouldReadAppRouteHandlerCache,\n  type AppRouteHandlerModule,\n} from \"./app-route-handler-policy.js\";\nimport { readAppRouteHandlerCacheResponse } from \"./app-route-handler-cache.js\";\nimport {\n  executeAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\nimport { isKnownDynamicAppRoute } from \"./app-route-handler-runtime.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  type RouteHandlerMiddlewareContext,\n} from \"./app-route-handler-response.js\";\nimport { createStaticGenerationHeadersContext } from \"./app-static-generation.js\";\nimport { buildPageCacheTags } from \"./implicit-tags.js\";\nimport { reportRequestError } from \"./instrumentation.js\";\n\ntype AppRouteHandlerDispatchRoute = {\n  pattern: string;\n  routeHandler: AppRouteHandlerModule;\n  routeSegments: string[];\n};\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerationErrorContext = {\n  routerKind: \"App Router\";\n  routePath: string;\n  routeType: \"route\";\n};\ntype RouteHandlerBackgroundRegenerator = (\n  key: string,\n  renderFn: () => Promise<void>,\n  errorContext?: RouteHandlerBackgroundRegenerationErrorContext,\n) => void;\n\ntype DispatchAppRouteHandlerOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  expireSeconds?: number;\n  i18n?: NextI18nConfig | null;\n  isDevelopment?: boolean;\n  isProduction?: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  middlewareRequestHeaders?: Headers | null;\n  params: AppRouteParams;\n  request: Request;\n  route: AppRouteHandlerDispatchRoute;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  searchParams: URLSearchParams;\n};\n\nfunction isAppRouteHandlerFunction(value: unknown): value is AppRouteHandlerFunction {\n  return typeof value === \"function\";\n}\n\nfunction makeThenableParams<T extends AppRouteParams>(params: T): Promise<T> & T {\n  const plain = { ...params };\n  return Object.assign(Promise.resolve(plain), plain);\n}\n\nfunction buildRouteHandlerPageCacheTags(\n  pathname: string,\n  extraTags: string[],\n  routeSegments: string[],\n): string[] {\n  return buildPageCacheTags(pathname, extraTags, routeSegments, \"route\");\n}\n\nasync function runInRouteHandlerRevalidationContext(\n  options: {\n    cleanPathname: string;\n    dynamicConfig?: string;\n    routePattern: string;\n    routeSegments: string[];\n  },\n  renderFn: () => Promise<void>,\n): Promise<void> {\n  const headersContext = createStaticGenerationHeadersContext({\n    dynamicConfig: options.dynamicConfig,\n    routeKind: \"route\",\n    routePattern: options.routePattern,\n  });\n  const requestContext = createRequestContext({\n    headersContext,\n    executionContext: getRequestExecutionContext(),\n    unstableCacheRevalidation: \"foreground\",\n  });\n\n  await runWithRequestContext(requestContext, async () => {\n    ensureFetchPatch();\n    setCurrentFetchSoftTags(\n      buildRouteHandlerPageCacheTags(options.cleanPathname, [], options.routeSegments),\n    );\n    await renderFn();\n  });\n}\n\nexport async function dispatchAppRouteHandler(\n  options: DispatchAppRouteHandlerOptions,\n): Promise<Response> {\n  const { route } = options;\n  const handler = route.routeHandler;\n  const method = options.request.method.toUpperCase();\n  const revalidateSeconds = getAppRouteHandlerRevalidateSeconds(handler);\n  const isDevelopment = options.isDevelopment ?? process.env.NODE_ENV === \"development\";\n  const isProduction = options.isProduction ?? process.env.NODE_ENV === \"production\";\n\n  if (hasAppRouteHandlerDefaultExport(handler) && isDevelopment) {\n    console.error(\n      \"[vinext] Detected default export in route handler \" +\n        route.pattern +\n        \". Export a named export for each HTTP method instead.\",\n    );\n  }\n\n  const { allowHeaderForOptions, handlerFn, isAutoHead, shouldAutoRespondToOptions } =\n    resolveAppRouteHandlerMethod(handler, method);\n\n  if (shouldAutoRespondToOptions) {\n    options.clearRequestContext();\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, {\n        status: 204,\n        headers: { Allow: allowHeaderForOptions },\n      }),\n      options.middlewareContext,\n    );\n  }\n\n  const resolvedHandlerFn = isAppRouteHandlerFunction(handlerFn) ? handlerFn : undefined;\n\n  if (\n    revalidateSeconds !== null &&\n    shouldReadAppRouteHandlerCache({\n      dynamicConfig: handler.dynamic,\n      handlerFn: resolvedHandlerFn,\n      isAutoHead,\n      isKnownDynamic: isKnownDynamicAppRoute(route.pattern),\n      isProduction,\n      method,\n      revalidateSeconds,\n    }) &&\n    resolvedHandlerFn\n  ) {\n    const cachedRouteResponse = await readAppRouteHandlerCacheResponse({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      dynamicConfig: handler.dynamic,\n      getCollectedFetchTags,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isrDebug: options.isrDebug,\n      isrGet: options.isrGet,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      middlewareContext: options.middlewareContext,\n      params: options.params,\n      requestUrl: options.request.url,\n      revalidateSearchParams: options.searchParams,\n      expireSeconds: options.expireSeconds,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      runInRevalidationContext(renderFn) {\n        return runInRouteHandlerRevalidationContext(\n          {\n            cleanPathname: options.cleanPathname,\n            dynamicConfig: handler.dynamic,\n            routePattern: route.pattern,\n            routeSegments: route.routeSegments,\n          },\n          renderFn,\n        );\n      },\n      scheduleBackgroundRegeneration(key, renderFn) {\n        options.scheduleBackgroundRegeneration(key, renderFn, {\n          routerKind: \"App Router\",\n          routePath: route.pattern,\n          routeType: \"route\",\n        });\n      },\n      setHeadersAccessPhase,\n      setNavigationContext,\n    });\n    if (cachedRouteResponse) {\n      return cachedRouteResponse;\n    }\n  }\n\n  if (resolvedHandlerFn) {\n    return executeAppRouteHandler({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      executionContext: getRequestExecutionContext(),\n      getAndClearPendingCookies,\n      getCollectedFetchTags,\n      getDraftModeCookieHeader,\n      handler,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isProduction,\n      isrDebug: options.isrDebug,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      method,\n      middlewareContext: options.middlewareContext,\n      middlewareRequestHeaders: options.middlewareRequestHeaders,\n      params: makeThenableParams(options.params),\n      reportRequestError,\n      request: options.request,\n      expireSeconds: options.expireSeconds,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      setHeadersAccessPhase,\n    });\n  }\n\n  options.clearRequestContext();\n  return applyRouteHandlerMiddlewareContext(\n    new Response(null, {\n      status: 405,\n    }),\n    options.middlewareContext,\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-route-handler-dispatch.js","names":[],"sources":["../../src/server/app-route-handler-dispatch.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport {\n  getCollectedFetchTags,\n  ensureFetchPatch,\n  setCurrentFetchSoftTags,\n} from \"vinext/shims/fetch-cache\";\nimport {\n  consumeDynamicUsage,\n  getAndClearPendingCookies,\n  getDraftModeCookieHeader,\n  markDynamicUsage,\n  setHeadersAccessPhase,\n} from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { getRequestExecutionContext } from \"vinext/shims/request-context\";\nimport { createRequestContext, runWithRequestContext } from \"vinext/shims/unified-request-context\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport {\n  getAppRouteHandlerRevalidateSeconds,\n  hasAppRouteHandlerDefaultExport,\n  resolveAppRouteHandlerMethod,\n  shouldReadAppRouteHandlerCache,\n  type AppRouteHandlerModule,\n} from \"./app-route-handler-policy.js\";\nimport { readAppRouteHandlerCacheResponse } from \"./app-route-handler-cache.js\";\nimport {\n  executeAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\nimport { isKnownDynamicAppRoute, isValidHTTPMethod } from \"./app-route-handler-runtime.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  type RouteHandlerMiddlewareContext,\n} from \"./app-route-handler-response.js\";\nimport { createStaticGenerationHeadersContext } from \"./app-static-generation.js\";\nimport { buildPageCacheTags } from \"./implicit-tags.js\";\nimport { makeThenableParams } from \"vinext/shims/thenable-params\";\nimport { reportRequestError } from \"./instrumentation.js\";\n\ntype AppRouteHandlerDispatchRoute = {\n  pattern: string;\n  routeHandler: AppRouteHandlerModule;\n  routeSegments: string[];\n};\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerationErrorContext = {\n  routerKind: \"App Router\";\n  routePath: string;\n  routeType: \"route\";\n};\ntype RouteHandlerBackgroundRegenerator = (\n  key: string,\n  renderFn: () => Promise<void>,\n  errorContext?: RouteHandlerBackgroundRegenerationErrorContext,\n) => void;\n\ntype DispatchAppRouteHandlerOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  expireSeconds?: number;\n  i18n?: NextI18nConfig | null;\n  isDevelopment?: boolean;\n  isProduction?: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  middlewareRequestHeaders?: Headers | null;\n  params: AppRouteParams;\n  request: Request;\n  route: AppRouteHandlerDispatchRoute;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  searchParams: URLSearchParams;\n};\n\nfunction isAppRouteHandlerFunction(value: unknown): value is AppRouteHandlerFunction {\n  return typeof value === \"function\";\n}\n\nfunction buildRouteHandlerPageCacheTags(\n  pathname: string,\n  extraTags: string[],\n  routeSegments: string[],\n): string[] {\n  return buildPageCacheTags(pathname, extraTags, routeSegments, \"route\");\n}\n\nasync function runInRouteHandlerRevalidationContext(\n  options: {\n    cleanPathname: string;\n    dynamicConfig?: string;\n    routePattern: string;\n    routeSegments: string[];\n  },\n  renderFn: () => Promise<void>,\n): Promise<void> {\n  const headersContext = createStaticGenerationHeadersContext({\n    dynamicConfig: options.dynamicConfig,\n    routeKind: \"route\",\n    routePattern: options.routePattern,\n  });\n  const requestContext = createRequestContext({\n    headersContext,\n    executionContext: getRequestExecutionContext(),\n    unstableCacheRevalidation: \"foreground\",\n  });\n\n  await runWithRequestContext(requestContext, async () => {\n    ensureFetchPatch();\n    setCurrentFetchSoftTags(\n      buildRouteHandlerPageCacheTags(options.cleanPathname, [], options.routeSegments),\n    );\n    await renderFn();\n  });\n}\n\nexport async function dispatchAppRouteHandler(\n  options: DispatchAppRouteHandlerOptions,\n): Promise<Response> {\n  const { route } = options;\n  const handler = route.routeHandler;\n  const method = options.request.method.toUpperCase();\n  const revalidateSeconds = getAppRouteHandlerRevalidateSeconds(handler);\n  const isDevelopment = options.isDevelopment ?? process.env.NODE_ENV === \"development\";\n  const isProduction = options.isProduction ?? process.env.NODE_ENV === \"production\";\n\n  if (hasAppRouteHandlerDefaultExport(handler) && isDevelopment) {\n    console.error(\n      \"[vinext] Detected default export in route handler \" +\n        route.pattern +\n        \". Export a named export for each HTTP method instead.\",\n    );\n  }\n\n  // Reject non-standard HTTP methods before any auto-OPTIONS/405 logic.\n  // Next.js returns 400 for invalid methods; vinext mirrors that behavior.\n  // https://github.com/vercel/next.js/blob/canary/packages/next/src/server/route-modules/app-route/module.ts#L390-L392\n  if (!isValidHTTPMethod(method)) {\n    options.clearRequestContext();\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, { status: 400 }),\n      options.middlewareContext,\n    );\n  }\n\n  const { allowHeaderForOptions, handlerFn, isAutoHead, shouldAutoRespondToOptions } =\n    resolveAppRouteHandlerMethod(handler, method);\n\n  if (shouldAutoRespondToOptions) {\n    options.clearRequestContext();\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, {\n        status: 204,\n        headers: { Allow: allowHeaderForOptions },\n      }),\n      options.middlewareContext,\n    );\n  }\n\n  const resolvedHandlerFn = isAppRouteHandlerFunction(handlerFn) ? handlerFn : undefined;\n\n  if (\n    revalidateSeconds !== null &&\n    shouldReadAppRouteHandlerCache({\n      dynamicConfig: handler.dynamic,\n      handlerFn: resolvedHandlerFn,\n      isAutoHead,\n      isKnownDynamic: isKnownDynamicAppRoute(route.pattern),\n      isProduction,\n      method,\n      revalidateSeconds,\n    }) &&\n    resolvedHandlerFn\n  ) {\n    const cachedRouteResponse = await readAppRouteHandlerCacheResponse({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      dynamicConfig: handler.dynamic,\n      getCollectedFetchTags,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isrDebug: options.isrDebug,\n      isrGet: options.isrGet,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      middlewareContext: options.middlewareContext,\n      params: options.params,\n      requestUrl: options.request.url,\n      revalidateSearchParams: options.searchParams,\n      expireSeconds: options.expireSeconds,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      runInRevalidationContext(renderFn) {\n        return runInRouteHandlerRevalidationContext(\n          {\n            cleanPathname: options.cleanPathname,\n            dynamicConfig: handler.dynamic,\n            routePattern: route.pattern,\n            routeSegments: route.routeSegments,\n          },\n          renderFn,\n        );\n      },\n      scheduleBackgroundRegeneration(key, renderFn) {\n        options.scheduleBackgroundRegeneration(key, renderFn, {\n          routerKind: \"App Router\",\n          routePath: route.pattern,\n          routeType: \"route\",\n        });\n      },\n      setHeadersAccessPhase,\n      setNavigationContext,\n    });\n    if (cachedRouteResponse) {\n      return cachedRouteResponse;\n    }\n  }\n\n  if (resolvedHandlerFn) {\n    return executeAppRouteHandler({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      executionContext: getRequestExecutionContext(),\n      getAndClearPendingCookies,\n      getCollectedFetchTags,\n      getDraftModeCookieHeader,\n      handler,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isProduction,\n      isrDebug: options.isrDebug,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      method,\n      middlewareContext: options.middlewareContext,\n      middlewareRequestHeaders: options.middlewareRequestHeaders,\n      params: makeThenableParams(options.params),\n      reportRequestError,\n      request: options.request,\n      expireSeconds: options.expireSeconds,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      setHeadersAccessPhase,\n    });\n  }\n\n  options.clearRequestContext();\n  return applyRouteHandlerMiddlewareContext(\n    new Response(null, {\n      status: 405,\n    }),\n    options.middlewareContext,\n  );\n}\n"],"mappings":"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"}