@nifrajs/web 4.0.0 → 5.0.0

package/src/query.ts

@@ -111,6 +111,12 @@ export interface DehydratedState {
     readonly data: unknown
     readonly updatedAt: number
   }>
+  /** The successful infinite queries, pages and page params. */
+  readonly infiniteQueries?: ReadonlyArray<{
+    readonly key: unknown
+    readonly data: InfiniteData<unknown, unknown>
+    readonly updatedAt: number
+  }>
 }
 
 /** The keyed query cache. One per app (a binding registers it like the router). */
@@ -125,8 +131,9 @@ export interface QueryClient {
     fn: (pageParam: P) => Promise<T>,
     options: InfiniteQueryOptions<T, P>,
   ) => InfiniteQueryHandle<T, P>
-  /** Mark matching cached queries stale and refetch the **mounted** ones (subscribers > 0). Array
-   * keys match by **prefix** (`["todo"]` ⇒ every `["todo", …]`); other keys match exactly. */
+  /** Mark matching cached queries, infinite ones included, stale and refetch the **mounted** ones
+   * (subscribers > 0). Array keys match by **prefix** (`["todo"]` ⇒ every `["todo", …]`); other keys
+   * match exactly. */
   invalidateQueries: (keyOrPrefix: unknown) => void
   /** Read a cached query's data (`undefined` if absent or not yet successful). Synchronous, no fetch. */
   getQueryData: <T>(key: unknown) => T | undefined
@@ -218,17 +225,24 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
 
   // Lazily evict entries whose GC timer has elapsed (no subscribers), then enforce the hard cap by
   // dropping the oldest-inserted unsubscribed entries. Called on every `query()` - no background timer.
-  const sweep = (): void => {
-    const t = now()
-    for (const [h, e] of cache) {
-      if (e.subscribers === 0 && e.gcAt !== undefined && t >= e.gcAt) cache.delete(h)
+  const sweepEntries = (
+    entries: Map<string, { readonly subscribers: number; readonly gcAt: number | undefined }>,
+    t: number,
+  ): void => {
+    for (const [h, e] of entries) {
+      if (e.subscribers === 0 && e.gcAt !== undefined && t >= e.gcAt) entries.delete(h)
     }
-    if (cache.size <= max) return
-    for (const [h, e] of cache) {
-      if (cache.size <= max) break
-      if (e.subscribers === 0) cache.delete(h) // oldest-inserted unsubscribed first (Map order)
+    if (entries.size <= max) return
+    for (const [h, e] of entries) {
+      if (entries.size <= max) break
+      if (e.subscribers === 0) entries.delete(h) // oldest-inserted unsubscribed first (Map order)
     }
   }
+  const sweep = (): void => {
+    const t = now()
+    sweepEntries(cache, t)
+    sweepEntries(infinite, t)
+  }
 
   // Build a cache entry + its handle. `fn`/`staleTime` are mutated in place on re-bind (closures change
   // between renders). All the fetch/dedup/generation machinery lives here so query(), prefetchQuery(),
@@ -348,6 +362,9 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
       entry.generation++
       if (entry.subscribers > 0) void entry.handle.refetch().catch(() => {}) // refresh mounted now (best-effort)
     }
+    for (const entry of infinite.values()) {
+      if (keyMatchesPrefix(entry.key, keyOrPrefix)) entry.invalidate()
+    }
   }
 
   const getQueryData = <T>(key: unknown): T | undefined => {
@@ -392,7 +409,17 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
       if (entry.state.status === "success")
         queries.push({ key: entry.key, data: entry.state.data, updatedAt: entry.state.updatedAt })
     }
-    return { queries }
+    const infiniteQueries: Array<{
+      key: unknown
+      data: InfiniteData<unknown, unknown>
+      updatedAt: number
+    }> = []
+    for (const entry of infinite.values()) {
+      const { status, data, updatedAt } = entry.handle.snapshot()
+      if (status === "success" && data !== undefined)
+        infiniteQueries.push({ key: entry.key, data, updatedAt })
+    }
+    return { queries, infiniteQueries }
   }
 
   const hydrate = (state: DehydratedState): void => {
@@ -409,6 +436,14 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
       if (entry.state.status !== "success" || q.updatedAt > entry.state.updatedAt)
         entry.setState(successState(q.data, q.updatedAt))
     }
