@manyducks.co/dolla 2.0.0-alpha.46 → 2.0.0-alpha.47

package/dist/index.js

@@ -1,54 +1,45 @@
-var zt = Object.defineProperty;
-var $t = (a) => {
-  throw TypeError(a);
+var Qt = Object.defineProperty;
+var St = (i) => {
+  throw TypeError(i);
 };
-var Bt = (a, t, e) => t in a ? zt(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
-var w = (a, t, e) => Bt(a, typeof t != "symbol" ? t + "" : t, e), wt = (a, t, e) => t.has(a) || $t("Cannot " + e);
-var i = (a, t, e) => (wt(a, t, "read from private field"), e ? e.call(a) : t.get(a)), u = (a, t, e) => t.has(a) ? $t("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(a) : t.set(a, e), d = (a, t, e, s) => (wt(a, t, "write to private field"), s ? s.call(a, e) : t.set(a, e), e), f = (a, t, e) => (wt(a, t, "access private method"), e);
-var _t = (a, t, e, s) => ({
+var zt = (i, t, e) => t in i ? Qt(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var g = (i, t, e) => zt(i, typeof t != "symbol" ? t + "" : t, e), gt = (i, t, e) => t.has(i) || St("Cannot " + e);
+var a = (i, t, e) => (gt(i, t, "read from private field"), e ? e.call(i) : t.get(i)), f = (i, t, e) => t.has(i) ? St("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(i) : t.set(i, e), p = (i, t, e, s) => (gt(i, t, "write to private field"), s ? s.call(i, e) : t.set(i, e), e), d = (i, t, e) => (gt(i, t, "access private method"), e);
+var _t = (i, t, e, s) => ({
   set _(n) {
-    d(a, t, n, e);
+    p(i, t, n, e);
   },
   get _() {
-    return i(a, t, s);
+    return a(i, t, s);
   }
 });
-import { a as Kt, b as Pt, i as H, I as Ft, c as Ot, d as U, s as St, e as Qt, f as M, g as V, h as Jt, t as Mt, j as ht, m as $, k as Xt, l as xt, S as Yt, n as Tt, o as Lt, V as Zt, p as te, q as ee, r as se, u as re } from "./markup-BJffA2Ls.js";
-import { v as je, w as Ce, B as De, x as Ie, C as Ve, y as qe, A as Ge, D as We, z as Ae, E as He } from "./markup-BJffA2Ls.js";
-function Te(a) {
-  return function() {
-    if (arguments.length === 1)
-      a = arguments[0];
-    else if (arguments.length > 1)
-      throw new Error(`Too many arguments. Expected 0 or 1. Got: ${arguments.length}`);
-    return a;
-  };
-}
-function Ut(a, t) {
+import { a as Bt, b as jt, i as H, I as Ft, $ as R, c as Kt, p as Jt, d as Xt, e as D, f as q, s as Mt, g as Yt, t as xt, h as ht, m as M, w as Zt, j as Pt, S as te, k as Tt, l as qt, V as ee, n as se, o as re, q as ne, r as ie } from "./markup-B-2w-v-S.js";
+import { u as Ce, x as Ve, y as De, v as Ae, z as We } from "./markup-B-2w-v-S.js";
+function Ot(i, t) {
   return t.outlet();
 }
-function K(a) {
-  return Pt(a, "Expected `path` to be a string. Got type: %t, value: %v"), a.split("/").map((t) => t.trim()).filter((t) => t !== "");
+function K(i) {
+  return jt(i, "Expected `path` to be a string. Got type: %t, value: %v"), i.split("/").map((t) => t.trim()).filter((t) => t !== "");
 }
-function z(a) {
+function z(i) {
   var e;
-  Kt(
+  Bt(
     (s) => H(s == null ? void 0 : s.toString),
-    a,
+    i,
     "Expected `parts` to be an array of objects with a .toString() method. Got type: %t, value: %v"
-  ), a = a.filter((s) => s).flatMap(String);
-  let t = (e = a.shift()) == null ? void 0 : e.toString();
+  ), i = i.filter((s) => s).flatMap(String);
+  let t = (e = i.shift()) == null ? void 0 : e.toString();
   if (t) {
-    for (const s of a.map((n) => n.toString()))
+    for (const s of i.map((n) => n.toString()))
       s.startsWith(".") ? t = ut(t, s) : t[t.length - 1] !== "/" ? s[0] !== "/" ? t += "/" + s : t += s : s[0] === "/" ? t += s.slice(1) : t += s;
     t && t !== "/" && t.endsWith("/") && (t = t.slice(0, t.length - 1));
   }
   return t ?? "";
 }
-function ut(a, t) {
-  if (Pt(a, "Expected `base` to be a string. Got type: %t, value: %v"), t == null && (t = a, a = ""), t.startsWith("/"))
+function ut(i, t) {
+  if (jt(i, "Expected `base` to be a string. Got type: %t, value: %v"), t == null && (t = i, i = ""), t.startsWith("/"))
     return t;
-  let e = a;
+  let e = i;
   for (; ; )
     if (t.startsWith("..")) {
       for (let s = e.length; s > 0; --s)
@@ -62,64 +53,63 @@ function ut(a, t) {
       break;
   return z([e, t]);
 }
-function ne(a) {
-  if (!a) return {};
-  a.startsWith("?") && (a = a.slice(1));
-  const t = a.split("&").filter((e) => e.trim() !== "").map((e) => {
-    const [s, n] = e.split("=").map((r) => r.trim());
-    return n.toLowerCase() === "true" ? [s, !0] : n.toLowerCase() === "false" ? [s, !1] : isNaN(Number(n)) ? [s, n] : [s, Number(n)];
-  });
+function ae(i) {
+  if (!i) return {};
+  i.startsWith("?") && (i = i.slice(1));
+  const t = i.split("&").filter((e) => e.trim() !== "").map(
+    (e) => e.split("=").map((s) => s.trim()).slice(0, 2)
+  );
   return Object.fromEntries(t);
 }
-function jt(a, t, e = {}) {
+function Nt(i, t, e = {}) {
   var o;
   const [s, n] = t.split("?"), r = K(s);
-  t: for (const c of a) {
+  t: for (const c of i) {
     const { fragments: l } = c;
     if (!(((o = l[l.length - 1]) == null ? void 0 : o.type) === 3) && l.length !== r.length || e.willMatch && !e.willMatch(c))
       continue t;
-    const b = [];
+    const m = [];
     e: for (let h = 0; h < l.length; h++) {
-      const x = r[h], E = l[h];
-      if (x == null && E.type !== 3)
+      const k = r[h], E = l[h];
+      if (k == null && E.type !== 3)
         continue t;
       switch (E.type) {
         case 1:
-          if (E.name.toLowerCase() === x.toLowerCase()) {
-            b.push(E);
+          if (E.name.toLowerCase() === k.toLowerCase()) {
+            m.push(E);
             break;
           } else
             continue t;
         case 2:
-          b.push({ ...E, value: x });
+          m.push({ ...E, value: k });
           break;
         case 3:
-          b.push({ ...E, value: r.slice(h).join("/") });
+          m.push({ ...E, value: r.slice(h).join("/") });
           break e;
         case 4:
-          if (isNaN(Number(x)))
+          if (isNaN(Number(k)))
             continue t;
-          b.push({ ...E, value: Number(x) });
+          m.push({ ...E, value: k });
           break;
         default:
           throw new Error(`Unknown fragment type: ${E.type}`);
       }
     }
-    const v = {};
-    for (const h of b)
-      h.type === 2 && (v[h.name] = decodeURIComponent(h.value)), h.type === 4 && (v[h.name] = h.value), h.type === 3 && (v.wildcard = "/" + decodeURIComponent(h.value));
+    const y = {};
+    for (const h of m)
+      h.type === 2 && (y[h.name] = decodeURIComponent(h.value)), h.type === 4 && (y[h.name] = String(h.value)), h.type === 3 && (y.wildcard = "/" + decodeURIComponent(h.value));
     return {
-      path: "/" + b.map((h) => h.value).join("/"),
+      path: "/" + m.map((h) => h.value).join("/"),
       pattern: "/" + l.map((h) => h.type === 2 ? `{${h.name}}` : h.type === 4 ? `{#${h.name}}` : h.name).join("/"),
-      params: v,
-      query: ne(n),
+      params: y,
+      query: ae(n),
       meta: c.meta
     };
   }
 }
-function ae(a) {
+function oe(i) {
   const t = [], e = [], s = [], n = [];
-  for (const o of a) {
+  for (const o of i) {
     const { fragments: c } = o;
     c.some(
       (l) => l.type === 3
@@ -135,13 +125,13 @@ function ae(a) {
   const r = (o, c) => o.fragments.length > c.fragments.length ? -1 : 1;
   return t.sort(r), e.sort(r), s.sort(r), n.sort(r), [...t, ...e, ...s, ...n];
 }
-function ie(a) {
-  const t = K(a), e = [];
+function le(i) {
+  const t = K(i), e = [];
   for (let s = 0; s < t.length; s++) {
     const n = t[s];
     if (n === "*") {
       if (s !== t.length - 1)
-        throw new Error(`Wildcard must be at the end of a pattern. Received: ${a}`);
+        throw new Error(`Wildcard must be at the end of a pattern. Received: ${i}`);
       e.push({
         type: 3,
         name: "*",
@@ -159,116 +149,120 @@ function ie(a) {
   }
   return e;
 }
-const oe = /(noopener|noreferrer) (noopener|noreferrer)/, le = /^[\w-_]+:/;
-function ce(a, t, e = window) {
+const ce = /(noopener|noreferrer) (noopener|noreferrer)/, he = /^[\w-_]+:/;
+function ue(i, t, e = window) {
   function s(r) {
-    return !r || r === a ? null : r.localName !== "a" || r.href === void 0 ? s(r.parentNode) : r;
+    return !r || r === i ? null : r.localName !== "a" || r.href === void 0 ? s(r.parentNode) : r;
   }
   function n(r) {
     if (r.button && r.button !== 0 || r.ctrlKey || r.metaKey || r.altKey || r.shiftKey || r.defaultPrevented)
       return;
     const o = s(r.target);
-    o && (e.location.protocol !== o.protocol || e.location.hostname !== o.hostname || e.location.port !== o.port || o.hasAttribute("data-router-ignore") || o.hasAttribute("download") || o.getAttribute("target") === "_blank" && oe.test(o.getAttribute("rel")) || le.test(o.getAttribute("href")) || (r.preventDefault(), t(o)));
+    o && (e.location.protocol !== o.protocol || e.location.hostname !== o.hostname || e.location.port !== o.port || o.hasAttribute("data-router-ignore") || o.hasAttribute("download") || o.getAttribute("target") === "_blank" && ce.test(o.getAttribute("rel")) || he.test(o.getAttribute("href")) || (r.preventDefault(), t(o)));
   }
-  return a.addEventListener("click", n), function() {
-    a.removeEventListener("click", n);
+  return i.addEventListener("click", n), function() {
+    i.removeEventListener("click", n);
   };
 }
-function he(a, t) {
+function fe(i, t) {
   for (const e in t) {
     const s = t[e].toString();
-    a = a.replace(`{${e}}`, s).replace(`{#${e}}`, s);
+    i = i.replace(`{${e}}`, s).replace(`{#${e}}`, s);
   }
-  return a;
+  return i;
 }
-function Le(a) {
-  return new de(a);
+function Le(i) {
+  return new pe(i);
 }
-const Ct = Symbol.for("DollaRouterMountMethod"), Dt = Symbol.for("DollaRouterUnmountMethod");
-function gt(a) {
-  return (a == null ? void 0 : a[Ft]) === !0;
+const Ut = Symbol.for("DollaRouterMountMethod"), It = Symbol.for("DollaRouterUnmountMethod");
+function yt(i) {
+  return (i == null ? void 0 : i[Ft]) === !0;
 }
-async function ue(a, t) {
-  return a[Ct](t);
+async function de(i, t) {
+  return i[Ut](t);
 }
-async function fe(a) {
-  return a[Dt]();
+async function me(i) {
+  return i[It]();
 }
-var Nt, J, S, ft, T, G, X, j, C, L, m, It, Vt, qt, B, Gt, yt, bt;
-class de {
+var Lt, J, P, ft, L, U, X, T, I, S, w, Ct, Vt, Dt, B, At, bt, vt;
+class pe {
   constructor(t) {
-    u(this, m);
-    w(this, Nt, !0);
-    u(this, J);
-    u(this, S);
-    u(this, ft, 0);
-    u(this, T, []);
-    u(this, G, []);
-    u(this, X, !1);
+    f(this, w);
+    g(this, Lt, !0);
+    f(this, J);
+    f(this, P);
+    f(this, ft, 0);
+    f(this, L, []);
+    f(this, U, []);
+    f(this, X, !1);
     /**
      * Use hash routing when true. Configured in router options.
      */
-    u(this, j, !1);
+    f(this, T, !1);
     // Callbacks that need to be called on unmount.
-    u(this, C, []);
+    f(this, I, []);
     /**
      * The current match object.
      */
-    u(this, L, Ot());
+    f(this, S, R());
     /**
      * The currently matched route pattern, if any.
      */
-    w(this, "pattern", U(() => {
+    g(this, "pattern", R(() => {
       var t;
-      return (t = i(this, L).get()) == null ? void 0 : t.pattern;
+      return (t = a(this, S).call(this)) == null ? void 0 : t.pattern;
     }));
     /**
      * The current URL path.
      */
-    w(this, "path", U(() => {
+    g(this, "path", R(() => {
       var t;
-      return ((t = i(this, L).get()) == null ? void 0 : t.path) ?? window.location.pathname;
+      return ((t = a(this, S).call(this)) == null ? void 0 : t.path) ?? window.location.pathname;
     }));
     /**
      * The current named path params.
      */
-    w(this, "params", U(() => {
+    g(this, "params", R(() => {
       var t;
-      return ((t = i(this, L).get()) == null ? void 0 : t.params) ?? {};
-    }, { equals: St }));
+      return ((t = a(this, S).call(this)) == null ? void 0 : t.params) ?? {};
+    }, { equals: Mt }));
     /**
      * The current query params. Changes to this object will be reflected in the URL.
      */
-    w(this, "query", U(() => {
+    g(this, "query", R(() => {
       var t;
-      return ((t = i(this, L).get()) == null ? void 0 : t.query) ?? {};
-    }, { equals: St }));
-    Qt(t, "Options must be an object. Got: %t"), t.hash && d(this, j, !0), d(this, G, ae(
-      t.routes.flatMap((e) => f(this, m, bt).call(this, e)).map((e) => ({
+      return ((t = a(this, S).call(this)) == null ? void 0 : t.query) ?? {};
+    }, { equals: Mt }));
+    Kt(t, "Options must be an object. Got: %t"), t.hash && p(this, T, !0), p(this, U, oe(
+      t.routes.flatMap((e) => d(this, w, vt).call(this, e)).map((e) => ({
         pattern: e.pattern,
         meta: e.meta,
-        fragments: ie(e.pattern)
+        fragments: le(e.pattern)
       }))
-    )), me(i(this, G));
+    )), console.log({ routes: t.routes, prepared: a(this, U) }), we(a(this, U));
   }
-  async [(Nt = Ft, Ct)](t) {
-    d(this, J, t), d(this, S, t.createLogger("Dolla.router"));
+  async [(Lt = Ft, Ut)](t) {
+    p(this, J, t), p(this, P, t.createLogger("Dolla.router"));
     const e = () => {
-      f(this, m, B).call(this);
+      d(this, w, B).call(this, void 0, {});
     };
-    window.addEventListener("popstate", e), i(this, C).push(() => window.removeEventListener("popstate", e));
+    window.addEventListener("popstate", e), a(this, I).push(() => window.removeEventListener("popstate", e));
     const s = t.getRootElement();
-    i(this, C).push(
-      ce(s, (n) => {
+    a(this, I).push(
+      ue(s, (n) => {
         let r = n.getAttribute("href");
-        i(this, S).info("intercepted click on <a> tag", n), this.go(r);
+        a(this, P).info("intercepted click on <a> tag", n);
+        const o = n.getAttribute("data-router-preserve-query");
+        this.go(r, {
+          preserveQuery: ge(o)
+        });
       })
-    ), i(this, S).info("will intercept clicks on <a> tags within root element", s), d(this, X, !0), await f(this, m, B).call(this);
+    ), a(this, P).info("will intercept clicks on <a> tags within root element", s), p(this, X, !0), await d(this, w, B).call(this, void 0, {});
   }
-  async [Dt]() {
-    for (const t of i(this, C))
+  async [It]() {
+    for (const t of a(this, I))
       t();
-    d(this, C, []);
+    p(this, I, []);
   }
   /**
    * Navigate backward. Pass a number of steps to hit the back button that many times.
@@ -291,94 +285,142 @@ class de {
    */
   go(t, e = {}) {
     let s;
-    Array.isArray(t) ? s = z(t) : s = t.toString(), s = ut(window.location.pathname, s), e.preserveQuery && (s += window.location.search), e.replace ? f(this, m, Vt).call(this, s) : f(this, m, It).call(this, s);
+    Array.isArray(t) ? s = z(t) : s = t.toString(), s = ut(window.location.pathname, s), e.replace ? d(this, w, Vt).call(this, s, e) : d(this, w, Ct).call(this, s, e);
+  }
+  /**
+   * Updates query params, keeping existing ones and applying new ones. Removes the query param if value is set to `null`.
+   */
+  updateQuery(t) {
+    const e = a(this, S).call(this), s = { ...this.query() };
+    for (const o in t) {
+      const c = t[o];
+      c === null ? delete s[o] : s[o] = c.toString();
+    }
+    let n = [];
+    for (const o in s)
+      n.push(`${o}=${s[o]}`);
+    const r = n.length > 0 ? "?" + n.join("&") : "";
+    a(this, S).call(this, { ...e, query: s }), window.history.replaceState(null, "", a(this, T) ? "/#" + e.path + r : e.path + r);
   }
 }
-J = new WeakMap(), S = new WeakMap(), ft = new WeakMap(), T = new WeakMap(), G = new WeakMap(), X = new WeakMap(), j = new WeakMap(), C = new WeakMap(), L = new WeakMap(), m = new WeakSet(), It = function(t, e) {
+J = new WeakMap(), P = new WeakMap(), ft = new WeakMap(), L = new WeakMap(), U = new WeakMap(), X = new WeakMap(), T = new WeakMap(), I = new WeakMap(), S = new WeakMap(), w = new WeakSet(), Ct = function(t, e) {
   var s;
-  (s = i(this, S)) == null || s.info("(push)", t), window.history.pushState(e, "", i(this, j) ? "/#" + t : t), f(this, m, B).call(this, t);
+  (s = a(this, P)) == null || s.info("(push)", t), window.history.pushState(null, "", a(this, T) ? "/#" + t : t), d(this, w, B).call(this, t, e);
 }, Vt = function(t, e) {
   var s;
-  (s = i(this, S)) == null || s.info("(replace)", t), window.history.replaceState(e, "", i(this, j) ? "/#" + t : t), f(this, m, B).call(this, t);
-}, qt = function() {
-  return i(this, j) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
-}, B = async function(t) {
-  var c;
-  const e = i(this, S), s = (c = i(this, J)) == null ? void 0 : c.getRootView(), n = t ? new URL(t, window.location.origin) : f(this, m, qt).call(this), { match: r, journey: o } = await f(this, m, yt).call(this, n);
-  for (const l of o)
-    switch (l.kind) {
+  (s = a(this, P)) == null || s.info("(replace)", t), window.history.replaceState(null, "", a(this, T) ? "/#" + t : t), d(this, w, B).call(this, t, e);
+}, Dt = function() {
+  return a(this, T) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
+}, B = async function(t, e) {
+  var l;
+  const s = a(this, P), n = (l = a(this, J)) == null ? void 0 : l.getRootView(), r = t ? new URL(t, window.location.origin) : d(this, w, Dt).call(this), { match: o, journey: c } = await d(this, w, bt).call(this, r);
+  for (const u of c)
+    switch (u.kind) {
       case "match":
-        e == null || e.info(`📍 ${l.message}`);
+        s == null || s.info(`📍 ${u.message}`);
         break;
       case "redirect":
-        e == null || e.info(`↩️ ${l.message}`);
+        s == null || s.info(`↩️ ${u.message}`);
         break;
       case "miss":
-        e == null || e.info(`💀 ${l.message}`);
+        s == null || s.info(`💀 ${u.message}`);
         break;
     }
-  if (r) {
-    const l = this.pattern.peek();
-    i(this, L).set(r), s && r.pattern !== l && f(this, m, Gt).call(this, s, r);
+  if (o) {
+    const u = Jt(this.pattern);
+    let m = o.query, y = [];
+    if (e.preserveQuery === !0)
+      m = Object.assign({}, this.query(), o.query);
+    else if (Xt(e.preserveQuery)) {
+      const k = {}, E = this.query();
+      for (const wt in E)
+        e.preserveQuery.includes(wt) && (k[wt] = E[wt]);
+      m = Object.assign({}, k, o.query);
+    }
+    for (const k in m)
+      y.push(`${k}=${m[k]}`);
+    const h = y.length > 0 ? "?" + y.join("&") : "";
+    a(this, S).call(this, { ...o, query: m }), n && (o.path !== location.pathname || location.search !== h) && window.history.replaceState(null, "", a(this, T) ? "/#" + o.path + h : o.path + h), n && o.pattern !== u && d(this, w, At).call(this, n, o);
   } else
-    i(this, X) && e.crash(new pe(`Failed to match route '${n.pathname}'`));
-  return { match: r, journey: o };
+    a(this, X) && s.crash(new ye(`Failed to match route '${r.pathname}'`));
+  return { match: o, journey: c };
 }, /**
  * Takes a matched route and mounts it.
  */
-Gt = function(t, e) {
+At = function(t, e) {
   const s = e.meta.layers;
   for (let n = 0; n < s.length; n++) {
-    const r = s[n], o = i(this, T)[n];
+    const r = s[n], o = a(this, L)[n];
     if ((o == null ? void 0 : o.id) !== r.id) {
-      d(this, T, i(this, T).slice(0, n)), o == null || o.view.unmount();
-      const c = i(this, T).at(-1), p = ((c == null ? void 0 : c.view) ?? t).setRouteView(r.view);
-      i(this, T).push({ id: r.id, view: p });
+      p(this, L, a(this, L).slice(0, n)), o == null || o.view.unmount();
+      const c = a(this, L).at(-1), u = ((c == null ? void 0 : c.view) ?? t).setRouteView(r.view);
+      a(this, L).push({ id: r.id, view: u });
     }
   }
-}, yt = async function(t, e = []) {
-  const s = jt(i(this, G), t.pathname);
-  if (!s)
-    return {
-      match: null,
-      journey: [...e, { kind: "miss", message: `no match for '${t.pathname}'` }]
+}, bt = async function(t, e = []) {
+  return new Promise((s, n) => {
+    var l;
+    const r = Nt(a(this, U), t.pathname);
+    if (!r)
+      return s({
+        match: null,
+        journey: [...e, { kind: "miss", message: `no match for '${t.pathname}'` }]
+      });
+    let o = r.meta.redirect;
+    const c = async () => {
+      if (o != null) {
+        let u;
+        if (q(o))
+          u = fe(o, r.params);
+        else if (H(o)) {
+          const m = {
+            path: r.path,
+            pattern: r.pattern,
+            params: r.params,
+            query: r.query
+          };
+          if (u = await o(m), !q(u))
+            return n(new Error("Redirect function must return a path to redirect to."));
+          u.startsWith("/") || (u = ut(r.path, u));
+        } else
+          return n(new TypeError("Redirect must either be a path string or a function."));
+        s(
+          d(this, w, bt).call(this, new URL(u, window.location.origin), [
+            ...e,
+            { kind: "redirect", message: `redirecting '${r.path}' -> '${u}'` }
+          ])
+        );
+      } else
+        s({ match: r, journey: [...e, { kind: "match", message: `matched route '${r.path}'` }] });
     };
-  let n = s.meta.redirect;
-  if (s.meta.beforeMatch && await s.meta.beforeMatch({
-    // TODO: Allow setting context variables from here? Would apply to the context of the matched view.
-    redirect: (r) => {
-      n = r;
-    }
-  }), n != null) {
-    let r;
-    if (M(n))
-      r = he(n, s.params);
-    else if (H(n)) {
-      const o = {
-        path: s.path,
-        pattern: s.pattern,
-        params: s.params,
-        query: s.query
+    if ((l = r.meta.beforeMatch) != null && l.length) {
+      const u = r.meta.beforeMatch;
+      let m = -1;
+      const y = () => {
+        m++, console.warn("blep", { i: m, callbacks: u }), m === u.length ? c() : u[m]({
+          path: r.path,
+          pattern: r.pattern,
+          params: r.params,
+          query: r.query,
+          // TODO: Allow setting context variables from here? Would apply to the context of the matched view.
+          redirect: (h) => {
+            o = h, c();
+          },
+          next: y
+        });
       };
-      if (r = await n(o), !M(r))
-        throw new Error("Redirect function must return a path to redirect to.");
-      r.startsWith("/") || (r = ut(s.path, r));
+      y();
     } else
-      throw new TypeError("Redirect must either be a path string or a function.");
-    return f(this, m, yt).call(this, new URL(r, window.location.origin), [
-      ...e,
-      { kind: "redirect", message: `redirecting '${s.path}' -> '${r}'` }
-    ]);
-  } else
-    return { match: s, journey: [...e, { kind: "match", message: `matched route '${s.path}'` }] };
+      c();
+  });
 }, /**
  * Parses a route definition object into a set of matchable routes.
  *
  * @param route - Route config object.
  * @param layers - Array of parent layers. Passed when this function calls itself on nested routes.
  */
-bt = function(t, e = [], s = []) {
-  if (!V(t) || !M(t.path))
+vt = function(t, e = [], s = []) {
+  if (!D(t) || !q(t.path))
     throw new TypeError(`Route configs must be objects with a 'path' string property. Got: ${t}`);
   if (t.redirect && t.routes)
     throw new Error("Route cannot have both a 'redirect' and nested 'routes'.");
@@ -393,14 +435,14 @@ bt = function(t, e = [], s = []) {
   const r = [];
   if (t.redirect) {
     let l = t.redirect;
-    return M(l) && (l = ut(z(n), l), l.startsWith("/") || (l = "/" + l)), r.push({
+    return q(l) && (l = ut(z(n), l), l.startsWith("/") || (l = "/" + l)), r.push({
       pattern: "/" + z([...n, ...K(t.path)]),
       meta: {
         redirect: l
       }
     }), r;
   }
-  let o = Ut;
+  let o = Ot;
   if (H(t.view))
     o = t.view;
   else if (t.view)
@@ -408,24 +450,24 @@ bt = function(t, e = [], s = []) {
   const c = { id: _t(this, ft)._++, view: o };
   if (t.routes)
     for (const l of t.routes)
-      r.push(...f(this, m, bt).call(this, l, [...e, t], [...s, c]));
+      r.push(...d(this, w, vt).call(this, l, [...e, t], [...s, c]));
   else
     r.push({
       pattern: parent ? z([...e.map((l) => l.path), t.path]) : t.path,
       meta: {
         pattern: t.path,
         layers: [...s, c],
-        beforeMatch: t.beforeMatch
+        beforeMatch: e.flatMap((l) => l.beforeMatch).concat(t.beforeMatch).filter((l) => l != null)
       }
     });
   return r;
 };
-function me(a) {
-  for (const t of a)
+function we(i) {
+  for (const t of i)
     if (t.meta.redirect) {
       let e;
-      if (!H(t.meta.redirect)) if (M(t.meta.redirect)) {
-        if (e = t.meta.redirect, !jt(a, e, {
+      if (!H(t.meta.redirect)) if (q(t.meta.redirect)) {
+        if (e = t.meta.redirect, !Nt(i, e, {
           willMatch(n) {
             return n !== t;
           }
@@ -435,14 +477,23 @@ function me(a) {
         throw new TypeError(`Expected a string or redirect function. Got: ${t.meta.redirect}`);
     }
 }
-class pe extends Error {
+function ge(i) {
+  if (i === null)
+    return !1;
+  if (i === !0 || i === !1)
+    return i;
+  if (typeof i == "string")
+    return i = i.trim(), i === "" || i === "true" ? !0 : i === "false" ? !1 : i.split(",").map((t) => t.trim()).filter((t) => t.length > 0);
+  throw new Error(`Invalid type for data-router-preserve-query attribute: ${typeof i} (value: ${i})`);
+}
+class ye extends Error {
 }
-var D, dt, k, _;
-class we {
+var C, dt, $, x;
+class be {
   constructor() {
-    u(this, k);
-    u(this, D, []);
-    u(this, dt, ge());
+    f(this, $);
+    f(this, C, []);
+    f(this, dt, ve());
   }
   /**
    * Adds a new middleware that will apply to subsequent requests.
@@ -451,65 +502,65 @@ class we {
    * @param middleware - A middleware function that will intercept requests.
    */
   use(t) {
-    return i(this, D).push(t), () => {
-      i(this, D).splice(i(this, D).indexOf(t), 1);
+    return a(this, C).push(t), () => {
+      a(this, C).splice(a(this, C).indexOf(t), 1);
     };
   }
   async get(t, e) {
-    return f(this, k, _).call(this, "get", t, e);
+    return d(this, $, x).call(this, "get", t, e);
   }
   async put(t, e) {
-    return f(this, k, _).call(this, "put", t, e);
+    return d(this, $, x).call(this, "put", t, e);
   }
   async patch(t, e) {
-    return f(this, k, _).call(this, "patch", t, e);
+    return d(this, $, x).call(this, "patch", t, e);
   }
   async post(t, e) {
-    return f(this, k, _).call(this, "post", t, e);
+    return d(this, $, x).call(this, "post", t, e);
   }
   async delete(t, e) {
-    return f(this, k, _).call(this, "delete", t, e);
+    return d(this, $, x).call(this, "delete", t, e);
   }
   async head(t, e) {
-    return f(this, k, _).call(this, "head", t, e);
+    return d(this, $, x).call(this, "head", t, e);
   }
   async options(t, e) {
-    return f(this, k, _).call(this, "options", t, e);
+    return d(this, $, x).call(this, "options", t, e);
   }
   async trace(t, e) {
-    return f(this, k, _).call(this, "trace", t, e);
+    return d(this, $, x).call(this, "trace", t, e);
   }
 }
-D = new WeakMap(), dt = new WeakMap(), k = new WeakSet(), _ = async function(t, e, s) {
-  return new ve({
+C = new WeakMap(), dt = new WeakMap(), $ = new WeakSet(), x = async function(t, e, s) {
+  return new $e({
     ...s,
     method: t,
     uri: e,
-    middleware: i(this, D),
-    fetch: i(this, dt)
+    middleware: a(this, C),
+    fetch: a(this, dt)
   }).fetch();
 };
-function ge() {
+function ve() {
   if (typeof window < "u" && window.fetch)
     return window.fetch.bind(window);
   if (typeof global < "u" && global.fetch)
     return global.fetch.bind(global);
   throw new Error("Running in neither browser nor node. Please run this app in one of the supported environments.");
 }
-class ye extends Error {
+class ke extends Error {
   constructor(e) {
     const { status: s, statusText: n, method: r, url: o } = e, c = `${s} ${n}: Request failed (${r.toUpperCase()} ${o.toString()})`;
     super(c);
-    w(this, "response");
+    g(this, "response");
     this.response = e;
   }
 }
-class be {
+class Ee {
   constructor(t) {
-    w(this, "method");
-    w(this, "url");
-    w(this, "headers", new Headers());
-    w(this, "body");
+    g(this, "method");
+    g(this, "url");
+    g(this, "headers", new Headers());
+    g(this, "body");
     this.method = t.method, this.body = t.body, t.uri.startsWith("http") ? this.url = new URL(t.uri) : this.url = new URL(t.uri, window.location.origin), this._applyHeaders(t.headers), this._applyQueryParams(t.query);
   }
   get isSameOrigin() {
@@ -521,7 +572,7 @@ class be {
         t.forEach((e, s) => {
           this.headers.set(s, e);
         });
-      else if (V(t))
+      else if (D(t))
         for (const e in t) {
           const s = t[e];
           s instanceof Date ? this.headers.set(e, s.toISOString()) : s != null && this.headers.set(e, String(s));
@@ -535,7 +586,7 @@ class be {
         t.forEach((e, s) => {
           this.url.searchParams.set(s, e);
         });
-      else if (V(t))
+      else if (D(t))
         for (const e in t) {
           const s = t[e];
           s instanceof Date ? this.url.searchParams.set(e, s.toISOString()) : s != null && this.url.searchParams.set(e, String(s));
@@ -544,13 +595,13 @@ class be {
         throw new TypeError(`Unknown query params type. Got: ${t}`);
   }
 }
-class ve {
+class $e {
   constructor(t) {
-    w(this, "_middleware");
-    w(this, "_fetch");
-    w(this, "_request");
-    w(this, "_response");
-    this._middleware = t.middleware, this._fetch = t.fetch, this._request = new be(t);
+    g(this, "_middleware");
+    g(this, "_fetch");
+    g(this, "_request");
+    g(this, "_response");
+    this._middleware = t.middleware, this._fetch = t.fetch, this._request = new Ee(t);
   }
   async fetch() {
     if (this._middleware.length > 0) {
@@ -562,14 +613,14 @@ class ve {
     } else
       await this._handler();
     if (this._response.status < 200 || this._response.status >= 400)
-      throw new ye(this._response);
+      throw new ke(this._response);
     return this._response;
   }
   // This is the function that performs the actual request after the final middleware.
   async _handler() {
     let t;
     const e = this._request;
-    !e.headers.has("content-type") && V(e.body) ? (e.headers.set("content-type", "application/json"), t = JSON.stringify(e.body)) : t = e.body;
+    !e.headers.has("content-type") && D(e.body) ? (e.headers.set("content-type", "application/json"), t = JSON.stringify(e.body)) : t = e.body;
     const s = await this._fetch(e.url.toString(), {
       method: e.method,
       headers: e.headers,
@@ -586,29 +637,29 @@ class ve {
     };
   }
 }
-var mt, W, q, vt, Wt;
-class Ee {
+var mt, W, A, kt, Wt;
+class Re {
   constructor(t, e) {
-    u(this, q);
-    w(this, "dolla");
-    w(this, "config");
-    u(this, mt, !1);
-    u(this, W, /* @__PURE__ */ new Map());
+    f(this, A);
+    g(this, "dolla");
+    g(this, "config");
+    f(this, mt, !1);
+    f(this, W, /* @__PURE__ */ new Map());
     this.config = t, this.dolla = e;
   }
   async load() {
     let t;
-    if (!i(this, mt)) {
-      if (V(this.config.strings))
+    if (!a(this, mt)) {
+      if (D(this.config.strings))
         t = this.config.strings;
       else if (H(this.config.fetch)) {
-        if (t = await this.config.fetch(), !V(t))
+        if (t = await this.config.fetch(), !D(t))
           throw new Error(`Fetch function did not return an object of language strings: ${t}`);
-      } else if (M(this.config.path)) {
+      } else if (q(this.config.path)) {
         const e = await fetch(this.config.path);
         if (e.ok) {
           const s = await e.json();
-          if (V(s))
+          if (D(s))
             t = s;
           else
             throw new Error(
@@ -619,34 +670,34 @@ class Ee {
       }
     }
     if (t) {
-      const e = f(this, q, vt).call(this, t);
+      const e = d(this, A, kt).call(this, t);
       for (const s of e)
-        i(this, W).set(s[0], s[1]);
+        a(this, W).set(s[0], s[1]);
     } else
       throw new Error("Language could not be loaded.");
   }
   getTemplate(t) {
-    return i(this, W).get(t) ?? {
+    return a(this, W).get(t) ?? {
       segments: [{ type: 0, text: `[MISSING: ${t}]` }]
     };
   }
   hasTemplate(t) {
-    return i(this, W).has(t);
+    return a(this, W).has(t);
   }
 }
-mt = new WeakMap(), W = new WeakMap(), q = new WeakSet(), vt = function(t, e = []) {
+mt = new WeakMap(), W = new WeakMap(), A = new WeakSet(), kt = function(t, e = []) {
   const s = [];
   for (const n in t)
-    switch (Mt(t[n])) {
+    switch (xt(t[n])) {
       case "string":
-        s.push([[...e, n].join("."), f(this, q, Wt).call(this, t[n])]);
+        s.push([[...e, n].join("."), d(this, A, Wt).call(this, t[n])]);
         break;
       case "object":
-        s.push(...f(this, q, vt).call(this, t[n], [...e, n]));
+        s.push(...d(this, A, kt).call(this, t[n], [...e, n]));
         break;
       default:
         throw new Error(
-          `Expected to find a string or object at ${[...e, n].join(".")}. Got: ${Mt(t[n])}`
+          `Expected to find a string or object at ${[...e, n].join(".")}. Got: ${xt(t[n])}`
         );
     }
   return s;
@@ -658,14 +709,14 @@ mt = new WeakMap(), W = new WeakMap(), q = new WeakSet(), vt = function(t, e = [
   const s = {
     segments: []
   };
-  let n = "", r = 0, o = 0, c, l, p;
-  const b = () => {
+  let n = "", r = 0, o = 0, c, l, u;
+  const m = () => {
     c = {
       type: 1,
       name: "",
       formats: []
     };
-  }, v = () => {
+  }, y = () => {
     l = {
       name: "",
       options: {}
@@ -678,58 +729,56 @@ mt = new WeakMap(), W = new WeakMap(), q = new WeakSet(), vt = function(t, e = [
     }
     switch (o) {
       case 0:
-        t[r] === "{" && t[r + 1] === "{" ? (o = 1, r += 2, n.length > 0 && (s.segments.push({ type: 0, text: n }), n = ""), b()) : (n += t[r], r++);
+        t[r] === "{" && t[r + 1] === "{" ? (o = 1, r += 2, n.length > 0 && (s.segments.push({ type: 0, text: n }), n = ""), m()) : (n += t[r], r++);
         break;
       case 1:
-        t[r] === "|" ? (o = 2, r += 1, c.name = n, n = "", v()) : t[r] === "}" && t[r + 1] === "}" ? (o = 0, r += 2, c.name = n, n = "", s.segments.push(c)) : (n += t[r], r++);
+        t[r] === "|" ? (o = 2, r += 1, c.name = n, n = "", y()) : t[r] === "}" && t[r + 1] === "}" ? (o = 0, r += 2, c.name = n, n = "", s.segments.push(c)) : (n += t[r], r++);
         break;
       case 2:
         t[r] === "(" ? (o = 3, r += 1, l.name = n, n = "") : t[r] === "}" && t[r + 1] === "}" ? (o = 0, r += 2, c.formats.push(l), s.segments.push(c)) : (n += t[r], r++);
         break;
       case 3:
-        t[r] === ")" || (t[r] === ":" ? (o = 4, r += 1, p = n, n = "") : t[r] === "}" && t[r + 1] === "}" || (n += t[r], r++));
+        t[r] === ")" || (t[r] === ":" ? (o = 4, r += 1, u = n, n = "") : t[r] === "}" && t[r + 1] === "}" || (n += t[r], r++));
         break;
       case 4:
-        t[r] === ")" ? (o = 5, r += 1, l.options[p] = n, n = "", c.formats.push(l)) : t[r] === "," ? (o = 3, r += 1, l.options[p] = n, n = "") : t[r] === "}" && t[r + 1] === "}" || (n += t[r], r++);
+        t[r] === ")" ? (o = 5, r += 1, l.options[u] = n, n = "", c.formats.push(l)) : t[r] === "," ? (o = 3, r += 1, l.options[u] = n, n = "") : t[r] === "}" && t[r + 1] === "}" || (n += t[r], r++);
         break;
       case 5:
-        t[r] === "|" ? (o = 2, r += 1, v()) : t[r] === "}" && t[r + 1] === "}" && (o = 0, r += 2, s.segments.push(c));
+        t[r] === "|" ? (o = 2, r += 1, y()) : t[r] === "}" && t[r + 1] === "}" && (o = 0, r += 2, s.segments.push(c));
         break;
     }
   }
   return o === 0 && n.length > 0 && s.segments.push({ type: 0, text: n }), s;
 };
-var Y, N, g, Z, tt, et, R, y, At, Et, kt, Rt, Ht;
-class ke {
+var Y, j, b, Z, tt, et, _, v, Gt, Et, $t, Rt, Ht;
+class Se {
   constructor(t) {
-    u(this, y);
-    u(this, Y);
-    u(this, N);
-    u(this, g, /* @__PURE__ */ new Map());
-    u(this, Z, []);
-    u(this, tt, /* @__PURE__ */ new Map());
-    u(this, et, "auto");
-    u(this, R, Ot(""));
-    d(this, Y, t), d(this, N, t.createLogger("Dolla.i18n")), this.addFormat("number", (e, s, n) => f(this, y, Et).call(this, Number(s), n)), this.addFormat("datetime", (e, s, n) => f(this, y, kt).call(this, s, n)), this.addFormat("list", (e, s, n) => f(this, y, Rt).call(this, s, n)), t.beforeMount(async () => {
-      i(this, g).size > 0 && await this.setLocale(i(this, et));
+    f(this, v);
+    f(this, Y);
+    f(this, j);
+    f(this, b, /* @__PURE__ */ new Map());
+    f(this, Z, []);
+    f(this, tt, /* @__PURE__ */ new Map());
+    f(this, et, "auto");
+    f(this, _, R(""));
+    g(this, "locale", R(a(this, _)));
+    p(this, Y, t), p(this, j, t.createLogger("Dolla.i18n")), this.addFormat("number", (e, s, n) => d(this, v, Et).call(this, Number(s), n)), this.addFormat("datetime", (e, s, n) => d(this, v, $t).call(this, s, n)), this.addFormat("list", (e, s, n) => d(this, v, Rt).call(this, s, n)), t.beforeMount(async () => {
+      a(this, b).size > 0 && await this.setLocale(a(this, et));
     });
   }
-  get locale() {
-    return i(this, R);
-  }
   get locales() {
-    return [...i(this, g).keys()];
+    return [...a(this, b).keys()];
   }
   setup(t) {
     if (t.translations.forEach((e) => {
-      i(this, g).set(e.locale, new Ee(e, i(this, Y)));
+      a(this, b).set(e.locale, new Re(e, a(this, Y)));
     }), t.locale && t.locale !== "auto") {
       if (!t.translations.some((s) => s.locale === t.locale))
         throw new Error(`Initial locale '${t.locale}' is not registered in the locales array.`);
-      d(this, et, t.locale);
+      p(this, et, t.locale);
     }
-    i(this, N).info(
-      `${i(this, g).size} language${i(this, g).size === 1 ? "" : "s"} supported: '${[...i(this, g).keys()].join("', '")}'`
+    a(this, j).info(
+      `${a(this, b).size} language${a(this, b).size === 1 ? "" : "s"} supported: '${[...a(this, b).keys()].join("', '")}'`
     );
   }
   async setLocale(t) {
@@ -742,20 +791,20 @@ class ke {
         ((n = o.languages) == null ? void 0 : n.length) > 0 ? r.push(...o.languages) : o.language ? r.push(o.language) : o.browserLanguage ? r.push(o.browserLanguage) : o.userLanguage && r.push(o.userLanguage);
       }
       for (const o of r)
-        i(this, g).has(o) && (e = o);
+        a(this, b).has(o) && (e = o);
     } else
-      i(this, g).has(t) && (e = t);
+      a(this, b).has(t) && (e = t);
     if (e == null) {
-      const r = i(this, g).keys().next().value;
+      const r = a(this, b).keys().next().value;
       r && (e = r);
     }
-    if (!e || !i(this, g).has(e))
+    if (!e || !a(this, b).has(e))
       throw new Error(`Locale '${t}' has no translation.`);
-    const s = i(this, g).get(e);
+    const s = a(this, b).get(e);
     try {
-      await s.load(), d(this, Z, []), i(this, R).set(e), i(this, N).info("set language to " + e);
+      await s.load(), p(this, Z, []), a(this, _).call(this, e), a(this, j).info("set language to " + e);
     } catch (r) {
-      r instanceof Error && i(this, N).crash(r);
+      r instanceof Error && a(this, j).crash(r);
     }
   }
   /**
@@ -772,11 +821,11 @@ class ke {
       throw new Error(
         `The 't' function cannot be destructured. If you need a standalone version you can import it like so: 'import { t } from "@manyducks.co/dolla"'`
       );
-    return U(() => {
+    return R(() => {
       const s = {};
       for (const n in e)
         s[n] = ht(e[n]);
-      return f(this, y, At).call(this, i(this, R).get(), t, s);
+      return d(this, v, Gt).call(this, a(this, _).call(this), t, s);
     });
   }
   /**
@@ -794,7 +843,7 @@ class ke {
    * t("greeting", {name: "world"}); // State<"Hello, WORLD!">
    */
   addFormat(t, e) {
-    i(this, tt).set(t, e);
+    a(this, tt).set(t, e);
   }
   /**
    * Creates an `Intl.Collator` configured for the current locale.
@@ -803,7 +852,7 @@ class ke {
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Collator/Collator#options
    */
   collator(t) {
-    return new Intl.Collator(i(this, R).get(), t);
+    return new Intl.Collator(a(this, _).call(this), t);
   }
   /**
    * Formats a number for the current locale. Uses `Intl.NumberFormat` under the hood.
@@ -811,7 +860,7 @@ class ke {
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#options
    */
   number(t, e) {
-    return U(() => f(this, y, Et).call(this, ht(t), e));
+    return R(() => d(this, v, Et).call(this, ht(t), e));
   }
   /**
    * Formats a date for the current locale. Uses `Intl.DateTimeFormat` under the hood.
@@ -823,7 +872,7 @@ class ke {
    * const $formatted = Dolla.i18n.dateTime(date, { dateFormat: "short" });
    */
   dateTime(t, e) {
-    return U(() => f(this, y, kt).call(this, ht(t), e));
+    return R(() => d(this, v, $t).call(this, ht(t), e));
   }
   /**
    * Formats a list for the current locale. Uses `Intl.ListFormat` under the hood.
@@ -835,68 +884,68 @@ class ke {
    * const $formatted = Dolla.i18n.list(list, {  });
    */
   list(t, e) {
-    return U(() => f(this, y, Rt).call(this, ht(t), e));
+    return R(() => d(this, v, Rt).call(this, ht(t), e));
   }
 }
-Y = new WeakMap(), N = new WeakMap(), g = new WeakMap(), Z = new WeakMap(), tt = new WeakMap(), et = new WeakMap(), R = new WeakMap(), y = new WeakSet(), At = function(t, e, s) {
+Y = new WeakMap(), j = new WeakMap(), b = new WeakMap(), Z = new WeakMap(), tt = new WeakMap(), et = new WeakMap(), _ = new WeakMap(), v = new WeakSet(), Gt = function(t, e, s) {
   var l;
-  const n = f(this, y, Ht).call(this, e, s);
+  const n = d(this, v, Ht).call(this, e, s);
   if (n) return n;
-  const r = i(this, g).get(t);
+  const r = a(this, b).get(t);
   if (s.context != null && (e += "_" + s.context), s.count != null)
     if (s.ordinal) {
-      const p = `${e}_ordinal_(=${s.count})`;
-      r.hasTemplate(p) ? e = p : e += "_ordinal_" + new Intl.PluralRules(t, { type: "ordinal" }).select(s.count);
+      const u = `${e}_ordinal_(=${s.count})`;
+      r.hasTemplate(u) ? e = u : e += "_ordinal_" + new Intl.PluralRules(t, { type: "ordinal" }).select(s.count);
     } else {
-      const p = `${e}_(=${s.count})`;
-      r.hasTemplate(p) ? e = p : e += "_" + new Intl.PluralRules(t).select(s.count);
+      const u = `${e}_(=${s.count})`;
+      r.hasTemplate(u) ? e = u : e += "_" + new Intl.PluralRules(t).select(s.count);
     }
   const o = r.getTemplate(e);
   let c = "";
-  for (const p of o.segments)
-    if (p.type === 0)
-      c += p.text;
-    else if (p.type === 1) {
-      let b = Re(s, p.name);
-      const v = ((l = s.formatOverrides) == null ? void 0 : l[p.name]) ?? [...p.formats];
-      p.name === "count" && v.length === 0 && v.push({ name: "number", options: {} });
-      for (const h of v) {
-        const x = i(this, tt).get(h.name);
-        if (x == null) {
+  for (const u of o.segments)
+    if (u.type === 0)
+      c += u.text;
+    else if (u.type === 1) {
+      let m = _e(s, u.name);
+      const y = ((l = s.formatOverrides) == null ? void 0 : l[u.name]) ?? [...u.formats];
+      u.name === "count" && y.length === 0 && y.push({ name: "number", options: {} });
+      for (const h of y) {
+        const k = a(this, tt).get(h.name);
+        if (k == null) {
           const E = new Error(
             `Failed to load format '${h.name}' when processing '${e}', template: ${o}`
           );
-          throw i(this, N).crash(E), E;
+          throw a(this, j).crash(E), E;
         }
-        b = x(t, b, h.options);
+        m = k(t, m, h.options);
       }
-      c += b;
+      c += m;
     }
   return c;
 }, Et = function(t, e) {
-  return new Intl.NumberFormat(i(this, R).get(), e).format(t);
-}, kt = function(t, e) {
-  return new Intl.DateTimeFormat(i(this, R).get(), e).format(M(t) ? new Date(t) : t);
+  return new Intl.NumberFormat(a(this, _).call(this), e).format(t);
+}, $t = function(t, e) {
+  return new Intl.DateTimeFormat(a(this, _).call(this), e).format(q(t) ? new Date(t) : t);
 }, Rt = function(t, e) {
-  return new Intl.ListFormat(i(this, R).get(), e).format(t);
+  return new Intl.ListFormat(a(this, _).call(this), e).format(t);
 }, // relativeTime(): State<string> {
 // }
 Ht = function(t, e) {
-  for (const s of i(this, Z))
-    if (s[0] === t && Jt(s[1], e))
+  for (const s of a(this, Z))
+    if (s[0] === t && Yt(s[1], e))
       return s[2];
 };
-function Re(a, t) {
+function _e(i, t) {
   const e = String(t).split(/[\.\[\]]/).filter((n) => n.trim() !== "");
-  let s = a;
+  let s = i;
   for (; e.length > 0; ) {
     const n = e.shift();
     s != null ? s = s[n] : s = void 0;
   }
   return s;
 }
-function $e(a) {
-  return $(
+function Me(i) {
+  return M(
     "div",
     {
       style: {
@@ -908,15 +957,15 @@ function $e(a) {
         fontSize: "20px"
       }
     },
-    $("h1", { style: { marginBottom: "0.5rem" } }, "The app has crashed"),
-    $(
+    M("h1", { style: { marginBottom: "0.5rem" } }, "The app has crashed"),
+    M(
       "p",
       { style: { marginBottom: "0.25rem" } },
-      $("span", { style: { fontFamily: "monospace" } }, a.loggerName),
-      Xt(a.uid, $("span", { style: { fontFamily: "monospace", opacity: 0.5 } }, ` [uid: ${a.uid}]`)),
+      M("span", { style: { fontFamily: "monospace" } }, i.loggerName),
+      Zt(i.uid, M("span", { style: { fontFamily: "monospace", opacity: 0.5 } }, ` [uid: ${i.uid}]`)),
       " says:"
     ),
-    $(
+    M(
       "blockquote",
       {
         style: {
@@ -927,7 +976,7 @@ function $e(a) {
           marginBottom: "1rem"
         }
       },
-      $(
+      M(
         "span",
         {
           style: {
@@ -940,88 +989,88 @@ function $e(a) {
             fontWeight: "bold"
           }
         },
-        a.error.name
+        i.error.name
       ),
-      a.error.message
+      i.error.message
     ),
-    $("p", {}, "Please see the browser console for details.")
+    M("p", {}, "Please see the browser console for details.")
   );
 }
-var P, st, F, I, rt, A, nt, at, it, ot, O, lt, ct, pt;
-class _e {
+var F, st, O, V, rt, G, nt, it, at, ot, N, lt, ct, pt;
+class xe {
   constructor() {
     // TODO: Take these off the global Dolla object.
-    w(this, "http");
-    w(this, "i18n");
-    u(this, P, !1);
-    u(this, st, "production");
-    u(this, F);
-    u(this, I);
-    u(this, rt, $e);
-    u(this, A);
-    u(this, nt, []);
-    u(this, at, []);
-    u(this, it, []);
-    u(this, ot, []);
-    u(this, O, {
+    g(this, "http");
+    g(this, "i18n");
+    f(this, F, !1);
+    f(this, st, "production");
+    f(this, O);
+    f(this, V);
+    f(this, rt, Me);
+    f(this, G);
+    f(this, nt, []);
+    f(this, it, []);
+    f(this, at, []);
+    f(this, ot, []);
+    f(this, N, {
       root: this,
       stores: /* @__PURE__ */ new Map(),
       viewName: "Dolla"
     });
-    u(this, lt, {
+    f(this, lt, {
       info: "development",
       log: "development",
       warn: "development",
       error: !0
     });
-    u(this, ct, xt("*,-Dolla.*"));
+    f(this, ct, Pt("*,-Dolla.*"));
     // Registration functions for modules.
     // All modules will be registered before mount.
-    u(this, pt, []);
-    this.http = new we(), this.i18n = new ke(this);
+    f(this, pt, []);
+    this.http = new be(), this.i18n = new Se(this);
   }
   /**
    * True when the app is connected to a DOM node and displayed to the user.
    */
   get isMounted() {
-    return i(this, P);
+    return a(this, F);
   }
   /**
    * Get the current environment that this app is running in.
    * Environment affects which log messages will print and how much debugging info is included in the DOM.
    */
   getEnv() {
-    return i(this, st);
+    return a(this, st);
   }
   /**
    * Sets the environment that this app is running in.
    * Environment affects which log messages will print and how much debugging info is included in the DOM.
    */
   setEnv(t) {
-    d(this, st, t);
+    p(this, st, t);
   }
   /**
    * Sets the view that will be shown when the `crash` method is called on any logger.
    * When a crash is reported the app will be unmounted and replaced with this crash page.
    */
   setCrashView(t) {
-    d(this, rt, t);
+    p(this, rt, t);
   }
   /**
    * Returns the HTMLElement Dolla is mounted to. This will return undefined until Dolla.mount() is called.
    */
   getRootElement() {
-    return i(this, F);
+    return a(this, O);
   }
   /**
    * Returns the top level view Dolla is rendering inside the root element. This will return undefined until Dolla.mount() is called.
    */
   getRootView() {
-    return i(this, I);
+    return a(this, V);
   }
   provide(t, e) {
-    const s = new Yt(t, e);
-    if (s.attach(i(this, O)))
+    const s = new te(t, e);
+    if (s.attach(a(this, N)))
       return s.value;
     {
       let r = t.name ? `'${t.name}'` : "this store";
@@ -1033,7 +1082,7 @@ class _e {
    */
   get(t) {
     if (H(t)) {
-      const e = i(this, O).stores.get(t);
+      const e = a(this, N).stores.get(t);
       if (e == null)
         throw new Tt("Store not found on this context.");
       return e.value;
@@ -1041,26 +1090,27 @@ class _e {
       throw new Tt("Invalid store.");
   }
   async mount(t, e) {
-    if (i(this, P))
+    if (a(this, F))
       throw new Error("Dolla is already mounted.");
-    if (M(t)) {
+    if (q(t)) {
       const r = document.querySelector(t);
-      Lt(HTMLElement, r, `Selector '${t}' did not match any element.`), d(this, F, r);
+      qt(HTMLElement, r, `Selector '${t}' did not match any element.`), p(this, O, r);
     } else
-      Lt(HTMLElement, t, "Expected an HTML element or a selector string. Got type: %t, value: %v"), d(this, F, t);
-    gt(e) && d(this, A, e);
-    const s = gt(e) ? Ut : e, n = $(s);
-    d(this, I, this.constructView(n.type, n.props)), await Promise.all(i(this, pt).map((r) => r())), gt(e) && await ue(e, this), await Promise.all(i(this, nt).map((r) => r())), i(this, I).mount(i(this, F)), d(this, P, !0);
-    for (const r of i(this, O).stores.values())
+      qt(HTMLElement, t, "Expected an HTML element or a selector string. Got type: %t, value: %v"), p(this, O, t);
+    yt(e) && p(this, G, e);
+    const s = yt(e) ? Ot : e, n = M(s);
+    p(this, V, this.constructView(n.type, n.props)), await Promise.all(a(this, pt).map((r) => r())), await Promise.all(a(this, nt).map((r) => r()));
+    for (const r of a(this, N).stores.values())
       r.handleMount();
-    for (const r of i(this, at))
+    yt(e) && await de(e, this), a(this, V).mount(a(this, O)), p(this, F, !0);
+    for (const r of a(this, it))
       r();
   }
   async unmount() {
     var t;
-    if (i(this, P)) {
-      await Promise.all(i(this, it).map((e) => e())), (t = i(this, I)) == null || t.unmount(!1), i(this, A) && await fe(i(this, A)), d(this, P, !1);
-      for (const e of i(this, ot))
+    if (a(this, F)) {
+      await Promise.all(a(this, at).map((e) => e())), (t = a(this, V)) == null || t.unmount(!1), a(this, G) && await me(a(this, G)), p(this, F, !1);
+      for (const e of a(this, ot))
         e();
     }
   }
@@ -1069,26 +1119,26 @@ class _e {
    * it will be awaited before mounting finishes. Use this to perform initial setup before the app is displayed to the user.
    */
   beforeMount(t) {
-    i(this, nt).push(t);
+    a(this, nt).push(t);
   }
   /**
    * Registers a `callback` to run after the app is mounted.
    */
   onMount(t) {
-    i(this, at).push(t);
+    a(this, it).push(t);
   }
   /**
    * Registers a `callback` to run after `Dolla.unmount` is called, before the app is unmounted. If `callback` returns a Promise,
    * it will be awaited before unmounting finishes. Use this to perform cleanup.
    */
   beforeUnmount(t) {
-    i(this, it).push(t);
+    a(this, at).push(t);
   }
   /**
    * Registers a `callback` to run after the app is unmounted.
    */
   onUnmount(t) {
-    i(this, ot).push(t);
+    a(this, ot).push(t);
   }
   /**
    * Update log type toggles. Values that are not passed will remain unchanged.
@@ -1096,22 +1146,22 @@ class _e {
   setLoggles(t) {
     for (const e in t) {
       const s = t[e];
-      s && (i(this, lt)[e] = s);
+      s && (a(this, lt)[e] = s);
     }
   }
   setLogFilter(t) {
-    d(this, ct, xt(t));
+    p(this, ct, Pt(t));
   }
   createLogger(t, e) {
-    const s = (e == null ? void 0 : e.console) ?? Se(), n = this, r = i(this, lt), o = (c) => {
-      if (r[c] === !1 || M(r[c]) && r[c] !== n.getEnv() || !i(this, ct).call(this, t))
-        return se;
+    const s = (e == null ? void 0 : e.console) ?? Pe(), n = this, r = a(this, lt), o = (c) => {
+      if (r[c] === !1 || q(r[c]) && r[c] !== n.getEnv() || !a(this, ct).call(this, t))
+        return ne;
       {
         let l = `%c${t}`;
         return e != null && e.uid ? l += ` %c[uid: %c${e.uid}%c]` : l += "%c%c%c", s[c].bind(
           s,
           l,
-          `color:${re(l)};font-weight:bold`,
+          `color:${ie(l)};font-weight:bold`,
           "color:#777",
           "color:#aaa",
           "color:#777"
@@ -1135,11 +1185,11 @@ class _e {
         return o("error");
       },
       crash(c) {
-        n.isMounted && (n.unmount(), n.constructView(i(n, rt), {
+        n.isMounted && (n.unmount(), n.constructView(a(n, rt), {
           error: c,
           loggerName: t,
           uid: e == null ? void 0 : e.uid
-        }).mount(i(n, F)));
+        }).mount(a(n, O)));
       }
     };
   }
@@ -1147,46 +1197,41 @@ class _e {
    *
    */
   constructView(t, e, s = []) {
-    return new Zt(i(this, O), t, e, s);
+    return new ee(a(this, N), t, e, s);
   }
   /**
    *
    */
   constructMarkup(t) {
-    return te(ee(i(this, O), t));
+    return se(re(a(this, N), t));
   }
 }
-P = new WeakMap(), st = new WeakMap(), F = new WeakMap(), I = new WeakMap(), rt = new WeakMap(), A = new WeakMap(), nt = new WeakMap(), at = new WeakMap(), it = new WeakMap(), ot = new WeakMap(), O = new WeakMap(), lt = new WeakMap(), ct = new WeakMap(), pt = new WeakMap();
-function Se() {
+F = new WeakMap(), st = new WeakMap(), O = new WeakMap(), V = new WeakMap(), rt = new WeakMap(), G = new WeakMap(), nt = new WeakMap(), it = new WeakMap(), at = new WeakMap(), ot = new WeakMap(), N = new WeakMap(), lt = new WeakMap(), ct = new WeakMap(), pt = new WeakMap();
+function Pe() {
   if (typeof window < "u" && window.console)
     return window.console;
   if (typeof global < "u" && global.console)
     return global.console;
 }
-const Q = new _e(), Ne = Q.i18n.t.bind(Q.i18n), Pe = Q.http, Fe = Q.createLogger.bind(Q);
+const Q = new xe(), je = Q.i18n.t.bind(Q.i18n), Fe = Q.i18n, Oe = Q.http, Ne = Q.createLogger.bind(Q);
 export {
-  Ot as atom,
-  U as compose,
-  Xt as cond,
-  Fe as createLogger,
+  R as $,
+  Ne as createLogger,
   Le as createRouter,
-  Jt as deepEqual,
+  Yt as deepEqual,
   Q as default,
-  je as effect,
+  Ce as effect,
   ht as get,
-  Ce as getTracked,
-  Pe as http,
-  De as list,
-  $ as markup,
-  Ie as peek,
+  Oe as http,
+  Fe as i18n,
+  M as markup,
+  Jt as peek,
   Ve as portal,
-  Te as ref,
-  qe as set,
-  St as shallowEqual,
-  Ge as strictEqual,
-  Ne as t,
+  De as repeat,
+  Mt as shallowEqual,
+  Ae as strictEqual,
+  je as t,
   We as unless,
-  Ae as untrack,
-  He as when
+  Zt as when
 };
 //# sourceMappingURL=index.js.map