vinext 0.0.46 → 0.0.47

package/dist/server/app-browser-navigation-controller.js

@@ -0,0 +1,282 @@
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState } from "../shims/navigation.js";
+import { createPendingNavigationCommit, resolveAndClassifyNavigationCommit, resolvePendingNavigationCommitDisposition, routerReducer } from "./app-browser-state.js";
+import { startTransition, useLayoutEffect } from "react";
+//#region src/server/app-browser-navigation-controller.ts
+function createAppBrowserNavigationController(deps = {}) {
+	const commitClientNavigationStateImpl = deps.commitClientNavigationState ?? commitClientNavigationState;
+	let nextNavigationRenderId = 0;
+	let activeNavigationId = 0;
+	const pendingNavigationCommits = /* @__PURE__ */ new Map();
+	const pendingNavigationPrePaintEffects = /* @__PURE__ */ new Map();
+	let setBrowserRouterState = null;
+	let browserRouterStateRef = null;
+	let activePendingBrowserRouterState = null;
+	let resolveBrowserRouterStateReady = null;
+	let browserRouterStateReadyPromise = null;
+	let browserRouterStateHasCommitted = false;
+	function getBrowserRouterStateSetter() {
+		if (!setBrowserRouterState) throw new Error("[vinext] Browser router state setter is not initialized");
+		return setBrowserRouterState;
+	}
+	function getBrowserRouterState() {
+		if (!browserRouterStateRef) throw new Error("[vinext] Browser router state is not initialized");
+		return browserRouterStateRef.current;
+	}
+	function waitForBrowserRouterStateReady() {
+		if (browserRouterStateRef || browserRouterStateHasCommitted) return Promise.resolve();
+		if (!browserRouterStateReadyPromise) browserRouterStateReadyPromise = new Promise((resolve) => {
+			resolveBrowserRouterStateReady = resolve;
+		});
+		return browserRouterStateReadyPromise;
+	}
+	function markBrowserRouterStateReady() {
+		browserRouterStateHasCommitted = true;
+		const resolveReady = resolveBrowserRouterStateReady;
+		resolveBrowserRouterStateReady = null;
+		browserRouterStateReadyPromise = null;
+		resolveReady?.();
+	}
+	function beginNavigation() {
+		activeNavigationId += 1;
+		return activeNavigationId;
+	}
+	function allocateRenderId() {
+		nextNavigationRenderId += 1;
+		return nextNavigationRenderId;
+	}
+	function hasBrowserRouterState() {
+		return browserRouterStateRef !== null;
+	}
+	function isCurrentNavigation(navId) {
+		return navId === activeNavigationId;
+	}
+	function beginPendingBrowserRouterState() {
+		const setter = getBrowserRouterStateSetter();
+		if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {
+			activePendingBrowserRouterState.settled = true;
+			activePendingBrowserRouterState.resolve(getBrowserRouterState());
+		}
+		let resolvePending;
+		const promise = new Promise((resolve) => {
+			resolvePending = resolve;
+		});
+		if (!resolvePending) throw new Error("[vinext] Failed to initialize browser router promise");
+		const pending = {
+			promise,
+			resolve: resolvePending,
+			settled: false
+		};
+		activePendingBrowserRouterState = pending;
+		setter(promise);
+		return pending;
+	}
+	function settlePendingBrowserRouterState(pending) {
+		if (!pending || pending.settled) return;
+		pending.settled = true;
+		pending.resolve(getBrowserRouterState());
+		if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
+	}
+	function finalizeNavigation(navId, pending) {
+		settlePendingBrowserRouterState(pending);
+		if (isCurrentNavigation(navId)) clearPendingPathname(navId);
+	}
+	function resolvePendingBrowserRouterState(pending, action) {
+		if (!pending || pending.settled) return;
+		pending.settled = true;
+		pending.resolve(routerReducer(getBrowserRouterState(), action));
+		if (activePendingBrowserRouterState === pending) activePendingBrowserRouterState = null;
+	}
+	function queuePrePaintNavigationEffect(renderId, effect) {
+		if (!effect) return;
+		pendingNavigationPrePaintEffects.set(renderId, effect);
+	}
+	/**
+	* Run all queued pre-paint effects for renderIds up to and including the
+	* given renderId. When React supersedes a startTransition update (rapid
+	* clicks on same-route links), the superseded NavigationCommitSignal never
+	* mounts, so its pre-paint effect never fires. By draining all effects
+	* <= the committed renderId here, the winning transition cleans up after
+	* any superseded ones, keeping the counter balanced.
+	*
+	* Invariant: each superseded navigation gets a commitClientNavigationState()
+	* to balance the activateNavigationSnapshot() from its renderNavigationPayload call.
+	*/
+	function drainPrePaintEffects(upToRenderId) {
+		for (const [id, effect] of pendingNavigationPrePaintEffects) {
+			if (id > upToRenderId) continue;
+			pendingNavigationPrePaintEffects.delete(id);
+			if (id === upToRenderId) effect();
+			else commitClientNavigationStateImpl(void 0, { releaseSnapshot: true });
+		}
+	}
+	/**
+	* Resolve all pending navigation commits with renderId <= the committed renderId.
+	* Note: Map iteration handles concurrent deletion safely — entries are visited in
+	* insertion order and deletion doesn't affect the iterator's view of remaining entries.
+	* This pattern is also used in drainPrePaintEffects with the same semantics.
+	*/
+	function resolveCommittedNavigations(renderId) {
+		for (const [pendingId, resolve] of pendingNavigationCommits) {
+			if (pendingId > renderId) continue;
+			pendingNavigationCommits.delete(pendingId);
+			resolve();
+		}
+	}
+	async function hmrReplaceTree(nextElements, navigationSnapshot) {
+		if (!hasBrowserRouterState()) return;
+		const pending = await createPendingNavigationCommit({
+			currentState: getBrowserRouterState(),
+			nextElements,
+			navigationSnapshot,
+			renderId: allocateRenderId(),
+			type: "replace"
+		});
+		if (!hasBrowserRouterState()) return;
+		dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "replace", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
+	}
+	function NavigationCommitSignal({ renderId, children }) {
+		useLayoutEffect(() => {
+			drainPrePaintEffects(renderId);
+			const frame = requestAnimationFrame(() => {
+				resolveCommittedNavigations(renderId);
+			});
+			return () => {
+				cancelAnimationFrame(frame);
+				resolveCommittedNavigations(renderId);
+			};
+		}, [renderId]);
+		return children;
+	}
+	function dispatchBrowserTree(elements, navigationSnapshot, renderId, actionType, interceptionContext, layoutFlags, previousNextUrl, routeId, rootLayoutTreePath, pendingRouterState, useTransitionMode) {
+		const setter = getBrowserRouterStateSetter();
+		const action = {
+			elements,
+			interceptionContext,
+			layoutFlags,
+			navigationSnapshot,
+			previousNextUrl,
+			renderId,
+			rootLayoutTreePath,
+			routeId,
+			type: actionType
+		};
+		const applyAction = () => {
+			if (pendingRouterState) {
+				resolvePendingBrowserRouterState(pendingRouterState, action);
+				return;
+			}
+			setter(routerReducer(getBrowserRouterState(), action));
+		};
+		if (useTransitionMode) startTransition(applyAction);
+		else applyAction();
+	}
+	async function renderNavigationPayload(options) {
+		const renderId = allocateRenderId();
+		let resolveCommitted;
+		const committed = new Promise((resolve) => {
+			resolveCommitted = resolve;
+			pendingNavigationCommits.set(renderId, resolve);
+		});
+		let snapshotActivated = false;
+		try {
+			const currentState = getBrowserRouterState();
+			const pending = await createPendingNavigationCommit({
+				currentState,
+				nextElements: options.nextElements,
+				navigationSnapshot: options.navigationSnapshot,
+				previousNextUrl: options.previousNextUrl,
+				renderId,
+				type: options.actionType
+			});
+			const disposition = resolvePendingNavigationCommitDisposition({
+				activeNavigationId,
+				currentRootLayoutTreePath: currentState.rootLayoutTreePath,
+				nextRootLayoutTreePath: pending.rootLayoutTreePath,
+				startedNavigationId: options.navId
+			});
+			if (disposition === "skip") {
+				settlePendingBrowserRouterState(options.pendingRouterState);
+				pendingNavigationCommits.delete(renderId);
+				resolveCommitted?.();
+				return;
+			}
+			if (disposition === "hard-navigate") {
+				settlePendingBrowserRouterState(options.pendingRouterState);
+				pendingNavigationCommits.delete(renderId);
+				window.location.assign(options.targetHref);
+				return;
+			}
+			queuePrePaintNavigationEffect(renderId, options.createNavigationCommitEffect({
+				href: options.targetHref,
+				historyUpdateMode: options.historyUpdateMode,
+				navId: options.navId,
+				params: options.params,
+				previousNextUrl: pending.previousNextUrl
+			}));
+			activateNavigationSnapshot();
+			snapshotActivated = true;
+			dispatchBrowserTree(pending.action.elements, options.navigationSnapshot, renderId, options.actionType, pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, options.pendingRouterState, options.useTransition ?? true);
+		} catch (error) {
+			pendingNavigationPrePaintEffects.delete(renderId);
+			pendingNavigationCommits.delete(renderId);
+			if (snapshotActivated) commitClientNavigationStateImpl(options.navId);
+			settlePendingBrowserRouterState(options.pendingRouterState);
+			resolveCommitted?.();
+			throw error;
+		}
+		return committed;
+	}
+	async function commitSameUrlNavigatePayload(nextElements, navigationSnapshot, returnValue) {
+		const currentState = getBrowserRouterState();
+		const startedNavigationId = activeNavigationId;
+		const { disposition, pending } = await resolveAndClassifyNavigationCommit({
+			activeNavigationId,
+			currentState,
+			navigationSnapshot,
+			nextElements,
+			renderId: allocateRenderId(),
+			startedNavigationId,
+			type: "navigate"
+		});
+		if (disposition === "hard-navigate") {
+			window.location.assign(window.location.href);
+			return;
+		}
+		if (disposition === "dispatch") dispatchBrowserTree(pending.action.elements, navigationSnapshot, pending.action.renderId, "navigate", pending.interceptionContext, pending.action.layoutFlags, pending.previousNextUrl, pending.routeId, pending.rootLayoutTreePath, null, false);
+		if (returnValue) {
+			if (!returnValue.ok) throw returnValue.data;
+			return returnValue.data;
+		}
+	}
+	function attachBrowserRouterState(setter, stateRef) {
+		setBrowserRouterState = setter;
+		browserRouterStateRef = stateRef;
+		markBrowserRouterStateReady();
+		return () => {
+			if (setBrowserRouterState === setter) setBrowserRouterState = null;
+			if (browserRouterStateRef === stateRef) {
+				browserRouterStateRef = null;
+				browserRouterStateHasCommitted = false;
+			}
+		};
+	}
+	return {
+		beginNavigation,
+		hasBrowserRouterState,
+		getBrowserRouterState,
+		isCurrentNavigation,
+		waitForBrowserRouterStateReady,
+		attachBrowserRouterState,
+		beginPendingBrowserRouterState,
+		finalizeNavigation,
+		renderNavigationPayload,
+		commitSameUrlNavigatePayload,
+		hmrReplaceTree,
+		drainPrePaintEffects,
+		NavigationCommitSignal
+	};
+}
+//#endregion
+export { createAppBrowserNavigationController };
+
+//# sourceMappingURL=app-browser-navigation-controller.js.map

