@timber-js/app 0.2.0-alpha.210 → 0.2.0-alpha.212

package/dist/client/internal.js

@@ -121,13 +121,16 @@ function isAbortError(error) {
 	if (error instanceof Error && error.name === "AbortError") return true;
 	return false;
 }
-function createNavigationLifecycle(deps) {
+function createNavigationLifecycle() {
 	let current = null;
 	let pendingCommit = null;
 	let routerPhase = { phase: "idle" };
 	const pendingListeners = /* @__PURE__ */ new Set();
 	let navigationSeq = 0;
 	let idleTask = null;
+	const idleListeners = /* @__PURE__ */ new Set();
+	const treeCommitListeners = /* @__PURE__ */ new Set();
+	const ownerSeq = /* @__PURE__ */ new WeakMap();
 	/**
 	* Whether a handed-off tree has not yet committed. Derived from the slot:
 	* true when `current` is handed off but not yet settled.
@@ -155,23 +158,18 @@ function createNavigationLifecycle(deps) {
 	* in-flight navigation. Optionally links to an external signal (e.g.,
 	* from the Navigation API's NavigateEvent.signal).
 	*
-	* Superseding is one operation with three parts:
+	* Superseding is one operation with two parts:
 	* 1. Abort the previous navigation's fetch — UNLESS its tree is the one on
 	*    screen, in which case tearing the stream down would error the page the
 	*    user is currently looking at. See `RenderOwner.handedOff`.
 	* 2. Settle the previous owner as 'superseded' so its transition detects
 	*    it lost and never hands a stale tree to React. This replaces both
 	*    `supersedeNavigationTransitions()` and the transition counter bump.
-	* 3. Resolve its Navigation API deferred — the superseded navigation's
-	*    finally block is staleness-guarded (see TIM-1034) and no longer
-	*    cleans up after itself, so the browser's native loading state for
-	*    the dead navigation is cleared here.
 	*/
 	function createNavOwner(kind, externalSignal) {
 		if (current) {
 			abortUnlessHandedOff(current);
 			current.settle("superseded");
-			deps.completeRouterNavigation?.();
 		}
 		if (pendingCommit) {
 			pendingCommit.settle("superseded");
@@ -179,6 +177,7 @@ function createNavigationLifecycle(deps) {
 		}
 		navigationSeq += 1;
 		const owner = createRenderOwner(kind);
+		ownerSeq.set(owner, navigationSeq);
 		current = owner;
 		if (externalSignal) {
 			if (externalSignal.aborted) abortUnlessHandedOff(owner);
@@ -214,13 +213,14 @@ function createNavigationLifecycle(deps) {
 			if (current === owner) {
 				current = null;
 				setPending(false);
-				deps.completeRouterNavigation?.();
 				flushIdleTask();
 			}
 		}
 	}
 	function flushIdleTask() {
-		if (routerPhase.phase !== "idle" || hasUncommittedNav() || !idleTask) return;
+		if (routerPhase.phase !== "idle" || hasUncommittedNav()) return;
+		for (const listener of [...idleListeners]) listener();
+		if (!idleTask) return;
 		const task = idleTask;
 		idleTask = null;
 		task();
@@ -237,9 +237,12 @@ function createNavigationLifecycle(deps) {
 		forgetOlderHandoffs(owner) {
 			owner.settle("committed");
 			if (pendingCommit === owner) pendingCommit = null;
+			const seq = ownerSeq.get(owner) ?? navigationSeq;
+			for (const listener of [...treeCommitListeners]) listener(seq);
 			flushIdleTask();
 		},
 		placeRevalidationOwner(owner) {
+			ownerSeq.set(owner, navigationSeq);
 			current = owner;
 		},
 		isPending: () => routerPhase.phase === "navigating",
@@ -264,6 +267,14 @@ function createNavigationLifecycle(deps) {
 			}
 			idleTask = task;
 		},
+		onIdle(listener) {
+			idleListeners.add(listener);
+			return () => idleListeners.delete(listener);
+		},
+		onTreeCommit(listener) {
+			treeCommitListeners.add(listener);
+			return () => treeCommitListeners.delete(listener);
+		},
 		settleHandoffs() {
 			if (pendingCommit) {
 				pendingCommit.settle("superseded");
@@ -461,9 +472,7 @@ function createNavigationPipeline({ deps, prefetchCache, currentStateTree, prepa
 			result = await fetchRscPayload(url, deps, freshStateTree, currentUrl, options.signal);
 		}
 		const commitHistoryUrl = () => {
-			if (options.skipHistory) return;
 			const commitUrl = options.commitUrl ?? url;
-			deps.setRouterNavigating?.(true);
 			if (options.replace) deps.replaceState({
 				timber: true,
 				scrollY: 0
@@ -472,7 +481,6 @@ function createNavigationPipeline({ deps, prefetchCache, currentStateTree, prepa
 				timber: true,
 				scrollY: 0
 			}, "", commitUrl);
-			deps.setRouterNavigating?.(false);
 		};
 		const params = await result.params;
 		const { navState, commit } = prepareNavigation(url, {
@@ -513,7 +521,7 @@ function createRouter(deps) {
 		historyStack,
 		clientSegmentCache: () => deps.clientSegmentCache
 	});
-	const lifecycle = createNavigationLifecycle(deps);
+	const lifecycle = createNavigationLifecycle();
 	const { currentOwner, createNavOwner, runNavigation, markHandedOff, forgetOlderHandoffs, isPending, getPendingUrl, onPendingChange } = lifecycle;
 	const { performNavigationFetch, renderViaTransition } = createNavigationPipeline({
 		deps,
@@ -541,13 +549,11 @@ function createRouter(deps) {
 	async function navigate(url, options = {}) {
 		const scroll = options.scroll !== false;
 		const replace = options.replace === true;
-		const externalSignal = options._signal;
-		const skipHistory = options._skipHistory === true;
 		const types = options._renderTypes ?? ["navigation-forward", ...options.transitionTypes ?? []];
 		const hashIndex = url.indexOf("#");
 		const hash = hashIndex === -1 ? "" : url.slice(hashIndex);
 		const fetchUrl = hashIndex === -1 ? url : url.slice(0, hashIndex);
-		const departingUrl = options._departingUrl ?? deps.getCurrentUrl();
+		const departingUrl = deps.getCurrentUrl();
 		const currentScrollY = deps.getScrollY();
 		if (deps.saveNavigationEntryScroll) deps.saveNavigationEntryScroll(currentScrollY);
 		else deps.replaceState({
@@ -555,20 +561,12 @@ function createRouter(deps) {
 			scrollY: currentScrollY
 		}, "", deps.getCurrentUrl());
 		if (isClientStale()) await leaveSpaSuperseding(url, departingUrl);
-		let effectiveSkipHistory = skipHistory;
 		await runNavigation(url, async (owner) => {
-			if (!effectiveSkipHistory && deps.navigationNavigate) {
-				deps.setRouterNavigating?.(true);
-				deps.navigationNavigate(url, replace);
-				deps.setRouterNavigating?.(false);
-				effectiveSkipHistory = true;
-			}
 			try {
 				await renderViaTransition(fetchUrl, owner, types, () => performNavigationFetch(fetchUrl, {
 					replace,
 					commitUrl: url,
 					signal: owner.fetchAbort.signal,
-					skipHistory: effectiveSkipHistory,
 					departingUrl
 				}), options.onCommit);
 				if (scroll && hash) scrollToHashAfterPaint(hash);
@@ -577,7 +575,7 @@ function createRouter(deps) {
 				if (await recoverFromNavigationError(error, owner, url, departingUrl, types)) return;
 				throw error;
 			}
-		}, externalSignal);
+		});
 	}
 	/**
 	* Fetch a URL's RSC payload, commit it, and render — the pipeline shared by
@@ -717,6 +715,8 @@ function createRouter(deps) {
 			return outcome === "committed";
 		},
 		runWhenIdle: (task) => lifecycle.runWhenIdle(task),
+		onIdle: (listener) => lifecycle.onIdle(listener),
+		onTreeCommit: (listener) => lifecycle.onTreeCommit(listener),
 		settleHandoffs: () => lifecycle.settleHandoffs(),
 		suppressSegmentReuse() {
 			segmentCache.invalidateReuse();