@manyducks.co/dolla 2.0.0-alpha.60 → 2.0.0-alpha.61

package/dist/{router-BpuJQ6OA.js → router-CjCkk4dA.js}

@@ -3,25 +3,26 @@ var V = (n) => {
   throw TypeError(n);
 };
 var rt = (n, t, e) => t in n ? et(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var A = (n, t, e) => rt(n, typeof t != "symbol" ? t + "" : t, e), C = (n, t, e) => t.has(n) || V("Cannot " + e);
-var l = (n, t, e) => (C(n, t, "read from private field"), e ? e.call(n) : t.get(n)), g = (n, t, e) => t.has(n) ? V("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, e), q = (n, t, e, r) => (C(n, t, "write to private field"), r ? r.call(n, e) : t.set(n, e), e), y = (n, t, e) => (C(n, t, "access private method"), e);
+var P = (n, t, e) => rt(n, typeof t != "symbol" ? t + "" : t, e), C = (n, t, e) => t.has(n) || V("Cannot " + e);
+var l = (n, t, e) => (C(n, t, "read from private field"), e ? e.call(n) : t.get(n)), b = (n, t, e) => t.has(n) ? V("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, e), M = (n, t, e, r) => (C(n, t, "write to private field"), r ? r.call(n, e) : t.set(n, e), e), g = (n, t, e) => (C(n, t, "access private method"), e);
 var D = (n, t, e, r) => ({
   set _(a) {
-    q(n, t, a, e);
+    M(n, t, a, e);
   },
   get _() {
     return l(n, t, r);
   }
 });
-import { h as nt, $ as M, s as B, u as H, b as it } from "./logger-MPwl-Xqu.js";
-import { D as st, V as at, m as ot, M as ct } from "./markup-BGlfQYQk.js";
-import { d as lt, e as X, c as G, f as ht, g as J, i as ut, b as U, h as ft } from "./typeChecking-CbltMOUt.js";
+import { c as nt } from "./logger-Bl496yfY.js";
+import { D as st, V as it, m as at, b as ot } from "./markup-CX27GJ1M.js";
+import { $ as R, d as ct, s as B, u as H, b as lt } from "./signals-gCwiIe5X.js";
+import { d as ht, e as X, c as G, f as ft, g as J, i as ut, b as U, h as pt } from "./typeChecking-CbltMOUt.js";
 function O(n) {
   return X(n, "Expected `path` to be a string. Got type: %t, value: %v"), n.split("/").map((t) => t.trim()).filter((t) => t !== "");
 }
-function W(n) {
+function N(n) {
   var e;
-  lt(
+  ht(
     (r) => G(r == null ? void 0 : r.toString),
     n,
     "Expected `parts` to be an array of objects with a .toString() method. Got type: %t, value: %v"
@@ -49,9 +50,9 @@ function T(n, t) {
       t = t.replace(/^\.\/?/, "");
     else
       break;
-  return W([e, t]);
+  return N([e, t]);
 }
-function pt(n) {
+function dt(n) {
   if (!n) return {};
   n.startsWith("?") && (n = n.slice(1));
   const t = n.split("&").filter((e) => e.trim() !== "").map(
@@ -60,70 +61,70 @@ function pt(n) {
   return Object.fromEntries(t);
 }
 function Y(n, t, e = {}) {
-  var i;
-  const [r, a] = t.split("?"), s = O(r);
+  var s;
+  const [r, a] = t.split("?"), i = O(r);
   t: for (const h of n) {
     const { fragments: o } = h;
-    if (!(((i = o[o.length - 1]) == null ? void 0 : i.type) === 3) && o.length !== s.length || e.willMatch && !e.willMatch(h))
+    if (!(((s = o[o.length - 1]) == null ? void 0 : s.type) === 3) && o.length !== i.length || e.willMatch && !e.willMatch(h))
       continue t;
-    const p = [];
+    const f = [];
     e: for (let c = 0; c < o.length; c++) {
-      const u = s[c], d = o[c];
-      if (u == null && d.type !== 3)
+      const u = i[c], m = o[c];
+      if (u == null && m.type !== 3)
         continue t;
-      switch (d.type) {
+      switch (m.type) {
         case 1:
-          if (d.name.toLowerCase() === u.toLowerCase()) {
-            p.push(d);
+          if (m.name.toLowerCase() === u.toLowerCase()) {
+            f.push(m);
             break;
           } else
             continue t;
         case 2:
-          p.push({ ...d, value: u });
+          f.push({ ...m, value: u });
           break;
         case 3:
-          p.push({ ...d, value: s.slice(c).join("/") });
+          f.push({ ...m, value: i.slice(c).join("/") });
           break e;
         case 4:
           if (isNaN(Number(u)))
             continue t;
-          p.push({ ...d, value: u });
+          f.push({ ...m, value: u });
           break;
         default:
-          throw new Error(`Unknown fragment type: ${d.type}`);
+          throw new Error(`Unknown fragment type: ${m.type}`);
       }
     }
-    const f = {};
-    for (const c of p)
-      c.type === 2 && (f[c.name] = decodeURIComponent(c.value)), c.type === 4 && (f[c.name] = String(c.value)), c.type === 3 && (f.wildcard = "/" + decodeURIComponent(c.value));
+    const p = {};
+    for (const c of f)
+      c.type === 2 && (p[c.name] = decodeURIComponent(c.value)), c.type === 4 && (p[c.name] = String(c.value)), c.type === 3 && (p.wildcard = "/" + decodeURIComponent(c.value));
     return {
-      path: "/" + p.map((c) => c.value).join("/"),
+      path: "/" + f.map((c) => c.value).join("/"),
       pattern: "/" + o.map((c) => c.type === 2 ? `{${c.name}}` : c.type === 4 ? `{#${c.name}}` : c.name).join("/"),
-      params: f,
-      query: pt(a),
+      params: p,
+      query: dt(a),
       meta: h.meta
     };
   }
 }
-function dt(n) {
+function mt(n) {
   const t = [], e = [], r = [], a = [];
-  for (const i of n) {
-    const { fragments: h } = i;
+  for (const s of n) {
+    const { fragments: h } = s;
     h.some(
       (o) => o.type === 3
       /* Wildcard */
-    ) ? a.push(i) : h.some(
+    ) ? a.push(s) : h.some(
       (o) => o.type === 4
       /* NumericParam */
-    ) ? e.push(i) : h.some(
+    ) ? e.push(s) : h.some(
       (o) => o.type === 2
       /* Param */
-    ) ? r.push(i) : t.push(i);
+    ) ? r.push(s) : t.push(s);
   }
-  const s = (i, h) => i.fragments.length > h.fragments.length ? -1 : 1;
-  return t.sort(s), e.sort(s), r.sort(s), a.sort(s), [...t, ...e, ...r, ...a];
+  const i = (s, h) => s.fragments.length > h.fragments.length ? -1 : 1;
+  return t.sort(i), e.sort(i), r.sort(i), a.sort(i), [...t, ...e, ...r, ...a];
 }
-function mt(n) {
+function wt(n) {
   const t = O(n), e = [];
   for (let r = 0; r < t.length; r++) {
     const a = t[r];
@@ -147,107 +148,124 @@ function mt(n) {
   }
   return e;
 }
-const wt = /(noopener|noreferrer) (noopener|noreferrer)/, yt = /^[\w-_]+:/;
-function gt(n, t, e = window) {
-  function r(s) {
-    return !s || s === n ? null : s.localName !== "a" || s.href === void 0 ? r(s.parentNode) : s;
+const yt = /(noopener|noreferrer) (noopener|noreferrer)/, gt = /^[\w-_]+:/;
+function bt(n, t, e = window) {
+  function r(i) {
+    return !i || i === n ? null : i.localName !== "a" || i.href === void 0 ? r(i.parentNode) : i;
   }
-  function a(s) {
-    if (s.button && s.button !== 0 || s.ctrlKey || s.metaKey || s.altKey || s.shiftKey || s.defaultPrevented)
+  function a(i) {
+    if (i.button && i.button !== 0 || i.ctrlKey || i.metaKey || i.altKey || i.shiftKey || i.defaultPrevented)
       return;
-    const i = r(s.target);
-    i && (e.location.protocol !== i.protocol || e.location.hostname !== i.hostname || e.location.port !== i.port || i.hasAttribute("data-router-ignore") || i.hasAttribute("download") || i.getAttribute("target") === "_blank" && wt.test(i.getAttribute("rel")) || yt.test(i.getAttribute("href")) || (s.preventDefault(), t(i)));
+    const s = r(i.target);
+    s && (e.location.protocol !== s.protocol || e.location.hostname !== s.hostname || e.location.port !== s.port || s.hasAttribute("data-router-ignore") || s.hasAttribute("download") || s.getAttribute("target") === "_blank" && yt.test(s.getAttribute("rel")) || gt.test(s.getAttribute("href")) || (i.preventDefault(), t(s)));
   }
   return n.addEventListener("click", a), function() {
     n.removeEventListener("click", a);
   };
 }
-function bt(n, t) {
+function $t(n, t) {
   for (const e in t) {
     const r = t[e].toString();
     n = n.replace(`{${e}}`, r).replace(`{#${e}}`, r);
   }
   return n;
 }
-const $t = Symbol(), vt = Symbol();
-var S, I, v, P, Q, j, k, L, b, m, Z, _, tt, N, F, K;
-class Pt {
+const vt = Symbol(), kt = Symbol();
+var S, I, v, j, Q, x, k, L, $, w, Z, _, tt, W, F, K;
+class xt {
   constructor(t) {
-    g(this, m);
-    g(this, S, nt("dolla.router"));
-    g(this, I, 0);
-    g(this, v, []);
-    g(this, P, []);
-    g(this, Q, !1);
-    g(this, j);
+    b(this, w);
+    b(this, S, nt("dolla.router"));
+    b(this, I, 0);
+    b(this, v, []);
+    b(this, j, []);
+    b(this, Q, !1);
+    b(this, x);
     /**
      * Use hash routing when true. Configured in router options.
      */
-    g(this, k, !1);
+    b(this, k, !1);
     /**
      * Cleanup functions to call on unmount.
      */
-    g(this, L, []);
+    b(this, L, []);
+    /**
+     * The current match object (internal).
+     */
+    b(this, $, R());
     /**
      * The current match object.
      */
-    g(this, b, M());
+    P(this, "$match", R(
+      () => {
+        const t = l(this, $).call(this);
+        if (t)
+          return {
+            path: t.path,
+            pattern: t.pattern,
+            params: { ...t.params },
+            query: { ...t.query },
+            data: t.meta.data ?? {}
+          };
+      },
+      { equals: ct }
+    ));
     /**
      * The currently matched route pattern, if any.
      */
-    A(this, "$pattern", M(() => {
+    P(this, "$pattern", R(() => {
       var t;
-      return (t = l(this, b).call(this)) == null ? void 0 : t.pattern;
+      return (t = l(this, $).call(this)) == null ? void 0 : t.pattern;
     }));
     /**
      * The current URL path.
      */
-    A(this, "$path", M(() => {
+    P(this, "$path", R(() => {
       var t;
-      return ((t = l(this, b).call(this)) == null ? void 0 : t.path) ?? window.location.pathname;
+      return ((t = l(this, $).call(this)) == null ? void 0 : t.path) ?? window.location.pathname;
     }));
     /**
      * The current named path params.
      */
-    A(this, "$params", M(() => {
+    P(this, "$params", R(() => {
       var t;
-      return ((t = l(this, b).call(this)) == null ? void 0 : t.params) ?? {};
+      return ((t = l(this, $).call(this)) == null ? void 0 : t.params) ?? {};
     }, { equals: B }));
     /**
      * The current query params.
      */
-    A(this, "$query", M(() => {
+    P(this, "$query", R(() => {
       var t;
-      return ((t = l(this, b).call(this)) == null ? void 0 : t.query) ?? {};
+      return ((t = l(this, $).call(this)) == null ? void 0 : t.query) ?? {};
     }, { equals: B }));
-    ht(t, "Options must be an object. Got: %t"), t.hash && q(this, k, !0), q(this, P, dt(
-      t.routes.flatMap((e) => y(this, m, K).call(this, e)).map((e) => ({
+    ft(t, "Options must be an object. Got: %t"), t.hash && M(this, k, !0), M(this, j, mt(
+      t.routes.flatMap((e) => g(this, w, K).call(this, e)).map((e) => ({
         pattern: e.pattern,
         meta: e.meta,
-        fragments: mt(e.pattern)
+        fragments: wt(e.pattern)
       }))
-    )), kt(l(this, P));
+    )), Et(l(this, j));
   }
-  async [$t](t, e) {
-    const r = M();
-    q(this, j, {
+  async [vt](t, e) {
+    const r = R();
+    M(this, x, {
       id: D(this, I)._++,
-      element: new st(e, r),
+      node: new st(e, r),
       context: e,
       $slot: r
     });
-    const a = () => y(this, m, N).call(this);
+    const a = () => g(this, w, W).call(this);
     return window.addEventListener("popstate", a), l(this, L).push(() => window.removeEventListener("popstate", a)), l(this, L).push(
-      gt(t, (s) => {
-        l(this, S).info("intercepted click on <a> tag", s);
-        const i = s.getAttribute("href"), h = s.getAttribute("data-router-preserve-query");
-        this.go(i, {
-          preserveQuery: Et(h)
+      bt(t, (i) => {
+        l(this, S).info("intercepted click on <a> tag", i);
+        const s = i.getAttribute("href"), h = i.getAttribute("data-router-preserve-query");
+        this.go(s, {
+          preserveQuery: qt(h)
         });
       })
-    ), l(this, S).info("will intercept clicks on <a> tags within parent element:", t), q(this, Q, !0), await y(this, m, N).call(this), l(this, j).element;
+    ), l(this, S).info("will intercept clicks on <a> tags within parent element:", t), M(this, Q, !0), await g(this, w, W).call(this), l(this, x).node;
   }
-  async [vt]() {
+  async [kt]() {
     for (const t of l(this, L))
       t();
     l(this, L).length = 0;
@@ -273,34 +291,34 @@ class Pt {
    */
   go(t, e = {}) {
     let r;
-    Array.isArray(t) ? r = W(t) : r = t.toString(), r = T(window.location.pathname, r), e.replace ? y(this, m, _).call(this, r, e) : y(this, m, Z).call(this, r, e);
+    Array.isArray(t) ? r = N(t) : r = t.toString(), r = T(window.location.pathname, r), e.replace ? g(this, w, _).call(this, r, e) : g(this, w, 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 = H(l(this, b)), r = { ...this.$query() };
-    for (const i in t) {
-      const h = t[i];
-      h === null ? delete r[i] : r[i] = h.toString();
+    const e = H(l(this, $)), r = { ...this.$query() };
+    for (const s in t) {
+      const h = t[s];
+      h === null ? delete r[s] : r[s] = h.toString();
     }
     let a = [];
-    for (const i in r)
-      a.push(`${i}=${r[i]}`);
-    const s = a.length > 0 ? "?" + a.join("&") : "";
-    l(this, b).call(this, { ...e, query: r }), window.history.replaceState(null, "", l(this, k) ? "/#" + e.path + s : e.path + s);
+    for (const s in r)
+      a.push(`${s}=${r[s]}`);
+    const i = a.length > 0 ? "?" + a.join("&") : "";
+    l(this, $).call(this, { ...e, query: r }), window.history.replaceState(null, "", l(this, k) ? "/#" + e.path + i : e.path + i);
   }
 }
-S = new WeakMap(), I = new WeakMap(), v = new WeakMap(), P = new WeakMap(), Q = new WeakMap(), j = new WeakMap(), k = new WeakMap(), L = new WeakMap(), b = new WeakMap(), m = new WeakSet(), Z = function(t, e) {
-  l(this, S).info("(push)", t), window.history.pushState(null, "", l(this, k) ? "/#" + t : t), y(this, m, N).call(this, t, e);
+S = new WeakMap(), I = new WeakMap(), v = new WeakMap(), j = new WeakMap(), Q = new WeakMap(), x = new WeakMap(), k = new WeakMap(), L = new WeakMap(), $ = new WeakMap(), w = new WeakSet(), Z = function(t, e) {
+  l(this, S).info("(push)", t), window.history.pushState(null, "", l(this, k) ? "/#" + t : t), g(this, w, W).call(this, t, e);
 }, _ = function(t, e) {
-  l(this, S).info("(replace)", t), window.history.replaceState(null, "", l(this, k) ? "/#" + t : t), y(this, m, N).call(this, t, e);
+  l(this, S).info("(replace)", t), window.history.replaceState(null, "", l(this, k) ? "/#" + t : t), g(this, w, W).call(this, t, e);
 }, tt = function() {
   return l(this, k) ? new URL(window.location.hash.slice(1), window.location.origin) : new URL(window.location.pathname, window.location.origin);
-}, N = async function(t, e = {}) {
-  const r = l(this, S), a = t ? new URL(t, window.location.origin) : y(this, m, tt).call(this), { match: s, journey: i, state: h } = await y(this, m, F).call(this, a);
-  for (let f = 0; f < i.length; f++) {
-    const c = i[f], u = `(update: step ${f + 1} of ${i.length})`;
+}, W = async function(t, e = {}) {
+  const r = l(this, S), a = t ? new URL(t, window.location.origin) : g(this, w, tt).call(this), { match: i, journey: s, state: h } = await g(this, w, F).call(this, a);
+  for (let p = 0; p < s.length; p++) {
+    const c = s[p], u = `(update: step ${p + 1} of ${s.length})`;
     switch (c.kind) {
       case "match":
         r == null || r.info(`${u} 📍 ${c.message}`);
@@ -313,119 +331,120 @@ S = new WeakMap(), I = new WeakMap(), v = new WeakMap(), P = new WeakMap(), Q =
         break;
     }
   }
-  if (!s) {
+  if (!i) {
     if (l(this, Q))
       throw r.crash(new Rt(`Failed to match route '${a.pathname}'`));
     return;
   }
-  let o = s.query, $ = [];
+  let o = i.query, d = [];
   if (e.preserveQuery === !0)
-    o = Object.assign({}, this.$query(), s.query);
+    o = Object.assign({}, this.$query(), i.query);
   else if (J(e.preserveQuery)) {
-    const f = {}, c = this.$query();
+    const p = {}, c = this.$query();
     for (const u in c)
-      e.preserveQuery.includes(u) && (f[u] = c[u]);
-    o = Object.assign({}, f, s.query);
+      e.preserveQuery.includes(u) && (p[u] = c[u]);
+    o = Object.assign({}, p, i.query);
   }
-  for (const f in o)
-    $.push(`${f}=${o[f]}`);
-  const p = $.length > 0 ? "?" + $.join("&") : "";
-  return (s.path !== location.pathname || location.search !== p) && window.history.replaceState(null, "", l(this, k) ? "/#" + s.path + p : s.path + p), it(() => {
-    const f = H(this.$pattern);
-    if (l(this, b).call(this, { ...s, query: o }), s.pattern === f) {
+  for (const p in o)
+    d.push(`${p}=${o[p]}`);
+  const f = d.length > 0 ? "?" + d.join("&") : "";
+  return (i.path !== location.pathname || location.search !== f) && window.history.replaceState(null, "", l(this, k) ? "/#" + i.path + f : i.path + f), lt(() => {
+    const p = H(this.$pattern);
+    if (l(this, $).call(this, { ...i, query: o }), i.pattern === p) {
       for (const u of l(this, v)) {
-        const d = h.get(u.id);
-        d && u.context.setState(d);
+        const m = h.get(u.id);
+        m && u.context.setState(m);
       }
       return;
     }
-    const c = s.meta.layers;
-    r.info("mounting", s);
+    const c = i.meta.layers;
+    r.info("mounting", i);
     for (let u = 0; u < c.length; u++) {
-      const d = c[u], w = l(this, v)[u];
-      if ((w == null ? void 0 : w.id) !== d.id) {
-        q(this, v, l(this, v).slice(0, u)), w == null || w.element.unmount();
-        const E = l(this, v).at(-1) ?? l(this, j), R = M(), x = new at(E.context, d.view, {
-          children: ot(ct.Dynamic, { source: R })
-        }), z = h.get(d.id);
-        z && x.context.setState(z), l(this, v).push({
-          id: d.id,
-          element: x,
-          context: x.context,
-          $slot: R
-        }), E.$slot(x);
+      const m = c[u], y = l(this, v)[u];
+      if ((y == null ? void 0 : y.id) !== m.id) {
+        M(this, v, l(this, v).slice(0, u)), y == null || y.node.unmount();
+        const E = l(this, v).at(-1) ?? l(this, x), q = R(), A = new it(E.context, m.view, {
+          children: at(ot.Dynamic, { source: q })
+        }), z = h.get(m.id);
+        z && A.context.setState(z), l(this, v).push({
+          id: m.id,
+          node: A,
+          context: A.context,
+          $slot: q
+        }), E.$slot(A);
       } else {
-        const E = h.get(w.id);
-        E && w.context.setState(E);
+        const E = h.get(y.id);
+        E && y.context.setState(E);
       }
     }
-  }), { match: s, journey: i };
+  }), { match: i, journey: s };
 }, F = async function(t, e = [], r = /* @__PURE__ */ new Map()) {
-  return new Promise((a, s) => {
-    var $;
-    const i = Y(l(this, P), t.pathname);
-    if (!i)
+  return new Promise((a, i) => {
+    var d;
+    const s = Y(l(this, j), t.pathname);
+    if (!s)
       return a({
         match: null,
         journey: [...e, { kind: "miss", message: `no match for '${t.pathname}'` }],
         state: r
       });
-    let h = i.meta.redirect;
+    let h = s.meta.redirect;
     const o = async () => {
       if (h != null) {
-        let p;
+        let f;
         if (U(h))
-          p = bt(h, i.params);
+          f = $t(h, s.params);
         else if (G(h)) {
-          const f = {
-            path: i.path,
-            pattern: i.pattern,
-            params: i.params,
-            query: i.query
+          const p = {
+            path: s.path,
+            pattern: s.pattern,
+            params: s.params,
+            query: s.query,
+            data: s.meta.data ?? {}
           };
-          if (p = await h(f), !U(p))
-            return s(new Error("Redirect function must return a path to redirect to."));
-          p.startsWith("/") || (p = T(i.path, p));
+          if (f = await h(p), !U(f))
+            return i(new Error("Redirect function must return a path to redirect to."));
+          f.startsWith("/") || (f = T(s.path, f));
         } else
-          return s(new TypeError("Redirect must either be a path string or a function."));
+          return i(new TypeError("Redirect must either be a path string or a function."));
         a(
-          y(this, m, F).call(this, new URL(p, window.location.origin), [
+          g(this, w, F).call(this, new URL(f, window.location.origin), [
             ...e,
-            { kind: "redirect", message: `redirecting '${i.path}' -> '${p}'` }
+            { kind: "redirect", message: `redirecting '${s.path}' -> '${f}'` }
           ])
         );
       } else
-        a({ match: i, journey: [...e, { kind: "match", message: `matched route '${i.path}'` }], state: r });
+        a({ match: s, journey: [...e, { kind: "match", message: `matched route '${s.path}'` }], state: r });
     };
-    if (($ = i.meta.beforeMatch) != null && $.length) {
-      const p = i.meta.beforeMatch;
-      let f = -1;
+    if ((d = s.meta.beforeMatch) != null && d.length) {
+      const f = s.meta.beforeMatch;
+      let p = -1;
       const c = () => {
-        if (f++, f === p.length)
+        if (p++, p === f.length)
           o();
         else {
           let u = !1;
-          const d = p[f].fn({
-            path: i.path,
-            pattern: i.pattern,
-            params: i.params,
-            query: i.query,
-            setState: (...w) => {
-              const E = p[f].layerId, R = [];
-              if (w.length === 1 && ft(J, w[0]))
-                R.push(...w[0]);
-              else if (w.length === 2)
-                R.push([w[0], w[1]]);
+          const m = f[p].fn({
+            path: s.path,
+            pattern: s.pattern,
+            params: s.params,
+            query: s.query,
+            data: s.meta.data ?? {},
+            setState: (...y) => {
+              const E = f[p].layerId, q = [];
+              if (y.length === 1 && pt(J, y[0]))
+                q.push(...y[0]);
+              else if (y.length === 2)
+                q.push([y[0], y[1]]);
               else
                 throw new Error("Invalid arguments.");
-              r.get(E) ? R.push(...R) : r.set(E, R);
+              r.get(E) ? q.push(...q) : r.set(E, q);
             },
-            redirect: (w) => {
-              h = w, u = !0, o();
+            redirect: (y) => {
+              h = y, u = !0, o();
             }
-            // next,
           });
-          u || (d instanceof Promise ? d.then(c) : c());
+          u || (m instanceof Promise ? m.then(c) : c());
         }
       };
       c();
@@ -451,38 +470,46 @@ K = function(t, e = [], r = []) {
   for (const o of e)
     a.push(...O(o.path));
   a.push(...O(t.path)), a[a.length - 1] === "*" && a.pop();
-  const s = [];
+  const i = [];
   if (t.redirect) {
     let o = t.redirect;
-    return U(o) && (o = T(W(a), o), o.startsWith("/") || (o = "/" + o)), s.push({
-      pattern: "/" + W([...a, ...O(t.path)]),
+    U(o) && (o = T(N(a), o), o.startsWith("/") || (o = "/" + o));
+    const d = {
+      pattern: "/" + N([...a, ...O(t.path)]),
       meta: {
         redirect: o
       }
-    }), s;
+    };
+    return i.push(d), i;
   }
-  let i = (o) => o.children;
+  let s = (o) => o.children;
   if (G(t.view))
-    i = t.view;
+    s = t.view;
   else if (t.view)
     throw new TypeError(`Route '${t.path}' expected a view function or undefined. Got: ${t.view}`);
-  const h = { id: D(this, I)._++, view: i };
+  const h = { id: D(this, I)._++, view: s };
   if (t.routes)
     for (const o of t.routes)
-      s.push(...y(this, m, K).call(this, o, [...e, t], [...r, h]));
-  else
-    s.push({
-      pattern: e.length ? W([...e.map((o) => o.path), t.path]) : t.path,
+      i.push(...g(this, w, K).call(this, o, [...e, t], [...r, h]));
+  else {
+    const o = {
+      pattern: e.length ? N([...e.map((d) => d.path), t.path]) : t.path,
       meta: {
         pattern: t.path,
         layers: [...r, h],
         // Store the layer ID with each beforeMatch so we can correlate which context needs to get any state that is set.
-        beforeMatch: e.flatMap((o, $) => o.beforeMatch ? { fn: o.beforeMatch, layerId: r[$].id } : null).concat(t.beforeMatch ? { fn: t.beforeMatch, layerId: h.id } : null).filter((o) => o != null)
+        beforeMatch: e.flatMap((d, f) => d.beforeMatch ? { fn: d.beforeMatch, layerId: r[f].id } : null).concat(t.beforeMatch ? { fn: t.beforeMatch, layerId: h.id } : null).filter((d) => d != null)
       }
-    });
-  return s;
+    };
+    if (t.data) {
+      const d = e.at(-1);
+      d ? o.meta.data = { ...d.data, ...t.data } : o.meta.data = t.data;
+    }
+    i.push(o);
+  }
+  return i;
 };
-function kt(n) {
+function Et(n) {
   for (const t of n)
     if (t.meta.redirect) {
       let e;
@@ -497,7 +524,7 @@ function kt(n) {
         throw new TypeError(`Expected a string or redirect function. Got: ${t.meta.redirect}`);
     }
 }
-function Et(n) {
+function qt(n) {
   if (n === null)
     return !1;
   if (n === !0 || n === !1)
@@ -509,8 +536,8 @@ function Et(n) {
 class Rt extends Error {
 }
 export {
-  $t as M,
-  Pt as R,
-  vt as U
+  vt as M,
+  xt as R,
+  kt as U
 };
-//# sourceMappingURL=router-BpuJQ6OA.js.map
+//# sourceMappingURL=router-CjCkk4dA.js.map