@manyducks.co/dolla 2.0.0-alpha.40 → 2.0.0-alpha.42

package/dist/index.js

@@ -1,51 +1,51 @@
 var zt = Object.defineProperty;
-var kt = (i) => {
-  throw TypeError(i);
+var $t = (a) => {
+  throw TypeError(a);
 };
-var Bt = (i, t, e) => t in i ? zt(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var w = (i, t, e) => Bt(i, typeof t != "symbol" ? t + "" : t, e), mt = (i, t, e) => t.has(i) || kt("Cannot " + e);
-var a = (i, t, e) => (mt(i, t, "read from private field"), e ? e.call(i) : t.get(i)), u = (i, t, e) => t.has(i) ? kt("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(i) : t.set(i, e), d = (i, t, e, s) => (mt(i, t, "write to private field"), s ? s.call(i, e) : t.set(i, e), e), f = (i, t, e) => (mt(i, t, "access private method"), e);
-var Rt = (i, t, e, s) => ({
-  set _(n) {
-    d(i, t, n, e);
+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), mt = (a, t, e) => t.has(a) || $t("Cannot " + e);
+var i = (a, t, e) => (mt(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) => (mt(a, t, "write to private field"), s ? s.call(a, e) : t.set(a, e), e), f = (a, t, e) => (mt(a, t, "access private method"), e);
+var Rt = (a, t, e, s) => ({
+  set _(r) {
+    d(a, t, r, e);
   },
   get _() {
-    return a(i, t, s);
+    return i(a, t, s);
   }
 });
-import { a as Kt, b as Ft, i as z, I as Ot, c as Ut, d as U, g as E, s as _t, e as Qt, f as M, h as D, P as jt, j as Jt, t as St, k as Xt, l as Mt, m as xt, S as Yt, n as Tt, o as Nt, p as Zt, V as te, q as ee, r as se, u as re, v as ne } from "./markup-DIfh0nwz.js";
-import { w as Ue, B as je, y as Ce, A as Ie, x as Ve, z as De } from "./markup-DIfh0nwz.js";
-function Ne(i) {
+import { a as Kt, b as Ft, i as H, I as Ot, c as Ut, d as O, s as _t, e as Qt, f as S, g as V, P as jt, h as Jt, t as St, j as lt, k as Xt, l as Mt, m as xt, S as Yt, n as Tt, o as Nt, p as Zt, V as te, q as ee, r as se, u as ne, v as re } from "./markup-DQdkb3ri.js";
+import { w as Ue, z as je, C as Ce, y as Ie, B as Ve, x as De, A as qe } from "./markup-DQdkb3ri.js";
+function Ne(a) {
   return function() {
     if (arguments.length === 1)
-      i = arguments[0];
+      a = arguments[0];
     else if (arguments.length > 1)
       throw new Error(`Too many arguments. Expected 0 or 1. Got: ${arguments.length}`);
-    return i;
+    return a;
   };
 }
-function K(i) {
-  return Ft(i, "Expected `path` to be a string. Got type: %t, value: %v"), i.split("/").map((t) => t.trim()).filter((t) => t !== "");
+function B(a) {
+  return Ft(a, "Expected `path` to be a string. Got type: %t, value: %v"), a.split("/").map((t) => t.trim()).filter((t) => t !== "");
 }
-function G(i) {
+function q(a) {
   var e;
   Kt(
-    (s) => z(s == null ? void 0 : s.toString),
-    i,
+    (s) => H(s == null ? void 0 : s.toString),
+    a,
     "Expected `parts` to be an array of objects with a .toString() method. Got type: %t, value: %v"
-  ), i = i.filter((s) => s).flatMap(String);
-  let t = (e = i.shift()) == null ? void 0 : e.toString();
+  ), a = a.filter((s) => s).flatMap(String);
+  let t = (e = a.shift()) == null ? void 0 : e.toString();
   if (t) {
-    for (const s of i.map((n) => n.toString()))
+    for (const s of a.map((r) => r.toString()))
       s.startsWith(".") ? t = ct(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 ct(i, t) {
-  if (Ft(i, "Expected `base` to be a string. Got type: %t, value: %v"), t == null && (t = i, i = ""), t.startsWith("/"))
+function ct(a, t) {
+  if (Ft(a, "Expected `base` to be a string. Got type: %t, value: %v"), t == null && (t = a, a = ""), t.startsWith("/"))
     return t;
-  let e = i;
+  let e = a;
   for (; ; )
     if (t.startsWith("..")) {
       for (let s = e.length; s > 0; --s)
@@ -57,71 +57,71 @@ function ct(i, t) {
       t = t.replace(/^\.\/?/, "");
     else
       break;
-  return G([e, t]);
+  return q([e, t]);
 }
-function ae(i) {
-  if (!i) return {};
-  i.startsWith("?") && (i = i.slice(1));
-  const t = i.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(a) {
+  if (!a) return {};
+  a.startsWith("?") && (a = a.slice(1));
+  const t = a.split("&").filter((e) => e.trim() !== "").map((e) => {
+    const [s, r] = e.split("=").map((n) => n.trim());
+    return r.toLowerCase() === "true" ? [s, !0] : r.toLowerCase() === "false" ? [s, !1] : isNaN(Number(r)) ? [s, r] : [s, Number(r)];
   });
   return Object.fromEntries(t);
 }
-function Ct(i, t, e = {}) {
+function Ct(a, t, e = {}) {
   var o;
-  const [s, n] = t.split("?"), r = K(s);
-  t: for (const c of i) {
+  const [s, r] = t.split("?"), n = B(s);
+  t: for (const c of a) {
     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))
+    if (!(((o = l[l.length - 1]) == null ? void 0 : o.type) === 3) && l.length !== n.length || e.willMatch && !e.willMatch(c))
       continue t;
-    const v = [];
+    const b = [];
     e: for (let h = 0; h < l.length; h++) {
-      const x = r[h], k = l[h];
-      if (x == null && k.type !== 3)
+      const M = n[h], k = l[h];
+      if (M == null && k.type !== 3)
         continue t;
       switch (k.type) {
         case 1:
-          if (k.name.toLowerCase() === x.toLowerCase()) {
-            v.push(k);
+          if (k.name.toLowerCase() === M.toLowerCase()) {
+            b.push(k);
             break;
           } else
             continue t;
         case 2:
-          v.push({ ...k, value: x });
+          b.push({ ...k, value: M });
           break;
         case 3:
-          v.push({ ...k, value: r.slice(h).join("/") });
+          b.push({ ...k, value: n.slice(h).join("/") });
           break e;
         case 4:
-          if (isNaN(Number(x)))
+          if (isNaN(Number(M)))
             continue t;
-          v.push({ ...k, value: Number(x) });
+          b.push({ ...k, value: Number(M) });
           break;
         default:
           throw new Error(`Unknown fragment type: ${k.type}`);
       }
     }
-    const $ = {};
-    for (const h of v)
-      h.type === 2 && ($[h.name] = decodeURIComponent(h.value)), h.type === 4 && ($[h.name] = h.value), h.type === 3 && ($.wildcard = "/" + decodeURIComponent(h.value));
+    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));
     return {
-      path: "/" + v.map((h) => h.value).join("/"),
+      path: "/" + b.map((h) => h.value).join("/"),
       pattern: "/" + l.map((h) => h.type === 2 ? `{${h.name}}` : h.type === 4 ? `{#${h.name}}` : h.name).join("/"),
-      params: $,
-      query: ae(n),
+      params: v,
+      query: ae(r),
       meta: c.meta
     };
   }
 }
-function ie(i) {
-  const t = [], e = [], s = [], n = [];
-  for (const o of i) {
+function ie(a) {
+  const t = [], e = [], s = [], r = [];
+  for (const o of a) {
     const { fragments: c } = o;
     c.some(
       (l) => l.type === 3
       /* Wildcard */
-    ) ? n.push(o) : c.some(
+    ) ? r.push(o) : c.some(
       (l) => l.type === 4
       /* NumericParam */
     ) ? e.push(o) : c.some(
@@ -129,121 +129,121 @@ function ie(i) {
       /* Param */
     ) ? s.push(o) : t.push(o);
   }
-  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];
+  const n = (o, c) => o.fragments.length > c.fragments.length ? -1 : 1;
+  return t.sort(n), e.sort(n), s.sort(n), r.sort(n), [...t, ...e, ...s, ...r];
 }
-function oe(i) {
-  const t = K(i), e = [];
+function oe(a) {
+  const t = B(a), e = [];
   for (let s = 0; s < t.length; s++) {
-    const n = t[s];
-    if (n === "*") {
+    const r = t[s];
+    if (r === "*") {
       if (s !== t.length - 1)
-        throw new Error(`Wildcard must be at the end of a pattern. Received: ${i}`);
+        throw new Error(`Wildcard must be at the end of a pattern. Received: ${a}`);
       e.push({
         type: 3,
         name: "*",
         value: null
       });
-    } else n.at(0) === "{" && n.at(-1) === "}" ? e.push({
-      type: n[1] === "#" ? 4 : 2,
-      name: n[1] === "#" ? n.slice(2, -1) : n.slice(1, -1),
+    } else r.at(0) === "{" && r.at(-1) === "}" ? e.push({
+      type: r[1] === "#" ? 4 : 2,
+      name: r[1] === "#" ? r.slice(2, -1) : r.slice(1, -1),
       value: null
     }) : e.push({
       type: 1,
-      name: n,
-      value: n
+      name: r,
+      value: r
     });
   }
   return e;
 }
-function Pe(i) {
-  return new he(i);
+function Pe(a) {
+  return new he(a);
 }
 const It = Symbol.for("DollaRouterMountMethod"), Vt = Symbol.for("DollaRouterUnmountMethod");
-function pt(i) {
-  return (i == null ? void 0 : i[Ot]) === !0;
+function pt(a) {
+  return (a == null ? void 0 : a[Ot]) === !0;
 }
-async function le(i, t) {
-  return i[It](t);
+async function le(a, t) {
+  return a[It](t);
 }
-async function ce(i) {
-  return i[Vt]();
+async function ce(a) {
+  return a[Vt]();
 }
-var Lt, Q, S, ht, T, W, J, j, C, N, m, wt, Dt, qt, B, Gt, gt, yt;
+var Lt, K, _, ht, x, G, Q, U, j, T, m, wt, Dt, qt, z, Gt, gt, yt;
 class he {
   constructor(t) {
     u(this, m);
     w(this, Lt, !0);
-    u(this, Q);
-    u(this, S);
+    u(this, K);
+    u(this, _);
     u(this, ht, 0);
-    u(this, T, []);
-    u(this, W, []);
-    u(this, J, !1);
+    u(this, x, []);
+    u(this, G, []);
+    u(this, Q, !1);
     /**
      * Use hash routing when true. Configured in router options.
      */
-    u(this, j, !1);
+    u(this, U, !1);
     // Callbacks that need to be called on unmount.
-    u(this, C, []);
+    u(this, j, []);
     /**
      * The current match object.
      */
-    u(this, N, Ut());
+    u(this, T, Ut());
     /**
      * The currently matched route pattern, if any.
      */
-    w(this, "pattern", U(() => {
+    w(this, "pattern", O(() => {
       var t;
-      return (t = E(a(this, N))) == null ? void 0 : t.pattern;
+      return (t = i(this, T).get()) == null ? void 0 : t.pattern;
     }));
     /**
      * The current URL path.
      */
-    w(this, "path", U(() => {
+    w(this, "path", O(() => {
       var t;
-      return ((t = E(a(this, N))) == null ? void 0 : t.path) ?? window.location.pathname;
+      return ((t = i(this, T).get()) == null ? void 0 : t.path) ?? window.location.pathname;
     }));
     /**
      * The current named path params.
      */
-    w(this, "params", U(() => {
+    w(this, "params", O(() => {
       var t;
-      return ((t = E(a(this, N))) == null ? void 0 : t.params) ?? {};
+      return ((t = i(this, T).get()) == null ? void 0 : t.params) ?? {};
     }, { equals: _t }));
     /**
      * The current query params. Changes to this object will be reflected in the URL.
      */
-    w(this, "query", U(() => {
+    w(this, "query", O(() => {
       var t;
-      return ((t = E(a(this, N))) == null ? void 0 : t.query) ?? {};
+      return ((t = i(this, T).get()) == null ? void 0 : t.query) ?? {};
     }, { equals: _t }));
-    Qt(t, "Options must be an object. Got: %t"), t.hash && d(this, j, !0), d(this, W, ie(
+    Qt(t, "Options must be an object. Got: %t"), t.hash && d(this, U, !0), d(this, G, ie(
       t.routes.flatMap((e) => f(this, m, yt).call(this, e)).map((e) => ({
         pattern: e.pattern,
         meta: e.meta,
         fragments: oe(e.pattern)
       }))
-    )), pe(a(this, W));
+    )), pe(i(this, G));
   }
   async [(Lt = Ot, It)](t) {
-    d(this, Q, t), d(this, S, t.createLogger("Dolla.router"));
+    d(this, K, t), d(this, _, t.createLogger("Dolla.router"));
     const e = () => {
-      f(this, m, B).call(this);
+      f(this, m, z).call(this);
     };
-    window.addEventListener("popstate", e), a(this, C).push(() => window.removeEventListener("popstate", e));
+    window.addEventListener("popstate", e), i(this, j).push(() => window.removeEventListener("popstate", e));
     const s = t.getRootElement();
-    a(this, C).push(
-      de(s, (n) => {
-        let r = n.getAttribute("href");
-        a(this, S).info("intercepted click on <a> tag", n), /^https?:\/\/|^\//.test(r) || (r = G([window.location.pathname, r])), f(this, m, wt).call(this, r);
+    i(this, j).push(
+      de(s, (r) => {
+        let n = r.getAttribute("href");
+        i(this, _).info("intercepted click on <a> tag", r), /^https?:\/\/|^\//.test(n) || (n = q([window.location.pathname, n])), f(this, m, wt).call(this, n);
       })
-    ), a(this, S).info("will intercept clicks on <a> tags within root element", s), d(this, J, !0), await f(this, m, B).call(this);
+    ), i(this, _).info("will intercept clicks on <a> tags within root element", s), d(this, Q, !0), await f(this, m, z).call(this);
   }
   async [Vt]() {
-    for (const t of a(this, C))
+    for (const t of i(this, j))
       t();
-    d(this, C, []);
+    d(this, j, []);
   }
   /**
    * Navigate backward. Pass a number of steps to hit the back button that many times.
@@ -266,71 +266,83 @@ class he {
    */
   go(t, e = {}) {
     let s;
-    Array.isArray(t) ? s = G(t) : s = t.toString(), s = ct(window.location.pathname, s), e.preserveQuery && (s += window.location.search), e.replace ? f(this, m, Dt).call(this, s) : f(this, m, wt).call(this, s);
+    Array.isArray(t) ? s = q(t) : s = t.toString(), s = ct(window.location.pathname, s), e.preserveQuery && (s += window.location.search), e.replace ? f(this, m, Dt).call(this, s) : f(this, m, wt).call(this, s);
   }
 }
-Q = new WeakMap(), S = new WeakMap(), ht = new WeakMap(), T = new WeakMap(), W = new WeakMap(), J = new WeakMap(), j = new WeakMap(), C = new WeakMap(), N = new WeakMap(), m = new WeakSet(), wt = function(t, e) {
+K = new WeakMap(), _ = new WeakMap(), ht = new WeakMap(), x = new WeakMap(), G = new WeakMap(), Q = new WeakMap(), U = new WeakMap(), j = new WeakMap(), T = new WeakMap(), m = new WeakSet(), wt = function(t, e) {
   var s;
-  (s = a(this, S)) == null || s.info("(push)", t), window.history.pushState(e, "", a(this, j) ? "/#" + t : t), f(this, m, B).call(this, t);
+  (s = i(this, _)) == null || s.info("(push)", t), window.history.pushState(e, "", i(this, U) ? "/#" + t : t), f(this, m, z).call(this, t);
 }, Dt = function(t, e) {
   var s;
-  (s = a(this, S)) == null || s.info("(replace)", t), window.history.replaceState(e, "", a(this, j) ? "/#" + t : t), f(this, m, B).call(this, t);
+  (s = i(this, _)) == null || s.info("(replace)", t), window.history.replaceState(e, "", i(this, U) ? "/#" + t : t), f(this, m, z).call(this, t);
 }, qt = function() {
-  return a(this, j) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
-}, B = async function(t) {
+  return i(this, U) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
+}, z = async function(t) {
   var c;
-  const e = a(this, S), s = (c = a(this, Q)) == 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, gt).call(this, n);
-  if (r) {
-    const l = this.pattern.value;
-    a(this, N).value = r, s && r.pattern !== l && f(this, m, Gt).call(this, s, r);
+  const e = i(this, _), s = (c = i(this, K)) == null ? void 0 : c.getRootView(), r = t ? new URL(t, window.location.origin) : f(this, m, qt).call(this), { match: n, journey: o } = await f(this, m, gt).call(this, r);
+  for (const l of o)
+    switch (l.kind) {
+      case "match":
+        e == null || e.info(`📍 ${l.message}`);
+        break;
+      case "redirect":
+        e == null || e.info(`↩️ ${l.message}`);
+        break;
+      case "miss":
+        e == null || e.info(`💀 ${l.message}`);
+        break;
+    }
+  if (n) {
+    const l = this.pattern.peek();
+    i(this, T).set(n), s && n.pattern !== l && f(this, m, Gt).call(this, s, n);
   } else
-    a(this, J) && e.crash(new we(`Failed to match route '${n.pathname}'`));
-  return { match: r, journey: o };
+    i(this, Q) && e.crash(new we(`Failed to match route '${r.pathname}'`));
+  return { match: n, journey: o };
 }, /**
  * Takes a matched route and mounts it.
  */
 Gt = function(t, e) {
   const s = e.meta.layers;
-  for (let n = 0; n < s.length; n++) {
-    const r = s[n], o = a(this, T)[n];
-    if ((o == null ? void 0 : o.id) !== r.id) {
-      d(this, T, a(this, T).slice(0, n)), o == null || o.view.unmount();
-      const c = a(this, T).at(-1), p = ((c == null ? void 0 : c.view) ?? t).setChildView(r.view);
-      a(this, T).push({ id: r.id, view: p });
+  for (let r = 0; r < s.length; r++) {
+    const n = s[r], o = i(this, x)[r];
+    if ((o == null ? void 0 : o.id) !== n.id) {
+      d(this, x, i(this, x).slice(0, r)), o == null || o.view.unmount();
+      const c = i(this, x).at(-1), p = ((c == null ? void 0 : c.view) ?? t).setChildView(n.view);
+      i(this, x).push({ id: n.id, view: p });
     }
   }
 }, gt = async function(t, e = []) {
-  const s = Ct(a(this, W), t.pathname);
+  const s = Ct(i(this, G), t.pathname);
   if (!s)
     return {
       match: null,
       journey: [...e, { kind: "miss", message: `no match for '${t.pathname}'` }]
     };
-  let n = s.meta.redirect;
+  let r = 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;
+    redirect: (n) => {
+      r = n;
     }
-  }), n != null) {
-    let r;
-    if (M(n))
-      r = me(n, s.params);
-    else if (z(n)) {
+  }), r != null) {
+    let n;
+    if (S(r))
+      n = me(r, s.params);
+    else if (H(r)) {
       const o = {
         path: s.path,
         pattern: s.pattern,
         params: s.params,
         query: s.query
       };
-      if (r = await n(o), !M(r))
+      if (n = await r(o), !S(n))
         throw new Error("Redirect function must return a path to redirect to.");
-      r.startsWith("/") || (r = ct(s.path, r));
+      n.startsWith("/") || (n = ct(s.path, n));
     } else
       throw new TypeError("Redirect must either be a path string or a function.");
-    return f(this, m, gt).call(this, new URL(r, window.location.origin), [
+    return f(this, m, gt).call(this, new URL(n, window.location.origin), [
       ...e,
-      { kind: "redirect", message: `redirecting '${s.path}' -> '${r}'` }
+      { kind: "redirect", message: `redirecting '${s.path}' -> '${n}'` }
     ]);
   } else
     return { match: s, journey: [...e, { kind: "match", message: `matched route '${s.path}'` }] };
@@ -341,7 +353,7 @@ Gt = function(t, e) {
  * @param layers - Array of parent layers. Passed when this function calls itself on nested routes.
  */
 yt = function(t, e = [], s = []) {
-  if (!D(t) || !M(t.path))
+  if (!V(t) || !S(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'.");
@@ -349,70 +361,70 @@ yt = function(t, e = [], s = []) {
     throw new Error("Route cannot have both a 'redirect' and a 'view'.");
   if (!t.view && !t.routes && !t.redirect)
     throw new Error("Route must have a 'view', a 'redirect', or a set of nested 'routes'.");
-  let n = [];
+  let r = [];
   for (const l of e)
-    n.push(...K(l.path));
-  n.push(...K(t.path)), n[n.length - 1] === "*" && n.pop();
-  const r = [];
+    r.push(...B(l.path));
+  r.push(...B(t.path)), r[r.length - 1] === "*" && r.pop();
+  const n = [];
   if (t.redirect) {
     let l = t.redirect;
-    return M(l) && (l = ct(G(n), l), l.startsWith("/") || (l = "/" + l)), r.push({
-      pattern: "/" + G([...n, ...K(t.path)]),
+    return S(l) && (l = ct(q(r), l), l.startsWith("/") || (l = "/" + l)), n.push({
+      pattern: "/" + q([...r, ...B(t.path)]),
       meta: {
         redirect: l
       }
-    }), r;
+    }), n;
   }
   let o = jt;
-  if (z(t.view))
+  if (H(t.view))
     o = t.view;
   else if (t.view)
     throw new TypeError(`Route '${t.path}' expected a view function or undefined. Got: ${t.view}`);
   const c = { id: Rt(this, ht)._++, view: o };
   if (t.routes)
     for (const l of t.routes)
-      r.push(...f(this, m, yt).call(this, l, [...e, t], [...s, c]));
+      n.push(...f(this, m, yt).call(this, l, [...e, t], [...s, c]));
   else
-    r.push({
-      pattern: parent ? G([...e.map((l) => l.path), t.path]) : t.path,
+    n.push({
+      pattern: parent ? q([...e.map((l) => l.path), t.path]) : t.path,
       meta: {
         pattern: t.path,
         layers: [...s, c],
         beforeMatch: t.beforeMatch
       }
     });
-  return r;
+  return n;
 };
 const ue = /(noopener|noreferrer) (noopener|noreferrer)/, fe = /^[\w-_]+:/;
-function de(i, t, e = window) {
-  function s(r) {
-    return !r || r === i ? null : r.localName !== "a" || r.href === void 0 ? s(r.parentNode) : r;
+function de(a, t, e = window) {
+  function s(n) {
+    return !n || n === a ? null : n.localName !== "a" || n.href === void 0 ? s(n.parentNode) : n;
   }
-  function n(r) {
-    if (r.button && r.button !== 0 || r.ctrlKey || r.metaKey || r.altKey || r.shiftKey || r.defaultPrevented)
+  function r(n) {
+    if (n.button && n.button !== 0 || n.ctrlKey || n.metaKey || n.altKey || n.shiftKey || n.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" && ue.test(o.getAttribute("rel")) || fe.test(o.getAttribute("href")) || (r.preventDefault(), t(o)));
+    const o = s(n.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" && ue.test(o.getAttribute("rel")) || fe.test(o.getAttribute("href")) || (n.preventDefault(), t(o)));
   }
-  return i.addEventListener("click", n), function() {
-    i.removeEventListener("click", n);
+  return a.addEventListener("click", r), function() {
+    a.removeEventListener("click", r);
   };
 }
-function me(i, t) {
+function me(a, t) {
   for (const e in t) {
     const s = t[e].toString();
-    i = i.replace(`{${e}}`, s).replace(`{#${e}}`, s);
+    a = a.replace(`{${e}}`, s).replace(`{#${e}}`, s);
   }
-  return i;
+  return a;
 }
-function pe(i) {
-  for (const t of i)
+function pe(a) {
+  for (const t of a)
     if (t.meta.redirect) {
       let e;
-      if (!z(t.meta.redirect)) if (M(t.meta.redirect)) {
-        if (e = t.meta.redirect, !Ct(i, e, {
-          willMatch(n) {
-            return n !== t;
+      if (!H(t.meta.redirect)) if (S(t.meta.redirect)) {
+        if (e = t.meta.redirect, !Ct(a, e, {
+          willMatch(r) {
+            return r !== t;
           }
         }))
           throw new Error(`Found a redirect to an undefined URL. From '${t.pattern}' to '${t.meta.redirect}'`);
@@ -422,11 +434,11 @@ function pe(i) {
 }
 class we extends Error {
 }
-var I, ut, R, _;
+var C, ut, E, R;
 class ge {
   constructor() {
-    u(this, R);
-    u(this, I, []);
+    u(this, E);
+    u(this, C, []);
     u(this, ut, ye());
   }
   /**
@@ -436,42 +448,42 @@ class ge {
    * @param middleware - A middleware function that will intercept requests.
    */
   use(t) {
-    return a(this, I).push(t), () => {
-      a(this, I).splice(a(this, I).indexOf(t), 1);
+    return i(this, C).push(t), () => {
+      i(this, C).splice(i(this, C).indexOf(t), 1);
     };
   }
   async get(t, e) {
-    return f(this, R, _).call(this, "get", t, e);
+    return f(this, E, R).call(this, "get", t, e);
   }
   async put(t, e) {
-    return f(this, R, _).call(this, "put", t, e);
+    return f(this, E, R).call(this, "put", t, e);
   }
   async patch(t, e) {
-    return f(this, R, _).call(this, "patch", t, e);
+    return f(this, E, R).call(this, "patch", t, e);
   }
   async post(t, e) {
-    return f(this, R, _).call(this, "post", t, e);
+    return f(this, E, R).call(this, "post", t, e);
   }
   async delete(t, e) {
-    return f(this, R, _).call(this, "delete", t, e);
+    return f(this, E, R).call(this, "delete", t, e);
   }
   async head(t, e) {
-    return f(this, R, _).call(this, "head", t, e);
+    return f(this, E, R).call(this, "head", t, e);
   }
   async options(t, e) {
-    return f(this, R, _).call(this, "options", t, e);
+    return f(this, E, R).call(this, "options", t, e);
   }
   async trace(t, e) {
-    return f(this, R, _).call(this, "trace", t, e);
+    return f(this, E, R).call(this, "trace", t, e);
   }
 }
-I = new WeakMap(), ut = new WeakMap(), R = new WeakSet(), _ = async function(t, e, s) {
-  return new Ee({
+C = new WeakMap(), ut = new WeakMap(), E = new WeakSet(), R = async function(t, e, s) {
+  return new ke({
     ...s,
     method: t,
     uri: e,
-    middleware: a(this, I),
-    fetch: a(this, ut)
+    middleware: i(this, C),
+    fetch: i(this, ut)
   }).fetch();
 };
 function ye() {
@@ -483,7 +495,7 @@ function ye() {
 }
 class be extends Error {
   constructor(e) {
-    const { status: s, statusText: n, method: r, url: o } = e, c = `${s} ${n}: Request failed (${r.toUpperCase()} ${o.toString()})`;
+    const { status: s, statusText: r, method: n, url: o } = e, c = `${s} ${r}: Request failed (${n.toUpperCase()} ${o.toString()})`;
     super(c);
     w(this, "response");
     this.response = e;
@@ -506,7 +518,7 @@ class ve {
         t.forEach((e, s) => {
           this.headers.set(s, e);
         });
-      else if (D(t))
+      else if (V(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));
@@ -520,7 +532,7 @@ class ve {
         t.forEach((e, s) => {
           this.url.searchParams.set(s, e);
         });
-      else if (D(t))
+      else if (V(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));
@@ -529,7 +541,7 @@ class ve {
         throw new TypeError(`Unknown query params type. Got: ${t}`);
   }
 }
-class Ee {
+class ke {
   constructor(t) {
     w(this, "_middleware");
     w(this, "_fetch");
@@ -540,8 +552,8 @@ class Ee {
   async fetch() {
     if (this._middleware.length > 0) {
       const t = (e = 0) => {
-        const s = this._middleware[e], n = this._middleware[e + 1] ? t(e + 1) : this._handler.bind(this);
-        return async () => s(this._request, async () => (await n(), this._response));
+        const s = this._middleware[e], r = this._middleware[e + 1] ? t(e + 1) : this._handler.bind(this);
+        return async () => s(this._request, async () => (await r(), this._response));
       };
       await t()();
     } else
@@ -554,46 +566,46 @@ class Ee {
   async _handler() {
     let t;
     const e = this._request;
-    !e.headers.has("content-type") && D(e.body) ? (e.headers.set("content-type", "application/json"), t = JSON.stringify(e.body)) : t = e.body;
+    !e.headers.has("content-type") && V(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,
       body: t
-    }), n = s.headers.get("content-type");
-    let r;
-    n != null && n.includes("application/json") ? r = await s.json() : n != null && n.includes("application/x-www-form-urlencoded") ? r = await s.formData() : r = await s.text(), this._response = {
+    }), r = s.headers.get("content-type");
+    let n;
+    r != null && r.includes("application/json") ? n = await s.json() : r != null && r.includes("application/x-www-form-urlencoded") ? n = await s.formData() : n = await s.text(), this._response = {
       method: e.method,
       url: e.url,
       status: s.status,
       statusText: s.statusText,
       headers: s.headers,
-      body: r
+      body: n
     };
   }
 }
-var ft, A, q, bt, Wt;
-class $e {
+var ft, W, D, bt, Wt;
+class Ee {
   constructor(t, e) {
-    u(this, q);
+    u(this, D);
     w(this, "dolla");
     w(this, "config");
     u(this, ft, !1);
-    u(this, A, /* @__PURE__ */ new Map());
+    u(this, W, /* @__PURE__ */ new Map());
     this.config = t, this.dolla = e;
   }
   async load() {
     let t;
-    if (!a(this, ft)) {
-      if (D(this.config.strings))
+    if (!i(this, ft)) {
+      if (V(this.config.strings))
         t = this.config.strings;
-      else if (z(this.config.fetch)) {
-        if (t = await this.config.fetch(), !D(t))
+      else if (H(this.config.fetch)) {
+        if (t = await this.config.fetch(), !V(t))
           throw new Error(`Fetch function did not return an object of language strings: ${t}`);
-      } else if (M(this.config.path)) {
+      } else if (S(this.config.path)) {
         const e = await fetch(this.config.path);
         if (e.ok) {
           const s = await e.json();
-          if (D(s))
+          if (V(s))
             t = s;
           else
             throw new Error(
@@ -604,34 +616,34 @@ class $e {
       }
     }
     if (t) {
-      const e = f(this, q, bt).call(this, t);
+      const e = f(this, D, bt).call(this, t);
       for (const s of e)
-        a(this, A).set(s[0], s[1]);
+        i(this, W).set(s[0], s[1]);
     } else
       throw new Error("Language could not be loaded.");
   }
   getTemplate(t) {
-    return a(this, A).get(t) ?? {
+    return i(this, W).get(t) ?? {
       segments: [{ type: 0, text: `[MISSING: ${t}]` }]
     };
   }
   hasTemplate(t) {
-    return a(this, A).has(t);
+    return i(this, W).has(t);
   }
 }
-ft = new WeakMap(), A = new WeakMap(), q = new WeakSet(), bt = function(t, e = []) {
+ft = new WeakMap(), W = new WeakMap(), D = new WeakSet(), bt = function(t, e = []) {
   const s = [];
-  for (const n in t)
-    switch (St(t[n])) {
+  for (const r in t)
+    switch (St(t[r])) {
       case "string":
-        s.push([[...e, n].join("."), f(this, q, Wt).call(this, t[n])]);
+        s.push([[...e, r].join("."), f(this, D, Wt).call(this, t[r])]);
         break;
       case "object":
-        s.push(...f(this, q, bt).call(this, t[n], [...e, n]));
+        s.push(...f(this, D, bt).call(this, t[r], [...e, r]));
         break;
       default:
         throw new Error(
-          `Expected to find a string or object at ${[...e, n].join(".")}. Got: ${St(t[n])}`
+          `Expected to find a string or object at ${[...e, r].join(".")}. Got: ${St(t[r])}`
         );
     }
   return s;
@@ -643,104 +655,104 @@ ft = new WeakMap(), A = new WeakMap(), q = new WeakSet(), bt = function(t, e = [
   const s = {
     segments: []
   };
-  let n = "", r = 0, o = 0, c, l, p;
-  const v = () => {
+  let r = "", n = 0, o = 0, c, l, p;
+  const b = () => {
     c = {
       type: 1,
       name: "",
       formats: []
     };
-  }, $ = () => {
+  }, v = () => {
     l = {
       name: "",
       options: {}
     };
   };
-  for (; r < t.length; ) {
-    if (o !== 0 && t[r] === " ") {
-      r++;
+  for (; n < t.length; ) {
+    if (o !== 0 && t[n] === " ") {
+      n++;
       continue;
     }
     switch (o) {
       case 0:
-        t[r] === "{" && t[r + 1] === "{" ? (o = 1, r += 2, n.length > 0 && (s.segments.push({ type: 0, text: n }), n = ""), v()) : (n += t[r], r++);
+        t[n] === "{" && t[n + 1] === "{" ? (o = 1, n += 2, r.length > 0 && (s.segments.push({ type: 0, text: r }), r = ""), b()) : (r += t[n], n++);
         break;
       case 1:
-        t[r] === "|" ? (o = 2, r += 1, c.name = n, n = "", $()) : t[r] === "}" && t[r + 1] === "}" ? (o = 0, r += 2, c.name = n, n = "", s.segments.push(c)) : (n += t[r], r++);
+        t[n] === "|" ? (o = 2, n += 1, c.name = r, r = "", v()) : t[n] === "}" && t[n + 1] === "}" ? (o = 0, n += 2, c.name = r, r = "", s.segments.push(c)) : (r += t[n], n++);
         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++);
+        t[n] === "(" ? (o = 3, n += 1, l.name = r, r = "") : t[n] === "}" && t[n + 1] === "}" ? (o = 0, n += 2, c.formats.push(l), s.segments.push(c)) : (r += t[n], n++);
         break;
       case 3:
-        t[r] === ")" || (t[r] === ":" ? (o = 4, r += 1, p = n, n = "") : t[r] === "}" && t[r + 1] === "}" || (n += t[r], r++));
+        t[n] === ")" || (t[n] === ":" ? (o = 4, n += 1, p = r, r = "") : t[n] === "}" && t[n + 1] === "}" || (r += t[n], n++));
         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[n] === ")" ? (o = 5, n += 1, l.options[p] = r, r = "", c.formats.push(l)) : t[n] === "," ? (o = 3, n += 1, l.options[p] = r, r = "") : t[n] === "}" && t[n + 1] === "}" || (r += t[n], n++);
         break;
       case 5:
-        t[r] === "|" ? (o = 2, r += 1, $()) : t[r] === "}" && t[r + 1] === "}" && (o = 0, r += 2, s.segments.push(c));
+        t[n] === "|" ? (o = 2, n += 1, v()) : t[n] === "}" && t[n + 1] === "}" && (o = 0, n += 2, s.segments.push(c));
         break;
     }
   }
-  return o === 0 && n.length > 0 && s.segments.push({ type: 0, text: n }), s;
+  return o === 0 && r.length > 0 && s.segments.push({ type: 0, text: r }), s;
 };
-var X, P, g, Y, Z, tt, b, y, At, vt, Et, $t, Ht;
-class ke {
+var J, N, g, X, Y, Z, $, y, At, vt, kt, Et, Ht;
+class $e {
   constructor(t) {
     u(this, y);
-    u(this, X);
-    u(this, P);
+    u(this, J);
+    u(this, N);
     u(this, g, /* @__PURE__ */ new Map());
-    u(this, Y, []);
-    u(this, Z, /* @__PURE__ */ new Map());
-    u(this, tt, "auto");
-    u(this, b, Ut(""));
-    d(this, X, t), d(this, P, t.createLogger("Dolla.i18n")), this.addFormat("number", (e, s, n) => f(this, y, vt).call(this, Number(s), n)), this.addFormat("datetime", (e, s, n) => f(this, y, Et).call(this, s, n)), this.addFormat("list", (e, s, n) => f(this, y, $t).call(this, s, n)), t.beforeMount(async () => {
-      a(this, g).size > 0 && await this.setLocale(a(this, tt));
+    u(this, X, []);
+    u(this, Y, /* @__PURE__ */ new Map());
+    u(this, Z, "auto");
+    u(this, $, Ut(""));
+    d(this, J, t), d(this, N, t.createLogger("Dolla.i18n")), this.addFormat("number", (e, s, r) => f(this, y, vt).call(this, Number(s), r)), this.addFormat("datetime", (e, s, r) => f(this, y, kt).call(this, s, r)), this.addFormat("list", (e, s, r) => f(this, y, Et).call(this, s, r)), t.beforeMount(async () => {
+      i(this, g).size > 0 && await this.setLocale(i(this, Z));
     });
   }
   get locale() {
-    return a(this, b);
+    return i(this, $);
   }
   get locales() {
-    return [...a(this, g).keys()];
+    return [...i(this, g).keys()];
   }
   setup(t) {
     if (t.translations.forEach((e) => {
-      a(this, g).set(e.locale, new $e(e, a(this, X)));
+      i(this, g).set(e.locale, new Ee(e, i(this, J)));
     }), 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, tt, t.locale);
+      d(this, Z, t.locale);
     }
-    a(this, P).info(
-      `${a(this, g).size} language${a(this, g).size === 1 ? "" : "s"} supported: '${[...a(this, g).keys()].join("', '")}'`
+    i(this, N).info(
+      `${i(this, g).size} language${i(this, g).size === 1 ? "" : "s"} supported: '${[...i(this, g).keys()].join("', '")}'`
     );
   }
   async setLocale(t) {
-    var n;
+    var r;
     let e;
     if (t === "auto") {
-      let r = [];
+      let n = [];
       if (typeof navigator < "u") {
         const o = navigator;
-        ((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);
+        ((r = o.languages) == null ? void 0 : r.length) > 0 ? n.push(...o.languages) : o.language ? n.push(o.language) : o.browserLanguage ? n.push(o.browserLanguage) : o.userLanguage && n.push(o.userLanguage);
       }
-      for (const o of r)
-        a(this, g).has(o) && (e = o);
+      for (const o of n)
+        i(this, g).has(o) && (e = o);
     } else
-      a(this, g).has(t) && (e = t);
+      i(this, g).has(t) && (e = t);
     if (e == null) {
-      const r = a(this, g).keys().next().value;
-      r && (e = r);
+      const n = i(this, g).keys().next().value;
+      n && (e = n);
     }
-    if (!e || !a(this, g).has(e))
+    if (!e || !i(this, g).has(e))
       throw new Error(`Locale '${t}' has no translation.`);
-    const s = a(this, g).get(e);
+    const s = i(this, g).get(e);
     try {
-      await s.load(), d(this, Y, []), a(this, b).value = e, a(this, P).info("set language to " + e);
-    } catch (r) {
-      r instanceof Error && a(this, P).crash(r);
+      await s.load(), d(this, X, []), i(this, $).set(e), i(this, N).info("set language to " + e);
+    } catch (n) {
+      n instanceof Error && i(this, N).crash(n);
     }
   }
   /**
@@ -757,11 +769,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 O(() => {
       const s = {};
-      for (const n in e)
-        s[n] = E(e[n]);
-      return f(this, y, At).call(this, E(a(this, b)), t, s);
+      for (const r in e)
+        s[r] = lt(e[r]);
+      return f(this, y, At).call(this, i(this, $).get(), t, s);
     });
   }
   /**
@@ -779,16 +791,16 @@ class ke {
    * t("greeting", {name: "world"}); // State<"Hello, WORLD!">
    */
   addFormat(t, e) {
-    a(this, Z).set(t, e);
+    i(this, Y).set(t, e);
   }
   /**
    * Creates an `Intl.Collator` configured for the current locale.
-   * NOTE: The Collator remains bound to the locale it was created with, even when the app's locale changes.
+   * NOTE: The locale is tracked if called within a signal tracking context.
    *
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Collator/Collator#options
    */
   collator(t) {
-    return new Intl.Collator(a(this, b).value, t);
+    return new Intl.Collator(i(this, $).get(), t);
   }
   /**
    * Formats a number for the current locale. Uses `Intl.NumberFormat` under the hood.
@@ -796,7 +808,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(() => (E(a(this, b)), f(this, y, vt).call(this, E(t), e)));
+    return O(() => f(this, y, vt).call(this, lt(t), e));
   }
   /**
    * Formats a date for the current locale. Uses `Intl.DateTimeFormat` under the hood.
@@ -808,7 +820,7 @@ class ke {
    * const $formatted = Dolla.i18n.dateTime(date, { dateFormat: "short" });
    */
   dateTime(t, e) {
-    return U(() => (E(a(this, b)), f(this, y, Et).call(this, E(t), e)));
+    return O(() => f(this, y, kt).call(this, lt(t), e));
   }
   /**
    * Formats a list for the current locale. Uses `Intl.ListFormat` under the hood.
@@ -820,67 +832,67 @@ class ke {
    * const $formatted = Dolla.i18n.list(list, {  });
    */
   list(t, e) {
-    return U(() => (E(a(this, b)), f(this, y, $t).call(this, E(t), e)));
+    return O(() => f(this, y, Et).call(this, lt(t), e));
   }
 }
-X = new WeakMap(), P = new WeakMap(), g = new WeakMap(), Y = new WeakMap(), Z = new WeakMap(), tt = new WeakMap(), b = new WeakMap(), y = new WeakSet(), At = function(t, e, s) {
+J = new WeakMap(), N = new WeakMap(), g = new WeakMap(), X = new WeakMap(), Y = new WeakMap(), Z = new WeakMap(), $ = new WeakMap(), y = new WeakSet(), At = function(t, e, s) {
   var l;
-  const n = f(this, y, Ht).call(this, e, s);
-  if (n) return n;
-  const r = a(this, g).get(t);
+  const r = f(this, y, Ht).call(this, e, s);
+  if (r) return r;
+  const n = i(this, g).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);
+      n.hasTemplate(p) ? e = p : 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);
+      n.hasTemplate(p) ? e = p : e += "_" + new Intl.PluralRules(t).select(s.count);
     }
-  const o = r.getTemplate(e);
+  const o = n.getTemplate(e);
   let c = "";
   for (const p of o.segments)
     if (p.type === 0)
       c += p.text;
     else if (p.type === 1) {
-      let v = Re(s, p.name);
-      const $ = ((l = s.formatOverrides) == null ? void 0 : l[p.name]) ?? [...p.formats];
-      p.name === "count" && $.length === 0 && $.push({ name: "number", options: {} });
-      for (const h of $) {
-        const x = a(this, Z).get(h.name);
-        if (x == null) {
+      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 M = i(this, Y).get(h.name);
+        if (M == null) {
           const k = new Error(
             `Failed to load format '${h.name}' when processing '${e}', template: ${o}`
           );
-          throw a(this, P).crash(k), k;
+          throw i(this, N).crash(k), k;
         }
-        v = x(t, v, h.options);
+        b = M(t, b, h.options);
       }
-      c += v;
+      c += b;
     }
   return c;
 }, vt = function(t, e) {
-  return new Intl.NumberFormat(a(this, b).value, e).format(t);
+  return new Intl.NumberFormat(i(this, $).get(), e).format(t);
+}, kt = function(t, e) {
+  return new Intl.DateTimeFormat(i(this, $).get(), e).format(S(t) ? new Date(t) : t);
 }, Et = function(t, e) {
-  return new Intl.DateTimeFormat(a(this, b).value, e).format(M(t) ? new Date(t) : t);
-}, $t = function(t, e) {
-  return new Intl.ListFormat(a(this, b).value, e).format(t);
+  return new Intl.ListFormat(i(this, $).get(), e).format(t);
 }, // relativeTime(): State<string> {
 // }
 Ht = function(t, e) {
-  for (const s of a(this, Y))
+  for (const s of i(this, X))
     if (s[0] === t && Jt(s[1], e))
       return s[2];
 };
-function Re(i, t) {
-  const e = String(t).split(/[\.\[\]]/).filter((n) => n.trim() !== "");
-  let s = i;
+function Re(a, t) {
+  const e = String(t).split(/[\.\[\]]/).filter((r) => r.trim() !== "");
+  let s = a;
   for (; e.length > 0; ) {
-    const n = e.shift();
-    s != null ? s = s[n] : s = void 0;
+    const r = e.shift();
+    s != null ? s = s[r] : s = void 0;
   }
   return s;
 }
-function _e(i) {
+function _e(a) {
   return Mt`
     <div
       style=${{
@@ -894,8 +906,8 @@ function _e(i) {
     >
       <h1 style=${{ marginBottom: "0.5rem" }}>The app has crashed</h1>
       <p style=${{ marginBottom: "0.25rem" }}>
-        <span style=${{ fontFamily: "monospace" }}>${i.loggerName}</span>
-        ${Xt(i.uid, Mt`<span style=${{ fontFamily: "monospace", opacity: 0.5 }}> [uid: ${i.uid}]</span>`)}
+        <span style=${{ fontFamily: "monospace" }}>${a.loggerName}</span>
+        ${Xt(a.uid, Mt`<span style=${{ fontFamily: "monospace", opacity: 0.5 }}> [uid: ${a.uid}]</span>`)}
         ${" "}says:
       </p>
       <blockquote
@@ -918,102 +930,102 @@ function _e(i) {
     fontWeight: "bold"
   }}
         >
-          ${i.error.name}
+          ${a.error.name}
         </span>
-        ${i.error.message}
+        ${a.error.message}
       </blockquote>
 
       <p>Please see the browser console for details.</p>
     </div>
   `;
 }
-var L, et, F, V, st, H, rt, nt, at, it, O, ot, lt, dt;
+var P, tt, L, I, et, A, st, nt, rt, at, F, it, ot, dt;
 class Se {
   constructor() {
     // TODO: Take these off the global Dolla object.
     w(this, "http");
     w(this, "i18n");
-    u(this, L, !1);
-    u(this, et, "production");
-    u(this, F);
-    u(this, V);
-    u(this, st, _e);
-    u(this, H);
-    u(this, rt, []);
+    u(this, P, !1);
+    u(this, tt, "production");
+    u(this, L);
+    u(this, I);
+    u(this, et, _e);
+    u(this, A);
+    u(this, st, []);
     u(this, nt, []);
+    u(this, rt, []);
     u(this, at, []);
-    u(this, it, []);
-    u(this, O, {
+    u(this, F, {
       root: this,
       stores: /* @__PURE__ */ new Map(),
       viewName: "Dolla"
     });
-    u(this, ot, {
+    u(this, it, {
       info: "development",
       log: "development",
       warn: "development",
       error: !0
     });
-    u(this, lt, xt("*,-Dolla.*"));
+    u(this, ot, xt("*,-Dolla.*"));
     // Registration functions for modules.
     // All modules will be registered before mount.
     u(this, dt, []);
-    this.http = new ge(), this.i18n = new ke(this);
+    this.http = new ge(), this.i18n = new $e(this);
   }
   /**
    * True when the app is connected to a DOM node and displayed to the user.
    */
   get isMounted() {
-    return a(this, L);
+    return i(this, P);
   }
   /**
    * 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 a(this, et);
+    return i(this, tt);
   }
   /**
    * 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, et, t);
+    d(this, tt, 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, st, t);
+    d(this, et, t);
   }
   /**
    * Returns the HTMLElement Dolla is mounted to. This will return undefined until Dolla.mount() is called.
    */
   getRootElement() {
-    return a(this, F);
+    return i(this, L);
   }
   /**
    * Returns the top level view Dolla is rendering inside the root element. This will return undefined until Dolla.mount() is called.
    */
   getRootView() {
-    return a(this, V);
+    return i(this, I);
   }
   provide(t, e) {
     const s = new Yt(t, e);
-    if (s.attach(a(this, O)))
+    if (s.attach(i(this, F)))
       return s.value;
     {
-      let r = t.name ? `'${t.name}'` : "this store";
-      return console.warn(`An instance of ${r} was already attached to this context.`), this.get(t);
+      let n = t.name ? `'${t.name}'` : "this store";
+      return console.warn(`An instance of ${n} was already attached to this context.`), this.get(t);
     }
   }
   /**
    * Gets the nearest instance of a store. Throws an error if the store isn't provided higher in the tree.
    */
   get(t) {
-    if (z(t)) {
-      const e = a(this, O).stores.get(t);
+    if (H(t)) {
+      const e = i(this, F).stores.get(t);
       if (e == null)
         throw new Tt("Store not found on this context.");
       return e.value;
@@ -1021,26 +1033,26 @@ class Se {
       throw new Tt("Invalid store.");
   }
   async mount(t, e) {
-    if (a(this, L))
+    if (i(this, P))
       throw new Error("Dolla is already mounted.");
-    if (M(t)) {
-      const r = document.querySelector(t);
-      Nt(HTMLElement, r, `Selector '${t}' did not match any element.`), d(this, F, r);
+    if (S(t)) {
+      const n = document.querySelector(t);
+      Nt(HTMLElement, n, `Selector '${t}' did not match any element.`), d(this, L, n);
     } else
-      Nt(HTMLElement, t, "Expected an HTML element or a selector string. Got type: %t, value: %v"), d(this, F, t);
-    pt(e) && d(this, H, e);
-    const s = pt(e) ? jt : e, n = Zt(s);
-    d(this, V, this.constructView(n.type, n.props)), await Promise.all(a(this, dt).map((r) => r())), pt(e) && await le(e, this), await Promise.all(a(this, rt).map((r) => r())), a(this, V).mount(a(this, F)), d(this, L, !0);
-    for (const r of a(this, O).stores.values())
-      r.handleMount();
-    for (const r of a(this, nt))
-      r();
+      Nt(HTMLElement, t, "Expected an HTML element or a selector string. Got type: %t, value: %v"), d(this, L, t);
+    pt(e) && d(this, A, e);
+    const s = pt(e) ? jt : e, r = Zt(s);
+    d(this, I, this.constructView(r.type, r.props)), await Promise.all(i(this, dt).map((n) => n())), pt(e) && await le(e, this), await Promise.all(i(this, st).map((n) => n())), i(this, I).mount(i(this, L)), d(this, P, !0);
+    for (const n of i(this, F).stores.values())
+      n.handleMount();
+    for (const n of i(this, nt))
+      n();
   }
   async unmount() {
     var t;
-    if (a(this, L)) {
-      await Promise.all(a(this, at).map((e) => e())), (t = a(this, V)) == null || t.unmount(!1), a(this, H) && await ce(a(this, H)), d(this, L, !1);
-      for (const e of a(this, it))
+    if (i(this, P)) {
+      await Promise.all(i(this, rt).map((e) => e())), (t = i(this, I)) == null || t.unmount(!1), i(this, A) && await ce(i(this, A)), d(this, P, !1);
+      for (const e of i(this, at))
         e();
     }
   }
@@ -1049,26 +1061,26 @@ class Se {
    * it will be awaited before mounting finishes. Use this to perform initial setup before the app is displayed to the user.
    */
   beforeMount(t) {
-    a(this, rt).push(t);
+    i(this, st).push(t);
   }
   /**
    * Registers a `callback` to run after the app is mounted.
    */
   onMount(t) {
-    a(this, nt).push(t);
+    i(this, nt).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) {
-    a(this, at).push(t);
+    i(this, rt).push(t);
   }
   /**
    * Registers a `callback` to run after the app is unmounted.
    */
   onUnmount(t) {
-    a(this, it).push(t);
+    i(this, at).push(t);
   }
   /**
    * Update log type toggles. Values that are not passed will remain unchanged.
@@ -1076,22 +1088,22 @@ class Se {
   setLoggles(t) {
     for (const e in t) {
       const s = t[e];
-      s && (a(this, ot)[e] = s);
+      s && (i(this, it)[e] = s);
     }
   }
   setLogFilter(t) {
-    d(this, lt, xt(t));
+    d(this, ot, xt(t));
   }
   createLogger(t, e) {
-    const s = (e == null ? void 0 : e.console) ?? Me(), n = this, r = a(this, ot), o = (c) => {
-      if (r[c] === !1 || M(r[c]) && r[c] !== n.getEnv() || !a(this, lt).call(this, t))
-        return re;
+    const s = (e == null ? void 0 : e.console) ?? Me(), r = this, n = i(this, it), o = (c) => {
+      if (n[c] === !1 || S(n[c]) && n[c] !== r.getEnv() || !i(this, ot).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:${ne(l)};font-weight:bold`,
+          `color:${re(l)};font-weight:bold`,
           "color:#777",
           "color:#aaa",
           "color:#777"
@@ -1115,11 +1127,11 @@ class Se {
         return o("error");
       },
       crash(c) {
-        n.isMounted && (n.unmount(), n.constructView(a(n, st), {
+        r.isMounted && (r.unmount(), r.constructView(i(r, et), {
           error: c,
           loggerName: t,
           uid: e == null ? void 0 : e.uid
-        }).mount(a(n, F)));
+        }).mount(i(r, L)));
       }
     };
   }
@@ -1127,16 +1139,16 @@ class Se {
    *
    */
   constructView(t, e, s = []) {
-    return new te(a(this, O), t, e, s);
+    return new te(i(this, F), t, e, s);
   }
   /**
    *
    */
   constructMarkup(t) {
-    return ee(se(a(this, O), t));
+    return ee(se(i(this, F), t));
   }
 }
-L = new WeakMap(), et = new WeakMap(), F = new WeakMap(), V = new WeakMap(), st = new WeakMap(), H = new WeakMap(), rt = new WeakMap(), nt = new WeakMap(), at = new WeakMap(), it = new WeakMap(), O = new WeakMap(), ot = new WeakMap(), lt = new WeakMap(), dt = new WeakMap();
+P = new WeakMap(), tt = new WeakMap(), L = new WeakMap(), I = new WeakMap(), et = new WeakMap(), A = new WeakMap(), st = new WeakMap(), nt = new WeakMap(), rt = new WeakMap(), at = new WeakMap(), F = new WeakMap(), it = new WeakMap(), ot = new WeakMap(), dt = new WeakMap();
 function Me() {
   if (typeof window < "u" && window.console)
     return window.console;
@@ -1146,22 +1158,23 @@ function Me() {
 const Pt = new Se(), Le = Pt.i18n.t.bind(Pt.i18n);
 export {
   Ut as atom,
-  U as compose,
+  O as compose,
   Xt as cond,
   Zt as createMarkup,
   Pe as createRouter,
   Jt as deepEqual,
   Pt as default,
   Ue as effect,
-  E as get,
+  lt as get,
+  je as getTracked,
   Mt as html,
-  je as list,
-  Ce as peek,
-  Ie as portal,
+  Ce as list,
+  Ie as peek,
+  Ve as portal,
   Ne as ref,
-  Ve as set,
+  De as set,
   _t as shallowEqual,
-  De as strictEqual,
+  qe as strictEqual,
   Le as t
 };
 //# sourceMappingURL=index.js.map