@tanstack/router-core 1.171.18 → 1.171.19

package/dist/cjs/load-client.cjs

@@ -108,7 +108,7 @@ function navigateFrom(router, location) {
 		_fromLocation: location
 	});
 }
-async function contextualize(router, lane, options, end, planSuccessfulLane) {
+async function contextualize(router, lane, options, end, planSuccessfulLane, retainedEnd) {
 	const [location, matches] = lane;
 	const signal = options[0].signal;
 	const preload = !!options[4];
@@ -163,7 +163,7 @@ async function contextualize(router, lane, options, end, planSuccessfulLane) {
 			...router.options.additionalContext
 		};
 		const previousStatus = match.status;
-		if (previousStatus === "success") match.status = "pending";
+		if (previousStatus === "success" && index >= retainedEnd) match.status = "pending";
 		options[8]?.();
 		try {
 			setFetching(router, match, "beforeLoad", options[0]);
@@ -209,22 +209,12 @@ function releaseFlight(router, match) {
 * Not passing in a `next` ownership recipient
 * is equivalent to discarding the match resources
 */
-function transferMatchResources(router, previous, next) {
+function transferMatchResources(router, previous, next, deferSameIdFlight) {
 	const abort = [];
 	for (const match of previous) if (!next?.includes(match)) {
 		const flight = match._flight;
 		match._flight = void 0;
-		const controller = releaseOwnedFlight(router, match, flight);
-		if (controller) abort.push(controller);
-	}
-	for (const controller of abort) controller.abort();
-}
-function transferPredecessorResources(router, previous, next) {
-	const abort = [];
-	for (const match of previous) if (!next.includes(match)) {
-		const flight = match._flight;
-		match._flight = void 0;
-		if (flight?.[2] === 1 && router._flights?.get(match.id) === flight && !(process.env.NODE_ENV !== "production" && router._tx?.[6]) && next.some((candidate) => candidate.id === match.id)) flight[2] = 0;
+		if (deferSameIdFlight && flight?.[2] === 1 && router._flights?.get(match.id) === flight && !(process.env.NODE_ENV !== "production" && router._tx?.[6]) && next?.some((candidate) => candidate.id === match.id)) flight[2] = 0;
 		else {
 			const controller = releaseOwnedFlight(router, match, flight);
 			if (controller) abort.push(controller);
@@ -232,14 +222,6 @@ function transferPredecessorResources(router, previous, next) {
 	}
 	for (const controller of abort) controller.abort();
 }
-function releaseUnownedFlights(router) {
-	const abort = [];
-	for (const [id, flight] of router._flights ?? []) if (!flight[2]) {
-		router._flights.delete(id);
-		abort.push(flight[1]);
-	}
-	for (const controller of abort) controller.abort();
-}
 function acquireMatchResources(matches) {
 	for (const match of matches) {
 		const flight = match._flight;
@@ -340,7 +322,7 @@ function getParentSnapshot(match, outcome) {
 	};
 	return match;
 }
-function createLoaderTask(router, lane, index, tasks, semanticParent, options) {
+function createLoaderTask(router, lane, index, tasks, semanticParent, options, retainedEnd) {
 	const match = lane[1][index];
 	const route = getRoute(router, match);
 	const preload = !!options[4];
@@ -386,7 +368,7 @@ function createLoaderTask(router, lane, index, tasks, semanticParent, options) {
 		const acceptedFlight = match._flight;
 		match._flight = donor;
 		releaseOwnedFlight(router, match, acceptedFlight)?.abort();
-		if (match.status === "success") match.status = "pending";
+		if (match.status === "success" && index >= retainedEnd) match.status = "pending";
 		options[8]?.();
 	}
 	if (!loaded) match.isFetching = false;
@@ -536,8 +518,9 @@ async function reduceLane(router, lane, tasks, controller, redirects, settlement
 			}
 		};
 		install();
+		const route = getRoute(router, match);
 		try {
-			await waitFor(outcome ? Promise.resolve().then(() => loadRouteChunk(getRoute(router, match), kind === ERROR ? "errorComponent" : "notFoundComponent")) : Promise.all([loadRouteChunk(getRoute(router, match)), loadRouteChunk(getRoute(router, match), "notFoundComponent")]), controller.signal);
+			await waitFor(outcome ? Promise.resolve().then(() => loadRouteChunk(route, kind === ERROR ? "errorComponent" : "notFoundComponent")) : Promise.all([loadRouteChunk(route), loadRouteChunk(route, "notFoundComponent")]), controller.signal);
 		} catch (cause) {
 			if (cause === controller.signal) {
 				discardBackground(router, lane);
@@ -590,6 +573,7 @@ async function projectLane(router, lane, signal, start = 0, end = lane[1].length
 }
 async function executeClientLane(router, location, matches, options) {
 	const matched = [location, matches];
+	const presented = router.stores.matches.get();
 	let plannedBoundary = matches.findIndex((match) => match._notFound);
 	if (router.options.notFoundMode !== "root" && plannedBoundary >= 0) {
 		const boundary = await getNotFoundBoundary(router, matched[1], void 0, options[0].signal, plannedBoundary);
@@ -600,16 +584,24 @@ async function executeClientLane(router, location, matches, options) {
 		plannedBoundary = boundary;
 	}
 	let end = plannedBoundary < 0 ? matches.length : plannedBoundary + 1;
+	let retainedEnd = 0;
+	while (retainedEnd < end && retainedEnd !== plannedBoundary) {
+		const match = matches[retainedEnd];
+		const committed = options[3][retainedEnd];
+		const visible = presented[retainedEnd];
+		if (committed?.id !== match.id || committed.status !== "success" || committed._notFound || match.preload || visible?.id !== match.id || visible.status !== "success" || visible._notFound) break;
+		retainedEnd++;
+	}
 	const tasks = [];
 	const start = options[7] ?? 0;
 	let semanticParent = start ? Promise.resolve(matched[1][start - 1]) : void 0;
 	const planSuccessfulLane = () => {
 		for (let index = start; index < end; index++) {
 			if (options[0].signal.aborted) break;
-			semanticParent = createLoaderTask(router, matched, index, tasks, semanticParent, options);
+			semanticParent = createLoaderTask(router, matched, index, tasks, semanticParent, options, retainedEnd);
 		}
 	};
-	const failure = await contextualize(router, matched, options, end, planSuccessfulLane);
+	const failure = await contextualize(router, matched, options, end, planSuccessfulLane, retainedEnd);
 	if (failure) {
 		options[5] = true;
 		end = failure[0];
@@ -619,7 +611,14 @@ async function executeClientLane(router, location, matches, options) {
 		} else if (failure[1][0] >= REDIRECTED) end = 0;
 		planSuccessfulLane();
 	}
-	if (options[2]() && !options[4]) releaseUnownedFlights(router);
+	if (options[2]() && !options[4]) {
+		const abort = [];
+		for (const [id, flight] of router._flights ?? []) if (!flight[2]) {
+			router._flights.delete(id);
+			abort.push(flight[1]);
+		}
+		for (const controller of abort) controller.abort();
+	}
 	let reduced;
 	try {
 		const reduction = reduceLane(router, matched, tasks, options[0], options[1], settleTasks(tasks, failure, matched[2]), options[8]);
@@ -633,30 +632,6 @@ async function executeClientLane(router, location, matches, options) {
 	return projectLane(router, reduced, options[0].signal, options[7] === reduced[1].length ? options[7] : 0);
 }
 /**
-* Finds the first route that should show pending UI and its two timing values.
-* A fallback already on screen remains selected after its route loads, so we
-* do not jump to a child fallback. Matches put back into pending by invalidation
-* skip pendingMs, and a route without a usable fallback blocks pending UI for deeper routes.
-*/
-function pendingConfig(router, matches) {
-	const presented = router.stores.matches.get();
-	for (let index = 0; index < matches.length; index++) {
-		const match = matches[index];
-		const success = match.status === "success";
-		const visible = success && presented[index]?.id === match.id && presented[index]?.status === "pending";
-		if (success && !visible) continue;
-		const route = getRoute(router, match);
-		const delay = visible || match.invalid ? 0 : route.options.pendingMs ?? router.options.defaultPendingMs;
-		const component = route.options.pendingComponent ?? router.options.defaultPendingComponent;
-		return component && typeof delay === "number" && delay !== Infinity ? [
-			delay,
-			index,
-			route.options.pendingMinMs ?? router.options.defaultPendingMinMs ?? 0,
-			component
-		] : void 0;
-	}
-}
-/**
 * Waits for `pendingMs`, then presents the complete lane. Rendering applies the
 * selected boundary cutoff while retaining every match's structural state.
 * A replacement load for the same match keeps the timer; choosing a different
@@ -674,20 +649,36 @@ function offerPending(router, tx) {
 		clearTimeout(session?.[3]);
 		router._pending = session = void 0;
 	}
-	const config = pendingConfig(router, tx[3]);
-	if (!config) return;
-	const [delay, boundary, min, component] = config;
-	const matchId = tx[3][boundary].id;
+	const matches = tx[3];
+	const presented = router.stores.matches.get();
+	let boundary = -1;
+	let delay;
+	let min;
+	let component;
+	let presentedPending = false;
+	for (let index = 0; index < matches.length; index++) {
+		const match = matches[index];
+		const success = match.status === "success";
+		presentedPending = presented[index]?.id === match.id && presented[index]?.status === "pending";
+		if (success && !presentedPending) continue;
+		const route = getRoute(router, match);
+		delay = success && presentedPending || match.invalid ? 0 : route.options.pendingMs ?? router.options.defaultPendingMs;
+		component = route.options.pendingComponent ?? router.options.defaultPendingComponent;
+		if (!component || typeof delay !== "number" || delay === Infinity) return;
+		boundary = index;
+		min = route.options.pendingMinMs ?? router.options.defaultPendingMinMs ?? 0;
+		break;
+	}
+	if (boundary < 0) return;
+	const matchId = matches[boundary].id;
 	if (!session || session[1] !== boundary || sessionMatchId !== matchId) {
 		clearTimeout(session?.[3]);
-		const presented = router.stores.matches.get()[boundary];
-		const visible = presented?.id === matchId && presented.status === "pending";
 		router._pending = session = [
 			tx,
 			boundary,
-			visible ? Date.now() + min : tx[4] + delay,
+			presentedPending ? Date.now() + min : tx[4] + delay,
 			void 0,
-			visible ? Promise.resolve(true) : void 0,
+			presentedPending ? Promise.resolve(true) : void 0,
 			component
 		];
 	}
@@ -697,14 +688,12 @@ function offerPending(router, tx) {
 		clearTimeout(session[3]);
 		const remaining = session[2] - Date.now();
 		if (remaining > 0) {
-			session[3] = setTimeout(() => {
-				offerPending(router, tx);
-			}, remaining);
+			session[3] = setTimeout(() => offerPending(router, tx), remaining);
 			return;
 		}
 		session[2] = 0;
 	}
-	const offered = tx[3].map((match) => ({
+	const offered = matches.map((match) => ({
 		...match,
 		_flight: void 0
 	}));
@@ -1113,7 +1102,7 @@ async function loadClientRoute(router, opts) {
 			if (match.isFetching) setFetching(router, match, false);
 		}
 		previousOwner[0].abort();
-		transferPredecessorResources(router, previousOwner[3], tx[3]);
+		transferMatchResources(router, previousOwner[3], tx[3], true);
 	}
 	if (router._tx !== tx) {
 		transferMatchResources(router, tx[3]);
@@ -1125,7 +1114,7 @@ async function loadClientRoute(router, opts) {
 		router.stores.status.set("pending");
 		router.stores.location.set(location);
 	});
-	offerPending(router, tx);
+	if (!resolvedLocation && !matches.some((match) => match._notFound)) offerPending(router, tx);
 	try {
 		await tx[5];
 	} finally {