+    // An infinite entry needs its page options before it can exist, so a snapshot for a key not yet
+    // queried waits here until `infiniteQuery` creates it.
+    for (const q of state.infiniteQueries ?? []) {
+      const h = hashQueryKey(q.key)
+      const existing = infinite.get(h)
+      if (existing === undefined) seeded.set(h, q)
+      else existing.seed(q.data, q.updatedAt)
+    }
   }
 
   // --- Infinite (paged) queries -----------------------------------------------------------------
@@ -427,19 +462,33 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
       )
       return existing.handle as InfiniteQueryHandle<T, P>
     }
-    const created = makeInfinite<T, P>(fn, opts)
+    const created = makeInfinite<T, P>(key, fn, opts)
     infinite.set(h, created as InfiniteEntry<unknown, unknown>)
+    const snapshot = seeded.get(h)
+    if (snapshot !== undefined) {
+      seeded.delete(h)
+      created.seed(snapshot.data, snapshot.updatedAt)
+    }
     return created.handle
   }
 
   // Infinite entries live in their own map (their data shape + fetch model differ from plain queries).
   interface InfiniteEntry<T, P> {
+    readonly key: unknown
     handle: InfiniteQueryHandle<T, P>
     rebind: (fn: (p: P) => Promise<T>, opts: InfiniteQueryOptions<T, P>) => void
+    /** Mark stale, drop an in-flight fetch's result, and refetch when mounted. */
+    invalidate: () => void
+    /** Take a dehydrated snapshot unless the entry already holds fresher data. */
+    seed: (data: InfiniteData<unknown, unknown>, updatedAt: number) => void
+    subscribers: number
+    gcAt: number | undefined
   }
   const infinite = new Map<string, InfiniteEntry<unknown, unknown>>()
+  const seeded = new Map<string, NonNullable<DehydratedState["infiniteQueries"]>[number]>()
 
   const makeInfinite = <T, P>(
+    key: unknown,
     fetchPage: (pageParam: P) => Promise<T>,
     initialOpts: InfiniteQueryOptions<T, P>,
   ): InfiniteEntry<T, P> => {
@@ -447,6 +496,7 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
     let opts = initialOpts
     let state: QueryState<InfiniteData<T, P>> = PENDING as QueryState<InfiniteData<T, P>>
     let generation = 0
+    let invalidated = false
     let promise: Promise<InfiniteData<T, P>> | undefined
     const listeners = new Set<() => void>()
     const emit = (): void => {
@@ -475,7 +525,8 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
         data.pageParams,
       )
     }
