vinext 0.0.50 → 0.0.51

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

@@ -181,7 +181,8 @@ async function resolveAppPageHeadInner(options) {
 	try {
 		metadata = await applyFileBasedMetadata(resolvedMetadataBase, options.routePath, options.params, options.metadataRoutes, {
 			routeSegments,
-			metadataSources
+			metadataSources,
+			basePath: options.basePath ?? ""
 		});
 	} catch (error) {
 		if (!options.fallbackOnFileMetadataError) throw error;

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-head.js","names":["parentForLayout"],"sources":["../../src/server/app-page-head.ts"],"sourcesContent":["import {\n  mergeMetadataEntries,\n  mergeViewport,\n  postProcessMetadata,\n  resolveModuleMetadata,\n  resolveModuleViewport,\n  type Metadata,\n  type MetadataMergeEntry,\n  type Viewport,\n} from \"vinext/shims/metadata\";\nimport { runWithFetchDedupe } from \"vinext/shims/fetch-cache\";\nimport { applyFileBasedMetadata } from \"./file-based-metadata.js\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\n\ntype AppPageSearchParams = Record<string, string | string[]>;\n\ntype AppPageHeadModule = Record<string, unknown>;\n\ntype AppPageHeadSource = {\n  metadata: Metadata | null;\n  routeSegments: readonly string[];\n};\n\ntype AppPageHeadLayout<TModule extends AppPageHeadModule> = {\n  module: TModule;\n  treePosition: number;\n};\n\ntype AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadModule> = {\n  layoutModule?: TModule | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  pageModule?: TModule | null;\n  params?: AppPageParams | null;\n  routeSegments?: readonly string[] | null;\n};\n\ntype AppPageHeadSlot<TModule extends AppPageHeadModule = AppPageHeadModule> = {\n  layout?: TModule | null;\n  page?: TModule | null;\n};\n\ntype ResolveActiveParallelRouteHeadInputsOptions<\n  TModule extends AppPageHeadModule = AppPageHeadModule,\n> = {\n  interceptLayouts?: readonly (TModule | null | undefined)[] | null;\n  interceptPage?: TModule | null;\n  interceptParams?: AppPageParams | null;\n  interceptSlotKey?: string | null;\n  params: AppPageParams;\n  routeSegments: readonly string[];\n  slots?: Record<string, AppPageHeadSlot<TModule>> | null;\n};\n\ntype ResolveAppPageHeadOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = {\n  fallbackOnFileMetadataError?: boolean;\n  layoutModules: readonly (TModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  metadataRoutes: readonly MetadataFileRoute[];\n  pageModule?: TModule | null;\n  parallelRoutes?: readonly AppPageHeadParallelRoute<TModule>[] | null;\n  params: AppPageParams;\n  routePath: string;\n  routeSegments?: readonly string[] | null;\n  searchParams?: URLSearchParams | null;\n};\n\ntype ResolveAppPageHeadResult = {\n  hasSearchParams: boolean;\n  metadata: Metadata | null;\n  pageSearchParams: AppPageSearchParams;\n  viewport: Viewport;\n};\n\ntype AppPageSearchParamsCollection = {\n  hasSearchParams: boolean;\n  pageSearchParams: AppPageSearchParams;\n};\n\ntype ResolvedParallelRouteHead = {\n  metadataResults: (Metadata | null)[];\n  metadataSources: AppPageHeadSource[];\n  viewportResults: (Viewport | null)[];\n};\n\nexport function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHeadModule>(\n  options: ResolveActiveParallelRouteHeadInputsOptions<TModule>,\n): AppPageHeadParallelRoute<TModule>[] {\n  return Object.entries(options.slots ?? {}).map(([slotKey, slot]) => {\n    if (options.interceptSlotKey === slotKey && options.interceptPage) {\n      return {\n        layoutModules: options.interceptLayouts ?? [],\n        pageModule: options.interceptPage,\n        params: options.interceptParams ?? options.params,\n        routeSegments: options.routeSegments,\n      };\n    }\n\n    return {\n      layoutModules: slot.layout ? [slot.layout] : [],\n      pageModule: slot.page,\n      params: options.params,\n      routeSegments: options.routeSegments,\n    };\n  });\n}\n\nfunction isPresent<T>(value: T | null | undefined): value is T {\n  return value !== null && value !== undefined;\n}\n\nexport function collectAppPageSearchParams(\n  searchParams: URLSearchParams | null | undefined,\n): AppPageSearchParamsCollection {\n  const pageSearchParams: AppPageSearchParams = Object.create(null);\n  let hasSearchParams = false;\n\n  searchParams?.forEach((value, key) => {\n    hasSearchParams = true;\n    const currentValue = pageSearchParams[key];\n    if (Array.isArray(currentValue)) {\n      pageSearchParams[key] = [...currentValue, value];\n      return;\n    }\n    if (currentValue !== undefined) {\n      pageSearchParams[key] = [currentValue, value];\n      return;\n    }\n    pageSearchParams[key] = value;\n  });\n\n  return { hasSearchParams, pageSearchParams };\n}\n\nfunction createMetadataSources(\n  metadataResults: readonly (Metadata | null)[],\n  routeSegments: readonly string[],\n  layoutTreePositions: readonly number[],\n  pageMetadata: Metadata | null,\n  includePageSource: boolean,\n): AppPageHeadSource[] {\n  const metadataSources: AppPageHeadSource[] = metadataResults.map((metadata, index) => ({\n    routeSegments: routeSegments.slice(0, layoutTreePositions[index] ?? 0),\n    metadata,\n  }));\n\n  if (includePageSource) {\n    metadataSources.push({\n      routeSegments,\n      metadata: pageMetadata,\n    });\n  }\n\n  return metadataSources;\n}\n\nfunction createLayoutInputs<TModule extends AppPageHeadModule>(\n  layoutModules: readonly (TModule | null | undefined)[],\n  layoutTreePositions: readonly number[],\n): AppPageHeadLayout<TModule>[] {\n  const layoutInputs: AppPageHeadLayout<TModule>[] = [];\n\n  for (let index = 0; index < layoutModules.length; index++) {\n    const layoutModule = layoutModules[index];\n    if (!isPresent(layoutModule)) {\n      continue;\n    }\n    layoutInputs.push({\n      module: layoutModule,\n      treePosition: layoutTreePositions[index] ?? 0,\n    });\n  }\n\n  return layoutInputs;\n}\n\nasync function resolveLayoutMetadata<TModule extends AppPageHeadModule>(\n  layoutInputs: readonly AppPageHeadLayout<TModule>[],\n  params: AppPageParams,\n  routeSegments: readonly string[],\n): Promise<(Metadata | null)[]> {\n  const layoutMetadataPromises: Promise<Metadata | null>[] = [];\n  let accumulatedMetadata = Promise.resolve<Metadata>({});\n\n  for (const layoutInput of layoutInputs) {\n    const parentForLayout = accumulatedMetadata;\n    const layoutParams = resolveAppPageSegmentParams(\n      routeSegments,\n      layoutInput.treePosition,\n      params,\n    );\n    const metadataPromise = resolveModuleMetadata(\n      layoutInput.module,\n      layoutParams,\n      undefined,\n      parentForLayout,\n    );\n    layoutMetadataPromises.push(metadataPromise);\n    void metadataPromise.catch(() => null);\n\n    accumulatedMetadata = metadataPromise.then(async (metadataResult) => {\n      if (metadataResult) {\n        return mergeMetadataEntries([\n          { metadata: await parentForLayout },\n          { metadata: metadataResult },\n        ]);\n      }\n      return parentForLayout;\n    });\n    void accumulatedMetadata.catch(() => null);\n  }\n\n  return Promise.all(layoutMetadataPromises);\n}\n\nasync function resolveLayoutViewport<TModule extends AppPageHeadModule>(\n  layoutInputs: readonly AppPageHeadLayout<TModule>[],\n  params: AppPageParams,\n  routeSegments: readonly string[],\n): Promise<(Viewport | null)[]> {\n  return Promise.all(\n    layoutInputs.map((layoutInput) => {\n      const layoutParams = resolveAppPageSegmentParams(\n        routeSegments,\n        layoutInput.treePosition,\n        params,\n      );\n      return resolveModuleViewport(layoutInput.module, layoutParams);\n    }),\n  );\n}\n\nasync function resolveParallelRouteHead<TModule extends AppPageHeadModule>(\n  parallelRoute: AppPageHeadParallelRoute<TModule>,\n  fallbackParams: AppPageParams,\n  fallbackRouteSegments: readonly string[],\n  pageSearchParams: AppPageSearchParams,\n  parent: Promise<Metadata>,\n): Promise<ResolvedParallelRouteHead> {\n  const params = parallelRoute.params ?? fallbackParams;\n  const routeSegments = parallelRoute.routeSegments ?? fallbackRouteSegments;\n  const metadataResults: (Metadata | null)[] = [];\n  const viewportResults: (Viewport | null)[] = [];\n  const metadataSources: AppPageHeadSource[] = [];\n  let accumulatedMetadata = parent;\n  const layoutModules = [...(parallelRoute.layoutModules ?? []), parallelRoute.layoutModule].filter(\n    isPresent,\n  );\n  const layoutViewportPromises = layoutModules.map((layoutModule) =>\n    resolveModuleViewport(layoutModule, params),\n  );\n  const pageViewportPromise = parallelRoute.pageModule\n    ? resolveModuleViewport(parallelRoute.pageModule, params)\n    : Promise.resolve(null);\n  for (const layoutViewportPromise of layoutViewportPromises) {\n    void layoutViewportPromise.catch(() => null);\n  }\n  void pageViewportPromise.catch(() => null);\n\n  for (const layoutModule of layoutModules) {\n    const layoutMetadata = await resolveModuleMetadata(\n      layoutModule,\n      params,\n      undefined,\n      accumulatedMetadata,\n    );\n    metadataResults.push(layoutMetadata);\n    // Parallel route metadata sources are scoped to the active slot branch because\n    // the route tree input does not carry per-layout segment positions inside that branch.\n    metadataSources.push({ metadata: layoutMetadata, routeSegments });\n    if (layoutMetadata) {\n      const parentForLayout = accumulatedMetadata;\n      accumulatedMetadata = parentForLayout.then(async (parentMetadata) =>\n        mergeMetadataEntries([{ metadata: parentMetadata }, { metadata: layoutMetadata }]),\n      );\n      void accumulatedMetadata.catch(() => null);\n    }\n  }\n\n  if (parallelRoute.pageModule) {\n    const pageMetadata = await resolveModuleMetadata(\n      parallelRoute.pageModule,\n      params,\n      pageSearchParams,\n      accumulatedMetadata,\n    );\n    metadataResults.push(pageMetadata);\n    // Keep the page source scoped to the same active slot branch as its layouts.\n    metadataSources.push({ metadata: pageMetadata, routeSegments });\n  }\n\n  viewportResults.push(...(await Promise.all(layoutViewportPromises)));\n  const pageViewport = await pageViewportPromise;\n  if (parallelRoute.pageModule) {\n    viewportResults.push(pageViewport);\n  }\n\n  return { metadataResults, metadataSources, viewportResults };\n}\n\nexport async function resolveAppPageHead<TModule extends AppPageHeadModule>(\n  options: ResolveAppPageHeadOptions<TModule>,\n): Promise<ResolveAppPageHeadResult> {\n  return await runWithFetchDedupe(() => resolveAppPageHeadInner(options));\n}\n\nasync function resolveAppPageHeadInner<TModule extends AppPageHeadModule>(\n  options: ResolveAppPageHeadOptions<TModule>,\n): Promise<ResolveAppPageHeadResult> {\n  const routeSegments = options.routeSegments ?? [];\n  const layoutTreePositions = options.layoutTreePositions ?? [];\n  const layoutInputs = createLayoutInputs(options.layoutModules, layoutTreePositions);\n  const layoutSourcePositions = layoutInputs.map((input) => input.treePosition);\n  const { hasSearchParams, pageSearchParams } = collectAppPageSearchParams(options.searchParams);\n  const layoutMetadataPromise = resolveLayoutMetadata(layoutInputs, options.params, routeSegments);\n  const layoutViewportPromise = resolveLayoutViewport(layoutInputs, options.params, routeSegments);\n\n  const layoutMetadataResultsForParent = layoutMetadataPromise.then((metadataResults) =>\n    metadataResults.filter(isPresent),\n  );\n  void layoutMetadataResultsForParent.catch(() => null);\n  const pageParentPromise = layoutMetadataResultsForParent.then((metadataResults) =>\n    metadataResults.length > 0\n      ? mergeMetadataEntries(metadataResults.map((metadata) => ({ metadata })))\n      : {},\n  );\n  void pageParentPromise.catch(() => null);\n  const pageMetadataPromise = options.pageModule\n    ? resolveModuleMetadata(options.pageModule, options.params, pageSearchParams, pageParentPromise)\n    : Promise.resolve(null);\n  const pageViewportPromise = options.pageModule\n    ? resolveModuleViewport(options.pageModule, options.params)\n    : Promise.resolve(null);\n  const parallelRouteHeadPromise = Promise.all(\n    (options.parallelRoutes ?? []).map((parallelRoute) =>\n      resolveParallelRouteHead(\n        parallelRoute,\n        options.params,\n        routeSegments,\n        pageSearchParams,\n        pageParentPromise,\n      ),\n    ),\n  );\n\n  const [\n    layoutMetadataResults,\n    layoutViewportResults,\n    pageMetadata,\n    pageViewport,\n    parallelRouteHeads,\n  ] = await Promise.all([\n    layoutMetadataPromise,\n    layoutViewportPromise,\n    pageMetadataPromise,\n    pageViewportPromise,\n    parallelRouteHeadPromise,\n  ]);\n  const parallelMetadataResults = parallelRouteHeads.flatMap((head) => head.metadataResults);\n  const parallelViewportResults = parallelRouteHeads.flatMap((head) => head.viewportResults);\n  const parallelMetadataSources = parallelRouteHeads.flatMap((head) => head.metadataSources);\n\n  const metadataEntries: MetadataMergeEntry[] = [\n    ...layoutMetadataResults.filter(isPresent).map((metadata) => ({ metadata })),\n    ...(pageMetadata ? [{ isPage: true, metadata: pageMetadata }] : []),\n    ...parallelMetadataResults\n      .filter(isPresent)\n      .map((metadata) => ({ contributesTitle: false, metadata })),\n  ];\n  const viewportList = [\n    ...layoutViewportResults.filter(isPresent),\n    ...(pageViewport ? [pageViewport] : []),\n    ...parallelViewportResults.filter(isPresent),\n  ];\n\n  const resolvedMetadataBase =\n    metadataEntries.length > 0 ? mergeMetadataEntries(metadataEntries) : null;\n  const metadataSources = createMetadataSources(\n    layoutMetadataResults,\n    routeSegments,\n    layoutSourcePositions,\n    pageMetadata,\n    Boolean(options.pageModule),\n  );\n  metadataSources.push(...parallelMetadataSources);\n  let metadata = resolvedMetadataBase;\n\n  try {\n    metadata = await applyFileBasedMetadata(\n      resolvedMetadataBase,\n      options.routePath,\n      options.params,\n      options.metadataRoutes,\n      {\n        routeSegments,\n        metadataSources,\n      },\n    );\n  } catch (error) {\n    if (!options.fallbackOnFileMetadataError) {\n      throw error;\n    }\n    console.error(\n      `[vinext] File-based metadata resolution failed while rendering error boundary for ${options.routePath}:`,\n      error,\n    );\n  }\n\n  if (metadata) {\n    metadata = postProcessMetadata(metadata);\n  }\n\n  return {\n    hasSearchParams,\n    metadata,\n    pageSearchParams,\n    viewport: mergeViewport(viewportList),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-head.js","names":["parentForLayout"],"sources":["../../src/server/app-page-head.ts"],"sourcesContent":["import {\n  mergeMetadataEntries,\n  mergeViewport,\n  postProcessMetadata,\n  resolveModuleMetadata,\n  resolveModuleViewport,\n  type Metadata,\n  type MetadataMergeEntry,\n  type Viewport,\n} from \"vinext/shims/metadata\";\nimport { runWithFetchDedupe } from \"vinext/shims/fetch-cache\";\nimport { applyFileBasedMetadata } from \"./file-based-metadata.js\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\n\ntype AppPageSearchParams = Record<string, string | string[]>;\n\ntype AppPageHeadModule = Record<string, unknown>;\n\ntype AppPageHeadSource = {\n  metadata: Metadata | null;\n  routeSegments: readonly string[];\n};\n\ntype AppPageHeadLayout<TModule extends AppPageHeadModule> = {\n  module: TModule;\n  treePosition: number;\n};\n\ntype AppPageHeadParallelRoute<TModule extends AppPageHeadModule = AppPageHeadModule> = {\n  layoutModule?: TModule | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  pageModule?: TModule | null;\n  params?: AppPageParams | null;\n  routeSegments?: readonly string[] | null;\n};\n\ntype AppPageHeadSlot<TModule extends AppPageHeadModule = AppPageHeadModule> = {\n  layout?: TModule | null;\n  page?: TModule | null;\n};\n\ntype ResolveActiveParallelRouteHeadInputsOptions<\n  TModule extends AppPageHeadModule = AppPageHeadModule,\n> = {\n  interceptLayouts?: readonly (TModule | null | undefined)[] | null;\n  interceptPage?: TModule | null;\n  interceptParams?: AppPageParams | null;\n  interceptSlotKey?: string | null;\n  params: AppPageParams;\n  routeSegments: readonly string[];\n  slots?: Record<string, AppPageHeadSlot<TModule>> | null;\n};\n\ntype ResolveAppPageHeadOptions<TModule extends AppPageHeadModule = AppPageHeadModule> = {\n  /**\n   * Configured next.config `basePath`. Threaded into `applyFileBasedMetadata`\n   * so file-based metadata route URLs (icon, opengraph-image, manifest, ...)\n   * emitted in <head> are prefixed with the basePath. Empty string when no\n   * basePath is configured.\n   */\n  basePath?: string;\n  fallbackOnFileMetadataError?: boolean;\n  layoutModules: readonly (TModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  metadataRoutes: readonly MetadataFileRoute[];\n  pageModule?: TModule | null;\n  parallelRoutes?: readonly AppPageHeadParallelRoute<TModule>[] | null;\n  params: AppPageParams;\n  routePath: string;\n  routeSegments?: readonly string[] | null;\n  searchParams?: URLSearchParams | null;\n};\n\ntype ResolveAppPageHeadResult = {\n  hasSearchParams: boolean;\n  metadata: Metadata | null;\n  pageSearchParams: AppPageSearchParams;\n  viewport: Viewport;\n};\n\ntype AppPageSearchParamsCollection = {\n  hasSearchParams: boolean;\n  pageSearchParams: AppPageSearchParams;\n};\n\ntype ResolvedParallelRouteHead = {\n  metadataResults: (Metadata | null)[];\n  metadataSources: AppPageHeadSource[];\n  viewportResults: (Viewport | null)[];\n};\n\nexport function resolveActiveParallelRouteHeadInputs<TModule extends AppPageHeadModule>(\n  options: ResolveActiveParallelRouteHeadInputsOptions<TModule>,\n): AppPageHeadParallelRoute<TModule>[] {\n  return Object.entries(options.slots ?? {}).map(([slotKey, slot]) => {\n    if (options.interceptSlotKey === slotKey && options.interceptPage) {\n      return {\n        layoutModules: options.interceptLayouts ?? [],\n        pageModule: options.interceptPage,\n        params: options.interceptParams ?? options.params,\n        routeSegments: options.routeSegments,\n      };\n    }\n\n    return {\n      layoutModules: slot.layout ? [slot.layout] : [],\n      pageModule: slot.page,\n      params: options.params,\n      routeSegments: options.routeSegments,\n    };\n  });\n}\n\nfunction isPresent<T>(value: T | null | undefined): value is T {\n  return value !== null && value !== undefined;\n}\n\nexport function collectAppPageSearchParams(\n  searchParams: URLSearchParams | null | undefined,\n): AppPageSearchParamsCollection {\n  const pageSearchParams: AppPageSearchParams = Object.create(null);\n  let hasSearchParams = false;\n\n  searchParams?.forEach((value, key) => {\n    hasSearchParams = true;\n    const currentValue = pageSearchParams[key];\n    if (Array.isArray(currentValue)) {\n      pageSearchParams[key] = [...currentValue, value];\n      return;\n    }\n    if (currentValue !== undefined) {\n      pageSearchParams[key] = [currentValue, value];\n      return;\n    }\n    pageSearchParams[key] = value;\n  });\n\n  return { hasSearchParams, pageSearchParams };\n}\n\nfunction createMetadataSources(\n  metadataResults: readonly (Metadata | null)[],\n  routeSegments: readonly string[],\n  layoutTreePositions: readonly number[],\n  pageMetadata: Metadata | null,\n  includePageSource: boolean,\n): AppPageHeadSource[] {\n  const metadataSources: AppPageHeadSource[] = metadataResults.map((metadata, index) => ({\n    routeSegments: routeSegments.slice(0, layoutTreePositions[index] ?? 0),\n    metadata,\n  }));\n\n  if (includePageSource) {\n    metadataSources.push({\n      routeSegments,\n      metadata: pageMetadata,\n    });\n  }\n\n  return metadataSources;\n}\n\nfunction createLayoutInputs<TModule extends AppPageHeadModule>(\n  layoutModules: readonly (TModule | null | undefined)[],\n  layoutTreePositions: readonly number[],\n): AppPageHeadLayout<TModule>[] {\n  const layoutInputs: AppPageHeadLayout<TModule>[] = [];\n\n  for (let index = 0; index < layoutModules.length; index++) {\n    const layoutModule = layoutModules[index];\n    if (!isPresent(layoutModule)) {\n      continue;\n    }\n    layoutInputs.push({\n      module: layoutModule,\n      treePosition: layoutTreePositions[index] ?? 0,\n    });\n  }\n\n  return layoutInputs;\n}\n\nasync function resolveLayoutMetadata<TModule extends AppPageHeadModule>(\n  layoutInputs: readonly AppPageHeadLayout<TModule>[],\n  params: AppPageParams,\n  routeSegments: readonly string[],\n): Promise<(Metadata | null)[]> {\n  const layoutMetadataPromises: Promise<Metadata | null>[] = [];\n  let accumulatedMetadata = Promise.resolve<Metadata>({});\n\n  for (const layoutInput of layoutInputs) {\n    const parentForLayout = accumulatedMetadata;\n    const layoutParams = resolveAppPageSegmentParams(\n      routeSegments,\n      layoutInput.treePosition,\n      params,\n    );\n    const metadataPromise = resolveModuleMetadata(\n      layoutInput.module,\n      layoutParams,\n      undefined,\n      parentForLayout,\n    );\n    layoutMetadataPromises.push(metadataPromise);\n    void metadataPromise.catch(() => null);\n\n    accumulatedMetadata = metadataPromise.then(async (metadataResult) => {\n      if (metadataResult) {\n        return mergeMetadataEntries([\n          { metadata: await parentForLayout },\n          { metadata: metadataResult },\n        ]);\n      }\n      return parentForLayout;\n    });\n    void accumulatedMetadata.catch(() => null);\n  }\n\n  return Promise.all(layoutMetadataPromises);\n}\n\nasync function resolveLayoutViewport<TModule extends AppPageHeadModule>(\n  layoutInputs: readonly AppPageHeadLayout<TModule>[],\n  params: AppPageParams,\n  routeSegments: readonly string[],\n): Promise<(Viewport | null)[]> {\n  return Promise.all(\n    layoutInputs.map((layoutInput) => {\n      const layoutParams = resolveAppPageSegmentParams(\n        routeSegments,\n        layoutInput.treePosition,\n        params,\n      );\n      return resolveModuleViewport(layoutInput.module, layoutParams);\n    }),\n  );\n}\n\nasync function resolveParallelRouteHead<TModule extends AppPageHeadModule>(\n  parallelRoute: AppPageHeadParallelRoute<TModule>,\n  fallbackParams: AppPageParams,\n  fallbackRouteSegments: readonly string[],\n  pageSearchParams: AppPageSearchParams,\n  parent: Promise<Metadata>,\n): Promise<ResolvedParallelRouteHead> {\n  const params = parallelRoute.params ?? fallbackParams;\n  const routeSegments = parallelRoute.routeSegments ?? fallbackRouteSegments;\n  const metadataResults: (Metadata | null)[] = [];\n  const viewportResults: (Viewport | null)[] = [];\n  const metadataSources: AppPageHeadSource[] = [];\n  let accumulatedMetadata = parent;\n  const layoutModules = [...(parallelRoute.layoutModules ?? []), parallelRoute.layoutModule].filter(\n    isPresent,\n  );\n  const layoutViewportPromises = layoutModules.map((layoutModule) =>\n    resolveModuleViewport(layoutModule, params),\n  );\n  const pageViewportPromise = parallelRoute.pageModule\n    ? resolveModuleViewport(parallelRoute.pageModule, params)\n    : Promise.resolve(null);\n  for (const layoutViewportPromise of layoutViewportPromises) {\n    void layoutViewportPromise.catch(() => null);\n  }\n  void pageViewportPromise.catch(() => null);\n\n  for (const layoutModule of layoutModules) {\n    const layoutMetadata = await resolveModuleMetadata(\n      layoutModule,\n      params,\n      undefined,\n      accumulatedMetadata,\n    );\n    metadataResults.push(layoutMetadata);\n    // Parallel route metadata sources are scoped to the active slot branch because\n    // the route tree input does not carry per-layout segment positions inside that branch.\n    metadataSources.push({ metadata: layoutMetadata, routeSegments });\n    if (layoutMetadata) {\n      const parentForLayout = accumulatedMetadata;\n      accumulatedMetadata = parentForLayout.then(async (parentMetadata) =>\n        mergeMetadataEntries([{ metadata: parentMetadata }, { metadata: layoutMetadata }]),\n      );\n      void accumulatedMetadata.catch(() => null);\n    }\n  }\n\n  if (parallelRoute.pageModule) {\n    const pageMetadata = await resolveModuleMetadata(\n      parallelRoute.pageModule,\n      params,\n      pageSearchParams,\n      accumulatedMetadata,\n    );\n    metadataResults.push(pageMetadata);\n    // Keep the page source scoped to the same active slot branch as its layouts.\n    metadataSources.push({ metadata: pageMetadata, routeSegments });\n  }\n\n  viewportResults.push(...(await Promise.all(layoutViewportPromises)));\n  const pageViewport = await pageViewportPromise;\n  if (parallelRoute.pageModule) {\n    viewportResults.push(pageViewport);\n  }\n\n  return { metadataResults, metadataSources, viewportResults };\n}\n\nexport async function resolveAppPageHead<TModule extends AppPageHeadModule>(\n  options: ResolveAppPageHeadOptions<TModule>,\n): Promise<ResolveAppPageHeadResult> {\n  return await runWithFetchDedupe(() => resolveAppPageHeadInner(options));\n}\n\nasync function resolveAppPageHeadInner<TModule extends AppPageHeadModule>(\n  options: ResolveAppPageHeadOptions<TModule>,\n): Promise<ResolveAppPageHeadResult> {\n  const routeSegments = options.routeSegments ?? [];\n  const layoutTreePositions = options.layoutTreePositions ?? [];\n  const layoutInputs = createLayoutInputs(options.layoutModules, layoutTreePositions);\n  const layoutSourcePositions = layoutInputs.map((input) => input.treePosition);\n  const { hasSearchParams, pageSearchParams } = collectAppPageSearchParams(options.searchParams);\n  const layoutMetadataPromise = resolveLayoutMetadata(layoutInputs, options.params, routeSegments);\n  const layoutViewportPromise = resolveLayoutViewport(layoutInputs, options.params, routeSegments);\n\n  const layoutMetadataResultsForParent = layoutMetadataPromise.then((metadataResults) =>\n    metadataResults.filter(isPresent),\n  );\n  void layoutMetadataResultsForParent.catch(() => null);\n  const pageParentPromise = layoutMetadataResultsForParent.then((metadataResults) =>\n    metadataResults.length > 0\n      ? mergeMetadataEntries(metadataResults.map((metadata) => ({ metadata })))\n      : {},\n  );\n  void pageParentPromise.catch(() => null);\n  const pageMetadataPromise = options.pageModule\n    ? resolveModuleMetadata(options.pageModule, options.params, pageSearchParams, pageParentPromise)\n    : Promise.resolve(null);\n  const pageViewportPromise = options.pageModule\n    ? resolveModuleViewport(options.pageModule, options.params)\n    : Promise.resolve(null);\n  const parallelRouteHeadPromise = Promise.all(\n    (options.parallelRoutes ?? []).map((parallelRoute) =>\n      resolveParallelRouteHead(\n        parallelRoute,\n        options.params,\n        routeSegments,\n        pageSearchParams,\n        pageParentPromise,\n      ),\n    ),\n  );\n\n  const [\n    layoutMetadataResults,\n    layoutViewportResults,\n    pageMetadata,\n    pageViewport,\n    parallelRouteHeads,\n  ] = await Promise.all([\n    layoutMetadataPromise,\n    layoutViewportPromise,\n    pageMetadataPromise,\n    pageViewportPromise,\n    parallelRouteHeadPromise,\n  ]);\n  const parallelMetadataResults = parallelRouteHeads.flatMap((head) => head.metadataResults);\n  const parallelViewportResults = parallelRouteHeads.flatMap((head) => head.viewportResults);\n  const parallelMetadataSources = parallelRouteHeads.flatMap((head) => head.metadataSources);\n\n  const metadataEntries: MetadataMergeEntry[] = [\n    ...layoutMetadataResults.filter(isPresent).map((metadata) => ({ metadata })),\n    ...(pageMetadata ? [{ isPage: true, metadata: pageMetadata }] : []),\n    ...parallelMetadataResults\n      .filter(isPresent)\n      .map((metadata) => ({ contributesTitle: false, metadata })),\n  ];\n  const viewportList = [\n    ...layoutViewportResults.filter(isPresent),\n    ...(pageViewport ? [pageViewport] : []),\n    ...parallelViewportResults.filter(isPresent),\n  ];\n\n  const resolvedMetadataBase =\n    metadataEntries.length > 0 ? mergeMetadataEntries(metadataEntries) : null;\n  const metadataSources = createMetadataSources(\n    layoutMetadataResults,\n    routeSegments,\n    layoutSourcePositions,\n    pageMetadata,\n    Boolean(options.pageModule),\n  );\n  metadataSources.push(...parallelMetadataSources);\n  let metadata = resolvedMetadataBase;\n\n  try {\n    metadata = await applyFileBasedMetadata(\n      resolvedMetadataBase,\n      options.routePath,\n      options.params,\n      options.metadataRoutes,\n      {\n        routeSegments,\n        metadataSources,\n        basePath: options.basePath ?? \"\",\n      },\n    );\n  } catch (error) {\n    if (!options.fallbackOnFileMetadataError) {\n      throw error;\n    }\n    console.error(\n      `[vinext] File-based metadata resolution failed while rendering error boundary for ${options.routePath}:`,\n      error,\n    );\n  }\n\n  if (metadata) {\n    metadata = postProcessMetadata(metadata);\n  }\n\n  return {\n    hasSearchParams,\n    metadata,\n    pageSearchParams,\n    viewport: mergeViewport(viewportList),\n  };\n}\n"],"mappings":"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"}

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

@@ -2,6 +2,28 @@ import { LayoutFlags } from "./app-elements-wire.js";
 import { AppPageSpecialError, LayoutClassificationOptions } from "./app-page-execution.js";
 
 //#region src/server/app-page-probe.d.ts
+/**
+ * Build a probePage() invocation for the App Router request lifecycle.
+ *
+ * The generated RSC entry calls this once per request after route matching to
+ * eagerly invoke the page component. Surfacing redirect()/notFound() throws
+ * here lets the probe lifecycle turn them into proper HTTP responses before
+ * RSC streaming begins (see `probeAppPageBeforeRender`).
+ *
+ * The helper exists to keep the generated entry thin (a single delegation
+ * call) and to make the search-params wiring directly unit-testable. A bug
+ * here previously slipped through because the entry hand-rolled the call and
+ * read a non-existent key off `collectAppPageSearchParams`'s return value
+ * (see https://github.com/cloudflare/vinext/issues/1235).
+ *
+ * Returns `null` when the route has no page component (eg. interception-only
+ * routes), matching the caller contract on `probePage`.
+ */
+declare function probeAppPage(options: {
+  pageComponent: unknown;
+  asyncRouteParams: unknown;
+  searchParams: URLSearchParams | null | undefined;
+}): unknown;
 type ProbeAppPageBeforeRenderResult = {
   response: Response | null;
   layoutFlags: LayoutFlags;
@@ -19,5 +41,5 @@ type ProbeAppPageBeforeRenderOptions = {
 };
 declare function probeAppPageBeforeRender(options: ProbeAppPageBeforeRenderOptions): Promise<ProbeAppPageBeforeRenderResult>;
 //#endregion
-export { probeAppPageBeforeRender };
+export { probeAppPage, probeAppPageBeforeRender };
 //# sourceMappingURL=app-page-probe.d.ts.map

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

@@ -1,5 +1,33 @@
+import { makeThenableParams } from "../shims/thenable-params.js";
+import { collectAppPageSearchParams } from "./app-page-head.js";
 import { probeAppPageComponent, probeAppPageLayouts } from "./app-page-execution.js";
 //#region src/server/app-page-probe.ts
+/**
+* Build a probePage() invocation for the App Router request lifecycle.
+*
+* The generated RSC entry calls this once per request after route matching to
+* eagerly invoke the page component. Surfacing redirect()/notFound() throws
+* here lets the probe lifecycle turn them into proper HTTP responses before
+* RSC streaming begins (see `probeAppPageBeforeRender`).
+*
+* The helper exists to keep the generated entry thin (a single delegation
+* call) and to make the search-params wiring directly unit-testable. A bug
+* here previously slipped through because the entry hand-rolled the call and
+* read a non-existent key off `collectAppPageSearchParams`'s return value
+* (see https://github.com/cloudflare/vinext/issues/1235).
+*
+* Returns `null` when the route has no page component (eg. interception-only
+* routes), matching the caller contract on `probePage`.
+*/
+function probeAppPage(options) {
+	const { pageComponent, asyncRouteParams, searchParams } = options;
+	if (typeof pageComponent !== "function") return null;
+	const { pageSearchParams } = collectAppPageSearchParams(searchParams);
+	return pageComponent({
+		params: asyncRouteParams,
+		searchParams: makeThenableParams(pageSearchParams)
+	});
+}
 async function probeAppPageBeforeRender(options) {
 	let layoutFlags = {};
 	if (options.layoutCount > 0) {
@@ -43,6 +71,6 @@ async function probeAppPageBeforeRender(options) {
 	};
 }
 //#endregion
-export { probeAppPageBeforeRender };
+export { probeAppPage, probeAppPageBeforeRender };
 
 //# sourceMappingURL=app-page-probe.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"app-page-probe.js","names":[],"sources":["../../src/server/app-page-probe.ts"],"sourcesContent":["import {\n  probeAppPageComponent,\n  probeAppPageLayouts,\n  type AppPageSpecialError,\n  type LayoutClassificationOptions,\n  type LayoutFlags,\n} from \"./app-page-execution.js\";\n\ntype ProbeAppPageBeforeRenderResult = {\n  response: Response | null;\n  layoutFlags: LayoutFlags;\n};\n\ntype ProbeAppPageBeforeRenderOptions = {\n  hasLoadingBoundary: boolean;\n  layoutCount: number;\n  probeLayoutAt: (layoutIndex: number) => unknown;\n  probePage: () => unknown;\n  renderLayoutSpecialError: (\n    specialError: AppPageSpecialError,\n    layoutIndex: number,\n  ) => Promise<Response>;\n  renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => AppPageSpecialError | null;\n  runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;\n  /** When provided, enables per-layout static/dynamic classification. */\n  classification?: LayoutClassificationOptions | null;\n};\n\nexport async function probeAppPageBeforeRender(\n  options: ProbeAppPageBeforeRenderOptions,\n): Promise<ProbeAppPageBeforeRenderResult> {\n  let layoutFlags: LayoutFlags = {};\n\n  // Layouts render before their children in Next.js, so layout-level special\n  // errors must be handled before probing the page component itself.\n  if (options.layoutCount > 0) {\n    const layoutProbeResult = await probeAppPageLayouts({\n      layoutCount: options.layoutCount,\n      async onLayoutError(layoutError, layoutIndex) {\n        const specialError = options.resolveSpecialError(layoutError);\n        if (!specialError) {\n          return null;\n        }\n\n        return options.renderLayoutSpecialError(specialError, layoutIndex);\n      },\n      probeLayoutAt: options.probeLayoutAt,\n      runWithSuppressedHookWarning(probe) {\n        return options.runWithSuppressedHookWarning(probe);\n      },\n      classification: options.classification,\n    });\n\n    layoutFlags = layoutProbeResult.layoutFlags;\n\n    if (layoutProbeResult.response) {\n      return { response: layoutProbeResult.response, layoutFlags };\n    }\n  }\n\n  // When a route-level loading.tsx is present, the page renders inside a\n  // route-level Suspense boundary, so a thrown redirect()/notFound() during\n  // page render becomes an error inside that boundary. We can't catch it\n  // here without serializing on the page promise — which would defeat the\n  // streaming benefit of loading.tsx for slow non-redirecting pages.\n  //\n  // Recovery for the redirect/notFound case happens later in\n  // renderAppPageLifecycle: rscErrorTracker captures the digest from React's\n  // onError callback, and a short race window after shell-ready lets the\n  // lifecycle swap the response to a 307/404 before bytes are flushed.\n  // This mirrors Next.js's \"until-first-byte-is-flushed\" swap behavior.\n  if (options.hasLoadingBoundary) {\n    return { response: null, layoutFlags };\n  }\n\n  // Server Components are functions, so we can probe the page ahead of stream\n  // creation and only turn special throws into immediate responses.\n  const pageResponse = await probeAppPageComponent({\n    awaitAsyncResult: true,\n    async onError(pageError) {\n      const specialError = options.resolveSpecialError(pageError);\n      if (specialError) {\n        return options.renderPageSpecialError(specialError);\n      }\n\n      // Non-special probe failures (for example use() outside React's render\n      // cycle or client references executing on the server) are expected here.\n      // The real RSC/SSR render path will surface those properly below.\n      return null;\n    },\n    probePage: options.probePage,\n    runWithSuppressedHookWarning(probe) {\n      return options.runWithSuppressedHookWarning(probe);\n    },\n  });\n\n  return { response: pageResponse, layoutFlags };\n}\n"],"mappings":";;AA6BA,eAAsB,yBACpB,SACyC;CACzC,IAAI,cAA2B,EAAE;CAIjC,IAAI,QAAQ,cAAc,GAAG;EAC3B,MAAM,oBAAoB,MAAM,oBAAoB;GAClD,aAAa,QAAQ;GACrB,MAAM,cAAc,aAAa,aAAa;IAC5C,MAAM,eAAe,QAAQ,oBAAoB,YAAY;IAC7D,IAAI,CAAC,cACH,OAAO;IAGT,OAAO,QAAQ,yBAAyB,cAAc,YAAY;;GAEpE,eAAe,QAAQ;GACvB,6BAA6B,OAAO;IAClC,OAAO,QAAQ,6BAA6B,MAAM;;GAEpD,gBAAgB,QAAQ;GACzB,CAAC;EAEF,cAAc,kBAAkB;EAEhC,IAAI,kBAAkB,UACpB,OAAO;GAAE,UAAU,kBAAkB;GAAU;GAAa;;CAehE,IAAI,QAAQ,oBACV,OAAO;EAAE,UAAU;EAAM;EAAa;CAwBxC,OAAO;EAAE,UAAU,MAnBQ,sBAAsB;GAC/C,kBAAkB;GAClB,MAAM,QAAQ,WAAW;IACvB,MAAM,eAAe,QAAQ,oBAAoB,UAAU;IAC3D,IAAI,cACF,OAAO,QAAQ,uBAAuB,aAAa;IAMrD,OAAO;;GAET,WAAW,QAAQ;GACnB,6BAA6B,OAAO;IAClC,OAAO,QAAQ,6BAA6B,MAAM;;GAErD,CAAC;EAE+B;EAAa"}
+{"version":3,"file":"app-page-probe.js","names":[],"sources":["../../src/server/app-page-probe.ts"],"sourcesContent":["import { makeThenableParams } from \"vinext/shims/thenable-params\";\nimport { collectAppPageSearchParams } from \"./app-page-head.js\";\nimport {\n  probeAppPageComponent,\n  probeAppPageLayouts,\n  type AppPageSpecialError,\n  type LayoutClassificationOptions,\n  type LayoutFlags,\n} from \"./app-page-execution.js\";\n\n/**\n * Build a probePage() invocation for the App Router request lifecycle.\n *\n * The generated RSC entry calls this once per request after route matching to\n * eagerly invoke the page component. Surfacing redirect()/notFound() throws\n * here lets the probe lifecycle turn them into proper HTTP responses before\n * RSC streaming begins (see `probeAppPageBeforeRender`).\n *\n * The helper exists to keep the generated entry thin (a single delegation\n * call) and to make the search-params wiring directly unit-testable. A bug\n * here previously slipped through because the entry hand-rolled the call and\n * read a non-existent key off `collectAppPageSearchParams`'s return value\n * (see https://github.com/cloudflare/vinext/issues/1235).\n *\n * Returns `null` when the route has no page component (eg. interception-only\n * routes), matching the caller contract on `probePage`.\n */\nexport function probeAppPage(options: {\n  pageComponent: unknown;\n  asyncRouteParams: unknown;\n  searchParams: URLSearchParams | null | undefined;\n}): unknown {\n  const { pageComponent, asyncRouteParams, searchParams } = options;\n  if (typeof pageComponent !== \"function\") {\n    return null;\n  }\n  const { pageSearchParams } = collectAppPageSearchParams(searchParams);\n  const asyncSearchParams = makeThenableParams(pageSearchParams);\n  return (pageComponent as (props: Record<string, unknown>) => unknown)({\n    params: asyncRouteParams,\n    searchParams: asyncSearchParams,\n  });\n}\n\ntype ProbeAppPageBeforeRenderResult = {\n  response: Response | null;\n  layoutFlags: LayoutFlags;\n};\n\ntype ProbeAppPageBeforeRenderOptions = {\n  hasLoadingBoundary: boolean;\n  layoutCount: number;\n  probeLayoutAt: (layoutIndex: number) => unknown;\n  probePage: () => unknown;\n  renderLayoutSpecialError: (\n    specialError: AppPageSpecialError,\n    layoutIndex: number,\n  ) => Promise<Response>;\n  renderPageSpecialError: (specialError: AppPageSpecialError) => Promise<Response>;\n  resolveSpecialError: (error: unknown) => AppPageSpecialError | null;\n  runWithSuppressedHookWarning<T>(probe: () => Promise<T>): Promise<T>;\n  /** When provided, enables per-layout static/dynamic classification. */\n  classification?: LayoutClassificationOptions | null;\n};\n\nexport async function probeAppPageBeforeRender(\n  options: ProbeAppPageBeforeRenderOptions,\n): Promise<ProbeAppPageBeforeRenderResult> {\n  let layoutFlags: LayoutFlags = {};\n\n  // Layouts render before their children in Next.js, so layout-level special\n  // errors must be handled before probing the page component itself.\n  if (options.layoutCount > 0) {\n    const layoutProbeResult = await probeAppPageLayouts({\n      layoutCount: options.layoutCount,\n      async onLayoutError(layoutError, layoutIndex) {\n        const specialError = options.resolveSpecialError(layoutError);\n        if (!specialError) {\n          return null;\n        }\n\n        return options.renderLayoutSpecialError(specialError, layoutIndex);\n      },\n      probeLayoutAt: options.probeLayoutAt,\n      runWithSuppressedHookWarning(probe) {\n        return options.runWithSuppressedHookWarning(probe);\n      },\n      classification: options.classification,\n    });\n\n    layoutFlags = layoutProbeResult.layoutFlags;\n\n    if (layoutProbeResult.response) {\n      return { response: layoutProbeResult.response, layoutFlags };\n    }\n  }\n\n  // When a route-level loading.tsx is present, the page renders inside a\n  // route-level Suspense boundary, so a thrown redirect()/notFound() during\n  // page render becomes an error inside that boundary. We can't catch it\n  // here without serializing on the page promise — which would defeat the\n  // streaming benefit of loading.tsx for slow non-redirecting pages.\n  //\n  // Recovery for the redirect/notFound case happens later in\n  // renderAppPageLifecycle: rscErrorTracker captures the digest from React's\n  // onError callback, and a short race window after shell-ready lets the\n  // lifecycle swap the response to a 307/404 before bytes are flushed.\n  // This mirrors Next.js's \"until-first-byte-is-flushed\" swap behavior.\n  if (options.hasLoadingBoundary) {\n    return { response: null, layoutFlags };\n  }\n\n  // Server Components are functions, so we can probe the page ahead of stream\n  // creation and only turn special throws into immediate responses.\n  const pageResponse = await probeAppPageComponent({\n    awaitAsyncResult: true,\n    async onError(pageError) {\n      const specialError = options.resolveSpecialError(pageError);\n      if (specialError) {\n        return options.renderPageSpecialError(specialError);\n      }\n\n      // Non-special probe failures (for example use() outside React's render\n      // cycle or client references executing on the server) are expected here.\n      // The real RSC/SSR render path will surface those properly below.\n      return null;\n    },\n    probePage: options.probePage,\n    runWithSuppressedHookWarning(probe) {\n      return options.runWithSuppressedHookWarning(probe);\n    },\n  });\n\n  return { response: pageResponse, layoutFlags };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA2BA,SAAgB,aAAa,SAIjB;CACV,MAAM,EAAE,eAAe,kBAAkB,iBAAiB;CAC1D,IAAI,OAAO,kBAAkB,YAC3B,OAAO;CAET,MAAM,EAAE,qBAAqB,2BAA2B,aAAa;CAErE,OAAQ,cAA8D;EACpE,QAAQ;EACR,cAHwB,mBAAmB,iBAGZ;EAChC,CAAC;;AAwBJ,eAAsB,yBACpB,SACyC;CACzC,IAAI,cAA2B,EAAE;CAIjC,IAAI,QAAQ,cAAc,GAAG;EAC3B,MAAM,oBAAoB,MAAM,oBAAoB;GAClD,aAAa,QAAQ;GACrB,MAAM,cAAc,aAAa,aAAa;IAC5C,MAAM,eAAe,QAAQ,oBAAoB,YAAY;IAC7D,IAAI,CAAC,cACH,OAAO;IAGT,OAAO,QAAQ,yBAAyB,cAAc,YAAY;;GAEpE,eAAe,QAAQ;GACvB,6BAA6B,OAAO;IAClC,OAAO,QAAQ,6BAA6B,MAAM;;GAEpD,gBAAgB,QAAQ;GACzB,CAAC;EAEF,cAAc,kBAAkB;EAEhC,IAAI,kBAAkB,UACpB,OAAO;GAAE,UAAU,kBAAkB;GAAU;GAAa;;CAehE,IAAI,QAAQ,oBACV,OAAO;EAAE,UAAU;EAAM;EAAa;CAwBxC,OAAO;EAAE,UAAU,MAnBQ,sBAAsB;GAC/C,kBAAkB;GAClB,MAAM,QAAQ,WAAW;IACvB,MAAM,eAAe,QAAQ,oBAAoB,UAAU;IAC3D,IAAI,cACF,OAAO,QAAQ,uBAAuB,aAAa;IAMrD,OAAO;;GAET,WAAW,QAAQ;GACnB,6BAA6B,OAAO;IAClC,OAAO,QAAQ,6BAA6B,MAAM;;GAErD,CAAC;EAE+B;EAAa"}

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

@@ -0,0 +1,35 @@
+import { BoundaryOutcome, CacheProofOutputScope, RenderCacheability, RenderObservation, RenderObservationCompleteness, RenderRequestApiKind } from "./cache-proof.js";
+import { ReactNode } from "react";
+
+//#region src/server/app-page-render-observation.d.ts
+type AppPageRenderObservationState = Readonly<{
+  dynamicFetches: readonly string[];
+  requestApis: readonly RenderRequestApiKind[];
+}>;
+declare function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState;
+declare function createAppPageRenderObservation(options: {
+  boundaryOutcome: BoundaryOutcome;
+  cacheTags: readonly string[];
+  cacheability: RenderCacheability;
+  cleanPathname: string;
+  completeness: RenderObservationCompleteness;
+  output: CacheProofOutputScope;
+  params: Record<string, unknown>;
+  state: AppPageRenderObservationState;
+}): RenderObservation;
+declare function createAppPageRscOutputScope(options: {
+  element: ReactNode | Readonly<Record<string, ReactNode>>;
+  mountedSlotsHeader?: string | null;
+  renderEpoch: string | null;
+  rootBoundaryId: string | null;
+  routePattern: string;
+}): CacheProofOutputScope;
+declare function createAppPageHtmlOutputScope(options: {
+  element: ReactNode | Readonly<Record<string, ReactNode>>;
+  renderEpoch: string | null;
+  rootBoundaryId: string | null;
+  routePattern: string;
+}): CacheProofOutputScope;
+//#endregion
+export { AppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState };
+//# sourceMappingURL=app-page-render-observation.d.ts.map

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

@@ -0,0 +1,68 @@
+import { fnv1a64 } from "../utils/hash.js";
+import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
+import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
+import "./app-elements.js";
+import { buildRenderObservation, buildRenderRequestApiObservations } from "./cache-proof.js";
+//#region src/server/app-page-render-observation.ts
+function readRootBoundaryId(element) {
+	const rootLayoutTreePath = element[AppElementsWire.keys.rootLayout];
+	return typeof rootLayoutTreePath === "string" ? rootLayoutTreePath : null;
+}
+function readRouteId(element, routePattern) {
+	if (isAppElementsRecord(element)) {
+		const routeId = element[AppElementsWire.keys.route];
+		if (typeof routeId === "string") return routeId;
+	}
+	return AppElementsWire.encodeRouteId(routePattern, null);
+}
+function createMountedSlotsFingerprint(mountedSlotsHeader) {
+	const normalized = normalizeMountedSlotsHeader(mountedSlotsHeader);
+	return normalized ? `slots:${fnv1a64(normalized)}` : null;
+}
+function mergeObservedRequestApis(observed, params) {
+	const merged = new Set(observed);
+	if (Object.keys(params).length > 0) merged.add("params");
+	return [...merged].sort();
+}
+function createEmptyAppPageRenderObservationState() {
+	return {
+		dynamicFetches: [],
+		requestApis: []
+	};
+}
+function createAppPageRenderObservation(options) {
+	return buildRenderObservation({
+		boundaryOutcome: options.boundaryOutcome,
+		cacheability: options.cacheability,
+		cacheTags: options.cacheTags,
+		completeness: options.completeness,
+		dynamicFetches: options.state.dynamicFetches,
+		output: options.output,
+		pathTags: [options.cleanPathname],
+		requestApis: buildRenderRequestApiObservations({
+			completeness: options.completeness,
+			observed: mergeObservedRequestApis(options.state.requestApis, options.params)
+		})
+	});
+}
+function createAppPageRscOutputScope(options) {
+	return {
+		kind: "app-rsc",
+		mountedSlotsFingerprint: createMountedSlotsFingerprint(options.mountedSlotsHeader),
+		renderEpoch: options.renderEpoch,
+		rootBoundaryId: options.rootBoundaryId ?? (isAppElementsRecord(options.element) ? readRootBoundaryId(options.element) : null),
+		routeId: readRouteId(options.element, options.routePattern)
+	};
+}
+function createAppPageHtmlOutputScope(options) {
+	return {
+		kind: "app-html",
+		renderEpoch: options.renderEpoch,
+		rootBoundaryId: options.rootBoundaryId ?? (isAppElementsRecord(options.element) ? readRootBoundaryId(options.element) : null),
+		routeId: readRouteId(options.element, options.routePattern)
+	};
+}
+//#endregion
+export { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState };
+
+//# sourceMappingURL=app-page-render-observation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"app-page-render-observation.js","names":[],"sources":["../../src/server/app-page-render-observation.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport { fnv1a64 } from \"../utils/hash.js\";\nimport { AppElementsWire, isAppElementsRecord } from \"./app-elements.js\";\nimport { normalizeMountedSlotsHeader } from \"./app-mounted-slots-header.js\";\nimport {\n  buildRenderObservation,\n  buildRenderRequestApiObservations,\n  type BoundaryOutcome,\n  type CacheProofOutputScope,\n  type RenderCacheability,\n  type RenderObservation,\n  type RenderObservationCompleteness,\n  type RenderRequestApiKind,\n} from \"./cache-proof.js\";\n\nexport type AppPageRenderObservationState = Readonly<{\n  dynamicFetches: readonly string[];\n  requestApis: readonly RenderRequestApiKind[];\n}>;\n\nfunction readRootBoundaryId(element: Readonly<Record<string, unknown>>): string | null {\n  const rootLayoutTreePath = element[AppElementsWire.keys.rootLayout];\n  return typeof rootLayoutTreePath === \"string\" ? rootLayoutTreePath : null;\n}\n\nfunction readRouteId(\n  element: ReactNode | Readonly<Record<string, ReactNode>>,\n  routePattern: string,\n): string {\n  if (isAppElementsRecord(element)) {\n    const routeId = element[AppElementsWire.keys.route];\n    if (typeof routeId === \"string\") {\n      return routeId;\n    }\n  }\n\n  return AppElementsWire.encodeRouteId(routePattern, null);\n}\n\nfunction createMountedSlotsFingerprint(\n  mountedSlotsHeader: string | null | undefined,\n): string | null {\n  const normalized = normalizeMountedSlotsHeader(mountedSlotsHeader);\n  return normalized ? `slots:${fnv1a64(normalized)}` : null;\n}\n\nfunction mergeObservedRequestApis(\n  observed: readonly RenderRequestApiKind[],\n  params: Record<string, unknown>,\n): RenderRequestApiKind[] {\n  const merged = new Set<RenderRequestApiKind>(observed);\n  // Conservative: route params are marked observed when the route supplies\n  // values, since this slice does not add property-access proxying.\n  if (Object.keys(params).length > 0) {\n    merged.add(\"params\");\n  }\n  return [...merged].sort();\n}\n\nexport function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState {\n  return {\n    dynamicFetches: [],\n    requestApis: [],\n  };\n}\n\nexport function createAppPageRenderObservation(options: {\n  boundaryOutcome: BoundaryOutcome;\n  cacheTags: readonly string[];\n  cacheability: RenderCacheability;\n  cleanPathname: string;\n  completeness: RenderObservationCompleteness;\n  output: CacheProofOutputScope;\n  params: Record<string, unknown>;\n  state: AppPageRenderObservationState;\n}): RenderObservation {\n  return buildRenderObservation({\n    boundaryOutcome: options.boundaryOutcome,\n    cacheability: options.cacheability,\n    cacheTags: options.cacheTags,\n    completeness: options.completeness,\n    dynamicFetches: options.state.dynamicFetches,\n    output: options.output,\n    pathTags: [options.cleanPathname],\n    requestApis: buildRenderRequestApiObservations({\n      completeness: options.completeness,\n      observed: mergeObservedRequestApis(options.state.requestApis, options.params),\n    }),\n  });\n}\n\nexport function createAppPageRscOutputScope(options: {\n  element: ReactNode | Readonly<Record<string, ReactNode>>;\n  mountedSlotsHeader?: string | null;\n  renderEpoch: string | null;\n  rootBoundaryId: string | null;\n  routePattern: string;\n}): CacheProofOutputScope {\n  return {\n    kind: \"app-rsc\",\n    mountedSlotsFingerprint: createMountedSlotsFingerprint(options.mountedSlotsHeader),\n    renderEpoch: options.renderEpoch,\n    rootBoundaryId:\n      options.rootBoundaryId ??\n      (isAppElementsRecord(options.element) ? readRootBoundaryId(options.element) : null),\n    routeId: readRouteId(options.element, options.routePattern),\n  };\n}\n\n// HTML output is derived from the resolved RSC render and does not vary by the\n// set of mounted parallel-route slots; only RSC payload artifacts include that\n// slot fingerprint in their output scope.\nexport function createAppPageHtmlOutputScope(options: {\n  element: ReactNode | Readonly<Record<string, ReactNode>>;\n  renderEpoch: string | null;\n  rootBoundaryId: string | null;\n  routePattern: string;\n}): CacheProofOutputScope {\n  return {\n    kind: \"app-html\",\n    renderEpoch: options.renderEpoch,\n    rootBoundaryId:\n      options.rootBoundaryId ??\n      (isAppElementsRecord(options.element) ? readRootBoundaryId(options.element) : null),\n    routeId: readRouteId(options.element, options.routePattern),\n  };\n}\n"],"mappings":";;;;;;AAoBA,SAAS,mBAAmB,SAA2D;CACrF,MAAM,qBAAqB,QAAQ,gBAAgB,KAAK;CACxD,OAAO,OAAO,uBAAuB,WAAW,qBAAqB;;AAGvE,SAAS,YACP,SACA,cACQ;CACR,IAAI,oBAAoB,QAAQ,EAAE;EAChC,MAAM,UAAU,QAAQ,gBAAgB,KAAK;EAC7C,IAAI,OAAO,YAAY,UACrB,OAAO;;CAIX,OAAO,gBAAgB,cAAc,cAAc,KAAK;;AAG1D,SAAS,8BACP,oBACe;CACf,MAAM,aAAa,4BAA4B,mBAAmB;CAClE,OAAO,aAAa,SAAS,QAAQ,WAAW,KAAK;;AAGvD,SAAS,yBACP,UACA,QACwB;CACxB,MAAM,SAAS,IAAI,IAA0B,SAAS;CAGtD,IAAI,OAAO,KAAK,OAAO,CAAC,SAAS,GAC/B,OAAO,IAAI,SAAS;CAEtB,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM;;AAG3B,SAAgB,2CAA0E;CACxF,OAAO;EACL,gBAAgB,EAAE;EAClB,aAAa,EAAE;EAChB;;AAGH,SAAgB,+BAA+B,SASzB;CACpB,OAAO,uBAAuB;EAC5B,iBAAiB,QAAQ;EACzB,cAAc,QAAQ;EACtB,WAAW,QAAQ;EACnB,cAAc,QAAQ;EACtB,gBAAgB,QAAQ,MAAM;EAC9B,QAAQ,QAAQ;EAChB,UAAU,CAAC,QAAQ,cAAc;EACjC,aAAa,kCAAkC;GAC7C,cAAc,QAAQ;GACtB,UAAU,yBAAyB,QAAQ,MAAM,aAAa,QAAQ,OAAO;GAC9E,CAAC;EACH,CAAC;;AAGJ,SAAgB,4BAA4B,SAMlB;CACxB,OAAO;EACL,MAAM;EACN,yBAAyB,8BAA8B,QAAQ,mBAAmB;EAClF,aAAa,QAAQ;EACrB,gBACE,QAAQ,mBACP,oBAAoB,QAAQ,QAAQ,GAAG,mBAAmB,QAAQ,QAAQ,GAAG;EAChF,SAAS,YAAY,QAAQ,SAAS,QAAQ,aAAa;EAC5D;;AAMH,SAAgB,6BAA6B,SAKnB;CACxB,OAAO;EACL,MAAM;EACN,aAAa,QAAQ;EACrB,gBACE,QAAQ,mBACP,oBAAoB,QAAQ,QAAQ,GAAG,mBAAmB,QAAQ,QAAQ,GAAG;EAChF,SAAS,YAAY,QAAQ,SAAS,QAAQ,aAAa;EAC5D"}

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

@@ -4,6 +4,7 @@ import { AppPageFontPreload, AppPageSpecialError, LayoutClassificationOptions }
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { ReactNode } from "react";
 import { ReactFormState } from "react-dom/client";
 
@@ -16,9 +17,11 @@ type AppPageRequestCacheLife = {
   expire?: number;
 };
 type RenderAppPageLifecycleOptions = {
+  basePath?: string;
   cleanPathname: string;
   clearRequestContext: () => void;
-  consumeDynamicUsage: () => boolean; /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */
+  consumeDynamicUsage: () => boolean;
+  consumeRenderObservationState?: () => AppPageRenderObservationState; /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */
   consumeInvalidDynamicUsageError?: () => unknown;
   createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
   getFontLinks: () => string[];
@@ -47,6 +50,7 @@ type RenderAppPageLifecycleOptions = {
   loadSsrHandler: () => Promise<AppPageSsrHandler>;
   middlewareContext: AppPageMiddlewareContext;
   params: Record<string, unknown>;
+  peekRenderObservationState?: () => AppPageRenderObservationState;
   probeLayoutAt: (layoutIndex: number) => unknown;
   probePage: () => unknown;
   expireSeconds?: number;

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

@@ -3,8 +3,10 @@ import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVe
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { createAppPageFontData, createAppPageRscErrorTracker, deferUntilStreamConsumed, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery, shouldRerenderAppPageWithGlobalError } from "./app-page-stream.js";
+import { createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse } from "./app-page-cache.js";
 import { buildAppPageFontLinkHeader, readAppPageBinaryStream, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
+import { hasDigest } from "./app-rsc-errors.js";
 import { probeAppPageBeforeRender } from "./app-page-probe.js";
 import { buildAppPageHtmlResponse, buildAppPageRscResponse, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy } from "./app-page-response.js";
 //#region src/server/app-page-render.ts
@@ -53,7 +55,15 @@ function createAppPageArtifactCompatibility(element, routePattern) {
 * "use cache" may be caught by user try/catch and silently swallowed — this
 * wrapper waits for the stream to drain and surfaces any recorded error to the
 * terminal (and, via HMR, the browser dev overlay).
-* Ported from Next.js: https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689
+*
+* Dedups against React's Flight error chunk: if the recorded error already
+* carries a `digest`, React's serverComponentsErrorHandler has already stamped
+* it and emitted it into the RSC stream. Skipping `console.error` prevents
+* double-logging. Caught cases (no digest) still surface here.
+*
+* Ported from Next.js:
+*   https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689
+*   https://github.com/vercel/next.js/pull/93706
 */
 function wrapRscResponseForDevErrorReporting(response, consumeInvalidDynamicUsageError) {
 	const originalBody = response.body;
@@ -63,7 +73,8 @@ function wrapRscResponseForDevErrorReporting(response, consumeInvalidDynamicUsag
 		if (consumed) return;
 		consumed = true;
 		const error = consumeInvalidDynamicUsageError();
-		if (error) console.error("[vinext] Invalid dynamic usage:", error);
+		if (!error) return;
+		if (!hasDigest(error)) console.error("[vinext] Invalid dynamic usage:", error);
 	};
 	const cleanup = new TransformStream({ flush() {
 		onConsumed();
@@ -115,10 +126,36 @@ async function renderAppPageLifecycle(options) {
 	if (preRenderResult.response) return preRenderResult.response;
 	const layoutFlags = preRenderResult.layoutFlags;
 	const artifactCompatibility = createAppPageArtifactCompatibility(options.element, options.routePattern);
+	const rootBoundaryId = artifactCompatibility?.rootBoundaryId ?? null;
+	const renderEpoch = artifactCompatibility?.renderEpoch ?? null;
+	const rscOutputScope = createAppPageRscOutputScope({
+		element: options.element,
+		mountedSlotsHeader: options.mountedSlotsHeader,
+		renderEpoch,
+		rootBoundaryId,
+		routePattern: options.routePattern
+	});
+	const htmlOutputScope = createAppPageHtmlOutputScope({
+		element: options.element,
+		renderEpoch,
+		rootBoundaryId,
+		routePattern: options.routePattern
+	});
+	const payloadRenderObservation = createAppPageRenderObservation({
+		boundaryOutcome: { kind: "unknown" },
+		cacheability: "unknown",
+		cacheTags: options.getPageTags(),
+		cleanPathname: options.cleanPathname,
+		completeness: "partial",
+		output: rscOutputScope,
+		params: options.params,
+		state: options.peekRenderObservationState?.() ?? createEmptyAppPageRenderObservationState()
+	});
 	const outgoingElement = AppElementsWire.encodeOutgoingPayload({
 		element: options.element,
 		layoutFlags,
-		...artifactCompatibility ? { artifactCompatibility } : {}
+		...artifactCompatibility ? { artifactCompatibility } : {},
+		renderObservation: payloadRenderObservation
 	});
 	const compileEnd = options.isProduction ? void 0 : performance.now();
 	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(options.cleanPathname, options.routePattern));
@@ -166,6 +203,19 @@ async function renderAppPageLifecycle(options) {
 			capturedRscDataPromise: options.isProduction && shouldCaptureRscForCacheMetadata ? capturedRscDataRef.value : null,
 			cleanPathname: options.cleanPathname,
 			consumeDynamicUsage: options.consumeDynamicUsage,
+			consumeRenderObservationState: options.consumeRenderObservationState,
+			createRscRenderObservation(input) {
+				return createAppPageRenderObservation({
+					boundaryOutcome: { kind: "success" },
+					cacheability: "public",
+					cacheTags: input.cacheTags,
+					cleanPathname: options.cleanPathname,
+					completeness: "complete",
+					output: rscOutputScope,
+					params: options.params,
+					state: input.state
+				});
+			},
 			dynamicUsedDuringBuild,
 			getPageTags() {
 				return options.getPageTags();
@@ -206,6 +256,7 @@ async function renderAppPageLifecycle(options) {
 				capturedRscDataRef,
 				fontData,
 				navigationContext: options.getNavigationContext(),
+				basePath: options.basePath,
 				formState: options.formState ?? null,
 				rscStream: rscForResponse,
 				scriptNonce: options.scriptNonce,
@@ -290,6 +341,31 @@ async function renderAppPageLifecycle(options) {
 			capturedRscDataPromise: capturedRscDataRef.value,
 			cleanPathname: options.cleanPathname,
 			consumeDynamicUsage: options.consumeDynamicUsage,
+			consumeRenderObservationState: options.consumeRenderObservationState,
+			createHtmlRenderObservation(input) {
+				return createAppPageRenderObservation({
+					boundaryOutcome: { kind: "success" },
+					cacheability: "public",
+					cacheTags: input.cacheTags,
+					cleanPathname: options.cleanPathname,
+					completeness: "complete",
+					output: htmlOutputScope,
+					params: options.params,
+					state: input.state
+				});
+			},
+			createRscRenderObservation(input) {
+				return createAppPageRenderObservation({
+					boundaryOutcome: { kind: "success" },
+					cacheability: "public",
+					cacheTags: input.cacheTags,
+					cleanPathname: options.cleanPathname,
+					completeness: "complete",
+					output: rscOutputScope,
+					params: options.params,
+					state: input.state
+				});
+			},
 			getPageTags() {
 				return options.getPageTags();
 			},