@manyducks.co/dolla 3.1.0 → 3.3.0

package/dist/router.js

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