-    const isStale = (): boolean => now() - state.updatedAt >= (opts.staleTime ?? defaultStaleTime)
+    const isStale = (): boolean =>
+      invalidated || now() - state.updatedAt >= (opts.staleTime ?? defaultStaleTime)
 
     // Run a paged operation under a fresh generation, guarding against a superseding op (like `run`).
     const runPaged = (build: () => Promise<InfiniteData<T, P>>): Promise<InfiniteData<T, P>> => {
@@ -486,6 +537,7 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
         try {
           const data = await build()
           if (gen !== generation) return data
+          invalidated = false
           setState(successState(data, now()))
           return data
         } catch (error) {
@@ -511,9 +563,13 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
     const handle: InfiniteQueryHandle<T, P> = {
       snapshot: () => state,
       subscribe: (listener) => {
+        entry.subscribers++
+        entry.gcAt = undefined
         listeners.add(listener)
         return () => {
           listeners.delete(listener)
+          entry.subscribers--
+          if (entry.subscribers === 0) entry.gcAt = now() + gcTime
         }
       },
       fetch: () => fetchFirst(false),
@@ -558,13 +614,30 @@ export function createQueryClient(options: QueryClientOptions): QueryClient {
         return p !== undefined && p !== null
       },
     }
-    return {
-      handle: handle as InfiniteQueryHandle<unknown, unknown>,
+    const entry: InfiniteEntry<T, P> = {
+      key,
+      handle,
       rebind: (nextFn, nextOpts) => {
         fn = nextFn
         opts = nextOpts
       },
-    } as InfiniteEntry<T, P>
+      invalidate: () => {
+        invalidated = true
+        // A fetch begun before this point read pre-mutation data: it may not publish, and a new fetch
+        // must not join it.
+        generation++
+        promise = undefined
+        if (entry.subscribers > 0) void handle.refetch().catch(() => {})
+      },
+      seed: (data, updatedAt) => {
+        if (state.status === "success" && state.updatedAt >= updatedAt) return
+        // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: the snapshot was dehydrated from an entry under this key, whose pages and params are T and P
+        setState(successState(data as InfiniteData<T, P>, updatedAt))
+      },
+      subscribers: 0,
+      gcAt: undefined,
+    }
+    return entry
   }
 
   return {
@@ -609,8 +682,10 @@ export interface MutationCallbacks<TData, TVariables> {
 export interface MutationHandle<TData, TVariables> {
   snapshot: () => MutationState<TData, TVariables>
   subscribe: (listener: () => void) => () => void
-  /** Run the mutation. Resolves to the data (and runs onSuccess/onSettled) or rejects (onError/onSettled).
-   * The latest concurrent call wins the published state (older results are dropped). */
+  /** Run the mutation. Resolves to the data (and runs onSuccess/onSettled) or rejects (onError/onSettled);
+   * a throwing `onMutate` fails it the same way. A throwing `onSuccess` or `onSettled` after the write
+   * rejects the call but leaves the state `success` and never calls `onError`. The latest concurrent
+   * call wins the published state (older results are dropped). */
   mutate: (variables: TVariables) => Promise<TData>
   /** Rebind the latest `fn`/callbacks (closures change between renders) without losing state. */
   rebind: (
@@ -667,21 +742,27 @@ export function createMutation<TData, TVariables>(
     mutate: async (variables) => {
       const mine = ++latest
       setState({ status: "pending", data: undefined, error: undefined, variables })
-      // Only await a callback when one is actually supplied - an `await undefined` would insert a
-      // needless microtask before the mutationFn runs (and complicates single-flight timing).
-      if (cbs.onMutate !== undefined) await cbs.onMutate(variables)
+      let data: TData
       try {
-        const data = await mutationFn(variables)
-        if (mine === latest) setState({ status: "success", data, error: undefined, variables })
-        if (cbs.onSuccess !== undefined) await cbs.onSuccess(data, variables)
-        if (cbs.onSettled !== undefined) await cbs.onSettled(data, undefined, variables)
-        return data
+        // Only await a callback when one is actually supplied - an `await undefined` would insert a
+        // needless microtask before the mutationFn runs (and complicates single-flight timing).
+        if (cbs.onMutate !== undefined) await cbs.onMutate(variables)
+        data = await mutationFn(variables)
       } catch (error) {
         if (mine === latest) setState({ status: "error", data: undefined, error, variables })
         if (cbs.onError !== undefined) await cbs.onError(error, variables)
         if (cbs.onSettled !== undefined) await cbs.onSettled(undefined, error, variables)
         throw error
       }
+      if (mine === latest) setState({ status: "success", data, error: undefined, variables })
+      // The write happened: a success callback that throws rejects the call, but is no failure of the
+      // write, so it never reaches onError (which would roll back what the server kept).
+      try {
+        if (cbs.onSuccess !== undefined) await cbs.onSuccess(data, variables)
+      } finally {
+        if (cbs.onSettled !== undefined) await cbs.onSettled(data, undefined, variables)
+      }
+      return data
     },
   }
 }

package/src/render-seam.ts

@@ -12,6 +12,7 @@ import type { Submission } from "./router.ts"
 
 /** The data handed to a route component. */
 export interface RenderProps {
+  readonly serverComponents?: import("./server-components/types.ts").ComponentState
   readonly data: unknown
   /** Per-layout loader data, aligned index-for-index with the layout prefix of `chain`. */
   readonly layoutData?: readonly unknown[]
@@ -123,5 +124,6 @@ export const ROUTE_GLOBAL = "__NIFRA_ROUTE__"
 export const ACTION_GLOBAL = "__NIFRA_ACTION__"
 /** Dynamic-boundary states for hydration; absent when a route declares no boundaries. */
 export const BOUNDARY_GLOBAL = "__NIFRA_BOUNDARIES__"
+export const COMPONENT_GLOBAL = "__NIFRA_COMPONENTS__"
 /** Marker attribute used to find a non-default hydration container. */
 export const ROOT_ATTRIBUTE = "data-nifra-root"

package/src/route-types.ts

@@ -30,6 +30,7 @@ import {
 } from "node:fs"
 import { dirname, join, relative } from "node:path"
 import { codeUnitOrder } from "./internal/code-unit-order.ts"
+import { jsStringLiteral } from "./internal/js-string.ts"
 import {
   buildManifest,
   isMiddlewareFile,
@@ -85,6 +86,8 @@ function routeFiles(manifest: Manifest): readonly RouteFile[] {
 const PARAM = /^\[([A-Za-z_][A-Za-z0-9_]*)\]$/
 const OPTIONAL = /^\[\[([A-Za-z_][A-Za-z0-9_]*)\]\]$/
 const CATCH_ALL = /^\[\.\.\.([A-Za-z_][A-Za-z0-9_]*)\]$/
+// A `[name]` inside a part-literal segment such as `post-[id]` or `[lang]-feed.xml`.
+const EMBEDDED_PARAM = /\[([A-Za-z_][A-Za-z0-9_]*)\]/g
 
 /** The params a route file's URL carries: its directories', plus its own name's for a page. */
 function paramsType(file: string, kind: Kind): string {
@@ -96,10 +99,20 @@ function paramsType(file: string, kind: Kind): string {
     const optional = OPTIONAL.exec(segment)
     const name = optional?.[1] ?? PARAM.exec(segment)?.[1] ?? CATCH_ALL.exec(segment)?.[1]
     if (name !== undefined) fields.push(`readonly ${name}${optional === null ? "" : "?"}: string`)
+    else
+      for (const embedded of segment.matchAll(EMBEDDED_PARAM))
+        fields.push(`readonly ${embedded[1]}: string`)
   }
   return fields.length === 0 ? "Record<string, never>" : `{ ${fields.join("; ")} }`
 }
 
+// A file name may hold a line terminator, which would end the `//` header comment it is quoted in.
+const commentSafe = (text: string): string =>
+  text.replace(
+    /[\n\r\u2028\u2029]/g,
+    (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`,
+  )
+
 /** A module specifier for `target` from a file in `fromDir`, without a script extension. */
 function specifier(fromDir: string, target: string): string {
   let path = posix(relative(fromDir, target))
@@ -121,16 +134,24 @@ function routeTypesModule(
   const backend = route.backend === undefined ? undefined : join(routesDir, route.backend)
   // Only a script module's exports are visible to TypeScript; a .svelte/.vue/.mdx one is an ambient shim.
   const frontend = /\.[jt]sx?$/.test(route.file) ? join(routesDir, route.file) : undefined
-  const lines = [`// Generated by nifra from ${label}. Do not edit: \`nifra types\` rewrites it.`]
+  const lines = [
+    `// Generated by nifra from ${commentSafe(label)}. Do not edit: \`nifra types\` rewrites it.`,
+  ]
   if (register !== undefined)
     lines.push(`/// <reference path="${posix(relative(dir, register))}" />`)
-  lines.push('import type { OutputOf, RouteLoaderArgs, SearchSchemaOf } from "@nifrajs/client"')
-  if (route.kind === "page") lines.push('import type { RenderProps } from "@nifrajs/web"')
+  lines.push(
+    'import type { OutputOf, RouteActionReturn, RouteLoaderArgs, RouteLoaderReturn, SearchSchemaOf } from "@nifrajs/client"',
+  )
+  lines.push(
+    route.kind === "page"
+      ? 'import type { MetaArgs as WebMetaArgs, RenderProps } from "@nifrajs/web"'
+      : 'import type { MetaArgs as WebMetaArgs } from "@nifrajs/web"',
+  )
   lines.push("")
   if (backend !== undefined)
-    lines.push(`type Backend = typeof import("${specifier(dir, backend)}")`)
+    lines.push(`type Backend = typeof import(${jsStringLiteral(specifier(dir, backend))})`)
   if (frontend !== undefined)
-    lines.push(`type Frontend = typeof import("${specifier(dir, frontend)}")`)
+    lines.push(`type Frontend = typeof import(${jsStringLiteral(specifier(dir, frontend))})`)
   if (backend !== undefined || frontend !== undefined) lines.push("")
   const output = (name: string) => (backend === undefined ? "null" : `OutputOf<Backend, "${name}">`)
   lines.push(
@@ -145,6 +166,12 @@ function routeTypesModule(
     `  export type LoaderArgs = RouteLoaderArgs<Params${frontend === undefined ? "" : ", SearchSchemaOf<Frontend>"}>`,
     "  /** The context the backend half's action receives. */",
     "  export type ActionArgs = LoaderArgs",
+    "  /** The backend half's loader. Annotate it, `export const loader: Route.Loader = ...`, and what it returns is checked against `loaderOutput`. */",
+    `  export type Loader = (args: LoaderArgs) => RouteLoaderReturn<${backend === undefined ? "null" : "Backend"}>`,
+    "  /** The backend half's action. Annotate it, `export const action: Route.Action = ...`, and what it returns is checked against `actionOutput`. */",
+    `  export type Action = (args: ActionArgs) => RouteActionReturn<${backend === undefined ? "null" : "Backend"}>`,
+    "  /** What this module's `meta` function receives: its own loader data as `data`. */",
+    "  export type MetaArgs = WebMetaArgs<LoaderData>",
   )
   if (route.kind === "page") {
     lines.push(
@@ -170,8 +197,8 @@ function routeTypesModule(
 
 function registerModule(out: string, backendApp: string, label: string): string {
   return [
-    `// Generated by nifra from ${label}. Do not edit: \`nifra types\` rewrites it.`,
-    `import type { backend } from "${specifier(dirname(out), backendApp)}"`,
+    `// Generated by nifra from ${commentSafe(label)}. Do not edit: \`nifra types\` rewrites it.`,
+    `import type { backend } from ${jsStringLiteral(specifier(dirname(out), backendApp))}`,
     "",
     'declare module "@nifrajs/client" {',
     "  interface Register {",

package/src/router.ts

@@ -9,6 +9,8 @@ import { Router as CoreRouter } from "@nifrajs/core/router"
 import type { StandardSchemaV1 } from "@nifrajs/core/server"
 import type { BoundaryDescriptor, BoundaryStates } from "./boundary.ts"
 import { parseNdjsonData } from "./deferred.ts"
+import { parsePageData } from "./internal/revive-dates.ts"
+import { requestPattern } from "./internal/route-path.ts"
 import type { ClientActionResult, ClientRequestBody, ClientRouteHooks } from "./manifest.ts"
 import type { MatchChain } from "./render-seam.ts"
 import { isClientOnlySearchChange } from "./search.ts"
@@ -90,6 +92,7 @@ export const NAV_FROM_HEADER = "x-nifra-from"
  * structure rather than by assuming the deploy was atomic.
  */
 export interface RouteDataEnvelope {
+  readonly serverComponents?: import("./server-components/types.ts").ComponentState | undefined
   readonly v: 1
   readonly data: unknown
   readonly layoutData?: readonly unknown[]
@@ -129,6 +132,7 @@ export interface Submission {
 
 /** The router's observable state. A new object is published on every transition. */
 export interface RouterState {
+  readonly serverComponents?: import("./server-components/types.ts").ComponentState | undefined
   readonly routeId: string
   readonly params: Record<string, string>
   /** The current URL path (used to revalidate the active loader after an action). */
@@ -173,7 +177,7 @@ export function createMatcher(
   for (const pattern of patterns) {
     // Pass the literal to the public router seam: package type resolution may point the two core
     // subpaths at different source/dist declarations, while registration-time compilation is cheap.
-    routeIndex.add("GET", pattern.pattern, pattern.routeId)
+    routeIndex.add("GET", requestPattern(pattern.pattern), pattern.routeId)
   }
   return (path) => {
     // Strip the query without allocating a `split("?")` array - matcher runs per match.
@@ -258,8 +262,9 @@ export interface ClientRouter {
    * loader is revalidated so the mutation is reflected. Pass `{ revalidate: false }` to SKIP that
    * revalidation - keep the current `data` and just publish the action's `actionData` (useful when
    * the action already returned everything that changed, saving the extra round-trip). A redirect
-   * always loads its target regardless. Rejects on failure (caller falls back); once the action has
-   * run, the rejection's `redirectTo` names the page to load instead of posting again.
+   * always loads its target regardless. Rejects on failure (caller falls back); once the server has
+   * answered, at any status, the rejection's `redirectTo` names the page to load instead of posting
+   * again.
    */
   submit: (
     action: string,
@@ -310,6 +315,10 @@ export interface ClientRouterOptions {
   /** Terminal status → client route id. Generated entries populate this from `_404` and
    * `_<status>` files so soft navigation renders the same boundary as a hard request. */
   readonly statusRoutes?: Readonly<Record<number, string>>
+  /** Status route ids whose page renders inside layouts (all but `inLayouts = false`), filled in by the generated entry's
+   * `loadModule`. A soft navigation that ends on one loads the URL as a document, as one ending on a
+   * nested `_404` does: only the server runs those layouts' loaders. */
+  readonly layoutStatusRoutes?: Readonly<Record<string, true>>
   /** routeId → the route's client-only search keys (its `searchClientKeys` export). When a soft
    * navigation stays on the same route + pathname and changes ONLY these keys, `navigate` publishes the
    * new URL WITHOUT re-running the loader (re-render, not revalidate). Populated lazily by the generated
@@ -346,7 +355,7 @@ export interface MountRouterOptions {
 const readResponseData = (res: Response, signal?: AbortSignal): Promise<unknown> =>
   (res.headers.get("content-type") ?? "").includes("application/x-ndjson") && res.body !== null
     ? parseNdjsonData(res.body, signal)
-    : res.json()
+    : res.text().then(parsePageData)
 
 // Index scan, not `/\/+$/` - the unanchored-start trailing-run replace backtracks quadratically and
 // the pathname is caller-controlled.
@@ -404,8 +413,8 @@ const targetUrl = (to: string): URL | undefined => {
   }
 }
 
-const redirected = (to: string): Error =>
-  Object.assign(new Error(`[nifra/web] redirected to ${to}`), { redirectTo: to })
+const redirected = (to: string, cause?: unknown): Error =>
+  Object.assign(new Error(`[nifra/web] redirected to ${to}`, { cause }), { redirectTo: to })
 
 const defaultFetchData: FetchRouteData = async (path, _match, signal, navigation) => {
   // SSG fast path: if this path was prerendered, its loader data is a static file - fetch that (no
@@ -519,11 +528,18 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
    * an older build be read by newer client code.
    */
   type LoadedRouteData = {
+    readonly serverComponents?: import("./server-components/types.ts").ComponentState | undefined
     readonly data: unknown
     readonly layoutData?: readonly unknown[] | undefined
     readonly terminalRouteId?: string | undefined
     readonly boundaries?: BoundaryStates
   }
+  const dataFields = (value: LoadedRouteData) => ({
+    data: value.data,
+    layoutData: value.layoutData,
+    serverComponents: value.serverComponents,
+    ...(value.boundaries === undefined ? {} : { boundaries: value.boundaries }),
+  })
   const loadRouteData = async (
     path: string,
     match: { routeId: string; params: Record<string, string> },
@@ -551,24 +567,21 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
       }
       return { data: null, terminalRouteId }
     }
-    if (retainFrom === undefined || payload.retained === undefined) {
-      return {
-        data: payload.data,
-        layoutData: payload.layoutData,
-        ...(payload.boundaries !== undefined ? { boundaries: payload.boundaries } : {}),
-      }
+    let layoutData = payload.layoutData
+    if (retainFrom !== undefined && payload.retained !== undefined) {
+      const retained = new Set(
+        payload.retained.filter(
+          (index) => Number.isInteger(index) && index >= 0 && index < retainFrom.layoutData.length,
+        ),
+      )
+      layoutData = layoutData?.map((value, index) =>
+        retained.has(index) ? retainFrom.layoutData[index] : value,
+      )
     }
-    const retained = new Set(
-      payload.retained.filter(
-        (index) => Number.isInteger(index) && index >= 0 && index < retainFrom.layoutData.length,
-      ),
-    )
-    const layoutData = payload.layoutData?.map((value, index) =>
-      retained.has(index) ? retainFrom.layoutData[index] : value,
-    )
     return {
       data: payload.data,
       layoutData,
+      serverComponents: payload.serverComponents,
       ...(payload.boundaries !== undefined ? { boundaries: payload.boundaries } : {}),
     }
   }
@@ -644,11 +657,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
     navAbort?.abort()
     const ac = new AbortController()
     navAbort = ac
-    const initial = {
-      data: state.data,
-      layoutData: state.layoutData,
-      ...(state.boundaries !== undefined ? { boundaries: state.boundaries } : {}),
-    }
+    const initial = dataFields(state)
     const loaded = await applyClientLoader(
       state.path,
       route,
@@ -663,9 +672,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
     } else {
       state = {
         ...state,
-        data: loaded.data,
-        layoutData: loaded.layoutData,
-        ...(loaded.boundaries !== undefined ? { boundaries: loaded.boundaries } : {}),
+        ...dataFields(loaded),
       }
     }
     emit()
@@ -707,6 +714,10 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
     }
   >()
   const cachePut = (path: string, loaded: LoadedRouteData): void => {
+    if (loaded.serverComponents !== undefined) {
+      cache.delete(path)
+      return
+    }
     if (!cache.has(path) && cache.size >= MAX_CACHE) {
       const oldest = cache.keys().next().value
       if (oldest !== undefined) cache.delete(oldest)
@@ -789,7 +800,14 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
           () => loadRouteData(at, route, signal, keepLayouts),
           prefetchedData,
         )
-        if (loaded.terminalRouteId !== undefined) await loadModule?.(loaded.terminalRouteId)
+        if (loaded.terminalRouteId !== undefined) {
+          await loadModule?.(loaded.terminalRouteId)
+          if (options.layoutStatusRoutes?.[loaded.terminalRouteId] === true) {
+            throw new Error(
+              `[nifra/web] ${loaded.terminalRouteId} renders inside layouts; loading ${at} as a document`,
+            )
+          }
+        }
         return [at, route, loaded]
       } catch (error) {
         const next = hops < 20 ? appRedirect(redirectOf(error)) : undefined
@@ -817,9 +835,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
       cachePut(state.path, loaded)
       state = {
         ...state,
-        data: loaded.data,
-        layoutData: loaded.layoutData,
-        ...(loaded.boundaries !== undefined ? { boundaries: loaded.boundaries } : {}),
+        ...dataFields(loaded),
         pending: false,
       }
       emit()
@@ -989,11 +1005,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
       ) {
         ++generation // supersede any in-flight navigation so its late result is dropped
         navAbort?.abort()
-        cachePut(path, {
-          data: state.data,
-          layoutData: state.layoutData,
-          ...(state.boundaries !== undefined ? { boundaries: state.boundaries } : {}),
-        })
+        cachePut(path, dataFields(state))
         state = { ...state, path, pending: false, pendingPath: undefined }
         emit()
         return
@@ -1041,9 +1053,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
           routeId: loaded.terminalRouteId ?? target.routeId,
           params: loaded.terminalRouteId === undefined ? target.params : {},
           path: to,
-          data: loaded.data,
-          layoutData: loaded.layoutData,
-          ...(loaded.boundaries !== undefined ? { boundaries: loaded.boundaries } : {}),
+          ...dataFields(loaded),
           actionData: undefined, // a fresh navigation has no action result
           pending: false,
         }
@@ -1089,8 +1099,9 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
           body: prepared.body,
           headers: { [DATA_HEADER]: "1" },
         })
-        if (!res.ok) throw new Error(`[nifra/web] action failed (${res.status}): ${action}`)
+        // Whatever the status, the server took the POST: the action may have run before it failed.
         posted = true
+        if (!res.ok) throw new Error(`[nifra/web] action failed (${res.status}): ${action}`)
         const redirectTo = res.headers.get(REDIRECT_HEADER)
         if (redirectTo !== null) {
           // The action redirected (Post/Redirect/Get) - treat it as a client navigation.
@@ -1114,9 +1125,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
             routeId: loaded.terminalRouteId ?? target.routeId,
             params: loaded.terminalRouteId === undefined ? target.params : {},
             path: to,
-            data: loaded.data,
-            layoutData: loaded.layoutData,
-            ...(loaded.boundaries !== undefined ? { boundaries: loaded.boundaries } : {}),
+            ...dataFields(loaded),
             actionData: undefined,
             pending: false,
           }
@@ -1137,9 +1146,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
         const active = { routeId: state.routeId, params: state.params }
         const loaded = skipActive
           ? {
-              data: state.data,
-              layoutData: state.layoutData,
-              ...(state.boundaries !== undefined ? { boundaries: state.boundaries } : {}),
+              ...dataFields(state),
             }
           : await applyClientLoader(state.path, active, ac.signal, () =>
               loadRouteData(state.path, active, ac.signal),
@@ -1154,9 +1161,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
           routeId: state.routeId,
           params: state.params,
           path: state.path,
-          data: loaded.data,
-          layoutData: loaded.layoutData,
-          ...(loaded.boundaries !== undefined ? { boundaries: loaded.boundaries } : {}),
+          ...dataFields(loaded),
           actionData,
           pending: false,
         }
@@ -1172,9 +1177,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
             routeId: state.routeId,
             params: state.params,
             path: state.path,
-            data: state.data,
-            layoutData: state.layoutData,
-            ...(state.boundaries !== undefined ? { boundaries: state.boundaries } : {}),
+            ...dataFields(state),
             actionData: previousActionData,
             pending: false,
           }
@@ -1182,7 +1185,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
         }
         if (!posted) throw err
         if (mine !== generation) return // a newer navigation or submit owns the page
-        throw redirectOf(err) === undefined ? redirected(landing ?? state.path) : err
+        throw redirectOf(err) === undefined ? redirected(landing ?? state.path, err) : err
       }
     },
     hydrate,
@@ -1216,7 +1219,7 @@ export function createClientRouter(options: ClientRouterOptions): ClientRouter {
           const oldest = prefetched.keys().next().value
           if (oldest !== undefined) prefetched.delete(oldest)
         }
-        prefetched.set(path, [loaded, Date.now()])
+        if (loaded.serverComponents === undefined) prefetched.set(path, [loaded, Date.now()])
       } catch {
         // Best-effort: a failed prefetch just means the eventual navigate fetches normally.
       } finally {

package/src/server-components/build-info.ts

@@ -0,0 +1,11 @@
+declare const __NIFRA_COMPONENT_BUILD__: string
+
+/** The coordinated compiler replaces this value in every environment. */
+export const componentBuild: string =
+  typeof __NIFRA_COMPONENT_BUILD__ === "string"
+    ? __NIFRA_COMPONENT_BUILD__
+    : (() => {
+        throw new Error(
+          "[nifra/components] build-info requires serverComponentsConfig or nifra build",
+        )
+      })()