@pyreon/router 0.14.0 → 0.15.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":"007eb862-1","name":"loader.ts"},{"uid":"007eb862-3","name":"match.ts"},{"uid":"007eb862-5","name":"scroll.ts"},{"uid":"007eb862-7","name":"types.ts"},{"uid":"007eb862-9","name":"router.ts"},{"uid":"007eb862-11","name":"components.tsx"},{"uid":"007eb862-13","name":"not-found.ts"},{"uid":"007eb862-15","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"007eb862-1":{"renderedLength":2974,"gzipLength":1310,"brotliLength":0,"metaUid":"007eb862-0"},"007eb862-3":{"renderedLength":12965,"gzipLength":3914,"brotliLength":0,"metaUid":"007eb862-2"},"007eb862-5":{"renderedLength":2194,"gzipLength":899,"brotliLength":0,"metaUid":"007eb862-4"},"007eb862-7":{"renderedLength":385,"gzipLength":246,"brotliLength":0,"metaUid":"007eb862-6"},"007eb862-9":{"renderedLength":27519,"gzipLength":7633,"brotliLength":0,"metaUid":"007eb862-8"},"007eb862-11":{"renderedLength":9851,"gzipLength":3302,"brotliLength":0,"metaUid":"007eb862-10"},"007eb862-13":{"renderedLength":1315,"gzipLength":682,"brotliLength":0,"metaUid":"007eb862-12"},"007eb862-15":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"007eb862-14"}},"nodeMetas":{"007eb862-0":{"id":"/src/loader.ts","moduleParts":{"index.js":"007eb862-1"},"imported":[{"uid":"007eb862-16"}],"importedBy":[{"uid":"007eb862-14"},{"uid":"007eb862-10"}]},"007eb862-2":{"id":"/src/match.ts","moduleParts":{"index.js":"007eb862-3"},"imported":[],"importedBy":[{"uid":"007eb862-14"},{"uid":"007eb862-8"}]},"007eb862-4":{"id":"/src/scroll.ts","moduleParts":{"index.js":"007eb862-5"},"imported":[],"importedBy":[{"uid":"007eb862-8"}]},"007eb862-6":{"id":"/src/types.ts","moduleParts":{"index.js":"007eb862-7"},"imported":[],"importedBy":[{"uid":"007eb862-14"},{"uid":"007eb862-8"}]},"007eb862-8":{"id":"/src/router.ts","moduleParts":{"index.js":"007eb862-9"},"imported":[{"uid":"007eb862-16"},{"uid":"007eb862-17"},{"uid":"007eb862-2"},{"uid":"007eb862-4"},{"uid":"007eb862-6"}],"importedBy":[{"uid":"007eb862-14"},{"uid":"007eb862-10"}]},"007eb862-10":{"id":"/src/components.tsx","moduleParts":{"index.js":"007eb862-11"},"imported":[{"uid":"007eb862-16"},{"uid":"007eb862-17"},{"uid":"007eb862-0"},{"uid":"007eb862-8"}],"importedBy":[{"uid":"007eb862-14"}]},"007eb862-12":{"id":"/src/not-found.ts","moduleParts":{"index.js":"007eb862-13"},"imported":[{"uid":"007eb862-16"}],"importedBy":[{"uid":"007eb862-14"}]},"007eb862-14":{"id":"/src/index.ts","moduleParts":{"index.js":"007eb862-15"},"imported":[{"uid":"007eb862-10"},{"uid":"007eb862-12"},{"uid":"007eb862-0"},{"uid":"007eb862-2"},{"uid":"007eb862-8"},{"uid":"007eb862-6"}],"importedBy":[],"isEntry":true},"007eb862-16":{"id":"@pyreon/core","moduleParts":{},"imported":[],"importedBy":[{"uid":"007eb862-10"},{"uid":"007eb862-12"},{"uid":"007eb862-0"},{"uid":"007eb862-8"}]},"007eb862-17":{"id":"@pyreon/reactivity","moduleParts":{},"imported":[],"importedBy":[{"uid":"007eb862-10"},{"uid":"007eb862-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":"25bb3a92-1","name":"loader.ts"},{"uid":"25bb3a92-3","name":"match.ts"},{"uid":"25bb3a92-5","name":"redirect.ts"},{"uid":"25bb3a92-7","name":"scroll.ts"},{"uid":"25bb3a92-9","name":"types.ts"},{"uid":"25bb3a92-11","name":"router.ts"},{"uid":"25bb3a92-13","name":"components.tsx"},{"uid":"25bb3a92-15","name":"not-found.ts"},{"uid":"25bb3a92-17","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"25bb3a92-1":{"renderedLength":3376,"gzipLength":1507,"brotliLength":0,"metaUid":"25bb3a92-0"},"25bb3a92-3":{"renderedLength":13072,"gzipLength":3951,"brotliLength":0,"metaUid":"25bb3a92-2"},"25bb3a92-5":{"renderedLength":1966,"gzipLength":1043,"brotliLength":0,"metaUid":"25bb3a92-4"},"25bb3a92-7":{"renderedLength":2194,"gzipLength":899,"brotliLength":0,"metaUid":"25bb3a92-6"},"25bb3a92-9":{"renderedLength":385,"gzipLength":246,"brotliLength":0,"metaUid":"25bb3a92-8"},"25bb3a92-11":{"renderedLength":29129,"gzipLength":8078,"brotliLength":0,"metaUid":"25bb3a92-10"},"25bb3a92-13":{"renderedLength":10571,"gzipLength":3518,"brotliLength":0,"metaUid":"25bb3a92-12"},"25bb3a92-15":{"renderedLength":1315,"gzipLength":682,"brotliLength":0,"metaUid":"25bb3a92-14"},"25bb3a92-17":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"25bb3a92-16"}},"nodeMetas":{"25bb3a92-0":{"id":"/src/loader.ts","moduleParts":{"index.js":"25bb3a92-1"},"imported":[{"uid":"25bb3a92-18"}],"importedBy":[{"uid":"25bb3a92-16"},{"uid":"25bb3a92-12"}]},"25bb3a92-2":{"id":"/src/match.ts","moduleParts":{"index.js":"25bb3a92-3"},"imported":[],"importedBy":[{"uid":"25bb3a92-16"},{"uid":"25bb3a92-10"}]},"25bb3a92-4":{"id":"/src/redirect.ts","moduleParts":{"index.js":"25bb3a92-5"},"imported":[],"importedBy":[{"uid":"25bb3a92-16"},{"uid":"25bb3a92-10"}]},"25bb3a92-6":{"id":"/src/scroll.ts","moduleParts":{"index.js":"25bb3a92-7"},"imported":[],"importedBy":[{"uid":"25bb3a92-10"}]},"25bb3a92-8":{"id":"/src/types.ts","moduleParts":{"index.js":"25bb3a92-9"},"imported":[],"importedBy":[{"uid":"25bb3a92-16"},{"uid":"25bb3a92-10"}]},"25bb3a92-10":{"id":"/src/router.ts","moduleParts":{"index.js":"25bb3a92-11"},"imported":[{"uid":"25bb3a92-18"},{"uid":"25bb3a92-19"},{"uid":"25bb3a92-2"},{"uid":"25bb3a92-4"},{"uid":"25bb3a92-6"},{"uid":"25bb3a92-8"}],"importedBy":[{"uid":"25bb3a92-16"},{"uid":"25bb3a92-12"}]},"25bb3a92-12":{"id":"/src/components.tsx","moduleParts":{"index.js":"25bb3a92-13"},"imported":[{"uid":"25bb3a92-18"},{"uid":"25bb3a92-19"},{"uid":"25bb3a92-0"},{"uid":"25bb3a92-10"}],"importedBy":[{"uid":"25bb3a92-16"}]},"25bb3a92-14":{"id":"/src/not-found.ts","moduleParts":{"index.js":"25bb3a92-15"},"imported":[{"uid":"25bb3a92-18"}],"importedBy":[{"uid":"25bb3a92-16"}]},"25bb3a92-16":{"id":"/src/index.ts","moduleParts":{"index.js":"25bb3a92-17"},"imported":[{"uid":"25bb3a92-12"},{"uid":"25bb3a92-14"},{"uid":"25bb3a92-4"},{"uid":"25bb3a92-0"},{"uid":"25bb3a92-2"},{"uid":"25bb3a92-10"},{"uid":"25bb3a92-8"}],"importedBy":[],"isEntry":true},"25bb3a92-18":{"id":"@pyreon/core","moduleParts":{},"imported":[],"importedBy":[{"uid":"25bb3a92-12"},{"uid":"25bb3a92-14"},{"uid":"25bb3a92-0"},{"uid":"25bb3a92-10"}]},"25bb3a92-19":{"id":"@pyreon/reactivity","moduleParts":{},"imported":[],"importedBy":[{"uid":"25bb3a92-12"},{"uid":"25bb3a92-10"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -1,8 +1,8 @@
-import { ErrorBoundary, createContext, createRef, h, onUnmount, provide, useContext } from "@pyreon/core";
+import { ErrorBoundary, createContext, createRef, cx, h, nativeCompat, onUnmount, provide, useContext } from "@pyreon/core";
 import { computed, signal } from "@pyreon/reactivity";
 
 //#region src/loader.ts
-const __DEV__$1 = import.meta.env?.DEV === true;
+const __DEV__$1 = process.env.NODE_ENV !== "production";
 const _countSink$1 = globalThis;
 /**
 * Context frame that holds the loader data for the currently rendered route record.
@@ -28,12 +28,18 @@ function useLoaderData() {
 * SSR helper: pre-run all loaders for the given path before rendering.
 * Call this before `renderToString` so route components can read data via `useLoaderData()`.
 *
+* The optional `request` is forwarded to each loader's `LoaderContext.request`,
+* letting server-side loaders read cookies / auth headers and `throw redirect()`
+* before the layout renders. A loader that throws `redirect()` propagates the
+* thrown error here — the SSR handler's `catch` converts it into a 302/307
+* `Location:` Response.
+*
 * @example
 * const router = createRouter({ routes, url: req.url })
-* await prefetchLoaderData(router, req.url)
+* await prefetchLoaderData(router, req.url, request)
 * const html = await renderToString(h(App, { router }))
 */
-async function prefetchLoaderData(router, path) {
+async function prefetchLoaderData(router, path, request) {
 	if (__DEV__$1) _countSink$1.__pyreon_count__?.("router.prefetch");
 	const route = router._resolve(path);
 	const ac = new AbortController();
@@ -41,7 +47,8 @@ async function prefetchLoaderData(router, path) {
 		const data = await r.loader?.({
 			params: route.params,
 			query: route.query,
-			signal: ac.signal
+			signal: ac.signal,
+			...request ? { request } : {}
 		});
 		router._loaderData.set(r, data);
 	}));
@@ -275,7 +282,8 @@ function flattenOne(result, c, parentSegments, chain, meta) {
 		if (c.children && c.children.length > 0) flattenWalk(result, c.children, parentSegments, chain, meta);
 		return;
 	}
-	const joined = [...parentSegments, ...c.segments];
+	const childPath = c.route.path;
+	const joined = typeof childPath === "string" && childPath.startsWith("/") ? c.segments : [...parentSegments, ...c.segments];
 	if (c.children && c.children.length > 0) flattenWalk(result, c.children, joined, chain, meta);
 	result.push(makeFlatEntry(joined, chain, meta, false));
 }
@@ -513,6 +521,58 @@ function buildNameIndex(routes) {
 	return index;
 }
 
+//#endregion
+//#region src/redirect.ts
+const REDIRECT = Symbol.for("pyreon.redirect");
+/**
+* Throw inside a route loader to redirect the navigation server-side
+* (during SSR returns a 302/307 `Location:` response) and client-side
+* (during CSR triggers `router.replace()` before the layout renders).
+*
+* The auth-gate use case: replaces the fragile `onMount + router.push()`
+* workaround. `onMount` doesn't fire reliably under nested-layout dev SSR +
+* hydration — so the layout renders briefly before the push happens, leaking
+* authenticated UI to unauthenticated users. `redirect()` runs in the loader
+* BEFORE the layout's component is invoked, so the unauthenticated UI never
+* mounts in the first place.
+*
+* @example
+* ```ts
+* // src/routes/app/_layout.tsx
+* export const loader = async ({ request }) => {
+*   const session = await getSession(request)
+*   if (!session) redirect('/login')
+*   return { user: session.user }
+* }
+* ```
+*
+* @param url - Target URL (typically a path like `/login` or absolute URL for cross-origin).
+* @param status - HTTP redirect status. Default `307` (Temporary Redirect, method-preserving).
+*   Use `301`/`308` for permanent moves, `302`/`303` to force GET on the target.
+*/
+function redirect(url, status = 307) {
+	const err = /* @__PURE__ */ new Error(`Redirect to ${url}`);
+	err[REDIRECT] = {
+		url,
+		status
+	};
+	throw err;
+}
+/** Check if an error is a RedirectError thrown by `redirect()`. */
+function isRedirectError(err) {
+	return typeof err === "object" && err !== null && typeof err[REDIRECT] === "object";
+}
+/**
+* Extract the redirect URL and status from a thrown RedirectError. Returns
+* `null` if `err` isn't a RedirectError. Used by the router's loader-runner
+* (CSR) and the SSR handler to convert the thrown error into the right kind
+* of response (a `router.replace()` call or a `302`/`307` Response).
+*/
+function getRedirectInfo(err) {
+	if (!isRedirectError(err)) return null;
+	return err[REDIRECT] ?? null;
+}
+
 //#endregion
 //#region src/scroll.ts
 /**
@@ -611,7 +671,7 @@ function isLazy(c) {
 //#endregion
 //#region src/router.ts
 const _isBrowser = typeof window !== "undefined";
-const __DEV__ = import.meta.env?.DEV === true;
+const __DEV__ = process.env.NODE_ENV !== "production";
 const _countSink = globalThis;
 const RouterContext = createContext(null);
 let _activeRouter = null;
@@ -992,14 +1052,19 @@ function createRouter(options) {
 	function processLoaderResult(result, record, ac, to) {
 		if (result.status === "fulfilled") {
 			router._loaderData.set(record, result.value);
-			return true;
+			return { action: "continue" };
 		}
-		if (ac.signal.aborted) return true;
+		if (ac.signal.aborted) return { action: "continue" };
+		const info = getRedirectInfo(result.reason);
+		if (info) return {
+			action: "redirect",
+			target: info.url
+		};
 		if (router._onError) {
-			if (router._onError(result.reason, to) === false) return false;
+			if (router._onError(result.reason, to) === false) return { action: "cancel" };
 		}
 		router._loaderData.set(record, void 0);
-		return true;
+		return { action: "continue" };
 	}
 	function syncBrowserUrl(path, replace) {
 		if (!_isBrowser) return;
@@ -1034,6 +1099,26 @@ function createRouter(options) {
 		return Date.now() - entry.timestamp < gcTime;
 	}
 	/**
+	* Bounded set into `_loaderCache`: evicts the oldest entry (insertion-order
+	* FIFO) when the cap is exceeded. The `gcTime` TTL handles staleness, but
+	* without a size cap a long-running SPA navigating across many distinct
+	* loader keys (e.g. `/posts/:id` with hundreds of unique IDs) would
+	* accumulate cache entries indefinitely until manual `invalidateLoader()`
+	* — `_maxCacheSize` was wired through from `RouterOptions.maxCacheSize`
+	* (default 100) but the loader cache write paths never read it. Mirrors
+	* the same pattern used for `_componentCache` in `components.tsx`.
+	*/
+	function loaderCacheSet(key, data) {
+		router._loaderCache.set(key, {
+			data,
+			timestamp: Date.now()
+		});
+		if (router._loaderCache.size > router._maxCacheSize) {
+			const oldest = router._loaderCache.keys().next().value;
+			if (oldest !== void 0) router._loaderCache.delete(oldest);
+		}
+	}
+	/**
 	* Execute a loader with cache + dedup:
 	* 1. Cache hit + fresh → return cached data (skip loader entirely)
 	* 2. In-flight for same key → dedup (return existing promise)
@@ -1050,20 +1135,20 @@ function createRouter(options) {
 			}
 		}
 		const inflight = router._loaderInflight.get(key);
-		if (inflight) return inflight;
+		if (inflight && !inflight.signal.aborted) return inflight.promise;
 		if (__DEV__) _countSink.__pyreon_count__?.("router.loaderRun");
-		const promise = record.loader(loaderCtx).then((data) => {
-			router._loaderCache.set(key, {
-				data,
-				timestamp: Date.now()
-			});
-			router._loaderInflight.delete(key);
+		const promise = Promise.resolve().then(() => record.loader(loaderCtx)).then((data) => {
+			loaderCacheSet(key, data);
+			if (router._loaderInflight.get(key)?.promise === promise) router._loaderInflight.delete(key);
 			return data;
 		}).catch((err) => {
-			router._loaderInflight.delete(key);
+			if (router._loaderInflight.get(key)?.promise === promise) router._loaderInflight.delete(key);
 			throw err;
 		});
-		router._loaderInflight.set(key, promise);
+		router._loaderInflight.set(key, {
+			promise,
+			signal: loaderCtx.signal
+		});
 		return promise;
 	}
 	async function runBlockingLoaders(records, to, gen, ac) {
@@ -1073,14 +1158,15 @@ function createRouter(options) {
 			signal: ac.signal
 		};
 		const results = await Promise.allSettled(records.map((r) => executeLoader(r, loaderCtx)));
-		if (gen !== _navGen) return false;
+		if (gen !== _navGen) return { action: "cancel" };
 		for (let i = 0; i < records.length; i++) {
 			const result = results[i];
 			const record = records[i];
 			if (!result || !record) continue;
-			if (!processLoaderResult(result, record, ac, to)) return false;
+			const outcome = processLoaderResult(result, record, ac, to);
+			if (outcome.action !== "continue") return outcome;
 		}
-		return true;
+		return { action: "continue" };
 	}
 	/** Fire-and-forget background revalidation for stale-while-revalidate routes. */
 	function revalidateSwrLoaders(records, to, ac) {
@@ -1094,11 +1180,7 @@ function createRouter(options) {
 			r.loader(loaderCtx).then((data) => {
 				if (!ac.signal.aborted) {
 					router._loaderData.set(r, data);
-					const key = getCacheKey(r, loaderCtx);
-					router._loaderCache.set(key, {
-						data,
-						timestamp: Date.now()
-					});
+					loaderCacheSet(getCacheKey(r, loaderCtx), data);
 					loadingSignal.update((n) => n + 1);
 					loadingSignal.update((n) => n - 1);
 				}
@@ -1107,16 +1189,17 @@ function createRouter(options) {
 	}
 	async function runLoaders(to, gen, ac) {
 		const loadableRecords = to.matched.filter((r) => r.loader);
-		if (loadableRecords.length === 0) return true;
+		if (loadableRecords.length === 0) return { action: "continue" };
 		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;
+			const outcome = await runBlockingLoaders(blocking, to, gen, ac);
+			if (outcome.action !== "continue") return outcome;
 		}
 		if (swr.length > 0) revalidateSwrLoaders(swr, to, ac);
-		return true;
+		return { action: "continue" };
 	}
 	async function commitNavigation(path, replace, to, from) {
 		scrollManager.save(from.path);
@@ -1211,8 +1294,10 @@ function createRouter(options) {
 		router._abortController?.abort();
 		const ac = new AbortController();
 		router._abortController = ac;
-		if (!await runLoaders(to, gen, ac)) {
+		const loaderOutcome = await runLoaders(to, gen, ac);
+		if (loaderOutcome.action !== "continue") {
 			loadingSignal.update((n) => n - 1);
+			if (loaderOutcome.action === "redirect") return navigate(sanitizePath(loaderOutcome.target), replace, redirectDepth + 1);
 			return;
 		}
 		await commitNavigation(path, replace, to, from);
@@ -1280,7 +1365,7 @@ function createRouter(options) {
 		isReady() {
 			return router._readyPromise;
 		},
-		async preload(path) {
+		async preload(path, request) {
 			const resolved = resolveRoute(path, routes);
 			await Promise.all(resolved.matched.map(async (record) => {
 				if (componentCache.has(record)) return;
@@ -1295,11 +1380,12 @@ function createRouter(options) {
 			}));
 			const ac = new AbortController();
 			await Promise.all(resolved.matched.filter((r) => r.loader).map(async (r) => {
-				const data = await r.loader?.({
+				const data = await Promise.resolve().then(() => r.loader({
 					params: resolved.params,
 					query: resolved.query,
-					signal: ac.signal
-				});
+					signal: ac.signal,
+					...request ? { request } : {}
+				}));
 				router._loaderData.set(r, data);
 			}));
 		},
@@ -1454,20 +1540,51 @@ const RouterView = (props) => {
 	onUnmount(() => {
 		router._viewDepth--;
 	});
-	const child = () => {
-		router._loadingSignal();
+	const depthEntry = computed(() => {
 		const route = router.currentRoute();
-		if (route.matched.length === 0) return null;
-		const record = route.matched[depth];
-		if (!record) return null;
-		const cached = router._componentCache.get(record);
-		if (cached) return renderWithLoader(router, record, cached, route);
-		const raw = record.component;
+		const rec = route.matched[depth] ?? null;
+		if (!rec) return {
+			rec: null,
+			comp: null,
+			errored: false,
+			route
+		};
+		router._loadingSignal();
+		if (router._erroredChunks.has(rec)) return {
+			rec,
+			comp: null,
+			errored: true,
+			route
+		};
+		const cached = router._componentCache.get(rec);
+		if (cached) return {
+			rec,
+			comp: cached,
+			errored: false,
+			route
+		};
+		const raw = rec.component;
 		if (!isLazy(raw)) {
-			cacheSet(router, record, raw);
-			return renderWithLoader(router, record, raw, route);
+			cacheSet(router, rec, raw);
+			return {
+				rec,
+				comp: raw,
+				errored: false,
+				route
+			};
 		}
-		return renderLazyRoute(router, record, raw);
+		return {
+			rec,
+			comp: null,
+			errored: false,
+			route
+		};
+	}, { equals: (a, b) => a.rec === b.rec && a.comp === b.comp && a.errored === b.errored && a.route === b.route });
+	const child = () => {
+		const { rec, comp, route } = depthEntry();
+		if (!rec) return null;
+		if (comp) return renderWithLoader(router, rec, comp, route);
+		return renderLazyRoute(router, rec, rec.component);
 	};
 	return h("div", { "data-pyreon-router-view": true }, child);
 };
@@ -1491,7 +1608,7 @@ const RouterLink = (props) => {
 		if (prefetchMode === "intent") triggerPrefetch();
 	};
 	const inst = router;
-	const href = inst?.mode === "history" ? `${inst._base}${props.to}` : `#${props.to}`;
+	const href = () => inst?.mode === "history" ? `${inst._base}${props.to}` : `#${props.to}`;
 	const isExactMatch = () => {
 		if (!router) return false;
 		const target = props.to;
@@ -1525,12 +1642,15 @@ const RouterLink = (props) => {
 		});
 		onUnmount(() => observer.disconnect());
 	}
-	const { to: _to, replace: _replace, activeClass: _ac, exactActiveClass: _eac, exact: _exact, prefetch: _prefetch, children, ...rest } = props;
+	const { to: _to, replace: _replace, activeClass: _ac, exactActiveClass: _eac, exact: _exact, prefetch: _prefetch, class: userClass, children, ...rest } = props;
+	const mergedClass = () => {
+		return cx([typeof userClass === "function" ? userClass() : userClass, activeClass()]);
+	};
 	return h("a", {
 		...rest,
 		ref,
 		href,
-		class: activeClass,
+		class: mergedClass,
 		"aria-current": ariaCurrent,
 		onClick: handleClick,
 		onMouseEnter: handleMouseEnter,
@@ -1712,6 +1832,9 @@ function isStaleChunk(err) {
 	if (err instanceof SyntaxError) return true;
 	return false;
 }
+nativeCompat(RouterProvider);
+nativeCompat(RouterView);
+nativeCompat(RouterLink);
 
 //#endregion
 //#region src/not-found.ts
@@ -1764,5 +1887,5 @@ const NotFoundBoundary = (props) => {
 };
 
 //#endregion
-export { NotFoundBoundary, RouterContext, RouterLink, RouterProvider, RouterView, buildPath, createRouter, findRouteByName, hydrateLoaderData, isNotFoundError, lazy, notFound, onBeforeRouteLeave, onBeforeRouteUpdate, parseQuery, parseQueryMulti, prefetchLoaderData, resolveRoute, serializeLoaderData, stringifyQuery, useBlocker, useIsActive, useLoaderData, useMiddlewareData, useRoute, useRouter, useSearchParams, useTransition, useTypedSearchParams, useValidatedSearch };
+export { NotFoundBoundary, RouterContext, RouterLink, RouterProvider, RouterView, buildPath, createRouter, findRouteByName, getRedirectInfo, hydrateLoaderData, isNotFoundError, isRedirectError, lazy, notFound, onBeforeRouteLeave, onBeforeRouteUpdate, parseQuery, parseQueryMulti, prefetchLoaderData, redirect, resolveRoute, serializeLoaderData, stringifyQuery, useBlocker, useIsActive, useLoaderData, useMiddlewareData, useRoute, useRouter, useSearchParams, useTransition, useTypedSearchParams, useValidatedSearch };
 //# sourceMappingURL=index.js.map

package/lib/types/index.d.ts

@@ -1,4 +1,4 @@
-import * as _pyreon_core0 from "@pyreon/core";
+import * as _$_pyreon_core0 from "@pyreon/core";
 import { ComponentFn, ComponentFn as ComponentFn$1, Props, VNodeChild } from "@pyreon/core";
 import { Computed, Signal } from "@pyreon/reactivity";
 
@@ -111,6 +111,21 @@ interface LoaderContext {
   query: Record<string, string>;
   /** Aborted when a newer navigation supersedes this one */
   signal: AbortSignal;
+  /**
+   * The incoming HTTP `Request` — populated only when the loader runs during
+   * SSR (via `prefetchLoaderData`); `undefined` on every CSR navigation.
+   * Lets server-side loaders read cookies / auth headers and decide whether
+   * to `throw redirect('/login')` BEFORE the layout renders.
+   *
+   * @example
+   * loader: ({ request }) => {
+   *   const cookie = request?.headers.get('cookie') ?? ''
+   *   const sid = cookie.match(/sid=([^;]+)/)?.[1]
+   *   if (!sid) redirect('/login')
+   *   return { sid }
+   * }
+   */
+  request?: Request;
 }
 type RouteLoaderFn = (ctx: LoaderContext) => Promise<unknown>;
 interface RouteRecord<TPath extends string = string> {
@@ -313,7 +328,7 @@ interface Router<TNames extends string = string> {
    * separately when creating the router (`createRouter({ url, ... })`) or
    * call this for the same `url` you initialised the router with.
    */
-  preload(path: string): Promise<void>;
+  preload(path: string, request?: Request): Promise<void>;
   /**
    * Invalidate cached loader data. Forces loaders to re-run on next navigation.
    * - No args: invalidate ALL cached loader data
@@ -363,8 +378,18 @@ interface RouterInstance extends Router {
     data: unknown;
     timestamp: number;
   }>;
-  /** In-flight loader dedup: cacheKey → Promise */
-  _loaderInflight: Map<string, Promise<unknown>>;
+  /**
+   * In-flight loader dedup: cacheKey → { promise, signal }.
+   * Tracking the signal lets dedup skip an in-flight entry whose signal is
+   * already aborted — otherwise nav-2 would inherit nav-1's aborted promise
+   * (`router.push` aborts the previous nav's controller before starting the
+   * next, so back-to-back nav to the same path could resolve nav-2 against
+   * nav-1's aborted fetch).
+   */
+  _loaderInflight: Map<string, {
+    promise: Promise<unknown>;
+    signal: AbortSignal;
+  }>;
 }
 //#endregion
 //#region src/components.d.ts
@@ -460,6 +485,50 @@ interface NotFoundBoundaryProps extends Props {
  */
 declare const NotFoundBoundary: ComponentFn<NotFoundBoundaryProps>;
 //#endregion
+//#region src/redirect.d.ts
+/** Standard redirect status codes. 307/308 preserve the request method, 302/303 don't. */
+type RedirectStatus = 301 | 302 | 303 | 307 | 308;
+interface RedirectInfo {
+  url: string;
+  status: RedirectStatus;
+}
+/**
+ * Throw inside a route loader to redirect the navigation server-side
+ * (during SSR returns a 302/307 `Location:` response) and client-side
+ * (during CSR triggers `router.replace()` before the layout renders).
+ *
+ * The auth-gate use case: replaces the fragile `onMount + router.push()`
+ * workaround. `onMount` doesn't fire reliably under nested-layout dev SSR +
+ * hydration — so the layout renders briefly before the push happens, leaking
+ * authenticated UI to unauthenticated users. `redirect()` runs in the loader
+ * BEFORE the layout's component is invoked, so the unauthenticated UI never
+ * mounts in the first place.
+ *
+ * @example
+ * ```ts
+ * // src/routes/app/_layout.tsx
+ * export const loader = async ({ request }) => {
+ *   const session = await getSession(request)
+ *   if (!session) redirect('/login')
+ *   return { user: session.user }
+ * }
+ * ```
+ *
+ * @param url - Target URL (typically a path like `/login` or absolute URL for cross-origin).
+ * @param status - HTTP redirect status. Default `307` (Temporary Redirect, method-preserving).
+ *   Use `301`/`308` for permanent moves, `302`/`303` to force GET on the target.
+ */
+declare function redirect(url: string, status?: RedirectStatus): never;
+/** Check if an error is a RedirectError thrown by `redirect()`. */
+declare function isRedirectError(err: unknown): boolean;
+/**
+ * Extract the redirect URL and status from a thrown RedirectError. Returns
+ * `null` if `err` isn't a RedirectError. Used by the router's loader-runner
+ * (CSR) and the SSR handler to convert the thrown error into the right kind
+ * of response (a `router.replace()` call or a `302`/`307` Response).
+ */
+declare function getRedirectInfo(err: unknown): RedirectInfo | null;
+//#endregion
 //#region src/loader.d.ts
 /**
  * Returns the data resolved by the current route's `loader` function.
@@ -478,12 +547,18 @@ declare function useLoaderData<T = unknown>(): T;
  * SSR helper: pre-run all loaders for the given path before rendering.
  * Call this before `renderToString` so route components can read data via `useLoaderData()`.
  *
+ * The optional `request` is forwarded to each loader's `LoaderContext.request`,
+ * letting server-side loaders read cookies / auth headers and `throw redirect()`
+ * before the layout renders. A loader that throws `redirect()` propagates the
+ * thrown error here — the SSR handler's `catch` converts it into a 302/307
+ * `Location:` Response.
+ *
  * @example
  * const router = createRouter({ routes, url: req.url })
- * await prefetchLoaderData(router, req.url)
+ * await prefetchLoaderData(router, req.url, request)
  * const html = await renderToString(h(App, { router }))
  */
-declare function prefetchLoaderData(router: RouterInstance, path: string): Promise<void>;
+declare function prefetchLoaderData(router: RouterInstance, path: string, request?: Request): Promise<void>;
 /**
  * Serialize loader data to a JSON-safe plain object for embedding in SSR HTML.
  * Keys are route path patterns (stable across server and client).
@@ -533,7 +608,7 @@ declare function buildPath(pattern: string, params: Record<string, string>): str
 declare function findRouteByName(name: string, routes: RouteRecord[]): RouteRecord | null;
 //#endregion
 //#region src/router.d.ts
-declare const RouterContext: _pyreon_core0.Context<RouterInstance | null>;
+declare const RouterContext: _$_pyreon_core0.Context<RouterInstance | null>;
 declare function useRouter(): Router;
 declare function useRoute<TPath extends string = string>(): () => ResolvedRoute<ExtractParams<TPath> & Record<string, string>, Record<string, string>>;
 /**
@@ -688,5 +763,5 @@ declare function useTransition(): () => boolean;
 declare function useMiddlewareData(): () => Record<string, unknown>;
 declare function createRouter<TNames extends string = string>(options: RouterOptions | RouteRecord[]): Router<TNames>;
 //#endregion
-export { type AfterEachHook, type Blocker, type BlockerFn, type ExtractParams, type LazyComponent, type LoaderContext, type NavigationGuard, type NavigationGuardResult, NotFoundBoundary, type NotFoundBoundaryProps, type ResolvedRoute, type RouteComponent, type RouteLoaderFn, type RouteMeta, type RouteMiddleware, type RouteMiddlewareContext, type RouteRecord, type Router, RouterContext, RouterLink, type RouterLinkProps, type RouterOptions, RouterProvider, type RouterProviderProps, RouterView, type RouterViewProps, type ScrollBehaviorFn, buildPath, createRouter, findRouteByName, hydrateLoaderData, isNotFoundError, lazy, notFound, onBeforeRouteLeave, onBeforeRouteUpdate, parseQuery, parseQueryMulti, prefetchLoaderData, resolveRoute, serializeLoaderData, stringifyQuery, useBlocker, useIsActive, useLoaderData, useMiddlewareData, useRoute, useRouter, useSearchParams, useTransition, useTypedSearchParams, useValidatedSearch };
+export { type AfterEachHook, type Blocker, type BlockerFn, type ExtractParams, type LazyComponent, type LoaderContext, type NavigationGuard, type NavigationGuardResult, NotFoundBoundary, type NotFoundBoundaryProps, type RedirectStatus, type ResolvedRoute, type RouteComponent, type RouteLoaderFn, type RouteMeta, type RouteMiddleware, type RouteMiddlewareContext, type RouteRecord, type Router, RouterContext, RouterLink, type RouterLinkProps, type RouterOptions, RouterProvider, type RouterProviderProps, RouterView, type RouterViewProps, type ScrollBehaviorFn, buildPath, createRouter, findRouteByName, getRedirectInfo, hydrateLoaderData, isNotFoundError, isRedirectError, lazy, notFound, onBeforeRouteLeave, onBeforeRouteUpdate, parseQuery, parseQueryMulti, prefetchLoaderData, redirect, resolveRoute, serializeLoaderData, stringifyQuery, useBlocker, useIsActive, useLoaderData, useMiddlewareData, useRoute, useRouter, useSearchParams, useTransition, useTypedSearchParams, useValidatedSearch };
 //# sourceMappingURL=index2.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/router",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Official router for Pyreon",
   "homepage": "https://github.com/pyreon/pyreon/tree/main/packages/router#readme",
   "bugs": {
@@ -14,6 +14,7 @@
   },
   "files": [
     "lib",
+    "!lib/**/*.map",
     "src",
     "README.md",
     "LICENSE"
@@ -43,9 +44,9 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@pyreon/core": "^0.14.0",
-    "@pyreon/reactivity": "^0.14.0",
-    "@pyreon/runtime-dom": "^0.14.0"
+    "@pyreon/core": "^0.15.0",
+    "@pyreon/reactivity": "^0.15.0",
+    "@pyreon/runtime-dom": "^0.15.0"
   },
   "devDependencies": {
     "@happy-dom/global-registrator": "^20.8.9",