@argon-router/core 0.1.4 → 0.2.0

package/dist/index.js

@@ -1,6 +1,6 @@
-import { createEffect as R, createStore as E, createEvent as x, sample as F, split as fe, attach as V, scopeBind as ue, withFactory as le } from "effector";
+import { createEffect as N, createStore as j, createEvent as x, sample as F, split as fe, attach as H, scopeBind as ue, withFactory as le } from "effector";
 import { spread as de } from "patronum";
-function z(e, t) {
+function V(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -13,9 +13,9 @@ function z(e, t) {
 function C(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? z(Object(r), !0).forEach(function(n) {
+    t % 2 ? V(Object(r), !0).forEach(function(n) {
       pe(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : z(Object(r)).forEach(function(n) {
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : V(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
@@ -40,57 +40,59 @@ function ye(e, t) {
 }
 function Qe(e) {
   let t;
-  const r = R(() => {
-    var h;
-    return (h = t) === null || h === void 0 ? void 0 : h();
+  const r = N(() => {
+    var p;
+    return (p = t) === null || p === void 0 ? void 0 : p();
   }, {
     name: "waitForAsyncBundleFx",
-    sid: "hl1gh5"
-  }), n = R(async () => {
-    for (const u of (h = e.beforeOpen) !== null && h !== void 0 ? h : []) {
-      var h;
-      await u();
+    sid: "tw7mq7"
+  }), n = N(async () => {
+    for (const l of (p = e.beforeOpen) !== null && p !== void 0 ? p : []) {
+      var p;
+      await l();
     }
   }, {
     name: "beforeOpenFx",
-    sid: "jez0xa"
-  }), a = R(async (h) => (await r(), await n(), e.parent && await e.parent.internal.openFx(C(C({}, h), {}, {
+    sid: "ls74w9"
+  }), a = N(async (p) => (await r(), await n(), e.parent && await e.parent.internal.openFx(C(C({}, p ?? {
+    params: {}
+  }), {}, {
     historyIgnore: !0
-  })), h), {
+  })), p), {
     name: "openFx",
-    sid: "-uafnek"
-  }), s = E({}, {
+    sid: "-hz9h5i"
+  }), s = j({}, {
     name: "$params",
-    sid: "dlh2xl"
-  }), o = E(!1, {
+    sid: "fyp6wk"
+  }), i = j(!1, {
     name: "$isOpened",
-    sid: "lcu7f1"
-  }), i = a.pending, c = x({
+    sid: "nq2be0"
+  }), o = a.pending, f = x({
     name: "open",
-    sid: "-qjaufd"
-  }), f = x({
+    sid: "-e84o6b"
+  }), u = x({
     name: "close",
-    sid: "-6cg68t"
-  }), m = x({
+    sid: "5yq009"
+  }), y = x({
     name: "opened",
-    sid: "-a2kpe7"
+    sid: "28lguv"
   }), d = x({
     name: "openedOnServer",
-    sid: "-u0yshs"
+    sid: "-rnqoit"
   }), b = x({
     name: "openedOnClient",
-    sid: "-u3faft"
+    sid: "-rq76gu"
   }), w = x({
     name: "closed",
-    sid: "-d6sqbp"
+    sid: "-atkmcq"
   });
   return F({
     and: [{
-      clock: c,
+      clock: f,
       target: a
     }],
     or: {
-      sid: "sre3h1"
+      sid: "t5oqwf"
     }
   }), fe({
     and: [{
@@ -102,75 +104,75 @@ function Qe(e) {
       }
     }],
     or: {
-      sid: "t5oqwf"
+      sid: "t8fpv8"
     }
   }), F({
     and: [{
       clock: [b, d],
-      target: m
+      target: y
     }],
     or: {
-      sid: "tamw8o"
+      sid: "tphc9f"
     }
   }), F({
     and: [{
-      clock: m,
+      clock: y,
       fn: () => !0,
-      target: o
+      target: i
     }],
     or: {
-      sid: "toxjo2"
+      sid: "u3rzot"
     }
   }), F({
     and: [{
-      clock: f,
+      clock: u,
       target: w
     }],
     or: {
-      sid: "u3rzot"
+      sid: "u72r8z"
     }
   }), F({
     and: [{
       clock: w,
       fn: () => !1,
-      target: o
+      target: i
     }],
     or: {
-      sid: "u6iynm"
+      sid: "ykn3cq"
     }
   }), {
     $params: s,
-    $isOpened: o,
-    $isPending: i,
-    open: c,
+    $isOpened: i,
+    $isPending: o,
+    open: f,
     closed: w,
-    opened: m,
+    opened: y,
     openedOnClient: b,
     openedOnServer: d,
     internal: C({
       index: !1,
-      close: f,
+      close: u,
       openFx: a,
-      setAsyncImport: (h) => t = h
+      setAsyncImport: (p) => t = p
     }, e),
     "@@unitShape": () => ({
       params: s,
-      isPending: i,
-      isOpened: o,
-      onOpen: c
+      isPending: o,
+      isOpened: i,
+      onOpen: f
     })
   };
 }
-var j = {};
-Object.defineProperty(j, "__esModule", {
+var E = {};
+Object.defineProperty(E, "__esModule", {
   value: !0
 });
-j.TokenData = void 0;
-j.parse = L;
-var he = j.compile = $e, ge = j.match = Oe;
-j.pathToRegexp = Z;
-j.stringify = Ae;
-const _ = "/", v = (e) => e, X = /^[$_\p{ID_Start}]$/u, q = /^[$\u200c\u200d\p{ID_Continue}]$/u, I = "https://git.new/pathToRegexpError", be = {
+E.TokenData = void 0;
+E.parse = L;
+var he = E.compile = $e, ge = E.match = Oe;
+E.pathToRegexp = Z;
+E.stringify = Ae;
+const U = "/", _ = (e) => e, X = /^[$_\p{ID_Start}]$/u, q = /^[$\u200c\u200d\p{ID_Continue}]$/u, I = "https://git.new/pathToRegexpError", be = {
   // Groups.
   "{": "{",
   "}": "}",
@@ -228,18 +230,18 @@ function* xe(e) {
         value: t[r++]
       };
     else if (a === ":") {
-      const o = n();
+      const i = n();
       yield {
         type: "PARAM",
         index: r,
-        value: o
+        value: i
       };
     } else if (a === "*") {
-      const o = n();
+      const i = n();
       yield {
         type: "WILDCARD",
         index: r,
-        value: o
+        value: i
       };
     } else
       yield {
@@ -286,72 +288,72 @@ class Fe {
     return t;
   }
 }
-class P {
+class k {
   constructor(t) {
     this.tokens = t;
   }
 }
-j.TokenData = P;
+E.TokenData = k;
 function L(e, t = {}) {
   const {
-    encodePath: r = v
+    encodePath: r = _
   } = t, n = new Fe(xe(e));
-  function a(o) {
-    const i = [];
+  function a(i) {
+    const o = [];
     for (; ; ) {
-      const c = n.text();
-      c && i.push({
+      const f = n.text();
+      f && o.push({
         type: "text",
-        value: r(c)
+        value: r(f)
       });
-      const f = n.tryConsume("PARAM");
-      if (f) {
-        i.push({
+      const u = n.tryConsume("PARAM");
+      if (u) {
+        o.push({
           type: "param",
-          name: f
+          name: u
         });
         continue;
       }
-      const m = n.tryConsume("WILDCARD");
-      if (m) {
-        i.push({
+      const y = n.tryConsume("WILDCARD");
+      if (y) {
+        o.push({
           type: "wildcard",
-          name: m
+          name: y
         });
         continue;
       }
       if (n.tryConsume("{")) {
-        i.push({
+        o.push({
           type: "group",
           tokens: a("}")
         });
         continue;
       }
-      return n.consume(o), i;
+      return n.consume(i), o;
     }
   }
   const s = a("END");
-  return new P(s);
+  return new k(s);
 }
 function $e(e, t = {}) {
   const {
     encode: r = encodeURIComponent,
-    delimiter: n = _
-  } = t, a = e instanceof P ? e : L(e, t), s = Y(a.tokens, n, r);
-  return function(i = {}) {
-    const [c, ...f] = s(i);
-    if (f.length)
-      throw new TypeError(`Missing parameters: ${f.join(", ")}`);
-    return c;
+    delimiter: n = U
+  } = t, a = e instanceof k ? e : L(e, t), s = Y(a.tokens, n, r);
+  return function(o = {}) {
+    const [f, ...u] = s(o);
+    if (u.length)
+      throw new TypeError(`Missing parameters: ${u.join(", ")}`);
+    return f;
   };
 }
 function Y(e, t, r) {
   const n = e.map((a) => Se(a, t, r));
   return (a) => {
     const s = [""];
-    for (const o of n) {
-      const [i, ...c] = o(a);
-      s[0] += i, s.push(...c);
+    for (const i of n) {
+      const [o, ...f] = i(a);
+      s[0] += o, s.push(...f);
     }
     return s;
   };
@@ -361,20 +363,20 @@ function Se(e, t, r) {
   if (e.type === "group") {
     const a = Y(e.tokens, t, r);
     return (s) => {
-      const [o, ...i] = a(s);
-      return i.length ? [""] : [o];
+      const [i, ...o] = a(s);
+      return o.length ? [""] : [i];
     };
   }
-  const n = r || v;
+  const n = r || _;
   return e.type === "wildcard" && r !== !1 ? (a) => {
     const s = a[e.name];
     if (s == null) return ["", e.name];
     if (!Array.isArray(s) || s.length === 0)
       throw new TypeError(`Expected "${e.name}" to be a non-empty array`);
-    return [s.map((o, i) => {
-      if (typeof o != "string")
-        throw new TypeError(`Expected "${e.name}/${i}" to be a string`);
-      return n(o);
+    return [s.map((i, o) => {
+      if (typeof i != "string")
+        throw new TypeError(`Expected "${e.name}/${o}" to be a string`);
+      return n(i);
     }).join(t)];
   } : (a) => {
     const s = a[e.name];
@@ -387,76 +389,76 @@ function Se(e, t, r) {
 function Oe(e, t = {}) {
   const {
     decode: r = decodeURIComponent,
-    delimiter: n = _
+    delimiter: n = U
   } = t, {
     regexp: a,
     keys: s
-  } = Z(e, t), o = s.map((i) => r === !1 ? v : i.type === "param" ? r : (c) => c.split(n).map(r));
-  return function(c) {
-    const f = a.exec(c);
-    if (!f) return !1;
-    const m = f[0], d = /* @__PURE__ */ Object.create(null);
-    for (let b = 1; b < f.length; b++) {
-      if (f[b] === void 0) continue;
-      const w = s[b - 1], h = o[b - 1];
-      d[w.name] = h(f[b]);
+  } = Z(e, t), i = s.map((o) => r === !1 ? _ : o.type === "param" ? r : (f) => f.split(n).map(r));
+  return function(f) {
+    const u = a.exec(f);
+    if (!u) return !1;
+    const y = u[0], d = /* @__PURE__ */ Object.create(null);
+    for (let b = 1; b < u.length; b++) {
+      if (u[b] === void 0) continue;
+      const w = s[b - 1], p = i[b - 1];
+      d[w.name] = p(u[b]);
     }
     return {
-      path: m,
+      path: y,
       params: d
     };
   };
 }
 function Z(e, t = {}) {
   const {
-    delimiter: r = _,
+    delimiter: r = U,
     end: n = !0,
     sensitive: a = !1,
     trailing: s = !0
-  } = t, o = [], i = [], c = a ? "" : "i", m = (Array.isArray(e) ? e : [e]).map((w) => w instanceof P ? w : L(w, t));
+  } = t, i = [], o = [], f = a ? "" : "i", y = (Array.isArray(e) ? e : [e]).map((w) => w instanceof k ? w : L(w, t));
   for (const {
     tokens: w
-  } of m)
-    for (const h of k(w, 0, [])) {
-      const u = je(h, r, o);
-      i.push(u);
+  } of y)
+    for (const p of R(w, 0, [])) {
+      const l = Ee(p, r, i);
+      o.push(l);
     }
-  let d = `^(?:${i.join("|")})`;
+  let d = `^(?:${o.join("|")})`;
   return s && (d += `(?:${$(r)}$)?`), d += n ? "$" : `(?=${$(r)}|$)`, {
-    regexp: new RegExp(d, c),
-    keys: o
+    regexp: new RegExp(d, f),
+    keys: i
   };
 }
-function* k(e, t, r) {
+function* R(e, t, r) {
   if (t === e.length)
     return yield r;
   const n = e[t];
   if (n.type === "group") {
     const a = r.slice();
-    for (const s of k(n.tokens, 0, a))
-      yield* k(e, t + 1, s);
+    for (const s of R(n.tokens, 0, a))
+      yield* R(e, t + 1, s);
   } else
     r.push(n);
-  yield* k(e, t + 1, r);
+  yield* R(e, t + 1, r);
 }
-function je(e, t, r) {
+function Ee(e, t, r) {
   let n = "", a = "", s = !0;
-  for (let o = 0; o < e.length; o++) {
-    const i = e[o];
-    if (i.type === "text") {
-      n += $(i.value), a += i.value, s || (s = i.value.includes(t));
+  for (let i = 0; i < e.length; i++) {
+    const o = e[i];
+    if (o.type === "text") {
+      n += $(o.value), a += o.value, s || (s = o.value.includes(t));
       continue;
     }
-    if (i.type === "param" || i.type === "wildcard") {
+    if (o.type === "param" || o.type === "wildcard") {
       if (!s && !a)
-        throw new TypeError(`Missing text after "${i.name}": ${I}`);
-      i.type === "param" ? n += `(${Ee(t, s ? "" : a)}+)` : n += "([\\s\\S]+)", r.push(i), a = "", s = !1;
+        throw new TypeError(`Missing text after "${o.name}": ${I}`);
+      o.type === "param" ? n += `(${je(t, s ? "" : a)}+)` : n += "([\\s\\S]+)", r.push(o), a = "", s = !1;
       continue;
     }
   }
   return n;
 }
-function Ee(e, t) {
+function je(e, t) {
   return t.length < 2 ? e.length < 2 ? `[^${$(e + t)}]` : `(?:(?!${$(e)})[^${$(t)}])` : e.length < 2 ? `(?:(?!${$(t)})[^${$(e)}])` : `(?:(?!${$(t)}|${$(e)})[\\s\\S])`;
 }
 function Ae(e) {
@@ -464,9 +466,9 @@ function Ae(e) {
     if (r.type === "text") return we(r.value);
     if (r.type === "group")
       return `{${r.tokens.map(t).join("")}}`;
-    const o = Ne(r.name) && Re(a[n + 1]) ? r.name : JSON.stringify(r.name);
-    if (r.type === "param") return `:${o}`;
-    if (r.type === "wildcard") return `*${o}`;
+    const i = Ne(r.name) && Re(a[n + 1]) ? r.name : JSON.stringify(r.name);
+    if (r.type === "param") return `:${i}`;
+    if (r.type === "wildcard") return `*${i}`;
     throw new TypeError(`Unexpected token: ${r}`);
   }).join("");
 }
@@ -477,9 +479,9 @@ function Ne(e) {
 function Re(e) {
   return (e == null ? void 0 : e.type) !== "text" ? !0 : !q.test(e.value[0]);
 }
-const ke = Symbol("any"), Ie = Symbol("number"), Pe = Symbol("string"), Ce = Symbol("array"), O = {
-  any: ke,
-  number: Ie,
+const Ie = Symbol("any"), ke = Symbol("number"), Pe = Symbol("string"), Ce = Symbol("array"), O = {
+  any: Ie,
+  number: ke,
   string: Pe,
   array: Ce
 };
@@ -551,8 +553,8 @@ function Te(e, t) {
     }
     switch (typeof a) {
       case "number": {
-        const o = e[n];
-        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+        const i = e[n];
+        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
         break;
       }
       case "object": {
@@ -562,8 +564,8 @@ function Te(e, t) {
       case "string":
         r[n] = e[n];
       case "boolean": {
-        const o = e[n];
-        r[n] = o === "0" ? parseFloat(o) : parseInt(o);
+        const i = e[n];
+        r[n] = i === "0" ? parseFloat(i) : parseInt(i);
         break;
       }
     }
@@ -575,8 +577,8 @@ function Te(e, t) {
         break;
       }
       case O.number: {
-        const o = e[n];
-        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+        const i = e[n];
+        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
         break;
       }
     }
@@ -591,10 +593,10 @@ function De(e, t) {
     } = r, s = x({
       name: "entered",
       sid: "-d3obu6"
-    }), o = x({
+    }), i = x({
       name: "exited",
       sid: "-xofyk3"
-    }), i = x({
+    }), o = x({
       name: "exit",
       sid: "-673d76"
     });
@@ -604,18 +606,18 @@ function De(e, t) {
           activeRoutes: e,
           query: t
         },
-        filter: (c) => {
+        filter: (f) => {
           let {
-            activeRoutes: f,
-            query: m
-          } = c;
-          return (!a || K(a, f)) && J(m, n);
+            activeRoutes: u,
+            query: y
+          } = f;
+          return (!a || K(a, u)) && J(y, n);
         },
-        fn: (c) => {
+        fn: (f) => {
           let {
-            query: f
-          } = c;
-          return Te(f, n);
+            query: u
+          } = f;
+          return Te(u, n);
         }
       }],
       or: {
@@ -627,25 +629,25 @@ function De(e, t) {
           activeRoutes: e,
           query: t
         },
-        filter: (c) => {
+        filter: (f) => {
           let {
-            activeRoutes: f,
-            query: m
-          } = c;
-          return !((!a || K(a, f)) && J(m, n));
+            activeRoutes: u,
+            query: y
+          } = f;
+          return !((!a || K(a, u)) && J(y, n));
         },
-        target: o
+        target: i
       }],
       or: {
         sid: "-s82e29"
       }
     }), {
       entered: s,
-      exited: o,
-      exit: i,
-      getPayload: (c) => Object.entries(c).reduce((f, m) => {
-        let [d, b] = m;
-        return typeof n[d] == "symbol" ? f[d] = b : f[d] = n[d], f;
+      exited: i,
+      exit: o,
+      getPayload: (f) => Object.entries(f).reduce((u, y) => {
+        let [d, b] = y;
+        return typeof n[d] == "symbol" ? u[d] = b : u[d] = n[d], u;
       }, {})
     };
   };
@@ -662,7 +664,7 @@ function D(e, t) {
   const r = e.slice(0, t), n = e.slice(t);
   return Array.prototype.concat.call([], D(r), D(n));
 }
-function Ue(e) {
+function ve(e) {
   try {
     return decodeURIComponent(e);
   } catch {
@@ -672,7 +674,7 @@ function Ue(e) {
     return e;
   }
 }
-function _e(e) {
+function Ue(e) {
   const t = {
     "%FE%FF": "��",
     "%FF%FE": "��"
@@ -682,7 +684,7 @@ function _e(e) {
     try {
       t[r[0]] = decodeURIComponent(r[0]);
     } catch {
-      const a = Ue(r[0]);
+      const a = ve(r[0]);
       a !== r[0] && (t[r[0]] = a);
     }
     r = W.exec(e);
@@ -693,13 +695,13 @@ function _e(e) {
     e = e.replace(new RegExp(a, "g"), t[a]);
   return e;
 }
-function ve(e) {
+function _e(e) {
   if (typeof e != "string")
     throw new TypeError("Expected `encodedURI` to be of type `string`, got `" + typeof e + "`");
   try {
     return decodeURIComponent(e);
   } catch {
-    return _e(e);
+    return Ue(e);
   }
 }
 function qe(e, t) {
@@ -727,29 +729,29 @@ function re(e, t) {
   const r = e.indexOf(t);
   return r === -1 ? [] : [e.slice(0, r), e.slice(r + t.length)];
 }
-const Le = (e) => e == null, Me = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), U = Symbol("encodeFragmentIdentifier");
-function Be(e) {
+const Le = (e) => e == null, Me = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), v = Symbol("encodeFragmentIdentifier");
+function ze(e) {
   switch (e.arrayFormat) {
     case "index":
       return (t) => (r, n) => {
         const a = r.length;
-        return n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [p(t, e), "[", a, "]"].join("")] : [...r, [p(t, e), "[", p(a, e), "]=", p(n, e)].join("")];
+        return n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [m(t, e), "[", a, "]"].join("")] : [...r, [m(t, e), "[", m(a, e), "]=", m(n, e)].join("")];
       };
     case "bracket":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [p(t, e), "[]"].join("")] : [...r, [p(t, e), "[]=", p(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [m(t, e), "[]"].join("")] : [...r, [m(t, e), "[]=", m(n, e)].join("")];
     case "colon-list-separator":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [p(t, e), ":list="].join("")] : [...r, [p(t, e), ":list=", p(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [m(t, e), ":list="].join("")] : [...r, [m(t, e), ":list=", m(n, e)].join("")];
     case "comma":
     case "separator":
     case "bracket-separator": {
       const t = e.arrayFormat === "bracket-separator" ? "[]=" : "=";
-      return (r) => (n, a) => a === void 0 || e.skipNull && a === null || e.skipEmptyString && a === "" ? n : (a = a === null ? "" : a, n.length === 0 ? [[p(r, e), t, p(a, e)].join("")] : [[n, p(a, e)].join(e.arrayFormatSeparator)]);
+      return (r) => (n, a) => a === void 0 || e.skipNull && a === null || e.skipEmptyString && a === "" ? n : (a = a === null ? "" : a, n.length === 0 ? [[m(r, e), t, m(a, e)].join("")] : [[n, m(a, e)].join(e.arrayFormatSeparator)]);
     }
     default:
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, p(t, e)] : [...r, [p(t, e), "=", p(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, m(t, e)] : [...r, [m(t, e), "=", m(n, e)].join("")];
   }
 }
-function He(e) {
+function Be(e) {
   let t;
   switch (e.arrayFormat) {
     case "index":
@@ -787,10 +789,10 @@ function He(e) {
     case "comma":
     case "separator":
       return (r, n, a) => {
-        const s = typeof n == "string" && n.includes(e.arrayFormatSeparator), o = typeof n == "string" && !s && S(n, e).includes(e.arrayFormatSeparator);
-        n = o ? S(n, e) : n;
-        const i = s || o ? n.split(e.arrayFormatSeparator).map((c) => S(c, e)) : n === null ? n : S(n, e);
-        a[r] = i;
+        const s = typeof n == "string" && n.includes(e.arrayFormatSeparator), i = typeof n == "string" && !s && S(n, e).includes(e.arrayFormatSeparator);
+        n = i ? S(n, e) : n;
+        const o = s || i ? n.split(e.arrayFormatSeparator).map((f) => S(f, e)) : n === null ? n : S(n, e);
+        a[r] = o;
       };
     case "bracket-separator":
       return (r, n, a) => {
@@ -799,12 +801,12 @@ function He(e) {
           a[r] = n && S(n, e);
           return;
         }
-        const o = n === null ? [] : S(n, e).split(e.arrayFormatSeparator);
+        const i = n === null ? [] : S(n, e).split(e.arrayFormatSeparator);
         if (a[r] === void 0) {
-          a[r] = o;
+          a[r] = i;
           return;
         }
-        a[r] = [...a[r], ...o];
+        a[r] = [...a[r], ...i];
       };
     default:
       return (r, n, a) => {
@@ -820,11 +822,11 @@ function te(e) {
   if (typeof e != "string" || e.length !== 1)
     throw new TypeError("arrayFormatSeparator must be single character string");
 }
-function p(e, t) {
+function m(e, t) {
   return t.encode ? t.strict ? Me(e) : encodeURIComponent(e) : e;
 }
 function S(e, t) {
-  return t.decode ? ve(e) : e;
+  return t.decode ? _e(e) : e;
 }
 function ne(e) {
   return Array.isArray(e) ? e.sort() : typeof e == "object" ? ne(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
@@ -833,7 +835,7 @@ function ae(e) {
   const t = e.indexOf("#");
   return t !== -1 && (e = e.slice(0, t)), e;
 }
-function Ve(e) {
+function He(e) {
   let t = "";
   const r = e.indexOf("#");
   return r !== -1 && (t = e.slice(r)), t;
@@ -846,7 +848,7 @@ function M(e) {
   const t = e.indexOf("?");
   return t === -1 ? "" : e.slice(t + 1);
 }
-function B(e, t) {
+function z(e, t) {
   t = {
     decode: !0,
     sort: !0,
@@ -857,26 +859,26 @@ function B(e, t) {
     types: /* @__PURE__ */ Object.create(null),
     ...t
   }, te(t.arrayFormatSeparator);
-  const r = He(t), n = /* @__PURE__ */ Object.create(null);
+  const r = Be(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 s = t.decode ? a.replaceAll("+", " ") : a;
-    let [o, i] = re(s, "=");
-    o === void 0 && (o = s), i = i === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? i : S(i, t), r(S(o, t), i, n);
+    let [i, o] = re(s, "=");
+    i === void 0 && (i = s), o = o === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? o : S(o, t), r(S(i, t), o, n);
   }
   for (const [a, s] of Object.entries(n))
     if (typeof s == "object" && s !== null && t.types[a] !== "string")
-      for (const [o, i] of Object.entries(s)) {
-        const c = t.types[a] ? t.types[a].replace("[]", "") : void 0;
-        s[o] = G(i, t, c);
+      for (const [i, o] of Object.entries(s)) {
+        const f = t.types[a] ? t.types[a].replace("[]", "") : void 0;
+        s[i] = G(o, t, f);
       }
     else typeof s == "object" && s !== null && t.types[a] === "string" ? n[a] = Object.values(s).join(t.arrayFormatSeparator) : n[a] = G(s, t, t.types[a]);
   return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, s) => {
-    const o = n[s];
-    return a[s] = o && typeof o == "object" && !Array.isArray(o) ? ne(o) : o, a;
+    const i = n[s];
+    return a[s] = i && typeof i == "object" && !Array.isArray(i) ? ne(i) : i, a;
   }, /* @__PURE__ */ Object.create(null));
 }
 function se(e, t) {
@@ -889,16 +891,16 @@ function se(e, t) {
     arrayFormatSeparator: ",",
     ...t
   }, te(t.arrayFormatSeparator);
-  const r = (o) => t.skipNull && Le(e[o]) || t.skipEmptyString && e[o] === "", n = Be(t), a = {};
-  for (const [o, i] of Object.entries(e))
-    r(o) || (a[o] = i);
+  const r = (i) => t.skipNull && Le(e[i]) || t.skipEmptyString && e[i] === "", n = ze(t), a = {};
+  for (const [i, o] of Object.entries(e))
+    r(i) || (a[i] = o);
   const s = Object.keys(a);
-  return t.sort !== !1 && s.sort(t.sort), s.map((o) => {
-    const i = e[o];
-    return i === void 0 ? "" : i === null ? p(o, t) : Array.isArray(i) ? i.length === 0 && t.arrayFormat === "bracket-separator" ? p(o, t) + "[]" : i.reduce(n(o), []).join("&") : p(o, t) + "=" + p(i, t);
-  }).filter((o) => o.length > 0).join("&");
+  return t.sort !== !1 && s.sort(t.sort), s.map((i) => {
+    const o = e[i];
+    return o === void 0 ? "" : o === null ? m(i, t) : Array.isArray(o) ? o.length === 0 && t.arrayFormat === "bracket-separator" ? m(i, t) + "[]" : o.reduce(n(i), []).join("&") : m(i, t) + "=" + m(o, t);
+  }).filter((i) => i.length > 0).join("&");
 }
-function oe(e, t) {
+function ie(e, t) {
   var a;
   t = {
     decode: !0,
@@ -907,176 +909,176 @@ function oe(e, t) {
   let [r, n] = re(e, "#");
   return r === void 0 && (r = e), {
     url: ((a = r == null ? void 0 : r.split("?")) == null ? void 0 : a[0]) ?? "",
-    query: B(M(e), t),
+    query: z(M(e), t),
     ...t && t.parseFragmentIdentifier && n ? {
       fragmentIdentifier: S(n, t)
     } : {}
   };
 }
-function ie(e, t) {
+function oe(e, t) {
   t = {
     encode: !0,
     strict: !0,
-    [U]: !0,
+    [v]: !0,
     ...t
   };
   const r = ae(e.url).split("?")[0] || "", n = M(e.url), a = {
-    ...B(n, {
+    ...z(n, {
       sort: !1
     }),
     ...e.query
   };
   let s = se(a, t);
   s && (s = `?${s}`);
-  let o = Ve(e.url);
+  let i = He(e.url);
   if (typeof e.fragmentIdentifier == "string") {
-    const i = new URL(r);
-    i.hash = e.fragmentIdentifier, o = t[U] ? i.hash : `#${e.fragmentIdentifier}`;
+    const o = new URL(r);
+    o.hash = e.fragmentIdentifier, i = t[v] ? o.hash : `#${e.fragmentIdentifier}`;
   }
-  return `${r}${s}${o}`;
+  return `${r}${s}${i}`;
 }
 function ce(e, t, r) {
   r = {
     parseFragmentIdentifier: !0,
-    [U]: !1,
+    [v]: !1,
     ...r
   };
   const {
     url: n,
     query: a,
     fragmentIdentifier: s
-  } = oe(e, r);
-  return ie({
+  } = ie(e, r);
+  return oe({
     url: n,
     query: qe(a, t),
     fragmentIdentifier: s
   }, r);
 }
-function ze(e, t, r) {
+function Ve(e, t, r) {
   const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, s) => !t(a, s);
   return ce(e, n, r);
 }
 const T = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  exclude: ze,
+  exclude: Ve,
   extract: M,
-  parse: B,
-  parseUrl: oe,
+  parse: z,
+  parseUrl: ie,
   pick: ce,
   stringify: se,
-  stringifyUrl: ie
+  stringifyUrl: oe
 }, Symbol.toStringTag, { value: "Module" }));
 function We(e) {
   const {
     base: t = "/",
     routes: r
-  } = e, n = E(null, {
+  } = e, n = j(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "31majq"
-  }), a = E([], {
+    sid: "ftu36z"
+  }), a = j([], {
     and: {
       serialize: "ignore"
     },
     name: "$activeRoutes",
-    sid: "mastmv"
-  }), s = E({}, {
+    sid: "z30ma4"
+  }), s = j({}, {
     name: "$query",
-    sid: "4sjpht"
-  }), o = E(null, {
+    sid: "hkri52"
+  }), i = j(null, {
     name: "$path",
-    sid: "wq6kyf"
-  }), i = x({
+    sid: "-zgnqnj"
+  }), o = x({
     name: "setHistory",
-    sid: "tco5ea"
-  }), c = x({
-    name: "back",
-    sid: "-hekewa"
+    sid: "w6xvrg"
   }), f = x({
+    name: "back",
+    sid: "-4mcm91"
+  }), u = x({
     name: "forward",
-    sid: "-64ksuk"
-  }), m = x({
+    sid: "6nmzsp"
+  }), y = x({
     name: "locationUpdated",
-    sid: "e6p2xg"
-  }), d = r.map((u) => {
-    let y = u;
-    const l = [];
-    for (l.unshift(y.internal.path); y.internal.parent; )
-      y = y.internal.parent, y.internal.path !== "/" && l.unshift(y.internal.path);
-    const g = t === "/" ? l.join("") : [t, ...l].join("");
+    sid: "qywvkp"
+  }), d = r.map((l) => {
+    let h = l;
+    const c = [];
+    for (c.unshift(h.internal.path); h.internal.parent; )
+      h = h.internal.parent, h.internal.path !== "/" && c.unshift(h.internal.path);
+    const g = t === "/" ? c.join("") : [t, ...c].join("");
     return {
-      route: u,
+      route: l,
       path: g,
       toPath: he(g),
       fromPath: ge(g)
     };
-  }), b = V({
+  }), b = H({
     and: {
       source: {
         history: n
       },
-      effect: async (u, y) => {
+      effect: async (l, h) => {
         let {
-          history: l
-        } = u, {
+          history: c
+        } = l, {
           path: g,
-          query: A,
-          replace: N
-        } = y;
-        if (!l)
+          query: P,
+          replace: A
+        } = h;
+        if (!c)
           throw new Error("history not found");
-        const H = {
+        const B = {
           pathname: g,
-          search: "?".concat(T.stringify(A))
+          search: "?".concat(T.stringify(P))
         };
-        N ? l.replace(H) : l.push(H);
+        A ? c.replace(B) : c.push(B);
       }
     },
     or: {
       name: "navigateFx",
-      sid: "dmi4v4"
+      sid: "qepxid"
     }
-  }), w = R((u) => {
-    const y = ue(m);
-    if (y({
-      pathname: u.location.pathname,
-      query: T.parse(u.location.search)
-    }), !u)
+  }), w = N((l) => {
+    const h = ue(y);
+    if (h({
+      pathname: l.location.pathname,
+      query: T.parse(l.location.search)
+    }), !l)
       throw new Error();
-    u.listen((l) => {
+    l.listen((c) => {
       let {
         location: g
-      } = l;
-      y({
+      } = c;
+      h({
         pathname: g.pathname,
         query: T.parse(g.search)
       });
     });
   }, {
     name: "subscribeHistoryFx",
-    sid: "h5gz6p"
-  }), h = V({
+    sid: "es8v7q"
+  }), p = H({
     and: {
       source: {
         query: s,
-        path: o
+        path: i
       },
-      effect: async (u) => {
+      effect: async (l) => {
         let {
-          query: y,
-          path: l
-        } = u;
+          query: h,
+          path: c
+        } = l;
         for (const {
           route: g,
-          fromPath: A
+          fromPath: P
         } of d) {
-          const N = A(l);
-          if (N)
+          const A = P(c);
+          if (A)
             await g.internal.openFx({
-              query: y,
-              params: N.params,
+              query: h,
+              params: A.params,
               historyIgnore: !0
             });
           else {
@@ -1088,65 +1090,59 @@ function We(e) {
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "e04f3o"
+      sid: "bmwb4p"
     }
   });
   for (const {
-    route: u,
-    toPath: y
+    route: l,
+    toPath: h
   } of d)
     F({
       and: [{
-        clock: u.opened,
+        clock: l.opened,
         source: a,
-        filter: (l) => !l.includes(u),
-        fn: (l) => [...l, u],
+        filter: (c) => !c.includes(l),
+        fn: (c) => [...c, l],
         target: a
       }],
       or: {
-        sid: "fhsl3g"
+        sid: "ff1m4n"
       }
     }), F({
       and: [{
-        clock: u.opened,
-        filter: (l) => !l.historyIgnore,
-        fn: function() {
-          let {
-            params: l,
-            query: g,
-            replace: A
-          } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
-            params: {}
-          };
+        clock: l.opened,
+        filter: (c) => !(c != null && c.historyIgnore),
+        fn: (c) => {
+          var g;
           return {
-            path: y(l),
-            query: g ?? {},
-            replace: A
+            path: h(c && "params" in c ? c.params : void 0),
+            query: (g = c == null ? void 0 : c.query) !== null && g !== void 0 ? g : {},
+            replace: c == null ? void 0 : c.replace
           };
         },
         target: b
       }],
       or: {
-        sid: "fxqmax"
+        sid: "fuznc4"
       }
     }), F({
       and: [{
-        clock: u.closed,
+        clock: l.closed,
         source: a,
-        fn: (l) => l.filter((g) => g !== u),
+        fn: (c) => c.filter((g) => g !== l),
         target: a
       }],
       or: {
-        sid: "gfc1ah"
+        sid: "ges8p4"
       }
     });
   return F({
     and: [{
-      clock: i,
+      clock: o,
       target: n
     }],
     or: {
-      sid: "gva2g8"
+      sid: "guq9uv"
     }
   }), F({
     and: [{
@@ -1155,49 +1151,49 @@ function We(e) {
       target: w
     }],
     or: {
-      sid: "h9kpvm"
+      sid: "gxh8to"
     }
   }), F({
     and: [{
-      clock: m,
-      fn: (u) => {
-        var y;
+      clock: y,
+      fn: (l) => {
+        var h;
         return {
-          path: u.pathname,
-          query: (y = u.query) !== null && y !== void 0 ? y : {}
+          path: l.pathname,
+          query: (h = l.query) !== null && h !== void 0 ? h : {}
         };
       },
       target: [le({
-        sid: "-382tqp",
+        sid: "-38mmc2",
         fn: () => de({
           targets: {
-            path: o,
+            path: i,
             query: s
           }
         }),
         name: "target",
         method: "spread"
-      }), h]
+      }), p]
     }],
     or: {
-      sid: "hcvhfs"
+      sid: "hcbouf"
     }
   }), {
     $query: s,
-    $path: o,
+    $path: i,
     $activeRoutes: a,
-    back: c,
-    forward: f,
+    back: f,
+    forward: u,
     routes: r,
-    setHistory: i,
+    setHistory: o,
     mappedRoutes: d,
     trackQuery: De(a, s),
     "@@unitShape": () => ({
       query: s,
-      path: o,
+      path: i,
       activeRoutes: a,
-      onBack: c,
-      onForward: f
+      onBack: f,
+      onForward: u
     })
   };
 }