@manyducks.co/dolla 3.2.0 → 4.0.0

package/dist/router.js

@@ -1,4 +1,4 @@
-import { D as e, E as t, F as n, I as r, L as i, N as a, O as o, P as s, R as c, S as l, T as u, _ as d, b as f, c as p, f as m, g as h, h as g, j as _, p as v, w as y, x as b, y as x, z as S } from "./core-2CFW0uRa.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-CHBZF6Mb.js";
 //#region src/router/utils.ts
 function C(e) {
 	return e.split("/").map((e) => e.trim()).filter(Boolean);
@@ -17,12 +17,12 @@ function T(e, t = null) {
 function E(e) {
 	return Object.fromEntries(new URLSearchParams(e));
 }
-function D(e, t, r) {
-	let i = {};
-	if (r === !0) Object.assign(i, e);
-	else if (n(r)) for (let t of r) t in e && (i[t] = e[t]);
-	for (let [e, n] of Object.entries(t)) n === null ? delete i[e] : i[e] = n;
-	return new URLSearchParams(i);
+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]);
+	for (let [e, n] of Object.entries(t)) n === null ? delete r[e] : r[e] = n;
+	return new URLSearchParams(r);
 }
 var O = class {
 	staticChildren = /* @__PURE__ */ new Map();
@@ -33,68 +33,68 @@ var O = class {
 	paramName;
 	numericName;
 };
-function k(e) {
-	let t = new O(), n = [];
-	function a(e, n) {
-		let r = C(e), i = t;
+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 = i.staticChildren.get(t);
 			n || i.staticChildren.set(t, n = new O()), i = n;
 		}
-		i.route = n;
+		i.route = t;
 	}
-	function o(e, t = [], l = []) {
-		s(i(e) && c(e.path), "Invalid route object");
-		let u = t.map((e) => e.path), d = t.at(-1), f = d && e.meta ? {
+	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,
-			...e.meta
-		} : e.meta || {}, p = u.length ? w([...u, e.path]) : e.path, m = N(p);
-		if (e.redirect) {
-			s(!e.routes && !e.view, "Route cannot mix redirect with view/routes");
-			let t = e.redirect;
-			c(t) && (t = T(w(u), t), t.startsWith("/") || (t = "/" + t));
-			for (let e of m) {
-				let r = {
-					pattern: e,
+			...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: t
+					redirect: e
 				};
-				a(e, r), c(t) && n.push(r);
+				o(t, n), S(e) && i.push(n);
 			}
 			return;
 		}
-		s(e.view || e.routes, "Route must have view, redirect, or routes");
-		let h = e.view || ((e) => e.children);
-		if (!r(h) && !h._lazy) throw TypeError(`Expected view function for ${e.path}`);
-		if (e.routes) {
-			let n = {
-				id: S(),
+		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: e.preload,
-				errorView: e.errorView
+				preload: t.preload,
+				errorView: t.errorView
 			};
-			for (let r of e.routes) o(r, [...t, e], [...l, n]);
-		} else for (let t of m) {
-			let n = {
-				id: S(),
-				pattern: t,
+			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: e.preload,
-				errorView: e.errorView
+				preload: t.preload,
+				errorView: t.errorView
 			};
-			a(t, {
-				pattern: t,
+			o(n, {
+				pattern: n,
 				meta: f,
-				layers: [...l, n]
+				layers: [...c, r]
 			});
 		}
 	}
-	for (let t of e) o(t);
-	for (let e of n) s(A(t, e.redirect, { willMatch: (t) => t !== e }), `Dead redirect: ${e.pattern} -> ${e.redirect}`);
-	return t;
+	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 A(e, t, n = {}) {
 	let [r, i] = t.split("?"), a = C(r), o = {};
@@ -152,23 +152,23 @@ function A(e, t, n = {}) {
 	return s(e, 0);
 }
 async function j(e, t, n = []) {
-	let r = A(e, t);
-	if (!r) return { journey: [...n, {
+	let i = A(e, t);
+	if (!i) return { journey: [...n, {
 		kind: "miss",
 		message: `no match for '${t}'`
 	}] };
-	if (r.redirect != null) {
-		let t = r.redirect;
-		return c(t) ? t = P(t, r.params) : (t = await t(r), s(c(t), "Redirect function must return a path."), t.startsWith("/") || (t = T(r.path, t))), j(e, t, [...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, {
 			kind: "redirect",
-			message: `redirecting '${r.path}' -> '${t}'`
+			message: `redirecting '${i.path}' -> '${t}'`
 		}]);
 	}
 	return {
-		match: r,
+		match: i,
 		journey: [...n, {
 			kind: "match",
-			message: `matched route '${r.path}'`
+			message: `matched route '${i.path}'`
 		}]
 	};
 }
@@ -200,75 +200,75 @@ function P(e, t) {
 	}
 	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(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, r = 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, i = () => window.history.state?.key || "root";
+	} : () => window.location.search, a = () => window.history.state?.key || "root";
 	return {
-		getPath: n,
-		getSearch: r,
-		getKey: i,
+		getPath: r,
+		getSearch: i,
+		getKey: a,
 		getIndex: () => window.history.state?.index || 0,
-		push: (n) => {
-			t++;
-			let r = e ? "/#" : "";
+		push: (r) => {
+			n++;
+			let i = t ? "/#" : "";
 			window.history.pushState({
-				key: S(),
-				index: t
-			}, "", r + n);
+				key: e(),
+				index: n
+			}, "", i + r);
 		},
-		replace: (n) => {
-			let r = e ? "/#" : "";
+		replace: (e) => {
+			let r = t ? "/#" : "";
 			window.history.replaceState({
-				key: i(),
-				index: t
-			}, "", r + n);
+				key: a(),
+				index: n
+			}, "", r + e);
 		}
 	};
 }
 //#endregion
 //#region src/router/store.ts
-function I({ 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 = p(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)" : ""}`);
+		l.info(`🗺️ navigating to '${e}'${t ? " (replace)" : ""}`);
 		let n = T(i.getPath(), e);
-		t ? i.replace(n) : i.push(n), o();
+		t ? i.replace(n) : i.push(n), a();
 	}
 	return {
-		path: e(() => t().path),
-		pattern: e(() => t().pattern),
-		params: e(() => t().params),
-		query: e(() => t().query),
-		meta: e(() => 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(e) {
-			let r = _(t), a = D(r.query, e, !0), o = Object.fromEntries(a);
+		setQuery(t) {
+			let r = o(e), a = D(r.query, t, !0), s = Object.fromEntries(a);
 			n({
 				...r,
-				query: o
+				query: s
 			});
-			let s = a.size ? "?" + a.toString() : "";
-			return i.replace(r.path + s), o;
+			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(n, r = !1) {
-			return e(() => {
-				let e = a(n), i = e === "/" ? "/" : e.replace(/\/$/, ""), o = i === "/" ? "/" : i + "/", s = t().path, c = s === "/" ? "/" : s.replace(/\/$/, "");
-				return r ? c === i : c === i || c.startsWith(o);
+			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);
 			});
 		}
 	};
@@ -283,40 +283,40 @@ function R(e) {
 	};
 }
 function z(e) {
-	return function(n) {
+	return function(t) {
 		"scrollRestoration" in window.history && (window.history.scrollRestoration = "manual");
-		let r = F(!!e.hash), i = /* @__PURE__ */ new Map(), a = r.getKey(), [s, c] = o({
+		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: {}
-		}), [h, S] = o(0), C = k(e.routes), w = /* @__PURE__ */ new Set(), T = v(n);
+		}), [g, S] = s(0), C = k(e.routes), w = /* @__PURE__ */ new Set(), T = v(t);
 		T.name = "dolla:router";
-		let E = p(T), [O, A] = o();
-		n[L] = O;
+		let E = m(T), [O, A] = s();
+		t[L] = O;
 		let N = {
-			context: n,
+			context: t,
 			slot: O,
 			setSlot: A
 		}, R = [];
-		async function z(d) {
+		async function z(f) {
 			i.set(a, window.scrollY);
-			let p = d ?? r.getPath(), { match: m, journey: h } = await j(C, p);
-			if (n[y]) for (let e = 0; e < h.length; e++) {
-				let t = h[e], n = `(update ${e + 1}/${h.length})`;
+			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" ? 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: g, params: v } = m, b = [], x = 0;
-			for (let e = 0; e < g.length; e++) {
-				let t = `${g[e].id}:${P(g[e].pattern, v)}`;
+			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++;
 			}
 			let w = [], T = [];
-			for (let e = x; e < g.length; e++) {
-				let t = g[e];
-				t.preload && w.push(Promise.resolve(t.preload(m)).then((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 n = t.view;
@@ -336,23 +336,23 @@ function z(e) {
 					O = e instanceof Error ? e : Error(String(e)), k = x;
 				}
 			}
-			let A = D(_(s).query, m.query, e.preserveQuery), M = A.toString(), F = m.path + (M ? `?${M}` : "");
-			F !== r.getPath() + r.getSearch() && r.replace(F), t(() => {
-				if (c({
-					...m,
+			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({
+					...h,
 					query: Object.fromEntries(A)
-				}), !(x === g.length && R.length === g.length)) {
+				}), !(x === _.length && R.length === _.length)) {
 					R[x] && (R[x].node.unmount(), R.length = x);
-					for (let e = x; e < g.length; e++) {
-						let t = g[e], n = R[e - 1] ?? N, [r, i] = o(), a = t.view, s = {
+					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: l(u, { args: [r] })
+							children: u(d, { args: [r] })
 						};
 						if (O && e === k) {
 							if (!t.errorView) throw O;
-							a = t.errorView, s = { error: O };
+							a = t.errorView, o = { error: O };
 						}
-						let c = new f(n.context, a, s);
+						let c = new p(n.context, a, o);
 						if (n.setSlot(c), R.push({
 							id: t.id,
 							key: b[e],
@@ -367,40 +367,40 @@ function z(e) {
 				window.scrollTo(0, i.get(r.getKey()) ?? 0), a = r.getKey();
 			});
 		}
-		let B = m(n, I, {
-			currentMatch: s,
-			setCurrentMatch: c,
-			progress: h,
+		let B = h(t, I, {
+			currentMatch: c,
+			setCurrentMatch: l,
+			progress: g,
 			history: r,
 			updateRoute: z,
 			guards: w
 		});
-		x(n, () => {
-			let e = !1, t = !1, i = r.getIndex(), a = b(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();
+				i = t, z();
 			}), o = b(window, "beforeunload", (e) => {
 				w.size > 0 && (e.preventDefault(), e.returnValue = "");
-			}), s = M(g(n), B.push);
-			d(n, () => {
+			}), s = M(_(t), B.push);
+			f(t, () => {
 				a(), o(), s();
 			}), z();
 		});
@@ -409,7 +409,7 @@ function z(e) {
 function B() {
 	this.name = "dolla:router";
 	let e = this[L];
-	return s(e != null, "Router plugin not found on root."), new u(this, e);
+	return r(e != null, "Router plugin not found on root."), new d(this, e);
 }
 var V = class extends Error {
 	constructor(e) {
@@ -419,9 +419,9 @@ var V = class extends Error {
 //#endregion
 //#region src/router/index.ts
 function H(e) {
-	return h(e, I);
+	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, H as getRouter, R as lazy };
 
 //# sourceMappingURL=router.js.map