@elurjs/core 3.5.0 → 3.6.0

package/dist/lib/elur/router.js

@@ -1,25 +1,26 @@
 import { signal as e } from "./signals.js";
 import { ElurComponent as t } from "./lifecycle.js";
-import { createInjectionKey as n, inject as r } from "./context.js";
-import { html as i } from "./elur/template/html.js";
+import { inject as n } from "./context.js";
+import { html as r } from "./elur/template/html.js";
+import { RouterKey as i, _debugRegisterRouter as a, _debugUnregisterRouter as o, _mountedRouters as s } from "./elur/router-registry.js";
 //#region src/elur/router.ts
-var a = n("elur:router"), o = null, s = null, c = [], l = "__elur_scroll", u = "__elur_pos";
-function d() {
-	if (!o) throw Error("[elur] No active router. Call createRouter() first, or instantiate an outlet that auto-bootstraps one (e.g. IonRouterOutlet).");
-	return o;
-}
+var c = null, l = null, u = "__elur_scroll", d = "__elur_pos";
 function f() {
-	return o !== null;
+	if (!c) throw Error("[elur] No active router. Call createRouter() first, or instantiate an outlet that auto-bootstraps one (e.g. IonRouterOutlet).");
+	return c;
 }
 function p() {
+	return c !== null;
+}
+function m() {
 	return {
 		left: window.scrollX ?? window.pageXOffset ?? 0,
 		top: window.scrollY ?? window.pageYOffset ?? 0
 	};
 }
