vinext 0.0.49 → 0.0.50

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-request.js","names":[],"sources":["../../src/server/app-page-request.ts"],"sourcesContent":["import type { AppPageSpecialError } from \"./app-page-execution.js\";\nimport { getAppPageSegmentParamName } from \"./app-page-params.js\";\nimport { notFoundResponse } from \"./http-error-responses.js\";\n\ntype AppPageParams = Record<string, string | string[]>;\ntype GenerateStaticParams = (args: { params: AppPageParams }) => unknown;\n\ntype GenerateStaticParamsModule = {\n  generateStaticParams?: GenerateStaticParams | null;\n};\n\ntype GenerateStaticParamsSource = {\n  generateStaticParams: GenerateStaticParams;\n  parentParamNames: readonly string[];\n};\n\nexport type ValidateAppPageDynamicParamsOptions = {\n  clearRequestContext: () => void;\n  enforceStaticParamsOnly: boolean;\n  generateStaticParams?:\n    | GenerateStaticParams\n    | GenerateStaticParamsSource\n    | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[]\n    | null;\n  isDynamicRoute: boolean;\n  params: AppPageParams;\n};\n\ntype ResolveAppPageGenerateStaticParamsSourcesOptions = {\n  layouts?: readonly (GenerateStaticParamsModule | null | undefined)[];\n  layoutTreePositions?: readonly number[];\n  page?: GenerateStaticParamsModule | null;\n  routeSegments: readonly string[];\n};\n\ntype BuildAppPageElementOptions<TElement> = {\n  buildPageElement: () => Promise<TElement>;\n  renderErrorBoundaryPage: (error: unknown) => Promise<Response | null>;\n  renderSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => AppPageSpecialError | null;\n};\n\ntype BuildAppPageElementResult<TElement> = {\n  element: TElement | null;\n  response: Response | null;\n};\n\ntype AppPageInterceptMatch<TPage = unknown> = {\n  matchedParams: AppPageParams;\n  page: TPage;\n  slotKey: string;\n  sourceRouteIndex: number;\n};\n\ntype ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts> = {\n  cleanPathname: string;\n  currentRoute: TRoute;\n  findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;\n};\n\ntype ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> = {\n  interceptOpts: TInterceptOpts;\n  matchedParams: AppPageParams;\n  sourceParams: AppPageParams;\n  sourceRoute: TRoute;\n};\n\ntype AppPageInterceptState<TRoute, TPage> =\n  | { kind: \"none\" }\n  | { kind: \"current-route\"; intercept: AppPageInterceptMatch<TPage> }\n  | { kind: \"source-route\"; intercept: AppPageInterceptMatch<TPage>; sourceRoute: TRoute };\n\ntype ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts> = {\n  cleanPathname: string;\n  currentParams: AppPageParams;\n  currentRoute: TRoute;\n  findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;\n};\n\ntype ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts> = {\n  interceptOpts: TInterceptOpts | undefined;\n  navigationParams: AppPageParams;\n  params: AppPageParams;\n  route: TRoute;\n};\n\ntype ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement> = {\n  buildPageElement: (\n    route: TRoute,\n    params: AppPageParams,\n    interceptOpts: TInterceptOpts | undefined,\n    searchParams: URLSearchParams,\n  ) => Promise<TElement>;\n  cleanPathname: string;\n  currentRoute: TRoute;\n  findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  renderInterceptResponse: (route: TRoute, element: TElement) => Promise<Response> | Response;\n  searchParams: URLSearchParams;\n  setNavigationContext: (context: {\n    params: AppPageParams;\n    pathname: string;\n    searchParams: URLSearchParams;\n  }) => void;\n  toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;\n};\n\ntype ResolveAppPageInterceptResult<TInterceptOpts> = {\n  interceptOpts: TInterceptOpts | undefined;\n  response: Response | null;\n};\n\nfunction pickRouteParams(\n  matchedParams: AppPageParams,\n  routeParamNames: readonly string[],\n): AppPageParams {\n  const params: AppPageParams = {};\n\n  for (const paramName of routeParamNames) {\n    const value = matchedParams[paramName];\n    if (value !== undefined) {\n      params[paramName] = value;\n    }\n  }\n\n  return params;\n}\n\nfunction collectParentParamNames(\n  routeSegments: readonly string[],\n  boundaryPosition: number,\n): string[] {\n  const limit = Math.max(0, Math.min(boundaryPosition, routeSegments.length));\n  const names: string[] = [];\n\n  for (const segment of routeSegments.slice(0, limit)) {\n    const name = getAppPageSegmentParamName(segment);\n    if (name && !names.includes(name)) {\n      names.push(name);\n    }\n  }\n\n  return names;\n}\n\nfunction getLayoutGenerateStaticParamsBoundary(layoutTreePosition: number | undefined): number {\n  // A layout at app/[id]/layout.tsx has tree position 1, but its\n  // generateStaticParams belongs to the [id] segment and receives only parent\n  // params from segments before [id].\n  return (layoutTreePosition ?? 0) - 1;\n}\n\nexport function resolveAppPageGenerateStaticParamsSources(\n  options: ResolveAppPageGenerateStaticParamsSourcesOptions,\n): GenerateStaticParamsSource[] {\n  const sources: GenerateStaticParamsSource[] = [];\n\n  options.layouts?.forEach((layout, index) => {\n    if (typeof layout?.generateStaticParams !== \"function\") return;\n\n    sources.push({\n      generateStaticParams: layout.generateStaticParams,\n      parentParamNames: collectParentParamNames(\n        options.routeSegments,\n        getLayoutGenerateStaticParamsBoundary(options.layoutTreePositions?.[index]),\n      ),\n    });\n  });\n\n  if (typeof options.page?.generateStaticParams === \"function\") {\n    sources.push({\n      generateStaticParams: options.page.generateStaticParams,\n      parentParamNames: collectParentParamNames(\n        options.routeSegments,\n        Math.max(0, options.routeSegments.length - 1),\n      ),\n    });\n  }\n\n  return sources;\n}\n\nfunction areStaticParamsAllowed(\n  params: AppPageParams,\n  staticParams: readonly Record<string, unknown>[],\n): boolean {\n  const paramKeys = Object.keys(params);\n\n  return staticParams.some((staticParamSet) =>\n    paramKeys.every((key) => {\n      const value = params[key];\n      const staticValue = staticParamSet[key];\n\n      // Parent params may not appear in the leaf route's returned set because\n      // Next.js passes them top-down through nested generateStaticParams calls.\n      if (staticValue === undefined) {\n        return true;\n      }\n\n      if (Array.isArray(value)) {\n        return JSON.stringify(value) === JSON.stringify(staticValue);\n      }\n\n      if (\n        typeof staticValue === \"string\" ||\n        typeof staticValue === \"number\" ||\n        typeof staticValue === \"boolean\"\n      ) {\n        return String(value) === String(staticValue);\n      }\n\n      return JSON.stringify(value) === JSON.stringify(staticValue);\n    }),\n  );\n}\n\nfunction normalizeGenerateStaticParams(\n  generateStaticParams: ValidateAppPageDynamicParamsOptions[\"generateStaticParams\"],\n): GenerateStaticParamsSource[] {\n  const sources = Array.isArray(generateStaticParams)\n    ? generateStaticParams\n    : [generateStaticParams];\n\n  return sources.flatMap((source) => {\n    if (typeof source === \"function\") {\n      return [{ generateStaticParams: source, parentParamNames: [] }];\n    }\n\n    if (typeof source?.generateStaticParams === \"function\") {\n      return [source];\n    }\n\n    return [];\n  });\n}\n\nexport async function validateAppPageDynamicParams(\n  options: ValidateAppPageDynamicParamsOptions,\n): Promise<Response | null> {\n  if (!options.enforceStaticParamsOnly || !options.isDynamicRoute) {\n    return null;\n  }\n\n  const generateStaticParamsSources = normalizeGenerateStaticParams(options.generateStaticParams);\n  if (generateStaticParamsSources.length === 0) {\n    options.clearRequestContext();\n    return notFoundResponse();\n  }\n\n  for (const source of generateStaticParamsSources) {\n    const staticParams = await source.generateStaticParams({\n      params: pickRouteParams(options.params, source.parentParamNames),\n    });\n    if (Array.isArray(staticParams) && !areStaticParamsAllowed(options.params, staticParams)) {\n      options.clearRequestContext();\n      return notFoundResponse();\n    }\n  }\n\n  return null;\n}\n\n/**\n * Pure: decides whether the incoming request should re-render an intercepted\n * source-route tree, and if so returns the source route, the source-route's\n * param slice, the full matched param set (the URL params the client sees),\n * and an opaque `interceptOpts` bag for the caller's render pipeline.\n *\n * Returns `null` in three decision-fallthrough cases:\n *   - non-RSC requests (server rendering the direct page for a full HTML load)\n *   - no intercepting route matches the path\n *   - the match's source route IS the current route (the same branch today\n *     returns `interceptOpts` for the direct render)\n *\n * Shared by both the GET path (resolveAppPageIntercept, which layers on\n * `setNavigationContext` + element build + Response wrap) and the server-action\n * POST path (entries/app-rsc-entry.ts), which runs its own response pipeline.\n */\nexport function resolveAppPageInterceptMatch<TRoute, TPage, TInterceptOpts>(\n  options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>,\n): ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> | null {\n  const interceptState = resolveAppPageInterceptState(options);\n  if (interceptState.kind !== \"source-route\") {\n    return null;\n  }\n\n  return {\n    interceptOpts: options.toInterceptOpts(interceptState.intercept),\n    matchedParams: interceptState.intercept.matchedParams,\n    sourceParams: pickRouteParams(\n      interceptState.intercept.matchedParams,\n      options.getRouteParamNames(interceptState.sourceRoute),\n    ),\n    sourceRoute: interceptState.sourceRoute,\n  };\n}\n\nfunction resolveAppPageInterceptState<TRoute, TPage, TInterceptOpts>(\n  options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>,\n): AppPageInterceptState<TRoute, TPage> {\n  if (!options.isRscRequest) {\n    return { kind: \"none\" };\n  }\n\n  const intercept = options.findIntercept(options.cleanPathname);\n  if (!intercept) {\n    return { kind: \"none\" };\n  }\n\n  const sourceRoute = options.getSourceRoute(intercept.sourceRouteIndex);\n  if (!sourceRoute) {\n    return { kind: \"none\" };\n  }\n\n  if (sourceRoute === options.currentRoute) {\n    return { kind: \"current-route\", intercept };\n  }\n\n  return { kind: \"source-route\", intercept, sourceRoute };\n}\n\nexport function resolveAppPageActionRerenderTarget<TRoute, TPage, TInterceptOpts>(\n  options: ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>,\n): ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts> {\n  const interceptState = resolveAppPageInterceptState({\n    cleanPathname: options.cleanPathname,\n    currentRoute: options.currentRoute,\n    findIntercept: options.findIntercept,\n    getRouteParamNames: options.getRouteParamNames,\n    getSourceRoute: options.getSourceRoute,\n    isRscRequest: options.isRscRequest,\n    toInterceptOpts: options.toInterceptOpts,\n  });\n\n  if (interceptState.kind === \"source-route\") {\n    return {\n      interceptOpts: options.toInterceptOpts(interceptState.intercept),\n      navigationParams: interceptState.intercept.matchedParams,\n      params: pickRouteParams(\n        interceptState.intercept.matchedParams,\n        options.getRouteParamNames(interceptState.sourceRoute),\n      ),\n      route: interceptState.sourceRoute,\n    };\n  }\n\n  return {\n    interceptOpts:\n      interceptState.kind === \"current-route\"\n        ? options.toInterceptOpts(interceptState.intercept)\n        : undefined,\n    navigationParams: options.currentParams,\n    params: options.currentParams,\n    route: options.currentRoute,\n  };\n}\n\nexport async function resolveAppPageIntercept<TRoute, TPage, TInterceptOpts, TElement>(\n  options: ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement>,\n): Promise<ResolveAppPageInterceptResult<TInterceptOpts>> {\n  const interceptState = resolveAppPageInterceptState({\n    cleanPathname: options.cleanPathname,\n    currentRoute: options.currentRoute,\n    findIntercept: options.findIntercept,\n    getRouteParamNames: options.getRouteParamNames,\n    getSourceRoute: options.getSourceRoute,\n    isRscRequest: options.isRscRequest,\n    toInterceptOpts: options.toInterceptOpts,\n  });\n\n  if (interceptState.kind === \"source-route\") {\n    options.setNavigationContext({\n      params: interceptState.intercept.matchedParams,\n      pathname: options.cleanPathname,\n      searchParams: options.searchParams,\n    });\n    const interceptElement = await options.buildPageElement(\n      interceptState.sourceRoute,\n      pickRouteParams(\n        interceptState.intercept.matchedParams,\n        options.getRouteParamNames(interceptState.sourceRoute),\n      ),\n      options.toInterceptOpts(interceptState.intercept),\n      options.searchParams,\n    );\n\n    return {\n      interceptOpts: undefined,\n      response: await options.renderInterceptResponse(interceptState.sourceRoute, interceptElement),\n    };\n  }\n\n  // Reproduce the current-route-is-source branch where we still need the opts\n  // bag even though we did not render a separate intercepted response.\n  return {\n    interceptOpts:\n      interceptState.kind === \"current-route\"\n        ? options.toInterceptOpts(interceptState.intercept)\n        : undefined,\n    response: null,\n  };\n}\n\nexport async function buildAppPageElement<TElement>(\n  options: BuildAppPageElementOptions<TElement>,\n): Promise<BuildAppPageElementResult<TElement>> {\n  try {\n    return {\n      element: await options.buildPageElement(),\n      response: null,\n    };\n  } catch (error) {\n    const specialError = options.resolveSpecialError(error);\n    if (specialError) {\n      return {\n        element: null,\n        response: await options.renderSpecialError(specialError),\n      };\n    }\n\n    const errorBoundaryResponse = await options.renderErrorBoundaryPage(error);\n    if (errorBoundaryResponse) {\n      return {\n        element: null,\n        response: errorBoundaryResponse,\n      };\n    }\n\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-request.js","names":[],"sources":["../../src/server/app-page-request.ts"],"sourcesContent":["import type { AppPageSpecialError } from \"./app-page-execution.js\";\nimport { runWithFetchDedupe } from \"vinext/shims/fetch-cache\";\nimport { getAppPageSegmentParamName } from \"./app-page-params.js\";\nimport { notFoundResponse } from \"./http-error-responses.js\";\n\ntype AppPageParams = Record<string, string | string[]>;\ntype GenerateStaticParams = (args: { params: AppPageParams }) => unknown;\n\ntype GenerateStaticParamsModule = {\n  generateStaticParams?: GenerateStaticParams | null;\n};\n\ntype GenerateStaticParamsSource = {\n  generateStaticParams: GenerateStaticParams;\n  parentParamNames: readonly string[];\n};\n\nexport type ValidateAppPageDynamicParamsOptions = {\n  clearRequestContext: () => void;\n  enforceStaticParamsOnly: boolean;\n  generateStaticParams?:\n    | GenerateStaticParams\n    | GenerateStaticParamsSource\n    | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[]\n    | null;\n  isDynamicRoute: boolean;\n  params: AppPageParams;\n};\n\ntype ResolveAppPageGenerateStaticParamsSourcesOptions = {\n  layouts?: readonly (GenerateStaticParamsModule | null | undefined)[];\n  layoutTreePositions?: readonly number[];\n  page?: GenerateStaticParamsModule | null;\n  routeSegments: readonly string[];\n};\n\ntype BuildAppPageElementOptions<TElement> = {\n  buildPageElement: () => Promise<TElement>;\n  renderErrorBoundaryPage: (error: unknown) => Promise<Response | null>;\n  renderSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => AppPageSpecialError | null;\n};\n\ntype BuildAppPageElementResult<TElement> = {\n  element: TElement | null;\n  response: Response | null;\n};\n\ntype AppPageInterceptMatch<TPage = unknown> = {\n  matchedParams: AppPageParams;\n  page: TPage;\n  slotKey: string;\n  sourceRouteIndex: number;\n};\n\ntype ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts> = {\n  cleanPathname: string;\n  currentRoute: TRoute;\n  findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;\n};\n\ntype ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> = {\n  interceptOpts: TInterceptOpts;\n  matchedParams: AppPageParams;\n  sourceParams: AppPageParams;\n  sourceRoute: TRoute;\n};\n\ntype AppPageInterceptState<TRoute, TPage> =\n  | { kind: \"none\" }\n  | { kind: \"current-route\"; intercept: AppPageInterceptMatch<TPage> }\n  | { kind: \"source-route\"; intercept: AppPageInterceptMatch<TPage>; sourceRoute: TRoute };\n\ntype ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts> = {\n  cleanPathname: string;\n  currentParams: AppPageParams;\n  currentRoute: TRoute;\n  findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;\n};\n\ntype ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts> = {\n  interceptOpts: TInterceptOpts | undefined;\n  navigationParams: AppPageParams;\n  params: AppPageParams;\n  route: TRoute;\n};\n\ntype ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement> = {\n  buildPageElement: (\n    route: TRoute,\n    params: AppPageParams,\n    interceptOpts: TInterceptOpts | undefined,\n    searchParams: URLSearchParams,\n  ) => Promise<TElement>;\n  cleanPathname: string;\n  currentRoute: TRoute;\n  findIntercept: (pathname: string) => AppPageInterceptMatch<TPage> | null;\n  getRouteParamNames: (route: TRoute) => readonly string[];\n  getSourceRoute: (sourceRouteIndex: number) => TRoute | undefined;\n  isRscRequest: boolean;\n  renderInterceptResponse: (route: TRoute, element: TElement) => Promise<Response> | Response;\n  searchParams: URLSearchParams;\n  setNavigationContext: (context: {\n    params: AppPageParams;\n    pathname: string;\n    searchParams: URLSearchParams;\n  }) => void;\n  toInterceptOpts: (intercept: AppPageInterceptMatch<TPage>) => TInterceptOpts;\n};\n\ntype ResolveAppPageInterceptResult<TInterceptOpts> = {\n  interceptOpts: TInterceptOpts | undefined;\n  response: Response | null;\n};\n\nfunction pickRouteParams(\n  matchedParams: AppPageParams,\n  routeParamNames: readonly string[],\n): AppPageParams {\n  const params: AppPageParams = {};\n\n  for (const paramName of routeParamNames) {\n    const value = matchedParams[paramName];\n    if (value !== undefined) {\n      params[paramName] = value;\n    }\n  }\n\n  return params;\n}\n\nfunction collectParentParamNames(\n  routeSegments: readonly string[],\n  boundaryPosition: number,\n): string[] {\n  const limit = Math.max(0, Math.min(boundaryPosition, routeSegments.length));\n  const names: string[] = [];\n\n  for (const segment of routeSegments.slice(0, limit)) {\n    const name = getAppPageSegmentParamName(segment);\n    if (name && !names.includes(name)) {\n      names.push(name);\n    }\n  }\n\n  return names;\n}\n\nfunction getLayoutGenerateStaticParamsBoundary(layoutTreePosition: number | undefined): number {\n  // A layout at app/[id]/layout.tsx has tree position 1, but its\n  // generateStaticParams belongs to the [id] segment and receives only parent\n  // params from segments before [id].\n  return (layoutTreePosition ?? 0) - 1;\n}\n\nexport function resolveAppPageGenerateStaticParamsSources(\n  options: ResolveAppPageGenerateStaticParamsSourcesOptions,\n): GenerateStaticParamsSource[] {\n  const sources: GenerateStaticParamsSource[] = [];\n\n  options.layouts?.forEach((layout, index) => {\n    if (typeof layout?.generateStaticParams !== \"function\") return;\n\n    sources.push({\n      generateStaticParams: layout.generateStaticParams,\n      parentParamNames: collectParentParamNames(\n        options.routeSegments,\n        getLayoutGenerateStaticParamsBoundary(options.layoutTreePositions?.[index]),\n      ),\n    });\n  });\n\n  if (typeof options.page?.generateStaticParams === \"function\") {\n    sources.push({\n      generateStaticParams: options.page.generateStaticParams,\n      parentParamNames: collectParentParamNames(\n        options.routeSegments,\n        Math.max(0, options.routeSegments.length - 1),\n      ),\n    });\n  }\n\n  return sources;\n}\n\nfunction areStaticParamsAllowed(\n  params: AppPageParams,\n  staticParams: readonly Record<string, unknown>[],\n): boolean {\n  const paramKeys = Object.keys(params);\n\n  return staticParams.some((staticParamSet) =>\n    paramKeys.every((key) => {\n      const value = params[key];\n      const staticValue = staticParamSet[key];\n\n      // Parent params may not appear in the leaf route's returned set because\n      // Next.js passes them top-down through nested generateStaticParams calls.\n      if (staticValue === undefined) {\n        return true;\n      }\n\n      if (Array.isArray(value)) {\n        return JSON.stringify(value) === JSON.stringify(staticValue);\n      }\n\n      if (\n        typeof staticValue === \"string\" ||\n        typeof staticValue === \"number\" ||\n        typeof staticValue === \"boolean\"\n      ) {\n        return String(value) === String(staticValue);\n      }\n\n      return JSON.stringify(value) === JSON.stringify(staticValue);\n    }),\n  );\n}\n\nfunction normalizeGenerateStaticParams(\n  generateStaticParams: ValidateAppPageDynamicParamsOptions[\"generateStaticParams\"],\n): GenerateStaticParamsSource[] {\n  const sources = Array.isArray(generateStaticParams)\n    ? generateStaticParams\n    : [generateStaticParams];\n\n  return sources.flatMap((source) => {\n    if (typeof source === \"function\") {\n      return [{ generateStaticParams: source, parentParamNames: [] }];\n    }\n\n    if (typeof source?.generateStaticParams === \"function\") {\n      return [source];\n    }\n\n    return [];\n  });\n}\n\nexport async function validateAppPageDynamicParams(\n  options: ValidateAppPageDynamicParamsOptions,\n): Promise<Response | null> {\n  if (!options.enforceStaticParamsOnly || !options.isDynamicRoute) {\n    return null;\n  }\n\n  const generateStaticParamsSources = normalizeGenerateStaticParams(options.generateStaticParams);\n  if (generateStaticParamsSources.length === 0) {\n    options.clearRequestContext();\n    return notFoundResponse();\n  }\n\n  for (const source of generateStaticParamsSources) {\n    const staticParams = await runWithFetchDedupe(() =>\n      source.generateStaticParams({\n        params: pickRouteParams(options.params, source.parentParamNames),\n      }),\n    );\n    if (Array.isArray(staticParams) && !areStaticParamsAllowed(options.params, staticParams)) {\n      options.clearRequestContext();\n      return notFoundResponse();\n    }\n  }\n\n  return null;\n}\n\n/**\n * Pure: decides whether the incoming request should re-render an intercepted\n * source-route tree, and if so returns the source route, the source-route's\n * param slice, the full matched param set (the URL params the client sees),\n * and an opaque `interceptOpts` bag for the caller's render pipeline.\n *\n * Returns `null` in three decision-fallthrough cases:\n *   - non-RSC requests (server rendering the direct page for a full HTML load)\n *   - no intercepting route matches the path\n *   - the match's source route IS the current route (the same branch today\n *     returns `interceptOpts` for the direct render)\n *\n * Shared by both the GET path (resolveAppPageIntercept, which layers on\n * `setNavigationContext` + element build + Response wrap) and the server-action\n * POST path (entries/app-rsc-entry.ts), which runs its own response pipeline.\n */\nexport function resolveAppPageInterceptMatch<TRoute, TPage, TInterceptOpts>(\n  options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>,\n): ResolveAppPageInterceptMatchResult<TRoute, TInterceptOpts> | null {\n  const interceptState = resolveAppPageInterceptState(options);\n  if (interceptState.kind !== \"source-route\") {\n    return null;\n  }\n\n  return {\n    interceptOpts: options.toInterceptOpts(interceptState.intercept),\n    matchedParams: interceptState.intercept.matchedParams,\n    sourceParams: pickRouteParams(\n      interceptState.intercept.matchedParams,\n      options.getRouteParamNames(interceptState.sourceRoute),\n    ),\n    sourceRoute: interceptState.sourceRoute,\n  };\n}\n\nfunction resolveAppPageInterceptState<TRoute, TPage, TInterceptOpts>(\n  options: ResolveAppPageInterceptMatchOptions<TRoute, TPage, TInterceptOpts>,\n): AppPageInterceptState<TRoute, TPage> {\n  if (!options.isRscRequest) {\n    return { kind: \"none\" };\n  }\n\n  const intercept = options.findIntercept(options.cleanPathname);\n  if (!intercept) {\n    return { kind: \"none\" };\n  }\n\n  const sourceRoute = options.getSourceRoute(intercept.sourceRouteIndex);\n  if (!sourceRoute) {\n    return { kind: \"none\" };\n  }\n\n  if (sourceRoute === options.currentRoute) {\n    return { kind: \"current-route\", intercept };\n  }\n\n  return { kind: \"source-route\", intercept, sourceRoute };\n}\n\nexport function resolveAppPageActionRerenderTarget<TRoute, TPage, TInterceptOpts>(\n  options: ResolveAppPageActionRerenderTargetOptions<TRoute, TPage, TInterceptOpts>,\n): ResolveAppPageActionRerenderTargetResult<TRoute, TInterceptOpts> {\n  const interceptState = resolveAppPageInterceptState({\n    cleanPathname: options.cleanPathname,\n    currentRoute: options.currentRoute,\n    findIntercept: options.findIntercept,\n    getRouteParamNames: options.getRouteParamNames,\n    getSourceRoute: options.getSourceRoute,\n    isRscRequest: options.isRscRequest,\n    toInterceptOpts: options.toInterceptOpts,\n  });\n\n  if (interceptState.kind === \"source-route\") {\n    return {\n      interceptOpts: options.toInterceptOpts(interceptState.intercept),\n      navigationParams: interceptState.intercept.matchedParams,\n      params: pickRouteParams(\n        interceptState.intercept.matchedParams,\n        options.getRouteParamNames(interceptState.sourceRoute),\n      ),\n      route: interceptState.sourceRoute,\n    };\n  }\n\n  return {\n    interceptOpts:\n      interceptState.kind === \"current-route\"\n        ? options.toInterceptOpts(interceptState.intercept)\n        : undefined,\n    navigationParams: options.currentParams,\n    params: options.currentParams,\n    route: options.currentRoute,\n  };\n}\n\nexport async function resolveAppPageIntercept<TRoute, TPage, TInterceptOpts, TElement>(\n  options: ResolveAppPageInterceptOptions<TRoute, TPage, TInterceptOpts, TElement>,\n): Promise<ResolveAppPageInterceptResult<TInterceptOpts>> {\n  const interceptState = resolveAppPageInterceptState({\n    cleanPathname: options.cleanPathname,\n    currentRoute: options.currentRoute,\n    findIntercept: options.findIntercept,\n    getRouteParamNames: options.getRouteParamNames,\n    getSourceRoute: options.getSourceRoute,\n    isRscRequest: options.isRscRequest,\n    toInterceptOpts: options.toInterceptOpts,\n  });\n\n  if (interceptState.kind === \"source-route\") {\n    options.setNavigationContext({\n      params: interceptState.intercept.matchedParams,\n      pathname: options.cleanPathname,\n      searchParams: options.searchParams,\n    });\n    const interceptElement = await options.buildPageElement(\n      interceptState.sourceRoute,\n      pickRouteParams(\n        interceptState.intercept.matchedParams,\n        options.getRouteParamNames(interceptState.sourceRoute),\n      ),\n      options.toInterceptOpts(interceptState.intercept),\n      options.searchParams,\n    );\n\n    return {\n      interceptOpts: undefined,\n      response: await options.renderInterceptResponse(interceptState.sourceRoute, interceptElement),\n    };\n  }\n\n  // Reproduce the current-route-is-source branch where we still need the opts\n  // bag even though we did not render a separate intercepted response.\n  return {\n    interceptOpts:\n      interceptState.kind === \"current-route\"\n        ? options.toInterceptOpts(interceptState.intercept)\n        : undefined,\n    response: null,\n  };\n}\n\nexport async function buildAppPageElement<TElement>(\n  options: BuildAppPageElementOptions<TElement>,\n): Promise<BuildAppPageElementResult<TElement>> {\n  try {\n    return {\n      element: await options.buildPageElement(),\n      response: null,\n    };\n  } catch (error) {\n    const specialError = options.resolveSpecialError(error);\n    if (specialError) {\n      return {\n        element: null,\n        response: await options.renderSpecialError(specialError),\n      };\n    }\n\n    const errorBoundaryResponse = await options.renderErrorBoundaryPage(error);\n    if (errorBoundaryResponse) {\n      return {\n        element: null,\n        response: errorBoundaryResponse,\n      };\n    }\n\n    throw error;\n  }\n}\n"],"mappings":"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"}

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

