@manyducks.co/dolla 2.0.0-alpha.10 → 2.0.0-alpha.11

package/dist/index.js

@@ -1,22 +1,22 @@
-var gt = Object.defineProperty;
-var Ze = (a) => {
+var wt = Object.defineProperty;
+var tt = (a) => {
   throw TypeError(a);
 };
-var mt = (a, e, t) => e in a ? gt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
-var P = (a, e, t) => mt(a, typeof e != "symbol" ? e + "" : e, t), ze = (a, e, t) => e.has(a) || Ze("Cannot " + t);
-var n = (a, e, t) => (ze(a, e, "read from private field"), t ? t.call(a) : e.get(a)), h = (a, e, t) => e.has(a) ? Ze("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(a) : e.set(a, t), g = (a, e, t, r) => (ze(a, e, "write to private field"), r ? r.call(a, t) : e.set(a, t), t), S = (a, e, t) => (ze(a, e, "access private method"), t);
-var et = (a, e, t, r) => ({
+var bt = (a, e, t) => e in a ? wt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
+var k = (a, e, t) => bt(a, typeof e != "symbol" ? e + "" : e, t), Ge = (a, e, t) => e.has(a) || tt("Cannot " + t);
+var n = (a, e, t) => (Ge(a, e, "read from private field"), t ? t.call(a) : e.get(a)), f = (a, e, t) => e.has(a) ? tt("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(a) : e.set(a, t), y = (a, e, t, r) => (Ge(a, e, "write to private field"), r ? r.call(a, t) : e.set(a, t), t), P = (a, e, t) => (Ge(a, e, "access private method"), t);
+var rt = (a, e, t, r) => ({
   set _(i) {
-    g(a, e, i, t);
+    y(a, e, i, t);
   },
   get _() {
     return n(a, e, r);
   }
 });
-import { h as tt, c as wt, i as Ge, t as Be, a as yt, d as ae, b as bt, e as Xe, f as U, g as K, j as lt, k as vt, w as ut, P as ht, l as rt, m as $t, n as Et, v as kt, o as Pt, p as St, q as nt, r as at, s as Lt, u as Te, x as Ae, y as Rt, z as xt, A as Ot } from "./passthrough-9kwwjgWk.js";
-import { B as rr, C as nr, D as ar } from "./passthrough-9kwwjgWk.js";
-function Nt(a) {
-  return tt`
+import { h as nt, c as vt, i as Be, t as Ke, d as me, a as $t, b as et, e as U, f as Q, g as ct, j as Et, w as ut, P as ht, k as at, l as kt, m as Pt, v as St, n as Lt, o as Rt, p as st, q as it, r as xt, s as Ae, u as De, x as Mt, y as Nt, z as Ot } from "./passthrough-Bu7iYKPr.js";
+import { A as ar, B as sr, C as ir } from "./passthrough-Bu7iYKPr.js";
+function Tt(a) {
+  return nt`
     <div
       style=${{
     backgroundColor: "#880000",
@@ -30,7 +30,7 @@ function Nt(a) {
       <h1 style=${{ marginBottom: "0.5rem" }}>The app has crashed</h1>
       <p style=${{ marginBottom: "0.25rem" }}>
         <span style=${{ fontFamily: "monospace" }}>${a.loggerName}</span>
-        ${wt(a.uid, tt`<span style=${{ fontFamily: "monospace", opacity: 0.5 }}> [uid: ${a.uid}]</span>`)}
+        ${vt(a.uid, nt`<span style=${{ fontFamily: "monospace", opacity: 0.5 }}> [uid: ${a.uid}]</span>`)}
         ${" "}says:
       </p>
       <blockquote
@@ -62,12 +62,12 @@ function Nt(a) {
     </div>
   `;
 }
-var J, Fe, M, C;
-class Mt {
+var J, We, T, j;
+class At {
   constructor() {
-    h(this, M);
-    h(this, J, []);
-    h(this, Fe, Tt());
+    f(this, T);
+    f(this, J, []);
+    f(this, We, Dt());
   }
   /**
    * Adds a new middleware that will apply to subsequent requests.
@@ -81,51 +81,51 @@ class Mt {
     };
   }
   async get(e, t) {
-    return S(this, M, C).call(this, "get", e, t);
+    return P(this, T, j).call(this, "get", e, t);
   }
   async put(e, t) {
-    return S(this, M, C).call(this, "put", e, t);
+    return P(this, T, j).call(this, "put", e, t);
   }
   async patch(e, t) {
-    return S(this, M, C).call(this, "patch", e, t);
+    return P(this, T, j).call(this, "patch", e, t);
   }
   async post(e, t) {
-    return S(this, M, C).call(this, "post", e, t);
+    return P(this, T, j).call(this, "post", e, t);
   }
   async delete(e, t) {
-    return S(this, M, C).call(this, "delete", e, t);
+    return P(this, T, j).call(this, "delete", e, t);
   }
   async head(e, t) {
-    return S(this, M, C).call(this, "head", e, t);
+    return P(this, T, j).call(this, "head", e, t);
   }
   async options(e, t) {
-    return S(this, M, C).call(this, "options", e, t);
+    return P(this, T, j).call(this, "options", e, t);
   }
   async trace(e, t) {
-    return S(this, M, C).call(this, "trace", e, t);
+    return P(this, T, j).call(this, "trace", e, t);
   }
 }
-J = new WeakMap(), Fe = new WeakMap(), M = new WeakSet(), C = async function(e, t, r) {
+J = new WeakMap(), We = new WeakMap(), T = new WeakSet(), j = async function(e, t, r) {
   return jt({
     ...r,
     method: e,
     uri: t,
     middleware: n(this, J),
-    fetch: n(this, Fe)
+    fetch: n(this, We)
   });
 };
-function Tt() {
+function Dt() {
   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 At extends Error {
+class Ct extends Error {
   constructor(t) {
-    const { status: r, statusText: i, method: s, uri: o } = t, f = `${r} ${i}: Request failed (${s.toUpperCase()} ${o})`;
-    super(f);
-    P(this, "response");
+    const { status: r, statusText: i, method: s, uri: o } = t, u = `${r} ${i}: Request failed (${s.toUpperCase()} ${o})`;
+    super(u);
+    k(this, "response");
     this.response = t;
   }
 }
@@ -142,79 +142,80 @@ async function jt(a) {
   };
   if (e)
     if (e instanceof Map || e instanceof Headers)
-      e.forEach((c, w) => {
-        s.headers.set(w, c);
+      e.forEach((l, w) => {
+        s.headers.set(w, l);
       });
     else if (e != null && typeof e == "object" && !Array.isArray(e))
-      for (const c in e) {
-        const w = e[c];
-        w instanceof Date ? s.headers.set(c, w.toISOString()) : w != null && s.headers.set(c, String(w));
+      for (const l in e) {
+        const w = e[l];
+        w instanceof Date ? s.headers.set(l, w.toISOString()) : w != null && s.headers.set(l, String(w));
       }
     else
       throw new TypeError(`Unknown headers type. Got: ${e}`);
   if (t)
     if (t instanceof Map || t instanceof URLSearchParams)
-      t.forEach((c, w) => {
-        s.query.set(w, c);
+      t.forEach((l, w) => {
+        s.query.set(w, l);
       });
     else if (t != null && typeof t == "object" && !Array.isArray(t))
-      for (const c in t) {
-        const w = t[c];
-        w instanceof Date ? s.query.set(c, w.toISOString()) : w != null && s.query.set(c, String(w));
+      for (const l in t) {
+        const w = t[l];
+        w instanceof Date ? s.query.set(l, w.toISOString()) : w != null && s.query.set(l, String(w));
       }
     else
       throw new TypeError(`Unknown query params type. Got: ${t}`);
   let o;
-  const f = async () => {
-    const c = s.query.toString(), w = c.length > 0 ? s.uri + "?" + c : s.uri;
-    let y;
-    !s.headers.has("content-type") && Ge(s.body) ? (s.headers.set("content-type", "application/json"), y = JSON.stringify(s.body)) : y = s.body;
-    const m = await r(w, {
+  const u = async () => {
+    const l = s.query.toString(), w = l.length > 0 ? s.uri + "?" + l : s.uri;
+    let g;
+    !s.headers.has("content-type") && Be(s.body) ? (s.headers.set("content-type", "application/json"), g = JSON.stringify(s.body)) : g = s.body;
+    const b = await r(w, {
       method: s.method,
       headers: s.headers,
-      body: y
-    }), d = Object.fromEntries(m.headers.entries()), b = d["content-type"];
-    let $;
-    b != null && b.includes("application/json") ? $ = await m.json() : b != null && b.includes("application/x-www-form-urlencoded") ? $ = await m.formData() : $ = await m.text(), o = {
+      body: g
+    }), d = Object.fromEntries(b.headers.entries()), p = d["content-type"];
+    let S;
+    p != null && p.includes("application/json") ? S = await b.json() : p != null && p.includes("application/x-www-form-urlencoded") ? S = await b.formData() : S = await b.text(), o = {
       method: s.method,
       uri: s.uri,
-      status: m.status,
-      statusText: m.statusText,
+      status: b.status,
+      statusText: b.statusText,
       headers: d,
-      body: $
+      body: S
     };
   };
   if (i.length > 0) {
-    const c = (w = 0) => {
-      const y = i[w], m = i[w + 1] ? c(w + 1) : f;
-      return async () => y(s, async () => (await m(), o));
+    const l = (w = 0) => {
+      const g = i[w], b = i[w + 1] ? l(w + 1) : u;
+      return async () => g(s, async () => (await b(), o));
     };
-    await c()();
+    await l()();
   } else
-    await f();
+    await u();
   if (o.status < 200 || o.status >= 400)
-    throw new At(o);
+    throw new Ct(o);
   return o;
 }
-class Dt {
+const _t = Ke("[NO LANGUAGE SET]");
+class qt {
   constructor(e, t) {
-    P(this, "dolla");
-    P(this, "config");
-    P(this, "strings");
+    k(this, "dolla");
+    k(this, "config");
+    k(this, "strings");
     this.config = e, this.dolla = t;
   }
   async load() {
     if (this.strings == null) {
-      if (Xe(this.config.fetch)) {
+      if (et(this.config.fetch)) {
         const e = await this.config.fetch();
-        if (Ge(e))
+        if (Be(e))
           this.strings = e;
         else
           throw new Error(`Fetch function did not return an object of language strings: ${e}`);
       } else if (U(this.config.path)) {
         const e = await this.dolla.http.get(this.config.path);
         if (e.status >= 200 && e.status < 300)
-          if (Ge(e.body))
+          if (Be(e.body))
             this.strings = e.body;
           else
             throw new Error(
@@ -229,22 +230,22 @@ class Dt {
     return this.strings;
   }
 }
-var ye, Y, x, ie, be, ve, oe, $e, Ie, ft;
-class Ct {
+var we, Y, x, se, be, ve, $e, Ee, O, Qe, ft, dt, pt, gt;
+class Ut {
   constructor(e) {
-    h(this, Ie);
-    h(this, ye);
-    h(this, Y);
-    h(this, x, /* @__PURE__ */ new Map());
-    h(this, ie, []);
-    h(this, be, "auto");
-    P(this, "$locale");
-    h(this, ve);
-    h(this, oe);
-    h(this, $e);
-    g(this, ye, e), g(this, Y, e.createLogger("dolla/i18n"));
-    const [t, r] = K(), [i, s] = K();
-    this.$locale = t, g(this, ve, r), g(this, oe, i), g(this, $e, s), e.beforeMount(async () => {
+    f(this, O);
+    f(this, we);
+    f(this, Y);
+    f(this, x, /* @__PURE__ */ new Map());
+    f(this, se, []);
+    f(this, be, "auto");
+    k(this, "$locale");
+    f(this, ve);
+    f(this, $e);
+    f(this, Ee);
+    y(this, we, e), y(this, Y, e.createLogger("dolla/i18n"));
+    const [t, r] = Q(), [i, s] = Q();
+    this.$locale = t, y(this, ve, r), y(this, $e, i), y(this, Ee, s), e.beforeMount(async () => {
       n(this, x).size > 0 && await this.setLocale(n(this, be));
     });
   }
@@ -253,11 +254,11 @@ class Ct {
   }
   setup(e) {
     if (e.translations.forEach((t) => {
-      n(this, x).set(t.locale, new Dt(t, n(this, ye)));
+      n(this, x).set(t.locale, new qt(t, n(this, we)));
     }), 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.`);
-      g(this, be, e.locale);
+      y(this, be, e.locale);
     }
     n(this, Y).info(
       `${n(this, x).size} language${n(this, x).size === 1 ? "" : "s"} supported: '${[...n(this, x).keys()].join("', '")}'`
@@ -285,7 +286,7 @@ class Ct {
     const r = n(this, x).get(t);
     try {
       const s = await r.load();
-      n(this, $e).call(this, s), n(this, ve).call(this, t), n(this, Y).info("set language to " + t);
+      y(this, se, []), n(this, Ee).call(this, s), n(this, ve).call(this, t), n(this, Y).info("set language to " + t);
     } catch (s) {
       s instanceof Error && n(this, Y).crash(s);
     }
@@ -294,7 +295,7 @@ class Ct {
    * Returns a State containing the value at `key`.
   
    * @param key - Key to the translated value.
-   * @param values - A map of {{placeholder}} names and the values to replace them with.
+   * @param options - A map of {{placeholder}} names and the values to replace them with.
    * 
    * @example
    * const $value = t("your.key.here");
@@ -305,39 +306,33 @@ class Ct {
         `The 't' function cannot be destructured. If you need a standalone version you can import it like so: 'import { t } from "@manyducks.co/dolla"'`
       );
     if (!this.$locale.get())
-      return qt;
-    const r = S(this, Ie, ft).call(this, e, t);
-    if (r)
-      return r;
-    if (t) {
-      const s = {};
-      for (const [f, c] of Object.entries(t))
-        yt(c) && (s[f] = c);
-      const o = Object.entries(s);
-      if (o.length > 0) {
-        const f = o.map((w) => w[1]), c = ae([n(this, oe), ...f], (w, ...y) => {
-          const m = y.map(($, j) => o[j]), d = {
-            ...t
-          };
-          for (let $ = 0; $ < m.length; $++) {
-            const j = m[$][0];
-            d[j] = y[$];
-          }
-          const b = it(w, e) || `[NO TRANSLATION: ${e}]`;
-          return st(b, d);
-        });
-        return n(this, ie).push([e, t, c]), c;
-      }
-    }
-    const i = ae([n(this, oe)], (s) => {
-      let o = it(s, e) || `[NO TRANSLATION: ${e}]`;
-      return t && (o = st(o, t)), o;
+      return _t;
+    let r = [], i = [];
+    for (const s in t)
+      r.push(s), i.push(t[s]);
+    return me([this.$locale, ...i], (s, ...o) => {
+      const u = {};
+      for (let p = 0; p < o.length; p++)
+        u[r[p]] = o[p];
+      const l = P(this, O, pt).call(this, e, u);
+      if (l) return l;
+      const w = n(this, $e).get();
+      let g = e;
+      if (u.context != null && (g += "_" + u.context), u.count != null)
+        if (u.ordinal) {
+          const p = `${g}_ordinal_(=${u.count})`;
+          Ce(w, p) != null ? g = p : g += "_ordinal_" + new Intl.PluralRules(s, { type: "ordinal" }).select(u.count);
+        } else {
+          const p = `${g}_(=${u.count})`;
+          Ce(w, p) != null ? g = p : g += "_" + new Intl.PluralRules(s).select(u.count);
+        }
+      const b = Ce(w, g) || `[MISSING: ${g}]`, d = P(this, O, gt).call(this, b, u);
+      return n(this, se).push([e, u, d]), d;
     });
-    return n(this, ie).push([e, t, i]), i;
   }
   /**
-   * Creates a wrapped `Intl.Collator` configured for the current locale.
-   * NOTE: The Collator remains bound to the locale it was created with.
+   * 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.
    *
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Collator/Collator#options
    */
@@ -350,7 +345,7 @@ class Ct {
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#options
    */
   number(e, t) {
-    return ae([this.$locale, e], (r, i) => new Intl.NumberFormat(this.$locale.get(), t).format(i));
+    return me([this.$locale, e], (r, i) => P(this, O, Qe).call(this, i, t));
   }
   /**
    * Returns a State containing the date formatted for the current locale. Uses `Intl.DateTimeFormat` under the hood.
@@ -362,9 +357,7 @@ class Ct {
    * const $formatted = Dolla.i18n.dateTime(date, { dateFormat: "short" });
    */
   dateTime(e, t) {
-    return ae([this.$locale, e], (r, i) => new Intl.DateTimeFormat(this.$locale.get(), t).format(
-      typeof i == "string" ? new Date(i) : i
-    ));
+    return me([this.$locale, e], (r, i) => P(this, O, ft).call(this, i, t));
   }
   /**
    * Returns a State containing the date formatted for the current locale. Uses `Intl.DateTimeFormat` under the hood.
@@ -376,23 +369,32 @@ class Ct {
    * const $formatted = Dolla.i18n.list(list, {  });
    */
   list(e, t) {
-    return ae([this.$locale, e], (r, i) => new Intl.ListFormat(this.$locale.get(), t).format(i));
+    return me([this.$locale, e], (r, i) => P(this, O, dt).call(this, i, t));
   }
 }
-ye = new WeakMap(), Y = new WeakMap(), x = new WeakMap(), ie = new WeakMap(), be = new WeakMap(), ve = new WeakMap(), oe = new WeakMap(), $e = new WeakMap(), Ie = new WeakSet(), // relativeTime(): State<string> {
+we = new WeakMap(), Y = new WeakMap(), x = new WeakMap(), se = new WeakMap(), be = new WeakMap(), ve = new WeakMap(), $e = new WeakMap(), Ee = new WeakMap(), O = new WeakSet(), Qe = function(e, t) {
+  return new Intl.NumberFormat(this.$locale.get(), t).format(e);
+}, ft = function(e, t) {
+  return new Intl.DateTimeFormat(this.$locale.get(), t).format(
+    typeof e == "string" ? new Date(e) : e
+  );
+}, dt = function(e, t) {
+  return new Intl.ListFormat(this.$locale.get(), t).format(e);
+}, // relativeTime(): State<string> {
 // }
-ft = function(e, t) {
-  for (const r of n(this, ie))
-    if (r[0] === e && bt(r[1], t))
+pt = function(e, t) {
+  for (const r of n(this, se))
+    if (r[0] === e && $t(r[1], t))
       return r[2];
+}, /**
+ * Replaces {{placeholders}} with values in translated strings.
+ */
+gt = function(e, t) {
+  for (const r in t)
+    r === "count" ? e = e.replace(`{{${r}}}`, P(this, O, Qe).call(this, Number(t[r]), t)) : e = e.replace(`{{${r}}}`, String(Ce(t, r)));
+  return e;
 };
-const qt = Be("[NO LANGUAGE SET]");
-function st(a, e) {
-  for (const t in e)
-    a = a.replace(`{{${t}}}`, String(e[t]));
-  return a;
-}
-function it(a, e) {
+function Ce(a, e) {
   const t = String(e).split(/[\.\[\]]/).filter((i) => i.trim() !== "");
   let r = a;
   for (; t.length > 0; ) {
@@ -401,21 +403,21 @@ function it(a, e) {
   }
   return r;
 }
-var X, Ee, _, H, ce, q, le, je;
+var X, ke, V, H, ie, _, oe, je;
 class Vt {
   constructor(e) {
-    h(this, le);
-    h(this, X);
-    h(this, Ee);
+    f(this, oe);
+    f(this, X);
+    f(this, ke);
     // Keyed updates ensure only the most recent callback queued with a certain key
     // will be called, keeping DOM operations to a minimum.
-    h(this, _, /* @__PURE__ */ new Map());
+    f(this, V, /* @__PURE__ */ new Map());
     // All unkeyed updates are run on every batch.
-    h(this, H, []);
+    f(this, H, []);
     // All read callbacks are run before updates on every batch.
-    h(this, ce, []);
-    h(this, q, !1);
-    g(this, X, e), g(this, Ee, e.createLogger("dolla/render"));
+    f(this, ie, []);
+    f(this, _, !1);
+    y(this, X, e), y(this, ke, e.createLogger("dolla/render"));
   }
   /**
    * Queues a callback to run in the next render batch.
@@ -424,11 +426,11 @@ class Vt {
    */
   update(e, t) {
     return new Promise((r) => {
-      t ? n(this, _).set(t, () => {
+      t ? n(this, V).set(t, () => {
         e(), r();
       }) : n(this, H).push(() => {
         e(), r();
-      }), !n(this, q) && n(this, X).isMounted && (g(this, q, !0), S(this, le, je).call(this));
+      }), !n(this, _) && n(this, X).isMounted && (y(this, _, !0), P(this, oe, je).call(this));
     });
   }
   /**
@@ -438,49 +440,49 @@ class Vt {
    */
   read(e) {
     return new Promise((t) => {
-      n(this, ce).push(() => {
+      n(this, ie).push(() => {
         e(), t();
-      }), !n(this, q) && n(this, X).isMounted && (g(this, q, !0), S(this, le, je).call(this));
+      }), !n(this, _) && n(this, X).isMounted && (y(this, _, !0), P(this, oe, je).call(this));
     });
   }
 }
-X = new WeakMap(), Ee = new WeakMap(), _ = new WeakMap(), H = new WeakMap(), ce = new WeakMap(), q = new WeakMap(), le = new WeakSet(), je = function() {
-  const e = n(this, _).size + n(this, H).length;
-  if ((!n(this, X).isMounted || e === 0) && g(this, q, !1), !n(this, q)) {
-    for (const t of n(this, ce))
+X = new WeakMap(), ke = new WeakMap(), V = new WeakMap(), H = new WeakMap(), ie = new WeakMap(), _ = new WeakMap(), oe = new WeakSet(), je = function() {
+  const e = n(this, V).size + n(this, H).length;
+  if ((!n(this, X).isMounted || e === 0) && y(this, _, !1), !n(this, _)) {
+    for (const t of n(this, ie))
       t();
-    g(this, ce, []);
+    y(this, ie, []);
     return;
   }
   requestAnimationFrame(() => {
-    n(this, Ee).info(`Batching ${n(this, _).size + n(this, H).length} queued DOM update(s).`);
-    for (const t of n(this, _).values())
+    n(this, ke).info(`Batching ${n(this, V).size + n(this, H).length} queued DOM update(s).`);
+    for (const t of n(this, V).values())
       t();
-    n(this, _).clear();
+    n(this, V).clear();
     for (const t of n(this, H))
       t();
-    g(this, H, []), S(this, le, je).call(this);
+    y(this, H, []), P(this, oe, je).call(this);
   });
 };
-function de() {
-  return de = Object.assign ? Object.assign.bind() : function(a) {
+function he() {
+  return he = Object.assign ? Object.assign.bind() : function(a) {
     for (var e = 1; e < arguments.length; e++) {
       var t = arguments[e];
       for (var r in t) ({}).hasOwnProperty.call(t, r) && (a[r] = t[r]);
     }
     return a;
-  }, de.apply(null, arguments);
+  }, he.apply(null, arguments);
 }
-var A;
+var D;
 (function(a) {
   a.Pop = "POP", a.Push = "PUSH", a.Replace = "REPLACE";
-})(A || (A = {}));
+})(D || (D = {}));
 var Ve = process.env.NODE_ENV !== "production" ? function(a) {
   return Object.freeze(a);
 } : function(a) {
   return a;
 };
-function De(a, e) {
+function _e(a, e) {
   if (!a) {
     typeof console < "u" && console.warn(e);
     try {
@@ -489,38 +491,38 @@ function De(a, e) {
     }
   }
 }
-var Ue = "beforeunload", Ut = "hashchange", dt = "popstate";
-function _t(a) {
+var He = "beforeunload", Ht = "hashchange", mt = "popstate";
+function It(a) {
   a === void 0 && (a = {});
   var e = a, t = e.window, r = t === void 0 ? document.defaultView : t, i = r.history;
   function s() {
-    var p = r.location, l = p.pathname, u = p.search, v = p.hash, E = i.state || {};
-    return [E.idx, Ve({
-      pathname: l,
-      search: u,
+    var m = r.location, c = m.pathname, h = m.search, v = m.hash, $ = i.state || {};
+    return [$.idx, Ve({
+      pathname: c,
+      search: h,
       hash: v,
-      state: E.usr || null,
-      key: E.key || "default"
+      state: $.usr || null,
+      key: $.key || "default"
     })];
   }
   var o = null;
-  function f() {
+  function u() {
     if (o)
-      b.call(o), o = null;
+      p.call(o), o = null;
     else {
-      var p = A.Pop, l = s(), u = l[0], v = l[1];
-      if (b.length)
-        if (u != null) {
-          var E = y - u;
-          E && (o = {
-            action: p,
+      var m = D.Pop, c = s(), h = c[0], v = c[1];
+      if (p.length)
+        if (h != null) {
+          var $ = g - h;
+          $ && (o = {
+            action: m,
             location: v,
             retry: function() {
-              V(E * -1);
+              q($ * -1);
             }
-          }, V(E));
+          }, q($));
         } else
-          process.env.NODE_ENV !== "production" && De(
+          process.env.NODE_ENV !== "production" && _e(
             !1,
             // TODO: Write up a doc that explains our blocking strategy in
             // detail and link to it here so people can understand better what
@@ -528,137 +530,137 @@ function _t(a) {
             "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
-        re(p);
+        re(m);
     }
   }
-  r.addEventListener(dt, f);
-  var c = A.Pop, w = s(), y = w[0], m = w[1], d = He(), b = He();
-  y == null && (y = 0, i.replaceState(de({}, i.state, {
-    idx: y
+  r.addEventListener(mt, u);
+  var l = D.Pop, w = s(), g = w[0], b = w[1], d = Fe(), p = Fe();
+  g == null && (g = 0, i.replaceState(he({}, i.state, {
+    idx: g
   }), ""));
-  function $(p) {
-    return typeof p == "string" ? p : Ce(p);
+  function S(m) {
+    return typeof m == "string" ? m : qe(m);
   }
-  function j(p, l) {
-    return l === void 0 && (l = null), Ve(de({
-      pathname: m.pathname,
+  function fe(m, c) {
+    return c === void 0 && (c = null), Ve(he({
+      pathname: b.pathname,
       hash: "",
       search: ""
-    }, typeof p == "string" ? Qe(p) : p, {
-      state: l,
-      key: pt()
+    }, typeof m == "string" ? Je(m) : m, {
+      state: c,
+      key: yt()
     }));
   }
-  function pe(p, l) {
+  function de(m, c) {
     return [{
-      usr: p.state,
-      key: p.key,
-      idx: l
-    }, $(p)];
-  }
-  function ge(p, l, u) {
-    return !b.length || (b.call({
-      action: p,
-      location: l,
-      retry: u
+      usr: m.state,
+      key: m.key,
+      idx: c
+    }, S(m)];
+  }
+  function pe(m, c, h) {
+    return !p.length || (p.call({
+      action: m,
+      location: c,
+      retry: h
     }), !1);
   }
-  function re(p) {
-    c = p;
-    var l = s();
-    y = l[0], m = l[1], d.call({
-      action: c,
-      location: m
+  function re(m) {
+    l = m;
+    var c = s();
+    g = c[0], b = c[1], d.call({
+      action: l,
+      location: b
     });
   }
-  function ne(p, l) {
-    var u = A.Push, v = j(p, l);
-    function E() {
-      ne(p, l);
+  function ne(m, c) {
+    var h = D.Push, v = fe(m, c);
+    function $() {
+      ne(m, c);
     }
-    if (ge(u, v, E)) {
-      var L = pe(v, y + 1), O = L[0], T = L[1];
+    if (pe(h, v, $)) {
+      var L = de(v, g + 1), M = L[0], A = L[1];
       try {
-        i.pushState(O, "", T);
+        i.pushState(M, "", A);
       } catch {
-        r.location.assign(T);
+        r.location.assign(A);
       }
-      re(u);
+      re(h);
     }
   }
-  function me(p, l) {
-    var u = A.Replace, v = j(p, l);
-    function E() {
-      me(p, l);
+  function ge(m, c) {
+    var h = D.Replace, v = fe(m, c);
+    function $() {
+      ge(m, c);
     }
-    if (ge(u, v, E)) {
-      var L = pe(v, y), O = L[0], T = L[1];
-      i.replaceState(O, "", T), re(u);
+    if (pe(h, v, $)) {
+      var L = de(v, g), M = L[0], A = L[1];
+      i.replaceState(M, "", A), re(h);
     }
   }
-  function V(p) {
-    i.go(p);
+  function q(m) {
+    i.go(m);
   }
-  var Q = {
+  var K = {
     get action() {
-      return c;
+      return l;
     },
     get location() {
-      return m;
+      return b;
     },
-    createHref: $,
+    createHref: S,
     push: ne,
-    replace: me,
-    go: V,
+    replace: ge,
+    go: q,
     back: function() {
-      V(-1);
+      q(-1);
     },
     forward: function() {
-      V(1);
+      q(1);
     },
-    listen: function(l) {
-      return d.push(l);
+    listen: function(c) {
+      return d.push(c);
     },
-    block: function(l) {
-      var u = b.push(l);
-      return b.length === 1 && r.addEventListener(Ue, _e), function() {
-        u(), b.length || r.removeEventListener(Ue, _e);
+    block: function(c) {
+      var h = p.push(c);
+      return p.length === 1 && r.addEventListener(He, Ie), function() {
+        h(), p.length || r.removeEventListener(He, Ie);
       };
     }
   };
-  return Q;
+  return K;
 }
-function Ht(a) {
+function Ft(a) {
   a === void 0 && (a = {});
   var e = a, t = e.window, r = t === void 0 ? document.defaultView : t, i = r.history;
   function s() {
-    var l = Qe(r.location.hash.substr(1)), u = l.pathname, v = u === void 0 ? "/" : u, E = l.search, L = E === void 0 ? "" : E, O = l.hash, T = O === void 0 ? "" : O, D = i.state || {};
-    return [D.idx, Ve({
+    var c = Je(r.location.hash.substr(1)), h = c.pathname, v = h === void 0 ? "/" : h, $ = c.search, L = $ === void 0 ? "" : $, M = c.hash, A = M === void 0 ? "" : M, C = i.state || {};
+    return [C.idx, Ve({
       pathname: v,
       search: L,
-      hash: T,
-      state: D.usr || null,
-      key: D.key || "default"
+      hash: A,
+      state: C.usr || null,
+      key: C.key || "default"
     })];
   }
   var o = null;
-  function f() {
+  function u() {
     if (o)
-      b.call(o), o = null;
+      p.call(o), o = null;
     else {
-      var l = A.Pop, u = s(), v = u[0], E = u[1];
-      if (b.length)
+      var c = D.Pop, h = s(), v = h[0], $ = h[1];
+      if (p.length)
         if (v != null) {
-          var L = y - v;
+          var L = g - v;
           L && (o = {
-            action: l,
-            location: E,
+            action: c,
+            location: $,
             retry: function() {
-              Q(L * -1);
+              K(L * -1);
             }
-          }, Q(L));
+          }, K(L));
         } else
-          process.env.NODE_ENV !== "production" && De(
+          process.env.NODE_ENV !== "production" && _e(
             !1,
             // TODO: Write up a doc that explains our blocking strategy in
             // detail and link to it here so people can understand better
@@ -666,121 +668,121 @@ function Ht(a) {
             "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
-        ne(l);
+        ne(c);
     }
   }
-  r.addEventListener(dt, f), r.addEventListener(Ut, function() {
-    var l = s(), u = l[1];
-    Ce(u) !== Ce(m) && f();
+  r.addEventListener(mt, u), r.addEventListener(Ht, function() {
+    var c = s(), h = c[1];
+    qe(h) !== qe(b) && u();
   });
-  var c = A.Pop, w = s(), y = w[0], m = w[1], d = He(), b = He();
-  y == null && (y = 0, i.replaceState(de({}, i.state, {
-    idx: y
+  var l = D.Pop, w = s(), g = w[0], b = w[1], d = Fe(), p = Fe();
+  g == null && (g = 0, i.replaceState(he({}, i.state, {
+    idx: g
   }), ""));
-  function $() {
-    var l = document.querySelector("base"), u = "";
-    if (l && l.getAttribute("href")) {
-      var v = r.location.href, E = v.indexOf("#");
-      u = E === -1 ? v : v.slice(0, E);
+  function S() {
+    var c = document.querySelector("base"), h = "";
+    if (c && c.getAttribute("href")) {
+      var v = r.location.href, $ = v.indexOf("#");
+      h = $ === -1 ? v : v.slice(0, $);
     }
-    return u;
+    return h;
   }
-  function j(l) {
-    return $() + "#" + (typeof l == "string" ? l : Ce(l));
+  function fe(c) {
+    return S() + "#" + (typeof c == "string" ? c : qe(c));
   }
-  function pe(l, u) {
-    return u === void 0 && (u = null), Ve(de({
-      pathname: m.pathname,
+  function de(c, h) {
+    return h === void 0 && (h = null), Ve(he({
+      pathname: b.pathname,
       hash: "",
       search: ""
-    }, typeof l == "string" ? Qe(l) : l, {
-      state: u,
-      key: pt()
+    }, typeof c == "string" ? Je(c) : c, {
+      state: h,
+      key: yt()
     }));
   }
-  function ge(l, u) {
+  function pe(c, h) {
     return [{
-      usr: l.state,
-      key: l.key,
-      idx: u
-    }, j(l)];
+      usr: c.state,
+      key: c.key,
+      idx: h
+    }, fe(c)];
   }
-  function re(l, u, v) {
-    return !b.length || (b.call({
-      action: l,
-      location: u,
+  function re(c, h, v) {
+    return !p.length || (p.call({
+      action: c,
+      location: h,
       retry: v
     }), !1);
   }
-  function ne(l) {
-    c = l;
-    var u = s();
-    y = u[0], m = u[1], d.call({
-      action: c,
-      location: m
+  function ne(c) {
+    l = c;
+    var h = s();
+    g = h[0], b = h[1], d.call({
+      action: l,
+      location: b
     });
   }
-  function me(l, u) {
-    var v = A.Push, E = pe(l, u);
+  function ge(c, h) {
+    var v = D.Push, $ = de(c, h);
     function L() {
-      me(l, u);
+      ge(c, h);
     }
-    if (process.env.NODE_ENV !== "production" && De(E.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(l) + ")"), re(v, E, L)) {
-      var O = ge(E, y + 1), T = O[0], D = O[1];
+    if (process.env.NODE_ENV !== "production" && _e($.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(c) + ")"), re(v, $, L)) {
+      var M = pe($, g + 1), A = M[0], C = M[1];
       try {
-        i.pushState(T, "", D);
+        i.pushState(A, "", C);
       } catch {
-        r.location.assign(D);
+        r.location.assign(C);
       }
       ne(v);
     }
   }
-  function V(l, u) {
-    var v = A.Replace, E = pe(l, u);
+  function q(c, h) {
+    var v = D.Replace, $ = de(c, h);
     function L() {
-      V(l, u);
+      q(c, h);
     }
-    if (process.env.NODE_ENV !== "production" && De(E.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(l) + ")"), re(v, E, L)) {
-      var O = ge(E, y), T = O[0], D = O[1];
-      i.replaceState(T, "", D), ne(v);
+    if (process.env.NODE_ENV !== "production" && _e($.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(c) + ")"), re(v, $, L)) {
+      var M = pe($, g), A = M[0], C = M[1];
+      i.replaceState(A, "", C), ne(v);
     }
   }
-  function Q(l) {
-    i.go(l);
+  function K(c) {
+    i.go(c);
   }
-  var p = {
+  var m = {
     get action() {
-      return c;
+      return l;
     },
     get location() {
-      return m;
+      return b;
     },
-    createHref: j,
-    push: me,
-    replace: V,
-    go: Q,
+    createHref: fe,
+    push: ge,
+    replace: q,
+    go: K,
     back: function() {
-      Q(-1);
+      K(-1);
     },
     forward: function() {
-      Q(1);
+      K(1);
     },
-    listen: function(u) {
-      return d.push(u);
+    listen: function(h) {
+      return d.push(h);
     },
-    block: function(u) {
-      var v = b.push(u);
-      return b.length === 1 && r.addEventListener(Ue, _e), function() {
-        v(), b.length || r.removeEventListener(Ue, _e);
+    block: function(h) {
+      var v = p.push(h);
+      return p.length === 1 && r.addEventListener(He, Ie), function() {
+        v(), p.length || r.removeEventListener(He, Ie);
       };
     }
   };
-  return p;
+  return m;
 }
-function _e(a) {
+function Ie(a) {
   a.preventDefault(), a.returnValue = "";
 }
-function He() {
+function Fe() {
   var a = [];
   return {
     get length() {
@@ -800,14 +802,14 @@ function He() {
     }
   };
 }
-function pt() {
+function yt() {
   return Math.random().toString(36).substr(2, 8);
 }
-function Ce(a) {
+function qe(a) {
   var e = a.pathname, t = e === void 0 ? "/" : e, r = a.search, i = r === void 0 ? "" : r, s = a.hash, o = s === void 0 ? "" : s;
   return i && i !== "?" && (t += i.charAt(0) === "?" ? i : "?" + i), o && o !== "#" && (t += o.charAt(0) === "#" ? o : "#" + o), t;
 }
-function Qe(a) {
+function Je(a) {
   var e = {};
   if (a) {
     var t = a.indexOf("#");
@@ -817,26 +819,26 @@ function Qe(a) {
   }
   return e;
 }
-function we(a) {
-  return lt(a, "Expected `path` to be a string. Got type: %t, value: %v"), a.split("/").map((e) => e.trim()).filter((e) => e !== "");
+function ye(a) {
+  return ct(a, "Expected `path` to be a string. Got type: %t, value: %v"), a.split("/").map((e) => e.trim()).filter((e) => e !== "");
 }
-function se(a) {
+function ae(a) {
   var t;
-  vt(
-    (r) => Xe(r == null ? void 0 : r.toString),
+  Et(
+    (r) => et(r == null ? void 0 : r.toString),
     a,
     "Expected `parts` to be an array of objects with a .toString() method. Got type: %t, value: %v"
   ), a = a.filter((r) => r).flatMap(String);
   let e = (t = a.shift()) == null ? void 0 : t.toString();
   if (e) {
     for (const r of a.map((i) => i.toString()))
-      r.startsWith(".") ? e = qe(e, r) : e[e.length - 1] !== "/" ? r[0] !== "/" ? e += "/" + r : e += r : r[0] === "/" ? e += r.slice(1) : e += r;
+      r.startsWith(".") ? e = Ue(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 qe(a, e) {
-  if (lt(a, "Expected `base` to be a string. Got type: %t, value: %v"), e == null && (e = a, a = ""), e.startsWith("/"))
+function Ue(a, e) {
+  if (ct(a, "Expected `base` to be a string. Got type: %t, value: %v"), e == null && (e = a, a = ""), e.startsWith("/"))
     return e;
   let t = a;
   for (; ; )
@@ -850,9 +852,9 @@ function qe(a, e) {
       e = e.replace(/^\.\/?/, "");
     else
       break;
-  return se([t, e]);
+  return ae([t, e]);
 }
-function Ke(a) {
+function Ye(a) {
   if (!a) return {};
   a.startsWith("?") && (a = a.slice(1));
   const e = a.split("&").filter((t) => t.trim() !== "").map((t) => {
@@ -863,70 +865,70 @@ function Ke(a) {
 }
 function ot(a, e, t = {}) {
   var o;
-  const [r, i] = e.split("?"), s = we(r);
-  e: for (const f of a) {
-    const { fragments: c } = f;
-    if (!(((o = c[c.length - 1]) == null ? void 0 : o.type) === 3) && c.length !== s.length || t.willMatch && !t.willMatch(f))
+  const [r, i] = e.split("?"), s = ye(r);
+  e: for (const u of a) {
+    const { fragments: l } = u;
+    if (!(((o = l[l.length - 1]) == null ? void 0 : o.type) === 3) && l.length !== s.length || t.willMatch && !t.willMatch(u))
       continue e;
-    const y = [];
-    t: for (let d = 0; d < c.length; d++) {
-      const b = s[d], $ = c[d];
-      if (b == null && $.type !== 3)
+    const g = [];
+    t: for (let d = 0; d < l.length; d++) {
+      const p = s[d], S = l[d];
+      if (p == null && S.type !== 3)
         continue e;
-      switch ($.type) {
+      switch (S.type) {
         case 1:
-          if ($.name.toLowerCase() === b.toLowerCase()) {
-            y.push($);
+          if (S.name.toLowerCase() === p.toLowerCase()) {
+            g.push(S);
             break;
           } else
             continue e;
         case 2:
-          y.push({ ...$, value: b });
+          g.push({ ...S, value: p });
           break;
         case 3:
-          y.push({ ...$, value: s.slice(d).join("/") });
+          g.push({ ...S, value: s.slice(d).join("/") });
           break t;
         case 4:
-          if (isNaN(Number(b)))
+          if (isNaN(Number(p)))
             continue e;
-          y.push({ ...$, value: Number(b) });
+          g.push({ ...S, value: Number(p) });
           break;
         default:
-          throw new Error(`Unknown fragment type: ${$.type}`);
+          throw new Error(`Unknown fragment type: ${S.type}`);
       }
     }
-    const m = /* @__PURE__ */ Object.create(null);
-    for (const d of y)
-      d.type === 2 && (m[d.name] = decodeURIComponent(d.value)), d.type === 4 && (m[d.name] = d.value), d.type === 3 && (m.wildcard = "/" + decodeURIComponent(d.value));
+    const b = /* @__PURE__ */ Object.create(null);
+    for (const d of g)
+      d.type === 2 && (b[d.name] = decodeURIComponent(d.value)), d.type === 4 && (b[d.name] = d.value), d.type === 3 && (b.wildcard = "/" + decodeURIComponent(d.value));
     return {
-      path: "/" + y.map((d) => d.value).join("/"),
-      pattern: "/" + c.map((d) => d.type === 2 ? `{${d.name}}` : d.type === 4 ? `{#${d.name}}` : d.name).join("/"),
-      params: m,
-      query: Ke(i),
-      meta: f.meta
+      path: "/" + g.map((d) => d.value).join("/"),
+      pattern: "/" + l.map((d) => d.type === 2 ? `{${d.name}}` : d.type === 4 ? `{#${d.name}}` : d.name).join("/"),
+      params: b,
+      query: Ye(i),
+      meta: u.meta
     };
   }
 }
-function Ft(a) {
+function Wt(a) {
   const e = [], t = [], r = [], i = [];
   for (const o of a) {
-    const { fragments: f } = o;
-    f.some(
-      (c) => c.type === 3
+    const { fragments: u } = o;
+    u.some(
+      (l) => l.type === 3
       /* Wildcard */
-    ) ? i.push(o) : f.some(
-      (c) => c.type === 4
+    ) ? i.push(o) : u.some(
+      (l) => l.type === 4
       /* NumericParam */
-    ) ? t.push(o) : f.some(
-      (c) => c.type === 2
+    ) ? t.push(o) : u.some(
+      (l) => l.type === 2
       /* Param */
     ) ? r.push(o) : e.push(o);
   }
-  const s = (o, f) => o.fragments.length > f.fragments.length ? -1 : 1;
+  const s = (o, u) => o.fragments.length > u.fragments.length ? -1 : 1;
   return e.sort(s), t.sort(s), r.sort(s), i.sort(s), [...e, ...t, ...r, ...i];
 }
-function It(a) {
-  const e = we(a), t = [];
+function zt(a) {
+  const e = ye(a), t = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
     if (i === "*") {
@@ -949,85 +951,85 @@ function It(a) {
   }
   return t;
 }
-var ke, N, Z, k, We, F, Pe, ee, I, ue, he, fe, Se, B, Je, Ye;
-class Wt {
+var Pe, N, Z, E, ze, I, Se, ee, F, le, ce, ue, Le, B, Xe, Ze;
+class Gt {
   constructor(e, t) {
-    h(this, B);
-    h(this, ke);
-    h(this, N);
-    h(this, Z);
-    h(this, k);
-    h(this, We, 0);
-    h(this, F, []);
-    h(this, Pe);
-    h(this, ee, []);
+    f(this, B);
+    f(this, Pe);
+    f(this, N);
+    f(this, Z);
+    f(this, E);
+    f(this, ze, 0);
+    f(this, I, []);
+    f(this, Se);
+    f(this, ee, []);
     // Callbacks that need to be called on unmount.
-    h(this, I, []);
+    f(this, F, []);
     /**
      * The currently matched route pattern, if any.
      */
-    P(this, "$pattern");
-    h(this, ue);
+    k(this, "$pattern");
+    f(this, le);
     /**
      * The current URL path.
      */
-    P(this, "$path");
-    h(this, he);
+    k(this, "$path");
+    f(this, ce);
     /**
      * The current named path params.
      */
-    P(this, "$params");
-    h(this, fe);
+    k(this, "$params");
+    f(this, ue);
     /**
      * The current query params. Changes to this object will be reflected in the URL.
      */
-    P(this, "$query");
-    h(this, Se);
-    g(this, ke, e), g(this, N, e.createLogger("dolla/router")), g(this, Z, t);
-    const [r, i] = K(null), [s, o] = K(""), [f, c] = K({}), [w, y] = K(
-      Ke(typeof window > "u" ? "" : window.location.search ?? "")
+    k(this, "$query");
+    f(this, Le);
+    y(this, Pe, e), y(this, N, e.createLogger("dolla/router")), y(this, Z, t);
+    const [r, i] = Q(null), [s, o] = Q(""), [u, l] = Q({}), [w, g] = Q(
+      Ye(typeof window > "u" ? "" : window.location.search ?? "")
     );
-    this.$pattern = r, g(this, ue, i), this.$path = s, g(this, he, o), this.$params = f, g(this, fe, c), this.$query = w, g(this, Se, y), e.beforeMount(() => {
-      n(this, k) != null && (n(this, I).push(
-        ut([w], (m) => {
+    this.$pattern = r, y(this, le, i), this.$path = s, y(this, ce, o), this.$params = u, y(this, ue, l), this.$query = w, y(this, Le, g), e.beforeMount(() => {
+      n(this, E) != null && (n(this, F).push(
+        ut([w], (b) => {
           const d = new URLSearchParams();
-          for (const $ in m)
-            d.set($, String(m[$]));
-          const b = "?" + d.toString();
-          b != n(this, k).location.search && n(this, k).replace({
-            pathname: n(this, k).location.pathname,
-            search: b
+          for (const S in b)
+            d.set(S, String(b[S]));
+          const p = "?" + d.toString();
+          p != n(this, E).location.search && n(this, E).replace({
+            pathname: n(this, E).location.pathname,
+            search: p
           });
         })
-      ), n(this, I).push(n(this, k).listen(S(this, B, Ye).bind(this))), S(this, B, Ye).call(this, n(this, k)), n(this, I).push(
-        Bt(n(this, Z).rootElement, (m) => {
-          let d = m.getAttribute("href");
-          n(this, N).info("Intercepted link click", m, d), /^https?:\/\/|^\//.test(d) || (d = se([n(this, k).location.pathname, d])), n(this, k).push(d);
+      ), n(this, F).push(n(this, E).listen(P(this, B, Ze).bind(this))), P(this, B, Ze).call(this, n(this, E)), n(this, F).push(
+        Qt(n(this, Z).rootElement, (b) => {
+          let d = b.getAttribute("href");
+          n(this, N).info("Intercepted link click", b, d), /^https?:\/\/|^\//.test(d) || (d = ae([n(this, E).location.pathname, d])), n(this, E).push(d);
         })
       ), n(this, N).info("Intercepting <a> clicks within root element:", n(this, Z).rootElement));
     }), e.onUnmount(() => {
-      for (; n(this, I).length > 0; )
-        n(this, I).pop()();
+      for (; n(this, F).length > 0; )
+        n(this, F).pop()();
     });
   }
   setup(e) {
-    if (n(this, ke).isMounted) {
+    if (n(this, Pe).isMounted) {
       n(this, N).crash(
         new Error("Dolla is already mounted. Router setup must be called before Dolla.mount is called.")
       );
       return;
     }
-    e.style === "hash" ? g(this, k, Ht()) : g(this, k, _t()), g(this, ee, Ft(
-      e.routes.flatMap((t) => S(this, B, Je).call(this, t)).map((t) => ({
+    e.style === "hash" ? y(this, E, Ft()) : y(this, E, It()), y(this, ee, Wt(
+      e.routes.flatMap((t) => P(this, B, Xe).call(this, t)).map((t) => ({
         pattern: t.pattern,
         meta: t.meta,
-        fragments: It(t.pattern)
+        fragments: zt(t.pattern)
       }))
     ));
     for (const t of n(this, ee))
       if (t.meta.redirect) {
         let r;
-        if (!Xe(t.meta.redirect)) if (U(t.meta.redirect)) {
+        if (!et(t.meta.redirect)) if (U(t.meta.redirect)) {
           if (r = t.meta.redirect, !ot(n(this, ee), r, {
             willMatch(s) {
               return s !== t;
@@ -1048,7 +1050,7 @@ class Wt {
    * Dolla.router.go["/users", 215], { replace: true }); // replace current history entry with `/users/215`
    */
   go(e, t = {}) {
-    if (n(this, k) == null) {
+    if (n(this, E) == null) {
       n(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."
@@ -1057,13 +1059,13 @@ class Wt {
       return;
     }
     let r;
-    Array.isArray(e) ? r = se(e) : r = e.toString(), r = qe(n(this, k).location.pathname, r), t.preserveQuery && (r += n(this, k).location.search), t.replace ? n(this, k).replace(r) : n(this, k).push(r);
+    Array.isArray(e) ? r = ae(e) : r = e.toString(), r = Ue(n(this, E).location.pathname, r), t.preserveQuery && (r += n(this, E).location.search), t.replace ? n(this, E).replace(r) : n(this, E).push(r);
   }
   /**
    * Navigate backward. Pass a number of steps to hit the back button that many times.
    */
   back(e = 1) {
-    if (n(this, k) == null) {
+    if (n(this, E) == null) {
       n(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."
@@ -1071,13 +1073,13 @@ class Wt {
       );
       return;
     }
-    n(this, k).go(-e);
+    n(this, E).go(-e);
   }
   /**
    * Navigate forward. Pass a number of steps to hit the forward button that many times.
    */
   forward(e = 1) {
-    if (n(this, k) == null) {
+    if (n(this, E) == null) {
       n(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."
@@ -1085,16 +1087,16 @@ class Wt {
       );
       return;
     }
-    n(this, k).go(e);
+    n(this, E).go(e);
   }
 }
-ke = new WeakMap(), N = new WeakMap(), Z = new WeakMap(), k = new WeakMap(), We = new WeakMap(), F = new WeakMap(), Pe = new WeakMap(), ee = new WeakMap(), I = new WeakMap(), ue = new WeakMap(), he = new WeakMap(), fe = new WeakMap(), Se = new WeakMap(), B = new WeakSet(), /**
+Pe = new WeakMap(), N = new WeakMap(), Z = new WeakMap(), E = new WeakMap(), ze = new WeakMap(), I = new WeakMap(), Se = new WeakMap(), ee = new WeakMap(), F = new WeakMap(), le = new WeakMap(), ce = new WeakMap(), ue = new WeakMap(), Le = new WeakMap(), B = 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.
  */
-Je = function(e, t = [], r = []) {
+Xe = function(e, t = [], r = []) {
   if (!(typeof e == "object" && !Array.isArray(e)) || typeof e.path != "string")
     throw new TypeError(`Route configs must be objects with a 'path' string property. Got: ${e}`);
   if (e.redirect && e.routes)
@@ -1104,16 +1106,16 @@ Je = 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 i = [];
-  for (const c of t)
-    i.push(...we(c.path));
-  i.push(...we(e.path)), i[i.length - 1] === "*" && i.pop();
+  for (const l of t)
+    i.push(...ye(l.path));
+  i.push(...ye(e.path)), i[i.length - 1] === "*" && i.pop();
   const s = [];
   if (e.redirect) {
-    let c = e.redirect;
-    return U(c) && (c = qe(se(i), c), c.startsWith("/") || (c = "/" + c)), s.push({
-      pattern: "/" + se([...i, ...we(e.path)]),
+    let l = e.redirect;
+    return U(l) && (l = Ue(ae(i), l), l.startsWith("/") || (l = "/" + l)), s.push({
+      pattern: "/" + ae([...i, ...ye(e.path)]),
       meta: {
-        redirect: c
+        redirect: l
       }
     }), s;
   }
@@ -1122,25 +1124,25 @@ Je = function(e, t = [], r = []) {
     o = e.view;
   else if (e.view)
     throw new TypeError(`Route '${e.path}' expected a view function or undefined. Got: ${e.view}`);
-  const f = { id: et(this, We)._++, view: o };
+  const u = { id: rt(this, ze)._++, view: o };
   if (e.routes)
-    for (const c of e.routes)
-      s.push(...S(this, B, Je).call(this, c, [...t, e], [...r, f]));
+    for (const l of e.routes)
+      s.push(...P(this, B, Xe).call(this, l, [...t, e], [...r, u]));
   else
     s.push({
-      pattern: parent ? se([...t.map((c) => c.path), e.path]) : e.path,
+      pattern: parent ? ae([...t.map((l) => l.path), e.path]) : e.path,
       meta: {
         pattern: e.path,
-        layers: [...r, f],
+        layers: [...r, u],
         beforeMatch: e.beforeMatch
       }
     });
   return s;
-}, Ye = async function({ location: e }) {
-  e.search !== n(this, Pe) && (g(this, Pe, e.search), n(this, Se).call(this, Ke(e.search)));
+}, Ze = async function({ location: e }) {
+  e.search !== n(this, Se) && (y(this, Se, e.search), n(this, Le).call(this, Ye(e.search)));
   const t = ot(n(this, ee), e.pathname);
   if (!t) {
-    n(this, ue).call(this, null), n(this, he).call(this, e.pathname), n(this, fe).call(this, {
+    n(this, le).call(this, null), n(this, ce).call(this, e.pathname), n(this, ue).call(this, {
       wildcard: e.pathname
     });
     return;
@@ -1152,8 +1154,8 @@ Je = function(e, t = [], r = []) {
     }
   }), t.meta.redirect != null)
     if (typeof t.meta.redirect == "string") {
-      const r = Qt(t.meta.redirect, t.params);
-      n(this, N).info(`↩️ redirecting from '${t.path}' to '${r}'`), n(this, k).replace(r);
+      const r = Jt(t.meta.redirect, t.params);
+      n(this, N).info(`↩️ redirecting from '${t.path}' to '${r}'`), n(this, E).replace(r);
     } else if (typeof t.meta.redirect == "function") {
       const r = {
         path: t.path,
@@ -1164,26 +1166,26 @@ Je = function(e, t = [], r = []) {
       let i = await t.meta.redirect(r);
       if (typeof i != "string")
         throw new Error("Redirect function must return a path to redirect to.");
-      i.startsWith("/") || (i = qe(t.path, i)), n(this, N).info(`Redirecting to: '${i}'`), n(this, k).replace(i);
+      i.startsWith("/") || (i = Ue(t.path, i)), n(this, N).info(`Redirecting to: '${i}'`), n(this, E).replace(i);
     } else
       throw new TypeError("Redirect must either be a path string or a function.");
-  else if (n(this, N).info(`📍 navigating to '${t.path}'`), n(this, he).call(this, t.path), n(this, fe).call(this, t.params), t.pattern !== this.$pattern.get()) {
-    n(this, ue).call(this, t.pattern);
+  else if (n(this, N).info(`📍 navigating to '${t.path}'`), n(this, ce).call(this, t.path), n(this, ue).call(this, t.params), t.pattern !== this.$pattern.get()) {
+    n(this, le).call(this, t.pattern);
     const r = t.meta.layers;
     for (let i = 0; i < r.length; i++) {
-      const s = r[i], o = n(this, F)[i];
+      const s = r[i], o = n(this, I)[i];
       if ((o == null ? void 0 : o.id) !== s.id) {
-        g(this, F, n(this, F).slice(0, i));
-        const f = n(this, F).at(-1);
+        y(this, I, n(this, I).slice(0, i));
+        const u = n(this, I).at(-1);
         o && o.node.isMounted && o.node.unmount();
-        let c;
-        f ? c = f.node.setChildView(s.view) : c = n(this, Z).rootView.setChildView(s.view), n(this, F).push({ id: s.id, node: c });
+        let l;
+        u ? l = u.node.setChildView(s.view) : l = n(this, Z).rootView.setChildView(s.view), n(this, I).push({ id: s.id, node: l });
       }
     }
   }
 };
-const zt = /(noopener|noreferrer) (noopener|noreferrer)/, Gt = /^[\w-_]+:/;
-function Bt(a, e, t = window) {
+const Bt = /(noopener|noreferrer) (noopener|noreferrer)/, Kt = /^[\w-_]+:/;
+function Qt(a, e, t = window) {
   function r(s) {
     return !s || s === a ? null : s.localName !== "a" || s.href === void 0 ? r(s.parentNode) : s;
   }
@@ -1191,53 +1193,53 @@ function Bt(a, e, t = window) {
     if (s.button && s.button !== 0 || s.ctrlKey || s.metaKey || s.altKey || s.shiftKey || s.defaultPrevented)
       return;
     const o = r(s.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" && zt.test(o.getAttribute("rel")) || Gt.test(o.getAttribute("href")) || (s.preventDefault(), e(o)));
+    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" && Bt.test(o.getAttribute("rel")) || Kt.test(o.getAttribute("href")) || (s.preventDefault(), e(o)));
   }
   return a.addEventListener("click", i), function() {
     a.removeEventListener("click", i);
   };
 }
-function Qt(a, e) {
+function Jt(a, e) {
   for (const t in e) {
     const r = e[t].toString();
     a = a.replace(`{${t}}`, r).replace(`{#${t}}`, r);
   }
   return a;
 }
-var W, Le, z, te, Re, xe, Oe, Ne, Me, R, G;
-class Kt {
+var W, Re, z, te, xe, Me, Ne, Oe, Te, R, G;
+class Yt {
   constructor() {
-    P(this, "http");
-    P(this, "i18n");
-    P(this, "render");
-    P(this, "router");
-    h(this, W, !1);
-    h(this, Le, "production");
-    h(this, z);
-    h(this, te);
-    h(this, Re, Nt);
-    h(this, xe, []);
-    h(this, Oe, []);
-    h(this, Ne, []);
-    h(this, Me, []);
-    h(this, R, {
+    k(this, "http");
+    k(this, "i18n");
+    k(this, "render");
+    k(this, "router");
+    f(this, W, !1);
+    f(this, Re, "production");
+    f(this, z);
+    f(this, te);
+    f(this, xe, Tt);
+    f(this, Me, []);
+    f(this, Ne, []);
+    f(this, Oe, []);
+    f(this, Te, []);
+    f(this, R, {
       info: "development",
       log: "development",
       warn: "development",
       error: !0
     });
-    h(this, G, rt("*,-dolla/*"));
-    P(this, "createState", K);
-    P(this, "createSettableState", $t);
-    P(this, "toSettableState", Et);
-    P(this, "toState", Be);
-    P(this, "valueOf", kt);
-    P(this, "derive", ae);
-    P(this, "watch", ut);
-    P(this, "createRef", Pt);
-    P(this, "isRef", St);
+    f(this, G, at("*,-dolla/*"));
+    k(this, "createState", Q);
+    k(this, "createSettableState", kt);
+    k(this, "toSettableState", Pt);
+    k(this, "toState", Ke);
+    k(this, "valueOf", St);
+    k(this, "derive", me);
+    k(this, "watch", ut);
+    k(this, "createRef", Lt);
+    k(this, "isRef", Rt);
     const e = this;
-    this.http = new Mt(), this.i18n = new Ct(this), this.render = new Vt(this), this.router = new Wt(this, {
+    this.http = new At(), this.i18n = new Ut(this), this.render = new Vt(this), this.router = new Gt(this, {
       get rootElement() {
         return n(e, z);
       },
@@ -1257,40 +1259,40 @@ class Kt {
    * Environment affects which log messages will print and how much debugging info is included in the DOM.
    */
   getEnv() {
-    return n(this, Le);
+    return n(this, Re);
   }
   /**
    * 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) {
-    g(this, Le, e);
+    y(this, Re, 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) {
-    g(this, Re, e);
+    y(this, xe, e);
   }
   async mount(e, t) {
     if (n(this, W))
       throw new Error("Dolla is already mounted.");
     if (U(e)) {
       const i = document.querySelector(e);
-      nt(HTMLElement, i, `Selector '${e}' did not match any element.`), g(this, z, i);
+      st(HTMLElement, i, `Selector '${e}' did not match any element.`), y(this, z, i);
     } else
-      nt(HTMLElement, e, "Expected an HTML element or a selector string. Got type: %t, value: %v"), g(this, z, e);
+      st(HTMLElement, e, "Expected an HTML element or a selector string. Got type: %t, value: %v"), y(this, z, e);
     let r;
-    t ? r = at(t) : r = at(ht), g(this, te, this.constructView(r.type, r.props)), await Promise.all(n(this, xe).map((i) => i())), n(this, te).mount(n(this, z)), g(this, W, !0);
-    for (const i of n(this, Oe))
+    t ? r = it(t) : r = it(ht), y(this, te, this.constructView(r.type, r.props)), await Promise.all(n(this, Me).map((i) => i())), n(this, te).mount(n(this, z)), y(this, W, !0);
+    for (const i of n(this, Ne))
       i();
   }
   async unmount() {
     var e;
     if (n(this, W)) {
-      await Promise.all(n(this, Ne).map((t) => t())), (e = n(this, te)) == null || e.unmount(), g(this, W, !1);
-      for (const t of n(this, Me))
+      await Promise.all(n(this, Oe).map((t) => t())), (e = n(this, te)) == null || e.unmount(), y(this, W, !1);
+      for (const t of n(this, Te))
         t();
     }
   }
@@ -1299,26 +1301,26 @@ class Kt {
    * it will be awaited before mounting finishes. Use this to perform initial setup before the app is displayed to the user.
    */
   beforeMount(e) {
-    n(this, xe).push(e);
+    n(this, Me).push(e);
   }
   /**
    * Registers a `callback` to run after the app is mounted.
    */
   onMount(e) {
-    n(this, Oe).push(e);
+    n(this, Ne).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) {
-    n(this, Ne).push(e);
+    n(this, Oe).push(e);
   }
   /**
    * Registers a `callback` to run after the app is unmounted.
    */
   onUnmount(e) {
-    n(this, Me).push(e);
+    n(this, Te).push(e);
   }
   /**
    * Update log type toggles. Values that are not passed will remain unchanged.
@@ -1330,22 +1332,22 @@ class Kt {
     }
   }
   setLogFilter(e) {
-    g(this, G, rt(e));
+    y(this, G, at(e));
   }
   createLogger(e, t) {
-    const r = Be(e), i = (t == null ? void 0 : t.console) ?? Lt(), s = this;
+    const r = Ke(e), i = (t == null ? void 0 : t.console) ?? xt(), s = this;
     return {
       get info() {
-        var f;
+        var u;
         const o = r.get();
-        if (n(s, R).info === !1 || U(n(s, R).info) && n(s, R).info !== s.getEnv() || !n(f = s, G).call(f, o))
-          return Te;
+        if (n(s, R).info === !1 || U(n(s, R).info) && n(s, R).info !== s.getEnv() || !n(u = s, G).call(u, o))
+          return Ae;
         {
-          let c = `%c${o}`;
-          return t != null && t.uid ? c += ` %c[uid: %c${t.uid}%c]` : c += "%c%c%c", i.info.bind(
+          let l = `%c${o}`;
+          return t != null && t.uid ? l += ` %c[uid: %c${t.uid}%c]` : l += "%c%c%c", i.info.bind(
             i,
-            c,
-            `color:${Ae(c)};font-weight:bold`,
+            l,
+            `color:${De(l)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1353,16 +1355,16 @@ class Kt {
         }
       },
       get log() {
-        var f;
+        var u;
         const o = r.get();
-        if (n(s, R).log === !1 || U(n(s, R).log) && n(s, R).log !== s.getEnv() || !n(f = s, G).call(f, o))
-          return Te;
+        if (n(s, R).log === !1 || U(n(s, R).log) && n(s, R).log !== s.getEnv() || !n(u = s, G).call(u, o))
+          return Ae;
         {
-          let c = `%c${o}`;
-          return t != null && t.uid ? c += ` %c[uid: %c${t.uid}%c]` : c += "%c%c%c", i.log.bind(
+          let l = `%c${o}`;
+          return t != null && t.uid ? l += ` %c[uid: %c${t.uid}%c]` : l += "%c%c%c", i.log.bind(
             i,
-            c,
-            `color:${Ae(c)};font-weight:bold`,
+            l,
+            `color:${De(l)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1370,16 +1372,16 @@ class Kt {
         }
       },
       get warn() {
-        var f;
+        var u;
         const o = r.get();
-        if (n(s, R).warn === !1 || U(n(s, R).warn) && n(s, R).warn !== s.getEnv() || !n(f = s, G).call(f, o))
-          return Te;
+        if (n(s, R).warn === !1 || U(n(s, R).warn) && n(s, R).warn !== s.getEnv() || !n(u = s, G).call(u, o))
+          return Ae;
         {
-          let c = `%c${o}`;
-          return t != null && t.uid ? c += ` %c[uid: %c${t.uid}%c]` : c += "%c%c%c", i.warn.bind(
+          let l = `%c${o}`;
+          return t != null && t.uid ? l += ` %c[uid: %c${t.uid}%c]` : l += "%c%c%c", i.warn.bind(
             i,
-            c,
-            `color:${Ae(c)};font-weight:bold`,
+            l,
+            `color:${De(l)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1387,16 +1389,16 @@ class Kt {
         }
       },
       get error() {
-        var f;
+        var u;
         const o = r.get();
-        if (n(s, R).error === !1 || U(n(s, R).error) && n(s, R).error !== s.getEnv() || !n(f = s, G).call(f, o))
-          return Te;
+        if (n(s, R).error === !1 || U(n(s, R).error) && n(s, R).error !== s.getEnv() || !n(u = s, G).call(u, o))
+          return Ae;
         {
-          let c = `%c${o}`;
-          return t != null && t.uid ? c += ` %c[uid: %c${t.uid}%c]` : c += "%c%c%c", i.error.bind(
+          let l = `%c${o}`;
+          return t != null && t.uid ? l += ` %c[uid: %c${t.uid}%c]` : l += "%c%c%c", i.error.bind(
             i,
-            c,
-            `color:${Ae(c)};font-weight:bold`,
+            l,
+            `color:${De(l)};font-weight:bold`,
             "color:#777",
             "color:#aaa",
             "color:#777"
@@ -1404,7 +1406,7 @@ class Kt {
         }
       },
       crash(o) {
-        throw s.isMounted && (s.unmount(), s.constructView(n(s, Re), {
+        throw s.isMounted && (s.unmount(), s.constructView(n(s, xe), {
           error: o,
           loggerName: r.get(),
           uid: t == null ? void 0 : t.uid
@@ -1416,33 +1418,33 @@ class Kt {
    *
    */
   constructView(e, t, r = []) {
-    return Rt({ root: this, data: {} }, e, t, r);
+    return Mt({ root: this, data: {} }, e, t, r);
   }
   /**
    *
    */
   constructMarkup(e) {
-    return xt(Ot({ root: this, data: {} }, e));
+    return Nt(Ot({ root: this, data: {} }, e));
   }
 }
-W = new WeakMap(), Le = new WeakMap(), z = new WeakMap(), te = new WeakMap(), Re = new WeakMap(), xe = new WeakMap(), Oe = new WeakMap(), Ne = new WeakMap(), Me = new WeakMap(), R = new WeakMap(), G = new WeakMap();
-const ct = new Kt(), Zt = ct.i18n.t.bind(ct.i18n);
+W = new WeakMap(), Re = new WeakMap(), z = new WeakMap(), te = new WeakMap(), xe = new WeakMap(), Me = new WeakMap(), Ne = new WeakMap(), Oe = new WeakMap(), Te = new WeakMap(), R = new WeakMap(), G = new WeakMap();
+const lt = new Yt(), tr = lt.i18n.t.bind(lt.i18n);
 export {
-  wt as cond,
-  at as createMarkup,
-  Pt as createRef,
-  $t as createSettableState,
-  rr as createSetter,
-  K as createState,
-  ct as default,
-  ae as derive,
-  tt as html,
-  St as isRef,
-  nr as portal,
-  ar as repeat,
-  Zt as t,
-  Et as toSettableState,
-  Be as toState,
-  kt as valueOf
+  vt as cond,
+  it as createMarkup,
+  Lt as createRef,
+  kt as createSettableState,
+  ar as createSetter,
+  Q as createState,
+  lt as default,
+  me as derive,
+  nt as html,
+  Rt as isRef,
+  sr as portal,
+  ir as repeat,
+  tr as t,
+  Pt as toSettableState,
+  Ke as toState,
+  St as valueOf
 };
 //# sourceMappingURL=index.js.map