@moku-labs/web 2.4.1 → 2.4.2

package/dist/browser.mjs

@@ -3867,6 +3867,17 @@ function createSpaKernel(state, config, emit, deps) {
 	let pendingScrollToTop = true;
 	let pendingTransition = resolveTransition(resolved.defaultTransition);
 	let pushingOwnUrl = false;
+	let programmatic;
+	/**
+	* Aborts the programmatic navigation still loading, if any.
+	*
+	* @example
+	* supersedeProgrammatic(); // a link click or back/forward starts
+	*/
+	const supersedeProgrammatic = () => {
+		programmatic?.abort();
+		programmatic = void 0;
+	};
 	/**
 	* Resolve a {@link TransitionMode} into the runtime {@link SwapTransition} the swap
 	* consumes: `"none"` ⇒ disabled; `"crossfade"` ⇒ enabled, no named types (default root
@@ -4181,7 +4192,8 @@ function createSpaKernel(state, config, emit, deps) {
 	* swaps but the address bar (and the back button / refresh / deep link) stays on the old URL.
 	* Where the Navigation API exists, `history.pushState` fires a `navigate` event synchronously
 	* (Chrome, Edge, Safari 26): `pushingOwnUrl` marks it, so the interceptor does not run this
-	* navigation a second time. The current scroll is saved first so a later back restores it.
+	* navigation a second time. The current scroll is saved first so a later back restores it. It
+	* carries its own abort signal: any later navigation aborts it before it can swap.
 	*
 	* @param path - The destination path (pathname + optional search).
 	* @param scroll - The optional per-call scroll override.
@@ -4199,7 +4211,12 @@ function createSpaKernel(state, config, emit, deps) {
 				pushingOwnUrl = false;
 			}
 		}
-		navigate(path, true, void 0, scroll).catch(() => {});
+		supersedeProgrammatic();
+		const controller = new AbortController();
+		programmatic = controller;
+		navigate(path, true, controller.signal, scroll).catch(() => {}).finally(() => {
+			if (programmatic === controller) programmatic = void 0;
+		});
 	};
 	return {
 		/**
@@ -4226,7 +4243,10 @@ function createSpaKernel(state, config, emit, deps) {
 			if (state.started) throw new Error(`${ERROR_PREFIX} spa kernel already started.\n  Call app.stop() before booting again (single boot per app).`);
 			progress = createProgressBar(resolved.progressBar);
 			state.currentUrl = currentLocationUrl();
-			state.destroyRouter = attachRouter(handlers, navigate, () => pushingOwnUrl);
+			state.destroyRouter = attachRouter(handlers, (pathname, scrollToTop, signal, scrollOverride) => {
+				supersedeProgrammatic();
+				return navigate(pathname, scrollToTop, signal, scrollOverride);
+			}, () => pushingOwnUrl);
 			const matchPath = state.currentUrl.split("?")[0] ?? state.currentUrl;
 			const hit = deps.router.match(matchPath);
 			if (hit?.route._handlers.render && isClientOnlyRoute(deps.router.mode(), hit.route)) bootRender(state.currentUrl);

package/dist/index.cjs

@@ -10961,6 +10961,17 @@ function createSpaKernel(state, config, emit, deps) {
 	let pendingScrollToTop = true;
 	let pendingTransition = resolveTransition(resolved.defaultTransition);
 	let pushingOwnUrl = false;
+	let programmatic;
+	/**
+	* Aborts the programmatic navigation still loading, if any.
+	*
+	* @example
+	* supersedeProgrammatic(); // a link click or back/forward starts
+	*/
+	const supersedeProgrammatic = () => {
+		programmatic?.abort();
+		programmatic = void 0;
+	};
 	/**
 	* Resolve a {@link TransitionMode} into the runtime {@link SwapTransition} the swap
 	* consumes: `"none"` ⇒ disabled; `"crossfade"` ⇒ enabled, no named types (default root
@@ -11275,7 +11286,8 @@ function createSpaKernel(state, config, emit, deps) {
 	* swaps but the address bar (and the back button / refresh / deep link) stays on the old URL.
 	* Where the Navigation API exists, `history.pushState` fires a `navigate` event synchronously
 	* (Chrome, Edge, Safari 26): `pushingOwnUrl` marks it, so the interceptor does not run this
-	* navigation a second time. The current scroll is saved first so a later back restores it.
+	* navigation a second time. The current scroll is saved first so a later back restores it. It
+	* carries its own abort signal: any later navigation aborts it before it can swap.
 	*
 	* @param path - The destination path (pathname + optional search).
 	* @param scroll - The optional per-call scroll override.
@@ -11293,7 +11305,12 @@ function createSpaKernel(state, config, emit, deps) {
 				pushingOwnUrl = false;
 			}
 		}
-		navigate(path, true, void 0, scroll).catch(() => {});
+		supersedeProgrammatic();
+		const controller = new AbortController();
+		programmatic = controller;
+		navigate(path, true, controller.signal, scroll).catch(() => {}).finally(() => {
+			if (programmatic === controller) programmatic = void 0;
+		});
 	};
 	return {
 		/**
@@ -11320,7 +11337,10 @@ function createSpaKernel(state, config, emit, deps) {
 			if (state.started) throw new Error(`${ERROR_PREFIX} spa kernel already started.\n  Call app.stop() before booting again (single boot per app).`);
 			progress = createProgressBar(resolved.progressBar);
 			state.currentUrl = currentLocationUrl();
-			state.destroyRouter = attachRouter(handlers, navigate, () => pushingOwnUrl);
+			state.destroyRouter = attachRouter(handlers, (pathname, scrollToTop, signal, scrollOverride) => {
+				supersedeProgrammatic();
+				return navigate(pathname, scrollToTop, signal, scrollOverride);
+			}, () => pushingOwnUrl);
 			const matchPath = state.currentUrl.split("?")[0] ?? state.currentUrl;
 			const hit = deps.router.match(matchPath);
 			if (hit?.route._handlers.render && isClientOnlyRoute(deps.router.mode(), hit.route)) bootRender(state.currentUrl);

package/dist/index.mjs

@@ -10917,6 +10917,17 @@ function createSpaKernel(state, config, emit, deps) {
 	let pendingScrollToTop = true;
 	let pendingTransition = resolveTransition(resolved.defaultTransition);
 	let pushingOwnUrl = false;
+	let programmatic;
+	/**
+	* Aborts the programmatic navigation still loading, if any.
+	*
+	* @example
+	* supersedeProgrammatic(); // a link click or back/forward starts
+	*/
+	const supersedeProgrammatic = () => {
+		programmatic?.abort();
+		programmatic = void 0;
+	};
 	/**
 	* Resolve a {@link TransitionMode} into the runtime {@link SwapTransition} the swap
 	* consumes: `"none"` ⇒ disabled; `"crossfade"` ⇒ enabled, no named types (default root
@@ -11231,7 +11242,8 @@ function createSpaKernel(state, config, emit, deps) {
 	* swaps but the address bar (and the back button / refresh / deep link) stays on the old URL.
 	* Where the Navigation API exists, `history.pushState` fires a `navigate` event synchronously
 	* (Chrome, Edge, Safari 26): `pushingOwnUrl` marks it, so the interceptor does not run this
-	* navigation a second time. The current scroll is saved first so a later back restores it.
+	* navigation a second time. The current scroll is saved first so a later back restores it. It
+	* carries its own abort signal: any later navigation aborts it before it can swap.
 	*
 	* @param path - The destination path (pathname + optional search).
 	* @param scroll - The optional per-call scroll override.
@@ -11249,7 +11261,12 @@ function createSpaKernel(state, config, emit, deps) {
 				pushingOwnUrl = false;
 			}
 		}
-		navigate(path, true, void 0, scroll).catch(() => {});
+		supersedeProgrammatic();
+		const controller = new AbortController();
+		programmatic = controller;
+		navigate(path, true, controller.signal, scroll).catch(() => {}).finally(() => {
+			if (programmatic === controller) programmatic = void 0;
+		});
 	};
 	return {
 		/**
@@ -11276,7 +11293,10 @@ function createSpaKernel(state, config, emit, deps) {
 			if (state.started) throw new Error(`${ERROR_PREFIX} spa kernel already started.\n  Call app.stop() before booting again (single boot per app).`);
 			progress = createProgressBar(resolved.progressBar);
 			state.currentUrl = currentLocationUrl();
-			state.destroyRouter = attachRouter(handlers, navigate, () => pushingOwnUrl);
+			state.destroyRouter = attachRouter(handlers, (pathname, scrollToTop, signal, scrollOverride) => {
+				supersedeProgrammatic();
+				return navigate(pathname, scrollToTop, signal, scrollOverride);
+			}, () => pushingOwnUrl);
 			const matchPath = state.currentUrl.split("?")[0] ?? state.currentUrl;
 			const hit = deps.router.match(matchPath);
 			if (hit?.route._handlers.render && isClientOnlyRoute(deps.router.mode(), hit.route)) bootRender(state.currentUrl);

package/package.json

@@ -137,5 +137,5 @@
     "release:doctor": "moku-release doctor",
     "release": "moku-release"
   },
-  "version": "2.4.1"
+  "version": "2.4.2"
 }