-function ee(e) {
+function h(e) {
 	if (!e || typeof e != "object") return null;
-	let t = e[l];
+	let t = e[u];
 	if (!t || typeof t != "object") return null;
 	let n = t.left, r = t.top;
 	return typeof n != "number" || typeof r != "number" ? null : {
@@ -27,31 +28,31 @@ function ee(e) {
 		top: r
 	};
 }
-function m(e) {
+function g(e) {
 	if (!e || typeof e != "object") return null;
-	let t = e[u];
+	let t = e[d];
 	return typeof t == "number" ? t : null;
 }
-function h(e, t, n) {
+function _(e, t, n) {
 	let r = e && typeof e == "object" ? { ...e } : {};
-	return r[l] = {
+	return r[u] = {
 		left: t.left,
 		top: t.top
-	}, r[u] = n, r;
+	}, r[d] = n, r;
 }
-function g(e) {
+function v(e) {
 	let t = {};
 	return new URLSearchParams(e).forEach((e, n) => {
 		t[n] = e;
 	}), t;
 }
-function _(e) {
+function y(e) {
 	let t = new URLSearchParams();
 	for (let [n, r] of Object.entries(e)) r != null && r !== !1 && t.set(n, String(r));
 	let n = t.toString();
 	return n ? "?" + n : "";
 }
-function v(e) {
+function b(e) {
 	return e === "*" ? [{ kind: "wildcard" }] : e.split("/").filter(Boolean).map((e) => e === "*" ? { kind: "wildcard" } : e.startsWith(":") ? {
 		kind: "param",
 		name: e.slice(1)
@@ -60,13 +61,13 @@ function v(e) {
 		value: e
 	});
 }
-function y(e, t) {
+function x(e, t) {
 	return t === "*" ? e === "" ? "*" : e + "/*" : (e + (t.startsWith("/") ? t : "/" + t)).replace(/\/+/g, "/") || "/";
 }
-function b(e, t = "", n = []) {
+function S(e, t = "", n = []) {
 	let r = [];
 	for (let i of e) {
-		let e = y(t, i.path), a = [...n, i.component], o = v(e);
+		let e = x(t, i.path), a = [...n, i.component], o = b(e);
 		r.push({
 			fullPath: e,
 			segments: o,
@@ -75,11 +76,11 @@ function b(e, t = "", n = []) {
 			meta: i.meta,
 			beforeEnter: i.beforeEnter,
 			record: i
-		}), i.children?.length && r.push(...b(i.children, e, a));
+		}), i.children?.length && r.push(...S(i.children, e, a));
 	}
 	return r;
 }
-function x(e, t) {
+function C(e, t) {
 	let n = e.split("/").filter(Boolean), r = t.segments;
 	if (r.length === 1 && r[0].kind === "wildcard") return {};
 	let i = r.length > 0 && r[r.length - 1].kind === "wildcard", a = i ? r.slice(0, -1) : r;
@@ -99,15 +100,15 @@ function x(e, t) {
 	}
 	return o;
 }
-function S(e) {
+function w(e) {
 	return e.segments.reduce((e, t) => t.kind === "literal" ? e + 2 : t.kind === "param" ? e + 1 : e, 0);
 }
-function C(e, t) {
+function T(e, t) {
 	let n, r = {}, i = -1;
 	for (let a of t) {
-		let t = x(e, a);
+		let t = C(e, a);
 		if (t === null) continue;
-		let o = S(a);
+		let o = w(a);
 		o > i && (n = a, r = t, i = o);
 	}
 	return n ? {
@@ -115,22 +116,22 @@ function C(e, t) {
 		params: r
 	} : void 0;
 }
-function w(e) {
+function E(e) {
 	let t = e.trim();
 	return !t || t === "/" ? "" : (t.startsWith("/") || (t = "/" + t), t.endsWith("/") && (t = t.slice(0, -1)), t);
 }
-function T() {
+function ee() {
 	if (typeof document > "u") return "";
 	let e = document.querySelector("base");
 	if (!e) return "";
 	let t = e.getAttribute("href") || "";
 	try {
-		return w(new URL(t, window.location.origin).pathname);
+		return E(new URL(t, window.location.origin).pathname);
 	} catch {
-		return w(t);
+		return E(t);
 	}
 }
-function te(e) {
+function D(e) {
 	return e === !1 ? { allow: !1 } : e === !0 || e == null ? { allow: !0 } : typeof e == "string" ? {
 		allow: !1,
 		redirect: e
@@ -139,8 +140,8 @@ function te(e) {
 		redirect: e.redirect
 	} : { allow: !0 };
 }
-function E(t, n) {
-	let r = n?.base == null ? T() : w(n.base), i = n?.mode ?? "history", a = i === "hash", c = n?.scrollBehavior, l = /* @__PURE__ */ new Map(), u = !1;
+function O(t, n) {
+	let r = n?.base == null ? ee() : E(n.base), i = n?.mode ?? "history", a = i === "hash", o = n?.scrollBehavior, s = /* @__PURE__ */ new Map(), u = !1;
 	function d(e) {
 		return e ? e.startsWith("/") ? e : "/" + e : "/";
 	}
@@ -152,11 +153,11 @@ function E(t, n) {
 		}
 		return t;
 	}
-	function v(e) {
+	function p(e) {
 		let t = d(e);
 		return r ? (r + t).replace(/\/+/g, "/") || "/" : t;
 	}
-	function y() {
+	function b() {
 		let e = window.location.hash || "";
 		if (e.startsWith("#") && (e = e.slice(1)), !e) return {
 			pathname: "/",
@@ -170,64 +171,64 @@ function E(t, n) {
 		};
 	}
 	function x() {
-		return a ? y() : {
+		return a ? b() : {
 			pathname: f(window.location.pathname || "/"),
 			search: window.location.search || ""
 		};
 	}
-	function S(e, t) {
-		let n = v(e) + _(t);
+	function C(e, t) {
+		let n = p(e) + y(t);
 		return a ? "#" + n : n;
 	}
-	function E(e, t) {
-		return d(e) + _(t);
+	function w(e, t) {
+		return d(e) + y(t);
 	}
-	let D = x(), O = D.pathname, k = g(D.search), A = b(t), j = /* @__PURE__ */ new Map();
-	for (let e of A) e.name && (j.has(e.name) && console.warn(`[Elur Router] Duplicate route name: "${e.name}"`), j.set(e.name, e));
-	let M = C(O, A), N = e(O), P = e(M?.params ?? {}), F = e(k), I = m(history.state) ?? 0, L = e({
+	let O = x(), k = O.pathname, A = v(O.search), j = S(t), M = /* @__PURE__ */ new Map();
+	for (let e of j) e.name && (M.has(e.name) && console.warn(`[Elur Router] Duplicate route name: "${e.name}"`), M.set(e.name, e));
+	let N = T(k, j), P = e(k), F = e(N?.params ?? {}), I = e(A), L = g(history.state) ?? 0, R = e({
 		action: "initial",
 		direction: "none"
-	}), R = e(I > 0);
-	a ? l.set(E(O, k), p()) : history.replaceState(h(history.state, p(), I), "");
-	function z(e) {
+	}), z = e(L > 0);
+	a ? s.set(w(k, A), m()) : history.replaceState(_(history.state, m(), L), "");
+	function B(e) {
 		window.scrollTo(e.left, e.top);
 	}
-	function B(e, t, n) {
-		if (c) {
-			let r = c(e, t, n);
+	function V(e, t, n) {
+		if (o) {
+			let r = o(e, t, n);
 			if (!r) return;
-			z(r);
+			B(r);
 			return;
 		}
-		z(n ?? {
+		B(n ?? {
 			left: 0,
 			top: 0
 		});
 	}
-	function ne(e, t) {
-		let n = p();
+	function te(e, t) {
+		let n = m();
 		if (a) {
-			l.set(E(e, t), n);
+			s.set(w(e, t), n);
 			return;
 		}
-		history.replaceState(h(history.state, n, I), "");
+		history.replaceState(_(history.state, n, L), "");
 	}
-	let V = [], H = [], U = 0;
-	function W(e, t, n, r, i) {
-		let a = [...V];
+	let H = [], U = [], W = 0;
+	function G(e, t, n, r, i) {
+		let a = [...H];
 		n && a.push(n);
-		let o = ++U;
+		let o = ++W;
 		if (a.length === 0) {
 			r();
 			return;
 		}
 		let s = 0;
 		function c(n) {
-			if (o !== U) return;
-			let l = te(n);
+			if (o !== W) return;
+			let l = D(n);
 			if (!l.allow) {
 				if (l.redirect && l.redirect !== e) {
-					Z(l.redirect);
+					Q(l.redirect);
 					return;
 				}
 				if (l.redirect === e) {
@@ -250,9 +251,9 @@ function E(t, n) {
 		}
 		c(void 0);
 	}
-	let G = !1;
-	function K(e, t) {
-		let n = e.indexOf("?"), r = d((n === -1 ? e : e.slice(0, n)) || "/"), i = n === -1 ? {} : g(e.slice(n)), a = t ? {
+	let K = !1;
+	function q(e, t) {
+		let n = e.indexOf("?"), r = d((n === -1 ? e : e.slice(0, n)) || "/"), i = n === -1 ? {} : v(e.slice(n)), a = t ? {
 			...i,
 			...t
 		} : i, o = {};
@@ -262,8 +263,8 @@ function E(t, n) {
 			stringQuery: o
 		};
 	}
-	function re(e) {
-		let t = j.get(e.name);
+	function ne(e) {
+		let t = M.get(e.name);
 		if (!t) throw Error(`[Elur Router] No route with name "${e.name}"`);
 		return "/" + t.segments.map((t) => {
 			if (t.kind === "literal") return t.value;
@@ -273,24 +274,24 @@ function E(t, n) {
 			return encodeURIComponent(String(n));
 		}).filter(Boolean).join("/");
 	}
-	function q(e, t) {
-		return typeof e == "string" ? K(e, t?.query) : K(re(e), {
+	function J(e, t) {
+		return typeof e == "string" ? q(e, t?.query) : q(ne(e), {
 			...e.query ?? {},
 			...t?.query ?? {}
 		});
 	}
-	s &&= (s(), null);
-	let J = (e, t, n, r, i) => {
-		let a = N.value, o = { ...F.value }, s = C(e, A), c = "none";
-		r != null && (r < I ? c = "back" : r > I && (c = "forward")), W(e, a, s?.route.beforeEnter, () => {
-			r != null && (I = r);
-			let i = X;
-			X = void 0, L.value = {
+	l &&= (l(), null);
+	let Y = (e, t, n, r, i) => {
+		let a = P.value, o = { ...I.value }, s = T(e, j), c = "none";
+		r != null && (r < L ? c = "back" : r > L && (c = "forward")), G(e, a, s?.route.beforeEnter, () => {
+			r != null && (L = r);
+			let i = Z;
+			Z = void 0, R.value = {
 				action: "pop",
 				direction: c,
 				animation: i
-			}, P.value = s?.params ?? {}, F.value = t, N.value = e, R.value = I > 0, B(e, a, n);
-			for (let t of H) try {
+			}, F.value = s?.params ?? {}, I.value = t, P.value = e, z.value = L > 0, V(e, a, n);
+			for (let t of U) try {
 				t(e, a);
 			} catch {}
 		}, () => i(a, o));
@@ -301,78 +302,78 @@ function E(t, n) {
 				u = !1;
 				return;
 			}
-			let e = x(), t = g(e.search), n = l.get(E(e.pathname, t)) ?? null;
-			J(e.pathname, t, n, null, (e, t) => {
-				u = !0, window.location.hash = S(e, t).slice(1), queueMicrotask(() => {
+			let e = x(), t = v(e.search), n = s.get(w(e.pathname, t)) ?? null;
+			Y(e.pathname, t, n, null, (e, t) => {
+				u = !0, window.location.hash = C(e, t).slice(1), queueMicrotask(() => {
 					u = !1;
 				});
 			});
 		};
-		window.addEventListener("hashchange", e), s = () => window.removeEventListener("hashchange", e);
+		window.addEventListener("hashchange", e), l = () => window.removeEventListener("hashchange", e);
 	} else {
 		let e = (e) => {
-			let t = x(), n = g(t.search), r = ee(e.state ?? history.state), i = m(e.state ?? history.state);
-			J(t.pathname, n, r, i, (e, t) => {
-				history.pushState(h({}, p(), I), "", S(e, t));
+			let t = x(), n = v(t.search), r = h(e.state ?? history.state), i = g(e.state ?? history.state);
+			Y(t.pathname, n, r, i, (e, t) => {
+				history.pushState(_({}, m(), L), "", C(e, t));
 			});
 		};
-		window.addEventListener("popstate", e), s = () => window.removeEventListener("popstate", e);
+		window.addEventListener("popstate", e), l = () => window.removeEventListener("popstate", e);
 	}
-	function Y(e, t, n, r, i, o, s) {
-		s || (ne(n, r), I += 1), L.value = o, P.value = i?.params ?? {}, F.value = t, N.value = e, R.value = I > 0;
-		let c = S(e, t);
-		if (a) l.set(E(e, t), {
+	function X(e, t, n, r, i, o, c) {
+		c || (te(n, r), L += 1), R.value = o, F.value = i?.params ?? {}, I.value = t, P.value = e, z.value = L > 0;
+		let l = C(e, t);
+		if (a) s.set(w(e, t), {
 			left: 0,
 			top: 0
-		}), s ? history.replaceState(history.state, "", c) : (u = !0, window.location.hash = c.slice(1), queueMicrotask(() => {
+		}), c ? history.replaceState(history.state, "", l) : (u = !0, window.location.hash = l.slice(1), queueMicrotask(() => {
 			u = !1;
 		}));
 		else {
-			let e = h({}, {
+			let e = _({}, {
 				left: 0,
 				top: 0
-			}, I);
-			s ? history.replaceState(e, "", c) : history.pushState(e, "", c);
+			}, L);
+			c ? history.replaceState(e, "", l) : history.pushState(e, "", l);
 		}
-		B(e, n, null);
-		for (let t of H) try {
+		V(e, n, null);
+		for (let t of U) try {
 			t(e, n);
 		} catch {}
 	}
-	let X;
-	function Z(e, t) {
-		G = !0;
-		let { pathname: n, stringQuery: r } = q(e, t), i = N.value, a = { ...F.value }, o = C(n, A), s = {
+	let Z;
+	function Q(e, t) {
+		K = !0;
+		let { pathname: n, stringQuery: r } = J(e, t), i = P.value, a = { ...I.value }, o = T(n, j), s = {
 			action: "push",
 			direction: t?.direction ?? "forward",
 			animation: t?.animation
 		};
-		W(n, i, o?.route.beforeEnter, () => Y(n, r, i, a, o, s, !1));
+		G(n, i, o?.route.beforeEnter, () => X(n, r, i, a, o, s, !1));
 	}
-	function ie(e, t) {
-		G = !0;
-		let { pathname: n, stringQuery: r } = q(e, t), i = N.value, a = { ...F.value }, o = C(n, A), s = {
+	function re(e, t) {
+		K = !0;
+		let { pathname: n, stringQuery: r } = J(e, t), i = P.value, a = { ...I.value }, o = T(n, j), s = {
 			action: "replace",
 			direction: t?.direction ?? "root",
 			animation: t?.animation
 		};
-		W(n, i, o?.route.beforeEnter, () => Y(n, r, i, a, o, s, !0));
+		G(n, i, o?.route.beforeEnter, () => X(n, r, i, a, o, s, !0));
+	}
+	function ie(e) {
+		e !== void 0 && (Z = e), history.back();
 	}
 	function ae(e) {
-		e !== void 0 && (X = e), history.back();
+		e !== void 0 && (Z = e), history.forward();
 	}
 	function oe(e) {
-		e !== void 0 && (X = e), history.forward();
-	}
-	function se(e) {
 		history.go(e);
 	}
-	function Q(e, t = !0) {
-		let n = N.value;
+	function se(e, t = !0) {
+		let n = P.value;
 		return t ? n === e : n === e || n.startsWith(e.endsWith("/") ? e : e + "/");
 	}
 	function ce(e) {
-		let t = C(e, A);
+		let t = T(e, j);
 		return t ? {
 			matched: !0,
 			params: t.params,
@@ -384,64 +385,64 @@ function E(t, n) {
 		};
 	}
 	function le(e) {
-		return V.push(e), () => {
-			let t = V.indexOf(e);
-			t !== -1 && V.splice(t, 1);
-		};
-	}
-	function ue(e) {
 		return H.push(e), () => {
 			let t = H.indexOf(e);
 			t !== -1 && H.splice(t, 1);
 		};
 	}
+	function ue(e) {
+		return U.push(e), () => {
+			let t = U.indexOf(e);
+			t !== -1 && U.splice(t, 1);
+		};
+	}
 	let $ = {
-		current: N,
-		params: P,
-		query: F,
-		intent: L,
-		canGoBack: R,
+		current: P,
+		params: F,
+		query: I,
+		intent: R,
+		canGoBack: z,
 		base: r || "/",
-		navigate: Z,
-		replace: ie,
-		back: ae,
-		forward: oe,
-		go: se,
-		isActive: Q,
+		navigate: Q,
+		replace: re,
+		back: ie,
+		forward: ae,
+		go: oe,
+		isActive: se,
 		resolve: ce,
 		beforeEach: le,
 		afterEach: ue,
 		routes: t,
-		_flat: A,
-		_guards: V,
+		_flat: j,
+		_guards: H,
 		_base: r,
 		_mode: i
 	};
-	return o && console.warn("[elur] A router already exists. The previous router is being replaced. Only one router instance should be active at a time."), o = $, queueMicrotask(() => {
-		G || W(O, "", C(O, A)?.route.beforeEnter, () => {}, () => {
-			let e = S("/", {});
-			a ? (l.set(E("/", {}), {
+	return c && console.warn("[elur] A router already exists. The previous router is being replaced. Only one router instance should be active at a time."), c = $, queueMicrotask(() => {
+		K || G(k, "", T(k, j)?.route.beforeEnter, () => {}, () => {
+			let e = C("/", {});
+			a ? (s.set(w("/", {}), {
 				left: 0,
 				top: 0
-			}), history.replaceState(history.state, "", e)) : history.replaceState(h({}, {
+			}), history.replaceState(history.state, "", e)) : history.replaceState(_({}, {
 				left: 0,
 				top: 0
-			}, I), "", e);
-			let t = C("/", A);
-			L.value = {
+			}, L), "", e);
+			let t = T("/", j);
+			R.value = {
 				action: "replace",
 				direction: "root"
-			}, N.value = "/", P.value = t?.params ?? {}, F.value = {}, R.value = I > 0, B("/", O, null);
+			}, P.value = "/", F.value = t?.params ?? {}, I.value = {}, z.value = L > 0, V("/", k, null);
 		});
 	}), $;
 }
-function D() {
-	return r(a) || d();
+function k() {
+	return n(i) || f();
 }
-function O() {
-	s &&= (s(), null), o = null, c.length = 0;
+function A() {
+	l &&= (l(), null), c = null, s.length = 0;
 }
-var k = class extends t {
+var j = class extends t {
 	_depth;
 	_router;
 	constructor(e = 0, t) {
@@ -449,23 +450,23 @@ var k = class extends t {
 	}
 	render() {
 		let e = this._depth, t = this._router;
-		return i`<div class="router-view">${() => {
-			let n = t ?? D(), r = C(n.current.value, n._flat);
-			if (!r) return i`
+		return r`<div class="router-view">${() => {
+			let n = t ?? k(), i = T(n.current.value, n._flat);
+			if (!i) return r`
                     <div style="color:#f87171;padding:16px 0">
                         404 — Route not found: <strong>${n.current.value}</strong>
                     </div>
                 `;
-			if (e >= r.route.chain.length) return i`
+			if (e >= i.route.chain.length) return r`
                     <span></span>
                 `;
-			let a = r.route.chain[e];
-			return a ? a() : i`
+			let a = i.route.chain[e];
+			return a ? a() : r`
                 <span></span>
             `;
 		}}</div>`;
 	}
-}, A = class extends t {
+}, M = class extends t {
 	_to;
 	_label;
 	_router;
@@ -473,26 +474,18 @@ var k = class extends t {
 		super(), this._to = e, this._label = t, this._router = n;
 	}
 	render() {
-		let e = this._to, t = this._label, n = this._router ?? D(), r = e.startsWith("/") ? e : "/" + e, a = (n._base ? n._base + r : r).replace(/\/+/g, "/");
-		return i`
+		let e = this._to, t = this._label, n = this._router ?? k(), i = e.startsWith("/") ? e : "/" + e, a = (n._base ? n._base + i : i).replace(/\/+/g, "/");
+		return r`
             <a     href=${n._mode === "hash" ? "#" + a : a}     style=${() => n.current.value === e ? "color:#38bdf8;font-weight:700;text-decoration:none;cursor:pointer;padding:4px 10px;border-radius:4px;background:#0c2a3a" : "color:#a3a3a3;text-decoration:none;cursor:pointer;padding:4px 10px;border-radius:4px"}     @click=${(t) => {
 			t.preventDefault(), n.navigate(e);
 		}}>${t}</a>
         `;
 	}
 };
-function j(e) {
-	let t = c.indexOf(e);
-	t >= 0 && c.splice(t, 1), c.push(e);
-}
-function M(e) {
-	let t = c.indexOf(e);
-	t >= 0 && c.splice(t, 1);
-}
 function N() {
-	let e = c.length ? c[c.length - 1] : o;
+	let e = s.length ? s[s.length - 1] : c;
 	if (!e) return null;
-	let t = e, n = t.current.value, r = C(n, t._flat), i = r?.route.beforeEnter, a = t._guards.map((e, t) => e.name || `beforeEach#${t + 1}`);
+	let t = e, n = t.current.value, r = T(n, t._flat), i = r?.route.beforeEnter, a = t._guards.map((e, t) => e.name || `beforeEach#${t + 1}`);
 	return i && a.push(i.name || "beforeEnter"), {
 		mode: t._mode,
 		base: t._base || "/",
@@ -508,6 +501,6 @@ function N() {
 	};
 }
 //#endregion
-export { A as Link, a as RouterKey, k as RouterView, N as _debugGetRouterInternal, j as _debugRegisterRouter, M as _debugUnregisterRouter, f as _hasActiveRouter, O as _resetRouter, E as createRouter, D as elurRouter };
+export { M as Link, i as RouterKey, j as RouterView, N as _debugGetRouterInternal, a as _debugRegisterRouter, o as _debugUnregisterRouter, p as _hasActiveRouter, A as _resetRouter, O as createRouter, k as elurRouter };
 
 //# sourceMappingURL=router.js.map