@ilha/router 0.8.4 → 0.8.6

package/dist/index.d.ts

@@ -65,6 +65,10 @@ export type Loader<T> = (ctx: LoaderContext) => Promise<T> | T;
 /**
  * Identity function for declaring a loader. Exists purely as a type anchor and
  * a marker for the Vite plugin to detect by export name.
+ *
+ * Loaders must read `ctx.params`/`ctx.url` rather than `useRoute()` — the
+ * route store still holds the previous route while a navigation's loader is
+ * in flight, so `useRoute().params()` inside a loader reads stale params.
  */
 export declare function loader<T>(fn: Loader<T>): Loader<T>;
 /** Extract the return type of a loader. */

package/dist/index.js

@@ -1,3 +1,3 @@
-import { A as wrapLayout, C as routePath, D as src_default, E as serializeHead, M as setHistoryMode, O as useRoute, S as routeParams, T as router, _ as navigating, a as RouterView, b as redirect, c as composeLoaders, d as error, f as head, g as navigate, h as loader, i as RouterLink, j as getHistoryMode, k as wrapError, l as defineLayout, m as isActive, n as LoaderError, o as afterNavigate, p as invalidate, r as Redirect, s as beforeNavigate, t as LOADER_ENDPOINT, u as enableLinkInterception, v as prefetch, w as routeSearch, x as routeHash, y as prime } from "./src-BFzs4FwW.js";
+import { A as wrapLayout, C as routePath, D as src_default, E as serializeHead, M as setHistoryMode, O as useRoute, S as routeParams, T as router, _ as navigating, a as RouterView, b as redirect, c as composeLoaders, d as error, f as head, g as navigate, h as loader, i as RouterLink, j as getHistoryMode, k as wrapError, l as defineLayout, m as isActive, n as LoaderError, o as afterNavigate, p as invalidate, r as Redirect, s as beforeNavigate, t as LOADER_ENDPOINT, u as enableLinkInterception, v as prefetch, w as routeSearch, x as routeHash, y as prime } from "./src-_T1q_MN5.js";
 
 export { LOADER_ENDPOINT, LoaderError, Redirect, RouterLink, RouterView, afterNavigate, beforeNavigate, composeLoaders, src_default as default, defineLayout, enableLinkInterception, error, getHistoryMode, head, invalidate, isActive, loader, navigate, navigating, prefetch, prime, redirect, routeHash, routeParams, routePath, routeSearch, router, serializeHead, setHistoryMode, useRoute, wrapError, wrapLayout };

package/dist/{src-BFzs4FwW.js → src-_T1q_MN5.js}

@@ -136,6 +136,10 @@ const isBrowser = typeof window !== "undefined" && typeof document !== "undefine
 /**
 * Identity function for declaring a loader. Exists purely as a type anchor and
 * a marker for the Vite plugin to detect by export name.
+*
+* Loaders must read `ctx.params`/`ctx.url` rather than `useRoute()` — the
+* route store still holds the previous route while a navigation's loader is
+* in flight, so `useRoute().params()` inside a loader reads stale params.
 */
 function loader(fn) {
 	return fn;
@@ -183,6 +187,7 @@ function composeLoaders(loaders) {
 }
 const WRAP_LAYOUT_LEAF = Symbol.for("ilha.router.wrapLayout.leaf");
 const WRAP_LAYOUT_HANDLER = Symbol.for("ilha.router.wrapLayout.handler");
+const ISLAND_CALL = Symbol.for("ilha.islandCall");
 function extractHydratableInnerHtml(block) {
 	const m = block.match(/^<([a-zA-Z][\w-]*)\s[^>]*>([\s\S]*)<\/\1>\s*$/);
 	return m ? m[2] : block;
@@ -315,6 +320,7 @@ function layoutHtmlWithEmptyKPage(wrappedLayout, props) {
 		...partial ?? {}
 	}));
 	Object.assign(shellChild, { toString: () => "" });
+	shellChild[ISLAND_CALL] = true;
 	return handler(shellChild).toString(props);
 }
 async function wrapLayoutSlotMarkup(innerWrapped, leafPage, props, opts) {
@@ -334,6 +340,7 @@ function wrapLayout(layout, page) {
 		} : props);
 	});
 	Object.assign(KeyedPage, { toString: page.toString.bind(page) });