@@ -16,6 +16,7 @@ type AppPageResponsePolicy = {
   cacheState?: "MISS" | "STATIC";
 };
 type ResolveAppPageResponsePolicyBaseOptions = {
+  isDraftMode: boolean;
   isDynamicError: boolean;
   isForceDynamic: boolean;
   isForceStatic: boolean;
@@ -28,6 +29,7 @@ type ResolveAppPageRscResponsePolicyOptions = {
 } & ResolveAppPageResponsePolicyBaseOptions;
 type ResolveAppPageHtmlResponsePolicyOptions = {
   dynamicUsedDuringRender: boolean;
+  isProgressiveActionRender?: boolean;
   hasScriptNonce: boolean;
 } & ResolveAppPageResponsePolicyBaseOptions;
 type AppPageHtmlResponsePolicy = {

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

@@ -1,3 +1,4 @@
+import { VINEXT_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
@@ -7,9 +8,10 @@ function applyTimingHeader(headers, timing) {
 	const handlerStart = Math.round(timing.handlerStart);
 	const compileMs = timing.compileEnd !== void 0 ? Math.round(timing.compileEnd - timing.handlerStart) : -1;
 	const renderMs = timing.responseKind === "html" && timing.renderEnd !== void 0 && timing.compileEnd !== void 0 ? Math.round(timing.renderEnd - timing.compileEnd) : -1;
-	headers.set("x-vinext-timing", `${handlerStart},${compileMs},${renderMs}`);
+	headers.set(VINEXT_TIMING_HEADER, `${handlerStart},${compileMs},${renderMs}`);
 }
 function resolveAppPageRscResponsePolicy(options) {
+	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.revalidateSeconds === 0) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds || options.revalidateSeconds === Infinity) return {
@@ -23,6 +25,10 @@ function resolveAppPageRscResponsePolicy(options) {
 	return {};
 }
 function resolveAppPageHtmlResponsePolicy(options) {
+	if (options.isDraftMode) return {
+		cacheControl: NO_STORE_CACHE_CONTROL,
+		shouldWriteToCache: false
+	};
 	if (options.isForceDynamic) return {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		shouldWriteToCache: false
@@ -31,6 +37,10 @@ function resolveAppPageHtmlResponsePolicy(options) {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		shouldWriteToCache: false
 	};
+	if (options.isProgressiveActionRender) return {
+		cacheControl: NO_STORE_CACHE_CONTROL,
+		shouldWriteToCache: false
+	};
 	if (options.revalidateSeconds === 0) return {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		shouldWriteToCache: false
@@ -61,10 +71,10 @@ function buildAppPageRscResponse(body, options) {
 		"Content-Type": "text/x-component; charset=utf-8",
 		Vary: VINEXT_RSC_VARY_HEADER
 	});
-	if (options.params && Object.keys(options.params).length > 0) headers.set("X-Vinext-Params", encodeURIComponent(JSON.stringify(options.params)));
-	if (options.mountedSlotsHeader) headers.set("X-Vinext-Mounted-Slots", options.mountedSlotsHeader);
+	if (options.params && Object.keys(options.params).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(options.params)));
+	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
-	if (options.policy.cacheState) headers.set("X-Vinext-Cache", options.policy.cacheState);
+	if (options.policy.cacheState) headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
@@ -78,7 +88,7 @@ function buildAppPageHtmlResponse(body, options) {
 		Vary: VINEXT_RSC_VARY_HEADER
 	});
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
-	if (options.policy.cacheState) headers.set("X-Vinext-Cache", options.policy.cacheState);
+	if (options.policy.cacheState) headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);
 	if (options.draftCookie) headers.append("Set-Cookie", options.draftCookie);
 	if (options.fontLinkHeader) headers.set("Link", options.fontLinkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-response.js","names":[],"sources":["../../src/server/app-page-response.ts"],"sourcesContent":["import {\n  buildRevalidateCacheControl,\n  NO_STORE_CACHE_CONTROL,\n  STATIC_CACHE_CONTROL,\n} from \"./cache-control.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\n\nexport type AppPageMiddlewareContext = {\n  headers: Headers | null;\n  status: number | null;\n};\n\nexport type AppPageResponseTiming = {\n  compileEnd?: number;\n  handlerStart: number;\n  renderEnd?: number;\n  responseKind: \"html\" | \"rsc\";\n};\n\ntype AppPageResponsePolicy = {\n  cacheControl?: string;\n  cacheState?: \"MISS\" | \"STATIC\";\n};\n\ntype ResolveAppPageResponsePolicyBaseOptions = {\n  isDynamicError: boolean;\n  isForceDynamic: boolean;\n  isForceStatic: boolean;\n  isProduction: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n};\n\ntype ResolveAppPageRscResponsePolicyOptions = {\n  dynamicUsedDuringBuild: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype ResolveAppPageHtmlResponsePolicyOptions = {\n  dynamicUsedDuringRender: boolean;\n  hasScriptNonce: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype AppPageHtmlResponsePolicy = {\n  shouldWriteToCache: boolean;\n} & AppPageResponsePolicy;\n\ntype BuildAppPageRscResponseOptions = {\n  middlewareContext: AppPageMiddlewareContext;\n  mountedSlotsHeader?: string | null;\n  params?: Record<string, unknown>;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\ntype BuildAppPageHtmlResponseOptions = {\n  draftCookie?: string | null;\n  fontLinkHeader?: string;\n  middlewareContext: AppPageMiddlewareContext;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\nfunction applyTimingHeader(headers: Headers, timing?: AppPageResponseTiming): void {\n  if (!timing) {\n    return;\n  }\n\n  const handlerStart = Math.round(timing.handlerStart);\n  const compileMs =\n    timing.compileEnd !== undefined ? Math.round(timing.compileEnd - timing.handlerStart) : -1;\n  const renderMs =\n    timing.responseKind === \"html\" &&\n    timing.renderEnd !== undefined &&\n    timing.compileEnd !== undefined\n      ? Math.round(timing.renderEnd - timing.compileEnd)\n      : -1;\n\n  headers.set(\"x-vinext-timing\", `${handlerStart},${compileMs},${renderMs}`);\n}\n\nexport function resolveAppPageRscResponsePolicy(\n  options: ResolveAppPageRscResponsePolicyOptions,\n): AppPageResponsePolicy {\n  if (options.isForceDynamic || options.dynamicUsedDuringBuild) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which uses !revalidateSeconds\n  // and would incorrectly catch 0 as a falsy value.\n  if (options.revalidateSeconds === 0) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  if (\n    ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds) ||\n    options.revalidateSeconds === Infinity\n  ) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n    };\n  }\n\n  if (options.revalidateSeconds) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      // Emit MISS as part of the initial RSC response shape rather than bolting\n      // it on later in the cache-write block so response construction stays\n      // centralized in this helper. This matches the eventual write path: the\n      // first ISR-eligible production response is a cache miss.\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n    };\n  }\n\n  return {};\n}\n\nexport function resolveAppPageHtmlResponsePolicy(\n  options: ResolveAppPageHtmlResponsePolicyOptions,\n): AppPageHtmlResponsePolicy {\n  if (options.isForceDynamic) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.hasScriptNonce) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which matches revalidateSeconds\n  // === 0 and would incorrectly return a static Cache-Control.\n  if (options.revalidateSeconds === 0) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if ((options.isForceStatic || options.isDynamicError) && options.revalidateSeconds === null) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.dynamicUsedDuringRender) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.revalidateSeconds !== Infinity\n  ) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n      shouldWriteToCache: options.isProduction,\n    };\n  }\n\n  if (options.revalidateSeconds === Infinity) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  return { shouldWriteToCache: false };\n}\n\nexport { mergeMiddlewareResponseHeaders };\n\nexport function buildAppPageRscResponse(\n  body: ReadableStream,\n  options: BuildAppPageRscResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/x-component; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.params && Object.keys(options.params).length > 0) {\n    // encodeURIComponent so non-ASCII params (e.g. Korean slugs) survive the\n    // HTTP ByteString constraint — Headers.set() rejects chars above U+00FF.\n    headers.set(\"X-Vinext-Params\", encodeURIComponent(JSON.stringify(options.params)));\n  }\n  if (options.mountedSlotsHeader) {\n    headers.set(\"X-Vinext-Mounted-Slots\", options.mountedSlotsHeader);\n  }\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(\"X-Vinext-Cache\", options.policy.cacheState);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n\nexport function buildAppPageHtmlResponse(\n  body: ReadableStream,\n  options: BuildAppPageHtmlResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/html; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(\"X-Vinext-Cache\", options.policy.cacheState);\n  }\n  if (options.draftCookie) {\n    headers.append(\"Set-Cookie\", options.draftCookie);\n  }\n  if (options.fontLinkHeader) {\n    headers.set(\"Link\", options.fontLinkHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-response.js","names":[],"sources":["../../src/server/app-page-response.ts"],"sourcesContent":["import {\n  buildRevalidateCacheControl,\n  NO_STORE_CACHE_CONTROL,\n  STATIC_CACHE_CONTROL,\n} from \"./cache-control.js\";\nimport {\n  VINEXT_CACHE_HEADER,\n  VINEXT_MOUNTED_SLOTS_HEADER,\n  VINEXT_PARAMS_HEADER,\n  VINEXT_TIMING_HEADER,\n} from \"./headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\n\nexport type AppPageMiddlewareContext = {\n  headers: Headers | null;\n  status: number | null;\n};\n\nexport type AppPageResponseTiming = {\n  compileEnd?: number;\n  handlerStart: number;\n  renderEnd?: number;\n  responseKind: \"html\" | \"rsc\";\n};\n\ntype AppPageResponsePolicy = {\n  cacheControl?: string;\n  cacheState?: \"MISS\" | \"STATIC\";\n};\n\ntype ResolveAppPageResponsePolicyBaseOptions = {\n  isDraftMode: boolean;\n  isDynamicError: boolean;\n  isForceDynamic: boolean;\n  isForceStatic: boolean;\n  isProduction: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n};\n\ntype ResolveAppPageRscResponsePolicyOptions = {\n  dynamicUsedDuringBuild: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype ResolveAppPageHtmlResponsePolicyOptions = {\n  dynamicUsedDuringRender: boolean;\n  isProgressiveActionRender?: boolean;\n  hasScriptNonce: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype AppPageHtmlResponsePolicy = {\n  shouldWriteToCache: boolean;\n} & AppPageResponsePolicy;\n\ntype BuildAppPageRscResponseOptions = {\n  middlewareContext: AppPageMiddlewareContext;\n  mountedSlotsHeader?: string | null;\n  params?: Record<string, unknown>;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\ntype BuildAppPageHtmlResponseOptions = {\n  draftCookie?: string | null;\n  fontLinkHeader?: string;\n  middlewareContext: AppPageMiddlewareContext;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\nfunction applyTimingHeader(headers: Headers, timing?: AppPageResponseTiming): void {\n  if (!timing) {\n    return;\n  }\n\n  const handlerStart = Math.round(timing.handlerStart);\n  const compileMs =\n    timing.compileEnd !== undefined ? Math.round(timing.compileEnd - timing.handlerStart) : -1;\n  const renderMs =\n    timing.responseKind === \"html\" &&\n    timing.renderEnd !== undefined &&\n    timing.compileEnd !== undefined\n      ? Math.round(timing.renderEnd - timing.compileEnd)\n      : -1;\n\n  headers.set(VINEXT_TIMING_HEADER, `${handlerStart},${compileMs},${renderMs}`);\n}\n\nexport function resolveAppPageRscResponsePolicy(\n  options: ResolveAppPageRscResponsePolicyOptions,\n): AppPageResponsePolicy {\n  if (options.isDraftMode) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  if (options.isForceDynamic || options.dynamicUsedDuringBuild) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which uses !revalidateSeconds\n  // and would incorrectly catch 0 as a falsy value.\n  if (options.revalidateSeconds === 0) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  if (\n    ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds) ||\n    options.revalidateSeconds === Infinity\n  ) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n    };\n  }\n\n  if (options.revalidateSeconds) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      // Emit MISS as part of the initial RSC response shape rather than bolting\n      // it on later in the cache-write block so response construction stays\n      // centralized in this helper. This matches the eventual write path: the\n      // first ISR-eligible production response is a cache miss.\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n    };\n  }\n\n  return {};\n}\n\nexport function resolveAppPageHtmlResponsePolicy(\n  options: ResolveAppPageHtmlResponsePolicyOptions,\n): AppPageHtmlResponsePolicy {\n  if (options.isDraftMode) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.isForceDynamic) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.hasScriptNonce) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.isProgressiveActionRender) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which matches revalidateSeconds\n  // === 0 and would incorrectly return a static Cache-Control.\n  if (options.revalidateSeconds === 0) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if ((options.isForceStatic || options.isDynamicError) && options.revalidateSeconds === null) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.dynamicUsedDuringRender) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.revalidateSeconds !== Infinity\n  ) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n      shouldWriteToCache: options.isProduction,\n    };\n  }\n\n  if (options.revalidateSeconds === Infinity) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  return { shouldWriteToCache: false };\n}\n\nexport { mergeMiddlewareResponseHeaders };\n\nexport function buildAppPageRscResponse(\n  body: ReadableStream,\n  options: BuildAppPageRscResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/x-component; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.params && Object.keys(options.params).length > 0) {\n    // encodeURIComponent so non-ASCII params (e.g. Korean slugs) survive the\n    // HTTP ByteString constraint — Headers.set() rejects chars above U+00FF.\n    headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(options.params)));\n  }\n  if (options.mountedSlotsHeader) {\n    headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);\n  }\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n\nexport function buildAppPageHtmlResponse(\n  body: ReadableStream,\n  options: BuildAppPageHtmlResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/html; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);\n  }\n  if (options.draftCookie) {\n    headers.append(\"Set-Cookie\", options.draftCookie);\n  }\n  if (options.fontLinkHeader) {\n    headers.set(\"Link\", options.fontLinkHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n"],"mappings":"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"}

package/dist/server/app-page-route-wiring.d.ts

@@ -1,7 +1,9 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
 import { AppElements } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
+import { resolveAppPageChildSegments } from "./app-page-segment-state.js";
 import { ComponentType, ReactNode } from "react";
 
 //#region src/server/app-page-route-wiring.d.ts
@@ -44,7 +46,9 @@ type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErro
 type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   ids?: AppRouteSemanticIds | null;
   error?: TErrorModule | null;
+  errorPaths?: readonly TErrorModule[] | null;
   errors?: readonly (TErrorModule | null | undefined)[] | null;
+  errorTreePositions?: readonly number[] | null;
   layoutTreePositions?: readonly number[] | null;
   layouts: readonly (TModule | null | undefined)[];
   loading?: TModule | null;
@@ -100,14 +104,14 @@ type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule,
   interceptionContext?: string | null;
   isRscRequest?: boolean;
   mountedSlotIds?: ReadonlySet<string> | null;
+  renderMode?: AppRscRenderMode;
   routePath: string;
 };
 declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
-declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
+declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "errorTreePositions" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
   forbiddens?: readonly (TModule | null | undefined)[] | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
-declare function resolveAppPageChildSegments(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string[];
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
 export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, resolveAppPageChildSegments };

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

@@ -1,11 +1,13 @@
+import { shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
+import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
 import { Children as Children$1, ParallelSlot, Slot } from "../shims/slot.js";
 import { createAppRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier } from "./app-render-dependency.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
+import { resolveAppPageChildSegments, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey } from "./app-page-segment-state.js";
 import { Suspense } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-page-route-wiring.tsx
@@ -25,7 +27,7 @@ function createAppPageLayoutEntries(route) {
 		const treePosition = route.layoutTreePositions?.[index] ?? 0;
 		const treePath = createAppPageTreePath(route.routeSegments, treePosition);
 		return {
-			errorModule: route.errors?.[index] ?? null,
+			errorModule: route.errorTreePositions ? null : route.errors?.[index] ?? null,
 			forbiddenModule: route.forbiddens?.[index] ?? null,
 			id: AppElementsWire.encodeLayoutId(treePath),
 			layoutModule,
@@ -48,40 +50,16 @@ function createAppPageTemplateEntries(route) {
 		};
 	});
 }
-function resolveAppPageChildSegments(routeSegments, treePosition, params) {
-	const rawSegments = routeSegments.slice(treePosition);
-	const resolvedSegments = [];
-	for (const segment of rawSegments) {
-		if (segment.startsWith("[[...") && segment.endsWith("]]") && segment.length > 7) {
-			const paramValue = params[segment.slice(5, -2)];
-			if (Array.isArray(paramValue) && paramValue.length === 0) continue;
-			if (paramValue === void 0) continue;
-			resolvedSegments.push(Array.isArray(paramValue) ? paramValue.join("/") : paramValue);
-			continue;
-		}
-		if (segment.startsWith("[...") && segment.endsWith("]")) {
-			const paramValue = params[segment.slice(4, -1)];
-			if (Array.isArray(paramValue)) {
-				resolvedSegments.push(paramValue.join("/"));
-				continue;
-			}
-			resolvedSegments.push(paramValue ?? segment);
-			continue;
-		}
-		if (segment.startsWith("[") && segment.endsWith("]") && !segment.includes(".")) {
-			const paramValue = params[segment.slice(1, -1)];
-			resolvedSegments.push(Array.isArray(paramValue) ? paramValue.join("/") : paramValue ?? segment);
-			continue;
-		}
-		resolvedSegments.push(segment);
-	}
-	return resolvedSegments;
-}
-function resolveAppPageVisibleSegments(routeSegments, params) {
-	return resolveAppPageChildSegments(routeSegments, 0, params).filter((segment) => !(segment.startsWith("(") && segment.endsWith(")")));
-}
-function resolveAppPageTemplateKey(routeSegments, treePosition, params) {
-	return resolveAppPageVisibleSegments(routeSegments.slice(treePosition), params)[0] ?? "";
+function createAppPageErrorEntries(route) {
+	return (route.errorPaths ?? route.errors ?? []).flatMap((errorModule, index) => {
+		if (!errorModule) return [];
+		const treePosition = route.errorTreePositions?.[index];
+		if (treePosition === void 0) return [];
+		return [{
+			errorModule,
+			treePosition
+		}];
+	});
 }
 function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, getEffectiveSlotParams) {
 	const parallelSlots = {};
@@ -107,14 +85,19 @@ function createAppPageRouteHead(metadata, viewport) {
 }
 function buildAppPageElements(options) {
 	const interceptionContext = options.interceptionContext ?? null;
+	const routeSegments = options.route.routeSegments ?? [];
+	const routeResetKey = resolveAppPageRouteStateKey(routeSegments, options.matchedParams);
 	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 errorEntries = createAppPageErrorEntries(options.route);
 	const layoutEntriesByTreePosition = /* @__PURE__ */ new Map();
 	const templateEntriesByTreePosition = /* @__PURE__ */ new Map();
+	const errorEntriesByTreePosition = /* @__PURE__ */ new Map();
 	for (const layoutEntry of layoutEntries) layoutEntriesByTreePosition.set(layoutEntry.treePosition, layoutEntry);
 	for (const templateEntry of templateEntries) templateEntriesByTreePosition.set(templateEntry.treePosition, templateEntry);
+	for (const errorEntry of errorEntries) errorEntriesByTreePosition.set(errorEntry.treePosition, errorEntry);
 	const layoutIndicesByTreePosition = /* @__PURE__ */ new Map();
 	for (let index = 0; index < layoutEntries.length; index++) layoutIndicesByTreePosition.set(layoutEntries[index].treePosition, index);
 	const layoutDependenciesByIndex = /* @__PURE__ */ new Map();
@@ -126,6 +109,7 @@ function buildAppPageElements(options) {
 	const rootLayoutTreePath = layoutEntries[0]?.treePath ?? null;
 	const elements = { ...AppElementsWire.createMetadataEntries({
 		interceptionContext,
+		layoutIds: options.route.ids?.layouts ?? layoutEntries.map((entry) => entry.id),
 		rootLayoutTreePath,
 		routeId
 	}) };
@@ -134,7 +118,11 @@ function buildAppPageElements(options) {
 		const slotName = slot.name;
 		slotNameCounts.set(slotName, (slotNameCounts.get(slotName) ?? 0) + 1);
 	}
-	const orderedTreePositions = Array.from(new Set([...layoutEntries.map((entry) => entry.treePosition), ...templateEntries.map((entry) => entry.treePosition)])).sort((left, right) => left - right);
+	const orderedTreePositions = Array.from(new Set([
+		...layoutEntries.map((entry) => entry.treePosition),
+		...templateEntries.map((entry) => entry.treePosition),
+		...errorEntries.map((entry) => entry.treePosition)
+	])).sort((left, right) => left - right);
 	const resolveSlotOverride = (slotKey, slotName) => {
 		const overrideByKey = options.slotOverrides?.[slotKey];
 		if (overrideByKey) return overrideByKey;
@@ -203,6 +191,7 @@ function buildAppPageElements(options) {
 		const slotId = AppElementsWire.encodeSlotId(slotName, treePath);
 		const slotOverride = resolveSlotOverride(slotKey, slotName);
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
+		const slotResetKey = resolveAppPageRouteStateKey(slot.routeSegments ?? [], slotParams);
 		const overrideOrPageComponent = getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);
 		const defaultComponent = getDefaultExport(slot.default);
 		if (!overrideOrPageComponent && defaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
@@ -230,12 +219,13 @@ function buildAppPageElements(options) {
 			children: slotElement
 		});
 		const slotLoadingComponent = getDefaultExport(slot.loading);
-		if (slotLoadingComponent) slotElement = /* @__PURE__ */ jsx(Suspense, {
+		if (slotLoadingComponent && !shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation")) slotElement = /* @__PURE__ */ jsx(Suspense, {
 			fallback: /* @__PURE__ */ jsx(slotLoadingComponent, {}),
 			children: slotElement
-		});
+		}, slotResetKey);
 		const slotErrorComponent = getErrorBoundaryExport(slot.error);
 		if (slotErrorComponent) slotElement = /* @__PURE__ */ jsx(ErrorBoundary, {
+			resetKey: slotResetKey,
 			fallback: slotErrorComponent,
 			children: slotElement
 		});
@@ -245,70 +235,81 @@ function buildAppPageElements(options) {
 		segmentMap: { children: [] },
 		children: /* @__PURE__ */ jsx(Slot, { id: pageId })
 	});
+	routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, { children: routeChildren });
 	const routeLoadingComponent = getDefaultExport(options.route.loading);
-	if (routeLoadingComponent) routeChildren = /* @__PURE__ */ jsx(Suspense, {
+	if (routeLoadingComponent && !shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation")) routeChildren = /* @__PURE__ */ jsx(Suspense, {
 		fallback: /* @__PURE__ */ jsx(routeLoadingComponent, {}),
 		children: routeChildren
-	});
-	const lastLayoutErrorModule = options.route.errors && options.route.errors.length > 0 ? options.route.errors[options.route.errors.length - 1] : null;
+	}, routeResetKey);
+	const lastLayoutErrorModule = errorEntries.length > 0 ? errorEntries[errorEntries.length - 1].errorModule : null;
 	const notFoundComponent = getDefaultExport(options.route.notFound) ?? getDefaultExport(options.rootNotFoundModule);
 	if (notFoundComponent) routeChildren = /* @__PURE__ */ jsx(NotFoundBoundary, {
+		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(notFoundComponent, {}),
 		children: routeChildren
 	});
 	const forbiddenComponent = getDefaultExport(options.route.forbidden) ?? getDefaultExport(options.rootForbiddenModule);
 	if (forbiddenComponent) routeChildren = /* @__PURE__ */ jsx(ForbiddenBoundary, {
+		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(forbiddenComponent, {}),
 		children: routeChildren
 	});
 	const unauthorizedComponent = getDefaultExport(options.route.unauthorized) ?? getDefaultExport(options.rootUnauthorizedModule);
 	if (unauthorizedComponent) routeChildren = /* @__PURE__ */ jsx(UnauthorizedBoundary, {
+		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(unauthorizedComponent, {}),
 		children: routeChildren
 	});
 	const pageErrorComponent = getErrorBoundaryExport(options.route.error);
 	if (pageErrorComponent && options.route.error !== lastLayoutErrorModule) routeChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
+		resetKey: routeResetKey,
 		fallback: pageErrorComponent,
 		children: routeChildren
 	});
 	for (let index = orderedTreePositions.length - 1; index >= 0; index--) {
 		const treePosition = orderedTreePositions[index];
+		const segmentResetKey = resolveAppPageSegmentStateKey(routeSegments, treePosition, options.matchedParams);
 		let segmentChildren = routeChildren;
 		const layoutEntry = layoutEntriesByTreePosition.get(treePosition);
 		const templateEntry = templateEntriesByTreePosition.get(treePosition);
+		const errorEntry = errorEntriesByTreePosition.get(treePosition);
 		if (layoutEntry) {
 			const layoutNotFoundComponent = getDefaultExport(layoutEntry.notFoundModule);
 			if (layoutNotFoundComponent) segmentChildren = /* @__PURE__ */ jsx(NotFoundBoundary, {
+				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutNotFoundComponent, {}),
 				children: segmentChildren
 			});
 			const layoutForbiddenComponent = getDefaultExport(layoutEntry.forbiddenModule);
 			if (layoutForbiddenComponent) segmentChildren = /* @__PURE__ */ jsx(ForbiddenBoundary, {
+				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutForbiddenComponent, {}),
 				children: segmentChildren
 			});
 			const layoutUnauthorizedComponent = getDefaultExport(layoutEntry.unauthorizedModule);
 			if (layoutUnauthorizedComponent) segmentChildren = /* @__PURE__ */ jsx(UnauthorizedBoundary, {
+				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutUnauthorizedComponent, {}),
 				children: segmentChildren
 			});