package/dist/server/app-browser-navigation-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-browser-navigation-controller.js","names":[],"sources":["../../src/server/app-browser-navigation-controller.ts"],"sourcesContent":["import { startTransition, useLayoutEffect, type Dispatch, type ReactNode } from \"react\";\nimport {\n  activateNavigationSnapshot,\n  clearPendingPathname,\n  commitClientNavigationState,\n} from \"vinext/shims/navigation\";\nimport type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport {\n  createPendingNavigationCommit,\n  resolveAndClassifyNavigationCommit,\n  resolvePendingNavigationCommitDisposition,\n  routerReducer,\n  type AppRouterAction,\n  type AppRouterState,\n} from \"./app-browser-state.js\";\nimport type { AppElements, LayoutFlags } from \"./app-elements.js\";\n\nexport type HistoryUpdateMode = \"push\" | \"replace\";\n\nexport type PendingBrowserRouterState = {\n  promise: Promise<AppRouterState>;\n  resolve: (state: AppRouterState) => void;\n  settled: boolean;\n};\n\ntype BrowserNavigationCommitEffectFactory = (options: {\n  href: string;\n  historyUpdateMode: HistoryUpdateMode | undefined;\n  navId: number;\n  params: Record<string, string | string[]>;\n  previousNextUrl: string | null;\n}) => () => void;\n\ntype BrowserRouterStateRef = {\n  current: AppRouterState;\n};\n\ntype BrowserNavigationControllerDeps = {\n  commitClientNavigationState?: typeof commitClientNavigationState;\n};\n\ntype BrowserNavigationController = {\n  beginNavigation(): number;\n  hasBrowserRouterState(): boolean;\n  getBrowserRouterState(): AppRouterState;\n  isCurrentNavigation(navId: number): boolean;\n  waitForBrowserRouterStateReady(): Promise<void>;\n  attachBrowserRouterState(\n    setter: Dispatch<AppRouterState | Promise<AppRouterState>>,\n    stateRef: BrowserRouterStateRef,\n  ): () => void;\n  beginPendingBrowserRouterState(): PendingBrowserRouterState;\n  finalizeNavigation(navId: number, pending: PendingBrowserRouterState | null | undefined): void;\n  renderNavigationPayload(options: {\n    actionType: \"navigate\" | \"replace\" | \"traverse\";\n    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;\n    historyUpdateMode: HistoryUpdateMode | undefined;\n    navigationSnapshot: ClientNavigationRenderSnapshot;\n    nextElements: Promise<AppElements>;\n    params: Record<string, string | string[]>;\n    pendingRouterState: PendingBrowserRouterState | null;\n    previousNextUrl: string | null;\n    targetHref: string;\n    navId: number;\n    useTransition?: boolean;\n  }): Promise<void>;\n  commitSameUrlNavigatePayload(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    returnValue?: { ok: boolean; data: unknown },\n  ): Promise<unknown>;\n  hmrReplaceTree(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n  ): Promise<void>;\n  /**\n   * Force-drain the queued pre-paint effect for the given renderId without\n   * waiting for NavigationCommitSignal to commit. Used by the dev recovery\n   * boundary in app-browser-entry.ts: when a render error replaces\n   * NavigationCommitSignal with the boundary's null fallback, its\n   * useLayoutEffect never fires, so the URL update for the in-flight\n   * navigation would otherwise be lost.\n   */\n  drainPrePaintEffects(renderId: number): void;\n  NavigationCommitSignal(\n    this: void,\n    {\n      renderId,\n      children,\n    }: {\n      renderId: number;\n      children?: ReactNode;\n    },\n  ): ReactNode;\n};\n\nexport function createAppBrowserNavigationController(\n  deps: BrowserNavigationControllerDeps = {},\n): BrowserNavigationController {\n  const commitClientNavigationStateImpl =\n    deps.commitClientNavigationState ?? commitClientNavigationState;\n\n  // These are plain module-level variables (inside the controller closure),\n  // unlike ClientNavigationState which uses Symbol.for to survive multiple\n  // Vite module instances. The browser entry is loaded exactly once (via the\n  // RSC plugin's generated bootstrap), so the controller running in a single\n  // module instance is safe. If that assumption ever changes, these should be\n  // migrated to a Symbol.for-backed global.\n  //\n  // The most severe consequence of multiple instances would be Map fragmentation:\n  // pendingNavigationCommits and pendingNavigationPrePaintEffects would split\n  // across instances, so drainPrePaintEffects in one instance could never drain\n  // effects queued by the other, permanently leaking navigationSnapshotActiveCount\n  // and causing hooks to prefer stale snapshot values indefinitely.\n  let nextNavigationRenderId = 0;\n  let activeNavigationId = 0;\n  const pendingNavigationCommits = new Map<number, () => void>();\n  const pendingNavigationPrePaintEffects = new Map<number, () => void>();\n\n  let setBrowserRouterState: Dispatch<AppRouterState | Promise<AppRouterState>> | null = null;\n  let browserRouterStateRef: BrowserRouterStateRef | null = null;\n  let activePendingBrowserRouterState: PendingBrowserRouterState | null = null;\n  let resolveBrowserRouterStateReady: (() => void) | null = null;\n  let browserRouterStateReadyPromise: Promise<void> | null = null;\n  let browserRouterStateHasCommitted = false;\n\n  function getBrowserRouterStateSetter(): Dispatch<AppRouterState | Promise<AppRouterState>> {\n    if (!setBrowserRouterState) {\n      throw new Error(\"[vinext] Browser router state setter is not initialized\");\n    }\n    return setBrowserRouterState;\n  }\n\n  function getBrowserRouterState(): AppRouterState {\n    if (!browserRouterStateRef) {\n      throw new Error(\"[vinext] Browser router state is not initialized\");\n    }\n    return browserRouterStateRef.current;\n  }\n\n  function waitForBrowserRouterStateReady(): Promise<void> {\n    if (browserRouterStateRef || browserRouterStateHasCommitted) {\n      return Promise.resolve();\n    }\n\n    if (!browserRouterStateReadyPromise) {\n      browserRouterStateReadyPromise = new Promise((resolve) => {\n        resolveBrowserRouterStateReady = resolve;\n      });\n    }\n\n    return browserRouterStateReadyPromise;\n  }\n\n  function markBrowserRouterStateReady(): void {\n    browserRouterStateHasCommitted = true;\n    const resolveReady = resolveBrowserRouterStateReady;\n    resolveBrowserRouterStateReady = null;\n    browserRouterStateReadyPromise = null;\n    resolveReady?.();\n  }\n\n  function beginNavigation(): number {\n    activeNavigationId += 1;\n    return activeNavigationId;\n  }\n\n  function allocateRenderId(): number {\n    nextNavigationRenderId += 1;\n    return nextNavigationRenderId;\n  }\n\n  function hasBrowserRouterState(): boolean {\n    return browserRouterStateRef !== null;\n  }\n\n  function isCurrentNavigation(navId: number): boolean {\n    return navId === activeNavigationId;\n  }\n\n  function beginPendingBrowserRouterState(): PendingBrowserRouterState {\n    const setter = getBrowserRouterStateSetter();\n\n    if (activePendingBrowserRouterState && !activePendingBrowserRouterState.settled) {\n      activePendingBrowserRouterState.settled = true;\n      activePendingBrowserRouterState.resolve(getBrowserRouterState());\n    }\n\n    let resolvePending: ((state: AppRouterState) => void) | undefined;\n    const promise = new Promise<AppRouterState>((resolve) => {\n      resolvePending = resolve;\n    });\n\n    if (!resolvePending) {\n      throw new Error(\"[vinext] Failed to initialize browser router promise\");\n    }\n\n    const pending: PendingBrowserRouterState = {\n      promise,\n      resolve: resolvePending,\n      settled: false,\n    };\n\n    activePendingBrowserRouterState = pending;\n    setter(promise);\n\n    return pending;\n  }\n\n  function settlePendingBrowserRouterState(\n    pending: PendingBrowserRouterState | null | undefined,\n  ): void {\n    if (!pending || pending.settled) return;\n\n    pending.settled = true;\n    pending.resolve(getBrowserRouterState());\n\n    if (activePendingBrowserRouterState === pending) {\n      activePendingBrowserRouterState = null;\n    }\n  }\n\n  function finalizeNavigation(\n    navId: number,\n    pending: PendingBrowserRouterState | null | undefined,\n  ): void {\n    settlePendingBrowserRouterState(pending);\n\n    if (isCurrentNavigation(navId)) {\n      clearPendingPathname(navId);\n    }\n  }\n\n  function resolvePendingBrowserRouterState(\n    pending: PendingBrowserRouterState | null | undefined,\n    action: AppRouterAction,\n  ): void {\n    if (!pending || pending.settled) return;\n\n    pending.settled = true;\n    pending.resolve(routerReducer(getBrowserRouterState(), action));\n\n    if (activePendingBrowserRouterState === pending) {\n      activePendingBrowserRouterState = null;\n    }\n  }\n\n  function queuePrePaintNavigationEffect(renderId: number, effect: (() => void) | null): void {\n    if (!effect) {\n      return;\n    }\n    pendingNavigationPrePaintEffects.set(renderId, effect);\n  }\n\n  /**\n   * Run all queued pre-paint effects for renderIds up to and including the\n   * given renderId. When React supersedes a startTransition update (rapid\n   * clicks on same-route links), the superseded NavigationCommitSignal never\n   * mounts, so its pre-paint effect never fires. By draining all effects\n   * <= the committed renderId here, the winning transition cleans up after\n   * any superseded ones, keeping the counter balanced.\n   *\n   * Invariant: each superseded navigation gets a commitClientNavigationState()\n   * to balance the activateNavigationSnapshot() from its renderNavigationPayload call.\n   */\n  function drainPrePaintEffects(upToRenderId: number): void {\n    for (const [id, effect] of pendingNavigationPrePaintEffects) {\n      if (id > upToRenderId) {\n        continue;\n      }\n\n      pendingNavigationPrePaintEffects.delete(id);\n      if (id === upToRenderId) {\n        effect();\n      } else {\n        // Superseded navigations still need to balance the snapshot counter.\n        commitClientNavigationStateImpl(undefined, { releaseSnapshot: true });\n      }\n    }\n  }\n\n  /**\n   * Resolve all pending navigation commits with renderId <= the committed renderId.\n   * Note: Map iteration handles concurrent deletion safely — entries are visited in\n   * insertion order and deletion doesn't affect the iterator's view of remaining entries.\n   * This pattern is also used in drainPrePaintEffects with the same semantics.\n   */\n  function resolveCommittedNavigations(renderId: number): void {\n    for (const [pendingId, resolve] of pendingNavigationCommits) {\n      if (pendingId > renderId) {\n        continue;\n      }\n\n      pendingNavigationCommits.delete(pendingId);\n      resolve();\n    }\n  }\n\n  async function hmrReplaceTree(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n  ): Promise<void> {\n    if (!hasBrowserRouterState()) return;\n\n    const currentState = getBrowserRouterState();\n    const renderId = allocateRenderId();\n    const pending = await createPendingNavigationCommit({\n      currentState,\n      nextElements,\n      navigationSnapshot,\n      renderId,\n      type: \"replace\",\n    });\n\n    // createPendingNavigationCommit awaits the new RSC payload. While\n    // suspended, the prior broken render can unmount BrowserRoot. Re-check\n    // before dispatching so a racing unmount doesn't surface as an\n    // initialized-setter error.\n    if (!hasBrowserRouterState()) return;\n\n    dispatchBrowserTree(\n      pending.action.elements,\n      navigationSnapshot,\n      pending.action.renderId,\n      \"replace\",\n      pending.interceptionContext,\n      pending.action.layoutFlags,\n      pending.previousNextUrl,\n      pending.routeId,\n      pending.rootLayoutTreePath,\n      null,\n      false,\n    );\n  }\n\n  function NavigationCommitSignal(\n    this: void,\n    {\n      renderId,\n      children,\n    }: {\n      renderId: number;\n      children?: ReactNode;\n    },\n  ): ReactNode {\n    useLayoutEffect(() => {\n      drainPrePaintEffects(renderId);\n\n      const frame = requestAnimationFrame(() => {\n        resolveCommittedNavigations(renderId);\n      });\n\n      return () => {\n        cancelAnimationFrame(frame);\n        // Resolve pending commits to prevent callers from hanging if React\n        // unmounts this component without committing (e.g., error boundary).\n        resolveCommittedNavigations(renderId);\n      };\n    }, [renderId]);\n\n    return children;\n  }\n\n  function dispatchBrowserTree(\n    elements: AppElements,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    renderId: number,\n    actionType: \"navigate\" | \"replace\" | \"traverse\",\n    interceptionContext: string | null,\n    layoutFlags: LayoutFlags,\n    previousNextUrl: string | null,\n    routeId: string,\n    rootLayoutTreePath: string | null,\n    pendingRouterState: PendingBrowserRouterState | null,\n    useTransitionMode: boolean,\n  ): void {\n    const setter = getBrowserRouterStateSetter();\n    const action: AppRouterAction = {\n      elements,\n      interceptionContext,\n      layoutFlags,\n      navigationSnapshot,\n      previousNextUrl,\n      renderId,\n      rootLayoutTreePath,\n      routeId,\n      type: actionType,\n    };\n\n    const applyAction = () => {\n      if (pendingRouterState) {\n        // The programmatic navigation is already running inside React.startTransition\n        // (from router.push/replace/refresh), so resolving the deferred promise is\n        // sufficient — no additional startTransition wrapper is needed below.\n        resolvePendingBrowserRouterState(pendingRouterState, action);\n        return;\n      }\n\n      setter(routerReducer(getBrowserRouterState(), action));\n    };\n\n    if (useTransitionMode) {\n      startTransition(applyAction);\n    } else {\n      applyAction();\n    }\n  }\n\n  async function renderNavigationPayload(options: {\n    actionType: \"navigate\" | \"replace\" | \"traverse\";\n    createNavigationCommitEffect: BrowserNavigationCommitEffectFactory;\n    historyUpdateMode: HistoryUpdateMode | undefined;\n    navigationSnapshot: ClientNavigationRenderSnapshot;\n    nextElements: Promise<AppElements>;\n    params: Record<string, string | string[]>;\n    pendingRouterState: PendingBrowserRouterState | null;\n    previousNextUrl: string | null;\n    targetHref: string;\n    navId: number;\n    useTransition?: boolean;\n  }): Promise<void> {\n    const renderId = allocateRenderId();\n    let resolveCommitted: (() => void) | undefined;\n    const committed = new Promise<void>((resolve) => {\n      resolveCommitted = resolve;\n      pendingNavigationCommits.set(renderId, resolve);\n    });\n\n    let snapshotActivated = false;\n    try {\n      const currentState = getBrowserRouterState();\n      const pending = await createPendingNavigationCommit({\n        currentState,\n        nextElements: options.nextElements,\n        navigationSnapshot: options.navigationSnapshot,\n        previousNextUrl: options.previousNextUrl,\n        renderId,\n        type: options.actionType,\n      });\n\n      const disposition = resolvePendingNavigationCommitDisposition({\n        activeNavigationId,\n        currentRootLayoutTreePath: currentState.rootLayoutTreePath,\n        nextRootLayoutTreePath: pending.rootLayoutTreePath,\n        startedNavigationId: options.navId,\n      });\n\n      if (disposition === \"skip\") {\n        settlePendingBrowserRouterState(options.pendingRouterState);\n        pendingNavigationCommits.delete(renderId);\n        resolveCommitted?.();\n        return;\n      }\n\n      if (disposition === \"hard-navigate\") {\n        settlePendingBrowserRouterState(options.pendingRouterState);\n        pendingNavigationCommits.delete(renderId);\n        window.location.assign(options.targetHref);\n        return;\n      }\n\n      queuePrePaintNavigationEffect(\n        renderId,\n        options.createNavigationCommitEffect({\n          href: options.targetHref,\n          historyUpdateMode: options.historyUpdateMode,\n          navId: options.navId,\n          params: options.params,\n          previousNextUrl: pending.previousNextUrl,\n        }),\n      );\n      activateNavigationSnapshot();\n      snapshotActivated = true;\n      dispatchBrowserTree(\n        pending.action.elements,\n        options.navigationSnapshot,\n        renderId,\n        options.actionType,\n        pending.interceptionContext,\n        pending.action.layoutFlags,\n        pending.previousNextUrl,\n        pending.routeId,\n        pending.rootLayoutTreePath,\n        options.pendingRouterState,\n        options.useTransition ?? true,\n      );\n    } catch (error) {\n      pendingNavigationPrePaintEffects.delete(renderId);\n      pendingNavigationCommits.delete(renderId);\n      if (snapshotActivated) {\n        commitClientNavigationStateImpl(options.navId);\n      }\n      settlePendingBrowserRouterState(options.pendingRouterState);\n      resolveCommitted?.();\n      throw error;\n    }\n\n    return committed;\n  }\n\n  async function commitSameUrlNavigatePayload(\n    nextElements: Promise<AppElements>,\n    navigationSnapshot: ClientNavigationRenderSnapshot,\n    returnValue?: { ok: boolean; data: unknown },\n  ): Promise<unknown> {\n    const currentState = getBrowserRouterState();\n    const startedNavigationId = activeNavigationId;\n    // Known limitation: if a same-URL navigation fully commits while this\n    // server action is awaiting resolveAndClassifyNavigationCommit(), the action\n    // can still dispatch its older payload afterward. The old pre-2c code had\n    // the same race, and Next.js has similar behavior. Tightening this would\n    // need a stronger commit-version gate than activeNavigationId alone.\n    const { disposition, pending } = await resolveAndClassifyNavigationCommit({\n      activeNavigationId,\n      currentState,\n      navigationSnapshot,\n      nextElements,\n      renderId: allocateRenderId(),\n      startedNavigationId,\n      type: \"navigate\",\n    });\n\n    if (disposition === \"hard-navigate\") {\n      window.location.assign(window.location.href);\n      return undefined;\n    }\n\n    if (disposition === \"dispatch\") {\n      dispatchBrowserTree(\n        pending.action.elements,\n        navigationSnapshot,\n        pending.action.renderId,\n        \"navigate\",\n        pending.interceptionContext,\n        pending.action.layoutFlags,\n        pending.previousNextUrl,\n        pending.routeId,\n        pending.rootLayoutTreePath,\n        null,\n        false,\n      );\n    }\n\n    // Same-URL server actions still return their action value even if the UI\n    // update was skipped due to a superseding navigation. That preserves the\n    // existing caller contract; a future Phase 2 router state model could make\n    // skipped UI updates observable to the caller without conflating them here.\n    if (returnValue) {\n      if (!returnValue.ok) {\n        throw returnValue.data;\n      }\n      return returnValue.data;\n    }\n\n    return undefined;\n  }\n\n  function attachBrowserRouterState(\n    setter: Dispatch<AppRouterState | Promise<AppRouterState>>,\n    stateRef: BrowserRouterStateRef,\n  ): () => void {\n    setBrowserRouterState = setter;\n    browserRouterStateRef = stateRef;\n    markBrowserRouterStateReady();\n\n    return () => {\n      if (setBrowserRouterState === setter) {\n        setBrowserRouterState = null;\n      }\n      if (browserRouterStateRef === stateRef) {\n        browserRouterStateRef = null;\n        browserRouterStateHasCommitted = false;\n      }\n    };\n  }\n\n  return {\n    beginNavigation,\n    hasBrowserRouterState,\n    getBrowserRouterState,\n    isCurrentNavigation,\n    waitForBrowserRouterStateReady,\n    attachBrowserRouterState,\n    beginPendingBrowserRouterState,\n    finalizeNavigation,\n    renderNavigationPayload,\n    commitSameUrlNavigatePayload,\n    hmrReplaceTree,\n    drainPrePaintEffects,\n    NavigationCommitSignal,\n  };\n}\n"],"mappings":"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"}

