@manyducks.co/dolla 2.0.0-alpha.21 → 2.0.0-alpha.23

package/dist/index.js

@@ -1,22 +1,22 @@
-var Dt = Object.defineProperty;
-var pt = (i) => {
-  throw TypeError(i);
+var nt = Object.defineProperty;
+var Ae = (o) => {
+  throw TypeError(o);
 };
-var Nt = (i, e, t) => e in i ? Dt(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t;
-var P = (i, e, t) => Nt(i, typeof e != "symbol" ? e + "" : e, t), Ze = (i, e, t) => e.has(i) || pt("Cannot " + t);
-var s = (i, e, t) => (Ze(i, e, "read from private field"), t ? t.call(i) : e.get(i)), h = (i, e, t) => e.has(i) ? pt("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(i) : e.set(i, t), b = (i, e, t, r) => (Ze(i, e, "write to private field"), r ? r.call(i, t) : e.set(i, t), t), v = (i, e, t) => (Ze(i, e, "access private method"), t);
-var et = (i, e, t, r) => ({
+var at = (o, e, t) => e in o ? nt(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
+var p = (o, e, t) => at(o, typeof e != "symbol" ? e + "" : e, t), qe = (o, e, t) => e.has(o) || Ae("Cannot " + t);
+var a = (o, e, t) => (qe(o, e, "read from private field"), t ? t.call(o) : e.get(o)), l = (o, e, t) => e.has(o) ? Ae("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(o) : e.set(o, t), g = (o, e, t, r) => (qe(o, e, "write to private field"), r ? r.call(o, t) : e.set(o, t), t), d = (o, e, t) => (qe(o, e, "access private method"), t);
+var Y = (o, e, t, r) => ({
   set _(n) {
-    b(i, e, n, t);
+    g(o, e, n, t);
   },
   get _() {
-    return s(i, e, r);
+    return a(o, e, r);
   }
 });
-import { h as mt, c as jt, i as rt, g as Tt, a as oe, d as be, b as dt, e as V, t as gt, f as kt, j as Mt, k as nt, P as St, l as wt, m as qt, n as Ft, o as At, v as _t, p as Ct, q as Vt, r as yt, s as It, u as Ut, w as Ce, x as Ve, V as Ht, y as Wt, z as Bt } from "./passthrough-6Lrg96Id.js";
-import { A as kr, B as Sr, C as Pr } from "./passthrough-6Lrg96Id.js";
-function Gt(i) {
-  return mt`
+import { h as Ie, c as it, i as ke, a as Ve, d as F, b as k, e as ot, f as te, t as We, g as Qe, j as lt, s as _e, k as Ge, P as Je, l as Be, m as ze, n as ct, o as ht, p as ut, v as ft, q as dt, r as mt, u as He, w as gt, x as be, y as $e, V as pt, z as wt, A as yt } from "./passthrough-C9975ULD.js";
+import { B as Ht, D as Kt, E as Qt, C as Jt } from "./passthrough-C9975ULD.js";
+function bt(o) {
+  return Ie`
     <div
       style=${{
     backgroundColor: "#880000",
@@ -29,8 +29,8 @@ function Gt(i) {
     >
       <h1 style=${{ marginBottom: "0.5rem" }}>The app has crashed</h1>
       <p style=${{ marginBottom: "0.25rem" }}>
-        <span style=${{ fontFamily: "monospace" }}>${i.loggerName}</span>
-        ${jt(i.uid, mt`<span style=${{ fontFamily: "monospace", opacity: 0.5 }}> [uid: ${i.uid}]</span>`)}
+        <span style=${{ fontFamily: "monospace" }}>${o.loggerName}</span>
+        ${it(o.uid, Ie`<span style=${{ fontFamily: "monospace", opacity: 0.5 }}> [uid: ${o.uid}]</span>`)}
         ${" "}says:
       </p>
       <blockquote
@@ -53,21 +53,92 @@ function Gt(i) {
     fontWeight: "bold"
   }}
         >
-          ${i.error.name}
+          ${o.error.name}
         </span>
-        ${i.error.message}
+        ${o.error.message}
       </blockquote>
 
       <p>Please see the browser console for details.</p>
     </div>
   `;
 }
-var J, Qe, j, F;
-class zt {
-  constructor() {
-    h(this, j);
-    h(this, J, []);
-    h(this, Qe, Kt());
+var re, K, N, V, A, Q, Re, M, se, q, Ne, ve;
+class $t {
+  constructor(e) {
+    l(this, q);
+    l(this, re);
+    l(this, K);
+    // Keys ensure only the most recent callback queued with a certain key
+    // will be called, keeping DOM operations to a minimum.
+    l(this, N, /* @__PURE__ */ new Map());
+    // All unkeyed writes are run on every batch.
+    l(this, V, []);
+    // All read callbacks are run before updates on every batch.
+    l(this, A, []);
+    l(this, Q, !1);
+    // When true, batches that would exceed 16ms will be split and deferred to a rAF.
+    // This may not be desirable, because while it does prevent hitching it sometimes leaves
+    // the state partially rendered for a brief second and certain elements can be seen to update after the fact.
+    // But the tradeoff here is snappier navigation with possibly slightly out of date DOM updates on heavy pages.
+    l(this, Re, !0);
+    l(this, M, 0);
+    l(this, se, new Intl.NumberFormat("en-US", { maximumFractionDigits: 2, minimumFractionDigits: 0 }));
+    g(this, re, e), g(this, K, e.createLogger("dolla/render"));
+  }
+  /**
+   * Queues a callback that runs before the next batch of writes.
+   */
+  read(e) {
+    a(this, A).push(e), d(this, q, Ne).call(this);
+  }
+  /**
+   * Queues a callback to run in the next render batch.
+   * Always put DOM mutations in a write callback when possible to help Dolla batch them efficiently.
+   */
+  write(e, t) {
+    t ? a(this, N).set(t, e) : a(this, V).push(e), d(this, q, Ne).call(this);
+  }
+}
+re = new WeakMap(), K = new WeakMap(), N = new WeakMap(), V = new WeakMap(), A = new WeakMap(), Q = new WeakMap(), Re = new WeakMap(), M = new WeakMap(), se = new WeakMap(), q = new WeakSet(), Ne = function() {
+  if (!a(this, Q)) {
+    g(this, Q, !0);
+    const e = a(this, re).getEnv() === "development";
+    queueMicrotask(() => {
+      d(this, q, ve).call(this, e);
+    });
+  }
+}, ve = function(e = !1) {
+  const t = performance.now();
+  let r = 0;
+  const n = a(this, A).length + a(this, N).size + a(this, V).length;
+  let s = 0;
+  const i = () => (s++, r = performance.now() - t, a(this, Re) && r > 12 && s < n ? (Y(this, M)._++, e && a(this, K).warn(
+    `⚠️ Deferring batch to next frame. Performed ${s} of ${n} batched operation${s === 1 ? "" : "s"} in ${a(this, se).format(r)}ms (deferral ${a(this, M)}).`
+  ), requestAnimationFrame(() => {
+    d(this, q, ve).call(this, e);
+  }), !0) : !1), f = [...a(this, N).entries()];
+  let c, u;
+  for (; u = a(this, A).shift(); )
+    if (u(), i()) return;
+  for ([c, u] of f)
+    if (u(), a(this, N).delete(c), i()) return;
+  for (; u = a(this, V).shift(); )
+    if (u(), i()) return;
+  e && a(this, K)[r > 16 ? "warn" : "info"](
+    `${r > 16 ? "⚠️ (>=16ms) " : ""}Executed ${s} operation${s === 1 ? "" : "s"} in ${a(this, se).format(r)}ms${a(this, M) > 0 ? ` (after ${a(this, M)} deferral${a(this, M) === 1 ? "" : "s"})` : ""}.`
+  ), g(this, M, 0), a(this, A).length || a(this, N).size || a(this, V).length ? queueMicrotask(() => {
+    d(this, q, ve).call(this, e);
+  }) : g(this, Q, !1);
+};
+var I, Se, Le, ne, S, L;
+class vt {
+  constructor(e) {
+    l(this, S);
+    l(this, I, []);
+    l(this, Se, Et());
+    l(this, Le);
+    l(this, ne);
+    g(this, Le, e), g(this, ne, e.createLogger("dolla/http"));
   }
   /**
    * Adds a new middleware that will apply to subsequent requests.
@@ -76,323 +147,295 @@ class zt {
    * @param middleware - A middleware function that will intercept requests.
    */
   use(e) {
-    return s(this, J).push(e), () => {
-      s(this, J).splice(s(this, J).indexOf(e), 1);
+    return a(this, I).push(e), () => {
+      a(this, I).splice(a(this, I).indexOf(e), 1);
     };
   }
   async get(e, t) {
-    return v(this, j, F).call(this, "get", e, t);
+    return d(this, S, L).call(this, "get", e, t);
   }
   async put(e, t) {
-    return v(this, j, F).call(this, "put", e, t);
+    return d(this, S, L).call(this, "put", e, t);
   }
   async patch(e, t) {
-    return v(this, j, F).call(this, "patch", e, t);
+    return d(this, S, L).call(this, "patch", e, t);
   }
   async post(e, t) {
-    return v(this, j, F).call(this, "post", e, t);
+    return d(this, S, L).call(this, "post", e, t);
   }
   async delete(e, t) {
-    return v(this, j, F).call(this, "delete", e, t);
+    return d(this, S, L).call(this, "delete", e, t);
   }
   async head(e, t) {
-    return v(this, j, F).call(this, "head", e, t);
+    return d(this, S, L).call(this, "head", e, t);
   }
   async options(e, t) {
-    return v(this, j, F).call(this, "options", e, t);
+    return d(this, S, L).call(this, "options", e, t);
   }
   async trace(e, t) {
-    return v(this, j, F).call(this, "trace", e, t);
+    return d(this, S, L).call(this, "trace", e, t);
   }
 }
-J = new WeakMap(), Qe = new WeakMap(), j = new WeakSet(), F = async function(e, t, r) {
-  return Jt({
+I = new WeakMap(), Se = new WeakMap(), Le = new WeakMap(), ne = new WeakMap(), S = new WeakSet(), L = async function(e, t, r) {
+  return Rt({
     ...r,
     method: e,
     uri: t,
-    middleware: s(this, J),
-    fetch: s(this, Qe)
+    middleware: a(this, I),
+    fetch: a(this, Se),
+    logger: a(this, ne)
   });
 };
-function Kt() {
+function Et() {
   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 Qt extends Error {
+class kt extends Error {
   constructor(t) {
-    const { status: r, statusText: n, method: a, uri: o } = t, p = `${r} ${n}: Request failed (${a.toUpperCase()} ${o})`;
-    super(p);
-    P(this, "response");
+    const { status: r, statusText: n, method: s, uri: i } = t, f = `${r} ${n}: Request failed (${s.toUpperCase()} ${i})`;
+    super(f);
+    p(this, "response");
     this.response = t;
   }
 }
-async function Jt(i) {
-  const { headers: e, query: t, fetch: r, middleware: n } = i, a = {
-    method: i.method,
-    uri: i.uri,
+async function Rt(o) {
+  const { headers: e, query: t, fetch: r, middleware: n, logger: s } = o, i = {
+    method: o.method,
+    uri: o.uri,
     get sameOrigin() {
-      return !a.uri.startsWith("http");
+      return !i.uri.startsWith("http");
     },
     query: new URLSearchParams(),
     headers: new Headers(),
-    body: i.body
+    body: o.body
   };
   if (e)
     if (e instanceof Map || e instanceof Headers)
-      e.forEach((l, f) => {
-        a.headers.set(f, l);
+      e.forEach((u, m) => {
+        i.headers.set(m, u);
       });
     else if (e != null && typeof e == "object" && !Array.isArray(e))
-      for (const l in e) {
-        const f = e[l];
-        f instanceof Date ? a.headers.set(l, f.toISOString()) : f != null && a.headers.set(l, String(f));
+      for (const u in e) {
+        const m = e[u];
+        m instanceof Date ? i.headers.set(u, m.toISOString()) : m != null && i.headers.set(u, String(m));
       }
     else
       throw new TypeError(`Unknown headers type. Got: ${e}`);
   if (t)
     if (t instanceof Map || t instanceof URLSearchParams)
-      t.forEach((l, f) => {
-        a.query.set(f, l);
+      t.forEach((u, m) => {
+        i.query.set(m, u);
       });
     else if (t != null && typeof t == "object" && !Array.isArray(t))
-      for (const l in t) {
-        const f = t[l];
-        f instanceof Date ? a.query.set(l, f.toISOString()) : f != null && a.query.set(l, String(f));
+      for (const u in t) {
+        const m = t[u];
+        m instanceof Date ? i.query.set(u, m.toISOString()) : m != null && i.query.set(u, String(m));
       }
     else
       throw new TypeError(`Unknown query params type. Got: ${t}`);
-  let o;
-  const p = async () => {
-    const l = a.query.toString(), f = l.length > 0 ? a.uri + "?" + l : a.uri;
-    let m;
-    !a.headers.has("content-type") && rt(a.body) ? (a.headers.set("content-type", "application/json"), m = JSON.stringify(a.body)) : m = a.body;
-    const g = await r(f, {
-      method: a.method,
-      headers: a.headers,
-      body: m
-    }), u = Object.fromEntries(g.headers.entries()), y = u["content-type"];
-    let k;
-    y != null && y.includes("application/json") ? k = await g.json() : y != null && y.includes("application/x-www-form-urlencoded") ? k = await g.formData() : k = await g.text(), o = {
-      method: a.method,
-      uri: a.uri,
-      status: g.status,
-      statusText: g.statusText,
-      headers: u,
-      body: k
+  let f;
+  const c = async () => {
+    const u = i.query.toString(), m = u.length > 0 ? i.uri + "?" + u : i.uri;
+    let b;
+    !i.headers.has("content-type") && ke(i.body) ? (i.headers.set("content-type", "application/json"), b = JSON.stringify(i.body)) : b = i.body;
+    const h = await r(m, {
+      method: i.method,
+      headers: i.headers,
+      body: b
+    }), R = Object.fromEntries(h.headers.entries()), y = R["content-type"];
+    let ye;
+    y != null && y.includes("application/json") ? ye = await h.json() : y != null && y.includes("application/x-www-form-urlencoded") ? ye = await h.formData() : ye = await h.text(), f = {
+      method: i.method,
+      uri: i.uri,
+      status: h.status,
+      statusText: h.statusText,
+      headers: R,
+      body: ye
     };
   };
   if (n.length > 0) {
-    const l = (f = 0) => {
-      const m = n[f], g = n[f + 1] ? l(f + 1) : p;
-      return async () => m(a, async () => (await g(), o));
+    const u = (m = 0) => {
+      const b = n[m], h = n[m + 1] ? u(m + 1) : c;
+      return async () => b(i, async () => (await h(), f));
     };
-    await l()();
+    await u()();
   } else
-    await p();
-  if (o.status < 200 || o.status >= 400)
-    throw new Qt(o);
-  return o;
-}
-var tt, bt;
-function Yt() {
-  return bt || (bt = 1, tt = function i(e, t) {
-    if (e === t) return !0;
-    if (e && t && typeof e == "object" && typeof t == "object") {
-      if (e.constructor !== t.constructor) return !1;
-      var r, n, a;
-      if (Array.isArray(e)) {
-        if (r = e.length, r != t.length) return !1;
-        for (n = r; n-- !== 0; )
-          if (!i(e[n], t[n])) return !1;
-        return !0;
-      }
-      if (e.constructor === RegExp) return e.source === t.source && e.flags === t.flags;
-      if (e.valueOf !== Object.prototype.valueOf) return e.valueOf() === t.valueOf();
-      if (e.toString !== Object.prototype.toString) return e.toString() === t.toString();
-      if (a = Object.keys(e), r = a.length, r !== Object.keys(t).length) return !1;
-      for (n = r; n-- !== 0; )
-        if (!Object.prototype.hasOwnProperty.call(t, a[n])) return !1;
-      for (n = r; n-- !== 0; ) {
-        var o = a[n];
-        if (!i(e[o], t[o])) return !1;
-      }
-      return !0;
-    }
-    return e !== e && t !== t;
-  }), tt;
+    await c();
+  if (f.status < 200 || f.status >= 400)
+    throw new kt(f);
+  return f;
 }
-var Xt = Yt();
-const Zt = /* @__PURE__ */ Tt(Xt);
-var Je, le, ne, at, Pt;
-class er {
+var Me, J, z, Pe, Xe;
+class St {
   constructor(e, t) {
-    h(this, ne);
-    P(this, "dolla");
-    P(this, "config");
-    h(this, Je, !1);
-    h(this, le, /* @__PURE__ */ new Map());
+    l(this, z);
+    p(this, "dolla");
+    p(this, "config");
+    l(this, Me, !1);
+    l(this, J, /* @__PURE__ */ new Map());
     this.config = e, this.dolla = t;
   }
   async load() {
     let e;
-    if (!s(this, Je)) {
-      if (dt(this.config.fetch)) {
-        if (e = await this.config.fetch(), !rt(e))
+    if (!a(this, Me)) {
+      if (te(this.config.fetch)) {
+        if (e = await this.config.fetch(), !ke(e))
           throw new Error(`Fetch function did not return an object of language strings: ${e}`);
-      } else if (V(this.config.path)) {
-        const t = await this.dolla.http.get(this.config.path);
-        if (t.status >= 200 && t.status < 300)
-          if (rt(t.body))
-            e = t.body;
+      } else if (k(this.config.path)) {
+        const t = await fetch(this.config.path);
+        if (t.ok) {
+          const r = await t.json();
+          if (ke(r))
+            e = r;
           else
             throw new Error(
-              `Language path '${this.config.path}' did not return an object of language strings: ${t.body}`
+              `Language path '${this.config.path}' did not return an object of language strings: ${r}`
             );
-        else
+        } else
           throw new Error("HTTP request failed.");
       }
     }
     if (e) {
-      const t = v(this, ne, at).call(this, e);
+      const t = d(this, z, Pe).call(this, e);
       for (const r of t)
-        s(this, le).set(r[0], r[1]);
+        a(this, J).set(r[0], r[1]);
     } else
       throw new Error("Language could not be loaded.");
   }
   getTemplate(e) {
-    return s(this, le).get(e) ?? {
+    return a(this, J).get(e) ?? {
       segments: [{ type: 0, text: `[MISSING: ${e}]` }]
     };
   }
   hasTemplate(e) {
-    return s(this, le).has(e);
+    return a(this, J).has(e);
   }
 }
-Je = new WeakMap(), le = new WeakMap(), ne = new WeakSet(), at = function(e, t = []) {
+Me = new WeakMap(), J = new WeakMap(), z = new WeakSet(), Pe = function(e, t = []) {
   const r = [];
   for (const n in e)
-    switch (gt(e[n])) {
+    switch (We(e[n])) {
       case "string":
-        r.push([[...t, n].join("."), v(this, ne, Pt).call(this, e[n])]);
+        r.push([[...t, n].join("."), d(this, z, Xe).call(this, e[n])]);
         break;
       case "object":
-        r.push(...v(this, ne, at).call(this, e[n], [...t, n]));
+        r.push(...d(this, z, Pe).call(this, e[n], [...t, n]));
         break;
       default:
         throw new Error(
-          `Expected to find a string or object at ${[...t, n].join(".")}. Got: ${gt(e[n])}`
+          `Expected to find a string or object at ${[...t, n].join(".")}. Got: ${We(e[n])}`
         );
     }
   return r;
-}, Pt = function(e) {
+}, Xe = function(e) {
   let t;
-  ((u) => {
-    u[u.Static = 0] = "Static", u[u.ValueName = 1] = "ValueName", u[u.FormatName = 2] = "FormatName", u[u.FormatOptionName = 3] = "FormatOptionName", u[u.FormatOptionValue = 4] = "FormatOptionValue", u[u.FormatOptionEnd = 5] = "FormatOptionEnd";
+  ((h) => {
+    h[h.Static = 0] = "Static", h[h.ValueName = 1] = "ValueName", h[h.FormatName = 2] = "FormatName", h[h.FormatOptionName = 3] = "FormatOptionName", h[h.FormatOptionValue = 4] = "FormatOptionValue", h[h.FormatOptionEnd = 5] = "FormatOptionEnd";
   })(t || (t = {}));
   const r = {
     segments: []
   };
-  let n = "", a = 0, o = 0, p, l, f;
+  let n = "", s = 0, i = 0, f, c, u;
   const m = () => {
-    p = {
+    f = {
       type: 1,
       name: "",
       formats: []
     };
-  }, g = () => {
-    l = {
+  }, b = () => {
+    c = {
       name: "",
       options: {}
     };
   };
-  for (; a < e.length; ) {
-    if (o !== 0 && e[a] === " ") {
-      a++;
+  for (; s < e.length; ) {
+    if (i !== 0 && e[s] === " ") {
+      s++;
       continue;
     }
-    switch (o) {
+    switch (i) {
       case 0:
-        e[a] === "{" && e[a + 1] === "{" ? (o = 1, a += 2, n.length > 0 && (r.segments.push({ type: 0, text: n }), n = ""), m()) : (n += e[a], a++);
+        e[s] === "{" && e[s + 1] === "{" ? (i = 1, s += 2, n.length > 0 && (r.segments.push({ type: 0, text: n }), n = ""), m()) : (n += e[s], s++);
         break;
       case 1:
-        e[a] === "|" ? (o = 2, a += 1, p.name = n, n = "", g()) : e[a] === "}" && e[a + 1] === "}" ? (o = 0, a += 2, p.name = n, n = "", r.segments.push(p)) : (n += e[a], a++);
+        e[s] === "|" ? (i = 2, s += 1, f.name = n, n = "", b()) : e[s] === "}" && e[s + 1] === "}" ? (i = 0, s += 2, f.name = n, n = "", r.segments.push(f)) : (n += e[s], s++);
         break;
       case 2:
-        e[a] === "(" ? (o = 3, a += 1, l.name = n, n = "") : e[a] === "}" && e[a + 1] === "}" ? (o = 0, a += 2, p.formats.push(l), r.segments.push(p)) : (n += e[a], a++);
+        e[s] === "(" ? (i = 3, s += 1, c.name = n, n = "") : e[s] === "}" && e[s + 1] === "}" ? (i = 0, s += 2, f.formats.push(c), r.segments.push(f)) : (n += e[s], s++);
         break;
       case 3:
-        e[a] === ")" || (e[a] === ":" ? (o = 4, a += 1, f = n, n = "") : e[a] === "}" && e[a + 1] === "}" || (n += e[a], a++));
+        e[s] === ")" || (e[s] === ":" ? (i = 4, s += 1, u = n, n = "") : e[s] === "}" && e[s + 1] === "}" || (n += e[s], s++));
         break;
       case 4:
-        e[a] === ")" ? (o = 5, a += 1, l.options[f] = n, n = "", p.formats.push(l)) : e[a] === "," ? (o = 3, a += 1, l.options[f] = n, n = "") : e[a] === "}" && e[a + 1] === "}" || (n += e[a], a++);
+        e[s] === ")" ? (i = 5, s += 1, c.options[u] = n, n = "", f.formats.push(c)) : e[s] === "," ? (i = 3, s += 1, c.options[u] = n, n = "") : e[s] === "}" && e[s + 1] === "}" || (n += e[s], s++);
         break;
       case 5:
-        e[a] === "|" ? (o = 2, a += 1, g()) : e[a] === "}" && e[a + 1] === "}" && (o = 0, a += 2, r.segments.push(p));
+        e[s] === "|" ? (i = 2, s += 1, b()) : e[s] === "}" && e[s + 1] === "}" && (i = 0, s += 2, r.segments.push(f));
         break;
     }
   }
-  return o === 0 && n.length > 0 && r.segments.push({ type: 0, text: n }), r;
+  return i === 0 && n.length > 0 && r.segments.push({ type: 0, text: n }), r;
 };
-var $e, I, L, Ee, ke, Se, Pe, R, xt, st, it, ot, Ot;
-class tr {
+var ae, P, v, ie, oe, le, ce, E, Ye, De, Te, Oe, Ze;
+class Lt {
   constructor(e) {
-    h(this, R);
-    h(this, $e);
-    h(this, I);
-    h(this, L, /* @__PURE__ */ new Map());
-    h(this, Ee, []);
-    h(this, ke, /* @__PURE__ */ new Map());
-    h(this, Se, "auto");
-    P(this, "$locale");
-    h(this, Pe);
-    b(this, $e, e), b(this, I, e.createLogger("dolla/i18n"));
-    const [t, r] = oe();
-    this.$locale = t, b(this, Pe, r), this.addFormat("number", (n, a, o) => v(this, R, st).call(this, Number(a), o)), this.addFormat("datetime", (n, a, o) => v(this, R, it).call(this, a, o)), this.addFormat("list", (n, a, o) => v(this, R, ot).call(this, a, o)), e.beforeMount(async () => {
-      s(this, L).size > 0 && await this.setLocale(s(this, Se));
+    l(this, E);
+    l(this, ae);
+    l(this, P);
+    l(this, v, /* @__PURE__ */ new Map());
+    l(this, ie, []);
+    l(this, oe, /* @__PURE__ */ new Map());
+    l(this, le, "auto");
+    p(this, "$locale");
+    l(this, ce);
+    g(this, ae, e), g(this, P, e.createLogger("dolla/i18n"));
+    const [t, r] = Ve();
+    this.$locale = t, g(this, ce, r), this.addFormat("number", (n, s, i) => d(this, E, De).call(this, Number(s), i)), this.addFormat("datetime", (n, s, i) => d(this, E, Te).call(this, s, i)), this.addFormat("list", (n, s, i) => d(this, E, Oe).call(this, s, i)), e.beforeMount(async () => {
+      a(this, v).size > 0 && await this.setLocale(a(this, le));
     });
   }
   get locales() {
-    return [...s(this, L).keys()];
+    return [...a(this, v).keys()];
   }
   setup(e) {
     if (e.translations.forEach((t) => {
-      s(this, L).set(t.locale, new er(t, s(this, $e)));
+      a(this, v).set(t.locale, new St(t, a(this, ae)));
     }), e.locale && e.locale !== "auto") {
       if (!e.translations.some((r) => r.locale === e.locale))
         throw new Error(`Initial locale '${e.locale}' is not registered in the locales array.`);
-      b(this, Se, e.locale);
+      g(this, le, e.locale);
     }
-    s(this, I).info(
-      `${s(this, L).size} language${s(this, L).size === 1 ? "" : "s"} supported: '${[...s(this, L).keys()].join("', '")}'`
+    a(this, P).info(
+      `${a(this, v).size} language${a(this, v).size === 1 ? "" : "s"} supported: '${[...a(this, v).keys()].join("', '")}'`
     );
   }
   async setLocale(e) {
     var n;
     let t;
     if (e === "auto") {
-      let a = [];
-      if (typeof navigator == "object") {
-        const o = navigator;
-        ((n = o.languages) == null ? void 0 : n.length) > 0 ? a.push(...o.languages) : o.language ? a.push(o.language) : o.browserLanguage ? a.push(o.browserLanguage) : o.userLanguage && a.push(o.userLanguage);
+      let s = [];
+      if (typeof navigator < "u") {
+        const i = navigator;
+        ((n = i.languages) == null ? void 0 : n.length) > 0 ? s.push(...i.languages) : i.language ? s.push(i.language) : i.browserLanguage ? s.push(i.browserLanguage) : i.userLanguage && s.push(i.userLanguage);
       }
-      for (const o of a)
-        s(this, L).has(o) && (t = o);
+      for (const i of s)
+        a(this, v).has(i) && (t = i);
     } else
-      s(this, L).has(e) && (t = e);
+      a(this, v).has(e) && (t = e);
     if (t == null) {
-      const a = s(this, L).keys().next().value;
-      a && (t = a);
+      const s = a(this, v).keys().next().value;
+      s && (t = s);
     }
-    if (!t || !s(this, L).has(t))
+    if (!t || !a(this, v).has(t))
       throw new Error(`Locale '${e}' has no translation.`);
-    const r = s(this, L).get(t);
+    const r = a(this, v).get(t);
     try {
-      await r.load(), b(this, Ee, []), s(this, Pe).call(this, t), s(this, I).info("set language to " + t);
-    } catch (a) {
-      a instanceof Error && s(this, I).crash(a);
+      await r.load(), g(this, ie, []), a(this, ce).call(this, t), a(this, P).info("set language to " + t);
+    } catch (s) {
+      s instanceof Error && a(this, P).crash(s);
     }
   }
   /**
@@ -410,15 +453,15 @@ class tr {
         `The 't' function cannot be destructured. If you need a standalone version you can import it like so: 'import { t } from "@manyducks.co/dolla"'`
       );
     let r = [], n = [];
-    for (const a in t)
-      r.push(a), n.push(t[a]);
-    return be([this.$locale, ...n], (a, ...o) => {
-      if (a == null)
+    for (const s in t)
+      r.push(s), n.push(t[s]);
+    return F([this.$locale, ...n], (s, ...i) => {
+      if (s == null)
         return "[NO LOCALE SET]";
-      const p = {};
-      for (let l = 0; l < o.length; l++)
-        p[r[l]] = o[l];
-      return v(this, R, xt).call(this, a, e, p);
+      const f = {};
+      for (let c = 0; c < i.length; c++)
+        f[r[c]] = i[c];
+      return d(this, E, Ye).call(this, s, e, f);
     });
   }
   /**
@@ -436,7 +479,7 @@ class tr {
    * t("greeting", {name: "world"}); // State<"Hello, WORLD!">
    */
   addFormat(e, t) {
-    s(this, ke).set(e, t);
+    a(this, oe).set(e, t);
   }
   /**
    * Creates an `Intl.Collator` configured for the current locale.
@@ -453,7 +496,7 @@ class tr {
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#options
    */
   number(e, t) {
-    return be([this.$locale, e], (r, n) => v(this, R, st).call(this, n, t));
+    return F([this.$locale, e], (r, n) => d(this, E, De).call(this, n, t));
   }
   /**
    * Returns a State containing the date formatted for the current locale. Uses `Intl.DateTimeFormat` under the hood.
@@ -465,7 +508,7 @@ class tr {
    * const $formatted = Dolla.i18n.dateTime(date, { dateFormat: "short" });
    */
   dateTime(e, t) {
-    return be([this.$locale, e], (r, n) => v(this, R, it).call(this, n, t));
+    return F([this.$locale, e], (r, n) => d(this, E, Te).call(this, n, t));
   }
   /**
    * Returns a State containing the date formatted for the current locale. Uses `Intl.DateTimeFormat` under the hood.
@@ -477,513 +520,88 @@ class tr {
    * const $formatted = Dolla.i18n.list(list, {  });
    */
   list(e, t) {
-    return be([this.$locale, e], (r, n) => v(this, R, ot).call(this, n, t));
+    return F([this.$locale, e], (r, n) => d(this, E, Oe).call(this, n, t));
   }
 }
-$e = new WeakMap(), I = new WeakMap(), L = new WeakMap(), Ee = new WeakMap(), ke = new WeakMap(), Se = new WeakMap(), Pe = new WeakMap(), R = new WeakSet(), xt = function(e, t, r) {
-  var l;
-  const n = v(this, R, Ot).call(this, t, r);
+ae = new WeakMap(), P = new WeakMap(), v = new WeakMap(), ie = new WeakMap(), oe = new WeakMap(), le = new WeakMap(), ce = new WeakMap(), E = new WeakSet(), Ye = function(e, t, r) {
+  var c;
+  const n = d(this, E, Ze).call(this, t, r);
   if (n) return n;
-  const a = s(this, L).get(e);
+  const s = a(this, v).get(e);
   if (r.context != null && (t += "_" + r.context), r.count != null)
     if (r.ordinal) {
-      const f = `${t}_ordinal_(=${r.count})`;
-      a.hasTemplate(f) ? t = f : t += "_ordinal_" + new Intl.PluralRules(e, { type: "ordinal" }).select(r.count);
+      const u = `${t}_ordinal_(=${r.count})`;
+      s.hasTemplate(u) ? t = u : t += "_ordinal_" + new Intl.PluralRules(e, { type: "ordinal" }).select(r.count);
     } else {
-      const f = `${t}_(=${r.count})`;
-      a.hasTemplate(f) ? t = f : t += "_" + new Intl.PluralRules(e).select(r.count);
+      const u = `${t}_(=${r.count})`;
+      s.hasTemplate(u) ? t = u : t += "_" + new Intl.PluralRules(e).select(r.count);
     }
-  const o = a.getTemplate(t);
-  let p = "";
-  for (const f of o.segments)
-    if (f.type === 0)
-      p += f.text;
-    else if (f.type === 1) {
-      let m = rr(r, f.name);
-      const g = ((l = r.formatOverrides) == null ? void 0 : l[f.name]) ?? [...f.formats];
-      f.name === "count" && g.length === 0 && g.push({ name: "number", options: {} });
-      for (const u of g) {
-        const y = s(this, ke).get(u.name);
-        if (y == null) {
-          const k = new Error(
-            `Failed to load format '${u.name}' when processing '${t}', template: ${o}`
+  const i = s.getTemplate(t);
+  let f = "";
+  for (const u of i.segments)
+    if (u.type === 0)
+      f += u.text;
+    else if (u.type === 1) {
+      let m = Mt(r, u.name);
+      const b = ((c = r.formatOverrides) == null ? void 0 : c[u.name]) ?? [...u.formats];
+      u.name === "count" && b.length === 0 && b.push({ name: "number", options: {} });
+      for (const h of b) {
+        const R = a(this, oe).get(h.name);
+        if (R == null) {
+          const y = new Error(
+            `Failed to load format '${h.name}' when processing '${t}', template: ${i}`
           );
-          throw s(this, I).crash(k), k;
+          throw a(this, P).crash(y), y;
         }
-        m = y(e, m, u.options);
+        m = R(e, m, h.options);
       }
-      p += m;
+      f += m;
     }
-  return p;
-}, st = function(e, t) {
+  return f;
+}, De = function(e, t) {
   return new Intl.NumberFormat(this.$locale.get(), t).format(e);
-}, it = function(e, t) {
-  return new Intl.DateTimeFormat(this.$locale.get(), t).format(
-    typeof e == "string" ? new Date(e) : e
-  );
-}, ot = function(e, t) {
+}, Te = function(e, t) {
+  return new Intl.DateTimeFormat(this.$locale.get(), t).format(k(e) ? new Date(e) : e);
+}, Oe = function(e, t) {
   return new Intl.ListFormat(this.$locale.get(), t).format(e);
 }, // relativeTime(): State<string> {
 // }
-Ot = function(e, t) {
-  for (const r of s(this, Ee))
-    if (r[0] === e && Zt(r[1], t))
+Ze = function(e, t) {
+  for (const r of a(this, ie))
+    if (r[0] === e && ot(r[1], t))
       return r[2];
 };
-function rr(i, e) {
+function Mt(o, e) {
   const t = String(e).split(/[\.\[\]]/).filter((n) => n.trim() !== "");
-  let r = i;
+  let r = o;
   for (; t.length > 0; ) {
     const n = t.shift();
     r != null ? r = r[n] : r = void 0;
   }
   return r;
 }
-var xe, ce, U, Y, X, ue, Ye, A, Oe, _, lt, Ie;
-class nr {
-  constructor(e) {
-    h(this, _);
-    h(this, xe);
-    h(this, ce);
-    // Keys ensure only the most recent callback queued with a certain key
-    // will be called, keeping DOM operations to a minimum.
-    h(this, U, /* @__PURE__ */ new Map());
-    // All unkeyed writes are run on every batch.
-    h(this, Y, []);
-    // All read callbacks are run before updates on every batch.
-    h(this, X, []);
-    h(this, ue, !1);
-    // When true, batches that would exceed 16ms will be split and deferred to a rAF.
-    // This may not be desirable, because while it does prevent hitching it sometimes leaves
-    // the state partially rendered for a brief second and certain elements can be seen to update after the fact.
-    // But the tradeoff here is snappier navigation with possibly slightly out of date DOM updates on heavy pages.
-    h(this, Ye, !0);
-    h(this, A, 0);
-    h(this, Oe, new Intl.NumberFormat("en-US", { maximumFractionDigits: 2, minimumFractionDigits: 0 }));
-    b(this, xe, e), b(this, ce, e.createLogger("dolla/render"));
-  }
-  /**
-   * Queues a callback that runs before the next batch of writes.
-   */
-  read(e) {
-    s(this, X).push(e), v(this, _, lt).call(this);
-  }
-  /**
-   * Queues a callback to run in the next render batch.
-   * Always put DOM mutations in a write callback when possible to help Dolla batch them efficiently.
-   */
-  write(e, t) {
-    t ? s(this, U).set(t, e) : s(this, Y).push(e), v(this, _, lt).call(this);
-  }
-}
-xe = new WeakMap(), ce = new WeakMap(), U = new WeakMap(), Y = new WeakMap(), X = new WeakMap(), ue = new WeakMap(), Ye = new WeakMap(), A = new WeakMap(), Oe = new WeakMap(), _ = new WeakSet(), lt = function() {
-  if (!s(this, ue)) {
-    b(this, ue, !0);
-    const e = s(this, xe).getEnv() === "development";
-    queueMicrotask(() => {
-      v(this, _, Ie).call(this, e);
-    });
-  }
-}, Ie = function(e = !1) {
-  const t = performance.now();
-  let r = 0;
-  const n = s(this, X).length + s(this, U).size + s(this, Y).length;
-  let a = 0;
-  const o = () => (a++, r = performance.now() - t, s(this, Ye) && r > 12 && a < n ? (et(this, A)._++, e && s(this, ce).warn(
-    `⚠️ Deferring batch to next frame. Performed ${a} of ${n} batched operation${a === 1 ? "" : "s"} in ${s(this, Oe).format(r)}ms (deferral ${s(this, A)}).`
-  ), requestAnimationFrame(() => {
-    v(this, _, Ie).call(this, e);
-  }), !0) : !1), p = [...s(this, U).entries()];
-  let l;
-  for (; l = s(this, X).shift(); )
-    if (l(), o()) return;
-  for (const [f, m] of p)
-    if (m(), s(this, U).delete(f), o()) return;
-  for (; l = s(this, Y).shift(); )
-    if (l(), o()) return;
-  e && s(this, ce)[r > 16 ? "warn" : "info"](
-    `${r > 16 ? "⚠️ (>=16ms) " : ""}Executed ${a} operation${a === 1 ? "" : "s"} in ${s(this, Oe).format(r)}ms${s(this, A) > 0 ? ` (after ${s(this, A)} deferral${s(this, A) === 1 ? "" : "s"})` : ""}.`
-  ), b(this, A, 0), s(this, X).length || s(this, U).size || s(this, Y).length ? queueMicrotask(() => {
-    v(this, _, Ie).call(this, e);
-  }) : b(this, ue, !1);
-};
-function pe() {
-  return pe = Object.assign ? Object.assign.bind() : function(i) {
-    for (var e = 1; e < arguments.length; e++) {
-      var t = arguments[e];
-      for (var r in t) ({}).hasOwnProperty.call(t, r) && (i[r] = t[r]);
-    }
-    return i;
-  }, pe.apply(null, arguments);
-}
-var M;
-(function(i) {
-  i.Pop = "POP", i.Push = "PUSH", i.Replace = "REPLACE";
-})(M || (M = {}));
-var Be = process.env.NODE_ENV !== "production" ? function(i) {
-  return Object.freeze(i);
-} : function(i) {
-  return i;
-};
-function Ue(i, e) {
-  if (!i) {
-    typeof console < "u" && console.warn(e);
-    try {
-      throw new Error(e);
-    } catch {
-    }
-  }
-}
-var Ge = "beforeunload", ar = "hashchange", Lt = "popstate";
-function sr(i) {
-  i === void 0 && (i = {});
-  var e = i, t = e.window, r = t === void 0 ? document.defaultView : t, n = r.history;
-  function a() {
-    var w = r.location, c = w.pathname, d = w.search, $ = w.hash, E = n.state || {};
-    return [E.idx, Be({
-      pathname: c,
-      search: d,
-      hash: $,
-      state: E.usr || null,
-      key: E.key || "default"
-    })];
-  }
-  var o = null;
-  function p() {
-    if (o)
-      y.call(o), o = null;
-    else {
-      var w = M.Pop, c = a(), d = c[0], $ = c[1];
-      if (y.length)
-        if (d != null) {
-          var E = m - d;
-          E && (o = {
-            action: w,
-            location: $,
-            retry: function() {
-              C(E * -1);
-            }
-          }, C(E));
-        } else
-          process.env.NODE_ENV !== "production" && Ue(
-            !1,
-            // TODO: Write up a doc that explains our blocking strategy in
-            // detail and link to it here so people can understand better what
-            // is going on and how to avoid it.
-            "You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."
-          );
-      else
-        ae(w);
-    }
-  }
-  r.addEventListener(Lt, p);
-  var l = M.Pop, f = a(), m = f[0], g = f[1], u = Ke(), y = Ke();
-  m == null && (m = 0, n.replaceState(pe({}, n.state, {
-    idx: m
-  }), ""));
-  function k(w) {
-    return typeof w == "string" ? w : He(w);
-  }
-  function me(w, c) {
-    return c === void 0 && (c = null), Be(pe({
-      pathname: g.pathname,
-      hash: "",
-      search: ""
-    }, typeof w == "string" ? ct(w) : w, {
-      state: c,
-      key: Rt()
-    }));
-  }
-  function ge(w, c) {
-    return [{
-      usr: w.state,
-      key: w.key,
-      idx: c
-    }, k(w)];
-  }
-  function we(w, c, d) {
-    return !y.length || (y.call({
-      action: w,
-      location: c,
-      retry: d
-    }), !1);
-  }
-  function ae(w) {
-    l = w;
-    var c = a();
-    m = c[0], g = c[1], u.call({
-      action: l,
-      location: g
-    });
-  }
-  function se(w, c) {
-    var d = M.Push, $ = me(w, c);
-    function E() {
-      se(w, c);
-    }
-    if (we(d, $, E)) {
-      var x = ge($, m + 1), D = x[0], T = x[1];
-      try {
-        n.pushState(D, "", T);
-      } catch {
-        r.location.assign(T);
-      }
-      ae(d);
-    }
-  }
-  function ye(w, c) {
-    var d = M.Replace, $ = me(w, c);
-    function E() {
-      ye(w, c);
-    }
-    if (we(d, $, E)) {
-      var x = ge($, m), D = x[0], T = x[1];
-      n.replaceState(D, "", T), ae(d);
-    }
-  }
-  function C(w) {
-    n.go(w);
-  }
-  var Q = {
-    get action() {
-      return l;
-    },
-    get location() {
-      return g;
-    },
-    createHref: k,
-    push: se,
-    replace: ye,
-    go: C,
-    back: function() {
-      C(-1);
-    },
-    forward: function() {
-      C(1);
-    },
-    listen: function(c) {
-      return u.push(c);
-    },
-    block: function(c) {
-      var d = y.push(c);
-      return y.length === 1 && r.addEventListener(Ge, ze), function() {
-        d(), y.length || r.removeEventListener(Ge, ze);
-      };
-    }
-  };
-  return Q;
-}
-function ir(i) {
-  i === void 0 && (i = {});
-  var e = i, t = e.window, r = t === void 0 ? document.defaultView : t, n = r.history;
-  function a() {
-    var c = ct(r.location.hash.substr(1)), d = c.pathname, $ = d === void 0 ? "/" : d, E = c.search, x = E === void 0 ? "" : E, D = c.hash, T = D === void 0 ? "" : D, q = n.state || {};
-    return [q.idx, Be({
-      pathname: $,
-      search: x,
-      hash: T,
-      state: q.usr || null,
-      key: q.key || "default"
-    })];
-  }
-  var o = null;
-  function p() {
-    if (o)
-      y.call(o), o = null;
-    else {
-      var c = M.Pop, d = a(), $ = d[0], E = d[1];
-      if (y.length)
-        if ($ != null) {
-          var x = m - $;
-          x && (o = {
-            action: c,
-            location: E,
-            retry: function() {
-              Q(x * -1);
-            }
-          }, Q(x));
-        } else
-          process.env.NODE_ENV !== "production" && Ue(
-            !1,
-            // TODO: Write up a doc that explains our blocking strategy in
-            // detail and link to it here so people can understand better
-            // what is going on and how to avoid it.
-            "You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."
-          );
-      else
-        se(c);
-    }
-  }
-  r.addEventListener(Lt, p), r.addEventListener(ar, function() {
-    var c = a(), d = c[1];
-    He(d) !== He(g) && p();
-  });
-  var l = M.Pop, f = a(), m = f[0], g = f[1], u = Ke(), y = Ke();
-  m == null && (m = 0, n.replaceState(pe({}, n.state, {
-    idx: m
-  }), ""));
-  function k() {
-    var c = document.querySelector("base"), d = "";
-    if (c && c.getAttribute("href")) {
-      var $ = r.location.href, E = $.indexOf("#");
-      d = E === -1 ? $ : $.slice(0, E);
-    }
-    return d;
-  }
-  function me(c) {
-    return k() + "#" + (typeof c == "string" ? c : He(c));
-  }
-  function ge(c, d) {
-    return d === void 0 && (d = null), Be(pe({
-      pathname: g.pathname,
-      hash: "",
-      search: ""
-    }, typeof c == "string" ? ct(c) : c, {
-      state: d,
-      key: Rt()
-    }));
-  }
-  function we(c, d) {
-    return [{
-      usr: c.state,
-      key: c.key,
-      idx: d
-    }, me(c)];
-  }
-  function ae(c, d, $) {
-    return !y.length || (y.call({
-      action: c,
-      location: d,
-      retry: $
-    }), !1);
-  }
-  function se(c) {
-    l = c;
-    var d = a();
-    m = d[0], g = d[1], u.call({
-      action: l,
-      location: g
-    });
-  }
-  function ye(c, d) {
-    var $ = M.Push, E = ge(c, d);
-    function x() {
-      ye(c, d);
-    }
-    if (process.env.NODE_ENV !== "production" && Ue(E.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(c) + ")"), ae($, E, x)) {
-      var D = we(E, m + 1), T = D[0], q = D[1];
-      try {
-        n.pushState(T, "", q);
-      } catch {
-        r.location.assign(q);
-      }
-      se($);
-    }
-  }
-  function C(c, d) {
-    var $ = M.Replace, E = ge(c, d);
-    function x() {
-      C(c, d);
-    }
-    if (process.env.NODE_ENV !== "production" && Ue(E.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(c) + ")"), ae($, E, x)) {
-      var D = we(E, m), T = D[0], q = D[1];
-      n.replaceState(T, "", q), se($);
-    }
-  }
-  function Q(c) {
-    n.go(c);
-  }
-  var w = {
-    get action() {
-      return l;
-    },
-    get location() {
-      return g;
-    },
-    createHref: me,
-    push: ye,
-    replace: C,
-    go: Q,
-    back: function() {
-      Q(-1);
-    },
-    forward: function() {
-      Q(1);
-    },
-    listen: function(d) {
-      return u.push(d);
-    },
-    block: function(d) {
-      var $ = y.push(d);
-      return y.length === 1 && r.addEventListener(Ge, ze), function() {
-        $(), y.length || r.removeEventListener(Ge, ze);
-      };
-    }
-  };
-  return w;
-}
-function ze(i) {
-  i.preventDefault(), i.returnValue = "";
-}
-function Ke() {
-  var i = [];
-  return {
-    get length() {
-      return i.length;
-    },
-    push: function(t) {
-      return i.push(t), function() {
-        i = i.filter(function(r) {
-          return r !== t;
-        });
-      };
-    },
-    call: function(t) {
-      i.forEach(function(r) {
-        return r && r(t);
-      });
-    }
-  };
-}
-function Rt() {
-  return Math.random().toString(36).substr(2, 8);
-}
-function He(i) {
-  var e = i.pathname, t = e === void 0 ? "/" : e, r = i.search, n = r === void 0 ? "" : r, a = i.hash, o = a === void 0 ? "" : a;
-  return n && n !== "?" && (t += n.charAt(0) === "?" ? n : "?" + n), o && o !== "#" && (t += o.charAt(0) === "#" ? o : "#" + o), t;
+function ee(o) {
+  return Qe(o, "Expected `path` to be a string. Got type: %t, value: %v"), o.split("/").map((e) => e.trim()).filter((e) => e !== "");
 }
-function ct(i) {
-  var e = {};
-  if (i) {
-    var t = i.indexOf("#");
-    t >= 0 && (e.hash = i.substr(t), i = i.substr(0, t));
-    var r = i.indexOf("?");
-    r >= 0 && (e.search = i.substr(r), i = i.substr(0, r)), i && (e.pathname = i);
-  }
-  return e;
-}
-function ve(i) {
-  return kt(i, "Expected `path` to be a string. Got type: %t, value: %v"), i.split("/").map((e) => e.trim()).filter((e) => e !== "");
-}
-function ie(i) {
+function H(o) {
   var t;
-  Mt(
-    (r) => dt(r == null ? void 0 : r.toString),
-    i,
+  lt(
+    (r) => te(r == null ? void 0 : r.toString),
+    o,
     "Expected `parts` to be an array of objects with a .toString() method. Got type: %t, value: %v"
-  ), i = i.filter((r) => r).flatMap(String);
-  let e = (t = i.shift()) == null ? void 0 : t.toString();
+  ), o = o.filter((r) => r).flatMap(String);
+  let e = (t = o.shift()) == null ? void 0 : t.toString();
   if (e) {
-    for (const r of i.map((n) => n.toString()))
-      r.startsWith(".") ? e = We(e, r) : e[e.length - 1] !== "/" ? r[0] !== "/" ? e += "/" + r : e += r : r[0] === "/" ? e += r.slice(1) : e += r;
+    for (const r of o.map((n) => n.toString()))
+      r.startsWith(".") ? e = Ee(e, r) : e[e.length - 1] !== "/" ? r[0] !== "/" ? e += "/" + r : e += r : r[0] === "/" ? e += r.slice(1) : e += r;
     e && e !== "/" && e.endsWith("/") && (e = e.slice(0, e.length - 1));
   }
   return e ?? "";
 }
-function We(i, e) {
-  if (kt(i, "Expected `base` to be a string. Got type: %t, value: %v"), e == null && (e = i, i = ""), e.startsWith("/"))
+function Ee(o, e) {
+  if (Qe(o, "Expected `base` to be a string. Got type: %t, value: %v"), e == null && (e = o, o = ""), e.startsWith("/"))
     return e;
-  let t = i;
+  let t = o;
   for (; ; )
     if (e.startsWith("..")) {
       for (let r = t.length; r > 0; --r)
@@ -995,88 +613,88 @@ function We(i, e) {
       e = e.replace(/^\.\/?/, "");
     else
       break;
-  return ie([t, e]);
+  return H([t, e]);
 }
-function ut(i) {
-  if (!i) return {};
-  i.startsWith("?") && (i = i.slice(1));
-  const e = i.split("&").filter((t) => t.trim() !== "").map((t) => {
-    const [r, n] = t.split("=").map((a) => a.trim());
+function xt(o) {
+  if (!o) return {};
+  o.startsWith("?") && (o = o.slice(1));
+  const e = o.split("&").filter((t) => t.trim() !== "").map((t) => {
+    const [r, n] = t.split("=").map((s) => s.trim());
     return n.toLowerCase() === "true" ? [r, !0] : n.toLowerCase() === "false" ? [r, !1] : isNaN(Number(n)) ? [r, n] : [r, Number(n)];
   });
   return Object.fromEntries(e);
 }
-function vt(i, e, t = {}) {
-  var o;
-  const [r, n] = e.split("?"), a = ve(r);
-  e: for (const p of i) {
-    const { fragments: l } = p;
-    if (!(((o = l[l.length - 1]) == null ? void 0 : o.type) === 3) && l.length !== a.length || t.willMatch && !t.willMatch(p))
+function et(o, e, t = {}) {
+  var i;
+  const [r, n] = e.split("?"), s = ee(r);
+  e: for (const f of o) {
+    const { fragments: c } = f;
+    if (!(((i = c[c.length - 1]) == null ? void 0 : i.type) === 3) && c.length !== s.length || t.willMatch && !t.willMatch(f))
       continue e;
     const m = [];
-    t: for (let u = 0; u < l.length; u++) {
-      const y = a[u], k = l[u];
-      if (y == null && k.type !== 3)
+    t: for (let h = 0; h < c.length; h++) {
+      const R = s[h], y = c[h];
+      if (R == null && y.type !== 3)
         continue e;
-      switch (k.type) {
+      switch (y.type) {
         case 1:
-          if (k.name.toLowerCase() === y.toLowerCase()) {
-            m.push(k);
+          if (y.name.toLowerCase() === R.toLowerCase()) {
+            m.push(y);
             break;
           } else
             continue e;
         case 2:
-          m.push({ ...k, value: y });
+          m.push({ ...y, value: R });
           break;
         case 3:
-          m.push({ ...k, value: a.slice(u).join("/") });
+          m.push({ ...y, value: s.slice(h).join("/") });
           break t;
         case 4:
-          if (isNaN(Number(y)))
+          if (isNaN(Number(R)))
             continue e;
-          m.push({ ...k, value: Number(y) });
+          m.push({ ...y, value: Number(R) });
           break;
         default:
-          throw new Error(`Unknown fragment type: ${k.type}`);
+          throw new Error(`Unknown fragment type: ${y.type}`);
       }
     }
-    const g = {};
-    for (const u of m)
-      u.type === 2 && (g[u.name] = decodeURIComponent(u.value)), u.type === 4 && (g[u.name] = u.value), u.type === 3 && (g.wildcard = "/" + decodeURIComponent(u.value));
+    const b = {};
+    for (const h of m)
+      h.type === 2 && (b[h.name] = decodeURIComponent(h.value)), h.type === 4 && (b[h.name] = h.value), h.type === 3 && (b.wildcard = "/" + decodeURIComponent(h.value));
     return {
-      path: "/" + m.map((u) => u.value).join("/"),
-      pattern: "/" + l.map((u) => u.type === 2 ? `{${u.name}}` : u.type === 4 ? `{#${u.name}}` : u.name).join("/"),
-      params: g,
-      query: ut(n),
-      meta: p.meta
+      path: "/" + m.map((h) => h.value).join("/"),
+      pattern: "/" + c.map((h) => h.type === 2 ? `{${h.name}}` : h.type === 4 ? `{#${h.name}}` : h.name).join("/"),
+      params: b,
+      query: xt(n),
+      meta: f.meta
     };
   }
 }
-function or(i) {
+function Ft(o) {
   const e = [], t = [], r = [], n = [];
-  for (const o of i) {
-    const { fragments: p } = o;
-    p.some(
-      (l) => l.type === 3
+  for (const i of o) {
+    const { fragments: f } = i;
+    f.some(
+      (c) => c.type === 3
       /* Wildcard */
-    ) ? n.push(o) : p.some(
-      (l) => l.type === 4
+    ) ? n.push(i) : f.some(
+      (c) => c.type === 4
       /* NumericParam */
-    ) ? t.push(o) : p.some(
-      (l) => l.type === 2
+    ) ? t.push(i) : f.some(
+      (c) => c.type === 2
       /* Param */
-    ) ? r.push(o) : e.push(o);
+    ) ? r.push(i) : e.push(i);
   }
-  const a = (o, p) => o.fragments.length > p.fragments.length ? -1 : 1;
-  return e.sort(a), t.sort(a), r.sort(a), n.sort(a), [...e, ...t, ...r, ...n];
+  const s = (i, f) => i.fragments.length > f.fragments.length ? -1 : 1;
+  return e.sort(s), t.sort(s), r.sort(s), n.sort(s), [...e, ...t, ...r, ...n];
 }
-function lr(i) {
-  const e = ve(i), t = [];
+function qt(o) {
+  const e = ee(o), t = [];
   for (let r = 0; r < e.length; r++) {
     const n = e[r];
     if (n === "*") {
       if (r !== e.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: ${o}`);
       t.push({
         type: 3,
         name: "*",
@@ -1094,105 +712,83 @@ function lr(i) {
   }
   return t;
 }
-const $t = (i, e) => {
-  if (Object.keys(i).length !== Object.keys(e).length)
-    return !1;
-  for (const t in i)
-    if (i[t] !== e[t])
-      return !1;
-  return !0;
-};
-var Le, N, Z, Re, S, Xe, H, De, ee, te, he, fe, de, Ne, K, ht, ft;
-class cr {
-  constructor(e, t) {
-    h(this, K);
-    h(this, Le);
-    h(this, N);
-    h(this, Z);
-    h(this, Re, nt());
-    h(this, S);
-    h(this, Xe, 0);
-    h(this, H, []);
-    h(this, De);
-    h(this, ee, []);
+var W, x, xe, D, X, _, G, T, he, w, je, tt, rt, Z, Ce, st, Ue;
+class Nt {
+  constructor(e) {
+    l(this, w);
+    l(this, W);
+    l(this, x);
+    l(this, xe, 0);
+    l(this, D, []);
+    l(this, X, []);
+    /**
+     * Use hash routing when true. Configured in router options.
+     */
+    l(this, _, !1);
     // Callbacks that need to be called on unmount.
-    h(this, te, []);
+    l(this, G, []);
+    /**
+     * The current match object.
+     */
+    l(this, T);
+    l(this, he);
     /**
      * The currently matched route pattern, if any.
      */
-    P(this, "$pattern");
-    h(this, he);
+    p(this, "$pattern");
     /**
      * The current URL path.
      */
-    P(this, "$path");
-    h(this, fe);
+    p(this, "$path");
     /**
      * The current named path params.
      */
-    P(this, "$params");
-    h(this, de);
+    p(this, "$params");
     /**
      * The current query params. Changes to this object will be reflected in the URL.
      */
-    P(this, "$query");
-    h(this, Ne);
-    b(this, Le, e), b(this, N, e.createLogger("dolla/router")), b(this, Z, t);
-    const [r, n] = oe(null), [a, o] = oe(""), [p, l] = oe({}, { equals: $t }), [f, m] = oe(
-      ut(typeof window > "u" ? "" : window.location.search ?? ""),
-      { equals: $t }
-    );
-    this.$pattern = r, b(this, he, n), this.$path = a, b(this, fe, o), this.$params = p, b(this, de, l), this.$query = f, b(this, Ne, m), e.beforeMount(() => {
-      s(this, S) != null && (s(this, Re).watch([f], (g) => {
-        const u = new URLSearchParams();
-        for (const k in g)
-          u.set(k, String(g[k]));
-        const y = "?" + u.toString();
-        y != s(this, S).location.search && s(this, S).replace({
-          pathname: s(this, S).location.pathname,
-          search: y
-        });
-      }), s(this, te).push(s(this, S).listen(v(this, K, ft).bind(this))), v(this, K, ft).call(this, s(this, S)), s(this, te).push(
-        fr(s(this, Z).rootElement, (g) => {
-          let u = g.getAttribute("href");
-          s(this, N).info("Intercepted link click", g, u), /^https?:\/\/|^\//.test(u) || (u = ie([s(this, S).location.pathname, u])), s(this, S).push(u);
+    p(this, "$query");
+    g(this, W, e), g(this, x, e.createLogger("dolla/router")), [Y(this, T)._, Y(this, he)._] = Ve(), this.$pattern = F([a(this, T)], (t) => t == null ? void 0 : t.pattern), this.$path = F([a(this, T)], (t) => (t == null ? void 0 : t.path) ?? window.location.pathname), this.$params = F([a(this, T)], (t) => (t == null ? void 0 : t.params) ?? {}, { equals: _e }), this.$query = F([a(this, T)], (t) => (t == null ? void 0 : t.query) ?? {}, { equals: _e }), e.beforeMount(async () => {
+      const t = () => {
+        d(this, w, Z).call(this);
+      };
+      window.addEventListener("popstate", t), a(this, G).push(() => window.removeEventListener("popstate", t));
+      const r = e.getRootElement();
+      return a(this, G).push(
+        Tt(r, (n) => {
+          let s = n.getAttribute("href");
+          a(this, x).info("intercepted click on <a> tag", n), /^https?:\/\/|^\//.test(s) || (s = H([window.location.pathname, s])), d(this, w, je).call(this, s);
         })
-      ), s(this, N).info("Intercepting <a> clicks within root element:", s(this, Z).rootElement));
+      ), a(this, x).info("will intercept clicks on <a> tags within root element", r), d(this, w, Z).call(this);
     }), e.onUnmount(() => {
-      for (; s(this, te).length > 0; )
-        s(this, te).pop()();
-      s(this, Re).stopAll();
+      for (const t of a(this, G))
+        t();
+      g(this, G, []);
     });
   }
-  setup(e) {
-    if (s(this, Le).isMounted) {
-      s(this, N).crash(
-        new Error("Dolla is already mounted. Router setup must be called before Dolla.mount is called.")
-      );
-      return;
-    }
-    e.style === "hash" ? b(this, S, ir()) : b(this, S, sr()), b(this, ee, or(
-      e.routes.flatMap((t) => v(this, K, ht).call(this, t)).map((t) => ({
+  async setup(e) {
+    Ge(e != null, "Options object must not be null. Got: %t"), Ge(
+      !a(this, W).isMounted,
+      "Dolla is already mounted. Dolla.router.setup() must be called before Dolla.mount()."
+    ), e.hash && g(this, _, !0), g(this, X, Ft(
+      e.routes.flatMap((t) => d(this, w, Ue).call(this, t)).map((t) => ({
         pattern: t.pattern,
         meta: t.meta,
-        fragments: lr(t.pattern)
+        fragments: qt(t.pattern)
       }))
-    ));
-    for (const t of s(this, ee))
-      if (t.meta.redirect) {
-        let r;
-        if (!dt(t.meta.redirect)) if (V(t.meta.redirect)) {
-          if (r = t.meta.redirect, !vt(s(this, ee), r, {
-            willMatch(a) {
-              return a !== t;
-            }
-          }))
-            throw new Error(
-              `Found a redirect to an undefined URL. From '${t.pattern}' to '${t.meta.redirect}'`
-            );
-        } else
-          throw new TypeError(`Expected a string or redirect function. Got: ${t.meta.redirect}`);
-      }
+    )), jt(a(this, X));
+  }
+  /**
+   * Navigate backward. Pass a number of steps to hit the back button that many times.
+   */
+  back(e = 1) {
+    window.history.go(-e);
+  }
+  /**
+   * Navigate forward. Pass a number of steps to hit the forward button that many times.
+   */
+  forward(e = 1) {
+    window.history.go(e);
   }
   /**
    * Navigates to another route.
@@ -1202,54 +798,93 @@ class cr {
    * Dolla.router.go["/users", 215], { replace: true }); // replace current history entry with `/users/215`
    */
   go(e, t = {}) {
-    if (s(this, S) == null) {
-      s(this, N).crash(
-        new Error(
-          "Router.go was called, but the router was never configured! Run 'Dolla.router.setup' before 'Dolla.mount' to configure routes."
-        )
-      );
-      return;
-    }
+    if (a(this, W) == null)
+      throw new Error("Routa methods won't work until you register it: Dolla.use(Routa, { /* ...options */ })");
     let r;
-    Array.isArray(e) ? r = ie(e) : r = e.toString(), r = We(s(this, S).location.pathname, r), t.preserveQuery && (r += s(this, S).location.search), t.replace ? s(this, S).replace(r) : s(this, S).push(r);
+    Array.isArray(e) ? r = H(e) : r = e.toString(), r = Ee(window.location.pathname, r), t.preserveQuery && (r += window.location.search), t.replace ? d(this, w, tt).call(this, r) : d(this, w, je).call(this, r);
   }
-  /**
-   * Navigate backward. Pass a number of steps to hit the back button that many times.
-   */
-  back(e = 1) {
-    if (s(this, S) == null) {
-      s(this, N).crash(
-        new Error(
-          "Router.back was called, but the router was never configured! Run 'Dolla.router.setup' before 'Dolla.mount' to configure routes."
-        )
-      );
-      return;
+}
+W = new WeakMap(), x = new WeakMap(), xe = new WeakMap(), D = new WeakMap(), X = new WeakMap(), _ = new WeakMap(), G = new WeakMap(), T = new WeakMap(), he = new WeakMap(), w = new WeakSet(), je = function(e, t) {
+  a(this, x).info("(push)", e), window.history.pushState(t, "", a(this, _) ? "/#" + e : e), d(this, w, Z).call(this, e);
+}, tt = function(e, t) {
+  a(this, x).info("(replace)", e), window.history.replaceState(t, "", a(this, _) ? "/#" + e : e), d(this, w, Z).call(this, e);
+}, rt = function() {
+  return a(this, _) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
+}, Z = async function(e) {
+  const t = a(this, x), r = e ? new URL(e, window.location.origin) : d(this, w, rt).call(this), { match: n, journey: s } = await d(this, w, Ce).call(this, r);
+  for (const i of s)
+    switch (i.kind) {
+      case "match":
+        t.info(`📍 ${i.message}`);
+        break;
+      case "redirect":
+        t.info(`↩️ ${i.message}`);
+        break;
+      case "miss":
+        t.info(`💀 ${i.message}`);
+        break;
     }
-    s(this, S).go(-e);
-  }
-  /**
-   * Navigate forward. Pass a number of steps to hit the forward button that many times.
-   */
-  forward(e = 1) {
-    if (s(this, S) == null) {
-      s(this, N).crash(
-        new Error(
-          "Router.forward was called, but the router was never configured! Run 'Dolla.router.setup' before 'Dolla.mount' to configure routes."
-        )
-      );
-      return;
+  if (n) {
+    const i = this.$pattern.get();
+    a(this, he).call(this, n), n.pattern !== i && d(this, w, st).call(this, n);
+  } else
+    t.crash(new Ct(`Failed to match route '${r.pathname}'`));
+}, Ce = async function(e, t = []) {
+  const r = et(a(this, X), e.pathname);
+  if (!r)
+    return {
+      match: null,
+      journey: [...t, { kind: "miss", message: `no match for '${e.pathname}'` }]
+    };
+  let n = r.meta.redirect;
+  if (r.meta.beforeMatch && await r.meta.beforeMatch({
+    // TODO: Allow setting context variables from here? Would apply to the context of the matched view.
+    redirect: (s) => {
+      n = s;
+    }
+  }), n != null) {
+    let s;
+    if (k(n))
+      s = Ot(n, r.params);
+    else if (te(n)) {
+      const i = {
+        path: r.path,
+        pattern: r.pattern,
+        params: r.params,
+        query: r.query
+      };
+      if (s = await n(i), !k(s))
+        throw new Error("Redirect function must return a path to redirect to.");
+      s.startsWith("/") || (s = Ee(r.path, s));
+    } else
+      throw new TypeError("Redirect must either be a path string or a function.");
+    return d(this, w, Ce).call(this, new URL(s, window.location.origin), [
+      ...t,
+      { kind: "redirect", message: `redirecting '${r.path}' -> '${s}'` }
+    ]);
+  } else
+    return { match: r, journey: [...t, { kind: "match", message: `matched route '${r.path}'` }] };
+}, /**
+ * Takes a matched route and mounts it.
+ */
+st = function(e) {
+  const t = e.meta.layers;
+  for (let r = 0; r < t.length; r++) {
+    const n = t[r], s = a(this, D)[r];
+    if ((s == null ? void 0 : s.id) !== n.id) {
+      g(this, D, a(this, D).slice(0, r)), s == null || s.node.unmount();
+      const i = a(this, D).at(-1), c = ((i == null ? void 0 : i.node) ?? a(this, W).getRootView()).setChildView(n.view);
+      a(this, D).push({ id: n.id, node: c });
     }
-    s(this, S).go(e);
   }
-}
-Le = new WeakMap(), N = new WeakMap(), Z = new WeakMap(), Re = new WeakMap(), S = new WeakMap(), Xe = new WeakMap(), H = new WeakMap(), De = new WeakMap(), ee = new WeakMap(), te = new WeakMap(), he = new WeakMap(), fe = new WeakMap(), de = new WeakMap(), Ne = new WeakMap(), K = new WeakSet(), /**
+}, /**
  * 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.
  */
-ht = function(e, t = [], r = []) {
-  if (!(typeof e == "object" && !Array.isArray(e)) || typeof e.path != "string")
+Ue = function(e, t = [], r = []) {
+  if (!ke(e) || !k(e.path))
     throw new TypeError(`Route configs must be objects with a 'path' string property. Got: ${e}`);
   if (e.redirect && e.routes)
     throw new Error("Route cannot have both a 'redirect' and nested 'routes'.");
@@ -1258,217 +893,205 @@ ht = function(e, t = [], r = []) {
   if (!e.view && !e.routes && !e.redirect)
     throw new Error("Route must have a 'view', a 'redirect', or a set of nested 'routes'.");
   let n = [];
-  for (const l of t)
-    n.push(...ve(l.path));
-  n.push(...ve(e.path)), n[n.length - 1] === "*" && n.pop();
-  const a = [];
+  for (const c of t)
+    n.push(...ee(c.path));
+  n.push(...ee(e.path)), n[n.length - 1] === "*" && n.pop();
+  const s = [];
   if (e.redirect) {
-    let l = e.redirect;
-    return V(l) && (l = We(ie(n), l), l.startsWith("/") || (l = "/" + l)), a.push({
-      pattern: "/" + ie([...n, ...ve(e.path)]),
+    let c = e.redirect;
+    return k(c) && (c = Ee(H(n), c), c.startsWith("/") || (c = "/" + c)), s.push({
+      pattern: "/" + H([...n, ...ee(e.path)]),
       meta: {
-        redirect: l
+        redirect: c
       }
-    }), a;
+    }), s;
   }
-  let o = St;
-  if (typeof e.view == "function")
-    o = e.view;
+  let i = Je;
+  if (te(e.view))
+    i = e.view;
   else if (e.view)
     throw new TypeError(`Route '${e.path}' expected a view function or undefined. Got: ${e.view}`);
-  const p = { id: et(this, Xe)._++, view: o };
+  const f = { id: Y(this, xe)._++, view: i };
   if (e.routes)
-    for (const l of e.routes)
-      a.push(...v(this, K, ht).call(this, l, [...t, e], [...r, p]));
+    for (const c of e.routes)
+      s.push(...d(this, w, Ue).call(this, c, [...t, e], [...r, f]));
   else
-    a.push({
-      pattern: parent ? ie([...t.map((l) => l.path), e.path]) : e.path,
+    s.push({
+      pattern: parent ? H([...t.map((c) => c.path), e.path]) : e.path,
       meta: {
         pattern: e.path,
-        layers: [...r, p],
+        layers: [...r, f],
         beforeMatch: e.beforeMatch
       }
     });
-  return a;
-}, ft = async function({ location: e }) {
-  e.search !== s(this, De) && (b(this, De, e.search), s(this, Ne).call(this, ut(e.search)));
-  const t = vt(s(this, ee), e.pathname);
-  if (!t) {
-    s(this, he).call(this, null), s(this, fe).call(this, e.pathname), s(this, de).call(this, {
-      wildcard: e.pathname
-    });
-    return;
-  }
-  if (t.meta.beforeMatch && await t.meta.beforeMatch({
-    // TODO: Allow setting context variables from here.
-    redirect: (r) => {
-      throw new Error("Redirect not yet implemented.");
-    }
-  }), t.meta.redirect != null)
-    if (typeof t.meta.redirect == "string") {
-      const r = dr(t.meta.redirect, t.params);
-      s(this, N).info(`↩️ redirecting from '${t.path}' to '${r}'`), s(this, S).replace(r);
-    } else if (typeof t.meta.redirect == "function") {
-      const r = {
-        path: t.path,
-        pattern: t.pattern,
-        params: t.params,
-        query: t.query
-      };
-      let n = await t.meta.redirect(r);
-      if (typeof n != "string")
-        throw new Error("Redirect function must return a path to redirect to.");
-      n.startsWith("/") || (n = We(t.path, n)), s(this, N).info(`Redirecting to: '${n}'`), s(this, S).replace(n);
-    } else
-      throw new TypeError("Redirect must either be a path string or a function.");
-  else if (s(this, N).info(`📍 navigating to '${t.path}'`), s(this, fe).call(this, t.path), s(this, de).call(this, t.params), t.pattern !== this.$pattern.get()) {
-    s(this, he).call(this, t.pattern);
-    const r = t.meta.layers;
-    for (let n = 0; n < r.length; n++) {
-      const a = r[n], o = s(this, H)[n];
-      if ((o == null ? void 0 : o.id) !== a.id) {
-        b(this, H, s(this, H).slice(0, n));
-        const p = s(this, H).at(-1);
-        o && o.node.isMounted && o.node.unmount(!1);
-        let l;
-        p ? l = p.node.setChildView(a.view) : l = s(this, Z).rootView.setChildView(a.view), s(this, H).push({ id: a.id, node: l });
-      }
-    }
-  }
+  return s;
 };
-const ur = /(noopener|noreferrer) (noopener|noreferrer)/, hr = /^[\w-_]+:/;
-function fr(i, e, t = window) {
-  function r(a) {
-    return !a || a === i ? null : a.localName !== "a" || a.href === void 0 ? r(a.parentNode) : a;
+const Pt = /(noopener|noreferrer) (noopener|noreferrer)/, Dt = /^[\w-_]+:/;
+function Tt(o, e, t = window) {
+  function r(s) {
+    return !s || s === o ? null : s.localName !== "a" || s.href === void 0 ? r(s.parentNode) : s;
   }
-  function n(a) {
-    if (a.button && a.button !== 0 || a.ctrlKey || a.metaKey || a.altKey || a.shiftKey || a.defaultPrevented)
+  function n(s) {
+    if (s.button && s.button !== 0 || s.ctrlKey || s.metaKey || s.altKey || s.shiftKey || s.defaultPrevented)
       return;
-    const o = r(a.target);
-    o && (t.location.protocol !== o.protocol || t.location.hostname !== o.hostname || t.location.port !== o.port || o.hasAttribute("data-router-ignore") || o.hasAttribute("download") || o.getAttribute("target") === "_blank" && ur.test(o.getAttribute("rel")) || hr.test(o.getAttribute("href")) || (a.preventDefault(), e(o)));
+    const i = r(s.target);
+    i && (t.location.protocol !== i.protocol || t.location.hostname !== i.hostname || t.location.port !== i.port || i.hasAttribute("data-router-ignore") || i.hasAttribute("download") || i.getAttribute("target") === "_blank" && Pt.test(i.getAttribute("rel")) || Dt.test(i.getAttribute("href")) || (s.preventDefault(), e(i)));
   }
-  return i.addEventListener("click", n), function() {
-    i.removeEventListener("click", n);
+  return o.addEventListener("click", n), function() {
+    o.removeEventListener("click", n);
   };
 }
-function dr(i, e) {
+function Ot(o, e) {
   for (const t in e) {
     const r = e[t].toString();
-    i = i.replace(`{${t}}`, r).replace(`{#${t}}`, r);
+    o = o.replace(`{${t}}`, r).replace(`{#${t}}`, r);
   }
-  return i;
+  return o;
+}
+function jt(o) {
+  for (const e of o)
+    if (e.meta.redirect) {
+      let t;
+      if (!te(e.meta.redirect)) if (k(e.meta.redirect)) {
+        if (t = e.meta.redirect, !et(o, t, {
+          willMatch(n) {
+            return n !== e;
+          }
+        }))
+          throw new Error(`Found a redirect to an undefined URL. From '${e.pattern}' to '${e.meta.redirect}'`);
+      } else
+        throw new TypeError(`Expected a string or redirect function. Got: ${e.meta.redirect}`);
+    }
 }
-var W, je, B, re, Te, Me, qe, Fe, Ae, _e, G, O, z;
-class pr {
+class Ct extends Error {
+}
+var O, ue, j, B, fe, de, me, ge, pe, we, C, $, U, Fe;
+class Ut {
   constructor() {
-    P(this, "http");
-    P(this, "i18n");
-    P(this, "render");
-    P(this, "router");
-    h(this, W, !1);
-    h(this, je, "production");
-    h(this, B);
-    h(this, re);
-    h(this, Te, Gt);
-    h(this, Me, nt());
-    h(this, qe, []);
-    h(this, Fe, []);
-    h(this, Ae, []);
-    h(this, _e, []);
-    h(this, G, {
+    p(this, "batch");
+    p(this, "http");
+    p(this, "i18n");
+    p(this, "router");
+    l(this, O, !1);
+    l(this, ue, "production");
+    l(this, j);
+    l(this, B);
+    l(this, fe, bt);
+    l(this, de, Be());
+    l(this, me, []);
+    l(this, ge, []);
+    l(this, pe, []);
+    l(this, we, []);
+    l(this, C, {
       root: this,
       data: {}
     });
-    h(this, O, {
+    l(this, $, {
       info: "development",
       log: "development",
       warn: "development",
       error: !0
     });
-    h(this, z, wt("*,-dolla/*"));
-    P(this, "watch", s(this, Me).watch);
-    P(this, "createState", oe);
-    P(this, "createSettableState", qt);
-    P(this, "toSettableState", Ft);
-    P(this, "toState", At);
-    P(this, "valueOf", _t);
-    P(this, "derive", be);
-    P(this, "createWatcher", nt);
-    P(this, "createRef", Ct);
-    P(this, "isRef", Vt);
-    const e = this;
-    this.http = new zt(), this.i18n = new tr(this), this.render = new nr(this), this.router = new cr(this, {
-      get rootElement() {
-        return s(e, B);
-      },
-      get rootView() {
-        return s(e, re);
-      }
-    });
+    l(this, U, ze("*,-dolla/*"));
+    // Registration functions for modules.
+    // All modules will be registered before mount.
+    l(this, Fe, []);
+    p(this, "watch", a(this, de).watch);
+    p(this, "createState", Ve);
+    p(this, "createSettableState", ct);
+    p(this, "toSettableState", ht);
+    p(this, "toState", ut);
+    p(this, "valueOf", ft);
+    p(this, "derive", F);
+    p(this, "createWatcher", Be);
+    p(this, "createRef", dt);
+    p(this, "isRef", mt);
+    this.batch = new $t(this), this.http = new vt(this), this.i18n = new Lt(this), this.router = new Nt(this);
   }
   /**
    * True when the app is connected to a DOM node and displayed to the user.
    */
   get isMounted() {
-    return s(this, W);
+    return a(this, O);
   }
   /**
    * 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 s(this, je);
+    return a(this, ue);
   }
   /**
    * 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(e) {
-    b(this, je, e);
+    g(this, ue, e);
   }
   /**
    * 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(e) {
-    b(this, Te, e);
+    g(this, fe, e);
+  }
+  /**
+   * Returns the HTMLElement Dolla is mounted to. This will return undefined until Dolla.mount() is called.
+   */
+  getRootElement() {
+    return a(this, j);
   }
+  /**
+   * 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, B);
+  }
+  /**
+   * Registers a Dolla module.
+   */
+  // use<O>(module: DollaModule<O>, options: O) {
+  //   this.#modules.push(async () => {
+  //     return module.register({ root: this, options });
+  //   });
+  //   return this;
+  // }
   /**
    * Sets a context variable and returns its value. Context variables are accessible on the app and in child views.
    */
   set(e, t) {
-    return s(this, G).data[e] = t, t;
+    return a(this, C).data[e] = t, t;
   }
   /**
    * Gets the value of a context variable. Returns null if the variable is not set.
    */
   get(e) {
-    return s(this, G).data[e] ?? null;
+    return a(this, C).data[e] ?? null;
   }
   /**
    * Returns an object of all context variables stored at the app level.
    */
   getAll() {
-    return { ...s(this, G).data };
+    return { ...a(this, C).data };
   }
   async mount(e, t) {
-    if (s(this, W))
+    if (a(this, O))
       throw new Error("Dolla is already mounted.");
-    if (V(e)) {
+    if (k(e)) {
       const n = document.querySelector(e);
-      yt(HTMLElement, n, `Selector '${e}' did not match any element.`), b(this, B, n);
+      He(HTMLElement, n, `Selector '${e}' did not match any element.`), g(this, j, n);
     } else
-      yt(HTMLElement, e, "Expected an HTML element or a selector string. Got type: %t, value: %v"), b(this, B, e);
-    const r = It(t ?? St);
-    b(this, re, this.constructView(r.type, r.props)), await Promise.all(s(this, qe).map((n) => n())), s(this, re).mount(s(this, B)), b(this, W, !0);
-    for (const n of s(this, Fe))
+      He(HTMLElement, e, "Expected an HTML element or a selector string. Got type: %t, value: %v"), g(this, j, e);
+    const r = gt(t ?? Je);
+    g(this, B, this.constructView(r.type, r.props)), await Promise.all(a(this, Fe).map((n) => n())), await Promise.all(a(this, me).map((n) => n())), a(this, B).mount(a(this, j)), g(this, O, !0);
+    for (const n of a(this, ge))
       n();
   }
   async unmount() {
     var e;
-    if (s(this, W)) {
-      await Promise.all(s(this, Ae).map((t) => t())), (e = s(this, re)) == null || e.unmount(!1), s(this, Me).stopAll(), b(this, W, !1);
-      for (const t of s(this, _e))
+    if (a(this, O)) {
+      await Promise.all(a(this, pe).map((t) => t())), (e = a(this, B)) == null || e.unmount(!1), a(this, de).stopAll(), g(this, O, !1);
+      for (const t of a(this, we))
         t();
     }
   }
@@ -1477,26 +1100,26 @@ class pr {
    * it will be awaited before mounting finishes. Use this to perform initial setup before the app is displayed to the user.
    */
   beforeMount(e) {
-    s(this, qe).push(e);
+    a(this, me).push(e);
   }
   /**
    * Registers a `callback` to run after the app is mounted.
    */
   onMount(e) {
-    s(this, Fe).push(e);
+    a(this, ge).push(e);
   }
   /**
    * 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(e) {
-    s(this, Ae).push(e);
+    a(this, pe).push(e);
   }
   /**
    * Registers a `callback` to run after the app is unmounted.
    */
   onUnmount(e) {
-    s(this, _e).push(e);
+    a(this, we).push(e);
   }
   /**
    * Update log type toggles. Values that are not passed will remain unchanged.
@@ -1504,28 +1127,28 @@ class pr {
   setLoggles(e) {
     for (const t in e) {
       const r = e[t];
-      r && (s(this, O)[t] = r);
+      r && (a(this, $)[t] = r);
     }
   }
   setLogFilter(e) {
-    b(this, z, wt(e));
+    g(this, U, ze(e));
   }
   createLogger(e, t) {
-    const r = (t == null ? void 0 : t.console) ?? Ut(), n = this;
+    const r = (t == null ? void 0 : t.console) ?? Vt(), n = this;
     return {
-      setName(a) {
-        return e = a, this;
+      setName(s) {
+        return e = s, this;
       },
       get info() {
-        var a;
-        if (s(n, O).info === !1 || V(s(n, O).info) && s(n, O).info !== n.getEnv() || !s(a = n, z).call(a, e))
-          return Ce;
+        var s;
+        if (a(n, $).info === !1 || k(a(n, $).info) && a(n, $).info !== n.getEnv() || !a(s = n, U).call(s, e))
+          return be;
         {
-          let o = `%c${e}`;
-          return t != null && t.uid ? o += ` %c[uid: %c${t.uid}%c]` : o += "%c%c%c", r.info.bind(
+          let i = `%c${e}`;
+          return t != null && t.uid ? i += ` %c[uid: %c${t.uid}%c]` : i += "%c%c%c", r.info.bind(
             r,
-            o,
-            `color:${Ve(o)};font-weight:bold`,
+            i,
+            `color:${$e(i)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1533,15 +1156,15 @@ class pr {
         }
       },
       get log() {
-        var a;
-        if (s(n, O).log === !1 || V(s(n, O).log) && s(n, O).log !== n.getEnv() || !s(a = n, z).call(a, e))
-          return Ce;
+        var s;
+        if (a(n, $).log === !1 || k(a(n, $).log) && a(n, $).log !== n.getEnv() || !a(s = n, U).call(s, e))
+          return be;
         {
-          let o = `%c${e}`;
-          return t != null && t.uid ? o += ` %c[uid: %c${t.uid}%c]` : o += "%c%c%c", r.log.bind(
+          let i = `%c${e}`;
+          return t != null && t.uid ? i += ` %c[uid: %c${t.uid}%c]` : i += "%c%c%c", r.log.bind(
             r,
-            o,
-            `color:${Ve(o)};font-weight:bold`,
+            i,
+            `color:${$e(i)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1549,15 +1172,15 @@ class pr {
         }
       },
       get warn() {
-        var a;
-        if (s(n, O).warn === !1 || V(s(n, O).warn) && s(n, O).warn !== n.getEnv() || !s(a = n, z).call(a, e))
-          return Ce;
+        var s;
+        if (a(n, $).warn === !1 || k(a(n, $).warn) && a(n, $).warn !== n.getEnv() || !a(s = n, U).call(s, e))
+          return be;
         {
-          let o = `%c${e}`;
-          return t != null && t.uid ? o += ` %c[uid: %c${t.uid}%c]` : o += "%c%c%c", r.warn.bind(
+          let i = `%c${e}`;
+          return t != null && t.uid ? i += ` %c[uid: %c${t.uid}%c]` : i += "%c%c%c", r.warn.bind(
             r,
-            o,
-            `color:${Ve(o)};font-weight:bold`,
+            i,
+            `color:${$e(i)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1565,27 +1188,27 @@ class pr {
         }
       },
       get error() {
-        var a;
-        if (s(n, O).error === !1 || V(s(n, O).error) && s(n, O).error !== n.getEnv() || !s(a = n, z).call(a, e))
-          return Ce;
+        var s;
+        if (a(n, $).error === !1 || k(a(n, $).error) && a(n, $).error !== n.getEnv() || !a(s = n, U).call(s, e))
+          return be;
         {
-          let o = `%c${e}`;
-          return t != null && t.uid ? o += ` %c[uid: %c${t.uid}%c]` : o += "%c%c%c", r.error.bind(
+          let i = `%c${e}`;
+          return t != null && t.uid ? i += ` %c[uid: %c${t.uid}%c]` : i += "%c%c%c", r.error.bind(
             r,
-            o,
-            `color:${Ve(o)};font-weight:bold`,
+            i,
+            `color:${$e(i)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
           );
         }
       },
-      crash(a) {
-        throw n.isMounted && (n.unmount(), n.constructView(s(n, Te), {
-          error: a,
+      crash(s) {
+        throw n.isMounted && (n.unmount(), n.constructView(a(n, fe), {
+          error: s,
           loggerName: e,
           uid: t == null ? void 0 : t.uid
-        }).mount(s(n, B))), a;
+        }).mount(a(n, j))), s;
       }
     };
   }
@@ -1593,41 +1216,50 @@ class pr {
    *
    */
   constructView(e, t, r = []) {
-    return new Ht(s(this, G), e, t, r);
+    return new pt(a(this, C), e, t, r);
   }
   /**
    *
    */
   constructMarkup(e) {
-    return Wt(Bt(s(this, G), e));
+    return wt(yt(a(this, C), e));
   }
 }
-W = new WeakMap(), je = new WeakMap(), B = new WeakMap(), re = new WeakMap(), Te = new WeakMap(), Me = new WeakMap(), qe = new WeakMap(), Fe = new WeakMap(), Ae = new WeakMap(), _e = new WeakMap(), G = new WeakMap(), O = new WeakMap(), z = new WeakMap();
-const Et = new pr(), yr = Et.i18n.t.bind(Et.i18n);
-function br(i) {
-  typeof window < "u" && (window.DOLLA_DEV_DEBUG = i);
+O = new WeakMap(), ue = new WeakMap(), j = new WeakMap(), B = new WeakMap(), fe = new WeakMap(), de = new WeakMap(), me = new WeakMap(), ge = new WeakMap(), pe = new WeakMap(), we = new WeakMap(), C = new WeakMap(), $ = new WeakMap(), U = new WeakMap(), Fe = new WeakMap();
+function Vt() {
+  if (typeof window < "u" && window.console)
+    return window.console;
+  if (typeof global < "u" && global.console)
+    return global.console;
+}
+const Ke = new Ut(), Wt = Ke.i18n.t.bind(Ke.i18n);
+function _t(o) {
+  typeof window < "u" && (window.DOLLA_DEV_DEBUG = o);
 }
-function vr() {
+function Gt() {
   return typeof window < "u" ? window.DOLLA_DEV_DEBUG === !0 : !1;
 }
 export {
-  jt as cond,
-  It as createMarkup,
-  Ct as createRef,
-  qt as createSettableState,
-  kr as createSetter,
-  oe as createState,
-  Et as default,
-  be as derive,
-  vr as getDevDebug,
-  mt as html,
-  Vt as isRef,
-  Sr as portal,
-  Pr as repeat,
-  br as setDevDebug,
-  yr as t,
-  Ft as toSettableState,
-  At as toState,
-  _t as valueOf
+  it as cond,
+  gt as createMarkup,
+  dt as createRef,
+  ct as createSettableState,
+  Ht as createSetter,
+  Ve as createState,
+  ot as deepEqual,
+  Ke as default,
+  F as derive,
+  Gt as getDevDebug,
+  Ie as html,
+  mt as isRef,
+  Kt as portal,
+  Qt as repeat,
+  _t as setDevDebug,
+  _e as shallowEqual,
+  Jt as strictEqual,
+  Wt as t,
+  ht as toSettableState,
+  ut as toState,
+  ft as valueOf
 };
 //# sourceMappingURL=index.js.map