vinext 0.0.49 → 0.0.51

package/dist/server/app-browser-visible-commit.js

@@ -1,3 +1,5 @@
+import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
 import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
@@ -5,7 +7,7 @@ import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositio
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");
 function applyApprovedVisibleCommit(state, commit) {
 	assertApprovedVisibleCommit(commit);
-	return reduceApprovedVisibleCommitState(state, commit.action);
+	return reduceApprovedVisibleCommitState(state, commit);
 }
 function assertApprovedVisibleCommit(commit) {
 	if (commit[approvedVisibleCommitBrand] !== true) throw new Error("[vinext] Visible router state mutation requires ApprovedVisibleCommit");
@@ -27,31 +29,62 @@ function commitVisibleRouterState(state, nextState, operation) {
 		visibleCommitVersion
 	};
 }
-function reduceApprovedVisibleCommitState(state, action) {
+function mergeSlotBindings(previousBindings, nextBindings, layoutIds, preservePreviousSlotIds) {
+	if (preservePreviousSlotIds.length === 0) return nextBindings;
+	const preservedSlotIds = new Set(preservePreviousSlotIds);
+	const previousBindingsBySlotId = /* @__PURE__ */ new Map();
+	for (const binding of previousBindings) {
+		if (!preservedSlotIds.has(binding.slotId)) continue;
+		previousBindingsBySlotId.set(binding.slotId, binding);
+	}
+	const mergedBindings = [];
+	const seenSlotIds = /* @__PURE__ */ new Set();
+	for (const binding of nextBindings) {
+		const previousBinding = previousBindingsBySlotId.get(binding.slotId);
+		mergedBindings.push(previousBinding ?? binding);
+		seenSlotIds.add(binding.slotId);
+	}
+	for (const slotId of preservePreviousSlotIds) {
+		if (seenSlotIds.has(slotId)) continue;
+		const previousBinding = previousBindingsBySlotId.get(slotId);
+		if (previousBinding) mergedBindings.push(previousBinding);
+	}
+	return normalizeAppElementsSlotBindings(mergedBindings, { layoutIds });
+}
+function reduceApprovedVisibleCommitState(state, commit) {
+	const { action } = commit;
 	switch (action.type) {
 		case "traverse":
 		case "navigate": return commitVisibleRouterState(state, {
-			elements: mergeElements(state.elements, action.elements, action.type === "traverse"),
+			elements: mergeElements(state.elements, action.elements, {
+				clearAbsentSlots: action.type === "traverse",
+				preserveAbsentSlots: commit.decision.preserveAbsentSlots,
+				preserveElementIds: commit.decision.preserveElementIds,
+				preservePreviousSlotIds: commit.decision.preservePreviousSlotIds
+			}),
+			interception: action.interception,
 			interceptionContext: action.interceptionContext,
-			layoutFlags: {
-				...state.layoutFlags,
-				...action.layoutFlags
-			},
+			layoutFlags: mergeLayoutFlags(state.layoutFlags, action.layoutFlags, commit.decision.preserveElementIds),
+			layoutIds: action.layoutIds,
 			navigationSnapshot: action.navigationSnapshot,
 			previousNextUrl: action.previousNextUrl,
 			renderId: action.renderId,
 			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId
+			routeId: action.routeId,
+			slotBindings: mergeSlotBindings(state.slotBindings, action.slotBindings, action.layoutIds, commit.decision.preservePreviousSlotIds)
 		}, action.operation);
 		case "replace": return commitVisibleRouterState(state, {
 			elements: action.elements,
+			interception: action.interception,
 			interceptionContext: action.interceptionContext,
 			layoutFlags: action.layoutFlags,
+			layoutIds: action.layoutIds,
 			navigationSnapshot: action.navigationSnapshot,
 			previousNextUrl: action.previousNextUrl,
 			renderId: action.renderId,
 			rootLayoutTreePath: action.rootLayoutTreePath,
-			routeId: action.routeId
+			routeId: action.routeId,
+			slotBindings: action.slotBindings
 		}, action.operation);
 		default: {
 			const _exhaustive = action.type;
@@ -60,31 +93,44 @@ function reduceApprovedVisibleCommitState(state, action) {
 	}
 }
 function resolvePendingNavigationCommitDecision(options) {
-	const { disposition, trace } = resolvePendingNavigationCommitDispositionDecision(options);
-	switch (disposition) {
+	const decision = resolvePendingNavigationCommitDispositionDecision(options);
+	switch (decision.disposition) {
 		case "skip": return {
 			disposition: "no-commit",
-			trace
+			trace: decision.trace
 		};
 		case "hard-navigate": return {
 			disposition: "hard-navigate",
-			trace
+			trace: decision.trace
 		};
-		case "dispatch": return createVisibleCommitDecision(trace);
-		default: throw new Error("[vinext] Unknown navigation commit disposition: " + String(disposition));
+		case "dispatch": return createVisibleCommitDecision(decision.trace, decision.preserveElementIds, decision.preserveAbsentSlots, decision.preservePreviousSlotIds);
+		default: throw new Error("[vinext] Unknown navigation commit disposition: " + String(decision));
 	}
 }
-function createVisibleCommitDecision(trace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent)) {
+function createVisibleCommitDecision(trace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent), preserveElementIds = [], preserveAbsentSlots = false, preservePreviousSlotIds = []) {
 	return {
 		disposition: "commit",
+		preserveAbsentSlots,
+		preserveElementIds: [...preserveElementIds],
+		preservePreviousSlotIds: [...preservePreviousSlotIds],
 		trace
 	};
 }
+function mergeLayoutFlags(previousFlags, nextFlags, preserveElementIds) {
+	const merged = { ...nextFlags };
+	for (const id of preserveElementIds) {
+		if (Object.hasOwn(merged, id)) continue;
+		const value = previousFlags[id];
+		if (value) merged[id] = value;
+	}
+	return merged;
+}
 function createApprovedVisibleCommit(options) {
 	return {
 		[approvedVisibleCommitBrand]: true,
 		action: options.pending.action,
 		decision: options.decision,
+		interception: options.pending.interception,
 		interceptionContext: options.pending.interceptionContext,
 		previousNextUrl: options.pending.previousNextUrl,
 		rootLayoutTreePath: options.pending.rootLayoutTreePath,
@@ -130,11 +176,11 @@ function approveHmrVisibleCommit(pending) {
 function approvePendingNavigationCommit(options) {
 	const decision = addCommitTransactionTrace(resolvePendingNavigationCommitDecision({
 		activeNavigationId: options.activeNavigationId,
-		currentVisibleCommitVersion: options.currentState.visibleCommitVersion,
-		currentRootLayoutTreePath: options.currentState.rootLayoutTreePath,
-		nextRootLayoutTreePath: options.pending.rootLayoutTreePath,
+		currentState: options.currentState,
+		pending: options.pending,
+		routeManifest: options.routeManifest ?? null,
 		startedNavigationId: options.startedNavigationId,
-		startedVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion
+		targetHref: options.targetHref
 	}), options.pending);
 	switch (decision.disposition) {
 		case "commit": return {
@@ -167,7 +213,9 @@ async function resolveAndClassifyNavigationCommit(options) {
 		activeNavigationId: options.getActiveNavigationId?.() ?? options.activeNavigationId,
 		currentState: approvalState,
 		pending,
-		startedNavigationId: options.startedNavigationId
+		routeManifest: options.routeManifest ?? null,
+		startedNavigationId: options.startedNavigationId,
+		targetHref: options.targetHref
 	});
 	return {
 		approvedCommit: approval.approvedCommit,

package/dist/server/app-browser-visible-commit.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-browser-visible-commit.js","names":[],"sources":["../../src/server/app-browser-visible-commit.ts"],"sourcesContent":["import type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport { mergeElements } from \"vinext/shims/slot\";\nimport type { AppElements } from \"./app-elements.js\";\nimport {\n  createPendingNavigationCommit,\n  resolvePendingNavigationCommitDispositionDecision,\n  type AppRouterAction,\n  type AppRouterState,\n  type CommittedOperationRecord,\n  type OperationLane,\n  type PendingNavigationCommit,\n  type PendingOperationRecord,\n} from \"./app-browser-state.js\";\nimport {\n  NavigationTraceReasonCodes,\n  NavigationTraceTransactionCodes,\n  createNavigationTrace,\n  prependNavigationTraceEntry,\n  type NavigationTrace,\n  type NavigationTraceFields,\n  type NavigationTraceTransactionCode,\n} from \"./navigation-trace.js\";\n\ntype VisibleCommitDecision = {\n  disposition: \"commit\";\n  trace: NavigationTrace;\n};\ntype HardNavigateCommitDecision = {\n  disposition: \"hard-navigate\";\n  trace: NavigationTrace;\n};\ntype NoCommitDecision = {\n  disposition: \"no-commit\";\n  trace: NavigationTrace;\n};\ntype CommitDecision = VisibleCommitDecision | HardNavigateCommitDecision | NoCommitDecision;\nconst approvedVisibleCommitBrand: unique symbol = Symbol(\"ApprovedVisibleCommit\");\nexport type ApprovedVisibleCommit = {\n  readonly [approvedVisibleCommitBrand]: true;\n  readonly action: AppRouterAction;\n  readonly decision: VisibleCommitDecision;\n  readonly interceptionContext: string | null;\n  readonly previousNextUrl: string | null;\n  readonly rootLayoutTreePath: string | null;\n  readonly routeId: string;\n};\ntype VisibleCommitApproval = {\n  approvedCommit: ApprovedVisibleCommit;\n  decision: VisibleCommitDecision;\n};\ntype NonVisibleCommitApproval = {\n  approvedCommit: null;\n  decision: HardNavigateCommitDecision | NoCommitDecision;\n};\ntype CommitApproval = VisibleCommitApproval | NonVisibleCommitApproval;\ntype ClassifiedPendingNavigationCommit = {\n  approvedCommit: ApprovedVisibleCommit | null;\n  decision: CommitDecision;\n  pending: PendingNavigationCommit;\n  trace: NavigationTrace;\n};\n\nexport function applyApprovedVisibleCommit(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  assertApprovedVisibleCommit(commit);\n  return reduceApprovedVisibleCommitState(state, commit.action);\n}\n\nfunction assertApprovedVisibleCommit(commit: ApprovedVisibleCommit): void {\n  if (commit[approvedVisibleCommitBrand] !== true) {\n    throw new Error(\"[vinext] Visible router state mutation requires ApprovedVisibleCommit\");\n  }\n}\n\nfunction commitOperationRecord(\n  operation: PendingOperationRecord,\n  visibleCommitVersion: number,\n): CommittedOperationRecord {\n  return {\n    id: operation.id,\n    lane: operation.lane,\n    startedVisibleCommitVersion: operation.startedVisibleCommitVersion,\n    state: \"committed\",\n    visibleCommitVersion,\n  };\n}\n\nfunction commitVisibleRouterState(\n  state: AppRouterState,\n  nextState: Omit<AppRouterState, \"activeOperation\" | \"visibleCommitVersion\">,\n  operation: PendingOperationRecord,\n): AppRouterState {\n  // Single owner for visibleCommitVersion: only an ApprovedVisibleCommit may\n  // advance it, and every accepted visible mutation advances it exactly once.\n  const visibleCommitVersion = state.visibleCommitVersion + 1;\n  return {\n    ...nextState,\n    activeOperation: commitOperationRecord(operation, visibleCommitVersion),\n    visibleCommitVersion,\n  };\n}\n\nfunction reduceApprovedVisibleCommitState(\n  state: AppRouterState,\n  action: AppRouterAction,\n): AppRouterState {\n  switch (action.type) {\n    case \"traverse\":\n    case \"navigate\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: mergeElements(state.elements, action.elements, action.type === \"traverse\"),\n          interceptionContext: action.interceptionContext,\n          layoutFlags: { ...state.layoutFlags, ...action.layoutFlags },\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n        },\n        action.operation,\n      );\n    case \"replace\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: action.elements,\n          interceptionContext: action.interceptionContext,\n          layoutFlags: action.layoutFlags,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n        },\n        action.operation,\n      );\n    default: {\n      const _exhaustive: never = action.type;\n      throw new Error(\"[vinext] Unknown router action: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction resolvePendingNavigationCommitDecision(options: {\n  activeNavigationId: number;\n  currentVisibleCommitVersion: number;\n  currentRootLayoutTreePath: string | null;\n  nextRootLayoutTreePath: string | null;\n  startedNavigationId: number;\n  startedVisibleCommitVersion: number;\n}): CommitDecision {\n  const { disposition, trace } = resolvePendingNavigationCommitDispositionDecision(options);\n\n  switch (disposition) {\n    case \"skip\":\n      return { disposition: \"no-commit\", trace };\n    case \"hard-navigate\":\n      return { disposition: \"hard-navigate\", trace };\n    case \"dispatch\":\n      return createVisibleCommitDecision(trace);\n    default: {\n      const _exhaustive: never = disposition;\n      throw new Error(\"[vinext] Unknown navigation commit disposition: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction createVisibleCommitDecision(\n  trace: NavigationTrace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent),\n): VisibleCommitDecision {\n  return { disposition: \"commit\", trace };\n}\n\nfunction createApprovedVisibleCommit(options: {\n  decision: VisibleCommitDecision;\n  pending: PendingNavigationCommit;\n}): ApprovedVisibleCommit {\n  return {\n    [approvedVisibleCommitBrand]: true,\n    action: options.pending.action,\n    decision: options.decision,\n    interceptionContext: options.pending.interceptionContext,\n    previousNextUrl: options.pending.previousNextUrl,\n    rootLayoutTreePath: options.pending.rootLayoutTreePath,\n    routeId: options.pending.routeId,\n  };\n}\n\nfunction createCommitTransactionFields(pending: PendingNavigationCommit): NavigationTraceFields {\n  return {\n    operationLane: pending.action.operation.lane,\n    pendingOperationId: pending.action.operation.id,\n    startedVisibleCommitVersion: pending.action.operation.startedVisibleCommitVersion,\n  };\n}\n\nfunction prependCommitTransactionTrace(\n  trace: NavigationTrace,\n  code: NavigationTraceTransactionCode,\n  pending: PendingNavigationCommit,\n): NavigationTrace {\n  return prependNavigationTraceEntry(trace, code, createCommitTransactionFields(pending));\n}\n\nfunction addCommitTransactionTrace(\n  decision: CommitDecision,\n  pending: PendingNavigationCommit,\n): CommitDecision {\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.visibleCommit,\n          pending,\n        ),\n      };\n    case \"hard-navigate\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.hardNavigate,\n          pending,\n        ),\n      };\n    case \"no-commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.noCommit,\n          pending,\n        ),\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport function approveHmrVisibleCommit(pending: PendingNavigationCommit): ApprovedVisibleCommit {\n  if (pending.action.operation.lane !== \"hmr\") {\n    throw new Error(\"[vinext] HMR visible commit approval requires an HMR pending operation\");\n  }\n\n  const decision = addCommitTransactionTrace(createVisibleCommitDecision(), pending);\n  // This guard is a type narrowing assertion: createVisibleCommitDecision()\n  // structurally produces a commit decision, and addCommitTransactionTrace()\n  // must preserve that disposition while adding operator trace context.\n  if (decision.disposition !== \"commit\") {\n    throw new Error(\"[vinext] HMR visible commit approval did not produce a commit decision\");\n  }\n\n  return createApprovedVisibleCommit({\n    decision,\n    pending,\n  });\n}\n\nexport function approvePendingNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  startedNavigationId: number;\n}): CommitApproval {\n  const decision = addCommitTransactionTrace(\n    resolvePendingNavigationCommitDecision({\n      activeNavigationId: options.activeNavigationId,\n      currentVisibleCommitVersion: options.currentState.visibleCommitVersion,\n      currentRootLayoutTreePath: options.currentState.rootLayoutTreePath,\n      nextRootLayoutTreePath: options.pending.rootLayoutTreePath,\n      startedNavigationId: options.startedNavigationId,\n      startedVisibleCommitVersion: options.pending.action.operation.startedVisibleCommitVersion,\n    }),\n    options.pending,\n  );\n\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        approvedCommit: createApprovedVisibleCommit({\n          decision,\n          pending: options.pending,\n        }),\n        decision,\n      };\n    case \"hard-navigate\":\n    case \"no-commit\":\n      return {\n        approvedCommit: null,\n        decision,\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport async function resolveAndClassifyNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  // When provided, these getters are called after awaiting nextElements so\n  // approval uses the latest lifecycle authority instead of the call snapshot.\n  getActiveNavigationId?: () => number;\n  getCurrentStateForApproval?: () => AppRouterState;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  nextElements: Promise<AppElements>;\n  operationLane: OperationLane;\n  previousNextUrl?: string | null;\n  renderId: number;\n  startedNavigationId: number;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n}): Promise<ClassifiedPendingNavigationCommit> {\n  const pending = await createPendingNavigationCommit({\n    currentState: options.currentState,\n    nextElements: options.nextElements,\n    navigationSnapshot: options.navigationSnapshot,\n    operationLane: options.operationLane,\n    previousNextUrl: options.previousNextUrl,\n    renderId: options.renderId,\n    type: options.type,\n  });\n\n  const approvalState = options.getCurrentStateForApproval?.() ?? options.currentState;\n  const approval = approvePendingNavigationCommit({\n    activeNavigationId: options.getActiveNavigationId?.() ?? options.activeNavigationId,\n    currentState: approvalState,\n    pending,\n    startedNavigationId: options.startedNavigationId,\n  });\n\n  return {\n    approvedCommit: approval.approvedCommit,\n    decision: approval.decision,\n    pending,\n    trace: approval.decision.trace,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-browser-visible-commit.js","names":["_exhaustive"],"sources":["../../src/server/app-browser-visible-commit.ts"],"sourcesContent":["import type { ClientNavigationRenderSnapshot } from \"vinext/shims/navigation\";\nimport type { RouteManifest } from \"../routing/app-route-graph.js\";\nimport { mergeElements } from \"vinext/shims/slot\";\nimport {\n  normalizeAppElementsSlotBindings,\n  type AppElements,\n  type AppElementsSlotBinding,\n} from \"./app-elements.js\";\nimport {\n  createPendingNavigationCommit,\n  resolvePendingNavigationCommitDispositionDecision,\n  type AppRouterAction,\n  type AppRouterState,\n  type CommittedOperationRecord,\n  type OperationLane,\n  type PendingNavigationCommit,\n  type PendingOperationRecord,\n} from \"./app-browser-state.js\";\nimport {\n  NavigationTraceReasonCodes,\n  NavigationTraceTransactionCodes,\n  createNavigationTrace,\n  prependNavigationTraceEntry,\n  type NavigationTrace,\n  type NavigationTraceFields,\n  type NavigationTraceTransactionCode,\n} from \"./navigation-trace.js\";\n\ntype VisibleCommitDecision = {\n  disposition: \"commit\";\n  preserveAbsentSlots: boolean;\n  preserveElementIds: readonly string[];\n  preservePreviousSlotIds: readonly string[];\n  trace: NavigationTrace;\n};\ntype HardNavigateCommitDecision = {\n  disposition: \"hard-navigate\";\n  trace: NavigationTrace;\n};\ntype NoCommitDecision = {\n  disposition: \"no-commit\";\n  trace: NavigationTrace;\n};\ntype CommitDecision = VisibleCommitDecision | HardNavigateCommitDecision | NoCommitDecision;\nconst approvedVisibleCommitBrand: unique symbol = Symbol(\"ApprovedVisibleCommit\");\nexport type ApprovedVisibleCommit = {\n  readonly [approvedVisibleCommitBrand]: true;\n  readonly action: AppRouterAction;\n  readonly decision: VisibleCommitDecision;\n  readonly interception: AppRouterAction[\"interception\"];\n  readonly interceptionContext: string | null;\n  readonly previousNextUrl: string | null;\n  readonly rootLayoutTreePath: string | null;\n  readonly routeId: string;\n};\ntype VisibleCommitApproval = {\n  approvedCommit: ApprovedVisibleCommit;\n  decision: VisibleCommitDecision;\n};\ntype NonVisibleCommitApproval = {\n  approvedCommit: null;\n  decision: HardNavigateCommitDecision | NoCommitDecision;\n};\ntype CommitApproval = VisibleCommitApproval | NonVisibleCommitApproval;\ntype ClassifiedPendingNavigationCommit = {\n  approvedCommit: ApprovedVisibleCommit | null;\n  decision: CommitDecision;\n  pending: PendingNavigationCommit;\n  trace: NavigationTrace;\n};\n\nexport function applyApprovedVisibleCommit(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  assertApprovedVisibleCommit(commit);\n  return reduceApprovedVisibleCommitState(state, commit);\n}\n\nfunction assertApprovedVisibleCommit(commit: ApprovedVisibleCommit): void {\n  if (commit[approvedVisibleCommitBrand] !== true) {\n    throw new Error(\"[vinext] Visible router state mutation requires ApprovedVisibleCommit\");\n  }\n}\n\nfunction commitOperationRecord(\n  operation: PendingOperationRecord,\n  visibleCommitVersion: number,\n): CommittedOperationRecord {\n  return {\n    id: operation.id,\n    lane: operation.lane,\n    startedVisibleCommitVersion: operation.startedVisibleCommitVersion,\n    state: \"committed\",\n    visibleCommitVersion,\n  };\n}\n\nfunction commitVisibleRouterState(\n  state: AppRouterState,\n  nextState: Omit<AppRouterState, \"activeOperation\" | \"visibleCommitVersion\">,\n  operation: PendingOperationRecord,\n): AppRouterState {\n  // Single owner for visibleCommitVersion: only an ApprovedVisibleCommit may\n  // advance it, and every accepted visible mutation advances it exactly once.\n  const visibleCommitVersion = state.visibleCommitVersion + 1;\n  return {\n    ...nextState,\n    activeOperation: commitOperationRecord(operation, visibleCommitVersion),\n    visibleCommitVersion,\n  };\n}\n\nfunction mergeSlotBindings(\n  previousBindings: readonly AppElementsSlotBinding[],\n  nextBindings: readonly AppElementsSlotBinding[],\n  layoutIds: readonly string[],\n  preservePreviousSlotIds: readonly string[],\n): readonly AppElementsSlotBinding[] {\n  if (preservePreviousSlotIds.length === 0) return nextBindings;\n\n  const preservedSlotIds = new Set(preservePreviousSlotIds);\n  const previousBindingsBySlotId = new Map<string, AppElementsSlotBinding>();\n  for (const binding of previousBindings) {\n    if (!preservedSlotIds.has(binding.slotId)) continue;\n    previousBindingsBySlotId.set(binding.slotId, binding);\n  }\n\n  const mergedBindings: AppElementsSlotBinding[] = [];\n  const seenSlotIds = new Set<string>();\n  for (const binding of nextBindings) {\n    const previousBinding = previousBindingsBySlotId.get(binding.slotId);\n    mergedBindings.push(previousBinding ?? binding);\n    seenSlotIds.add(binding.slotId);\n  }\n  for (const slotId of preservePreviousSlotIds) {\n    if (seenSlotIds.has(slotId)) continue;\n    const previousBinding = previousBindingsBySlotId.get(slotId);\n    if (previousBinding) mergedBindings.push(previousBinding);\n  }\n  return normalizeAppElementsSlotBindings(mergedBindings, { layoutIds });\n}\n\nfunction reduceApprovedVisibleCommitState(\n  state: AppRouterState,\n  commit: ApprovedVisibleCommit,\n): AppRouterState {\n  const { action } = commit;\n  switch (action.type) {\n    case \"traverse\":\n    case \"navigate\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: mergeElements(state.elements, action.elements, {\n            clearAbsentSlots: action.type === \"traverse\",\n            preserveAbsentSlots: commit.decision.preserveAbsentSlots,\n            preserveElementIds: commit.decision.preserveElementIds,\n            preservePreviousSlotIds: commit.decision.preservePreviousSlotIds,\n          }),\n          interception: action.interception,\n          interceptionContext: action.interceptionContext,\n          layoutFlags: mergeLayoutFlags(\n            state.layoutFlags,\n            action.layoutFlags,\n            commit.decision.preserveElementIds,\n          ),\n          layoutIds: action.layoutIds,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n          slotBindings: mergeSlotBindings(\n            state.slotBindings,\n            action.slotBindings,\n            action.layoutIds,\n            commit.decision.preservePreviousSlotIds,\n          ),\n        },\n        action.operation,\n      );\n    case \"replace\":\n      return commitVisibleRouterState(\n        state,\n        {\n          elements: action.elements,\n          interception: action.interception,\n          interceptionContext: action.interceptionContext,\n          layoutFlags: action.layoutFlags,\n          layoutIds: action.layoutIds,\n          navigationSnapshot: action.navigationSnapshot,\n          previousNextUrl: action.previousNextUrl,\n          renderId: action.renderId,\n          rootLayoutTreePath: action.rootLayoutTreePath,\n          routeId: action.routeId,\n          slotBindings: action.slotBindings,\n        },\n        action.operation,\n      );\n    default: {\n      const _exhaustive: never = action.type;\n      throw new Error(\"[vinext] Unknown router action: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction resolvePendingNavigationCommitDecision(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref: string;\n}): CommitDecision {\n  const decision = resolvePendingNavigationCommitDispositionDecision(options);\n\n  switch (decision.disposition) {\n    case \"skip\":\n      return { disposition: \"no-commit\", trace: decision.trace };\n    case \"hard-navigate\":\n      return { disposition: \"hard-navigate\", trace: decision.trace };\n    case \"dispatch\":\n      return createVisibleCommitDecision(\n        decision.trace,\n        decision.preserveElementIds,\n        decision.preserveAbsentSlots,\n        decision.preservePreviousSlotIds,\n      );\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown navigation commit disposition: \" + String(_exhaustive));\n    }\n  }\n}\n\nfunction createVisibleCommitDecision(\n  trace: NavigationTrace = createNavigationTrace(NavigationTraceReasonCodes.commitCurrent),\n  preserveElementIds: readonly string[] = [],\n  preserveAbsentSlots: boolean = false,\n  preservePreviousSlotIds: readonly string[] = [],\n): VisibleCommitDecision {\n  return {\n    disposition: \"commit\",\n    preserveAbsentSlots,\n    preserveElementIds: [...preserveElementIds],\n    preservePreviousSlotIds: [...preservePreviousSlotIds],\n    trace,\n  };\n}\n\nfunction mergeLayoutFlags(\n  previousFlags: AppRouterState[\"layoutFlags\"],\n  nextFlags: AppRouterState[\"layoutFlags\"],\n  preserveElementIds: readonly string[],\n): AppRouterState[\"layoutFlags\"] {\n  const merged: Record<string, \"s\" | \"d\"> = { ...nextFlags };\n  for (const id of preserveElementIds) {\n    if (Object.hasOwn(merged, id)) continue;\n    const value = previousFlags[id];\n    if (value) merged[id] = value;\n  }\n  return merged;\n}\n\nfunction createApprovedVisibleCommit(options: {\n  decision: VisibleCommitDecision;\n  pending: PendingNavigationCommit;\n}): ApprovedVisibleCommit {\n  return {\n    [approvedVisibleCommitBrand]: true,\n    action: options.pending.action,\n    decision: options.decision,\n    interception: options.pending.interception,\n    interceptionContext: options.pending.interceptionContext,\n    previousNextUrl: options.pending.previousNextUrl,\n    rootLayoutTreePath: options.pending.rootLayoutTreePath,\n    routeId: options.pending.routeId,\n  };\n}\n\nfunction createCommitTransactionFields(pending: PendingNavigationCommit): NavigationTraceFields {\n  return {\n    operationLane: pending.action.operation.lane,\n    pendingOperationId: pending.action.operation.id,\n    startedVisibleCommitVersion: pending.action.operation.startedVisibleCommitVersion,\n  };\n}\n\nfunction prependCommitTransactionTrace(\n  trace: NavigationTrace,\n  code: NavigationTraceTransactionCode,\n  pending: PendingNavigationCommit,\n): NavigationTrace {\n  return prependNavigationTraceEntry(trace, code, createCommitTransactionFields(pending));\n}\n\nfunction addCommitTransactionTrace(\n  decision: CommitDecision,\n  pending: PendingNavigationCommit,\n): CommitDecision {\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.visibleCommit,\n          pending,\n        ),\n      };\n    case \"hard-navigate\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.hardNavigate,\n          pending,\n        ),\n      };\n    case \"no-commit\":\n      return {\n        ...decision,\n        trace: prependCommitTransactionTrace(\n          decision.trace,\n          NavigationTraceTransactionCodes.noCommit,\n          pending,\n        ),\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport function approveHmrVisibleCommit(pending: PendingNavigationCommit): ApprovedVisibleCommit {\n  if (pending.action.operation.lane !== \"hmr\") {\n    throw new Error(\"[vinext] HMR visible commit approval requires an HMR pending operation\");\n  }\n\n  const decision = addCommitTransactionTrace(createVisibleCommitDecision(), pending);\n  // This guard is a type narrowing assertion: createVisibleCommitDecision()\n  // structurally produces a commit decision, and addCommitTransactionTrace()\n  // must preserve that disposition while adding operator trace context.\n  if (decision.disposition !== \"commit\") {\n    throw new Error(\"[vinext] HMR visible commit approval did not produce a commit decision\");\n  }\n\n  return createApprovedVisibleCommit({\n    decision,\n    pending,\n  });\n}\n\nexport function approvePendingNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  pending: PendingNavigationCommit;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref: string;\n}): CommitApproval {\n  const decision = addCommitTransactionTrace(\n    resolvePendingNavigationCommitDecision({\n      activeNavigationId: options.activeNavigationId,\n      currentState: options.currentState,\n      pending: options.pending,\n      routeManifest: options.routeManifest ?? null,\n      startedNavigationId: options.startedNavigationId,\n      targetHref: options.targetHref,\n    }),\n    options.pending,\n  );\n\n  switch (decision.disposition) {\n    case \"commit\":\n      return {\n        approvedCommit: createApprovedVisibleCommit({\n          decision,\n          pending: options.pending,\n        }),\n        decision,\n      };\n    case \"hard-navigate\":\n    case \"no-commit\":\n      return {\n        approvedCommit: null,\n        decision,\n      };\n    default: {\n      const _exhaustive: never = decision;\n      throw new Error(\"[vinext] Unknown commit decision: \" + String(_exhaustive));\n    }\n  }\n}\n\nexport async function resolveAndClassifyNavigationCommit(options: {\n  activeNavigationId: number;\n  currentState: AppRouterState;\n  // When provided, these getters are called after awaiting nextElements so\n  // approval uses the latest lifecycle authority instead of the call snapshot.\n  getActiveNavigationId?: () => number;\n  getCurrentStateForApproval?: () => AppRouterState;\n  navigationSnapshot: ClientNavigationRenderSnapshot;\n  nextElements: Promise<AppElements>;\n  operationLane: OperationLane;\n  previousNextUrl?: string | null;\n  renderId: number;\n  routeManifest?: RouteManifest | null;\n  startedNavigationId: number;\n  targetHref: string;\n  type: \"navigate\" | \"replace\" | \"traverse\";\n}): Promise<ClassifiedPendingNavigationCommit> {\n  const pending = await createPendingNavigationCommit({\n    currentState: options.currentState,\n    nextElements: options.nextElements,\n    navigationSnapshot: options.navigationSnapshot,\n    operationLane: options.operationLane,\n    previousNextUrl: options.previousNextUrl,\n    renderId: options.renderId,\n    type: options.type,\n  });\n\n  const approvalState = options.getCurrentStateForApproval?.() ?? options.currentState;\n  const approval = approvePendingNavigationCommit({\n    activeNavigationId: options.getActiveNavigationId?.() ?? options.activeNavigationId,\n    currentState: approvalState,\n    pending,\n    routeManifest: options.routeManifest ?? null,\n    startedNavigationId: options.startedNavigationId,\n    targetHref: options.targetHref,\n  });\n\n  return {\n    approvedCommit: approval.approvedCommit,\n    decision: approval.decision,\n    pending,\n    trace: approval.decision.trace,\n  };\n}\n"],"mappings":"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"}

package/dist/server/app-client-reference-preloader.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-client-reference-preloader.js","names":[],"sources":["../../src/server/app-client-reference-preloader.ts"],"sourcesContent":["type ClientReferenceRequire = (id: string) => Promise<unknown>;\n\ntype ClientReferenceMap = Readonly<Record<string, unknown>>;\n\ntype ClientReferencePreloaderOptions = {\n  getReferences: () => ClientReferenceMap | undefined;\n  getClientRequire: () => ClientReferenceRequire | undefined;\n  onPreloadError?: (id: string, error: unknown) => void;\n};\n\ntype ClientReferencePreloader = {\n  preload: (referenceIds?: Iterable<string>) => Promise<void>;\n};\n\nconst resolvedPreload = Promise.resolve();\n\nexport function createClientReferencePreloader(\n  options: ClientReferencePreloaderOptions,\n): ClientReferencePreloader {\n  let allReferencesPreloaded = false;\n  let allReferencesPreloadPromise: Promise<void> | null = null;\n  const preloadedReferences = new Set<string>();\n  const referencePreloadPromises = new Map<string, Promise<void>>();\n\n  function preloadReference(id: string, clientRequire: ClientReferenceRequire): Promise<void> {\n    if (preloadedReferences.has(id)) {\n      return resolvedPreload;\n    }\n\n    const existing = referencePreloadPromises.get(id);\n    if (existing) {\n      return existing;\n    }\n\n    const preloadPromise = clientRequire(id)\n      .catch((error) => {\n        options.onPreloadError?.(id, error);\n      })\n      .then(() => {\n        preloadedReferences.add(id);\n      })\n      .finally(() => {\n        referencePreloadPromises.delete(id);\n      });\n\n    referencePreloadPromises.set(id, preloadPromise);\n    return preloadPromise;\n  }\n\n  function preloadReferenceSet(\n    referenceIds: Iterable<string>,\n    refs: ClientReferenceMap,\n    clientRequire: ClientReferenceRequire,\n  ): Promise<void> {\n    const pending: Promise<void>[] = [];\n\n    for (const id of referenceIds) {\n      if (Object.hasOwn(refs, id)) {\n        pending.push(preloadReference(id, clientRequire));\n      }\n    }\n\n    if (pending.length === 0) {\n      return resolvedPreload;\n    }\n\n    return Promise.all(pending).then(() => {});\n  }\n\n  return {\n    preload(referenceIds) {\n      const refs = options.getReferences();\n      const clientRequire = options.getClientRequire();\n      if (!refs || !clientRequire) {\n        return resolvedPreload;\n      }\n\n      if (referenceIds) {\n        return preloadReferenceSet(referenceIds, refs, clientRequire);\n      }\n\n      if (allReferencesPreloaded) {\n        return resolvedPreload;\n      }\n      if (allReferencesPreloadPromise) {\n        return allReferencesPreloadPromise;\n      }\n\n      allReferencesPreloadPromise = preloadReferenceSet(Object.keys(refs), refs, clientRequire)\n        .then(() => {\n          allReferencesPreloaded = true;\n        })\n        .finally(() => {\n          allReferencesPreloadPromise = null;\n        });\n\n      return allReferencesPreloadPromise;\n    },\n  };\n}\n"],"mappings":";AAcA,MAAM,kBAAkB,QAAQ,SAAS;AAEzC,SAAgB,+BACd,SAC0B;CAC1B,IAAI,yBAAyB;CAC7B,IAAI,8BAAoD;CACxD,MAAM,sCAAsB,IAAI,KAAa;CAC7C,MAAM,2CAA2B,IAAI,KAA4B;CAEjE,SAAS,iBAAiB,IAAY,eAAsD;AAC1F,MAAI,oBAAoB,IAAI,GAAG,CAC7B,QAAO;EAGT,MAAM,WAAW,yBAAyB,IAAI,GAAG;AACjD,MAAI,SACF,QAAO;EAGT,MAAM,iBAAiB,cAAc,GAAG,CACrC,OAAO,UAAU;AAChB,WAAQ,iBAAiB,IAAI,MAAM;IACnC,CACD,WAAW;AACV,uBAAoB,IAAI,GAAG;IAC3B,CACD,cAAc;AACb,4BAAyB,OAAO,GAAG;IACnC;AAEJ,2BAAyB,IAAI,IAAI,eAAe;AAChD,SAAO;;CAGT,SAAS,oBACP,cACA,MACA,eACe;EACf,MAAM,UAA2B,EAAE;AAEnC,OAAK,MAAM,MAAM,aACf,KAAI,OAAO,OAAO,MAAM,GAAG,CACzB,SAAQ,KAAK,iBAAiB,IAAI,cAAc,CAAC;AAIrD,MAAI,QAAQ,WAAW,EACrB,QAAO;AAGT,SAAO,QAAQ,IAAI,QAAQ,CAAC,WAAW,GAAG;;AAG5C,QAAO,EACL,QAAQ,cAAc;EACpB,MAAM,OAAO,QAAQ,eAAe;EACpC,MAAM,gBAAgB,QAAQ,kBAAkB;AAChD,MAAI,CAAC,QAAQ,CAAC,cACZ,QAAO;AAGT,MAAI,aACF,QAAO,oBAAoB,cAAc,MAAM,cAAc;AAG/D,MAAI,uBACF,QAAO;AAET,MAAI,4BACF,QAAO;AAGT,gCAA8B,oBAAoB,OAAO,KAAK,KAAK,EAAE,MAAM,cAAc,CACtF,WAAW;AACV,4BAAyB;IACzB,CACD,cAAc;AACb,iCAA8B;IAC9B;AAEJ,SAAO;IAEV"}
+{"version":3,"file":"app-client-reference-preloader.js","names":[],"sources":["../../src/server/app-client-reference-preloader.ts"],"sourcesContent":["type ClientReferenceRequire = (id: string) => Promise<unknown>;\n\ntype ClientReferenceMap = Readonly<Record<string, unknown>>;\n\ntype ClientReferencePreloaderOptions = {\n  getReferences: () => ClientReferenceMap | undefined;\n  getClientRequire: () => ClientReferenceRequire | undefined;\n  onPreloadError?: (id: string, error: unknown) => void;\n};\n\ntype ClientReferencePreloader = {\n  preload: (referenceIds?: Iterable<string>) => Promise<void>;\n};\n\nconst resolvedPreload = Promise.resolve();\n\nexport function createClientReferencePreloader(\n  options: ClientReferencePreloaderOptions,\n): ClientReferencePreloader {\n  let allReferencesPreloaded = false;\n  let allReferencesPreloadPromise: Promise<void> | null = null;\n  const preloadedReferences = new Set<string>();\n  const referencePreloadPromises = new Map<string, Promise<void>>();\n\n  function preloadReference(id: string, clientRequire: ClientReferenceRequire): Promise<void> {\n    if (preloadedReferences.has(id)) {\n      return resolvedPreload;\n    }\n\n    const existing = referencePreloadPromises.get(id);\n    if (existing) {\n      return existing;\n    }\n\n    const preloadPromise = clientRequire(id)\n      .catch((error) => {\n        options.onPreloadError?.(id, error);\n      })\n      .then(() => {\n        preloadedReferences.add(id);\n      })\n      .finally(() => {\n        referencePreloadPromises.delete(id);\n      });\n\n    referencePreloadPromises.set(id, preloadPromise);\n    return preloadPromise;\n  }\n\n  function preloadReferenceSet(\n    referenceIds: Iterable<string>,\n    refs: ClientReferenceMap,\n    clientRequire: ClientReferenceRequire,\n  ): Promise<void> {\n    const pending: Promise<void>[] = [];\n\n    for (const id of referenceIds) {\n      if (Object.hasOwn(refs, id)) {\n        pending.push(preloadReference(id, clientRequire));\n      }\n    }\n\n    if (pending.length === 0) {\n      return resolvedPreload;\n    }\n\n    return Promise.all(pending).then(() => {});\n  }\n\n  return {\n    preload(referenceIds) {\n      const refs = options.getReferences();\n      const clientRequire = options.getClientRequire();\n      if (!refs || !clientRequire) {\n        return resolvedPreload;\n      }\n\n      if (referenceIds) {\n        return preloadReferenceSet(referenceIds, refs, clientRequire);\n      }\n\n      if (allReferencesPreloaded) {\n        return resolvedPreload;\n      }\n      if (allReferencesPreloadPromise) {\n        return allReferencesPreloadPromise;\n      }\n\n      allReferencesPreloadPromise = preloadReferenceSet(Object.keys(refs), refs, clientRequire)\n        .then(() => {\n          allReferencesPreloaded = true;\n        })\n        .finally(() => {\n          allReferencesPreloadPromise = null;\n        });\n\n      return allReferencesPreloadPromise;\n    },\n  };\n}\n"],"mappings":";AAcA,MAAM,kBAAkB,QAAQ,SAAS;AAEzC,SAAgB,+BACd,SAC0B;CAC1B,IAAI,yBAAyB;CAC7B,IAAI,8BAAoD;CACxD,MAAM,sCAAsB,IAAI,KAAa;CAC7C,MAAM,2CAA2B,IAAI,KAA4B;CAEjE,SAAS,iBAAiB,IAAY,eAAsD;EAC1F,IAAI,oBAAoB,IAAI,GAAG,EAC7B,OAAO;EAGT,MAAM,WAAW,yBAAyB,IAAI,GAAG;EACjD,IAAI,UACF,OAAO;EAGT,MAAM,iBAAiB,cAAc,GAAG,CACrC,OAAO,UAAU;GAChB,QAAQ,iBAAiB,IAAI,MAAM;IACnC,CACD,WAAW;GACV,oBAAoB,IAAI,GAAG;IAC3B,CACD,cAAc;GACb,yBAAyB,OAAO,GAAG;IACnC;EAEJ,yBAAyB,IAAI,IAAI,eAAe;EAChD,OAAO;;CAGT,SAAS,oBACP,cACA,MACA,eACe;EACf,MAAM,UAA2B,EAAE;EAEnC,KAAK,MAAM,MAAM,cACf,IAAI,OAAO,OAAO,MAAM,GAAG,EACzB,QAAQ,KAAK,iBAAiB,IAAI,cAAc,CAAC;EAIrD,IAAI,QAAQ,WAAW,GACrB,OAAO;EAGT,OAAO,QAAQ,IAAI,QAAQ,CAAC,WAAW,GAAG;;CAG5C,OAAO,EACL,QAAQ,cAAc;EACpB,MAAM,OAAO,QAAQ,eAAe;EACpC,MAAM,gBAAgB,QAAQ,kBAAkB;EAChD,IAAI,CAAC,QAAQ,CAAC,eACZ,OAAO;EAGT,IAAI,cACF,OAAO,oBAAoB,cAAc,MAAM,cAAc;EAG/D,IAAI,wBACF,OAAO;EAET,IAAI,6BACF,OAAO;EAGT,8BAA8B,oBAAoB,OAAO,KAAK,KAAK,EAAE,MAAM,cAAc,CACtF,WAAW;GACV,yBAAyB;IACzB,CACD,cAAc;GACb,8BAA8B;IAC9B;EAEJ,OAAO;IAEV"}

package/dist/server/app-elements-wire.d.ts

@@ -1,16 +1,38 @@
+import { RenderObservation } from "./cache-proof.js";
 import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { ReactNode } from "react";
 
 //#region src/server/app-elements-wire.d.ts
 declare const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
+declare const APP_INTERCEPTION_KEY = "__interception";
 declare const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
+declare const APP_LAYOUT_IDS_KEY = "__layoutIds";
 declare const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
+declare const APP_RENDER_OBSERVATION_KEY = "__renderObservation";
 declare const APP_ROUTE_KEY = "__route";
 declare const APP_ROOT_LAYOUT_KEY = "__rootLayout";
+declare const APP_SLOT_BINDINGS_KEY = "__slotBindings";
 declare const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
 declare const UNMATCHED_SLOT: unique symbol;
-type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null;
-type AppWireElementValue = ReactNode | string | null;
+type AppElementsSlotBindingState = "active" | "default" | "unmatched";
+type AppElementsSlotBinding = Readonly<{
+  ownerLayoutId: string | null;
+  slotId: string;
+  state: AppElementsSlotBindingState;
+}>;
+type AppElementsInterception = Readonly<{
+  sourceMatchedUrl: string;
+  sourceRouteId: string;
+  slotId: string;
+  targetMatchedUrl: string;
+  targetRouteId: string;
+}>;
+declare function compareAppElementsSlotIds(left: string, right: string): number;
+declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
+  layoutIds?: readonly string[];
+}): readonly AppElementsSlotBinding[];
+type AppElementValue = ReactNode | typeof UNMATCHED_SLOT | string | null | LayoutFlags | ArtifactCompatibilityEnvelope | AppElementsInterception | readonly AppElementsSlotBinding[];
+type AppWireElementValue = ReactNode | string | null | LayoutFlags | ArtifactCompatibilityEnvelope | AppElementsInterception | readonly AppElementsSlotBinding[];
 type AppElements = Readonly<Record<string, AppElementValue>>;
 type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
 /**
@@ -33,10 +55,13 @@ type AppWireElements = Readonly<Record<string, AppWireElementValue>>;
 type LayoutFlags = Readonly<Record<string, "s" | "d">>;
 type AppElementsMetadata = {
   artifactCompatibility: ArtifactCompatibilityEnvelope;
+  interception: AppElementsInterception | null;
   interceptionContext: string | null;
+  layoutIds: readonly string[];
   layoutFlags: LayoutFlags;
   routeId: string;
   rootLayoutTreePath: string | null;
+  slotBindings: readonly AppElementsSlotBinding[];
 };
 type AppElementsWireElementKey = {
   kind: "layout";
@@ -58,14 +83,20 @@ type AppElementsWireElementKey = {
   treePath: string;
 };
 type AppElementsWireMetadataInput = {
+  interception?: AppElementsInterception | null;
   interceptionContext: string | null;
+  layoutIds?: readonly string[];
   routeId: string;
   rootLayoutTreePath: string | null;
+  slotBindings?: readonly AppElementsSlotBinding[];
 };
 type AppElementsWireMetadataEntries = Readonly<{
   [APP_ROUTE_KEY]: string;
+  [APP_INTERCEPTION_KEY]?: AppElementsInterception;
   [APP_INTERCEPTION_CONTEXT_KEY]: string | null;
+  [APP_LAYOUT_IDS_KEY]: readonly string[];
   [APP_ROOT_LAYOUT_KEY]: string | null;
+  [APP_SLOT_BINDINGS_KEY]?: readonly AppElementsSlotBinding[];
 }>;
 /**
  * The outgoing wire payload shape. Includes ReactNode values for the
@@ -73,13 +104,17 @@ type AppElementsWireMetadataEntries = Readonly<{
  * known keys (e.g. __layoutFlags). Distinct from AppElements / AppWireElements
  * which only carry render-time values.
  */
-type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | ArtifactCompatibilityEnvelope>>;
+type AppOutgoingElements = Readonly<Record<string, ReactNode | LayoutFlags | ArtifactCompatibilityEnvelope | AppElementsInterception | RenderObservation | readonly AppElementsSlotBinding[]>>;
 type AppElementsWireKeys = {
   readonly artifactCompatibility: typeof APP_ARTIFACT_COMPATIBILITY_KEY;
+  readonly interception: typeof APP_INTERCEPTION_KEY;
   readonly interceptionContext: typeof APP_INTERCEPTION_CONTEXT_KEY;
+  readonly layoutIds: typeof APP_LAYOUT_IDS_KEY;
   readonly layoutFlags: typeof APP_LAYOUT_FLAGS_KEY;
+  readonly renderObservation: typeof APP_RENDER_OBSERVATION_KEY;
   readonly rootLayout: typeof APP_ROOT_LAYOUT_KEY;
   readonly route: typeof APP_ROUTE_KEY;
+  readonly slotBindings: typeof APP_SLOT_BINDINGS_KEY;
 };
 type AppElementsWireCodec = {
   readonly keys: AppElementsWireKeys;
@@ -89,9 +124,10 @@ type AppElementsWireCodec = {
   encodeCacheKey(rscUrl: string, interceptionContext: string | null): string;
   encodeLayoutId(treePath: string): string;
   encodeOutgoingPayload(input: {
-    element: ReactNode | Readonly<Record<string, ReactNode>>;
+    element: ReactNode | Readonly<Record<string, ReactNode | AppElementsInterception | readonly AppElementsSlotBinding[]>>;
     artifactCompatibility?: ArtifactCompatibilityEnvelope;
     layoutFlags: LayoutFlags;
+    renderObservation?: RenderObservation;
   }): ReactNode | AppOutgoingElements;
   encodePageId(routePath: string, interceptionContext: string | null): string;
   encodeRouteId(routePath: string, interceptionContext: string | null): string;
@@ -119,12 +155,13 @@ declare function withLayoutFlags<T extends Record<string, unknown>>(elements: T,
   [APP_LAYOUT_FLAGS_KEY]: LayoutFlags;
 };
 declare function buildOutgoingAppPayload(input: {
-  element: ReactNode | Readonly<Record<string, ReactNode>>;
+  element: ReactNode | Readonly<Record<string, ReactNode | AppElementsInterception | readonly AppElementsSlotBinding[]>>;
   artifactCompatibility?: ArtifactCompatibilityEnvelope;
   layoutFlags: LayoutFlags;
+  renderObservation?: RenderObservation;
 }): ReactNode | AppOutgoingElements;
 declare function readAppElementsMetadata(elements: Readonly<Record<string, unknown>>): AppElementsMetadata;
 declare const AppElementsWire: AppElementsWireCodec;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsSlotBindingState, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
 //# sourceMappingURL=app-elements-wire.d.ts.map

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

@@ -1,14 +1,39 @@
+import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
 import { createArtifactCompatibilityEnvelope, parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { isValidElement } from "react";
 //#region src/server/app-elements-wire.ts
 const APP_INTERCEPTION_SEPARATOR = "\0";
 const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
+const APP_INTERCEPTION_KEY = "__interception";
 const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
+const APP_LAYOUT_IDS_KEY = "__layoutIds";
 const APP_LAYOUT_FLAGS_KEY = "__layoutFlags";
+const APP_RENDER_OBSERVATION_KEY = "__renderObservation";
 const APP_ROUTE_KEY = "__route";
 const APP_ROOT_LAYOUT_KEY = "__rootLayout";
+const APP_SLOT_BINDINGS_KEY = "__slotBindings";
 const APP_UNMATCHED_SLOT_WIRE_VALUE = "__VINEXT_UNMATCHED_SLOT__";
 const UNMATCHED_SLOT = Symbol.for("vinext.unmatchedSlot");
+function compareAppElementsSlotIds(left, right) {
+	if (left < right) return -1;
+	if (left > right) return 1;
+	return 0;
+}
+function compareAppElementsSlotBindingsBySlotId(left, right) {
+	return compareAppElementsSlotIds(left.slotId, right.slotId);
+}
+function normalizeAppElementsSlotBindings(slotBindings, options = {}) {
+	const ownerLayoutIds = options.layoutIds ? new Set(options.layoutIds) : null;
+	const seenSlotIds = /* @__PURE__ */ new Set();
+	const normalized = [];
+	for (const binding of slotBindings) {
+		if (seenSlotIds.has(binding.slotId)) throw new Error("[vinext] Invalid __slotBindings in App Router payload: duplicate slot id");
+		seenSlotIds.add(binding.slotId);
+		if (ownerLayoutIds && binding.ownerLayoutId !== null && !ownerLayoutIds.has(binding.ownerLayoutId)) throw new Error("[vinext] Invalid __slotBindings in App Router payload: owner layout id missing from __layoutIds");
+		normalized.push({ ...binding });
+	}
+	return normalized.sort(compareAppElementsSlotBindingsBySlotId);
+}
 function appendInterceptionContext(identity, interceptionContext) {
 	return interceptionContext === null ? identity : `${identity}${APP_INTERCEPTION_SEPARATOR}${interceptionContext}`;
 }
@@ -100,11 +125,22 @@ function isAppElementsWireSlotId(key) {
 	return separatorIndex > 0 && body.charCodeAt(separatorIndex + 1) === 47;
 }
 function createAppElementsWireMetadataEntries(input) {
-	return {
+	const layoutIds = [...input.layoutIds ?? []];
+	const entries = {
 		[APP_ROUTE_KEY]: input.routeId,
 		[APP_INTERCEPTION_CONTEXT_KEY]: input.interceptionContext,
+		[APP_LAYOUT_IDS_KEY]: layoutIds,
 		[APP_ROOT_LAYOUT_KEY]: input.rootLayoutTreePath
 	};
+	const entriesWithInterception = input.interception ? {
+		...entries,
+		[APP_INTERCEPTION_KEY]: input.interception
+	} : entries;
+	if (input.slotBindings && input.slotBindings.length > 0) return {
+		...entriesWithInterception,
+		[APP_SLOT_BINDINGS_KEY]: normalizeAppElementsSlotBindings(input.slotBindings, { layoutIds })
+	};
+	return entriesWithInterception;
 }
 function normalizeAppElements(elements) {
 	let needsNormalization = false;
@@ -122,10 +158,78 @@ function isLayoutFlagsRecord(value) {
 	for (const v of Object.values(value)) if (v !== "s" && v !== "d") return false;
 	return true;
 }
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function parseLayoutFlags(value) {
 	if (isLayoutFlagsRecord(value)) return value;
 	return {};
 }
+function parseLayoutIds(value) {
+	if (value === void 0) return [];
+	if (!Array.isArray(value)) throw new Error("[vinext] Invalid __layoutIds in App Router payload: expected layout id string[]");
+	const layoutIds = [];
+	for (const entry of value) {
+		if (typeof entry !== "string") throw new Error("[vinext] Invalid __layoutIds in App Router payload: expected layout id string[]");
+		if (parseAppElementsWireElementKey(entry)?.kind !== "layout") throw new Error("[vinext] Invalid __layoutIds in App Router payload: expected layout ids");
+		layoutIds.push(entry);
+	}
+	return layoutIds;
+}
+function isSlotBindingState(value) {
+	return value === "active" || value === "default" || value === "unmatched";
+}
+function parseSlotBindings(value, options = {}) {
+	if (value === void 0) return [];
+	if (!Array.isArray(value)) throw new Error("[vinext] Invalid __slotBindings in App Router payload: expected array");
+	const slotBindings = [];
+	for (const entry of value) {
+		if (!isRecord(entry)) throw new Error("[vinext] Invalid __slotBindings in App Router payload: expected objects");
+		const slotId = entry.slotId;
+		if (typeof slotId !== "string" || parseAppElementsWireElementKey(slotId)?.kind !== "slot") throw new Error("[vinext] Invalid __slotBindings in App Router payload: expected slot ids");
+		const ownerLayoutId = entry.ownerLayoutId;
+		if (ownerLayoutId !== null && (typeof ownerLayoutId !== "string" || parseAppElementsWireElementKey(ownerLayoutId)?.kind !== "layout")) throw new Error("[vinext] Invalid __slotBindings in App Router payload: expected owner layout ids");
+		const state = entry.state;
+		if (!isSlotBindingState(state)) throw new Error("[vinext] Invalid __slotBindings in App Router payload: expected state");
+		slotBindings.push({
+			ownerLayoutId,
+			slotId,
+			state
+		});
+	}
+	return normalizeAppElementsSlotBindings(slotBindings, options);
+}
+function readRequiredInterceptionString(entry, fieldName) {
+	const value = entry[fieldName];
+	if (typeof value !== "string") throw new Error("[vinext] Invalid __interception in App Router payload: expected strings");
+	return value;
+}
+function parseInterceptionMatchedUrl(value) {
+	if (!isInterceptionMatchedUrlPath(value)) throw new Error("[vinext] Invalid __interception in App Router payload: expected path URLs");
+	return value;
+}
+function parseInterceptionRouteId(value, matchedUrl) {
+	const parsed = parseAppElementsWireElementKey(value);
+	if (parsed?.kind !== "route" || parsed.path !== matchedUrl || parsed.interceptionContext !== null) throw new Error("[vinext] Invalid __interception in App Router payload: expected route ids");
+	return value;
+}
+function parseInterceptionSlotId(value) {
+	if (parseAppElementsWireElementKey(value)?.kind !== "slot") throw new Error("[vinext] Invalid __interception in App Router payload: expected slot id");
+	return value;
+}
+function parseInterceptionMetadata(value) {
+	if (value === void 0 || value === null) return null;
+	if (!isRecord(value)) throw new Error("[vinext] Invalid __interception in App Router payload: expected object");
+	const sourceMatchedUrl = parseInterceptionMatchedUrl(readRequiredInterceptionString(value, "sourceMatchedUrl"));
+	const targetMatchedUrl = parseInterceptionMatchedUrl(readRequiredInterceptionString(value, "targetMatchedUrl"));
+	return {
+		sourceMatchedUrl,
+		sourceRouteId: parseInterceptionRouteId(readRequiredInterceptionString(value, "sourceRouteId"), sourceMatchedUrl),
+		slotId: parseInterceptionSlotId(readRequiredInterceptionString(value, "slotId")),
+		targetMatchedUrl,
+		targetRouteId: parseInterceptionRouteId(readRequiredInterceptionString(value, "targetRouteId"), targetMatchedUrl)
+	};
+}
 /**
 * Type predicate for a plain (non-null, non-array) record of app payload values.
 * Used to distinguish the App Router payload object from bare React elements at
@@ -149,11 +253,13 @@ function withLayoutFlags(elements, layoutFlags) {
 }
 function buildOutgoingAppPayload(input) {
 	if (!isAppElementsRecord(input.element)) return input.element;
-	return {
+	const payload = {
 		...input.element,
 		[APP_LAYOUT_FLAGS_KEY]: input.layoutFlags,
 		[APP_ARTIFACT_COMPATIBILITY_KEY]: input.artifactCompatibility ?? createArtifactCompatibilityEnvelope()
 	};
+	if (input.renderObservation) payload[APP_RENDER_OBSERVATION_KEY] = input.renderObservation;
+	return payload;
 }
 function readArtifactCompatibilityMetadata(value) {
 	if (value === void 0) return createArtifactCompatibilityEnvelope();
@@ -168,21 +274,31 @@ function readAppElementsMetadata(elements) {
 	if (rootLayoutTreePath === void 0) throw new Error("[vinext] Missing __rootLayout key in App Router payload");
 	if (rootLayoutTreePath !== null && typeof rootLayoutTreePath !== "string") throw new Error("[vinext] Invalid __rootLayout in App Router payload: expected string or null");
 	const layoutFlags = parseLayoutFlags(elements[APP_LAYOUT_FLAGS_KEY]);
+	const layoutIds = parseLayoutIds(elements[APP_LAYOUT_IDS_KEY]);
+	const slotBindings = parseSlotBindings(elements[APP_SLOT_BINDINGS_KEY], { layoutIds });
+	const interception = parseInterceptionMetadata(elements[APP_INTERCEPTION_KEY]);
 	return {
 		artifactCompatibility: readArtifactCompatibilityMetadata(elements[APP_ARTIFACT_COMPATIBILITY_KEY]),
+		interception,
 		interceptionContext: interceptionContext ?? null,
+		layoutIds,
 		layoutFlags,
 		routeId,
-		rootLayoutTreePath
+		rootLayoutTreePath,
+		slotBindings
 	};
 }
 const AppElementsWire = {
 	keys: {
 		artifactCompatibility: APP_ARTIFACT_COMPATIBILITY_KEY,
+		interception: APP_INTERCEPTION_KEY,
 		interceptionContext: APP_INTERCEPTION_CONTEXT_KEY,
+		layoutIds: APP_LAYOUT_IDS_KEY,
 		layoutFlags: APP_LAYOUT_FLAGS_KEY,
+		renderObservation: APP_RENDER_OBSERVATION_KEY,
 		rootLayout: APP_ROOT_LAYOUT_KEY,
-		route: APP_ROUTE_KEY
+		route: APP_ROUTE_KEY,
+		slotBindings: APP_SLOT_BINDINGS_KEY
 	},
 	unmatchedSlotValue: APP_UNMATCHED_SLOT_WIRE_VALUE,
 	createMetadataEntries: createAppElementsWireMetadataEntries,
@@ -200,6 +316,6 @@ const AppElementsWire = {
 	withLayoutFlags
 };
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
 
 //# sourceMappingURL=app-elements-wire.js.map