package/dist/server/app-browser-state.d.ts

@@ -1,5 +1,5 @@
-import { AppElements, LayoutFlags } from "./app-elements.js";
 import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
+import { AppElements, LayoutFlags } from "./app-elements.js";
 
 //#region src/server/app-browser-state.d.ts
 type HistoryStateRecord = {

package/dist/server/app-elements.js

@@ -1,3 +1,4 @@
+import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { isValidElement } from "react";
 //#region src/server/app-elements.ts
 const APP_INTERCEPTION_SEPARATOR = "\0";
@@ -7,11 +8,6 @@ const APP_ROUTE_KEY = "__route";
 const APP_ROOT_LAYOUT_KEY = "__rootLayout";
 const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
 const UNMATCHED_SLOT = Symbol.for("vinext.unmatchedSlot");
-function normalizeMountedSlotsHeader(header) {
-	if (!header) return null;
-	const slotIds = Array.from(new Set(header.split(/\s+/).filter(Boolean))).sort();
-	return slotIds.length > 0 ? slotIds.join(" ") : null;
-}
 function getMountedSlotIds(elements) {
 	return Object.keys(elements).filter((key) => {
 		const value = elements[key];

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

@@ -1 +1 @@
-{"version":3,"file":"app-elements.js","names":[],"sources":["../../src/server/app-elements.ts"],"sourcesContent":["import { isValidElement, type ReactNode } from \"react\";\n\nconst APP_INTERCEPTION_SEPARATOR = \"\\0\";\n\nexport const APP_INTERCEPTION_CONTEXT_KEY = \"__interceptionContext\";\nexport const APP_LAYOUT_FLAGS_KEY = \"__layoutFlags\";\nexport const APP_ROUTE_KEY = \"__route\";\nexport const APP_ROOT_LAYOUT_KEY = \"__rootLayout\";\nexport const APP_UNMATCHED_SLOT_WIRE_VALUE = \"__VINEXT_UNMATCHED_SLOT__\";\n\nexport const UNMATCHED_SLOT = Symbol.for(\"vinext.unmatchedSlot\");\n\nexport type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null;\ntype AppWireElementValue = ReactNode | string | null;\n\nexport type AppElements = Readonly<Record<string, AppElementValue>>;\nexport type AppWireElements = Readonly<Record<string, AppWireElementValue>>;\n\n/**\n * Per-layout static/dynamic flags. `\"s\"` = static (skippable on next nav);\n * `\"d\"` = dynamic (must always render).\n *\n * Lifecycle (partial — later PRs extend this):\n *\n *   1. PROBE   — probeAppPageLayouts (server/app-page-execution.ts) returns\n *                LayoutFlags for every layout in the route at render time.\n *\n *   2. ATTACH  — withLayoutFlags (this file) writes `__layoutFlags` into the\n *                outgoing App Router payload record.\n *\n *   3. WIRE    — renderToReadableStream serializes the record as RSC row 0.\n *\n *   4. PARSE   — readAppElementsMetadata (this file) extracts layoutFlags from\n *                the wire payload on the client side.\n */\nexport type LayoutFlags = Readonly<Record<string, \"s\" | \"d\">>;\n\ntype AppElementsMetadata = {\n  interceptionContext: string | null;\n  layoutFlags: LayoutFlags;\n  routeId: string;\n  rootLayoutTreePath: string | null;\n};\n\nfunction normalizeMountedSlotsHeader(header: string | null | undefined): string | null {\n  if (!header) {\n    return null;\n  }\n\n  const slotIds = Array.from(new Set(header.split(/\\s+/).filter(Boolean))).sort();\n\n  return slotIds.length > 0 ? slotIds.join(\" \") : null;\n}\n\nexport function getMountedSlotIds(elements: AppElements): string[] {\n  return Object.keys(elements)\n    .filter((key) => {\n      const value = elements[key];\n      return (\n        key.startsWith(\"slot:\") && value !== null && value !== undefined && value !== UNMATCHED_SLOT\n      );\n    })\n    .sort();\n}\n\nexport function getMountedSlotIdsHeader(elements: AppElements): string | null {\n  return normalizeMountedSlotsHeader(getMountedSlotIds(elements).join(\" \"));\n}\n\nfunction appendInterceptionContext(identity: string, interceptionContext: string | null): string {\n  return interceptionContext === null\n    ? identity\n    : `${identity}${APP_INTERCEPTION_SEPARATOR}${interceptionContext}`;\n}\n\nexport function createAppPayloadRouteId(\n  routePath: string,\n  interceptionContext: string | null,\n): string {\n  return appendInterceptionContext(`route:${routePath}`, interceptionContext);\n}\n\nexport function createAppPayloadPageId(\n  routePath: string,\n  interceptionContext: string | null,\n): string {\n  return appendInterceptionContext(`page:${routePath}`, interceptionContext);\n}\n\nexport function createAppPayloadCacheKey(\n  rscUrl: string,\n  interceptionContext: string | null,\n): string {\n  return appendInterceptionContext(rscUrl, interceptionContext);\n}\n\nexport function resolveVisitedResponseInterceptionContext(\n  requestInterceptionContext: string | null,\n  payloadInterceptionContext: string | null,\n): string | null {\n  return payloadInterceptionContext ?? requestInterceptionContext;\n}\n\nexport function normalizeAppElements(elements: AppWireElements): AppElements {\n  let needsNormalization = false;\n  for (const [key, value] of Object.entries(elements)) {\n    if (key.startsWith(\"slot:\") && value === APP_UNMATCHED_SLOT_WIRE_VALUE) {\n      needsNormalization = true;\n      break;\n    }\n  }\n\n  if (!needsNormalization) {\n    return elements;\n  }\n\n  const normalized: Record<string, AppElementValue> = {};\n  for (const [key, value] of Object.entries(elements)) {\n    normalized[key] =\n      key.startsWith(\"slot:\") && value === APP_UNMATCHED_SLOT_WIRE_VALUE ? UNMATCHED_SLOT : value;\n  }\n\n  return normalized;\n}\n\nfunction isLayoutFlagsRecord(value: unknown): value is LayoutFlags {\n  if (!value || typeof value !== \"object\" || Array.isArray(value)) return false;\n  for (const v of Object.values(value)) {\n    if (v !== \"s\" && v !== \"d\") return false;\n  }\n  return true;\n}\n\nfunction parseLayoutFlags(value: unknown): LayoutFlags {\n  if (isLayoutFlagsRecord(value)) return value;\n  return {};\n}\n\n/**\n * Type predicate for a plain (non-null, non-array) record of app payload values.\n * Used to distinguish the App Router payload object from bare React elements at\n * the render boundary. Narrows to `Readonly<Record<string, unknown>>` because\n * the outgoing payload carries heterogeneous values (ReactNodes for the rendered\n * tree, plus metadata like `__layoutFlags` which is a plain object). Delegates\n * to React's canonical `isValidElement` so we don't depend on React's internal\n * `$$typeof` marker scheme.\n */\nexport function isAppElementsRecord(value: unknown): value is Readonly<Record<string, unknown>> {\n  if (typeof value !== \"object\" || value === null) return false;\n  if (Array.isArray(value)) return false;\n  if (isValidElement(value)) return false;\n  return true;\n}\n\n/**\n * Pure: returns a new record with `__layoutFlags` attached. Owns the write\n * boundary for the layout flags key so the write side sits next to\n * `readAppElementsMetadata`.\n *\n * See `LayoutFlags` type docblock in this file for lifecycle.\n */\nexport function withLayoutFlags<T extends Record<string, unknown>>(\n  elements: T,\n  layoutFlags: LayoutFlags,\n): T & { [APP_LAYOUT_FLAGS_KEY]: LayoutFlags } {\n  return { ...elements, [APP_LAYOUT_FLAGS_KEY]: layoutFlags };\n}\n\n/**\n * The outgoing wire payload shape. Includes ReactNode values for the\n * rendered tree plus metadata values like LayoutFlags attached under\n * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements\n * which only carry render-time values.\n */\nexport type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags>>;\n\n/**\n * Pure: builds the outgoing payload for the wire. Non-record inputs (e.g. a\n * bare React element) are returned unchanged. Record inputs get a fresh copy\n * with `__layoutFlags` attached. Never mutates `input.element`.\n */\nexport function buildOutgoingAppPayload(input: {\n  element: ReactNode | Readonly<Record<string, ReactNode>>;\n  layoutFlags: LayoutFlags;\n}): ReactNode | AppOutgoingElements {\n  if (!isAppElementsRecord(input.element)) {\n    return input.element;\n  }\n  return withLayoutFlags(input.element, input.layoutFlags);\n}\n\n/**\n * Parses metadata from the wire payload. Accepts `Record<string, unknown>`\n * because the RSC payload carries heterogeneous values (React elements,\n * strings, and plain objects like layout flags) under the same record type.\n *\n * See `LayoutFlags` type docblock in this file for lifecycle.\n */\nexport function readAppElementsMetadata(\n  elements: Readonly<Record<string, unknown>>,\n): AppElementsMetadata {\n  const routeId = elements[APP_ROUTE_KEY];\n  if (typeof routeId !== \"string\") {\n    throw new Error(\"[vinext] Missing __route string in App Router payload\");\n  }\n\n  const interceptionContext = elements[APP_INTERCEPTION_CONTEXT_KEY];\n  if (\n    interceptionContext !== undefined &&\n    interceptionContext !== null &&\n    typeof interceptionContext !== \"string\"\n  ) {\n    throw new Error(\"[vinext] Invalid __interceptionContext in App Router payload\");\n  }\n\n  const rootLayoutTreePath = elements[APP_ROOT_LAYOUT_KEY];\n  if (rootLayoutTreePath === undefined) {\n    throw new Error(\"[vinext] Missing __rootLayout key in App Router payload\");\n  }\n  if (rootLayoutTreePath !== null && typeof rootLayoutTreePath !== \"string\") {\n    throw new Error(\"[vinext] Invalid __rootLayout in App Router payload: expected string or null\");\n  }\n\n  const layoutFlags = parseLayoutFlags(elements[APP_LAYOUT_FLAGS_KEY]);\n\n  return {\n    interceptionContext: interceptionContext ?? null,\n    layoutFlags,\n    routeId,\n    rootLayoutTreePath,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-elements.js","names":[],"sources":["../../src/server/app-elements.ts"],"sourcesContent":["import { isValidElement, type ReactNode } from \"react\";\nimport { normalizeMountedSlotsHeader } from \"./app-mounted-slots-header.js\";\n\nconst APP_INTERCEPTION_SEPARATOR = \"\\0\";\n\nexport const APP_INTERCEPTION_CONTEXT_KEY = \"__interceptionContext\";\nexport const APP_LAYOUT_FLAGS_KEY = \"__layoutFlags\";\nexport const APP_ROUTE_KEY = \"__route\";\nexport const APP_ROOT_LAYOUT_KEY = \"__rootLayout\";\nexport const APP_UNMATCHED_SLOT_WIRE_VALUE = \"__VINEXT_UNMATCHED_SLOT__\";\n\nexport const UNMATCHED_SLOT = Symbol.for(\"vinext.unmatchedSlot\");\n\nexport type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null;\ntype AppWireElementValue = ReactNode | string | null;\n\nexport type AppElements = Readonly<Record<string, AppElementValue>>;\nexport type AppWireElements = Readonly<Record<string, AppWireElementValue>>;\n\n/**\n * Per-layout static/dynamic flags. `\"s\"` = static (skippable on next nav);\n * `\"d\"` = dynamic (must always render).\n *\n * Lifecycle (partial — later PRs extend this):\n *\n *   1. PROBE   — probeAppPageLayouts (server/app-page-execution.ts) returns\n *                LayoutFlags for every layout in the route at render time.\n *\n *   2. ATTACH  — withLayoutFlags (this file) writes `__layoutFlags` into the\n *                outgoing App Router payload record.\n *\n *   3. WIRE    — renderToReadableStream serializes the record as RSC row 0.\n *\n *   4. PARSE   — readAppElementsMetadata (this file) extracts layoutFlags from\n *                the wire payload on the client side.\n */\nexport type LayoutFlags = Readonly<Record<string, \"s\" | \"d\">>;\n\ntype AppElementsMetadata = {\n  interceptionContext: string | null;\n  layoutFlags: LayoutFlags;\n  routeId: string;\n  rootLayoutTreePath: string | null;\n};\n\nexport function getMountedSlotIds(elements: AppElements): string[] {\n  return Object.keys(elements)\n    .filter((key) => {\n      const value = elements[key];\n      return (\n        key.startsWith(\"slot:\") && value !== null && value !== undefined && value !== UNMATCHED_SLOT\n      );\n    })\n    .sort();\n}\n\nexport function getMountedSlotIdsHeader(elements: AppElements): string | null {\n  return normalizeMountedSlotsHeader(getMountedSlotIds(elements).join(\" \"));\n}\n\nfunction appendInterceptionContext(identity: string, interceptionContext: string | null): string {\n  return interceptionContext === null\n    ? identity\n    : `${identity}${APP_INTERCEPTION_SEPARATOR}${interceptionContext}`;\n}\n\nexport function createAppPayloadRouteId(\n  routePath: string,\n  interceptionContext: string | null,\n): string {\n  return appendInterceptionContext(`route:${routePath}`, interceptionContext);\n}\n\nexport function createAppPayloadPageId(\n  routePath: string,\n  interceptionContext: string | null,\n): string {\n  return appendInterceptionContext(`page:${routePath}`, interceptionContext);\n}\n\nexport function createAppPayloadCacheKey(\n  rscUrl: string,\n  interceptionContext: string | null,\n): string {\n  return appendInterceptionContext(rscUrl, interceptionContext);\n}\n\nexport function resolveVisitedResponseInterceptionContext(\n  requestInterceptionContext: string | null,\n  payloadInterceptionContext: string | null,\n): string | null {\n  return payloadInterceptionContext ?? requestInterceptionContext;\n}\n\nexport function normalizeAppElements(elements: AppWireElements): AppElements {\n  let needsNormalization = false;\n  for (const [key, value] of Object.entries(elements)) {\n    if (key.startsWith(\"slot:\") && value === APP_UNMATCHED_SLOT_WIRE_VALUE) {\n      needsNormalization = true;\n      break;\n    }\n  }\n\n  if (!needsNormalization) {\n    return elements;\n  }\n\n  const normalized: Record<string, AppElementValue> = {};\n  for (const [key, value] of Object.entries(elements)) {\n    normalized[key] =\n      key.startsWith(\"slot:\") && value === APP_UNMATCHED_SLOT_WIRE_VALUE ? UNMATCHED_SLOT : value;\n  }\n\n  return normalized;\n}\n\nfunction isLayoutFlagsRecord(value: unknown): value is LayoutFlags {\n  if (!value || typeof value !== \"object\" || Array.isArray(value)) return false;\n  for (const v of Object.values(value)) {\n    if (v !== \"s\" && v !== \"d\") return false;\n  }\n  return true;\n}\n\nfunction parseLayoutFlags(value: unknown): LayoutFlags {\n  if (isLayoutFlagsRecord(value)) return value;\n  return {};\n}\n\n/**\n * Type predicate for a plain (non-null, non-array) record of app payload values.\n * Used to distinguish the App Router payload object from bare React elements at\n * the render boundary. Narrows to `Readonly<Record<string, unknown>>` because\n * the outgoing payload carries heterogeneous values (ReactNodes for the rendered\n * tree, plus metadata like `__layoutFlags` which is a plain object). Delegates\n * to React's canonical `isValidElement` so we don't depend on React's internal\n * `$$typeof` marker scheme.\n */\nexport function isAppElementsRecord(value: unknown): value is Readonly<Record<string, unknown>> {\n  if (typeof value !== \"object\" || value === null) return false;\n  if (Array.isArray(value)) return false;\n  if (isValidElement(value)) return false;\n  return true;\n}\n\n/**\n * Pure: returns a new record with `__layoutFlags` attached. Owns the write\n * boundary for the layout flags key so the write side sits next to\n * `readAppElementsMetadata`.\n *\n * See `LayoutFlags` type docblock in this file for lifecycle.\n */\nexport function withLayoutFlags<T extends Record<string, unknown>>(\n  elements: T,\n  layoutFlags: LayoutFlags,\n): T & { [APP_LAYOUT_FLAGS_KEY]: LayoutFlags } {\n  return { ...elements, [APP_LAYOUT_FLAGS_KEY]: layoutFlags };\n}\n\n/**\n * The outgoing wire payload shape. Includes ReactNode values for the\n * rendered tree plus metadata values like LayoutFlags attached under\n * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements\n * which only carry render-time values.\n */\nexport type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags>>;\n\n/**\n * Pure: builds the outgoing payload for the wire. Non-record inputs (e.g. a\n * bare React element) are returned unchanged. Record inputs get a fresh copy\n * with `__layoutFlags` attached. Never mutates `input.element`.\n */\nexport function buildOutgoingAppPayload(input: {\n  element: ReactNode | Readonly<Record<string, ReactNode>>;\n  layoutFlags: LayoutFlags;\n}): ReactNode | AppOutgoingElements {\n  if (!isAppElementsRecord(input.element)) {\n    return input.element;\n  }\n  return withLayoutFlags(input.element, input.layoutFlags);\n}\n\n/**\n * Parses metadata from the wire payload. Accepts `Record<string, unknown>`\n * because the RSC payload carries heterogeneous values (React elements,\n * strings, and plain objects like layout flags) under the same record type.\n *\n * See `LayoutFlags` type docblock in this file for lifecycle.\n */\nexport function readAppElementsMetadata(\n  elements: Readonly<Record<string, unknown>>,\n): AppElementsMetadata {\n  const routeId = elements[APP_ROUTE_KEY];\n  if (typeof routeId !== \"string\") {\n    throw new Error(\"[vinext] Missing __route string in App Router payload\");\n  }\n\n  const interceptionContext = elements[APP_INTERCEPTION_CONTEXT_KEY];\n  if (\n    interceptionContext !== undefined &&\n    interceptionContext !== null &&\n    typeof interceptionContext !== \"string\"\n  ) {\n    throw new Error(\"[vinext] Invalid __interceptionContext in App Router payload\");\n  }\n\n  const rootLayoutTreePath = elements[APP_ROOT_LAYOUT_KEY];\n  if (rootLayoutTreePath === undefined) {\n    throw new Error(\"[vinext] Missing __rootLayout key in App Router payload\");\n  }\n  if (rootLayoutTreePath !== null && typeof rootLayoutTreePath !== \"string\") {\n    throw new Error(\"[vinext] Invalid __rootLayout in App Router payload: expected string or null\");\n  }\n\n  const layoutFlags = parseLayoutFlags(elements[APP_LAYOUT_FLAGS_KEY]);\n\n  return {\n    interceptionContext: interceptionContext ?? null,\n    layoutFlags,\n    routeId,\n    rootLayoutTreePath,\n  };\n}\n"],"mappings":"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"}

package/dist/server/app-fallback-renderer.d.ts

@@ -0,0 +1,57 @@
+import { MetadataFileRoute } from "./metadata-routes.js";
+import { AppElements } from "./app-elements.js";
+import { AppPageParams } from "./app-page-boundary.js";
+import { AppPageFontPreload } from "./app-page-execution.js";
+import { AppPageMiddlewareContext } from "./app-page-response.js";
+import { AppPageSsrHandler } from "./app-page-stream.js";
+import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
+import * as _$react from "react";
+import { ReactNode } from "react";
+
+//#region src/server/app-fallback-renderer.d.ts
+type AppPageComponent = _$react.ComponentType<any>;
+type AppPageModule = Record<string, unknown> & {
+  default?: AppPageComponent | null | undefined;
+};
+type AppPageBoundaryOnError = (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
+type AppFallbackRendererRootBoundaries<TModule extends AppPageModule = AppPageModule> = {
+  rootForbiddenModule?: TModule | null;
+  rootLayouts: readonly (TModule | null | undefined)[];
+  rootNotFoundModule?: TModule | null;
+  rootUnauthorizedModule?: TModule | null;
+};
+type AppFallbackRendererFontProviders = {
+  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;
+  getFontLinks: () => string[];
+  getFontPreloads: () => AppPageFontPreload[];
+  getFontStyles: () => string[];
+};
+type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> = {
+  clearRequestContext: () => void;
+  createRscOnErrorHandler: (request: Request, pathname: string, routePath: string) => AppPageBoundaryOnError;
+  fontProviders: AppFallbackRendererFontProviders;
+  getNavigationContext: () => unknown;
+  globalErrorModule?: TModule | null;
+  makeThenableParams: (params: AppPageParams) => unknown;
+  metadataRoutes: MetadataFileRoute[];
+  resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
+  rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;
+  rscRenderer: (element: ReactNode | AppElements, options: {
+    onError: AppPageBoundaryOnError;
+  }) => ReadableStream<Uint8Array>;
+  sanitizer: (error: Error) => Error;
+  ssrLoader: () => Promise<AppPageSsrHandler>;
+};
+type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
+  renderErrorBoundary: (route: AppPageBoundaryRoute<TModule> | null, error: unknown, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext) => Promise<Response | null>;
+  renderHttpAccessFallback: (route: AppPageBoundaryRoute<TModule> | null, statusCode: number, isRscRequest: boolean, request: Request, opts: {
+    boundaryComponent?: AppPageComponent | null;
+    layouts?: readonly (TModule | null | undefined)[] | null;
+    matchedParams?: AppPageParams;
+  }, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext) => Promise<Response | null>;
+  renderNotFound: (route: AppPageBoundaryRoute<TModule> | null, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext) => Promise<Response | null>;
+};
+declare function createAppFallbackRenderer<TModule extends AppPageModule>(options: AppFallbackRendererOptions<TModule>): AppFallbackRenderer<TModule>;
+//#endregion
+export { createAppFallbackRenderer };
+//# sourceMappingURL=app-fallback-renderer.d.ts.map

package/dist/server/app-fallback-renderer.js

@@ -0,0 +1,79 @@
+import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
+//#region src/server/app-fallback-renderer.ts
+const EMPTY_MW_CTX = {
+	headers: null,
+	status: null
+};
+function createAppFallbackRenderer(options) {
+	const { clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader } = options;
+	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
+	return {
+		renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext) {
+			return renderAppPageHttpAccessFallback({
+				boundaryComponent: opts?.boundaryComponent ?? null,
+				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
+				clearRequestContext,
+				createRscOnErrorHandler(pathname, routePath) {
+					return buildRscOnErrorHandler(request, pathname, routePath);
+				},
+				getFontLinks: fontProviders.getFontLinks,
+				getFontPreloads: fontProviders.getFontPreloads,
+				getFontStyles: fontProviders.getFontStyles,
+				getNavigationContext,
+				globalErrorModule,
+				isRscRequest,
+				layoutModules: opts?.layouts ?? null,
+				loadSsrHandler: ssrLoader,
+				makeThenableParams,
+				matchedParams: opts?.matchedParams ?? route?.params ?? {},
+				middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
+				metadataRoutes,
+				requestUrl: request.url,
+				resolveChildSegments,
+				rootForbiddenModule,
+				rootLayouts,
+				rootNotFoundModule,
+				rootUnauthorizedModule,
+				route,
+				renderToReadableStream: rscRenderer,
+				scriptNonce,
+				statusCode
+			});
+		},
+		renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {
+			return this.renderHttpAccessFallback(route, 404, isRscRequest, request, { matchedParams }, scriptNonce, middlewareContext);
+		},
+		renderErrorBoundary(route, error, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {
+			return renderAppPageErrorBoundary({
+				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
+				clearRequestContext,
+				createRscOnErrorHandler(pathname, routePath) {
+					return buildRscOnErrorHandler(request, pathname, routePath);
+				},
+				error,
+				getFontLinks: fontProviders.getFontLinks,
+				getFontPreloads: fontProviders.getFontPreloads,
+				getFontStyles: fontProviders.getFontStyles,
+				getNavigationContext,
+				globalErrorModule,
+				isRscRequest,
+				loadSsrHandler: ssrLoader,
+				makeThenableParams,
+				matchedParams: matchedParams ?? route?.params ?? {},
+				middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
+				metadataRoutes,
+				requestUrl: request.url,
+				resolveChildSegments,
+				rootLayouts,
+				route,
+				renderToReadableStream: rscRenderer,
+				sanitizeErrorForClient: sanitizer,
+				scriptNonce
+			});
+		}
+	};
+}
+//#endregion
+export { createAppFallbackRenderer };
+
+//# sourceMappingURL=app-fallback-renderer.js.map

package/dist/server/app-fallback-renderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-fallback-renderer.js","names":[],"sources":["../../src/server/app-fallback-renderer.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport {\n  renderAppPageErrorBoundary,\n  renderAppPageHttpAccessFallback,\n  type AppPageBoundaryRoute,\n} from \"./app-page-boundary-render.js\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { AppPageSsrHandler } from \"./app-page-stream.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport type { AppElements } from \"./app-elements.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = import(\"react\").ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppFallbackRendererRootBoundaries<TModule extends AppPageModule = AppPageModule> = {\n  rootForbiddenModule?: TModule | null;\n  rootLayouts: readonly (TModule | null | undefined)[];\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n};\n\ntype AppFallbackRendererFontProviders = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n};\n\ntype AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> = {\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (\n    request: Request,\n    pathname: string,\n    routePath: string,\n  ) => AppPageBoundaryOnError;\n  fontProviders: AppFallbackRendererFontProviders;\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  metadataRoutes: MetadataFileRoute[];\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;\n  rscRenderer: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  sanitizer: (error: Error) => Error;\n  ssrLoader: () => Promise<AppPageSsrHandler>;\n};\n\ntype AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {\n  renderErrorBoundary: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    error: unknown,\n    isRscRequest: boolean,\n    request: Request,\n    matchedParams: AppPageParams | undefined,\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n  renderHttpAccessFallback: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    statusCode: number,\n    isRscRequest: boolean,\n    request: Request,\n    opts: {\n      boundaryComponent?: AppPageComponent | null;\n      layouts?: readonly (TModule | null | undefined)[] | null;\n      matchedParams?: AppPageParams;\n    },\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n  renderNotFound: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    isRscRequest: boolean,\n    request: Request,\n    matchedParams: AppPageParams | undefined,\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n};\n\nconst EMPTY_MW_CTX: AppPageMiddlewareContext = { headers: null, status: null };\n\nexport function createAppFallbackRenderer<TModule extends AppPageModule>(\n  options: AppFallbackRendererOptions<TModule>,\n): AppFallbackRenderer<TModule> {\n  const {\n    clearRequestContext,\n    createRscOnErrorHandler: buildRscOnErrorHandler,\n    fontProviders,\n    getNavigationContext,\n    globalErrorModule,\n    makeThenableParams,\n    metadataRoutes,\n    resolveChildSegments,\n    rootBoundaries,\n    rscRenderer,\n    sanitizer,\n    ssrLoader,\n  } = options;\n\n  const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } =\n    rootBoundaries;\n\n  return {\n    renderHttpAccessFallback(\n      route,\n      statusCode,\n      isRscRequest,\n      request,\n      opts,\n      scriptNonce,\n      middlewareContext,\n    ) {\n      return renderAppPageHttpAccessFallback({\n        boundaryComponent: opts?.boundaryComponent ?? null,\n        buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n        clearRequestContext,\n        createRscOnErrorHandler(pathname, routePath) {\n          return buildRscOnErrorHandler(request, pathname, routePath);\n        },\n        getFontLinks: fontProviders.getFontLinks,\n        getFontPreloads: fontProviders.getFontPreloads,\n        getFontStyles: fontProviders.getFontStyles,\n        getNavigationContext,\n        globalErrorModule,\n        isRscRequest,\n        layoutModules: opts?.layouts ?? null,\n        loadSsrHandler: ssrLoader,\n        makeThenableParams,\n        matchedParams: opts?.matchedParams ?? route?.params ?? {},\n        middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n        metadataRoutes,\n        requestUrl: request.url,\n        resolveChildSegments,\n        rootForbiddenModule,\n        rootLayouts,\n        rootNotFoundModule,\n        rootUnauthorizedModule,\n        route,\n        renderToReadableStream: rscRenderer,\n        scriptNonce,\n        statusCode,\n      });\n    },\n\n    renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {\n      return this.renderHttpAccessFallback(\n        route,\n        404,\n        isRscRequest,\n        request,\n        { matchedParams },\n        scriptNonce,\n        middlewareContext,\n      );\n    },\n\n    renderErrorBoundary(\n      route,\n      error,\n      isRscRequest,\n      request,\n      matchedParams,\n      scriptNonce,\n      middlewareContext,\n    ) {\n      return renderAppPageErrorBoundary({\n        buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n        clearRequestContext,\n        createRscOnErrorHandler(pathname, routePath) {\n          return buildRscOnErrorHandler(request, pathname, routePath);\n        },\n        error,\n        getFontLinks: fontProviders.getFontLinks,\n        getFontPreloads: fontProviders.getFontPreloads,\n        getFontStyles: fontProviders.getFontStyles,\n        getNavigationContext,\n        globalErrorModule,\n        isRscRequest,\n        loadSsrHandler: ssrLoader,\n        makeThenableParams,\n        matchedParams: matchedParams ?? route?.params ?? {},\n        middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n        metadataRoutes,\n        requestUrl: request.url,\n        resolveChildSegments,\n        rootLayouts,\n        route,\n        renderToReadableStream: rscRenderer,\n        sanitizeErrorForClient: sanitizer,\n        scriptNonce,\n      });\n    },\n  };\n}\n"],"mappings":";;AAiGA,MAAM,eAAyC;CAAE,SAAS;CAAM,QAAQ;CAAM;AAE9E,SAAgB,0BACd,SAC8B;CAC9B,MAAM,EACJ,qBACA,yBAAyB,wBACzB,eACA,sBACA,mBACA,oBACA,gBACA,sBACA,gBACA,aACA,WACA,cACE;CAEJ,MAAM,EAAE,qBAAqB,aAAa,oBAAoB,2BAC5D;AAEF,QAAO;EACL,yBACE,OACA,YACA,cACA,SACA,MACA,aACA,mBACA;AACA,UAAO,gCAAgC;IACrC,mBAAmB,MAAM,qBAAqB;IAC9C,qBAAqB,cAAc;IACnC;IACA,wBAAwB,UAAU,WAAW;AAC3C,YAAO,uBAAuB,SAAS,UAAU,UAAU;;IAE7D,cAAc,cAAc;IAC5B,iBAAiB,cAAc;IAC/B,eAAe,cAAc;IAC7B;IACA;IACA;IACA,eAAe,MAAM,WAAW;IAChC,gBAAgB;IAChB;IACA,eAAe,MAAM,iBAAiB,OAAO,UAAU,EAAE;IACzD,mBAAmB,qBAAqB;IACxC;IACA,YAAY,QAAQ;IACpB;IACA;IACA;IACA;IACA;IACA;IACA,wBAAwB;IACxB;IACA;IACD,CAAC;;EAGJ,eAAe,OAAO,cAAc,SAAS,eAAe,aAAa,mBAAmB;AAC1F,UAAO,KAAK,yBACV,OACA,KACA,cACA,SACA,EAAE,eAAe,EACjB,aACA,kBACD;;EAGH,oBACE,OACA,OACA,cACA,SACA,eACA,aACA,mBACA;AACA,UAAO,2BAA2B;IAChC,qBAAqB,cAAc;IACnC;IACA,wBAAwB,UAAU,WAAW;AAC3C,YAAO,uBAAuB,SAAS,UAAU,UAAU;;IAE7D;IACA,cAAc,cAAc;IAC5B,iBAAiB,cAAc;IAC/B,eAAe,cAAc;IAC7B;IACA;IACA;IACA,gBAAgB;IAChB;IACA,eAAe,iBAAiB,OAAO,UAAU,EAAE;IACnD,mBAAmB,qBAAqB;IACxC;IACA,YAAY,QAAQ;IACpB;IACA;IACA;IACA,wBAAwB;IACxB,wBAAwB;IACxB;IACD,CAAC;;EAEL"}

package/dist/server/app-hook-warning-suppression.d.ts

@@ -0,0 +1,7 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+
+//#region src/server/app-hook-warning-suppression.d.ts
+declare const suppressHookWarningAls: AsyncLocalStorage<boolean>;
+//#endregion
+export { suppressHookWarningAls };
+//# sourceMappingURL=app-hook-warning-suppression.d.ts.map

package/dist/server/app-hook-warning-suppression.js

@@ -0,0 +1,12 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+//#region src/server/app-hook-warning-suppression.ts
+const suppressHookWarningAls = new AsyncLocalStorage();
+const _origConsoleError = console.error;
+console.error = (...args) => {
+	if (suppressHookWarningAls.getStore() === true && typeof args[0] === "string" && args[0].includes("Invalid hook call")) return;
+	_origConsoleError.apply(console, args);
+};
+//#endregion
+export { suppressHookWarningAls };
+
+//# sourceMappingURL=app-hook-warning-suppression.js.map

package/dist/server/app-hook-warning-suppression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-hook-warning-suppression.js","names":[],"sources":["../../src/server/app-hook-warning-suppression.ts"],"sourcesContent":["import { AsyncLocalStorage } from \"node:async_hooks\";\n\nexport const suppressHookWarningAls = new AsyncLocalStorage<boolean>();\n\nconst _origConsoleError = console.error;\nconsole.error = (...args: unknown[]) => {\n  if (\n    suppressHookWarningAls.getStore() === true &&\n    typeof args[0] === \"string\" &&\n    args[0].includes(\"Invalid hook call\")\n  )\n    return;\n  _origConsoleError.apply(console, args);\n};\n"],"mappings":";;AAEA,MAAa,yBAAyB,IAAI,mBAA4B;AAEtE,MAAM,oBAAoB,QAAQ;AAClC,QAAQ,SAAS,GAAG,SAAoB;AACtC,KACE,uBAAuB,UAAU,KAAK,QACtC,OAAO,KAAK,OAAO,YACnB,KAAK,GAAG,SAAS,oBAAoB,CAErC;AACF,mBAAkB,MAAM,SAAS,KAAK"}

package/dist/server/app-mounted-slots-header.d.ts

@@ -0,0 +1,17 @@
+//#region src/server/app-mounted-slots-header.d.ts
+/**
+ * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
+ *
+ * The browser sends mounted slot ids as a space-separated list in the order slots were
+ * rendered, which changes across navigations. This normalizes to a canonical form
+ * (sorted, deduplicated) so equivalent slot sets map to the same RSC cache entry.
+ *
+ * Consumed by:
+ *   - app-rsc-request-normalization (request lifecycle, reads incoming header)
+ *   - app-elements (outgoing x-vinext-mounted-slots construction)
+ *   - isr-cache (RSC cache key generation)
+ */
+declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;
+//#endregion
+export { normalizeMountedSlotsHeader };
+//# sourceMappingURL=app-mounted-slots-header.d.ts.map

package/dist/server/app-mounted-slots-header.js

@@ -0,0 +1,21 @@
+//#region src/server/app-mounted-slots-header.ts
+/**
+* Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
+*
+* The browser sends mounted slot ids as a space-separated list in the order slots were
+* rendered, which changes across navigations. This normalizes to a canonical form
+* (sorted, deduplicated) so equivalent slot sets map to the same RSC cache entry.
+*
+* Consumed by:
+*   - app-rsc-request-normalization (request lifecycle, reads incoming header)
+*   - app-elements (outgoing x-vinext-mounted-slots construction)
+*   - isr-cache (RSC cache key generation)
+*/
+function normalizeMountedSlotsHeader(raw) {
+	if (!raw) return null;
+	return Array.from(new Set(raw.split(/\s+/).filter(Boolean))).sort().join(" ") || null;
+}
+//#endregion
+export { normalizeMountedSlotsHeader };
+
+//# sourceMappingURL=app-mounted-slots-header.js.map

package/dist/server/app-mounted-slots-header.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-mounted-slots-header.js","names":[],"sources":["../../src/server/app-mounted-slots-header.ts"],"sourcesContent":["/**\n * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.\n *\n * The browser sends mounted slot ids as a space-separated list in the order slots were\n * rendered, which changes across navigations. This normalizes to a canonical form\n * (sorted, deduplicated) so equivalent slot sets map to the same RSC cache entry.\n *\n * Consumed by:\n *   - app-rsc-request-normalization (request lifecycle, reads incoming header)\n *   - app-elements (outgoing x-vinext-mounted-slots construction)\n *   - isr-cache (RSC cache key generation)\n */\nexport function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null {\n  if (!raw) return null;\n  const normalized = Array.from(new Set(raw.split(/\\s+/).filter(Boolean)))\n    .sort()\n    .join(\" \");\n  return normalized || null;\n}\n"],"mappings":";;;;;;;;;;;;;AAYA,SAAgB,4BAA4B,KAA+C;AACzF,KAAI,CAAC,IAAK,QAAO;AAIjB,QAHmB,MAAM,KAAK,IAAI,IAAI,IAAI,MAAM,MAAM,CAAC,OAAO,QAAQ,CAAC,CAAC,CACrE,MAAM,CACN,KAAK,IAAI,IACS"}