@pyreon/router 0.3.1 → 0.5.0

package/lib/analysis/index.js.html

@@ -5386,7 +5386,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"ffb5fd41-1","name":"loader.ts"},{"uid":"ffb5fd41-3","name":"match.ts"},{"uid":"ffb5fd41-5","name":"scroll.ts"},{"uid":"ffb5fd41-7","name":"types.ts"},{"uid":"ffb5fd41-9","name":"router.ts"},{"uid":"ffb5fd41-11","name":"components.tsx"},{"uid":"ffb5fd41-13","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"ffb5fd41-1":{"renderedLength":2855,"gzipLength":1243,"brotliLength":0,"metaUid":"ffb5fd41-0"},"ffb5fd41-3":{"renderedLength":10804,"gzipLength":3328,"brotliLength":0,"metaUid":"ffb5fd41-2"},"ffb5fd41-5":{"renderedLength":1367,"gzipLength":576,"brotliLength":0,"metaUid":"ffb5fd41-4"},"ffb5fd41-7":{"renderedLength":385,"gzipLength":246,"brotliLength":0,"metaUid":"ffb5fd41-6"},"ffb5fd41-9":{"renderedLength":8965,"gzipLength":2657,"brotliLength":0,"metaUid":"ffb5fd41-8"},"ffb5fd41-11":{"renderedLength":6631,"gzipLength":2488,"brotliLength":0,"metaUid":"ffb5fd41-10"},"ffb5fd41-13":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"ffb5fd41-12"}},"nodeMetas":{"ffb5fd41-0":{"id":"/src/loader.ts","moduleParts":{"index.js":"ffb5fd41-1"},"imported":[{"uid":"ffb5fd41-14"}],"importedBy":[{"uid":"ffb5fd41-12"},{"uid":"ffb5fd41-10"}]},"ffb5fd41-2":{"id":"/src/match.ts","moduleParts":{"index.js":"ffb5fd41-3"},"imported":[],"importedBy":[{"uid":"ffb5fd41-12"},{"uid":"ffb5fd41-8"}]},"ffb5fd41-4":{"id":"/src/scroll.ts","moduleParts":{"index.js":"ffb5fd41-5"},"imported":[],"importedBy":[{"uid":"ffb5fd41-8"}]},"ffb5fd41-6":{"id":"/src/types.ts","moduleParts":{"index.js":"ffb5fd41-7"},"imported":[],"importedBy":[{"uid":"ffb5fd41-12"},{"uid":"ffb5fd41-8"}]},"ffb5fd41-8":{"id":"/src/router.ts","moduleParts":{"index.js":"ffb5fd41-9"},"imported":[{"uid":"ffb5fd41-14"},{"uid":"ffb5fd41-15"},{"uid":"ffb5fd41-2"},{"uid":"ffb5fd41-4"},{"uid":"ffb5fd41-6"}],"importedBy":[{"uid":"ffb5fd41-12"},{"uid":"ffb5fd41-10"}]},"ffb5fd41-10":{"id":"/src/components.tsx","moduleParts":{"index.js":"ffb5fd41-11"},"imported":[{"uid":"ffb5fd41-14"},{"uid":"ffb5fd41-0"},{"uid":"ffb5fd41-8"}],"importedBy":[{"uid":"ffb5fd41-12"}]},"ffb5fd41-12":{"id":"/src/index.ts","moduleParts":{"index.js":"ffb5fd41-13"},"imported":[{"uid":"ffb5fd41-10"},{"uid":"ffb5fd41-0"},{"uid":"ffb5fd41-2"},{"uid":"ffb5fd41-8"},{"uid":"ffb5fd41-6"}],"importedBy":[],"isEntry":true},"ffb5fd41-14":{"id":"@pyreon/core","moduleParts":{},"imported":[],"importedBy":[{"uid":"ffb5fd41-10"},{"uid":"ffb5fd41-0"},{"uid":"ffb5fd41-8"}]},"ffb5fd41-15":{"id":"@pyreon/reactivity","moduleParts":{},"imported":[],"importedBy":[{"uid":"ffb5fd41-8"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"216d545d-1","name":"loader.ts"},{"uid":"216d545d-3","name":"match.ts"},{"uid":"216d545d-5","name":"scroll.ts"},{"uid":"216d545d-7","name":"types.ts"},{"uid":"216d545d-9","name":"router.ts"},{"uid":"216d545d-11","name":"components.tsx"},{"uid":"216d545d-13","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"216d545d-1":{"renderedLength":2855,"gzipLength":1243,"brotliLength":0,"metaUid":"216d545d-0"},"216d545d-3":{"renderedLength":12203,"gzipLength":3691,"brotliLength":0,"metaUid":"216d545d-2"},"216d545d-5":{"renderedLength":1367,"gzipLength":576,"brotliLength":0,"metaUid":"216d545d-4"},"216d545d-7":{"renderedLength":385,"gzipLength":246,"brotliLength":0,"metaUid":"216d545d-6"},"216d545d-9":{"renderedLength":16575,"gzipLength":4649,"brotliLength":0,"metaUid":"216d545d-8"},"216d545d-11":{"renderedLength":6669,"gzipLength":2506,"brotliLength":0,"metaUid":"216d545d-10"},"216d545d-13":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"216d545d-12"}},"nodeMetas":{"216d545d-0":{"id":"/src/loader.ts","moduleParts":{"index.js":"216d545d-1"},"imported":[{"uid":"216d545d-14"}],"importedBy":[{"uid":"216d545d-12"},{"uid":"216d545d-10"}]},"216d545d-2":{"id":"/src/match.ts","moduleParts":{"index.js":"216d545d-3"},"imported":[],"importedBy":[{"uid":"216d545d-12"},{"uid":"216d545d-8"}]},"216d545d-4":{"id":"/src/scroll.ts","moduleParts":{"index.js":"216d545d-5"},"imported":[],"importedBy":[{"uid":"216d545d-8"}]},"216d545d-6":{"id":"/src/types.ts","moduleParts":{"index.js":"216d545d-7"},"imported":[],"importedBy":[{"uid":"216d545d-12"},{"uid":"216d545d-8"}]},"216d545d-8":{"id":"/src/router.ts","moduleParts":{"index.js":"216d545d-9"},"imported":[{"uid":"216d545d-14"},{"uid":"216d545d-15"},{"uid":"216d545d-2"},{"uid":"216d545d-4"},{"uid":"216d545d-6"}],"importedBy":[{"uid":"216d545d-12"},{"uid":"216d545d-10"}]},"216d545d-10":{"id":"/src/components.tsx","moduleParts":{"index.js":"216d545d-11"},"imported":[{"uid":"216d545d-14"},{"uid":"216d545d-0"},{"uid":"216d545d-8"}],"importedBy":[{"uid":"216d545d-12"}]},"216d545d-12":{"id":"/src/index.ts","moduleParts":{"index.js":"216d545d-13"},"imported":[{"uid":"216d545d-10"},{"uid":"216d545d-0"},{"uid":"216d545d-2"},{"uid":"216d545d-8"},{"uid":"216d545d-6"}],"importedBy":[],"isEntry":true},"216d545d-14":{"id":"@pyreon/core","moduleParts":{},"imported":[],"importedBy":[{"uid":"216d545d-10"},{"uid":"216d545d-0"},{"uid":"216d545d-8"}]},"216d545d-15":{"id":"@pyreon/reactivity","moduleParts":{},"imported":[],"importedBy":[{"uid":"216d545d-8"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -142,18 +142,28 @@ function compileSegment(raw) {
 		raw,
 		isParam: true,
 		isSplat: true,
+		isOptional: false,
+		paramName: raw.slice(1, -1)
+	};
+	if (raw.endsWith("?") && raw.startsWith(":")) return {
+		raw,
+		isParam: true,
+		isSplat: false,
+		isOptional: true,
 		paramName: raw.slice(1, -1)
 	};
 	if (raw.startsWith(":")) return {
 		raw,
 		isParam: true,
 		isSplat: false,
+		isOptional: false,
 		paramName: raw.slice(1)
 	};
 	return {
 		raw,
 		isParam: false,
 		isSplat: false,
+		isOptional: false,
 		paramName: ""
 	};
 }
@@ -185,14 +195,30 @@ function compileRoute(route) {
 		firstSegment
 	};
 }
+/** Expand alias paths into additional compiled entries sharing the original RouteRecord */
+function expandAliases(r, c) {
+	if (!r.alias) return [];
+	return (Array.isArray(r.alias) ? r.alias : [r.alias]).map((aliasPath) => {
+		const { alias: _, ...withoutAlias } = r;
+		const ac = compileRoute({
+			...withoutAlias,
+			path: aliasPath
+		});
+		ac.children = c.children;
+		ac.route = r;
+		return ac;
+	});
+}
 function compileRoutes(routes) {
 	const cached = _compiledCache.get(routes);
 	if (cached) return cached;
-	const compiled = routes.map((r) => {
+	const compiled = [];
+	for (const r of routes) {
 		const c = compileRoute(r);
 		if (r.children && r.children.length > 0) c.children = compileRoutes(r.children);
-		return c;
-	});
+		compiled.push(c);
+		compiled.push(...expandAliases(r, c));
+	}
 	_compiledCache.set(routes, compiled);
 	return compiled;
 }
@@ -205,6 +231,9 @@ function getFirstSegment(segments) {
 /** Build a FlattenedRoute from segments + metadata */
 function makeFlatEntry(segments, chain, meta, isWildcard) {
 	const isStatic = !isWildcard && segments.every((s) => !s.isParam);
+	const hasOptional = segments.some((s) => s.isOptional);
+	let minSegs = segments.length;
+	if (hasOptional) while (minSegs > 0 && segments[minSegs - 1]?.isOptional) minSegs--;
 	return {
 		segments,
 		segmentCount: segments.length,
@@ -214,7 +243,9 @@ function makeFlatEntry(segments, chain, meta, isWildcard) {
 		meta,
 		firstSegment: getFirstSegment(segments),
 		hasSplat: segments.some((s) => s.isSplat),
-		isWildcard
+		isWildcard,
+		hasOptional,
+		minSegments: minSegs
 	};
 }
 /**
@@ -305,22 +336,31 @@ function captureSplat(pathParts, from, pathLen) {
 	}
 	return remaining.join("/");
 }
+/** Check whether a flattened route's segment count is compatible with the path length */
+function isSegmentCountCompatible(f, pathLen) {
+	if (f.segmentCount === pathLen) return true;
+	if (f.hasSplat && pathLen >= f.segmentCount) return true;
+	if (f.hasOptional && pathLen >= f.minSegments && pathLen <= f.segmentCount) return true;
+	return false;
+}
 /** Try to match a flattened route against path parts */
 function matchFlattened(f, pathParts, pathLen) {
-	if (f.segmentCount !== pathLen) {
-		if (!f.hasSplat || pathLen < f.segmentCount) return null;
-	}
+	if (!isSegmentCountCompatible(f, pathLen)) return null;
 	const params = {};
 	const segments = f.segments;
 	const count = f.segmentCount;
 	for (let i = 0; i < count; i++) {
 		const seg = segments[i];
 		const pt = pathParts[i];
-		if (!seg || pt === void 0) return null;
+		if (!seg) return null;
 		if (seg.isSplat) {
 			params[seg.paramName] = captureSplat(pathParts, i, pathLen);
 			return params;
 		}
+		if (pt === void 0) {
+			if (!seg.isOptional) return null;
+			continue;
+		}
 		if (seg.isParam) params[seg.paramName] = decodeSafe(pt);
 		else if (seg.raw !== pt) return null;
 	}
@@ -413,7 +453,11 @@ function mergeMeta(matched) {
 }
 /** Build a path string from a named route's pattern and params */
 function buildPath(pattern, params) {
-	return pattern.replace(/:([^/]+)\*?/g, (match, key) => {
+	return pattern.replace(/\/:([^/]+)\?/g, (_match, key) => {
+		const val = params[key];
+		if (!val) return "";
+		return `/${encodeURIComponent(val)}`;
+	}).replace(/:([^/]+)\*?/g, (match, key) => {
 		const val = params[key] ?? "";
 		if (match.endsWith("*")) return val.split("/").map(encodeURIComponent).join("/");
 		return encodeURIComponent(val);
@@ -535,28 +579,134 @@ function useRoute() {
 	if (!router) throw new Error("[pyreon-router] No router installed. Wrap your app in <RouterProvider router={router}>.");
 	return router.currentRoute;
 }
+/**
+* In-component guard: called before the component's route is left.
+* Return `false` to cancel, a string to redirect, or `undefined`/`true` to proceed.
+* Automatically removed on component unmount.
+*
+* @example
+* onBeforeRouteLeave((to, from) => {
+*   if (hasUnsavedChanges()) return false
+* })
+*/
+function onBeforeRouteLeave(guard) {
+	const router = useContext(RouterContext) ?? _activeRouter;
+	if (!router) throw new Error("[pyreon-router] No router installed. Wrap your app in <RouterProvider router={router}>.");
+	const currentMatched = router.currentRoute().matched;
+	const wrappedGuard = (to, from) => {
+		if (!from.matched.some((r) => currentMatched.includes(r))) return void 0;
+		return guard(to, from);
+	};
+	const remove = router.beforeEach(wrappedGuard);
+	onUnmount(() => remove());
+	return remove;
+}
+/**
+* In-component guard: called when the route changes but the component is reused
+* (e.g. `/user/1` → `/user/2`). Useful for reacting to param changes.
+* Automatically removed on component unmount.
+*
+* @example
+* onBeforeRouteUpdate((to, from) => {
+*   if (!isValidId(to.params.id)) return false
+* })
+*/
+function onBeforeRouteUpdate(guard) {
+	const router = useContext(RouterContext) ?? _activeRouter;
+	if (!router) throw new Error("[pyreon-router] No router installed. Wrap your app in <RouterProvider router={router}>.");
+	const currentMatched = router.currentRoute().matched;
+	const wrappedGuard = (to, from) => {
+		if (!to.matched.some((r) => currentMatched.includes(r))) return void 0;
+		return guard(to, from);
+	};
+	const remove = router.beforeEach(wrappedGuard);
+	onUnmount(() => remove());
+	return remove;
+}
+/**
+* Register a navigation blocker. The `fn` callback is called before each
+* navigation — return `true` (or resolve to `true`) to block it.
+*
+* Automatically removed on component unmount if called during component setup.
+* Also installs a `beforeunload` handler so the browser shows a confirmation
+* dialog when the user tries to close the tab while a blocker is active.
+*
+* @example
+* const blocker = useBlocker((to, from) => {
+*   return hasUnsavedChanges() && !confirm("Discard changes?")
+* })
+* // later: blocker.remove()
+*/
+function useBlocker(fn) {
+	const router = useContext(RouterContext) ?? _activeRouter;
+	if (!router) throw new Error("[pyreon-router] No router installed. Wrap your app in <RouterProvider router={router}>.");
+	router._blockers.add(fn);
+	const beforeUnloadHandler = _isBrowser ? (e) => {
+		e.preventDefault();
+	} : null;
+	if (beforeUnloadHandler) window.addEventListener("beforeunload", beforeUnloadHandler);
+	const remove = () => {
+		router._blockers.delete(fn);
+		if (beforeUnloadHandler) window.removeEventListener("beforeunload", beforeUnloadHandler);
+	};
+	onUnmount(() => remove());
+	return { remove };
+}
+/**
+* Reactive read/write access to the current route's query parameters.
+*
+* Returns `[get, set]` where `get` is a reactive signal producing the merged
+* query object and `set` navigates to the current path with updated params.
+*
+* @example
+* const [params, setParams] = useSearchParams({ page: "1", sort: "name" })
+* params().page  // "1" if not in URL
+* setParams({ page: "2" })  // navigates to ?page=2&sort=name
+*/
+function useSearchParams(defaults) {
+	const router = useContext(RouterContext) ?? _activeRouter;
+	if (!router) throw new Error("[pyreon-router] No router installed. Wrap your app in <RouterProvider router={router}>.");
+	const get = () => {
+		const query = router.currentRoute().query;
+		if (!defaults) return query;
+		return {
+			...defaults,
+			...query
+		};
+	};
+	const set = (updates) => {
+		const merged = {
+			...get(),
+			...updates
+		};
+		const path = router.currentRoute().path + stringifyQuery(merged);
+		return router.replace(path);
+	};
+	return [get, set];
+}
 function createRouter(options) {
 	const opts = Array.isArray(options) ? { routes: options } : options;
-	const { routes, mode = "hash", scrollBehavior, onError, maxCacheSize = 100 } = opts;
+	const { routes, mode = "hash", scrollBehavior, onError, maxCacheSize = 100, trailingSlash = "strip" } = opts;
+	const base = mode === "history" ? normalizeBase(opts.base ?? "") : "";
 	const nameIndex = buildNameIndex(routes);
 	const guards = [];
 	const afterHooks = [];
 	const scrollManager = new ScrollManager(scrollBehavior);
 	let _navGen = 0;
 	const getInitialLocation = () => {
-		if (opts.url) return opts.url;
+		if (opts.url) return stripBase(opts.url, base);
 		if (!_isBrowser) return "/";
-		if (mode === "history") return window.location.pathname + window.location.search;
+		if (mode === "history") return stripBase(window.location.pathname, base) + window.location.search;
 		const hash = window.location.hash;
 		return hash.startsWith("#") ? hash.slice(1) || "/" : "/";
 	};
 	const getCurrentLocation = () => {
 		if (!_isBrowser) return currentPath();
-		if (mode === "history") return window.location.pathname + window.location.search;
+		if (mode === "history") return stripBase(window.location.pathname, base) + window.location.search;
 		const hash = window.location.hash;
 		return hash.startsWith("#") ? hash.slice(1) || "/" : "/";
 	};
-	const currentPath = signal(getInitialLocation());
+	const currentPath = signal(normalizeTrailingSlash(getInitialLocation(), trailingSlash));
 	const currentRoute = computed(() => resolveRoute(currentPath(), routes));
 	let _popstateHandler = null;
 	let _hashchangeHandler = null;
@@ -612,7 +762,7 @@ function createRouter(options) {
 	}
 	function syncBrowserUrl(path, replace) {
 		if (!_isBrowser) return;
-		const url = mode === "history" ? path : `#${path}`;
+		const url = mode === "history" ? `${base}${path}` : `#${path}`;
 		if (replace) window.history.replaceState(null, "", url);
 		else window.history.pushState(null, "", url);
 	}
@@ -628,27 +778,53 @@ function createRouter(options) {
 		if (enterOutcome.action !== "continue") return enterOutcome;
 		return runGlobalGuards(guards, to, from, gen);
 	}
-	async function runLoaders(to, gen, ac) {
-		const loadableRecords = to.matched.filter((r) => r.loader);
-		if (loadableRecords.length === 0) return true;
+	async function runBlockingLoaders(records, to, gen, ac) {
 		const loaderCtx = {
 			params: to.params,
 			query: to.query,
 			signal: ac.signal
 		};
-		const results = await Promise.allSettled(loadableRecords.map((r) => {
-			if (!r.loader) return Promise.resolve(void 0);
-			return r.loader(loaderCtx);
-		}));
+		const results = await Promise.allSettled(records.map((r) => r.loader ? r.loader(loaderCtx) : Promise.resolve(void 0)));
 		if (gen !== _navGen) return false;
-		for (let i = 0; i < loadableRecords.length; i++) {
+		for (let i = 0; i < records.length; i++) {
 			const result = results[i];
-			const record = loadableRecords[i];
+			const record = records[i];
 			if (!result || !record) continue;
 			if (!processLoaderResult(result, record, ac, to)) return false;
 		}
 		return true;
 	}
+	/** Fire-and-forget background revalidation for stale-while-revalidate routes. */
+	function revalidateSwrLoaders(records, to, ac) {
+		const loaderCtx = {
+			params: to.params,
+			query: to.query,
+			signal: ac.signal
+		};
+		for (const r of records) {
+			if (!r.loader) continue;
+			r.loader(loaderCtx).then((data) => {
+				if (!ac.signal.aborted) {
+					router._loaderData.set(r, data);
+					loadingSignal.update((n) => n + 1);
+					loadingSignal.update((n) => n - 1);
+				}
+			}).catch(() => {});
+		}
+	}
+	async function runLoaders(to, gen, ac) {
+		const loadableRecords = to.matched.filter((r) => r.loader);
+		if (loadableRecords.length === 0) return true;
+		const blocking = [];
+		const swr = [];
+		for (const r of loadableRecords) if (r.staleWhileRevalidate && router._loaderData.has(r)) swr.push(r);
+		else blocking.push(r);
+		if (blocking.length > 0) {
+			if (!await runBlockingLoaders(blocking, to, gen, ac)) return false;
+		}
+		if (swr.length > 0) revalidateSwrLoaders(swr, to, ac);
+		return true;
+	}
 	function commitNavigation(path, replace, to, from) {
 		scrollManager.save(from.path);
 		currentPath.set(path);
@@ -660,8 +836,16 @@ function createRouter(options) {
 		} catch (_err) {}
 		if (_isBrowser) queueMicrotask(() => scrollManager.restore(to, from));
 	}
-	async function navigate(path, replace, redirectDepth = 0) {
+	async function checkBlockers(to, from, gen) {
+		for (const blocker of router._blockers) {
+			const blocked = await blocker(to, from);
+			if (gen !== _navGen || blocked) return "cancel";
+		}
+		return "continue";
+	}
+	async function navigate(rawPath, replace, redirectDepth = 0) {
 		if (redirectDepth > 10) return;
+		const path = normalizeTrailingSlash(rawPath, trailingSlash);
 		const gen = ++_navGen;
 		loadingSignal.update((n) => n + 1);
 		const to = resolveRoute(path, routes);
@@ -671,6 +855,10 @@ function createRouter(options) {
 			loadingSignal.update((n) => n - 1);
 			return navigate(redirectTarget, replace, redirectDepth + 1);
 		}
+		if (await checkBlockers(to, from, gen) !== "continue") {
+			loadingSignal.update((n) => n - 1);
+			return;
+		}
 		const guardOutcome = await runAllGuards(to, from, gen);
 		if (guardOutcome.action !== "continue") {
 			loadingSignal.update((n) => n - 1);
@@ -687,9 +875,14 @@ function createRouter(options) {
 		commitNavigation(path, replace, to, from);
 		loadingSignal.update((n) => n - 1);
 	}
+	let _readyResolve = null;
+	const _readyPromise = new Promise((resolve) => {
+		_readyResolve = resolve;
+	});
 	const router = {
 		routes,
 		mode,
+		_base: base,
 		currentRoute,
 		_currentPath: currentPath,
 		_currentRoute: currentRoute,
@@ -701,18 +894,28 @@ function createRouter(options) {
 		_erroredChunks: /* @__PURE__ */ new Set(),
 		_loaderData: /* @__PURE__ */ new Map(),
 		_abortController: null,
+		_blockers: /* @__PURE__ */ new Set(),
+		_readyResolve,
+		_readyPromise,
 		_onError: onError,
 		_maxCacheSize: maxCacheSize,
 		async push(location) {
-			if (typeof location === "string") return navigate(sanitizePath(location), false);
+			if (typeof location === "string") return navigate(sanitizePath(resolveRelativePath(location, currentPath())), false);
 			return navigate(resolveNamedPath(location.name, location.params ?? {}, location.query ?? {}, nameIndex), false);
 		},
-		async replace(path) {
-			return navigate(sanitizePath(path), true);
+		async replace(location) {
+			if (typeof location === "string") return navigate(sanitizePath(resolveRelativePath(location, currentPath())), true);
+			return navigate(resolveNamedPath(location.name, location.params ?? {}, location.query ?? {}, nameIndex), true);
 		},
 		back() {
 			if (_isBrowser) window.history.back();
 		},
+		forward() {
+			if (_isBrowser) window.history.forward();
+		},
+		go(delta) {
+			if (_isBrowser) window.history.go(delta);
+		},
 		beforeEach(guard) {
 			guards.push(guard);
 			return () => {
@@ -728,6 +931,9 @@ function createRouter(options) {
 			};
 		},
 		loading: () => loadingSignal() > 0,
+		isReady() {
+			return router._readyPromise;
+		},
 		destroy() {
 			if (_popstateHandler) {
 				window.removeEventListener("popstate", _popstateHandler);
@@ -739,6 +945,7 @@ function createRouter(options) {
 			}
 			guards.length = 0;
 			afterHooks.length = 0;
+			router._blockers.clear();
 			componentCache.clear();
 			router._loaderData.clear();
 			router._abortController?.abort();
@@ -746,6 +953,12 @@ function createRouter(options) {
 		},
 		_resolve: (rawPath) => resolveRoute(rawPath, routes)
 	};
+	queueMicrotask(() => {
+		if (router._readyResolve) {
+			router._readyResolve();
+			router._readyResolve = null;
+		}
+	});
 	return router;
 }
 async function runGuard(guard, to, from) {
@@ -763,6 +976,45 @@ function resolveNamedPath(name, params, query, index) {
 	if (qs) path += `?${qs}`;
 	return path;
 }
+/** Normalize a base path: ensure leading `/`, strip trailing `/`. */
+function normalizeBase(raw) {
+	if (!raw) return "";
+	let b = raw;
+	if (!b.startsWith("/")) b = `/${b}`;
+	if (b.endsWith("/")) b = b.slice(0, -1);
+	return b;
+}
+/** Strip the base prefix from a full URL path. Returns the app-relative path. */
+function stripBase(path, base) {
+	if (!base) return path;
+	if (path === base || path === `${base}/`) return "/";
+	if (path.startsWith(`${base}/`)) return path.slice(base.length);
+	return path;
+}
+/** Normalize trailing slash on a path according to the configured strategy. */
+function normalizeTrailingSlash(path, strategy) {
+	if (strategy === "ignore" || path === "/") return path;
+	const qIdx = path.indexOf("?");
+	const hIdx = path.indexOf("#");
+	const endIdx = qIdx >= 0 ? qIdx : hIdx >= 0 ? hIdx : path.length;
+	const pathPart = path.slice(0, endIdx);
+	const suffix = path.slice(endIdx);
+	if (strategy === "strip") return pathPart.length > 1 && pathPart.endsWith("/") ? pathPart.slice(0, -1) + suffix : path;
+	return !pathPart.endsWith("/") ? `${pathPart}/${suffix}` : path;
+}
+/**
+* Resolve a relative path (starting with `.` or `..`) against the current path.
+* Non-relative paths are returned as-is.
+*/
+function resolveRelativePath(to, from) {
+	if (!to.startsWith("./") && !to.startsWith("../") && to !== "." && to !== "..") return to;
+	const fromSegments = from.split("/").filter(Boolean);
+	fromSegments.pop();
+	const toSegments = to.split("/").filter(Boolean);
+	for (const seg of toSegments) if (seg === "..") fromSegments.pop();
+	else if (seg !== ".") fromSegments.push(seg);
+	return `/${fromSegments.join("/")}`;
+}
 /** Block unsafe navigation targets: javascript/data/vbscript URIs and absolute URLs. */
 function sanitizePath(path) {
 	const trimmed = path.trim();
@@ -846,7 +1098,8 @@ const RouterLink = (props) => {
 		if (prefetchMode !== "hover" || !router) return;
 		prefetchRoute(router, props.to);
 	};
-	const href = router?.mode === "history" ? props.to : `#${props.to}`;
+	const inst = router;
+	const href = inst?.mode === "history" ? `${inst._base}${props.to}` : `#${props.to}`;
 	const activeClass = () => {
 		if (!router) return "";
 		const current = router.currentRoute().path;
@@ -968,5 +1221,5 @@ function isStaleChunk(err) {
 }
 
 //#endregion
-export { RouterContext, RouterLink, RouterProvider, RouterView, buildPath, createRouter, findRouteByName, hydrateLoaderData, lazy, parseQuery, parseQueryMulti, prefetchLoaderData, resolveRoute, serializeLoaderData, stringifyQuery, useLoaderData, useRoute, useRouter };
+export { RouterContext, RouterLink, RouterProvider, RouterView, buildPath, createRouter, findRouteByName, hydrateLoaderData, lazy, onBeforeRouteLeave, onBeforeRouteUpdate, parseQuery, parseQueryMulti, prefetchLoaderData, resolveRoute, serializeLoaderData, stringifyQuery, useBlocker, useLoaderData, useRoute, useRouter, useSearchParams };
 //# sourceMappingURL=index.js.map