@manyducks.co/dolla 2.0.0-alpha.55 → 2.0.0-alpha.57

package/dist/{router-B-rtBG7i.js → router-ClSFnmRK.js}

@@ -1,41 +1,41 @@
-var Y = Object.defineProperty;
-var F = (n) => {
+var X = Object.defineProperty;
+var C = (n) => {
   throw TypeError(n);
 };
-var Z = (n, t, e) => t in n ? Y(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var S = (n, t, e) => Z(n, typeof t != "symbol" ? t + "" : t, e), Q = (n, t, e) => t.has(n) || F("Cannot " + e);
-var c = (n, t, e) => (Q(n, t, "read from private field"), e ? e.call(n) : t.get(n)), w = (n, t, e) => t.has(n) ? F("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, e), $ = (n, t, e, r) => (Q(n, t, "write to private field"), r ? r.call(n, e) : t.set(n, e), e), d = (n, t, e) => (Q(n, t, "access private method"), e);
-var I = (n, t, e, r) => ({
-  set _(i) {
-    $(n, t, i, e);
+var Y = (n, t, e) => t in n ? X(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
+var j = (n, t, e) => Y(n, typeof t != "symbol" ? t + "" : t, e), G = (n, t, e) => t.has(n) || C("Cannot " + e);
+var l = (n, t, e) => (G(n, t, "read from private field"), e ? e.call(n) : t.get(n)), w = (n, t, e) => t.has(n) ? C("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, e), $ = (n, t, e, r) => (G(n, t, "write to private field"), r ? r.call(n, e) : t.set(n, e), e), d = (n, t, e) => (G(n, t, "access private method"), e);
+var F = (n, t, e, r) => ({
+  set _(s) {
+    $(n, t, s, e);
   },
   get _() {
-    return c(n, t, r);
+    return l(n, t, r);
   }
 });
-import { f as _, $ as E, p as K, s as V } from "./logger-CXdzxt1e.js";
-import { O as tt, V as et, t as rt } from "./markup-yTuFdC0t.js";
-import { d as nt, e as z, c as N, f as st, g as it, i as at, b as j } from "./typeChecking-lgllKIVq.js";
+import { f as Z, $ as E, p as I, s as D } from "./logger-sSxIw5od.js";
+import { D as _, V as tt, m as et } from "./markup-CAJd0zdA.js";
+import { d as rt, e as K, c as N, f as nt, g as it, i as st, b as P } from "./typeChecking-BJ-ymQ2F.js";
 function x(n) {
-  return z(n, "Expected `path` to be a string. Got type: %t, value: %v"), n.split("/").map((t) => t.trim()).filter((t) => t !== "");
+  return K(n, "Expected `path` to be a string. Got type: %t, value: %v"), n.split("/").map((t) => t.trim()).filter((t) => t !== "");
 }
 function M(n) {
   var e;
-  nt(
+  rt(
     (r) => N(r == null ? void 0 : r.toString),
     n,
     "Expected `parts` to be an array of objects with a .toString() method. Got type: %t, value: %v"
   ), n = n.filter((r) => r).flatMap(String);
   let t = (e = n.shift()) == null ? void 0 : e.toString();
   if (t) {
-    for (const r of n.map((i) => i.toString()))
+    for (const r of n.map((s) => s.toString()))
       r.startsWith(".") ? t = W(t, r) : t[t.length - 1] !== "/" ? r[0] !== "/" ? t += "/" + r : t += r : r[0] === "/" ? t += r.slice(1) : t += r;
     t && t !== "/" && t.endsWith("/") && (t = t.slice(0, t.length - 1));
   }
   return t ?? "";
 }
 function W(n, t) {
-  if (z(n, "Expected `base` to be a string. Got type: %t, value: %v"), t == null && (t = n, n = ""), t.startsWith("/"))
+  if (K(n, "Expected `base` to be a string. Got type: %t, value: %v"), t == null && (t = n, n = ""), t.startsWith("/"))
     return t;
   let e = n;
   for (; ; )
@@ -51,7 +51,7 @@ function W(n, t) {
       break;
   return M([e, t]);
 }
-function ot(n) {
+function at(n) {
   if (!n) return {};
   n.startsWith("?") && (n = n.slice(1));
   const t = n.split("&").filter((e) => e.trim() !== "").map(
@@ -59,16 +59,16 @@ function ot(n) {
   );
   return Object.fromEntries(t);
 }
-function D(n, t, e = {}) {
+function V(n, t, e = {}) {
   var a;
-  const [r, i] = t.split("?"), s = x(r);
-  t: for (const l of n) {
-    const { fragments: o } = l;
-    if (!(((a = o[o.length - 1]) == null ? void 0 : a.type) === 3) && o.length !== s.length || e.willMatch && !e.willMatch(l))
+  const [r, s] = t.split("?"), i = x(r);
+  t: for (const c of n) {
+    const { fragments: o } = c;
+    if (!(((a = o[o.length - 1]) == null ? void 0 : a.type) === 3) && o.length !== i.length || e.willMatch && !e.willMatch(c))
       continue t;
     const p = [];
     e: for (let h = 0; h < o.length; h++) {
-      const g = s[h], v = o[h];
+      const g = i[h], v = o[h];
       if (g == null && v.type !== 3)
         continue t;
       switch (v.type) {
@@ -82,7 +82,7 @@ function D(n, t, e = {}) {
           p.push({ ...v, value: g });
           break;
         case 3:
-          p.push({ ...v, value: s.slice(h).join("/") });
+          p.push({ ...v, value: i.slice(h).join("/") });
           break e;
         case 4:
           if (isNaN(Number(g)))
@@ -100,34 +100,34 @@ function D(n, t, e = {}) {
       path: "/" + p.map((h) => h.value).join("/"),
       pattern: "/" + o.map((h) => h.type === 2 ? `{${h.name}}` : h.type === 4 ? `{#${h.name}}` : h.name).join("/"),
       params: m,
-      query: ot(i),
-      meta: l.meta
+      query: at(s),
+      meta: c.meta
     };
   }
 }
-function ct(n) {
-  const t = [], e = [], r = [], i = [];
+function ot(n) {
+  const t = [], e = [], r = [], s = [];
   for (const a of n) {
-    const { fragments: l } = a;
-    l.some(
+    const { fragments: c } = a;
+    c.some(
       (o) => o.type === 3
       /* Wildcard */
-    ) ? i.push(a) : l.some(
+    ) ? s.push(a) : c.some(
       (o) => o.type === 4
       /* NumericParam */
-    ) ? e.push(a) : l.some(
+    ) ? e.push(a) : c.some(
       (o) => o.type === 2
       /* Param */
     ) ? r.push(a) : t.push(a);
   }
-  const s = (a, l) => a.fragments.length > l.fragments.length ? -1 : 1;
-  return t.sort(s), e.sort(s), r.sort(s), i.sort(s), [...t, ...e, ...r, ...i];
+  const i = (a, c) => a.fragments.length > c.fragments.length ? -1 : 1;
+  return t.sort(i), e.sort(i), r.sort(i), s.sort(i), [...t, ...e, ...r, ...s];
 }
-function lt(n) {
+function ct(n) {
   const t = x(n), e = [];
   for (let r = 0; r < t.length; r++) {
-    const i = t[r];
-    if (i === "*") {
+    const s = t[r];
+    if (s === "*") {
       if (r !== t.length - 1)
         throw new Error(`Wildcard must be at the end of a pattern. Received: ${n}`);
       e.push({
@@ -135,53 +135,51 @@ function lt(n) {
         name: "*",
         value: null
       });
-    } else i.at(0) === "{" && i.at(-1) === "}" ? e.push({
-      type: i[1] === "#" ? 4 : 2,
-      name: i[1] === "#" ? i.slice(2, -1) : i.slice(1, -1),
+    } else s.at(0) === "{" && s.at(-1) === "}" ? e.push({
+      type: s[1] === "#" ? 4 : 2,
+      name: s[1] === "#" ? s.slice(2, -1) : s.slice(1, -1),
       value: null
     }) : e.push({
       type: 1,
-      name: i,
-      value: i
+      name: s,
+      value: s
     });
   }
   return e;
 }
-const ht = /(noopener|noreferrer) (noopener|noreferrer)/, ut = /^[\w-_]+:/;
-function ft(n, t, e = window) {
-  function r(s) {
-    return !s || s === n ? null : s.localName !== "a" || s.href === void 0 ? r(s.parentNode) : s;
+const lt = /(noopener|noreferrer) (noopener|noreferrer)/, ht = /^[\w-_]+:/;
+function ut(n, t, e = window) {
+  function r(i) {
+    return !i || i === n ? null : i.localName !== "a" || i.href === void 0 ? r(i.parentNode) : i;
   }
-  function i(s) {
-    if (s.button && s.button !== 0 || s.ctrlKey || s.metaKey || s.altKey || s.shiftKey || s.defaultPrevented)
+  function s(i) {
+    if (i.button && i.button !== 0 || i.ctrlKey || i.metaKey || i.altKey || i.shiftKey || i.defaultPrevented)
       return;
-    const a = r(s.target);
-    a && (e.location.protocol !== a.protocol || e.location.hostname !== a.hostname || e.location.port !== a.port || a.hasAttribute("data-router-ignore") || a.hasAttribute("download") || a.getAttribute("target") === "_blank" && ht.test(a.getAttribute("rel")) || ut.test(a.getAttribute("href")) || (s.preventDefault(), t(a)));
+    const a = r(i.target);
+    a && (e.location.protocol !== a.protocol || e.location.hostname !== a.hostname || e.location.port !== a.port || a.hasAttribute("data-router-ignore") || a.hasAttribute("download") || a.getAttribute("target") === "_blank" && lt.test(a.getAttribute("rel")) || ht.test(a.getAttribute("href")) || (i.preventDefault(), t(a)));
   }
-  return n.addEventListener("click", i), function() {
-    n.removeEventListener("click", i);
+  return n.addEventListener("click", s), function() {
+    n.removeEventListener("click", s);
   };
 }
-function pt(n, t) {
+function ft(n, t) {
   for (const e in t) {
     const r = t[e].toString();
     n = n.replace(`{${e}}`, r).replace(`{#${e}}`, r);
   }
   return n;
 }
-const mt = Symbol(), dt = Symbol();
-var k, G, R, L, U, A, O, b, q, y, u, B, H, J, P, X, T, C;
-class Rt {
+const pt = Symbol(), mt = Symbol();
+var k, O, R, S, A, L, b, q, y, u, z, B, H, U, J, Q, T;
+class kt {
   constructor(t) {
     w(this, u);
-    w(this, k, _("dolla.router"));
-    w(this, G, 0);
+    w(this, k, Z("dolla.router"));
+    w(this, O, 0);
     w(this, R, []);
-    w(this, L, []);
-    w(this, U, !1);
-    S(this, "$slot", E());
-    w(this, A, new tt(this.$slot));
-    w(this, O);
+    w(this, S, []);
+    w(this, A, !1);
+    w(this, L);
     /**
      * Use hash routing when true. Configured in router options.
      */
@@ -195,62 +193,63 @@ class Rt {
     /**
      * The currently matched route pattern, if any.
      */
-    S(this, "$pattern", E(() => {
+    j(this, "$pattern", E(() => {
       var t;
-      return (t = c(this, y).call(this)) == null ? void 0 : t.pattern;
+      return (t = l(this, y).call(this)) == null ? void 0 : t.pattern;
     }));
     /**
      * The current URL path.
      */
-    S(this, "$path", E(() => {
+    j(this, "$path", E(() => {
       var t;
-      return ((t = c(this, y).call(this)) == null ? void 0 : t.path) ?? window.location.pathname;
+      return ((t = l(this, y).call(this)) == null ? void 0 : t.path) ?? window.location.pathname;
     }));
     /**
      * The current named path params.
      */
-    S(this, "$params", E(() => {
+    j(this, "$params", E(() => {
       var t;
-      return ((t = c(this, y).call(this)) == null ? void 0 : t.params) ?? {};
-    }, { equals: V }));
+      return ((t = l(this, y).call(this)) == null ? void 0 : t.params) ?? {};
+    }, { equals: D }));
     /**
      * The current query params.
      */
-    S(this, "$query", E(() => {
+    j(this, "$query", E(() => {
       var t;
-      return ((t = c(this, y).call(this)) == null ? void 0 : t.query) ?? {};
-    }, { equals: V }));
-    st(t, "Options must be an object. Got: %t"), t.hash && $(this, b, !0), $(this, L, ct(
-      t.routes.flatMap((e) => d(this, u, C).call(this, e)).map((e) => ({
+      return ((t = l(this, y).call(this)) == null ? void 0 : t.query) ?? {};
+    }, { equals: D }));
+    nt(t, "Options must be an object. Got: %t"), t.hash && $(this, b, !0), $(this, S, ot(
+      t.routes.flatMap((e) => d(this, u, T).call(this, e)).map((e) => ({
         pattern: e.pattern,
         meta: e.meta,
-        fragments: lt(e.pattern)
+        fragments: ct(e.pattern)
       }))
-    )), wt(c(this, L));
+    )), dt(l(this, S));
   }
-  async [mt](t, e) {
-    $(this, O, {
+  async [pt](t, e) {
+    const r = E();
+    $(this, L, {
       id: -1,
-      element: c(this, A),
+      element: new _(e, r),
       context: e,
-      $slot: this.$slot
+      $slot: r
     });
-    const r = () => {
-      d(this, u, P).call(this, void 0, {});
+    const s = () => {
+      d(this, u, U).call(this, void 0, {});
     };
-    return window.addEventListener("popstate", r), c(this, q).push(() => window.removeEventListener("popstate", r)), c(this, q).push(
-      ft(t, (i) => {
-        let s = i.getAttribute("href");
-        c(this, k).info("intercepted click on <a> tag", i);
-        const a = i.getAttribute("data-router-preserve-query");
-        this.go(s, {
-          preserveQuery: yt(a)
+    return window.addEventListener("popstate", s), l(this, q).push(() => window.removeEventListener("popstate", s)), l(this, q).push(
+      ut(t, (i) => {
+        let a = i.getAttribute("href");
+        l(this, k).info("intercepted click on <a> tag", i);
+        const c = i.getAttribute("data-router-preserve-query");
+        this.go(a, {
+          preserveQuery: wt(c)
         });
       })
-    ), c(this, k).info("will intercept clicks on <a> tags within root element", t), $(this, U, !0), await d(this, u, P).call(this, void 0, {}), c(this, A);
+    ), l(this, k).info("will intercept clicks on <a> tags within root element", t), $(this, A, !0), await d(this, u, U).call(this, void 0, {}), l(this, L).element;
   }
-  async [dt]() {
-    for (const t of c(this, q))
+  async [mt]() {
+    for (const t of l(this, q))
       t();
     $(this, q, []);
   }
@@ -275,135 +274,137 @@ class Rt {
    */
   go(t, e = {}) {
     let r;
-    Array.isArray(t) ? r = M(t) : r = t.toString(), r = W(window.location.pathname, r), e.replace ? d(this, u, H).call(this, r, e) : d(this, u, B).call(this, r, e);
+    Array.isArray(t) ? r = M(t) : r = t.toString(), r = W(window.location.pathname, r), e.replace ? d(this, u, B).call(this, r, e) : d(this, u, z).call(this, r, e);
   }
   /**
    * Updates query params, keeping existing ones and applying new ones. Removes the query param if value is set to `null`.
    */
   updateQuery(t) {
-    const e = K(c(this, y)), r = { ...this.$query() };
+    const e = I(l(this, y)), r = { ...this.$query() };
     for (const a in t) {
-      const l = t[a];
-      l === null ? delete r[a] : r[a] = l.toString();
+      const c = t[a];
+      c === null ? delete r[a] : r[a] = c.toString();
     }
-    let i = [];
+    let s = [];
     for (const a in r)
-      i.push(`${a}=${r[a]}`);
-    const s = i.length > 0 ? "?" + i.join("&") : "";
-    c(this, y).call(this, { ...e, query: r }), window.history.replaceState(null, "", c(this, b) ? "/#" + e.path + s : e.path + s);
+      s.push(`${a}=${r[a]}`);
+    const i = s.length > 0 ? "?" + s.join("&") : "";
+    l(this, y).call(this, { ...e, query: r }), window.history.replaceState(null, "", l(this, b) ? "/#" + e.path + i : e.path + i);
   }
 }
-k = new WeakMap(), G = new WeakMap(), R = new WeakMap(), L = new WeakMap(), U = new WeakMap(), A = new WeakMap(), O = new WeakMap(), b = new WeakMap(), q = new WeakMap(), y = new WeakMap(), u = new WeakSet(), B = function(t, e) {
-  c(this, k).info("(push)", t), window.history.pushState(null, "", c(this, b) ? "/#" + t : t), d(this, u, P).call(this, t, e);
-}, H = function(t, e) {
-  c(this, k).info("(replace)", t), window.history.replaceState(null, "", c(this, b) ? "/#" + t : t), d(this, u, P).call(this, t, e);
-}, J = function() {
-  return c(this, b) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
-}, P = async function(t, e) {
-  const r = c(this, k), i = t ? new URL(t, window.location.origin) : d(this, u, J).call(this), { match: s, journey: a } = await d(this, u, T).call(this, i);
-  for (const l of a)
-    switch (l.kind) {
+k = new WeakMap(), O = new WeakMap(), R = new WeakMap(), S = new WeakMap(), A = new WeakMap(), L = new WeakMap(), b = new WeakMap(), q = new WeakMap(), y = new WeakMap(), u = new WeakSet(), z = function(t, e) {
+  l(this, k).info("(push)", t), window.history.pushState(null, "", l(this, b) ? "/#" + t : t), d(this, u, U).call(this, t, e);
+}, B = function(t, e) {
+  l(this, k).info("(replace)", t), window.history.replaceState(null, "", l(this, b) ? "/#" + t : t), d(this, u, U).call(this, t, e);
+}, H = function() {
+  return l(this, b) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
+}, U = async function(t, e) {
+  const r = l(this, k), s = t ? new URL(t, window.location.origin) : d(this, u, H).call(this), { match: i, journey: a } = await d(this, u, Q).call(this, s);
+  for (const c of a)
+    switch (c.kind) {
       case "match":
-        r == null || r.info(`📍 ${l.message}`);
+        r == null || r.info(`📍 ${c.message}`);
         break;
       case "redirect":
-        r == null || r.info(`↩️ ${l.message}`);
+        r == null || r.info(`↩️ ${c.message}`);
         break;
       case "miss":
-        r == null || r.info(`💀 ${l.message}`);
+        r == null || r.info(`💀 ${c.message}`);
         break;
     }
-  if (s) {
-    const l = K(this.$pattern);
-    let o = s.query, f = [];
+  if (i) {
+    const c = I(this.$pattern);
+    let o = i.query, f = [];
     if (e.preserveQuery === !0)
-      o = Object.assign({}, this.$query(), s.query);
+      o = Object.assign({}, this.$query(), i.query);
     else if (it(e.preserveQuery)) {
       const m = {}, h = this.$query();
       for (const g in h)
         e.preserveQuery.includes(g) && (m[g] = h[g]);
-      o = Object.assign({}, m, s.query);
+      o = Object.assign({}, m, i.query);
     }
     for (const m in o)
       f.push(`${m}=${o[m]}`);
     const p = f.length > 0 ? "?" + f.join("&") : "";
-    c(this, y).call(this, { ...s, query: o }), (s.path !== location.pathname || location.search !== p) && window.history.replaceState(null, "", c(this, b) ? "/#" + s.path + p : s.path + p), s.pattern !== l && d(this, u, X).call(this, s);
+    l(this, y).call(this, { ...i, query: o }), (i.path !== location.pathname || location.search !== p) && window.history.replaceState(null, "", l(this, b) ? "/#" + i.path + p : i.path + p), i.pattern !== c && d(this, u, J).call(this, i);
   } else
-    c(this, U) && r.crash(new gt(`Failed to match route '${i.pathname}'`));
-  return { match: s, journey: a };
+    l(this, A) && r.crash(new yt(`Failed to match route '${s.pathname}'`));
+  return { match: i, journey: a };
 }, /**
  * Takes a matched route and mounts it.
  */
-X = function(t) {
+J = function(t) {
   const e = t.meta.layers;
   for (let r = 0; r < e.length; r++) {
-    const i = e[r], s = c(this, R)[r];
-    if ((s == null ? void 0 : s.id) !== i.id) {
-      $(this, R, c(this, R).slice(0, r)), s == null || s.element.unmount();
-      const a = c(this, R).at(-1) ?? c(this, O), l = E(), o = new et(a.context, i.view, {}, rt(l));
-      a.$slot(o), c(this, R).push({
-        id: i.id,
+    const s = e[r], i = l(this, R)[r];
+    if ((i == null ? void 0 : i.id) !== s.id) {
+      $(this, R, l(this, R).slice(0, r)), i == null || i.element.unmount();
+      const a = l(this, R).at(-1) ?? l(this, L), c = E(), o = new tt(a.context, s.view, {}, [
+        et("$dynamic", { source: c })
+      ]);
+      a.$slot(o), l(this, R).push({
+        id: s.id,
         element: o,
         context: o.context,
-        $slot: l
+        $slot: c
       });
     }
   }
-}, T = async function(t, e = []) {
-  return new Promise((r, i) => {
+}, Q = async function(t, e = []) {
+  return new Promise((r, s) => {
     var o;
-    const s = D(c(this, L), t.pathname);
-    if (!s)
+    const i = V(l(this, S), t.pathname);
+    if (!i)
       return r({
         match: null,
         journey: [...e, { kind: "miss", message: `no match for '${t.pathname}'` }]
       });
-    let a = s.meta.redirect;
-    const l = async () => {
+    let a = i.meta.redirect;
+    const c = async () => {
       if (a != null) {
         let f;
-        if (j(a))
-          f = pt(a, s.params);
+        if (P(a))
+          f = ft(a, i.params);
         else if (N(a)) {
           const p = {
-            path: s.path,
-            pattern: s.pattern,
-            params: s.params,
-            query: s.query
+            path: i.path,
+            pattern: i.pattern,
+            params: i.params,
+            query: i.query
           };
-          if (f = await a(p), !j(f))
-            return i(new Error("Redirect function must return a path to redirect to."));
-          f.startsWith("/") || (f = W(s.path, f));
+          if (f = await a(p), !P(f))
+            return s(new Error("Redirect function must return a path to redirect to."));
+          f.startsWith("/") || (f = W(i.path, f));
         } else
-          return i(new TypeError("Redirect must either be a path string or a function."));
+          return s(new TypeError("Redirect must either be a path string or a function."));
         r(
-          d(this, u, T).call(this, new URL(f, window.location.origin), [
+          d(this, u, Q).call(this, new URL(f, window.location.origin), [
             ...e,
-            { kind: "redirect", message: `redirecting '${s.path}' -> '${f}'` }
+            { kind: "redirect", message: `redirecting '${i.path}' -> '${f}'` }
           ])
         );
       } else
-        r({ match: s, journey: [...e, { kind: "match", message: `matched route '${s.path}'` }] });
+        r({ match: i, journey: [...e, { kind: "match", message: `matched route '${i.path}'` }] });
     };
-    if ((o = s.meta.beforeMatch) != null && o.length) {
-      const f = s.meta.beforeMatch;
+    if ((o = i.meta.beforeMatch) != null && o.length) {
+      const f = i.meta.beforeMatch;
       let p = -1;
       const m = () => {
-        p++, p === f.length ? l() : f[p]({
-          path: s.path,
-          pattern: s.pattern,
-          params: s.params,
-          query: s.query,
+        p++, p === f.length ? c() : f[p]({
+          path: i.path,
+          pattern: i.pattern,
+          params: i.params,
+          query: i.query,
           // TODO: Allow setting context variables from here? Would apply to the context of the matched view.
           redirect: (h) => {
-            a = h, l();
+            a = h, c();
           },
           next: m
         });
       };
       m();
     } else
-      l();
+      c();
   });
 }, /**
  * Parses a route definition object into a set of matchable routes.
@@ -411,8 +412,8 @@ X = function(t) {
  * @param route - Route config object.
  * @param layers - Array of parent layers. Passed when this function calls itself on nested routes.
  */
-C = function(t, e = [], r = []) {
-  if (!at(t) || !j(t.path))
+T = function(t, e = [], r = []) {
+  if (!st(t) || !P(t.path))
     throw new TypeError(`Route configs must be objects with a 'path' string property. Got: ${t}`);
   if (t.redirect && t.routes)
     throw new Error("Route cannot have both a 'redirect' and nested 'routes'.");
@@ -420,48 +421,48 @@ C = function(t, e = [], r = []) {
     throw new Error("Route cannot have both a 'redirect' and a 'view'.");
   if (!t.view && !t.routes && !t.redirect)
     throw new Error("Route must have a 'view', a 'redirect', or a set of nested 'routes'.");
-  let i = [];
+  let s = [];
   for (const o of e)
-    i.push(...x(o.path));
-  i.push(...x(t.path)), i[i.length - 1] === "*" && i.pop();
-  const s = [];
+    s.push(...x(o.path));
+  s.push(...x(t.path)), s[s.length - 1] === "*" && s.pop();
+  const i = [];
   if (t.redirect) {
     let o = t.redirect;
-    return j(o) && (o = W(M(i), o), o.startsWith("/") || (o = "/" + o)), s.push({
-      pattern: "/" + M([...i, ...x(t.path)]),
+    return P(o) && (o = W(M(s), o), o.startsWith("/") || (o = "/" + o)), i.push({
+      pattern: "/" + M([...s, ...x(t.path)]),
       meta: {
         redirect: o
       }
-    }), s;
+    }), i;
   }
   let a = (o) => o.children;
   if (N(t.view))
     a = t.view;
   else if (t.view)
     throw new TypeError(`Route '${t.path}' expected a view function or undefined. Got: ${t.view}`);
-  const l = { id: I(this, G)._++, view: a };
+  const c = { id: F(this, O)._++, view: a };
   if (t.routes)
     for (const o of t.routes)
-      s.push(...d(this, u, C).call(this, o, [...e, t], [...r, l]));
+      i.push(...d(this, u, T).call(this, o, [...e, t], [...r, c]));
   else
-    s.push({
+    i.push({
       pattern: parent ? M([...e.map((o) => o.path), t.path]) : t.path,
       meta: {
         pattern: t.path,
-        layers: [...r, l],
+        layers: [...r, c],
         beforeMatch: e.flatMap((o) => o.beforeMatch).concat(t.beforeMatch).filter((o) => o != null)
       }
     });
-  return s;
+  return i;
 };
-function wt(n) {
+function dt(n) {
   for (const t of n)
     if (t.meta.redirect) {
       let e;
-      if (!N(t.meta.redirect)) if (j(t.meta.redirect)) {
-        if (e = t.meta.redirect, !D(n, e, {
-          willMatch(i) {
-            return i !== t;
+      if (!N(t.meta.redirect)) if (P(t.meta.redirect)) {
+        if (e = t.meta.redirect, !V(n, e, {
+          willMatch(s) {
+            return s !== t;
           }
         }))
           throw new Error(`Found a redirect to an undefined URL. From '${t.pattern}' to '${t.meta.redirect}'`);
@@ -469,7 +470,7 @@ function wt(n) {
         throw new TypeError(`Expected a string or redirect function. Got: ${t.meta.redirect}`);
     }
 }
-function yt(n) {
+function wt(n) {
   if (n === null)
     return !1;
   if (n === !0 || n === !1)
@@ -478,11 +479,11 @@ function yt(n) {
     return n = n.trim(), n === "" || n === "true" ? !0 : n === "false" ? !1 : n.split(",").map((t) => t.trim()).filter((t) => t.length > 0);
   throw new Error(`Invalid type for data-router-preserve-query attribute: ${typeof n} (value: ${n})`);
 }
-class gt extends Error {
+class yt extends Error {
 }
 export {
-  mt as M,
-  Rt as R,
-  dt as U
+  pt as M,
+  kt as R,
+  mt as U
 };
-//# sourceMappingURL=router-B-rtBG7i.js.map
+//# sourceMappingURL=router-ClSFnmRK.js.map