@manyducks.co/dolla 3.3.0 → 4.1.0

package/dist/router.js

@@ -1,9 +1,9 @@
-import { B as e, D as t, E as n, F as r, I as i, L as a, M as o, O as s, P as c, R as l, S as u, T as d, _ as f, b as p, c as m, f as h, g, h as _, p as v, w as y, x as b, y as x, z as S } from "./core-BRSu5hVw.js";
+import { B as e, C as t, D as n, E as r, F as i, I as a, L as o, N as s, O as c, R as l, S as u, T as d, V as f, _ as p, b as m, c as h, h as g, k as _, p as v, s as y, y as b, z as x } from "./core-C4DWUGxz.js";
 //#region src/router/utils.ts
-function C(e) {
+function S(e) {
 	return e.split("/").map((e) => e.trim()).filter(Boolean);
 }
-function w(e) {
+function C(e) {
 	let t = e.map((e) => e.toString()).filter(Boolean).join("/");
 	if (!t) return "";
 	let n = t.startsWith("/"), r = t.split("/"), i = [];
@@ -11,20 +11,20 @@ function w(e) {
 	let a = i.join("/");
 	return n && (a = "/" + a), a || (n ? "/" : "");
 }
-function T(e, t = null) {
-	return t ?? (t = e, e = ""), t.startsWith("/") ? w([t]) : w([e, t]);
+function w(e, t = null) {
+	return t ?? (t = e, e = ""), t.startsWith("/") ? C([t]) : C([e, t]);
 }
-function E(e) {
+function T(e) {
 	return Object.fromEntries(new URLSearchParams(e));
 }
-function D(e, t, n) {
+function E(e, t, n) {
 	let r = {};
 	if (n === !0) Object.assign(r, e);
-	else if (i(n)) for (let t of n) t in e && (r[t] = e[t]);
+	else if (o(n)) for (let t of n) t in e && (r[t] = e[t]);
 	for (let [e, n] of Object.entries(t)) n === null ? delete r[e] : r[e] = n;
 	return new URLSearchParams(r);
 }
-var O = class {
+var D = class {
 	staticChildren = /* @__PURE__ */ new Map();
 	numericChild = null;
 	paramChild = null;
@@ -33,77 +33,77 @@ var O = class {
 	paramName;
 	numericName;
 };
-function k(t) {
-	let n = new O(), i = [];
-	function o(e, t) {
-		let r = C(e), i = n;
-		for (let e of r) if (e === "*") i = i.wildcardChild ??= new O();
-		else if (e.charCodeAt(0) === 123) e.charCodeAt(1) === 35 ? (i = i.numericChild ??= new O(), i.numericName = e.slice(2, -1)) : (i = i.paramChild ??= new O(), i.paramName = e.slice(1, -1));
+function O(t) {
+	let n = new D(), r = [];
+	function i(e, t) {
+		let r = S(e), i = n;
+		for (let e of r) if (e === "*") i = i.wildcardChild ??= new D();
+		else if (e.charCodeAt(0) === 123) e.charCodeAt(1) === 35 ? (i = i.numericChild ??= new D(), i.numericName = e.slice(2, -1)) : (i = i.paramChild ??= new D(), i.paramName = e.slice(1, -1));
 		else {
 			let t = e.toLowerCase(), n = i.staticChildren.get(t);
-			n || i.staticChildren.set(t, n = new O()), i = n;
+			n || i.staticChildren.set(t, n = new D()), i = n;
 		}
 		i.route = t;
 	}
-	function s(t, n = [], c = []) {
-		r(l(t) && S(t.path), "Invalid route object");
-		let u = n.map((e) => e.path), d = n.at(-1), f = d && t.meta ? {
-			...d.meta,
+	function o(t, n = [], s = []) {
+		a(x(t) && e(t.path), "Invalid route object");
+		let c = n.map((e) => e.path), u = n.at(-1), d = u && t.meta ? {
+			...u.meta,
 			...t.meta
-		} : t.meta || {}, p = u.length ? w([...u, t.path]) : t.path, m = N(p);
+		} : t.meta || {}, p = c.length ? C([...c, t.path]) : t.path, m = M(p);
 		if (t.redirect) {
-			r(!t.routes && !t.view, "Route cannot mix redirect with view/routes");
-			let e = t.redirect;
-			S(e) && (e = T(w(u), e), e.startsWith("/") || (e = "/" + e));
+			a(!t.routes && !t.view, "Route cannot mix redirect with view/routes");
+			let n = t.redirect;
+			e(n) && (n = w(C(c), n), n.startsWith("/") || (n = "/" + n));
 			for (let t of m) {
-				let n = {
+				let a = {
 					pattern: t,
-					meta: f,
-					redirect: e
+					meta: d,
+					redirect: n
 				};
-				o(t, n), S(e) && i.push(n);
+				i(t, a), e(n) && r.push(a);
 			}
 			return;
 		}
-		r(t.view || t.routes, "Route must have view, redirect, or routes");
+		a(t.view || t.routes, "Route must have view, redirect, or routes");
 		let h = t.view || ((e) => e.children);
-		if (!a(h) && !h._lazy) throw TypeError(`Expected view function for ${t.path}`);
+		if (!l(h) && !h._lazy) throw TypeError(`Expected view function for ${t.path}`);
 		if (t.routes) {
-			let r = {
-				id: e(),
+			let e = {
+				id: f(),
 				pattern: p,
 				view: h,
 				preload: t.preload,
 				errorView: t.errorView
 			};
-			for (let e of t.routes) s(e, [...n, t], [...c, r]);
-		} else for (let n of m) {
-			let r = {
-				id: e(),
-				pattern: n,
+			for (let r of t.routes) o(r, [...n, t], [...s, e]);
+		} else for (let e of m) {
+			let n = {
+				id: f(),
+				pattern: e,
 				view: h,
 				preload: t.preload,
 				errorView: t.errorView
 			};
-			o(n, {
-				pattern: n,
-				meta: f,
-				layers: [...c, r]
+			i(e, {
+				pattern: e,
+				meta: d,
+				layers: [...s, n]
 			});
 		}
 	}
-	for (let e of t) s(e);
-	for (let e of i) r(A(n, e.redirect, { willMatch: (t) => t !== e }), `Dead redirect: ${e.pattern} -> ${e.redirect}`);
+	for (let e of t) o(e);
+	for (let e of r) a(k(n, e.redirect, { willMatch: (t) => t !== e }), `Dead redirect: ${e.pattern} -> ${e.redirect}`);
 	return n;
 }
-function A(e, t, n = {}) {
-	let [r, i] = t.split("?"), a = C(r), o = {};
+function k(e, t, n = {}) {
+	let [r, i] = t.split("?"), a = S(r), o = {};
 	function s(e, t) {
 		if (t === a.length) return e.route && (!n.willMatch || n.willMatch(e.route)) ? {
 			path: r || "/",
 			pattern: e.route.pattern,
 			params: { ...o },
-			query: E(i || ""),
+			query: T(i || ""),
 			meta: e.route.meta,
 			layers: e.route.layers ?? [],
 			redirect: e.route.redirect
@@ -114,7 +114,7 @@ function A(e, t, n = {}) {
 				...o,
 				wildcard: "/"
 			},
-			query: E(i || ""),
+			query: T(i || ""),
 			meta: e.wildcardChild.route.meta,
 			layers: e.wildcardChild.route.layers ?? [],
 			redirect: e.wildcardChild.route.redirect
@@ -143,7 +143,7 @@ function A(e, t, n = {}) {
 				...o,
 				wildcard: "/" + a.slice(t).map(decodeURIComponent).join("/")
 			},
-			query: E(i || ""),
+			query: T(i || ""),
 			meta: e.wildcardChild.route.meta,
 			layers: e.wildcardChild.route.layers ?? [],
 			redirect: e.wildcardChild.route.redirect
@@ -151,28 +151,28 @@ function A(e, t, n = {}) {
 	}
 	return s(e, 0);
 }
-async function j(e, t, n = []) {
-	let i = A(e, t);
-	if (!i) return { journey: [...n, {
+async function A(t, n, r = []) {
+	let i = k(t, n);
+	if (!i) return { journey: [...r, {
 		kind: "miss",
-		message: `no match for '${t}'`
+		message: `no match for '${n}'`
 	}] };
 	if (i.redirect != null) {
-		let t = i.redirect;
-		return S(t) ? t = P(t, i.params) : (t = await t(i), r(S(t), "Redirect function must return a path."), t.startsWith("/") || (t = T(i.path, t))), j(e, t, [...n, {
+		let n = i.redirect;
+		return e(n) ? n = N(n, i.params) : (n = await n(i), a(e(n), "Redirect function must return a path."), n.startsWith("/") || (n = w(i.path, n))), A(t, n, [...r, {
 			kind: "redirect",
-			message: `redirecting '${i.path}' -> '${t}'`
+			message: `redirecting '${i.path}' -> '${n}'`
 		}]);
 	}
 	return {
 		match: i,
-		journey: [...n, {
+		journey: [...r, {
 			kind: "match",
 			message: `matched route '${i.path}'`
 		}]
 	};
 }
-function M(e, t, n = window) {
+function j(e, t, n = window) {
 	function r(r) {
 		if (r.button && r.button !== 0 || r.ctrlKey || r.metaKey || r.altKey || r.shiftKey || r.defaultPrevented) return;
 		let i = r.target.closest("a");
@@ -182,8 +182,8 @@ function M(e, t, n = window) {
 	}
 	return e.addEventListener("click", r), () => e.removeEventListener("click", r);
 }
-function N(e) {
-	let t = C(e), n = [[]];
+function M(e) {
+	let t = S(e), n = [[]];
 	for (let e of t) {
 		let t = e.endsWith("?}"), r = t ? e.replace("?", "") : e;
 		if (t) {
@@ -193,89 +193,85 @@ function N(e) {
 	}
 	return n.map((e) => "/" + e.join("/")).map((e) => e === "/" ? e : e.replace(/\/$/, ""));
 }
-function P(e, t) {
+function N(e, t) {
 	for (let n in t) {
 		let r = String(t[n]);
 		e = e.replace(`{${n}}`, r).replace(`{#${n}}`, r).replace(`{${n}?}`, r).replace(`{#${n}?}`, r);
 	}
 	return e = e.replace(/\{#?[a-zA-Z0-9_]+\?\}/g, ""), e = e.replace(/\/+/g, "/"), e.length > 1 && e.endsWith("/") && (e = e.slice(0, -1)), e;
 }
-function F(t) {
-	let n = window.history.state?.index || 0;
+function P(e) {
+	let t = window.history.state?.index || 0;
 	window.history.state?.index === void 0 && window.history.replaceState({
 		...window.history.state,
 		key: Date.now().toString(),
-		index: n
+		index: t
 	}, "");
-	let r = t ? () => window.location.hash.slice(1).split("?")[0] || "/" : () => window.location.pathname, i = t ? () => {
+	let n = e ? () => window.location.hash.slice(1).split("?")[0] || "/" : () => window.location.pathname, r = e ? () => {
 		let e = window.location.hash, t = e.indexOf("?");
 		return t === -1 ? "" : e.slice(t);
-	} : () => window.location.search, a = () => window.history.state?.key || "root";
+	} : () => window.location.search, i = () => window.history.state?.key || "root";
 	return {
-		getPath: r,
-		getSearch: i,
-		getKey: a,
+		getPath: n,
+		getSearch: r,
+		getKey: i,
 		getIndex: () => window.history.state?.index || 0,
-		push: (r) => {
-			n++;
-			let i = t ? "/#" : "";
+		push: (n) => {
+			t++;
+			let r = e ? "/#" : "";
 			window.history.pushState({
-				key: e(),
-				index: n
-			}, "", i + r);
+				key: f(),
+				index: t
+			}, "", r + n);
 		},
-		replace: (e) => {
-			let r = t ? "/#" : "";
+		replace: (n) => {
+			let r = e ? "/#" : "";
 			window.history.replaceState({
-				key: a(),
-				index: n
-			}, "", r + e);
+				key: i(),
+				index: t
+			}, "", r + n);
 		}
 	};
 }
 //#endregion
 //#region src/router/store.ts
-function I({ currentMatch: e, setCurrentMatch: n, progress: r, history: i, updateRoute: a, guards: s }) {
-	this.name = "dolla:router";
-	let l = m(this);
-	async function u(e, t) {
-		for (let e of s) if (await e()) return;
-		l.info(`🗺️ navigating to '${e}'${t ? " (replace)" : ""}`);
-		let n = T(i.getPath(), e);
-		t ? i.replace(n) : i.push(n), a();
+var [F, I] = v("dolla:router", (e, t) => {
+	let n = h(e), { currentMatch: r, setCurrentMatch: a, progress: o, history: l, updateRoute: u, guards: d } = t;
+	async function f(e, t) {
+		for (let e of d) if (await e()) return;
+		n.info(`🗺️ navigating to '${e}'${t ? " (replace)" : ""}`);
+		let r = w(l.getPath(), e);
+		t ? l.replace(r) : l.push(r), u();
 	}
 	return {
-		path: t(() => e().path),
-		pattern: t(() => e().pattern),
-		params: t(() => e().params),
-		query: t(() => e().query),
-		meta: t(() => e().meta),
-		progress: r,
-		setQuery(t) {
-			let r = o(e), a = D(r.query, t, !0), s = Object.fromEntries(a);
-			n({
-				...r,
-				query: s
+		path: c(() => r().path),
+		pattern: c(() => r().pattern),
+		params: c(() => r().params),
+		query: c(() => r().query),
+		meta: c(() => r().meta),
+		progress: o,
+		setQuery(e) {
+			let t = s(r), n = E(t.query, e, !0), i = Object.fromEntries(n);
+			a({
+				...t,
+				query: i
 			});
-			let c = a.size ? "?" + a.toString() : "";
-			return i.replace(r.path + c), s;
+			let o = n.size ? "?" + n.toString() : "";
+			return l.replace(t.path + o), i;
 		},
 		back: (e = 1) => window.history.go(-e),
 		forward: (e = 1) => window.history.go(e),
-		push: (e) => u(e, !1),
-		replace: (e) => u(e, !0),
-		block: (e) => (s.add(e), () => s.delete(e)),
-		isActive(n, r = !1) {
-			return t(() => {
-				let t = c(n), i = t === "/" ? "/" : t.replace(/\/$/, ""), a = i === "/" ? "/" : i + "/", o = e().path, s = o === "/" ? "/" : o.replace(/\/$/, "");
-				return r ? s === i : s === i || s.startsWith(a);
+		push: (e) => f(e, !1),
+		replace: (e) => f(e, !0),
+		block: (e) => (d.add(e), () => d.delete(e)),
+		isActive(e, t = !1) {
+			return c(() => {
+				let n = i(e), a = n === "/" ? "/" : n.replace(/\/$/, ""), o = a === "/" ? "/" : a + "/", s = r().path, c = s === "/" ? "/" : s.replace(/\/$/, "");
+				return t ? c === a : c === a || c.startsWith(o);
 			});
 		}
 	};
-}
-//#endregion
-//#region src/router/router.ts
-var L = Symbol();
+}), L = Symbol.for("$_ROUTER_ROOT_SLOT");
 function R(e) {
 	return {
 		_lazy: !0,
@@ -283,133 +279,131 @@ function R(e) {
 	};
 }
 function z(e) {
-	return function(t) {
+	return function(i) {
 		"scrollRestoration" in window.history && (window.history.scrollRestoration = "manual");
-		let r = F(!!e.hash), i = /* @__PURE__ */ new Map(), a = r.getKey(), [c, l] = s({
-			path: r.getPath(),
+		let a = P(!!e.hash), o = /* @__PURE__ */ new Map(), c = a.getKey(), [l, f] = _({
+			path: a.getPath(),
 			pattern: "",
 			params: {},
-			query: Object.fromEntries(new URLSearchParams(r.getSearch())),
+			query: Object.fromEntries(new URLSearchParams(a.getSearch())),
 			meta: {}
-		}), [g, S] = s(0), C = k(e.routes), w = /* @__PURE__ */ new Set(), T = v(t);
-		T.name = "dolla:router";
-		let E = m(T), [O, A] = s();
-		t[L] = O;
-		let N = {
-			context: t,
-			slot: O,
-			setSlot: A
-		}, R = [];
-		async function z(f) {
-			i.set(a, window.scrollY);
-			let m = f ?? r.getPath(), { match: h, journey: g } = await j(C, m);
-			if (t[y]) for (let e = 0; e < g.length; e++) {
+		}), [h, v] = _(0), x = O(e.routes), S = /* @__PURE__ */ new Set(), C = y("dolla:router"), [w, T] = _();
+		i[L] = w;
+		let D = {
+			context: i,
+			slot: w,
+			setSlot: T
+		}, k = [];
+		async function M(u) {
+			o.set(c, window.scrollY);
+			let p = u ?? a.getPath(), { match: h, journey: g } = await A(x, p);
+			if (i[d]) for (let e = 0; e < g.length; e++) {
 				let t = g[e], n = `(update ${e + 1}/${g.length})`;
-				t.kind === "match" ? E.info(`📍 ${n} ${t.message}`) : t.kind === "redirect" ? E.info(`↩️ ${n} ${t.message}`) : E.info(`💀 ${n} ${t.message}`);
+				t.kind === "match" ? C.info(`📍 ${n} ${t.message}`) : t.kind === "redirect" ? C.info(`↩️ ${n} ${t.message}`) : C.info(`💀 ${n} ${t.message}`);
 			}
-			if (!h) throw Error(`Failed to match route '${m}'`);
-			let { layers: _, params: v } = h, b = [], x = 0;
-			for (let e = 0; e < _.length; e++) {
-				let t = `${_[e].id}:${P(_[e].pattern, v)}`;
-				b.push(t), x === e && R[e]?.key === t && x++;
+			if (!h) throw Error(`Failed to match route '${p}'`);
+			let { layers: y, params: b } = h, S = [], w = 0;
+			for (let e = 0; e < y.length; e++) {
+				let t = `${y[e].id}:${N(y[e].pattern, b)}`;
+				S.push(t), w === e && k[e]?.key === t && w++;
 			}
-			let w = [], T = [];
-			for (let e = x; e < _.length; e++) {
-				let t = _[e];
-				t.preload && w.push(Promise.resolve(t.preload(h)).then((t) => {
-					T[e - x] = t;
+			let T = [], O = [];
+			for (let e = w; e < y.length; e++) {
+				let t = y[e];
+				t.preload && T.push(Promise.resolve(t.preload(h)).then((t) => {
+					O[e - w] = t;
 				}));
 				let n = t.view;
-				n._lazy && w.push(n.load().then((e) => {
+				n._lazy && T.push(n.load().then((e) => {
 					t.view = e.default ?? e;
 				}));
 			}
-			let O = null, k = -1;
-			if (w.length > 0) {
-				S(.1);
-				let e = 0, t = .8 / w.length;
-				w.forEach((n) => n.then(() => S(.1 + ++e * t)).catch(() => {}));
+			let j = null, M = -1;
+			if (T.length > 0) {
+				v(.1);
+				let e = 0, t = .8 / T.length;
+				T.forEach((n) => n.then(() => v(.1 + ++e * t)).catch(() => {}));
 				try {
-					await Promise.all(w);
+					await Promise.all(T);
 				} catch (e) {
-					if (S(0), e instanceof V) return B.replace(e.redirectPath);
-					O = e instanceof Error ? e : Error(String(e)), k = x;
+					if (v(0), e instanceof V) return I.replace(e.redirectPath);
+					j = e instanceof Error ? e : Error(String(e)), M = w;
 				}
 			}
-			let A = D(o(c).query, h.query, e.preserveQuery), M = A.toString(), F = h.path + (M ? `?${M}` : "");
-			F !== r.getPath() + r.getSearch() && r.replace(F), n(() => {
-				if (l({
+			let P = E(s(l).query, h.query, e.preserveQuery), F = P.toString(), L = h.path + (F ? `?${F}` : "");
+			L !== a.getPath() + a.getSearch() && a.replace(L), n(() => {
+				if (f({
 					...h,
-					query: Object.fromEntries(A)
-				}), !(x === _.length && R.length === _.length)) {
-					R[x] && (R[x].node.unmount(), R.length = x);
-					for (let e = x; e < _.length; e++) {
-						let t = _[e], n = R[e - 1] ?? N, [r, i] = s(), a = t.view, o = {
-							data: T[e - x],
-							children: u(d, { args: [r] })
+					query: Object.fromEntries(P)
+				}), !(w === y.length && k.length === y.length)) {
+					k[w] && (k[w].node.unmount(), k.length = w);
+					for (let e = w; e < y.length; e++) {
+						let n = y[e], i = k[e - 1] ?? D, [a, o] = _(), s = n.view, c = {
+							data: O[e - w],
+							children: t(r, { args: [a] })
 						};
-						if (O && e === k) {
-							if (!t.errorView) throw O;
-							a = t.errorView, o = { error: O };
+						if (j && e === M) {
+							if (!n.errorView) throw j;
+							s = n.errorView, c = { error: j };
 						}
-						let c = new p(n.context, a, o);
-						if (n.setSlot(c), R.push({
-							id: t.id,
-							key: b[e],
-							node: c,
-							context: c.context,
-							slot: r,
-							setSlot: i
-						}), O && e === k) break;
+						let l = new m(i.context, s, c);
+						if (i.setSlot(l), k.push({
+							id: n.id,
+							key: S[e],
+							node: l,
+							context: l.context,
+							slot: a,
+							setSlot: o
+						}), j && e === M) break;
 					}
 				}
-			}), S(0), requestAnimationFrame(() => {
-				window.scrollTo(0, i.get(r.getKey()) ?? 0), a = r.getKey();
+			}), v(0), requestAnimationFrame(() => {
+				window.scrollTo(0, o.get(a.getKey()) ?? 0), c = a.getKey();
 			});
 		}
-		let B = h(t, I, {
-			currentMatch: c,
-			setCurrentMatch: l,
-			progress: g,
-			history: r,
-			updateRoute: z,
-			guards: w
+		let I = F(i, {
+			currentMatch: l,
+			setCurrentMatch: f,
+			progress: h,
+			history: a,
+			updateRoute: M,
+			guards: S
 		});
-		x(t, () => {
-			let e = !1, n = !1, i = r.getIndex(), a = b(window, "popstate", async () => {
+		b(i, () => {
+			let e = !1, t = !1, n = a.getIndex(), r = u(window, "popstate", async () => {
 				if (e) {
 					e = !1;
 					return;
 				}
-				if (n) {
-					n = !1, i = r.getIndex(), z();
+				if (t) {
+					t = !1, n = a.getIndex(), M();
 					return;
 				}
-				let t = r.getIndex(), a = i - t;
-				if (w.size > 0) {
-					e = !0, window.history.go(a);
-					let t = !1;
-					for (let e of w) if (await e()) {
-						t = !0;
+				let r = a.getIndex(), i = n - r;
+				if (S.size > 0) {
+					e = !0, window.history.go(i);
+					let n = !1;
+					for (let e of S) if (await e()) {
+						n = !0;
 						break;
 					}
-					t || (n = !0, window.history.go(-a));
+					n || (t = !0, window.history.go(-i));
 					return;
 				}
-				i = t, z();
-			}), o = b(window, "beforeunload", (e) => {
-				w.size > 0 && (e.preventDefault(), e.returnValue = "");
-			}), s = M(_(t), B.push);
-			f(t, () => {
-				a(), o(), s();
-			}), z();
+				n = r, M();
+			}), o = u(window, "beforeunload", (e) => {
+				S.size > 0 && (e.preventDefault(), e.returnValue = "");
+			}), s = j(g(i), I.push);
+			p(i, () => {
+				r(), o(), s();
+			}), M();
 		});
 	};
 }
 function B() {
 	this.name = "dolla:router";
 	let e = this[L];
-	return r(e != null, "Router plugin not found on root."), new d(this, e);
+	return a(e != null, "Router plugin not found on root."), new r(this, e);
 }
 var V = class extends Error {
 	constructor(e) {
@@ -417,11 +411,6 @@ var V = class extends Error {
 	}
 };
 //#endregion
-//#region src/router/index.ts
-function H(e) {
-	return g(e, I);
-}
-//#endregion
-export { B as Outlet, V as RedirectError, z as createRouterPlugin, H as getRouter, R as lazy };
+export { B as Outlet, V as RedirectError, z as createRouter, I as getRouter, R as lazy };
 
 //# sourceMappingURL=router.js.map