@manyducks.co/dolla 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/index.js

@@ -13,8 +13,8 @@ var et = (a, e, t, r) => ({
     return n(a, e, r);
   }
 });
-import { h as tt, c as wt, i as Ie, t as Ge, a as yt, d as Be, b as bt, e as Xe, f as V, 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 Lt, p as Pt, q as nt, r as at, s as St, u as Ne, x as Te, y as Rt, z as xt, A as Ot } from "./passthrough-CW8Ezjg-.js";
-import { B as rr, C as nr, D as ar } from "./passthrough-CW8Ezjg-.js";
+import { h as tt, c as wt, i as Ge, t as Be, a as yt, d as Ie, 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 Lt, p as Pt, q as nt, r as at, s as St, u as Ne, x as Te, 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 Mt(a) {
   return tt`
     <div
@@ -168,7 +168,7 @@ async function jt(a) {
   const f = async () => {
     const c = s.query.toString(), w = c.length > 0 ? s.uri + "?" + c : s.uri;
     let y;
-    !s.headers.has("content-type") && Ie(s.body) ? (s.headers.set("content-type", "application/json"), y = JSON.stringify(s.body)) : y = s.body;
+    !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, {
       method: s.method,
       headers: s.headers,
@@ -207,14 +207,14 @@ class Ct {
     if (this.strings == null) {
       if (Xe(this.config.fetch)) {
         const e = await this.config.fetch();
-        if (Ie(e))
+        if (Ge(e))
           this.strings = e;
         else
           throw new Error(`Fetch function did not return an object of language strings: ${e}`);
-      } else if (V(this.config.path)) {
+      } else if (U(this.config.path)) {
         const e = await this.dolla.http.get(this.config.path);
         if (e.status >= 200 && e.status < 300)
-          if (Ie(e.body))
+          if (Ge(e.body))
             this.strings = e.body;
           else
             throw new Error(
@@ -229,23 +229,23 @@ class Ct {
     return this.strings;
   }
 }
-var ye, Y, x, se, be, ve, ie, $e, We, ft;
+var we, Y, x, se, ye, be, ie, ve, We, ft;
 class Dt {
   constructor(e) {
     h(this, We);
-    h(this, ye);
+    h(this, we);
     h(this, Y);
     h(this, x, /* @__PURE__ */ new Map());
     h(this, se, []);
-    h(this, be, "auto");
+    h(this, ye, "auto");
     L(this, "$current");
-    h(this, ve);
+    h(this, be);
     h(this, ie);
-    h(this, $e);
-    g(this, ye, e), g(this, Y, e.createLogger("dolla/language"));
+    h(this, ve);
+    g(this, we, e), g(this, Y, e.createLogger("dolla/language"));
     const [t, r] = K(), [i, s] = K();
-    this.$current = t, g(this, ve, r), g(this, ie, i), g(this, $e, s), e.beforeMount(async () => {
-      n(this, x).size > 0 && await this.setLanguage(n(this, be));
+    this.$current = t, g(this, be, r), g(this, ie, i), g(this, ve, s), e.beforeMount(async () => {
+      n(this, x).size > 0 && await this.setLanguage(n(this, ye));
     });
   }
   get supportedLanguages() {
@@ -253,11 +253,11 @@ class Dt {
   }
   setup(e) {
     if (e.languages.forEach((t) => {
-      n(this, x).set(t.name, new Ct(t, n(this, ye)));
+      n(this, x).set(t.name, new Ct(t, n(this, we)));
     }), e.initialLanguage && e.initialLanguage !== "auto") {
       if (!e.languages.some((r) => r.name === e.initialLanguage))
         throw new Error(`Initial language '${e.initialLanguage}' has no registered translation.`);
-      g(this, be, e.initialLanguage);
+      g(this, ye, e.initialLanguage);
     }
     n(this, Y).info(
       `${n(this, x).size} language${n(this, x).size === 1 ? "" : "s"} supported: '${[...n(this, x).keys()].join("', '")}'`
@@ -285,7 +285,7 @@ class Dt {
     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);
+      n(this, ve).call(this, s), n(this, be).call(this, t), n(this, Y).info("set language to " + t);
     } catch (s) {
       s instanceof Error && n(this, Y).crash(s);
     }
@@ -312,7 +312,7 @@ class Dt {
         yt(c) && (s[f] = c);
       const o = Object.entries(s);
       if (o.length > 0) {
-        const f = o.map((w) => w[1]), c = Be([n(this, ie), ...f], (w, ...y) => {
+        const f = o.map((w) => w[1]), c = Ie([n(this, ie), ...f], (w, ...y) => {
           const m = y.map(($, j) => o[j]), d = {
             ...t
           };
@@ -326,19 +326,19 @@ class Dt {
         return n(this, se).push([e, t, c]), c;
       }
     }
-    const i = Be([n(this, ie)], (s) => {
+    const i = Ie([n(this, ie)], (s) => {
       let o = it(s, e) || `[NO TRANSLATION: ${e}]`;
       return t && (o = st(o, t)), o;
     });
     return n(this, se).push([e, t, i]), i;
   }
 }
-ye = new WeakMap(), Y = new WeakMap(), x = new WeakMap(), se = new WeakMap(), be = new WeakMap(), ve = new WeakMap(), ie = new WeakMap(), $e = new WeakMap(), We = new WeakSet(), ft = function(e, t) {
+we = new WeakMap(), Y = new WeakMap(), x = new WeakMap(), se = new WeakMap(), ye = new WeakMap(), be = new WeakMap(), ie = new WeakMap(), ve = new WeakMap(), We = new WeakSet(), ft = function(e, t) {
   for (const r of n(this, se))
     if (r[0] === e && bt(r[1], t))
       return r[2];
 };
-const qt = Ge("[NO LANGUAGE SET]");
+const qt = Be("[NO LANGUAGE SET]");
 function st(a, e) {
   for (const t in e)
     a = a.replace(`{{${t}}}`, String(e[t]));
@@ -353,20 +353,21 @@ function it(a, e) {
   }
   return r;
 }
-var X, Ee, H, _, oe, q, ce, Ae;
-class Ut {
+var X, $e, H, _, oe, q, ce, Ae;
+class Vt {
   constructor(e) {
     h(this, ce);
     h(this, X);
-    h(this, Ee);
+    h(this, $e);
     // Keyed updates ensure only the most recent callback queued with a certain key
     // will be called, keeping DOM operations to a minimum.
     h(this, H, /* @__PURE__ */ new Map());
     // All unkeyed updates are run on every batch.
     h(this, _, []);
+    // All read callbacks are run before updates on every batch.
     h(this, oe, []);
     h(this, q, !1);
-    g(this, X, e), g(this, Ee, e.createLogger("dolla/render"));
+    g(this, X, e), g(this, $e, e.createLogger("dolla/render"));
   }
   /**
    * Queues a callback to run in the next render batch.
@@ -395,7 +396,7 @@ class Ut {
     });
   }
 }
-X = new WeakMap(), Ee = new WeakMap(), H = new WeakMap(), _ = new WeakMap(), oe = new WeakMap(), q = new WeakMap(), ce = new WeakSet(), Ae = function() {
+X = new WeakMap(), $e = new WeakMap(), H = new WeakMap(), _ = new WeakMap(), oe = new WeakMap(), q = new WeakMap(), ce = new WeakSet(), Ae = function() {
   const e = n(this, H).size + n(this, _).length;
   if ((!n(this, X).isMounted || e === 0) && g(this, q, !1), !n(this, q)) {
     for (const t of n(this, oe))
@@ -404,7 +405,7 @@ X = new WeakMap(), Ee = new WeakMap(), H = new WeakMap(), _ = new WeakMap(), oe
     return;
   }
   requestAnimationFrame(() => {
-    n(this, Ee).info(`Batching ${n(this, H).size + n(this, _).length} queued DOM update(s).`);
+    n(this, $e).info(`Batching ${n(this, H).size + n(this, _).length} queued DOM update(s).`);
     for (const t of n(this, H).values())
       t();
     n(this, H).clear();
@@ -413,14 +414,14 @@ X = new WeakMap(), Ee = new WeakMap(), H = new WeakMap(), _ = new WeakMap(), oe
     g(this, _, []), P(this, ce, Ae).call(this);
   });
 };
-function de() {
-  return de = Object.assign ? Object.assign.bind() : function(a) {
+function fe() {
+  return fe = 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);
+  }, fe.apply(null, arguments);
 }
 var A;
 (function(a) {
@@ -440,7 +441,7 @@ function je(a, e) {
     }
   }
 }
-var Ue = "beforeunload", Vt = "hashchange", dt = "popstate";
+var Ve = "beforeunload", Ut = "hashchange", dt = "popstate";
 function Ht(a) {
   a === void 0 && (a = {});
   var e = a, t = e.window, r = t === void 0 ? document.defaultView : t, i = r.history;
@@ -467,9 +468,9 @@ function Ht(a) {
             action: p,
             location: v,
             retry: function() {
-              U(E * -1);
+              V(E * -1);
             }
-          }, U(E));
+          }, V(E));
         } else
           process.env.NODE_ENV !== "production" && je(
             !1,
@@ -484,14 +485,14 @@ function Ht(a) {
   }
   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, {
+  y == null && (y = 0, i.replaceState(fe({}, i.state, {
     idx: y
   }), ""));
   function $(p) {
     return typeof p == "string" ? p : Ce(p);
   }
   function j(p, l) {
-    return l === void 0 && (l = null), qe(de({
+    return l === void 0 && (l = null), qe(fe({
       pathname: m.pathname,
       hash: "",
       search: ""
@@ -500,14 +501,14 @@ function Ht(a) {
       key: pt()
     }));
   }
-  function pe(p, l) {
+  function de(p, l) {
     return [{
       usr: p.state,
       key: p.key,
       idx: l
     }, $(p)];
   }
-  function ge(p, l, u) {
+  function pe(p, l, u) {
     return !b.length || (b.call({
       action: p,
       location: l,
@@ -527,27 +528,27 @@ function Ht(a) {
     function E() {
       ne(p, l);
     }
-    if (ge(u, v, E)) {
-      var S = pe(v, y + 1), M = S[0], T = S[1];
+    if (pe(u, v, E)) {
+      var S = de(v, y + 1), O = S[0], T = S[1];
       try {
-        i.pushState(M, "", T);
+        i.pushState(O, "", T);
       } catch {
         r.location.assign(T);
       }
       re(u);
     }
   }
-  function me(p, l) {
+  function ge(p, l) {
     var u = A.Replace, v = j(p, l);
     function E() {
-      me(p, l);
+      ge(p, l);
     }
-    if (ge(u, v, E)) {
-      var S = pe(v, y), M = S[0], T = S[1];
-      i.replaceState(M, "", T), re(u);
+    if (pe(u, v, E)) {
+      var S = de(v, y), O = S[0], T = S[1];
+      i.replaceState(O, "", T), re(u);
     }
   }
-  function U(p) {
+  function V(p) {
     i.go(p);
   }
   var Q = {
@@ -559,21 +560,21 @@ function Ht(a) {
     },
     createHref: $,
     push: ne,
-    replace: me,
-    go: U,
+    replace: ge,
+    go: V,
     back: function() {
-      U(-1);
+      V(-1);
     },
     forward: function() {
-      U(1);
+      V(1);
     },
     listen: function(l) {
       return d.push(l);
     },
     block: function(l) {
       var u = b.push(l);
-      return b.length === 1 && r.addEventListener(Ue, Ve), function() {
-        u(), b.length || r.removeEventListener(Ue, Ve);
+      return b.length === 1 && r.addEventListener(Ve, Ue), function() {
+        u(), b.length || r.removeEventListener(Ve, Ue);
       };
     }
   };
@@ -583,7 +584,7 @@ function _t(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, S = E === void 0 ? "" : E, M = l.hash, T = M === void 0 ? "" : M, C = i.state || {};
+    var l = Qe(r.location.hash.substr(1)), u = l.pathname, v = u === void 0 ? "/" : u, E = l.search, S = E === void 0 ? "" : E, O = l.hash, T = O === void 0 ? "" : O, C = i.state || {};
     return [C.idx, qe({
       pathname: v,
       search: S,
@@ -620,12 +621,12 @@ function _t(a) {
         ne(l);
     }
   }
-  r.addEventListener(dt, f), r.addEventListener(Vt, function() {
+  r.addEventListener(dt, f), r.addEventListener(Ut, function() {
     var l = s(), u = l[1];
     Ce(u) !== Ce(m) && 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, {
+  y == null && (y = 0, i.replaceState(fe({}, i.state, {
     idx: y
   }), ""));
   function $() {
@@ -639,8 +640,8 @@ function _t(a) {
   function j(l) {
     return $() + "#" + (typeof l == "string" ? l : Ce(l));
   }
-  function pe(l, u) {
-    return u === void 0 && (u = null), qe(de({
+  function de(l, u) {
+    return u === void 0 && (u = null), qe(fe({
       pathname: m.pathname,
       hash: "",
       search: ""
@@ -649,7 +650,7 @@ function _t(a) {
       key: pt()
     }));
   }
-  function ge(l, u) {
+  function pe(l, u) {
     return [{
       usr: l.state,
       key: l.key,
@@ -671,13 +672,13 @@ function _t(a) {
       location: m
     });
   }
-  function me(l, u) {
-    var v = A.Push, E = pe(l, u);
+  function ge(l, u) {
+    var v = A.Push, E = de(l, u);
     function S() {
-      me(l, u);
+      ge(l, u);
     }
     if (process.env.NODE_ENV !== "production" && je(E.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(l) + ")"), re(v, E, S)) {
-      var M = ge(E, y + 1), T = M[0], C = M[1];
+      var O = pe(E, y + 1), T = O[0], C = O[1];
       try {
         i.pushState(T, "", C);
       } catch {
@@ -686,13 +687,13 @@ function _t(a) {
       ne(v);
     }
   }
-  function U(l, u) {
-    var v = A.Replace, E = pe(l, u);
+  function V(l, u) {
+    var v = A.Replace, E = de(l, u);
     function S() {
-      U(l, u);
+      V(l, u);
     }
     if (process.env.NODE_ENV !== "production" && je(E.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(l) + ")"), re(v, E, S)) {
-      var M = ge(E, y), T = M[0], C = M[1];
+      var O = pe(E, y), T = O[0], C = O[1];
       i.replaceState(T, "", C), ne(v);
     }
   }
@@ -707,8 +708,8 @@ function _t(a) {
       return m;
     },
     createHref: j,
-    push: me,
-    replace: U,
+    push: ge,
+    replace: V,
     go: Q,
     back: function() {
       Q(-1);
@@ -721,14 +722,14 @@ function _t(a) {
     },
     block: function(u) {
       var v = b.push(u);
-      return b.length === 1 && r.addEventListener(Ue, Ve), function() {
-        v(), b.length || r.removeEventListener(Ue, Ve);
+      return b.length === 1 && r.addEventListener(Ve, Ue), function() {
+        v(), b.length || r.removeEventListener(Ve, Ue);
       };
     }
   };
   return p;
 }
-function Ve(a) {
+function Ue(a) {
   a.preventDefault(), a.returnValue = "";
 }
 function He() {
@@ -768,7 +769,7 @@ function Qe(a) {
   }
   return e;
 }
-function we(a) {
+function me(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 ae(a) {
@@ -814,7 +815,7 @@ function Ke(a) {
 }
 function ot(a, e, t = {}) {
   var o;
-  const [r, i] = e.split("?"), s = we(r);
+  const [r, i] = e.split("?"), s = me(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))
@@ -877,7 +878,7 @@ function Wt(a) {
   return e.sort(s), t.sort(s), r.sort(s), i.sort(s), [...e, ...t, ...r, ...i];
 }
 function zt(a) {
-  const e = we(a), t = [];
+  const e = me(a), t = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
     if (i === "*") {
@@ -900,12 +901,12 @@ function zt(a) {
   }
   return t;
 }
-var le, O, Z, k, ze, W, ke, ee, z, ue, he, fe, Le, B, Je, Ye;
+var Ee, M, Z, k, ze, W, ke, ee, z, le, ue, he, Le, I, Je, Ye;
 class Ft {
   constructor(e, t) {
-    h(this, B);
-    h(this, le);
-    h(this, O);
+    h(this, I);
+    h(this, Ee);
+    h(this, M);
     h(this, Z);
     h(this, k);
     h(this, ze, 0);
@@ -918,27 +919,27 @@ class Ft {
      * The currently matched route pattern, if any.
      */
     L(this, "$pattern");
-    h(this, ue);
+    h(this, le);
     /**
      * The current URL path.
      */
     L(this, "$path");
-    h(this, he);
+    h(this, ue);
     /**
      * The current named path params.
      */
     L(this, "$params");
-    h(this, fe);
+    h(this, he);
     /**
      * The current query params. Changes to this object will be reflected in the URL.
      */
     L(this, "$query");
     h(this, Le);
-    g(this, le, e), g(this, O, e.createLogger("dolla/router")), g(this, Z, t);
+    g(this, Ee, e), g(this, M, 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 ?? "")
     );
-    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, Le, y), e.beforeMount(() => {
+    this.$pattern = r, g(this, le, i), this.$path = s, g(this, ue, o), this.$params = f, g(this, he, c), this.$query = w, g(this, Le, y), e.beforeMount(() => {
       n(this, k) != null && (n(this, z).push(
         ut([w], (m) => {
           const d = new URLSearchParams();
@@ -950,26 +951,26 @@ class Ft {
             search: b
           });
         })
-      ), n(this, z).push(n(this, k).listen(P(this, B, Ye).bind(this))), P(this, B, Ye).call(this, n(this, k)), n(this, z).push(
-        Bt(n(this, Z).rootElement, (m) => {
+      ), n(this, z).push(n(this, k).listen(P(this, I, Ye).bind(this))), P(this, I, Ye).call(this, n(this, k)), n(this, z).push(
+        It(n(this, Z).rootElement, (m) => {
           let d = m.getAttribute("href");
-          n(this, O).info("Intercepted link click", m, d), /^https?:\/\/|^\//.test(d) || (d = ae([n(this, k).location.pathname, d])), n(this, k).push(d);
+          n(this, M).info("Intercepted link click", m, d), /^https?:\/\/|^\//.test(d) || (d = ae([n(this, k).location.pathname, d])), n(this, k).push(d);
         })
-      ), n(this, O).info("Intercepting <a> clicks within root element:", n(this, Z).rootElement));
+      ), n(this, M).info("Intercepting <a> clicks within root element:", n(this, Z).rootElement));
     }), e.onUnmount(() => {
       for (; n(this, z).length > 0; )
         n(this, z).pop()();
     });
   }
   setup(e) {
-    if (n(this, le).isMounted) {
-      n(this, O).crash(
+    if (n(this, Ee).isMounted) {
+      n(this, M).crash(
         new Error("Dolla is already mounted. Router setup must be called before Dolla.mount is called.")
       );
       return;
     }
     e.style === "hash" ? g(this, k, _t()) : g(this, k, Ht()), g(this, ee, Wt(
-      e.routes.flatMap((t) => P(this, B, Je).call(this, t)).map((t) => ({
+      e.routes.flatMap((t) => P(this, I, Je).call(this, t)).map((t) => ({
         pattern: t.pattern,
         meta: t.meta,
         fragments: zt(t.pattern)
@@ -978,7 +979,7 @@ class Ft {
     for (const t of n(this, ee))
       if (t.meta.redirect) {
         let r;
-        if (!Xe(t.meta.redirect)) if (V(t.meta.redirect)) {
+        if (!Xe(t.meta.redirect)) if (U(t.meta.redirect)) {
           if (r = t.meta.redirect, !ot(n(this, ee), r, {
             willMatch(s) {
               return s !== t;
@@ -1000,7 +1001,7 @@ class Ft {
    */
   go(e, t = {}) {
     if (n(this, k) == null) {
-      n(this, O).crash(
+      n(this, M).crash(
         new Error(
           "Router.go was called, but the router was never configured! Run 'Dolla.router.setup' before 'Dolla.mount' to configure routes."
         )
@@ -1015,7 +1016,7 @@ class Ft {
    */
   back(e = 1) {
     if (n(this, k) == null) {
-      n(this, O).crash(
+      n(this, M).crash(
         new Error(
           "Router.back was called, but the router was never configured! Run 'Dolla.router.setup' before 'Dolla.mount' to configure routes."
         )
@@ -1029,7 +1030,7 @@ class Ft {
    */
   forward(e = 1) {
     if (n(this, k) == null) {
-      n(this, O).crash(
+      n(this, M).crash(
         new Error(
           "Router.forward was called, but the router was never configured! Run 'Dolla.router.setup' before 'Dolla.mount' to configure routes."
         )
@@ -1039,7 +1040,7 @@ class Ft {
     n(this, k).go(e);
   }
 }
-le = new WeakMap(), O = new WeakMap(), Z = new WeakMap(), k = new WeakMap(), ze = new WeakMap(), W = new WeakMap(), ke = new WeakMap(), ee = new WeakMap(), z = new WeakMap(), ue = new WeakMap(), he = new WeakMap(), fe = new WeakMap(), Le = new WeakMap(), B = new WeakSet(), /**
+Ee = new WeakMap(), M = new WeakMap(), Z = new WeakMap(), k = new WeakMap(), ze = new WeakMap(), W = new WeakMap(), ke = new WeakMap(), ee = new WeakMap(), z = new WeakMap(), le = new WeakMap(), ue = new WeakMap(), he = new WeakMap(), Le = new WeakMap(), I = new WeakSet(), /**
  * Parses a route definition object into a set of matchable routes.
  *
  * @param route - Route config object.
@@ -1056,13 +1057,13 @@ Je = function(e, t = [], r = []) {
     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();
+    i.push(...me(c.path));
+  i.push(...me(e.path)), i[i.length - 1] === "*" && i.pop();
   const s = [];
   if (e.redirect) {
     let c = e.redirect;
-    return V(c) && (c = De(ae(i), c), c.startsWith("/") || (c = "/" + c)), s.push({
-      pattern: "/" + ae([...i, ...we(e.path)]),
+    return U(c) && (c = De(ae(i), c), c.startsWith("/") || (c = "/" + c)), s.push({
+      pattern: "/" + ae([...i, ...me(e.path)]),
       meta: {
         redirect: c
       }
@@ -1076,7 +1077,7 @@ Je = function(e, t = [], r = []) {
   const f = { id: et(this, ze)._++, view: o };
   if (e.routes)
     for (const c of e.routes)
-      s.push(...P(this, B, Je).call(this, c, [...t, e], [...r, f]));
+      s.push(...P(this, I, Je).call(this, c, [...t, e], [...r, f]));
   else
     s.push({
       pattern: parent ? ae([...t.map((c) => c.path), e.path]) : e.path,
@@ -1091,19 +1092,20 @@ Je = function(e, t = [], r = []) {
   e.search !== n(this, ke) && (g(this, ke, e.search), n(this, Le).call(this, Ke(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, ue).call(this, e.pathname), n(this, he).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.");
     }
-  }), n(this, O).info(`Matched route: '${t.pattern}' ('${t.path}')`), t.meta.redirect != null)
+  }), t.meta.redirect != null)
     if (typeof t.meta.redirect == "string") {
       const r = Qt(t.meta.redirect, t.params);
-      n(this, O).info(`Redirecting to: '${r}'`), n(this, k).replace(r);
+      n(this, M).info(`↩️ redirecting from '${t.path}' to '${r}'`), n(this, k).replace(r);
     } else if (typeof t.meta.redirect == "function") {
       const r = {
         path: t.path,
@@ -1114,24 +1116,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 = De(t.path, i)), n(this, O).info(`Redirecting to: '${i}'`), n(this, k).replace(i);
+      i.startsWith("/") || (i = De(t.path, i)), n(this, M).info(`Redirecting to: '${i}'`), n(this, k).replace(i);
     } else
       throw new TypeError("Redirect must either be a path string or a function.");
-  else if (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, M).info(`📍 navigating to '${t.path}'`), n(this, ue).call(this, t.path), n(this, he).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, W)[i];
       if ((o == null ? void 0 : o.id) !== s.id) {
-        n(this, O).info(`Replacing layer @${i} (active ID: ${o == null ? void 0 : o.id}, matched ID: ${s.id})`), g(this, W, n(this, W).slice(0, i));
-        const f = n(this, W).at(-1), c = n(this, le).constructView(s.view, {});
-        o && o.node.isMounted && o.node.unmount(), f ? f.node.setChildren([c]) : n(this, Z).rootView.setChildren([c]), n(this, W).push({ id: s.id, node: c });
+        g(this, W, n(this, W).slice(0, i));
+        const f = n(this, W).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, W).push({ id: s.id, node: c });
       }
     }
   }
 };
-const It = /(noopener|noreferrer) (noopener|noreferrer)/, Gt = /^[\w-_]+:/;
-function Bt(a, e, t = window) {
+const Gt = /(noopener|noreferrer) (noopener|noreferrer)/, Bt = /^[\w-_]+:/;
+function It(a, e, t = window) {
   function r(s) {
     return !s || s === a ? null : s.localName !== "a" || s.href === void 0 ? r(s.parentNode) : s;
   }
@@ -1139,7 +1143,7 @@ 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" && It.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" && Gt.test(o.getAttribute("rel")) || Bt.test(o.getAttribute("href")) || (s.preventDefault(), e(o)));
   }
   return a.addEventListener("click", i), function() {
     a.removeEventListener("click", i);
@@ -1152,7 +1156,7 @@ function Qt(a, e) {
   }
   return a;
 }
-var F, Pe, I, te, Se, Re, xe, Oe, Me, R, G;
+var F, Pe, G, te, Se, Re, xe, Oe, Me, R, B;
 class Kt {
   constructor() {
     L(this, "http");
@@ -1161,7 +1165,7 @@ class Kt {
     L(this, "router");
     h(this, F, !1);
     h(this, Pe, "production");
-    h(this, I);
+    h(this, G);
     h(this, te);
     h(this, Se, Mt);
     h(this, Re, []);
@@ -1174,20 +1178,20 @@ class Kt {
       warn: "development",
       error: !0
     });
-    h(this, G, rt("*,-dolla/*"));
+    h(this, B, rt("*,-dolla/*"));
     L(this, "createState", K);
     L(this, "createSettableState", $t);
     L(this, "toSettableState", Et);
-    L(this, "toState", Ge);
+    L(this, "toState", Be);
     L(this, "valueOf", kt);
-    L(this, "derive", Be);
+    L(this, "derive", Ie);
     L(this, "watch", ut);
     L(this, "createRef", Lt);
     L(this, "isRef", Pt);
     const e = this;
-    this.http = new Nt(), this.language = new Dt(this), this.render = new Ut(this), this.router = new Ft(this, {
+    this.http = new Nt(), this.language = new Dt(this), this.render = new Vt(this), this.router = new Ft(this, {
       get rootElement() {
-        return n(e, I);
+        return n(e, G);
       },
       get rootView() {
         return n(e, te);
@@ -1224,13 +1228,13 @@ class Kt {
   async mount(e, t) {
     if (n(this, F))
       throw new Error("Dolla is already mounted.");
-    if (V(e)) {
+    if (U(e)) {
       const i = document.querySelector(e);
-      nt(HTMLElement, i, `Selector '${e}' did not match any element.`), g(this, I, i);
+      nt(HTMLElement, i, `Selector '${e}' did not match any element.`), g(this, G, i);
     } else
-      nt(HTMLElement, e, "Expected an HTML element or a selector string. Got type: %t, value: %v"), g(this, I, e);
+      nt(HTMLElement, e, "Expected an HTML element or a selector string. Got type: %t, value: %v"), g(this, G, e);
     let r;
-    t ? r = at(t) : r = at(ht), g(this, te, this.constructView(r.type, r.props)), await Promise.all(n(this, Re).map((i) => i())), n(this, te).mount(n(this, I)), g(this, F, !0);
+    t ? r = at(t) : r = at(ht), g(this, te, this.constructView(r.type, r.props)), await Promise.all(n(this, Re).map((i) => i())), n(this, te).mount(n(this, G)), g(this, F, !0);
     for (const i of n(this, xe))
       i();
   }
@@ -1278,15 +1282,15 @@ class Kt {
     }
   }
   setLogFilter(e) {
-    g(this, G, rt(e));
+    g(this, B, rt(e));
   }
   createLogger(e, t) {
-    const r = Ge(e), i = (t == null ? void 0 : t.console) ?? St(), s = this;
+    const r = Be(e), i = (t == null ? void 0 : t.console) ?? St(), s = this;
     return {
       get info() {
         var f;
         const o = r.get();
-        if (n(s, R).info === !1 || V(n(s, R).info) && n(s, R).info !== s.getEnv() || !n(f = s, G).call(f, o))
+        if (n(s, R).info === !1 || U(n(s, R).info) && n(s, R).info !== s.getEnv() || !n(f = s, B).call(f, o))
           return Ne;
         {
           let c = `%c${o}`;
@@ -1303,7 +1307,7 @@ class Kt {
       get log() {
         var f;
         const o = r.get();
-        if (n(s, R).log === !1 || V(n(s, R).log) && n(s, R).log !== s.getEnv() || !n(f = s, G).call(f, o))
+        if (n(s, R).log === !1 || U(n(s, R).log) && n(s, R).log !== s.getEnv() || !n(f = s, B).call(f, o))
           return Ne;
         {
           let c = `%c${o}`;
@@ -1320,7 +1324,7 @@ class Kt {
       get warn() {
         var f;
         const o = r.get();
-        if (n(s, R).warn === !1 || V(n(s, R).warn) && n(s, R).warn !== s.getEnv() || !n(f = s, G).call(f, o))
+        if (n(s, R).warn === !1 || U(n(s, R).warn) && n(s, R).warn !== s.getEnv() || !n(f = s, B).call(f, o))
           return Ne;
         {
           let c = `%c${o}`;
@@ -1337,7 +1341,7 @@ class Kt {
       get error() {
         var f;
         const o = r.get();
-        if (n(s, R).error === !1 || V(n(s, R).error) && n(s, R).error !== s.getEnv() || !n(f = s, G).call(f, o))
+        if (n(s, R).error === !1 || U(n(s, R).error) && n(s, R).error !== s.getEnv() || !n(f = s, B).call(f, o))
           return Ne;
         {
           let c = `%c${o}`;
@@ -1356,7 +1360,7 @@ class Kt {
           error: o,
           loggerName: r.get(),
           uid: t == null ? void 0 : t.uid
-        }).mount(n(s, I))), o;
+        }).mount(n(s, G))), o;
       }
     };
   }
@@ -1364,16 +1368,16 @@ class Kt {
    *
    */
   constructView(e, t, r = []) {
-    return Rt({ root: this }, e, t, r);
+    return Rt({ root: this, data: {} }, e, t, r);
   }
   /**
    *
    */
   constructMarkup(e) {
-    return xt(Ot({ root: this }, e));
+    return xt(Ot({ root: this, data: {} }, e));
   }
 }
-F = new WeakMap(), Pe = new WeakMap(), I = new WeakMap(), te = new WeakMap(), Se = new WeakMap(), Re = new WeakMap(), xe = new WeakMap(), Oe = new WeakMap(), Me = new WeakMap(), R = new WeakMap(), G = new WeakMap();
+F = new WeakMap(), Pe = new WeakMap(), G = new WeakMap(), te = new WeakMap(), Se = new WeakMap(), Re = new WeakMap(), xe = new WeakMap(), Oe = new WeakMap(), Me = new WeakMap(), R = new WeakMap(), B = new WeakMap();
 const ct = new Kt(), Zt = ct.language.t.bind(ct.language);
 export {
   wt as cond,
@@ -1383,14 +1387,14 @@ export {
   rr as createSetter,
   K as createState,
   ct as default,
-  Be as derive,
+  Ie as derive,
   tt as html,
   Pt as isRef,
   nr as portal,
   ar as repeat,
   Zt as t,
   Et as toSettableState,
-  Ge as toState,
+  Be as toState,
   kt as valueOf
 };
 //# sourceMappingURL=index.js.map