-			const layoutErrorComponent = getErrorBoundaryExport(layoutEntry.errorModule);
-			if (layoutErrorComponent) segmentChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
-				fallback: layoutErrorComponent,
-				children: segmentChildren
-			});
 		}
+		const segmentErrorComponent = getErrorBoundaryExport(errorEntry?.errorModule ?? layoutEntry?.errorModule);
+		if (segmentErrorComponent) segmentChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
+			resetKey: segmentResetKey,
+			fallback: segmentErrorComponent,
+			children: segmentChildren
+		});
 		if (templateEntry && getDefaultExport(templateEntry.templateModule)) segmentChildren = /* @__PURE__ */ jsx(Slot, {
 			id: templateEntry.id,
 			children: segmentChildren
-		}, resolveAppPageTemplateKey(options.route.routeSegments ?? [], templateEntry.treePosition, options.matchedParams));
+		}, segmentResetKey);
 		if (!layoutEntry) {
 			routeChildren = segmentChildren;
 			continue;
 		}
 		const layoutHasElement = getDefaultExport(layoutEntry.layoutModule) !== null;
 		const layoutIndex = layoutIndicesByTreePosition.get(treePosition) ?? -1;
-		const segmentMap = { children: resolveAppPageChildSegments(options.route.routeSegments ?? [], layoutEntry.treePosition, options.matchedParams) };
+		const segmentMap = { children: resolveAppPageChildSegments(routeSegments, layoutEntry.treePosition, options.matchedParams) };
 		for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {
 			const slotName = slot.name;
 			if ((slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1) !== layoutIndex) continue;