+	KeyedPage[ISLAND_CALL] = true;
 	const Wrapped = layout(KeyedPage);
 	Wrapped[WRAP_LAYOUT_LEAF] = leafPage;
 	Wrapped[WRAP_LAYOUT_HANDLER] = layout;
@@ -1531,11 +1538,13 @@ function router(options = {}) {
 				if (getHistoryMode() === "hash") console.warn("[ilha-router] mount({ hydrate: true }) was called in hash mode. SSR + hydration assumes the server can render the active route, but in hash mode the server only ever sees the document URL. Use plain SPA mode (`mount(target)` without `hydrate: true`) for hash-mode apps.");
 				const viewHost = host.querySelector("[data-router-view]") ?? host;
 				let currentMountedIsland = activeIsland();
+				let currentMountedPath = routePath() + routeSearch();
 				const reverseRegistry = registry ? buildReverseRegistry(registry) : void 0;
 				let navVersion = 0;
 				const NavHandler = ilha.render(() => {
 					const current = activeIsland();
-					if (current !== currentMountedIsland) {
+					const pathWithSearch = routePath() + routeSearch();
+					if (current !== currentMountedIsland || pathWithSearch !== currentMountedPath) {
 						const thisNav = ++navVersion;
 						navAbort?.abort();
 						navAbort = new AbortController();
@@ -1546,8 +1555,7 @@ function router(options = {}) {
 							unmountView?.();
 							unmountView = null;
 							try {
-								const loc = getAdapter().readLocation();
-								unmountView = await mountRouteWithHydration(current, viewHost, loc.pathname + loc.search, signal, registry, reverseRegistry);
+								unmountView = await mountRouteWithHydration(current, viewHost, pathWithSearch, signal, registry, reverseRegistry);
 							} catch (e) {
 								if (e?.name === "AbortError") return;
 								console.error("[ilha-router] navigation failed:", e);
@@ -1557,6 +1565,7 @@ function router(options = {}) {
 								settle();
 							}
 							currentMountedIsland = current;
+							currentMountedPath = pathWithSearch;
 						});
 					}
 					return "";
@@ -1604,11 +1613,13 @@ function router(options = {}) {
 					const settle = beginNavigation();
 					try {
 						const loc = getAdapter().readLocation();
-						const um = await mountRouteWithHydration(island, viewHost, loc.pathname + loc.search, ac.signal, registry, reverseRegistry);
+						const pathWithSearch = loc.pathname + loc.search;
+						const um = await mountRouteWithHydration(island, viewHost, pathWithSearch, ac.signal, registry, reverseRegistry);
 						if (thisNav === navVersion) {
 							unmountView?.();
 							unmountView = um;
 							currentMountedIsland = island;
+							currentMountedPath = pathWithSearch;
 						} else um();
 					} catch (e) {
 						if (e?.name !== "AbortError") console.error("[ilha-router] invalidate failed:", e);
@@ -1633,6 +1644,7 @@ function router(options = {}) {
 			}
 			let unmountIsland = null;
 			let currentMountedIsland = null;
+			let currentMountedPath = null;
 			let navVersion = 0;
 			unmountView = RouterView.mount(host);
 			/**
@@ -1644,6 +1656,7 @@ function router(options = {}) {
 				unmountIsland?.();
 				unmountIsland = null;
 				currentMountedIsland = island;
+				currentMountedPath = routePath() + routeSearch();
 				if (!island) {
 					const nfHost = host?.querySelector("[data-router-not-found]");
 					if (_notFound && nfHost) unmountIsland = _notFound.mount(nfHost);
@@ -1690,7 +1703,8 @@ function router(options = {}) {
 			});
 			const NavHandler = ilha.render(() => {
 				const current = activeIsland();
-				if (current !== currentMountedIsland) {
+				const pathWithSearch = routePath() + routeSearch();
+				if (current !== currentMountedIsland || pathWithSearch !== currentMountedPath) {
 					const thisNav = ++navVersion;
 					navAbort?.abort();
 					navAbort = new AbortController();

package/dist/ssr.js

@@ -1,4 +1,4 @@
-import { t as LOADER_ENDPOINT } from "./src-BFzs4FwW.js";
+import { t as LOADER_ENDPOINT } from "./src-_T1q_MN5.js";
 import { pageRouter, registry } from "ilha:pages/server";
 import "ilha:loaders";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/router",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "A tiny SPA router for Ilha",
   "keywords": [
     "frontend",