@argon-router/core 0.6.3 → 0.8.0

package/dist/index.js

@@ -1,5 +1,5 @@
-import { createEffect as A, createStore as v, createEvent as m, sample as y, split as Q, attach as _, scopeBind as E } from "effector";
-function q(e, t) {
+import { createEffect as S, createStore as k, createEvent as g, sample as h, split as V, attach as K, scopeBind as N } from "effector";
+function C(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -9,25 +9,25 @@ function q(e, t) {
   }
   return r;
 }
-function $(e) {
+function P(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? q(Object(r), !0).forEach(function(n) {
-      ie(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : q(Object(r)).forEach(function(n) {
+    t % 2 ? C(Object(r), !0).forEach(function(n) {
+      ne(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : C(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function ie(e, t, r) {
-  return (t = se(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
+function ne(e, t, r) {
+  return (t = ae(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
 }
-function se(e) {
-  var t = ce(e, "string");
+function ae(e) {
+  var t = oe(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function ce(e, t) {
+function oe(e, t) {
   if (typeof e != "object" || !e) return e;
   var r = e[Symbol.toPrimitive];
   if (r !== void 0) {
@@ -37,62 +37,62 @@ function ce(e, t) {
   }
   return (t === "string" ? String : Number)(e);
 }
-function _e(e) {
+function ze(e) {
   let t;
-  const r = A(() => {
-    var h;
-    return (h = t) === null || h === void 0 ? void 0 : h();
+  const r = S(() => {
+    var m;
+    return (m = t) === null || m === void 0 ? void 0 : m();
   }, {
     name: "waitForAsyncBundleFx",
     sid: "-au0m0h"
-  }), n = A(async () => {
-    for (const u of (h = e.beforeOpen) !== null && h !== void 0 ? h : []) {
-      var h;
-      await u();
+  }), n = S(async () => {
+    for (const j of (m = e.beforeOpen) !== null && m !== void 0 ? m : []) {
+      var m;
+      await j();
     }
   }, {
     name: "beforeOpenFx",
     sid: "-iy13uf"
-  }), a = A(async (h) => {
+  }), a = S(async (m) => {
     await r(), await n();
-    const u = e.parent;
-    return u && await u.internal.openFx($($({}, h ?? {
+    const j = e.parent;
+    return j && await j.internal.openFx(P(P({}, m ?? {
       params: {}
     }), {}, {
       navigate: !1
-    })), h;
+    })), m;
   }, {
     name: "openFx",
     sid: "cbmc2y"
-  }), o = v({}, {
+  }), o = k({}, {
     name: "$params",
     sid: "-cxehz9"
-  }), i = v(!1, {
+  }), i = k(!1, {
     name: "$isOpened",
     sid: "-561dht"
-  }), s = a.pending, c = m({
+  }), s = a.pending, c = g({
     name: "open",
     sid: "hyxmmx"
-  }), j = m({
+  }), d = g({
     name: "close",
     sid: "-wvbr5n"
-  }), w = m({
+  }), b = g({
     name: "opened",
     sid: "-qni80y"
-  }), p = m({
+  }), u = g({
     name: "openedOnServer",
     sid: "eh9oki"
-  }), l = m({
+  }), y = g({
     name: "openedOnClient",
     sid: "eet6mh"
-  }), d = m({
+  }), l = g({
     name: "navigated",
     sid: "-rnvpuc"
-  }), g = m({
+  }), f = g({
     name: "closed",
     sid: "w9iziz"
   });
-  y({
+  h({
     and: [{
       clock: c,
       target: a
@@ -101,67 +101,67 @@ function _e(e) {
       sid: "u86cfp"
     }
   });
-  const S = {};
-  return y({
+  const p = {};
+  return h({
     and: [{
-      clock: d,
-      fn: (h) => h && "params" in h ? $({}, h.params) : S,
+      clock: l,
+      fn: (m) => m && "params" in m ? P({}, m.params) : p,
       target: o
     }],
     or: {
       sid: "ymu9q6"
     }
-  }), Q({
+  }), V({
     and: [{
-      source: d,
+      source: l,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: p,
-        client: l
+        server: u,
+        client: y
       }
     }],
     or: {
       sid: "z4zhb3"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: [l, p],
-      target: w
+      clock: [y, u],
+      target: b
     }],
     or: {
       sid: "-zf2y9u"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: j,
-      target: g
+      clock: d,
+      target: f
     }],
     or: {
       sid: "-z0saug"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: [w.map(() => !0), g.map(() => !1)],
+      clock: [b.map(() => !0), f.map(() => !1)],
       target: i
     }],
     or: {
       sid: "-yy1bvn"
     }
-  }), $($({
+  }), P(P({
     $params: o,
     $isOpened: i,
     $isPending: s,
     open: c,
-    closed: g,
-    opened: w,
-    openedOnClient: l,
-    openedOnServer: p
+    closed: f,
+    opened: b,
+    openedOnClient: y,
+    openedOnServer: u
   }, e), {}, {
     internal: {
-      navigated: d,
-      close: j,
+      navigated: l,
+      close: d,
       openFx: a,
-      setAsyncImport: (h) => t = h
+      setAsyncImport: (m) => t = m
     },
     "@@unitShape": () => ({
       params: o,
@@ -171,20 +171,20 @@ function _e(e) {
     })
   });
 }
-const ue = Symbol("any"), fe = Symbol("number"), le = Symbol("string"), de = Symbol("array"), pe = Symbol("boolean"), P = {
-  any: ue,
-  number: fe,
-  string: le,
-  array: de,
-  boolean: pe
+const ie = Symbol("any"), se = Symbol("number"), ce = Symbol("string"), ue = Symbol("array"), fe = Symbol("boolean"), w = {
+  any: ie,
+  number: se,
+  string: ce,
+  array: ue,
+  boolean: fe
 };
-function B(e, t) {
+function D(e, t) {
   for (const r of e)
     if (t.includes(r))
       return !0;
   return !1;
 }
-function T(e, t) {
+function z(e, t) {
   for (const r in t) {
     const n = t[r];
     if (Array.isArray(n) && (!e[r] || JSON.stringify(n) !== e[r]))
@@ -212,27 +212,27 @@ function T(e, t) {
       }
     }
     switch (n) {
-      case P.any: {
+      case w.any: {
         if (!e[r])
           return !1;
         break;
       }
-      case P.string: {
+      case w.string: {
         if (!e[r] || Array.isArray(e[r]))
           return !1;
         break;
       }
-      case P.array: {
+      case w.array: {
         if (!e[r] || !Array.isArray(e[r]))
           return !1;
         break;
       }
-      case P.number: {
+      case w.number: {
         if (!e[r] || Array.isArray(e[r]) || isNaN(parseInt(e[r])) && isNaN(parseFloat(e[r])))
           return !1;
         break;
       }
-      case P.boolean: {
+      case w.boolean: {
         if (!e[r] || Array.isArray(e[r]) || !["0", "1", "false", "true"].includes(e[r]))
           return !1;
         break;
@@ -241,7 +241,7 @@ function T(e, t) {
   }
   return !0;
 }
-function me(e, t) {
+function le(e, t) {
   const r = {};
   for (const n in t) {
     const a = t[n], o = e[n];
@@ -267,18 +267,18 @@ function me(e, t) {
       }
     }
     switch (a) {
-      case P.any:
-      case P.string:
-      case P.array: {
+      case w.any:
+      case w.string:
+      case w.array: {
         r[n] = e[n];
         break;
       }
-      case P.number: {
+      case w.number: {
         const i = e[n];
         r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
         break;
       }
-      case P.boolean: {
+      case w.boolean: {
         const i = e[n];
         r[n] = i === "1" || i === "true";
         break;
@@ -287,7 +287,21 @@ function me(e, t) {
   }
   return r;
 }
-function ye(e) {
+function de(e) {
+  let {
+    $query: t,
+    navigate: r
+  } = e;
+  return L({
+    $activeRoutes: k([], {
+      name: "$activeRoutes",
+      sid: "7ol7tr"
+    }),
+    $query: t,
+    navigate: r
+  });
+}
+function L(e) {
   let {
     $activeRoutes: t,
     $query: r,
@@ -297,86 +311,86 @@ function ye(e) {
     const {
       parameters: o,
       forRoutes: i
-    } = a, s = v(!1, {
+    } = a, s = k(!1, {
       name: "$entered",
-      sid: "lde75p"
-    }), c = m({
+      sid: "-okbvx4"
+    }), c = g({
       name: "entered",
-      sid: "-ggrer9"
-    }), j = m({
+      sid: "-1bbi51"
+    }), d = g({
       name: "exited",
-      sid: "xzl0hy"
-    }), w = m({
+      sid: "-lw34uy"
+    }), b = g({
       name: "exit",
-      sid: "-9k6g49"
-    }), p = m({
+      sid: "5l9ghz"
+    }), u = g({
       name: "changeEntered",
-      sid: "-ibka8"
+      sid: "en4cc0"
     });
-    return y({
+    return h({
       and: [{
-        clock: p,
+        clock: u,
         target: s
       }],
       or: {
-        sid: "-hadp7p"
+        sid: "-gssa85"
       }
-    }), y({
+    }), h({
       and: [{
         source: {
           activeRoutes: t,
           query: r
         },
-        filter: (l) => {
+        filter: (y) => {
           let {
-            activeRoutes: d,
-            query: g
-          } = l;
-          return (!i || B(i, d)) && T(g, o);
+            activeRoutes: l,
+            query: f
+          } = y;
+          return (!i || D(i, l)) && z(f, o);
         },
-        fn: (l) => {
+        fn: (y) => {
           let {
-            query: d
-          } = l;
-          return me(d, o);
+            query: l
+          } = y;
+          return le(l, o);
         },
-        target: [c, p.prepend(() => !0)]
+        target: [c, u.prepend(() => !0)]
       }],
       or: {
-        sid: "-gw31sb"
+        sid: "-gehmsr"
       }
-    }), y({
+    }), h({
       and: [{
         source: {
           activeRoutes: t,
           query: r,
           entered: s
         },
-        filter: (l) => {
+        filter: (y) => {
           let {
-            activeRoutes: d,
-            query: g,
-            entered: S
-          } = l;
-          return S && !((!i || B(i, d)) && T(g, o));
+            activeRoutes: l,
+            query: f,
+            entered: p
+          } = y;
+          return p && !((!i || D(i, l)) && z(f, o));
         },
-        target: [j.prepend(() => {
-        }), p.prepend(() => !1)]
+        target: [d.prepend(() => {
+        }), u.prepend(() => !1)]
       }],
       or: {
-        sid: "-gfl7zh"
+        sid: "-fxzszx"
       }
-    }), y({
+    }), h({
       and: [{
-        clock: w,
+        clock: b,
         source: r,
-        fn: (l, d) => {
-          if (d && d.ignoreParams) {
-            const g = {};
-            for (const S of d.ignoreParams)
-              l[S] && (g[S] = l[S]);
+        fn: (y, l) => {
+          if (l && l.ignoreParams) {
+            const f = {};
+            for (const p of l.ignoreParams)
+              y[p] && (f[p] = y[p]);
             return {
-              query: g
+              query: f
             };
           }
           return {
@@ -386,17 +400,251 @@ function ye(e) {
         target: n
       }],
       or: {
-        sid: "-fwcf7u"
+        sid: "-fer08a"
       }
     }), {
       entered: c,
-      exited: j,
-      exit: w
+      exited: d,
+      exit: b
     };
   };
 }
-const G = "%[a-f0-9]{2}", H = new RegExp("(" + G + ")|([^%]+?)", "gi"), V = new RegExp("(" + G + ")+", "gi");
-function D(e, t) {
+function pe(e) {
+  return (t) => {
+    const r = t.split("/").map((s) => s.trim()).filter((s) => s !== "");
+    let n = null;
+    function a(s, c) {
+      n || (n = {}), n[s] = c;
+    }
+    if (e.length === 0) return r.length === 0 ? {
+      path: t,
+      params: null
+    } : null;
+    for (let s = 0; s < e.length; s++) {
+      const c = e[s];
+      switch (c.type) {
+        case "const": {
+          if (c.name !== r.shift()) return null;
+          continue;
+        }
+        case "parameter": {
+          const {
+            arrayProps: d,
+            genericProps: b,
+            required: u
+          } = c.payload;
+          if (d) {
+            var o;
+            const l = [];
+            let f;
+            for (; ; ) {
+              var i;
+              if (f = r.shift(), !f) break;
+              switch (b == null ? void 0 : b.type) {
+                case "number": {
+                  if (isNaN(+f)) return null;
+                  l.push(+f);
+                  break;
+                }
+                case "union": {
+                  if (!b.items.includes(f)) return null;
+                  l.push(f);
+                  break;
+                }
+                default: {
+                  l.push(f);
+                  break;
+                }
+              }
+              if (l.length >= ((i = d.max) !== null && i !== void 0 ? i : 1 / 0)) break;
+            }
+            if (l.length < ((o = d.min) !== null && o !== void 0 ? o : 0) || r.length > 0 && !e[s + 1]) return null;
+            a(c.name, l);
+            break;
+          }
+          const y = r.shift();
+          if (u && !y) return null;
+          if (!y) {
+            a(c.name, void 0);
+            continue;
+          }
+          switch (b == null ? void 0 : b.type) {
+            case "number": {
+              if (isNaN(+y)) return null;
+              a(c.name, +y);
+              break;
+            }
+            case "union": {
+              if (!b.items.includes(y)) return null;
+              a(c.name, y);
+              break;
+            }
+            default: {
+              a(c.name, y);
+              break;
+            }
+          }
+        }
+      }
+    }
+    return r.length > 0 ? null : {
+      path: t,
+      params: n
+    };
+  };
+}
+function me(e) {
+  if (!e) return null;
+  const t = e[1];
+  let r, n, a;
+  for (const o of e.slice(2)) if (o) {
+    if (o.includes("<")) {
+      r = o.replace("<", "").replace(">", "");
+      continue;
+    }
+    if (o.includes("{") && (n = o.replace("{", "").replace("}", "").split(",").map((i) => parseInt(i))), ["*", "?", "+"].includes(o)) {
+      a = o;
+      continue;
+    }
+  }
+  return {
+    name: t,
+    genericProps: r,
+    arrayProps: n,
+    modificator: a
+  };
+}
+function ye(e) {
+  return (t) => {
+    const r = [];
+    if (e.length === 0) return "/";
+    for (const n of e) switch (n.type) {
+      case "const": {
+        r.push(n.name);
+        break;
+      }
+      case "parameter": {
+        if (!t[n.name]) continue;
+        if (Array.isArray(t[n.name])) for (const a of t[n.name]) r.push(a.toString());
+        else r.push(t[n.name].toString());
+        break;
+      }
+    }
+    return "/".concat(r.join("/"));
+  };
+}
+function q(e, t) {
+  var r = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var n = Object.getOwnPropertySymbols(e);
+    t && (n = n.filter(function(a) {
+      return Object.getOwnPropertyDescriptor(e, a).enumerable;
+    })), r.push.apply(r, n);
+  }
+  return r;
+}
+function U(e) {
+  for (var t = 1; t < arguments.length; t++) {
+    var r = arguments[t] != null ? arguments[t] : {};
+    t % 2 ? q(Object(r), !0).forEach(function(n) {
+      be(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : q(Object(r)).forEach(function(n) {
+      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
+    });
+  }
+  return e;
+}
+function be(e, t, r) {
+  return (t = ge(t)) in e ? Object.defineProperty(e, t, {
+    value: r,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[t] = r, e;
+}
+function ge(e) {
+  var t = he(e, "string");
+  return typeof t == "symbol" ? t : t + "";
+}
+function he(e, t) {
+  if (typeof e != "object" || !e) return e;
+  var r = e[Symbol.toPrimitive];
+  if (r !== void 0) {
+    var n = r.call(e, t);
+    if (typeof n != "object") return n;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (t === "string" ? String : Number)(e);
+}
+function Oe(e) {
+  const t = [], r = /:(\w+)(<[\w|]+>)?({\d+\,\d+})?([+*?])?/, n = e.split("/").filter(Boolean);
+  for (let a = 0; a < n.length; a++) {
+    const o = n[a];
+    if (!o) continue;
+    const i = me(o.match(r));
+    if (!i) {
+      t.push({
+        type: "const",
+        name: o,
+        payload: void 0
+      });
+      continue;
+    }
+    const {
+      arrayProps: s,
+      genericProps: c,
+      modificator: d,
+      name: b
+    } = i;
+    if (!b) throw new Error('Invalid path: "'.concat(e, '". Name for argument must be provided'));
+    const u = {
+      type: "parameter",
+      name: b,
+      payload: {
+        required: !0
+      }
+    };
+    switch (c && c === "number" && (u.payload.genericProps = {
+      type: "number"
+    }), c && c.includes("|") && (u.payload.genericProps = {
+      type: "union",
+      items: c.split("|")
+    }), d) {
+      case "*": {
+        u.payload.arrayProps = {};
+        break;
+      }
+      case "+": {
+        u.payload.arrayProps = {
+          min: 1
+        };
+        break;
+      }
+      case "?": {
+        u.payload.required = !1;
+        break;
+      }
+    }
+    s && (u.payload.arrayProps = U(U({}, u.payload.arrayProps), {}, {
+      min: s[0],
+      max: s[1]
+    })), t.push(u);
+  }
+  return {
+    /**
+     * @param input Input path
+     * @returns `{ path: string; params: Params }` | `null`
+     */
+    parse: pe(t),
+    /**
+     * @param params Route parameters
+     * @returns string
+     */
+    build: ye(t)
+  };
+}
+const M = "%[a-f0-9]{2}", B = new RegExp("(" + M + ")|([^%]+?)", "gi"), _ = new RegExp("(" + M + ")+", "gi");
+function A(e, t) {
   try {
     return [decodeURIComponent(e.join(""))];
   } catch {
@@ -405,32 +653,32 @@ function D(e, t) {
     return e;
   t = t || 1;
   const r = e.slice(0, t), n = e.slice(t);
-  return Array.prototype.concat.call([], D(r), D(n));
+  return Array.prototype.concat.call([], A(r), A(n));
 }
-function be(e) {
+function we(e) {
   try {
     return decodeURIComponent(e);
   } catch {
-    let t = e.match(H) || [];
+    let t = e.match(B) || [];
     for (let r = 1; r < t.length; r++)
-      e = D(t, r).join(""), t = e.match(H) || [];
+      e = A(t, r).join(""), t = e.match(B) || [];
     return e;
   }
 }
-function ge(e) {
+function Fe(e) {
   const t = {
     "%FE%FF": "��",
     "%FF%FE": "��"
   };
-  let r = V.exec(e);
+  let r = _.exec(e);
   for (; r; ) {
     try {
       t[r[0]] = decodeURIComponent(r[0]);
     } catch {
-      const a = be(r[0]);
+      const a = we(r[0]);
       a !== r[0] && (t[r[0]] = a);
     }
-    r = V.exec(e);
+    r = _.exec(e);
   }
   t["%C2"] = "�";
   const n = Object.keys(t);
@@ -438,16 +686,16 @@ function ge(e) {
     e = e.replace(new RegExp(a, "g"), t[a]);
   return e;
 }
-function he(e) {
+function je(e) {
   if (typeof e != "string")
     throw new TypeError("Expected `encodedURI` to be of type `string`, got `" + typeof e + "`");
   try {
     return decodeURIComponent(e);
   } catch {
-    return ge(e);
+    return Fe(e);
   }
 }
-function Oe(e, t) {
+function ke(e, t) {
   const r = {};
   if (Array.isArray(t))
     for (const n of t) {
@@ -464,7 +712,7 @@ function Oe(e, t) {
     }
   return r;
 }
-function W(e, t) {
+function Q(e, t) {
   if (!(typeof e == "string" && typeof t == "string"))
     throw new TypeError("Expected the arguments to be of type `string`");
   if (e === "" || t === "")
@@ -472,8 +720,8 @@ function W(e, t) {
   const r = e.indexOf(t);
   return r === -1 ? [] : [e.slice(0, r), e.slice(r + t.length)];
 }
-const we = (e) => e == null, je = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), C = Symbol("encodeFragmentIdentifier");
-function Fe(e) {
+const Se = (e) => e == null, Pe = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), E = Symbol("encodeFragmentIdentifier");
+function ve(e) {
   switch (e.arrayFormat) {
     case "index":
       return (t) => (r, n) => {
@@ -494,7 +742,7 @@ function Fe(e) {
       return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, O(t, e)] : [...r, [O(t, e), "=", O(n, e)].join("")];
   }
 }
-function Se(e) {
+function xe(e) {
   let t;
   switch (e.arrayFormat) {
     case "index":
@@ -532,19 +780,19 @@ function Se(e) {
     case "comma":
     case "separator":
       return (r, n, a) => {
-        const o = typeof n == "string" && n.includes(e.arrayFormatSeparator), i = typeof n == "string" && !o && k(n, e).includes(e.arrayFormatSeparator);
-        n = i ? k(n, e) : n;
-        const s = o || i ? n.split(e.arrayFormatSeparator).map((c) => k(c, e)) : n === null ? n : k(n, e);
+        const o = typeof n == "string" && n.includes(e.arrayFormatSeparator), i = typeof n == "string" && !o && F(n, e).includes(e.arrayFormatSeparator);
+        n = i ? F(n, e) : n;
+        const s = o || i ? n.split(e.arrayFormatSeparator).map((c) => F(c, e)) : n === null ? n : F(n, e);
         a[r] = s;
       };
     case "bracket-separator":
       return (r, n, a) => {
         const o = /(\[])$/.test(r);
         if (r = r.replace(/\[]$/, ""), !o) {
-          a[r] = n && k(n, e);
+          a[r] = n && F(n, e);
           return;
         }
-        const i = n === null ? [] : k(n, e).split(e.arrayFormatSeparator);
+        const i = n === null ? [] : F(n, e).split(e.arrayFormatSeparator);
         if (a[r] === void 0) {
           a[r] = i;
           return;
@@ -561,37 +809,37 @@ function Se(e) {
       };
   }
 }
-function X(e) {
+function J(e) {
   if (typeof e != "string" || e.length !== 1)
     throw new TypeError("arrayFormatSeparator must be single character string");
 }
 function O(e, t) {
-  return t.encode ? t.strict ? je(e) : encodeURIComponent(e) : e;
+  return t.encode ? t.strict ? Pe(e) : encodeURIComponent(e) : e;
 }
-function k(e, t) {
-  return t.decode ? he(e) : e;
+function F(e, t) {
+  return t.decode ? je(e) : e;
 }
-function Y(e) {
-  return Array.isArray(e) ? e.sort() : typeof e == "object" ? Y(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
+function G(e) {
+  return Array.isArray(e) ? e.sort() : typeof e == "object" ? G(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
 }
-function Z(e) {
+function W(e) {
   const t = e.indexOf("#");
   return t !== -1 && (e = e.slice(0, t)), e;
 }
-function Pe(e) {
+function $e(e) {
   let t = "";
   const r = e.indexOf("#");
   return r !== -1 && (t = e.slice(r)), t;
 }
-function K(e, t, r) {
+function T(e, t, r) {
   return r === "string" && typeof e == "string" ? e : typeof r == "function" && typeof e == "string" ? r(e) : t.parseBooleans && e !== null && (e.toLowerCase() === "true" || e.toLowerCase() === "false") ? e.toLowerCase() === "true" : r === "number" && !Number.isNaN(Number(e)) && typeof e == "string" && e.trim() !== "" || t.parseNumbers && !Number.isNaN(Number(e)) && typeof e == "string" && e.trim() !== "" ? Number(e) : e;
 }
-function z(e) {
-  e = Z(e);
+function R(e) {
+  e = W(e);
   const t = e.indexOf("?");
   return t === -1 ? "" : e.slice(t + 1);
 }
-function U(e, t) {
+function I(e, t) {
   t = {
     decode: !0,
     sort: !0,
@@ -601,30 +849,30 @@ function U(e, t) {
     parseBooleans: !1,
     types: /* @__PURE__ */ Object.create(null),
     ...t
-  }, X(t.arrayFormatSeparator);
-  const r = Se(t), n = /* @__PURE__ */ Object.create(null);
+  }, J(t.arrayFormatSeparator);
+  const r = xe(t), n = /* @__PURE__ */ Object.create(null);
   if (typeof e != "string" || (e = e.trim().replace(/^[?#&]/, ""), !e))
     return n;
   for (const a of e.split("&")) {
     if (a === "")
       continue;
     const o = t.decode ? a.replaceAll("+", " ") : a;
-    let [i, s] = W(o, "=");
-    i === void 0 && (i = o), s = s === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? s : k(s, t), r(k(i, t), s, n);
+    let [i, s] = Q(o, "=");
+    i === void 0 && (i = o), s = s === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? s : F(s, t), r(F(i, t), s, n);
   }
   for (const [a, o] of Object.entries(n))
     if (typeof o == "object" && o !== null && t.types[a] !== "string")
       for (const [i, s] of Object.entries(o)) {
         const c = t.types[a] ? t.types[a].replace("[]", "") : void 0;
-        o[i] = K(s, t, c);
+        o[i] = T(s, t, c);
       }
-    else typeof o == "object" && o !== null && t.types[a] === "string" ? n[a] = Object.values(o).join(t.arrayFormatSeparator) : n[a] = K(o, t, t.types[a]);
+    else typeof o == "object" && o !== null && t.types[a] === "string" ? n[a] = Object.values(o).join(t.arrayFormatSeparator) : n[a] = T(o, t, t.types[a]);
   return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, o) => {
     const i = n[o];
-    return a[o] = i && typeof i == "object" && !Array.isArray(i) ? Y(i) : i, a;
+    return a[o] = i && typeof i == "object" && !Array.isArray(i) ? G(i) : i, a;
   }, /* @__PURE__ */ Object.create(null));
 }
-function ee(e, t) {
+function X(e, t) {
   if (!e)
     return "";
   t = {
@@ -633,8 +881,8 @@ function ee(e, t) {
     arrayFormat: "none",
     arrayFormatSeparator: ",",
     ...t
-  }, X(t.arrayFormatSeparator);
-  const r = (i) => t.skipNull && we(e[i]) || t.skipEmptyString && e[i] === "", n = Fe(t), a = {};
+  }, J(t.arrayFormatSeparator);
+  const r = (i) => t.skipNull && Se(e[i]) || t.skipEmptyString && e[i] === "", n = ve(t), a = {};
   for (const [i, s] of Object.entries(e))
     r(i) || (a[i] = s);
   const o = Object.keys(a);
@@ -643,199 +891,75 @@ function ee(e, t) {
     return s === void 0 ? "" : s === null ? O(i, t) : Array.isArray(s) ? s.length === 0 && t.arrayFormat === "bracket-separator" ? O(i, t) + "[]" : s.reduce(n(i), []).join("&") : O(i, t) + "=" + O(s, t);
   }).filter((i) => i.length > 0).join("&");
 }
-function re(e, t) {
+function Y(e, t) {
   var a;
   t = {
     decode: !0,
     ...t
   };
-  let [r, n] = W(e, "#");
+  let [r, n] = Q(e, "#");
   return r === void 0 && (r = e), {
     url: ((a = r == null ? void 0 : r.split("?")) == null ? void 0 : a[0]) ?? "",
-    query: U(z(e), t),
+    query: I(R(e), t),
     ...t && t.parseFragmentIdentifier && n ? {
-      fragmentIdentifier: k(n, t)
+      fragmentIdentifier: F(n, t)
     } : {}
   };
 }
-function te(e, t) {
+function Z(e, t) {
   t = {
     encode: !0,
     strict: !0,
-    [C]: !0,
+    [E]: !0,
     ...t
   };
-  const r = Z(e.url).split("?")[0] || "", n = z(e.url), a = {
-    ...U(n, {
+  const r = W(e.url).split("?")[0] || "", n = R(e.url), a = {
+    ...I(n, {
       sort: !1
     }),
     ...e.query
   };
-  let o = ee(a, t);
+  let o = X(a, t);
   o && (o = `?${o}`);
-  let i = Pe(e.url);
+  let i = $e(e.url);
   if (typeof e.fragmentIdentifier == "string") {
     const s = new URL(r);
-    s.hash = e.fragmentIdentifier, i = t[C] ? s.hash : `#${e.fragmentIdentifier}`;
+    s.hash = e.fragmentIdentifier, i = t[E] ? s.hash : `#${e.fragmentIdentifier}`;
   }
   return `${r}${o}${i}`;
 }
-function ne(e, t, r) {
+function ee(e, t, r) {
   r = {
     parseFragmentIdentifier: !0,
-    [C]: !1,
+    [E]: !1,
     ...r
   };
   const {
     url: n,
     query: a,
     fragmentIdentifier: o
-  } = re(e, r);
-  return te({
+  } = Y(e, r);
+  return Z({
     url: n,
-    query: Oe(a, t),
+    query: ke(a, t),
     fragmentIdentifier: o
   }, r);
 }
-function ke(e, t, r) {
+function Ne(e, t, r) {
   const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, o) => !t(a, o);
-  return ne(e, n, r);
+  return ee(e, n, r);
 }
-const R = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const x = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  exclude: ke,
-  extract: z,
-  parse: U,
-  parseUrl: re,
-  pick: ne,
-  stringify: ee,
-  stringifyUrl: te
+  exclude: Ne,
+  extract: R,
+  parse: I,
+  parseUrl: Y,
+  pick: ee,
+  stringify: X,
+  stringifyUrl: Z
 }, Symbol.toStringTag, { value: "Module" }));
-function xe(e) {
-  return (t) => {
-    const r = t.split("/").map((s) => s.trim()).filter((s) => s !== "");
-    let n = null;
-    function a(s, c) {
-      n || (n = {}), n[s] = c;
-    }
-    if (e.length === 0) return r.length === 0 ? {
-      path: t,
-      params: null
-    } : null;
-    for (let s = 0; s < e.length; s++) {
-      const c = e[s];
-      switch (c.type) {
-        case "const": {
-          if (c.name !== r.shift()) return null;
-          continue;
-        }
-        case "parameter": {
-          const {
-            arrayProps: j,
-            genericProps: w,
-            required: p
-          } = c.payload;
-          if (j) {
-            var o;
-            const d = [];
-            let g;
-            for (; ; ) {
-              var i;
-              if (g = r.shift(), !g) break;
-              switch (w == null ? void 0 : w.type) {
-                case "number": {
-                  if (isNaN(+g)) return null;
-                  d.push(+g);
-                  break;
-                }
-                case "union": {
-                  if (!w.items.includes(g)) return null;
-                  d.push(g);
-                  break;
-                }
-                default: {
-                  d.push(g);
-                  break;
-                }
-              }
-              if (d.length >= ((i = j.max) !== null && i !== void 0 ? i : 1 / 0)) break;
-            }
-            if (d.length < ((o = j.min) !== null && o !== void 0 ? o : 0) || r.length > 0 && !e[s + 1]) return null;
-            a(c.name, d);
-            break;
-          }
-          const l = r.shift();
-          if (p && !l) return null;
-          if (!l) {
-            a(c.name, void 0);
-            continue;
-          }
-          switch (w == null ? void 0 : w.type) {
-            case "number": {
-              if (isNaN(+l)) return null;
-              a(c.name, +l);
-              break;
-            }
-            case "union": {
-              if (!w.items.includes(l)) return null;
-              a(c.name, l);
-              break;
-            }
-            default: {
-              a(c.name, l);
-              break;
-            }
-          }
-        }
-      }
-    }
-    return r.length > 0 ? null : {
-      path: t,
-      params: n
-    };
-  };
-}
-function ve(e) {
-  if (!e) return null;
-  const t = e[1];
-  let r, n, a;
-  for (const o of e.slice(2)) if (o) {
-    if (o.includes("<")) {
-      r = o.replace("<", "").replace(">", "");
-      continue;
-    }
-    if (o.includes("{") && (n = o.replace("{", "").replace("}", "").split(",").map((i) => parseInt(i))), ["*", "?", "+"].includes(o)) {
-      a = o;
-      continue;
-    }
-  }
-  return {
-    name: t,
-    genericProps: r,
-    arrayProps: n,
-    modificator: a
-  };
-}
-function Ne(e) {
-  return (t) => {
-    const r = [];
-    if (e.length === 0) return "/";
-    for (const n of e) switch (n.type) {
-      case "const": {
-        r.push(n.name);
-        break;
-      }
-      case "parameter": {
-        if (!t[n.name]) continue;
-        if (Array.isArray(t[n.name])) for (const a of t[n.name]) r.push(a.toString());
-        else r.push(t[n.name].toString());
-        break;
-      }
-    }
-    return "/".concat(r.join("/"));
-  };
-}
-function L(e, t) {
+function H(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -845,135 +969,25 @@ function L(e, t) {
   }
   return r;
 }
-function M(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? L(Object(r), !0).forEach(function(n) {
-      $e(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : L(Object(r)).forEach(function(n) {
-      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
-    });
-  }
-  return e;
-}
-function $e(e, t, r) {
-  return (t = Ae(t)) in e ? Object.defineProperty(e, t, {
-    value: r,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[t] = r, e;
-}
-function Ae(e) {
-  var t = Ee(e, "string");
-  return typeof t == "symbol" ? t : t + "";
-}
-function Ee(e, t) {
-  if (typeof e != "object" || !e) return e;
-  var r = e[Symbol.toPrimitive];
-  if (r !== void 0) {
-    var n = r.call(e, t);
-    if (typeof n != "object") return n;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (t === "string" ? String : Number)(e);
-}
-function Re(e) {
-  const t = [], r = /:(\w+)(<[\w|]+>)?({\d+\,\d+})?([+*?])?/, n = e.split("/").filter(Boolean);
-  for (let a = 0; a < n.length; a++) {
-    const o = n[a];
-    if (!o) continue;
-    const i = ve(o.match(r));
-    if (!i) {
-      t.push({
-        type: "const",
-        name: o,
-        payload: void 0
-      });
-      continue;
-    }
-    const {
-      arrayProps: s,
-      genericProps: c,
-      modificator: j,
-      name: w
-    } = i;
-    if (!w) throw new Error('Invalid path: "'.concat(e, '". Name for argument must be provided'));
-    const p = {
-      type: "parameter",
-      name: w,
-      payload: {
-        required: !0
-      }
-    };
-    switch (c && c === "number" && (p.payload.genericProps = {
-      type: "number"
-    }), c && c.includes("|") && (p.payload.genericProps = {
-      type: "union",
-      items: c.split("|")
-    }), j) {
-      case "*": {
-        p.payload.arrayProps = {};
-        break;
-      }
-      case "+": {
-        p.payload.arrayProps = {
-          min: 1
-        };
-        break;
-      }
-      case "?": {
-        p.payload.required = !1;
-        break;
-      }
-    }
-    s && (p.payload.arrayProps = M(M({}, p.payload.arrayProps), {}, {
-      min: s[0],
-      max: s[1]
-    })), t.push(p);
-  }
-  return {
-    /**
-     * @param input Input path
-     * @returns `{ path: string; params: Params }` | `null`
-     */
-    parse: xe(t),
-    /**
-     * @param params Route parameters
-     * @returns string
-     */
-    build: Ne(t)
-  };
-}
-function J(e, t) {
-  var r = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    t && (n = n.filter(function(a) {
-      return Object.getOwnPropertyDescriptor(e, a).enumerable;
-    })), r.push.apply(r, n);
-  }
-  return r;
-}
-function I(e) {
+function $(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? J(Object(r), !0).forEach(function(n) {
-      Ie(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : J(Object(r)).forEach(function(n) {
+    t % 2 ? H(Object(r), !0).forEach(function(n) {
+      Ae(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : H(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function Ie(e, t, r) {
-  return (t = De(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
+function Ae(e, t, r) {
+  return (t = Ee(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
 }
-function De(e) {
-  var t = Ce(e, "string");
+function Ee(e) {
+  var t = Re(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function Ce(e, t) {
+function Re(e, t) {
   if (typeof e != "object" || !e) return e;
   var r = e[Symbol.toPrimitive];
   if (r !== void 0) {
@@ -983,266 +997,292 @@ function Ce(e, t) {
   }
   return (t === "string" ? String : Number)(e);
 }
-function qe(e) {
-  const {
-    base: t = "/",
-    routes: r
-  } = e, n = v(null, {
+function Ie() {
+  const e = k(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "-c46cwg"
-  }), a = v({
+    sid: "o3gup1"
+  }), t = k({
     query: {},
     path: null
   }, {
     name: "$locationState",
-    sid: "-xif7zo"
-  }), o = a.map((u) => u.query), i = a.map((u) => u.path), s = m({
+    sid: "-kglf8k"
+  }), r = t.map((u) => u.query), n = t.map((u) => u.path), a = g({
     name: "setHistory",
-    sid: "5o2aum"
-  }), c = m({
+    sid: "kp1u42"
+  }), o = g({
     name: "navigate",
-    sid: "-kee8mo"
-  }), j = m({
+    sid: "3qh547"
+  }), i = g({
     name: "back",
-    sid: "-uo6kro"
-  }), w = m({
+    sid: "-3oja8m"
+  }), s = g({
     name: "forward",
-    sid: "-je6ypy"
-  }), p = m({
+    sid: "-rc4ibg"
+  }), c = g({
     name: "locationUpdated",
-    sid: "x2x22"
-  }), l = r.map((u) => {
-    let b = u;
-    const f = [];
-    for (f.unshift(b.path); b.parent; )
-      b = b.parent, b.path !== "/" && f.unshift(b.path);
-    const F = t === "/" ? f.join("") : [t, ...f].join(""), {
-      build: N,
-      parse: x
-    } = Re(F);
-    return {
-      route: u,
-      path: F,
-      build: N,
-      parse: x
-    };
-  }), d = i.map((u) => {
-    const b = [];
-    if (!u)
-      return b;
-    for (const {
-      route: f,
-      parse: F
-    } of l)
-      F(u) && b.push(f);
-    return b;
-  }), g = _({
+    sid: "5yi2di"
+  }), d = K({
     and: {
-      source: n,
-      effect: (u, b) => {
+      source: e,
+      effect: (u, y) => {
         let {
-          path: f,
-          query: F,
-          replace: N
-        } = b;
+          path: l,
+          query: f,
+          replace: p
+        } = y;
         if (!u)
           throw new Error("history not found");
-        const x = {
-          pathname: f,
-          search: "?".concat(R.stringify(F))
+        const m = {
+          pathname: l,
+          search: "?".concat(x.stringify(f))
         };
-        N ? u.replace(x) : u.push(x);
+        p ? u.replace(m) : u.push(m);
       }
     },
     or: {
       name: "navigateFx",
-      sid: "9h4a5f"
+      sid: "klmj1f"
     }
-  }), S = A((u) => {
-    const b = E(p);
-    if (b({
+  }), b = S((u) => {
+    const y = N(c);
+    if (y({
       pathname: u.location.pathname,
-      query: I({}, R.parse(u.location.search))
+      query: $({}, x.parse(u.location.search))
     }), !u)
       throw new Error();
-    u.listen((f) => {
+    u.listen((l) => {
       let {
-        location: F
-      } = f;
-      b({
-        pathname: F.pathname,
-        query: I({}, R.parse(F.search))
+        location: f
+      } = l;
+      y({
+        pathname: f.pathname,
+        query: $({}, x.parse(f.search))
       });
     });
   }, {
     name: "subscribeHistoryFx",
-    sid: "-o0gyju"
-  }), h = _({
-    and: {
-      source: {
-        query: o,
-        path: i
-      },
-      effect: async (u) => {
-        let {
-          query: b,
-          path: f
-        } = u;
-        for (const {
-          route: F,
-          parse: N
-        } of l) {
-          const x = N(f), [ae, oe] = [E(F.internal.close), E(F.internal.navigated)];
-          x ? oe({
-            query: b,
-            params: x.params
-          }) : ae();
-        }
-      }
-    },
-    or: {
-      name: "openRoutesByPathFx",
-      sid: "dzro9q"
-    }
+    sid: "xpn9z4"
   });
-  for (const {
-    route: u,
-    build: b
-  } of l)
-    y({
-      and: [{
-        clock: u.internal.openFx.doneData,
-        filter: (f) => (f == null ? void 0 : f.navigate) !== !1,
-        fn: (f) => {
-          var F;
-          return {
-            path: b(f && "params" in f ? f.params : void 0),
-            query: (F = f == null ? void 0 : f.query) !== null && F !== void 0 ? F : {},
-            replace: f == null ? void 0 : f.replace
-          };
-        },
-        target: c
-      }],
-      or: {
-        sid: "htdbac"
-      }
-    });
-  return y({
+  return h({
     and: [{
-      clock: s,
-      target: n
+      clock: a,
+      target: e
     }],
     or: {
-      sid: "sn7fxn"
+      sid: "-h2wuu"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: n,
+      clock: e,
       filter: Boolean,
-      target: S
+      target: b
     }],
     or: {
-      sid: "spyewg"
+      sid: "-ebxw1"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: p,
+      clock: c,
       fn: (u) => ({
         path: u.pathname,
         query: u.query
       }),
-      target: a
+      target: t
     }],
     or: {
-      sid: "t4sux7"
+      sid: "ii4q"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: p,
-      fn: (u) => ({
-        path: u.pathname,
-        query: u.query
-      }),
-      target: h
+      clock: o,
+      source: n,
+      fn: (u, y) => $({
+        path: u
+      }, y),
+      target: d
     }],
     or: {
-      sid: "tlaoq1"
+      sid: "h0bxk"
     }
-  }), y({
+  }), {
+    $history: e,
+    $locationState: t,
+    $query: r,
+    $path: n,
+    setHistory: a,
+    navigate: o,
+    back: i,
+    forward: s,
+    locationUpdated: c,
+    trackQuery: de({
+      $query: r,
+      navigate: o
+    })
+  };
+}
+function qe(e) {
+  const {
+    base: t = "/",
+    routes: r
+  } = e, {
+    $path: n,
+    $query: a,
+    back: o,
+    forward: i,
+    navigate: s,
+    setHistory: c,
+    locationUpdated: d
+  } = Ie(), b = r.map((l) => {
+    let f = l;
+    const p = [];
+    for (p.unshift(f.path); f.parent; )
+      f = f.parent, f.path !== "/" && p.unshift(f.path);
+    const m = t === "/" ? p.join("") : [t, ...p].join(""), {
+      build: j,
+      parse: v
+    } = Oe(m);
+    return {
+      route: l,
+      path: m,
+      build: j,
+      parse: v
+    };
+  }), u = n.map((l) => {
+    const f = [];
+    if (!l)
+      return f;
+    for (const {
+      route: p,
+      parse: m
+    } of b)
+      m(l) && f.push(p);
+    return f;
+  }), y = K({
+    and: {
+      source: {
+        query: a,
+        path: n
+      },
+      effect: async (l) => {
+        let {
+          query: f,
+          path: p
+        } = l;
+        for (const {
+          route: m,
+          parse: j
+        } of b) {
+          const v = j(p), [re, te] = [N(m.internal.close), N(m.internal.navigated)];
+          v ? te({
+            query: f,
+            params: v.params
+          }) : re();
+        }
+      }
+    },
+    or: {
+      name: "openRoutesByPathFx",
+      sid: "-3zl7vq"
+    }
+  });
+  for (const {
+    route: l,
+    build: f
+  } of b)
+    h({
+      and: [{
+        clock: l.internal.openFx.doneData,
+        filter: (p) => (p == null ? void 0 : p.navigate) !== !1,
+        fn: (p) => {
+          var m;
+          return {
+            path: f(p && "params" in p ? p.params : void 0),
+            query: (m = p == null ? void 0 : p.query) !== null && m !== void 0 ? m : {},
+            replace: p == null ? void 0 : p.replace
+          };
+        },
+        target: s
+      }],
+      or: {
+        sid: "exzzqg"
+      }
+    });
+  return h({
     and: [{
-      clock: c,
-      source: i,
-      fn: (u, b) => I({
-        path: u
-      }, b),
-      target: g
+      clock: d,
+      fn: (l) => ({
+        path: l.pathname,
+        query: l.query
+      }),
+      target: y
     }],
     or: {
-      sid: "u1siiv"
+      sid: "ficdn3"
     }
   }), {
-    $query: o,
-    $path: i,
-    $activeRoutes: d,
-    back: j,
-    forward: w,
-    navigate: c,
+    $query: a,
+    $path: n,
+    $activeRoutes: u,
+    back: o,
+    forward: i,
+    navigate: s,
     routes: r,
-    setHistory: s,
-    mappedRoutes: l,
-    trackQuery: ye({
-      $activeRoutes: d,
-      $query: o,
-      navigate: c
+    setHistory: c,
+    mappedRoutes: b,
+    trackQuery: L({
+      $activeRoutes: u,
+      $query: a,
+      navigate: s
     }),
     "@@unitShape": () => ({
-      query: o,
-      path: i,
-      activeRoutes: d,
-      onBack: j,
-      onForward: w,
-      onNavigate: c
+      query: a,
+      path: n,
+      activeRoutes: u,
+      onBack: o,
+      onForward: i,
+      onNavigate: s
     })
   };
 }
-function ze(e) {
-  const t = v(null, {
+function Ce(e) {
+  const t = k(null, {
     name: "$params",
-    sid: "-ui6zqo"
-  }), r = v(!1, {
+    sid: "-i70thm"
+  }), r = k(!1, {
     name: "$isOpened",
-    sid: "p6gokr"
-  }), n = e, a = m({
+    sid: "-xjh75b"
+  }), n = e, a = g({
     name: "open",
-    sid: "55xtzu"
-  }), o = m({
+    sid: "7j5xyt"
+  }), o = g({
     name: "opened",
-    sid: "tidivr"
-  }), i = m({
+    sid: "vvlmuq"
+  }), i = g({
     name: "openedOnServer",
-    sid: "8drh93"
-  }), s = m({
+    sid: "aqzl82"
+  }), s = g({
     name: "openedOnClient",
-    sid: "-pj4ssy"
-  }), c = m({
+    sid: "-n5wotz"
+  }), c = g({
     name: "close",
-    sid: "-9osjjv"
-  }), j = m({
+    sid: "2mdmp7"
+  }), d = g({
     name: "closed",
-    sid: "hnb5jj"
+    sid: "tyhbsl"
   });
-  return y({
+  return h({
     and: [{
       clock: a,
       target: o
     }],
     or: {
-      sid: "-v1zz6f"
+      sid: "-unpbr1"
     }
-  }), Q({
+  }), V({
     and: [{
       source: o,
       match: () => typeof window > "u" ? "server" : "client",
@@ -1252,23 +1292,23 @@ function ze(e) {
       }
     }],
     or: {
-      sid: "-unpbr1"
+      sid: "-ukycs8"
     }
-  }), y({
+  }), h({
     and: [{
       clock: c,
-      target: j
+      target: d
     }],
     or: {
-      sid: "-u77hy7"
+      sid: "-u4gize"
     }
-  }), y({
+  }), h({
     and: [{
-      clock: [o.map(() => !0), j.map(() => !1)],
+      clock: [o.map(() => !0), d.map(() => !1)],
       target: r
     }],
     or: {
-      sid: "-u4gize"
+      sid: "-tq5vk0"
     }
   }), {
     $params: t,
@@ -1279,7 +1319,7 @@ function ze(e) {
     openedOnClient: s,
     openedOnServer: i,
     close: c,
-    closed: j,
+    closed: d,
     // @ts-expect-error emulated path for virtual route
     path: null,
     "@@unitShape": () => ({
@@ -1290,68 +1330,82 @@ function ze(e) {
     })
   };
 }
-function Be(e) {
+function Ue(e) {
   const {
     route: t,
     beforeOpen: r,
     openOn: n,
     cancelOn: a
-  } = e, o = A(async (s) => {
-    for (const c of [].concat(r))
-      await c(s);
+  } = e;
+  let o;
+  const i = S(() => {
+    var d;
+    return (d = o) === null || d === void 0 ? void 0 : d();
+  }, {
+    name: "waitForAsyncBundleFx",
+    sid: "-y53ute"
+  }), s = S(async (d) => {
+    await i();
+    for (const b of [].concat(r))
+      await b(d);
   }, {
     name: "openFx",
-    sid: "x22os2"
-  }), i = ze(o.pending);
-  return y({
+    sid: "-nropd8"
+  }), c = Ce(s.pending);
+  return h({
     and: [{
       clock: t.open,
-      target: o
+      target: s
     }],
     or: {
-      sid: "2j17t"
+      sid: "k4g7d"
     }
-  }), y({
+  }), h({
     and: [{
       clock: t.opened,
-      fn: (s) => s && "params" in s ? s.params : null,
-      target: i.$params
+      fn: (d) => d && "params" in d ? d.params : null,
+      target: c.$params
     }],
     or: {
-      sid: "5a06m"
+      sid: "mvf66"
     }
-  }), n && y({
+  }), n && h({
     and: [{
       clock: n,
       source: {
-        params: i.$params
+        params: c.$params
       },
-      fn: (s) => {
+      fn: (d) => {
         let {
-          params: c
-        } = s;
+          params: b
+        } = d;
         return {
-          params: c
+          params: b
         };
       },
-      target: i.open
+      target: c.open
     }],
     or: {
-      sid: "lru16"
+      sid: "13d90q"
     }
-  }), a && y({
+  }), a && h({
     and: [{
       clock: [t.closed].concat(a),
-      target: i.close
+      target: c.close
     }],
     or: {
-      sid: "129nu0"
+      sid: "1jv2tk"
     }
-  }), i;
+  }), Object.assign(c, {
+    internal: {
+      setAsyncImport: (d) => o = d
+    }
+  });
 }
 export {
-  Be as chainRoute,
-  _e as createRoute,
+  Ue as chainRoute,
+  ze as createRoute,
   qe as createRouter,
-  P as parameters
+  Ie as createRouterControls,
+  w as parameters
 };