@moku-labs/web 2.4.0 → 2.4.2

package/dist/browser.mjs

@@ -3645,11 +3645,13 @@ function attachHistoryFallback(handlers, navigate = (pathname, _scrollToTop, sig
 * @param navigation - The Navigation API object to attach the listener to.
 * @param handlers - The navigation lifecycle callbacks.
 * @param navigate - The navigation strategy (defaults to HTML-over-fetch via `performNavigation`).
+* @param isOwnPush - True while the kernel's programmatic navigation runs its own
+*   `history.pushState`: the `navigate` event it fires is left alone, the kernel runs it once.
 * @returns A teardown that removes the `navigate` listener.
 * @example
 * const dispose = attachNavigationApi(navigation, handlers);
 */
-function attachNavigationApi(navigation, handlers, navigate = (pathname, _scrollToTop, signal) => performNavigation(pathname, handlers, signal)) {
+function attachNavigationApi(navigation, handlers, navigate = (pathname, _scrollToTop, signal) => performNavigation(pathname, handlers, signal), isOwnPush = () => false) {
 	/**
 	* Handle a `navigate` event: classify, then intercept with fetch-and-swap.
 	*
@@ -3658,6 +3660,7 @@ function attachNavigationApi(navigation, handlers, navigate = (pathname, _scroll
 	* navigation.addEventListener("navigate", onNavigate);
 	*/
 	const onNavigate = (navEvent) => {
+		if (isOwnPush()) return;
 		const url = new URL(navEvent.destination.url);
 		if (!navEvent.canIntercept || navEvent.hashChange || navEvent.downloadRequest) return;
 		if (!isInternalLink(url)) return;
@@ -3690,13 +3693,15 @@ function attachNavigationApi(navigation, handlers, navigate = (pathname, _scroll
 *
 * @param handlers - The navigation lifecycle callbacks the kernel supplies.
 * @param navigate - The navigation strategy (defaults to HTML-over-fetch via `performNavigation`).
+* @param isOwnPush - True while the kernel runs its own `history.pushState` (Navigation API path
+*   only; the History fallback never sees an event for it).
 * @returns A teardown removing all attached listeners.
 * @example
-* const dispose = attachRouter(handlers, navigate);
+* const dispose = attachRouter(handlers, navigate, () => pushingOwnUrl);
 */
-function attachRouter(handlers, navigate) {
+function attachRouter(handlers, navigate, isOwnPush) {
 	const navigation = getNavigation();
-	return navigation ? attachNavigationApi(navigation, handlers, navigate) : attachHistoryFallback(handlers, navigate);
+	return navigation ? attachNavigationApi(navigation, handlers, navigate, isOwnPush) : attachHistoryFallback(handlers, navigate);
 }
 //#endregion
 //#region src/plugins/spa/state.ts
@@ -3861,6 +3866,18 @@ function createSpaKernel(state, config, emit, deps) {
 	let progress;
 	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
@@ -4173,8 +4190,10 @@ function createSpaKernel(state, config, emit, deps) {
 	* Navigation API commits the address bar before the interceptor calls {@link navigate}; a
 	* programmatic call does NOT, so it must commit the URL itself first — otherwise the content
 	* swaps but the address bar (and the back button / refresh / deep link) stays on the old URL.
-	* `history.pushState` updates the URL WITHOUT firing a `navigate` event, so it can't
-	* double-trigger the interceptor. The current scroll is saved first so a later back restores it.
+	* 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. 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.
@@ -4185,9 +4204,19 @@ function createSpaKernel(state, config, emit, deps) {
 		if (typeof document === "undefined") return;
 		if (path !== currentLocationUrl()) {
 			saveScrollPosition(currentLocationUrl());
-			history.pushState({}, "", path);
+			pushingOwnUrl = true;
+			try {
+				history.pushState({}, "", path);
+			} finally {
+				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 {
 		/**
@@ -4214,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);
+			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

@@ -10739,11 +10739,13 @@ function attachHistoryFallback(handlers, navigate = (pathname, _scrollToTop, sig
 * @param navigation - The Navigation API object to attach the listener to.
 * @param handlers - The navigation lifecycle callbacks.
 * @param navigate - The navigation strategy (defaults to HTML-over-fetch via `performNavigation`).
+* @param isOwnPush - True while the kernel's programmatic navigation runs its own
+*   `history.pushState`: the `navigate` event it fires is left alone, the kernel runs it once.
 * @returns A teardown that removes the `navigate` listener.
 * @example
 * const dispose = attachNavigationApi(navigation, handlers);
 */
-function attachNavigationApi(navigation, handlers, navigate = (pathname, _scrollToTop, signal) => performNavigation(pathname, handlers, signal)) {
+function attachNavigationApi(navigation, handlers, navigate = (pathname, _scrollToTop, signal) => performNavigation(pathname, handlers, signal), isOwnPush = () => false) {
 	/**
 	* Handle a `navigate` event: classify, then intercept with fetch-and-swap.
 	*
@@ -10752,6 +10754,7 @@ function attachNavigationApi(navigation, handlers, navigate = (pathname, _scroll
 	* navigation.addEventListener("navigate", onNavigate);
 	*/
 	const onNavigate = (navEvent) => {
+		if (isOwnPush()) return;
 		const url = new URL(navEvent.destination.url);
 		if (!navEvent.canIntercept || navEvent.hashChange || navEvent.downloadRequest) return;
 		if (!isInternalLink(url)) return;
@@ -10784,13 +10787,15 @@ function attachNavigationApi(navigation, handlers, navigate = (pathname, _scroll
 *
 * @param handlers - The navigation lifecycle callbacks the kernel supplies.
 * @param navigate - The navigation strategy (defaults to HTML-over-fetch via `performNavigation`).
+* @param isOwnPush - True while the kernel runs its own `history.pushState` (Navigation API path
+*   only; the History fallback never sees an event for it).
 * @returns A teardown removing all attached listeners.
 * @example
-* const dispose = attachRouter(handlers, navigate);
+* const dispose = attachRouter(handlers, navigate, () => pushingOwnUrl);
 */
-function attachRouter(handlers, navigate) {
+function attachRouter(handlers, navigate, isOwnPush) {
 	const navigation = getNavigation();
-	return navigation ? attachNavigationApi(navigation, handlers, navigate) : attachHistoryFallback(handlers, navigate);
+	return navigation ? attachNavigationApi(navigation, handlers, navigate, isOwnPush) : attachHistoryFallback(handlers, navigate);
 }
 //#endregion
 //#region src/plugins/spa/state.ts
@@ -10955,6 +10960,18 @@ function createSpaKernel(state, config, emit, deps) {
 	let progress;
 	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
@@ -11267,8 +11284,10 @@ function createSpaKernel(state, config, emit, deps) {
 	* Navigation API commits the address bar before the interceptor calls {@link navigate}; a
 	* programmatic call does NOT, so it must commit the URL itself first — otherwise the content
 	* swaps but the address bar (and the back button / refresh / deep link) stays on the old URL.
-	* `history.pushState` updates the URL WITHOUT firing a `navigate` event, so it can't
-	* double-trigger the interceptor. The current scroll is saved first so a later back restores it.
+	* 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. 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.
@@ -11279,9 +11298,19 @@ function createSpaKernel(state, config, emit, deps) {
 		if (typeof document === "undefined") return;
 		if (path !== currentLocationUrl()) {
 			saveScrollPosition(currentLocationUrl());
-			history.pushState({}, "", path);
+			pushingOwnUrl = true;
+			try {
+				history.pushState({}, "", path);
+			} finally {
+				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 {
 		/**
@@ -11308,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);
+			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

@@ -10695,11 +10695,13 @@ function attachHistoryFallback(handlers, navigate = (pathname, _scrollToTop, sig
 * @param navigation - The Navigation API object to attach the listener to.
 * @param handlers - The navigation lifecycle callbacks.
 * @param navigate - The navigation strategy (defaults to HTML-over-fetch via `performNavigation`).
+* @param isOwnPush - True while the kernel's programmatic navigation runs its own
+*   `history.pushState`: the `navigate` event it fires is left alone, the kernel runs it once.
 * @returns A teardown that removes the `navigate` listener.
 * @example
 * const dispose = attachNavigationApi(navigation, handlers);
 */
-function attachNavigationApi(navigation, handlers, navigate = (pathname, _scrollToTop, signal) => performNavigation(pathname, handlers, signal)) {
+function attachNavigationApi(navigation, handlers, navigate = (pathname, _scrollToTop, signal) => performNavigation(pathname, handlers, signal), isOwnPush = () => false) {
 	/**
 	* Handle a `navigate` event: classify, then intercept with fetch-and-swap.
 	*
@@ -10708,6 +10710,7 @@ function attachNavigationApi(navigation, handlers, navigate = (pathname, _scroll
 	* navigation.addEventListener("navigate", onNavigate);
 	*/
 	const onNavigate = (navEvent) => {
+		if (isOwnPush()) return;
 		const url = new URL(navEvent.destination.url);
 		if (!navEvent.canIntercept || navEvent.hashChange || navEvent.downloadRequest) return;
 		if (!isInternalLink(url)) return;
@@ -10740,13 +10743,15 @@ function attachNavigationApi(navigation, handlers, navigate = (pathname, _scroll
 *
 * @param handlers - The navigation lifecycle callbacks the kernel supplies.
 * @param navigate - The navigation strategy (defaults to HTML-over-fetch via `performNavigation`).
+* @param isOwnPush - True while the kernel runs its own `history.pushState` (Navigation API path
+*   only; the History fallback never sees an event for it).
 * @returns A teardown removing all attached listeners.
 * @example
-* const dispose = attachRouter(handlers, navigate);
+* const dispose = attachRouter(handlers, navigate, () => pushingOwnUrl);
 */
-function attachRouter(handlers, navigate) {
+function attachRouter(handlers, navigate, isOwnPush) {
 	const navigation = getNavigation();
-	return navigation ? attachNavigationApi(navigation, handlers, navigate) : attachHistoryFallback(handlers, navigate);
+	return navigation ? attachNavigationApi(navigation, handlers, navigate, isOwnPush) : attachHistoryFallback(handlers, navigate);
 }
 //#endregion
 //#region src/plugins/spa/state.ts
@@ -10911,6 +10916,18 @@ function createSpaKernel(state, config, emit, deps) {
 	let progress;
 	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
@@ -11223,8 +11240,10 @@ function createSpaKernel(state, config, emit, deps) {
 	* Navigation API commits the address bar before the interceptor calls {@link navigate}; a
 	* programmatic call does NOT, so it must commit the URL itself first — otherwise the content
 	* swaps but the address bar (and the back button / refresh / deep link) stays on the old URL.
-	* `history.pushState` updates the URL WITHOUT firing a `navigate` event, so it can't
-	* double-trigger the interceptor. The current scroll is saved first so a later back restores it.
+	* 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. 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.
@@ -11235,9 +11254,19 @@ function createSpaKernel(state, config, emit, deps) {
 		if (typeof document === "undefined") return;
 		if (path !== currentLocationUrl()) {
 			saveScrollPosition(currentLocationUrl());
-			history.pushState({}, "", path);
+			pushingOwnUrl = true;
+			try {
+				history.pushState({}, "", path);
+			} finally {
+				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 {
 		/**
@@ -11264,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);
+			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.0"
+  "version": "2.4.2"
 }