@voltro/web 0.7.0 → 0.8.0

package/dist/{serverContext-DSValgbm.js → serverContext-BW0GF8fv.js}

@@ -1,57 +1,58 @@
 import { t as e } from "./globalContext-d4A-ugDg.js";
 import { c as t, n, t as r } from "./defaultFallbacks-CGs2z5qv.js";
-import { Component as i, useCallback as a, useContext as o, useEffect as s, useMemo as c, useRef as l, useState as u } from "react";
-import { jsx as d, jsxs as ee } from "react/jsx-runtime";
+import { f as i, i as a } from "./routerState-ga64vk2B.js";
+import { Component as o, useCallback as s, useContext as c, useEffect as l, useMemo as u, useRef as d, useState as f } from "react";
+import { jsx as p, jsxs as ee } from "react/jsx-runtime";
 //#region src/routeEventBus.ts
-var f = {
+var m = {
 	pathname: "/",
 	params: {},
 	loaderData: void 0
-}, p = /* @__PURE__ */ new Set(), te = (e) => {
-	f = e;
-	for (let e of p) e();
-}, m = () => f, h = (e) => (p.add(e), () => {
-	p.delete(e);
-}), g = class extends Error {
+}, h = /* @__PURE__ */ new Set(), te = (e) => {
+	m = e;
+	for (let e of h) e();
+}, g = () => m, _ = (e) => (h.add(e), () => {
+	h.delete(e);
+}), v = class extends Error {
 	_voltroControl = "not-found";
 	constructor(e) {
 		super(e ? `Not found: ${e}` : "Not found"), this.name = "NotFoundError";
 	}
-}, _ = class extends Error {
+}, y = class extends Error {
 	_voltroControl = "redirect";
 	location;
 	status;
 	constructor(e, t) {
 		super(`Redirect: ${e}`), this.name = "RedirectError", this.location = e, this.status = t?.status ?? 303;
 	}
-}, v = (e) => {
-	throw new g(e);
-}, y = (e, t) => {
-	throw new _(e, t);
-}, ne = (e) => e instanceof Error && e._voltroControl === "not-found", b = (e) => e instanceof Error && e._voltroControl === "redirect" && typeof e.location == "string", x = 0, S = 1, C = 2, w = 3, re = (e) => e.startsWith("[[...") && e.endsWith("]]") ? {
+}, b = (e) => {
+	throw new v(e);
+}, x = (e, t) => {
+	throw new y(e, t);
+}, ne = (e) => e instanceof Error && e._voltroControl === "not-found", S = (e) => e instanceof Error && e._voltroControl === "redirect" && typeof e.location == "string", C = 0, w = 1, T = 2, E = 3, D = (e) => e.startsWith("[[...") && e.endsWith("]]") ? {
 	source: "(.*)",
 	paramName: e.slice(5, -2),
-	weight: C
+	weight: T
 } : e.startsWith("[...") && e.endsWith("]") ? {
 	source: "(.+)",
 	paramName: e.slice(4, -1),
-	weight: w
+	weight: E
 } : e.startsWith("[") && e.endsWith("]") ? {
 	source: "([^/]+)",
 	paramName: e.slice(1, -1),
-	weight: S
+	weight: w
 } : {
 	source: e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
 	paramName: null,
-	weight: x
-}, T = (e) => {
-	let t = e.pattern.split("/").map(re);
+	weight: C
+}, re = (e) => {
+	let t = e.pattern.split("/").map(D);
 	for (let n = 0; n < t.length - 1; n++) {
 		let r = t[n];
-		if (r.weight === w || r.weight === C) throw Error(`Route ${JSON.stringify(e.pattern)}: catch-all segment must be last. Anything after a catch-all is unreachable.`);
+		if (r.weight === E || r.weight === T) throw Error(`Route ${JSON.stringify(e.pattern)}: catch-all segment must be last. Anything after a catch-all is unreachable.`);
 	}
 	let n, r = t[t.length - 1];
-	n = r && r.weight === C ? `${t.slice(0, -1).map((e) => e.source).join("/")}(?:/(.*))?` : t.map((e) => e.source).join("/");
+	n = r && r.weight === T ? `${t.slice(0, -1).map((e) => e.source).join("/")}(?:/(.*))?` : t.map((e) => e.source).join("/");
 	let i = t.map((e) => e.paramName).filter((e) => e !== null), a = t.reduce((e, t) => e + t.weight, 0);
 	return {
 		...e,
@@ -62,7 +63,7 @@ var f = {
 }, ie = (e) => [...e].map((e, t) => ({
 	route: e,
 	index: t
-})).sort((e, t) => e.route.priority === t.route.priority ? e.index - t.index : e.route.priority - t.route.priority).map(({ route: e }) => e), E = (e, t) => {
+})).sort((e, t) => e.route.priority === t.route.priority ? e.index - t.index : e.route.priority - t.route.priority).map(({ route: e }) => e), O = (e, t) => {
 	let n = ie(e);
 	for (let e of n) {
 		let n = e.regex.exec(t);
@@ -79,20 +80,23 @@ var f = {
 		}
 	}
 	return null;
-}, D = (e, t, n) => O(`${e}__seg${t}`, n), O = (e, t) => `${e}\u0000${Object.entries(t).sort(([e], [t]) => e < t ? -1 : 1).map(([e, t]) => `${e}=${t}`).join("
")}`, ae = (e, t, n, r) => e === void 0 ? null : typeof e == "function" ? e({
+}, ae = (e, t, n) => k(`${e}__seg${t}`, n), k = (e, t) => `${e}\u0000${Object.entries(t).sort(([e], [t]) => e < t ? -1 : 1).map(([e, t]) => `${e}=${t}`).join("
")}`, oe = (e, t) => {
+	let n = e(t);
+	return n instanceof Promise ? n.then(i) : i(n);
+}, se = (e, t, n, r) => e === void 0 ? null : typeof e == "function" ? e({
 	params: t,
 	loaderData: n,
 	locale: r ?? "en"
-}) : e, oe = (e, t) => {
+}) : e, ce = (e, t) => {
 	let n = null, r = -1;
 	for (let i of e) (i.prefix === "" || t === i.prefix || t.startsWith(`${i.prefix}/`)) && i.prefix.length > r && (n = i, r = i.prefix.length);
 	return n;
-}, k = (e, t, n) => {
+}, A = (e, t, n) => {
 	if (e) for (let r = n; r >= 0; r--) {
 		let n = e[r]?.[t];
 		if (n !== void 0) return n;
 	}
-}, se = class {
+}, le = class {
 	entries = /* @__PURE__ */ new Map();
 	get(e) {
 		return this.entries.get(e);
@@ -131,70 +135,89 @@ var f = {
 		let t = `${e}\u0000`;
 		for (let e of this.entries.keys()) e.startsWith(t) && this.entries.delete(e);
 	}
+	seed(e, t) {
+		this.entries.has(e) || this.entries.set(e, {
+			status: "success",
+			data: t
+		});
+	}
 	clear() {
 		this.entries.clear();
 	}
-}, A = { kind: "native" }, ce = (e, t) => {
-	if (e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return A;
+}, j = { kind: "native" }, ue = (e, t) => {
+	if (e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return j;
 	let n = e.target, r = n instanceof Element ? n.closest("a") : null;
-	if (!r) return A;
+	if (!r) return j;
 	let i = r.getAttribute("href");
-	if (i === null) return A;
+	if (i === null) return j;
 	let a = r.getAttribute("target");
-	if (a && a !== "_self" || r.hasAttribute("download") || r.hasAttribute("data-no-spa")) return A;
+	if (a && a !== "_self" || r.hasAttribute("download") || r.hasAttribute("data-no-spa")) return j;
 	let o = r.getAttribute("rel");
-	if (o && /(^|\s)external(\s|$)/i.test(o)) return A;
+	if (o && /(^|\s)external(\s|$)/i.test(o)) return j;
 	let s, c;
 	try {
 		c = new URL(t), s = new URL(i, c);
 	} catch {
-		return A;
+		return j;
 	}
-	return s.origin !== c.origin || s.pathname === c.pathname && s.search === c.search && s.hash !== "" ? A : {
+	return s.origin !== c.origin || s.pathname === c.pathname && s.search === c.search && s.hash !== "" ? j : {
 		kind: "spa",
 		to: s.pathname + s.search + s.hash
 	};
-}, j = (e) => {
+}, M = (e) => {
 	let t = e.replace(/^#/, "");
 	try {
 		return decodeURIComponent(t);
 	} catch {
 		return t;
 	}
-}, M = (e) => {
-	let t = j(e);
+}, N = (e) => {
+	let t = M(e);
 	return t ? document.getElementById(t) ?? document.getElementsByName(t)[0] ?? null : null;
-}, le = (e) => {
+}, de = (e) => {
 	if (typeof window.requestAnimationFrame == "function") {
 		window.requestAnimationFrame(e);
 		return;
 	}
 	window.setTimeout(e, 0);
-}, ue = (e) => {
+}, fe = (e) => {
 	if (!e.hash) {
 		window.scrollTo(0, 0);
 		return;
 	}
-	le(() => {
-		let t = M(e.hash);
+	de(() => {
+		let t = N(e.hash);
 		if (t) {
 			t.scrollIntoView();
 			return;
 		}
 		window.scrollTo(0, 0);
 	});
-}, N = 0, de = () => {
+}, P = 0, pe = () => {
 	let e = typeof crypto < "u" ? crypto : void 0;
-	return e && typeof e.randomUUID == "function" ? e.randomUUID() : (N += 1, `k${Date.now().toString(36)}-${N}`);
-}, P = e("router", null), F = () => {
-	let e = o(P);
+	return e && typeof e.randomUUID == "function" ? e.randomUUID() : (P += 1, `k${Date.now().toString(36)}-${P}`);
+}, F = e("router", null), I = () => {
+	let e = c(F);
 	if (!e) throw Error("Router hooks must be used inside <Router>.");
 	return e;
-}, I = e("loaderData", void 0), fe = () => {
+}, L = e("loaderData", void 0), me = (e, t) => {
+	if (!e || e.pathname !== t) return;
+	let n = {};
+	for (let [t, r] of e.segments) n[t] = r;
+	return {
+		page: e.page,
+		segments: n
+	};
+}, he = (e, t) => {
+	if (e === t) return !0;
+	if (!e || !t || !Object.is(e.page, t.page)) return !1;
+	let n = Object.keys(e.segments), r = Object.keys(t.segments);
+	return n.length === r.length && n.every((n) => Object.is(e.segments[Number(n)], t.segments[Number(n)]));
+}, ge = () => {
 	if (typeof document > "u") return;
 	let e = document.cookie.match(/(?:^|;\s*)voltro:lang=([^;]*)/);
 	return e ? decodeURIComponent(e[1]) : void 0;
-}, pe = (e) => {
+}, _e = (e) => {
 	if (e === null || typeof document > "u") return () => {};
 	let t = document.title, n = [], r = [], i = [], a = [], o = [];
 	typeof e.title == "string" && (document.title = e.title);
@@ -229,7 +252,7 @@ var f = {
 	}
 	if (e.jsonLd) for (let t of e.jsonLd) {
 		let e = document.createElement("script");
-		e.type = "application/ld+json", e.setAttribute("data-voltro-page-jsonld", ""), e.textContent = L(t), document.head.appendChild(e), o.push(e);
+		e.type = "application/ld+json", e.setAttribute("data-voltro-page-jsonld", ""), e.textContent = R(t), document.head.appendChild(e), o.push(e);
 	}
 	return () => {
 		document.title = t;
@@ -239,7 +262,7 @@ var f = {
 		for (let { el: e, previous: t } of r) e.content = t;
 		for (let { el: e, previous: t } of a) e.href = t;
 	};
-}, L = (e) => JSON.stringify(e).replace(/<\/(script)/gi, "<\\/$1").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029"), R = class extends i {
+}, R = (e) => JSON.stringify(e).replace(/<\/(script)/gi, "<\\/$1").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029"), z = class extends o {
 	state = { error: null };
 	static getDerivedStateFromError(e) {
 		return { error: e };
@@ -256,18 +279,18 @@ var f = {
 	render() {
 		if (this.state.error !== null) {
 			let { Fallback: e } = this.props;
-			return /* @__PURE__ */ d(e, {
+			return /* @__PURE__ */ p(e, {
 				error: this.state.error,
 				reset: this.reset
 			});
 		}
 		return this.props.children;
 	}
-}, z = ({ routes: e, notFounds: i = [], notFound: o = n, errorFallback: f = r }) => {
-	let [p, m] = u(() => window.location.pathname), [h, g] = u(() => window.location.pathname), [_, v] = u(() => window.location.search + window.location.hash), y = l(new se()), x = l(/* @__PURE__ */ new Map()), [S, C] = u(null), w = a((e, t) => (x.current.set(e, t), () => {
+}, ve = ({ routes: e, notFounds: i = [], notFound: o = n, errorFallback: c = r }) => {
+	let [m, h] = f(() => window.location.pathname), [g, _] = f(() => window.location.pathname), [v, y] = f(() => window.location.search + window.location.hash), b = d(new le()), x = d(/* @__PURE__ */ new Map()), [C, w] = f(null), T = s((e, t) => (x.current.set(e, t), () => {
 		x.current.delete(e);
-	}), []), re = l(/* @__PURE__ */ new Map()), A = l(null), j = c(() => ie(e.map(T)), [e]);
-	s(() => {
+	}), []), E = d(/* @__PURE__ */ new Map()), D = d(null), j = u(() => ie(e.map(re)), [e]);
+	l(() => {
 		if (typeof window > "u") return;
 		let e = window.history.scrollRestoration;
 		try {
@@ -275,7 +298,7 @@ var f = {
 		} catch {}
 		return window.history.state?.__vwebKey || window.history.replaceState({
 			...window.history.state,
-			__vwebKey: de()
+			__vwebKey: pe()
 		}, ""), () => {
 			try {
 				window.history.scrollRestoration = e;
@@ -283,120 +306,130 @@ var f = {
 		};
 	}, []);
 	let M = () => window.history.state?.__vwebKey ?? "initial";
-	s(() => {
+	l(() => {
 		let e = () => {
-			let e = re.current.get(M());
-			A.current = e ?? {
+			let e = E.current.get(M());
+			D.current = e ?? {
 				x: 0,
 				y: 0
-			}, m(window.location.pathname), v(window.location.search + window.location.hash);
+			}, h(window.location.pathname), y(window.location.search + window.location.hash);
 		};
 		return window.addEventListener("popstate", e), () => window.removeEventListener("popstate", e);
 	}, []);
-	let N = a((e, t, n) => {
-		re.current.set(M(), {
+	let N = s((e, t, n) => {
+		E.current.set(M(), {
 			x: window.scrollX,
 			y: window.scrollY
 		});
-		let r = { __vwebKey: de() };
-		n?.replace ? window.history.replaceState(r, "", e) : window.history.pushState(r, "", e), m(t.pathname), v(t.search + t.hash), n?.scroll !== !1 && ue(t);
-	}, []), F = a((e, t) => {
+		let r = { __vwebKey: pe() };
+		n?.replace ? window.history.replaceState(r, "", e) : window.history.pushState(r, "", e), h(t.pathname), y(t.search + t.hash), n?.scroll !== !1 && fe(t);
+	}, []), P = s((e, t) => {
 		let n = new URL(window.location.href), r = new URL(e, n);
 		if (!(r.pathname === n.pathname && r.search === n.search && r.hash === n.hash)) {
 			for (let n of x.current.values()) if (n({
 				to: e,
 				...t ? { opts: t } : {}
 			})) {
-				C({
+				w({
 					to: e,
 					...t ? { opts: t } : {},
 					retry: () => {
-						C(null), N(e, r, t);
+						w(null), N(e, r, t);
 					},
-					reset: () => C(null)
+					reset: () => w(null)
 				});
 				return;
 			}
 			N(e, r, t);
 		}
 	}, [N]);
-	s(() => {
+	l(() => {
 		if (typeof document > "u") return;
 		let e = (e) => {
-			let t = ce(e, window.location.href);
-			t.kind === "spa" && (e.preventDefault(), F(t.to));
+			let t = ue(e, window.location.href);
+			t.kind === "spa" && (e.preventDefault(), P(t.to));
 		};
 		return document.addEventListener("click", e), () => document.removeEventListener("click", e);
-	}, [F]);
-	let L = c(() => E(j, p), [j, p]), z = l(/* @__PURE__ */ new Map()), [B, ge] = u(0);
-	s(() => {
-		let e = L?.route;
-		if (!e?.load || z.current.has(e.pattern)) return;
+	}, [P]);
+	let I = u(() => O(j, m), [j, m]), R = d(/* @__PURE__ */ new Map()), [ve, ye] = f(0);
+	l(() => {
+		let e = I?.route;
+		if (!e?.load || R.current.has(e.pattern)) return;
 		let t = !1;
 		return e.load().then((n) => {
-			t || (z.current.set(e.pattern, n), ge((e) => e + 1));
+			t || (R.current.set(e.pattern, n), ye((e) => e + 1));
 		}).catch(() => {}), () => {
 			t = !0;
 		};
-	}, [L?.route.load ? L.route.pattern : null]);
-	let V = c(() => {
-		if (!L) return null;
-		let e = L.route;
+	}, [I?.route.load ? I.route.pattern : null]);
+	let B = u(() => {
+		if (!I) return null;
+		let e = I.route;
 		if (!e.load) return e;
-		let t = z.current.get(e.pattern);
+		let t = R.current.get(e.pattern);
 		return t ? {
 			...e,
-			...ye(t),
+			...Ee(t),
 			load: void 0
 		} : null;
-	}, [L, B]), H = c(() => E(j, h), [j, h]), U = c(() => {
-		if (!H) return null;
-		let e = H.route;
+	}, [I, ve]), V = u(() => O(j, g), [j, g]), H = u(() => {
+		if (!V) return null;
+		let e = V.route;
 		if (!e.load) return e;
-		let t = z.current.get(e.pattern);
+		let t = R.current.get(e.pattern);
 		return t ? {
 			...e,
-			...ye(t),
+			...Ee(t),
 			load: void 0
 		} : null;
-	}, [H, B]), W = a((e) => {
-		let t = new URL(e, window.location.origin), n = E(j, t.pathname);
+	}, [V, ve]), Se = s((e) => {
+		let t = new URL(e, window.location.origin), n = O(j, t.pathname);
 		if (!n) return;
 		let r = (e, r) => {
-			y.current.start(e, (e) => r({
+			b.current.start(e, (e) => oe(r, {
 				params: n.params,
 				pathname: t.pathname,
 				signal: e
 			}));
 		};
-		n.route.loader && r(O(n.route.pattern, n.params), n.route.loader), n.route.chain?.forEach((e, t) => {
-			e.loader && r(D(n.route.pattern, t, n.params), e.loader);
+		n.route.loader && r(k(n.route.pattern, n.params), n.route.loader), n.route.chain?.forEach((e, t) => {
+			e.loader && r(ae(n.route.pattern, t, n.params), e.loader);
 		});
-	}, [j]), [G, K] = u({ status: "idle" }), [_e, ve] = u(void 0);
-	s(() => {
+	}, [j]), [U, W] = f({ status: "idle" }), G = d(void 0);
+	G.current === void 0 && (G.current = a());
+	let Ce = d(!1), [K, we] = f(() => ({
+		pathname: m,
+		data: me(G.current ?? null, m),
+		chain: I?.route.chain
+	}));
+	l(() => {
 		let e = (e) => {
-			g(p), ve(e);
+			_(m), we((t) => t.pathname === m && he(t.data, e) ? t : {
+				pathname: m,
+				data: e,
+				chain: I?.route.chain
+			});
 		};
-		if (!L) {
-			K({ status: "idle" }), e(void 0);
+		if (!I) {
+			W({ status: "idle" }), e(void 0);
 			return;
 		}
-		if (!V) {
-			K({
+		if (!B) {
+			W({
 				status: "pending",
-				key: O(L.route.pattern, L.params)
+				key: k(I.route.pattern, I.params)
 			});
 			return;
 		}
-		let t = V, { params: n } = L, r = t.chain, i = (t.Pending ?? k(r, "Pending", r ? r.length - 1 : -1)) !== void 0, a = [];
+		let t = B, { params: n } = I, r = t.chain, i = (t.Pending ?? A(r, "Pending", r ? r.length - 1 : -1)) !== void 0, a = [];
 		if (t.loader) {
 			let e = t.loader;
 			a.push({
-				cacheKey: O(t.pattern, n),
+				cacheKey: k(t.pattern, n),
 				target: "page",
-				run: (t) => e({
+				run: (t) => oe(e, {
 					params: n,
-					pathname: p,
+					pathname: m,
 					signal: t
 				})
 			});
@@ -405,26 +438,31 @@ var f = {
 			if (e.loader) {
 				let i = e.loader;
 				a.push({
-					cacheKey: D(t.pattern, r, n),
+					cacheKey: ae(t.pattern, r, n),
 					target: r,
-					run: (e) => i({
+					run: (e) => oe(i, {
 						params: n,
-						pathname: p,
+						pathname: m,
 						signal: e
 					})
 				});
 			}
 		}), a.length === 0) {
-			K({ status: "idle" }), e(void 0);
+			W({ status: "idle" }), e(void 0);
 			return;
 		}
-		let o = O(t.pattern, n), s = a.map((e) => ({
+		let o = k(t.pattern, n), s = G.current;
+		if (s && !Ce.current && m === s.pathname) {
+			Ce.current = !0;
+			for (let e of a) e.target === "page" ? s.pageRan && b.current.seed(e.cacheKey, s.page) : s.segments.has(e.target) && b.current.seed(e.cacheKey, s.segments.get(e.target));
+		}
+		let c = a.map((e) => ({
 			spec: e,
-			entry: y.current.start(e.cacheKey, e.run)
-		})), c = () => {
+			entry: b.current.start(e.cacheKey, e.run)
+		})), l = () => {
 			let e = {}, t;
-			for (let { spec: n } of s) {
-				let r = y.current.get(n.cacheKey);
+			for (let { spec: n } of c) {
+				let r = b.current.get(n.cacheKey);
 				if (!r || r.status === "pending") return null;
 				if (r.status === "error") return {
 					ok: !1,
@@ -439,87 +477,87 @@ var f = {
 					segments: e
 				}
 			};
-		}, l = c();
-		if (l) {
-			l.ok ? (K({
+		}, u = l();
+		if (u) {
+			u.ok ? (W({
 				status: "success",
 				key: o,
-				data: l.data
-			}), e(l.data)) : (K({
+				data: u.data
+			}), e(u.data)) : (W({
 				status: "error",
 				key: o,
-				error: l.error
-			}), b(l.error) || e(void 0));
+				error: u.error
+			}), S(u.error) || e(void 0));
 			return;
 		}
-		K({
+		W({
 			status: "pending",
 			key: o
-		}), i && g(p);
-		let u = !1, d = s.map(({ entry: e }) => e.status === "pending" ? e.promise : Promise.resolve());
-		return Promise.all(d).then(() => {
-			if (u) return;
-			let t = c();
-			t && (t.ok ? (K({
+		}), i && _(m);
+		let d = !1, f = c.map(({ entry: e }) => e.status === "pending" ? e.promise : Promise.resolve());
+		return Promise.all(f).then(() => {
+			if (d) return;
+			let t = l();
+			t && (t.ok ? (W({
 				status: "success",
 				key: o,
 				data: t.data
-			}), e(t.data)) : (K({
+			}), e(t.data)) : (W({
 				status: "error",
 				key: o,
 				error: t.error
-			}), b(t.error) || e(void 0)));
+			}), S(t.error) || e(void 0)));
 		}), () => {
-			u = !0;
+			d = !0;
 		};
 	}, [
-		L,
-		V,
-		p
+		I,
+		B,
+		m
 	]);
-	let q = _e, J = q?.page, Y = h === p, X = fe(), Z = c(() => {
-		if (!H) return null;
-		let e = H.params.locale ?? X;
-		return ae(U?.meta, H.params, J, e);
+	let q = K.data?.page, J = g === m, Y = K.pathname === g, Te = Y ? K.data?.page : void 0, De = ge(), X = u(() => {
+		if (!V) return null;
+		let e = V.params.locale ?? De;
+		return se(H?.meta, V.params, q, e);
 	}, [
+		V,
 		H,
-		U,
-		J,
-		X
+		q,
+		De
 	]);
-	s(() => pe(Z), [Z]);
-	let [be, xe] = u(""), Se = l(!1), [Q, Ce] = u(!1);
-	s(() => {
-		if (!Se.current) {
-			Se.current = !0, Ce(!0);
+	l(() => _e(X), [X]);
+	let [Oe, Z] = f(""), Q = d(!1), [ke, Ae] = f(!1);
+	l(() => {
+		if (!Q.current) {
+			Q.current = !0, Ae(!0);
 			return;
 		}
-		let e = Z?.title ?? (typeof document < "u" ? document.title : "");
-		xe(e && e.length > 0 ? e : h);
-	}, [h, Z]), s(() => {
-		let e = A.current;
-		e && (A.current = null, le(() => window.scrollTo(e.x, e.y)));
-	}, [h]);
-	let we = c(() => ({
-		pathname: h,
-		search: _,
-		navigate: F,
-		params: H?.params ?? {},
-		prefetch: W,
-		loaderData: J,
-		registerBlocker: w,
-		blocked: S
+		let e = X?.title ?? (typeof document < "u" ? document.title : "");
+		Z(e && e.length > 0 ? e : g);
+	}, [g, X]), l(() => {
+		let e = D.current;
+		e && (D.current = null, de(() => window.scrollTo(e.x, e.y)));
+	}, [g]);
+	let je = u(() => ({
+		pathname: g,
+		search: v,
+		navigate: P,
+		params: V?.params ?? {},
+		prefetch: Se,
+		loaderData: q,
+		registerBlocker: T,
+		blocked: C
 	}), [
-		h,
-		_,
-		F,
-		H,
-		W,
-		J,
-		w,
-		S
+		g,
+		v,
+		P,
+		V,
+		Se,
+		q,
+		T,
+		C
 	]);
-	s(() => {
+	l(() => {
 		if (typeof window > "u") return;
 		let e = (e) => {
 			let t = !1;
@@ -530,81 +568,85 @@ var f = {
 			t && (e.preventDefault(), e.returnValue = "");
 		};
 		return window.addEventListener("beforeunload", e), () => window.removeEventListener("beforeunload", e);
-	}, []), s(() => {
+	}, []), l(() => {
 		te({
-			pathname: h,
-			params: H?.params ?? {},
-			loaderData: J
+			pathname: g,
+			params: V?.params ?? {},
+			loaderData: q
 		});
 	}, [
-		h,
-		H,
-		J
-	]), s(() => {
-		if (G.status === "pending") return t({
+		g,
+		V,
+		q
+	]), l(() => {
+		if (U.status === "pending") return t({
 			id: "voltro:router:loader",
 			kind: "loading",
 			label: "Loading…"
 		});
-	}, [G.status]), s(() => {
-		if (G.status === "error") return t({
+	}, [U.status]), l(() => {
+		if (U.status === "error") return t({
 			id: "voltro:router:loader-error",
 			kind: "error",
 			label: "Loader failed"
 		});
-	}, [G.status]), s(() => {
-		G.status === "error" && b(G.error) && F(G.error.location, { replace: !0 });
-	}, [G, F]);
-	let Te = () => {
-		let e = oe(i, h);
+	}, [U.status]), l(() => {
+		U.status === "error" && S(U.error) && P(U.error.location, { replace: !0 });
+	}, [U, P]);
+	let Me = () => {
+		let e = ce(i, g);
 		if (e) {
 			let { Component: t, chain: n } = e;
-			return he(n, /* @__PURE__ */ d(t, {}), h, f);
+			return xe(n, /* @__PURE__ */ p(t, {}), g, c);
 		}
-		return /* @__PURE__ */ d(o, {});
-	}, Ee = Y && H && G.status === "error" ? G.error : void 0, $;
-	if (!H) $ = Te();
-	else if (ne(Ee)) $ = Te();
+		return /* @__PURE__ */ p(o, {});
+	}, Ne = J && V && U.status === "error" ? U.error : void 0, $;
+	if (!V) $ = Me();
+	else if (ne(Ne)) $ = Me();
 	else {
-		let e = H.route.chain, t = e ? e.length - 1 : -1, n = U?.ErrorBoundary ?? k(e, "Error", t) ?? f, r;
-		if (Y && G.status === "error" && !b(G.error)) r = /* @__PURE__ */ d(n, {
-			error: G.error,
+		let e = V.route.chain, t = e ? e.length - 1 : -1, n = H?.ErrorBoundary ?? A(e, "Error", t) ?? c, r;
+		if (J && U.status === "error" && !S(U.error)) r = /* @__PURE__ */ p(n, {
+			error: U.error,
 			reset: () => {
-				y.current.invalidate(H.route.pattern), m((e) => e), K({ status: "idle" });
+				b.current.invalidate(V.route.pattern), h((e) => e), W({ status: "idle" });
 			}
 		});
-		else if (Y && G.status === "pending") {
-			let i = U?.Pending ?? k(e, "Pending", t);
-			if (i) r = /* @__PURE__ */ d(i, {});
-			else if (U?.Component) {
-				let e = U.Component;
-				r = /* @__PURE__ */ d(R, {
-					resetKey: h,
+		else if (J && U.status === "pending") {
+			let i = H?.Pending ?? A(e, "Pending", t);
+			if (i) r = /* @__PURE__ */ p(i, {});
+			else if (H?.Component) {
+				let e = H.Component;
+				r = /* @__PURE__ */ p(z, {
+					resetKey: g,
 					Fallback: n,
-					children: /* @__PURE__ */ d(I.Provider, {
-						value: void 0,
-						children: /* @__PURE__ */ d(e, {})
+					children: /* @__PURE__ */ p(L.Provider, {
+						value: Te,
+						children: /* @__PURE__ */ p(e, {})
 					})
 				});
 			} else r = null;
 		} else {
-			let e = U?.Component;
-			r = e ? /* @__PURE__ */ d(R, {
-				resetKey: h,
+			let e = H?.Component;
+			r = e ? /* @__PURE__ */ p(z, {
+				resetKey: g,
 				Fallback: n,
-				children: /* @__PURE__ */ d(I.Provider, {
-					value: q?.page,
-					children: /* @__PURE__ */ d(e, {})
+				children: /* @__PURE__ */ p(L.Provider, {
+					value: Te,
+					children: /* @__PURE__ */ p(e, {})
 				})
 			}) : null;
 		}
-		$ = he(e, r, h, f, (e) => q?.segments[e]);
+		$ = xe(e, r, g, c, (t) => {
+			if (Y) return K.data?.segments[t];
+			let n = e?.[t]?.Layout;
+			return n !== void 0 && n === K.chain?.[t]?.Layout ? K.data?.segments[t] : void 0;
+		});
 	}
-	return /* @__PURE__ */ ee(P.Provider, {
-		value: we,
-		children: [$, Q ? /* @__PURE__ */ d(me, { message: be }) : null]
+	return /* @__PURE__ */ ee(F.Provider, {
+		value: je,
+		children: [$, ke ? /* @__PURE__ */ p(be, { message: Oe }) : null]
 	});
-}, B = {
+}, ye = {
 	position: "absolute",
 	width: 1,
 	height: 1,
@@ -614,28 +656,28 @@ var f = {
 	clip: "rect(0, 0, 0, 0)",
 	whiteSpace: "nowrap",
 	border: 0
-}, me = ({ message: e }) => /* @__PURE__ */ d("div", {
+}, be = ({ message: e }) => /* @__PURE__ */ p("div", {
 	"data-vweb-route-announcer": "",
 	role: "status",
 	"aria-live": "assertive",
 	"aria-atomic": "true",
-	style: B,
+	style: ye,
 	children: e
-}), he = (e, t, n, r, i) => {
+}), xe = (e, t, n, r, i) => {
 	if (!e || e.length === 0) return t;
 	let a = t;
 	for (let t = e.length - 1; t >= 0; t--) {
 		let r = e[t];
 		if (r.Layout) {
 			let e = r.Layout;
-			a = /* @__PURE__ */ d(I.Provider, {
+			a = /* @__PURE__ */ p(L.Provider, {
 				value: i?.(t),
-				children: /* @__PURE__ */ d(e, { children: a })
+				children: /* @__PURE__ */ p(e, { children: a })
 			});
 		}
 		if (r.Error) {
 			let e = r.Error;
-			a = /* @__PURE__ */ d(R, {
+			a = /* @__PURE__ */ p(z, {
 				resetKey: n,
 				Fallback: e,
 				children: a
@@ -643,9 +685,9 @@ var f = {
 		}
 	}
 	return a;
-}, ge = () => F().pathname, V = () => F().navigate, H = () => F().params, U = () => o(I), W = () => F().prefetch, G = (e) => {
-	let { registerBlocker: t, blocked: n } = F(), r = l(Symbol("voltro:blocker")), i = l(e);
-	return i.current = e, s(() => {
+}, B = () => I().pathname, V = () => I().navigate, H = () => I().params, Se = () => c(L), U = () => I().prefetch, W = (e) => {
+	let { registerBlocker: t, blocked: n } = I(), r = d(Symbol("voltro:blocker")), i = d(e);
+	return i.current = e, l(() => {
 		let e = r.current;
 		return t(e, (e) => {
 			let t = i.current;
@@ -657,40 +699,40 @@ var f = {
 		retry: n.retry,
 		reset: n.reset
 	} : { blocked: !1 };
-}, K = (e) => e instanceof URLSearchParams ? e : new URLSearchParams(e), _e = () => {
-	let { navigate: e } = F();
-	return a((t, n) => {
-		let r = new URLSearchParams(typeof window < "u" ? window.location.search : ""), i = K(typeof t == "function" ? t(r) : t).toString(), a = typeof window < "u" ? window.location.pathname : "/", o = i ? `${a}?${i}` : a;
+}, G = (e) => e instanceof URLSearchParams ? e : new URLSearchParams(e), Ce = () => {
+	let { navigate: e } = I();
+	return s((t, n) => {
+		let r = new URLSearchParams(typeof window < "u" ? window.location.search : ""), i = G(typeof t == "function" ? t(r) : t).toString(), a = typeof window < "u" ? window.location.pathname : "/", o = i ? `${a}?${i}` : a;
 		e(o, {
 			replace: !n?.push,
 			...n?.scroll === void 0 ? {} : { scroll: n.scroll }
 		});
 	}, [e]);
-}, ve = (e) => e, q = (e, t) => {
+}, K = (e) => e, we = (e, t) => {
 	let n = new URLSearchParams();
 	for (let [e, r] of Object.entries(t)) r !== void 0 && n.append(e, String(r));
 	let r = n.toString();
 	return r ? `${e}?${r}` : e;
-}, J = (e, t) => `${e}#${t.replace(/^#/, "")}`, Y = (e) => /^([a-z][a-z0-9+.-]*:|\/\/|#)/i.test(e), X = ({ to: e, children: t, onClick: n, prefetch: r = !1, replace: i = !1, onMouseEnter: a, onFocus: o, ...s }) => {
-	let c = V(), l = W(), u = Y(e), ee = (t) => {
+}, q = (e, t) => `${e}#${t.replace(/^#/, "")}`, J = (e) => /^([a-z][a-z0-9+.-]*:|\/\/|#)/i.test(e), Y = ({ to: e, children: t, onClick: n, prefetch: r = !1, replace: i = !1, onMouseEnter: a, onFocus: o, ...s }) => {
+	let c = V(), l = U(), u = J(e), d = (t) => {
 		u || t.metaKey || t.ctrlKey || t.shiftKey || t.altKey || t.button !== 0 || (t.preventDefault(), n?.(t), c(e, i ? { replace: i } : void 0));
 	}, f = (t) => {
 		r && !u && l(e), a?.(t);
-	}, p = (t) => {
+	}, ee = (t) => {
 		r && !u && l(e), o?.(t);
 	};
-	return /* @__PURE__ */ d("a", {
+	return /* @__PURE__ */ p("a", {
 		...s,
 		href: e,
-		onClick: ee,
+		onClick: d,
 		onMouseEnter: f,
-		onFocus: p,
+		onFocus: ee,
 		children: t
 	});
-}, Z = (e) => X({
+}, Te = (e) => Y({
 	...e,
 	to: e.to
-}), ye = (e) => ({
+}), Ee = (e) => ({
 	Component: e.default,
 	meta: e.meta,
 	loader: e.loader,
@@ -698,30 +740,30 @@ var f = {
 	Pending: e.Pending,
 	renderMode: e.renderMode,
 	interactive: e.interactive
-}), be = (e, t, n = {}) => ({
+}), De = (e, t, n = {}) => ({
 	pattern: e,
-	...ye(t),
+	...Ee(t),
 	chain: n.chain
-}), xe = (e, t, n = {}) => ({
+}), X = (e, t, n = {}) => ({
 	pattern: e,
 	load: t,
 	chain: n.chain
-}), Se = async (e, t) => {
-	let n = E(e.map(T), t)?.route.load;
+}), Oe = async (e, t) => {
+	let n = O(e.map(re), t)?.route.load;
 	if (n) try {
 		await n();
 	} catch {}
-}, Q = e("serverRequest", null), Ce = () => o(Q), we = () => {
-	let e = Ce();
+}, Z = e("serverRequest", null), Q = () => c(Z), ke = () => {
+	let e = Q();
 	if (e !== null) {
 		let t = e.url.indexOf("?");
 		return new URLSearchParams(t >= 0 ? e.url.slice(t + 1) : "");
 	}
 	return typeof window < "u" ? new URLSearchParams(window.location.search) : new URLSearchParams();
-}, Te = ({ value: e, children: t }) => /* @__PURE__ */ d(Q.Provider, {
+}, Ae = ({ value: e, children: t }) => /* @__PURE__ */ p(Z.Provider, {
 	value: e,
 	children: t
-}), Ee = (e) => {
+}), je = (e) => {
 	let t = {};
 	if (!e) return t;
 	for (let n of e.split(";")) {
@@ -739,4 +781,4 @@ var f = {
 	return t;
 };
 //#endregion
-export { _e as A, te as B, ie as C, V as D, ge as E, ne as F, b as I, v as L, q as M, g as N, H as O, _ as P, y as R, D as S, U as T, h as V, E as _, Ce as a, ce as b, I as c, P as d, T as f, O as g, xe as h, we as i, J as j, W as k, Z as l, oe as m, Te as n, X as o, ve as p, Ee as r, se as s, Q as t, z as u, be as v, G as w, ae as x, Se as y, m as z };
+export { Ce as A, te as B, ie as C, V as D, B as E, ne as F, S as I, b as L, we as M, v as N, H as O, y as P, x as R, ae as S, Se as T, _ as V, O as _, Q as a, ue as b, L as c, F as d, re as f, k as g, X as h, ke as i, q as j, U as k, Te as l, ce as m, Ae as n, Y as o, K as p, je as r, le as s, Z as t, ve as u, De as v, W as w, se as x, Oe as y, g as z };