@argon-router/core 0.5.0 → 0.5.1

package/dist/index.js

@@ -1,6 +1,6 @@
-import { createEffect as V, createStore as _, createEvent as $, sample as x, split as ue, attach as J, scopeBind as Oe, withFactory as xe } from "effector";
-import { spread as $e } from "patronum";
-function Z(e, t) {
+import { createEffect as B, createStore as T, createEvent as O, sample as x, split as ue, attach as ee, scopeBind as J, withFactory as xe } from "effector";
+import { spread as Fe } from "patronum";
+function re(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -13,15 +13,15 @@ function Z(e, t) {
 function H(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) {
-      Fe(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : Z(Object(r)).forEach(function(n) {
+    t % 2 ? re(Object(r), !0).forEach(function(n) {
+      $e(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : re(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function Fe(e, t, r) {
+function $e(e, t, r) {
   return (t = je(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
 }
 function je(e) {
@@ -40,55 +40,58 @@ function Se(e, t) {
 }
 function Ge(e) {
   let t;
-  const r = V(() => {
-    var y;
-    return (y = t) === null || y === void 0 ? void 0 : y();
+  const r = B(() => {
+    var l;
+    return (l = t) === null || l === void 0 ? void 0 : l();
   }, {
     name: "waitForAsyncBundleFx",
     sid: "tw7mq7"
-  }), n = V(async () => {
-    for (const R of (y = e.beforeOpen) !== null && y !== void 0 ? y : []) {
-      var y;
-      await R();
+  }), n = B(async () => {
+    for (const y of (l = e.beforeOpen) !== null && l !== void 0 ? l : []) {
+      var l;
+      await y();
     }
   }, {
     name: "beforeOpenFx",
     sid: "ls74w9"
-  }), a = V(async (y) => {
+  }), a = B(async (l) => {
     await r(), await n();
-    const R = e.parent;
-    return R && await R.internal.openFx(H(H({}, y ?? {
+    const y = e.parent;
+    return y && await y.internal.openFx(H(H({}, l ?? {
       params: {}
     }), {}, {
-      historyIgnore: !0
-    })), y;
+      navigate: !1
+    })), l;
   }, {
     name: "openFx",
     sid: "-hz9h5i"
-  }), u = _({}, {
+  }), i = T({}, {
     name: "$params",
     sid: "rstqrf"
-  }), s = _(!1, {
+  }), o = T(!1, {
     name: "$isOpened",
     sid: "-zgx6q9"
-  }), f = a.pending, w = $({
+  }), u = a.pending, w = O({
     name: "open",
     sid: "-cby6lj"
-  }), E = $({
+  }), P = O({
     name: "close",
     sid: "7uwhl1"
-  }), k = $({
+  }), E = O({
     name: "opened",
     sid: "44ryfn"
-  }), P = $({
+  }), v = O({
     name: "openedOnServer",
     sid: "-prk6y1"
-  }), A = $({
+  }), j = O({
     name: "openedOnClient",
     sid: "-fw2mlz"
-  }), S = $({
+  }), S = O({
+    name: "navigated",
+    sid: "d2ciwc"
+  }), A = O({
     name: "closed",
-    sid: "10jxi5"
+    sid: "1yn6aj"
   });
   x({
     and: [{
@@ -96,94 +99,85 @@ function Ge(e) {
       target: a
     }],
     or: {
-      sid: "t7vx9v"
+      sid: "t8zigl"
     }
   });
-  const v = {};
+  const k = {};
   return x({
     and: [{
-      clock: a.doneData,
-      fn: (y) => y && "params" in y ? H({}, y.params) : v,
-      target: u
+      clock: S,
+      fn: (l) => l && "params" in l ? H({}, l.params) : k,
+      target: i
     }],
     or: {
-      sid: "tna5vz"
+      sid: "todr2p"
     }
   }), ue({
     and: [{
-      source: a.doneData,
+      source: S,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: P,
-        client: A
+        server: v,
+        client: j
       }
     }],
     or: {
-      sid: "u5fdgw"
-    }
-  }), x({
-    and: [{
-      clock: [A, P],
-      target: k
-    }],
-    or: {
-      sid: "ylqojg"
+      sid: "u6iynm"
     }
   }), x({
     and: [{
-      clock: k,
-      fn: () => !0,
-      target: s
+      clock: [j, v],
+      target: E
     }],
     or: {
-      sid: "yohni9"
+      sid: "ymu9q6"
     }
   }), x({
     and: [{
-      clock: E,
-      target: S
+      clock: P,
+      target: A
     }],
     or: {
-      sid: "z3c3j0"
+      sid: "z14x5k"
     }
   }), x({
     and: [{
-      clock: S,
-      fn: () => !1,
-      target: s
+      clock: [E.map(() => !0), A.map(() => !1)],
+      target: o
     }],
     or: {
-      sid: "z632ht"
+      sid: "z3vw4d"
     }
   }), {
-    $params: u,
-    $isOpened: s,
-    $isPending: f,
+    $params: i,
+    $isOpened: o,
+    $isPending: u,
     open: w,
-    closed: S,
-    opened: k,
-    openedOnClient: A,
-    openedOnServer: P,
+    closed: A,
+    opened: E,
+    openedOnClient: j,
+    openedOnServer: v,
     internal: H({
-      close: E,
+      navigated: S,
+      close: P,
       openFx: a,
-      setAsyncImport: (y) => t = y
+      setAsyncImport: (l) => t = l
     }, e),
     "@@unitShape": () => ({
-      params: u,
-      isPending: f,
-      isOpened: s,
+      params: i,
+      isPending: u,
+      isOpened: o,
       onOpen: w
     })
   };
 }
-var C = {}, ee;
+var C = {}, te;
 function ve() {
-  if (ee) return C;
-  ee = 1, Object.defineProperty(C, "__esModule", {
+  if (te) return C;
+  te = 1, Object.defineProperty(C, "__esModule", {
     value: !0
-  }), C.TokenData = void 0, C.parse = P, C.compile = A, C.match = y, C.pathToRegexp = R, C.stringify = F;
-  const e = "/", t = (c) => c, r = /^[$_\p{ID_Start}]$/u, n = /^[$\u200c\u200d\p{ID_Continue}]$/u, a = "https://git.new/pathToRegexpError", u = {
+  }), C.TokenData = void 0, C.parse = v, C.compile = j, C.match = k, C.pathToRegexp = l, C.stringify = M;
+  const e = "/", t = (c) => c, r = /^[$_\p{ID_Start}]$/u, n = /^[$\u200c\u200d\p{ID_Continue}]$/u, a = "https://git.new/pathToRegexpError", i = {
     // Groups.
     "{": "{",
     "}": "}",
@@ -196,317 +190,317 @@ function ve() {
     "?": "?",
     "!": "!"
   };
-  function s(c) {
+  function o(c) {
     return c.replace(/[{}()\[\]+?!:*]/g, "\\$&");
   }
-  function f(c) {
+  function u(c) {
     return c.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
   }
   function* w(c) {
-    const i = [...c];
-    let o = 0;
-    function p() {
-      let l = "";
-      if (r.test(i[++o]))
-        for (l += i[o]; n.test(i[++o]); )
-          l += i[o];
-      else if (i[o] === '"') {
-        let d = o;
-        for (; o < i.length; ) {
-          if (i[++o] === '"') {
-            o++, d = 0;
+    const f = [...c];
+    let s = 0;
+    function m() {
+      let d = "";
+      if (r.test(f[++s]))
+        for (d += f[s]; n.test(f[++s]); )
+          d += f[s];
+      else if (f[s] === '"') {
+        let p = s;
+        for (; s < f.length; ) {
+          if (f[++s] === '"') {
+            s++, p = 0;
             break;
           }
-          i[o] === "\\" ? l += i[++o] : l += i[o];
+          f[s] === "\\" ? d += f[++s] : d += f[s];
         }
-        if (d)
-          throw new TypeError(`Unterminated quote at ${d}: ${a}`);
+        if (p)
+          throw new TypeError(`Unterminated quote at ${p}: ${a}`);
       }
-      if (!l)
-        throw new TypeError(`Missing parameter name at ${o}: ${a}`);
-      return l;
+      if (!d)
+        throw new TypeError(`Missing parameter name at ${s}: ${a}`);
+      return d;
     }
-    for (; o < i.length; ) {
-      const l = i[o], d = u[l];
-      if (d)
+    for (; s < f.length; ) {
+      const d = f[s], p = i[d];
+      if (p)
         yield {
-          type: d,
-          index: o++,
-          value: l
+          type: p,
+          index: s++,
+          value: d
         };
-      else if (l === "\\")
+      else if (d === "\\")
         yield {
           type: "ESCAPED",
-          index: o++,
-          value: i[o++]
+          index: s++,
+          value: f[s++]
         };
-      else if (l === ":") {
-        const O = p();
+      else if (d === ":") {
+        const b = m();
         yield {
           type: "PARAM",
-          index: o,
-          value: O
+          index: s,
+          value: b
         };
-      } else if (l === "*") {
-        const O = p();
+      } else if (d === "*") {
+        const b = m();
         yield {
           type: "WILDCARD",
-          index: o,
-          value: O
+          index: s,
+          value: b
         };
       } else
         yield {
           type: "CHAR",
-          index: o,
-          value: i[o++]
+          index: s,
+          value: f[s++]
         };
     }
     return {
       type: "END",
-      index: o,
+      index: s,
       value: ""
     };
   }
-  class E {
-    constructor(i) {
-      this.tokens = i;
+  class P {
+    constructor(f) {
+      this.tokens = f;
     }
     peek() {
       if (!this._peek) {
-        const i = this.tokens.next();
-        this._peek = i.value;
+        const f = this.tokens.next();
+        this._peek = f.value;
       }
       return this._peek;
     }
-    tryConsume(i) {
-      const o = this.peek();
-      if (o.type === i)
-        return this._peek = void 0, o.value;
+    tryConsume(f) {
+      const s = this.peek();
+      if (s.type === f)
+        return this._peek = void 0, s.value;
     }
-    consume(i) {
-      const o = this.tryConsume(i);
-      if (o !== void 0) return o;
+    consume(f) {
+      const s = this.tryConsume(f);
+      if (s !== void 0) return s;
       const {
-        type: p,
-        index: l
+        type: m,
+        index: d
       } = this.peek();
-      throw new TypeError(`Unexpected ${p} at ${l}, expected ${i}: ${a}`);
+      throw new TypeError(`Unexpected ${m} at ${d}, expected ${f}: ${a}`);
     }
     text() {
-      let i = "", o;
-      for (; o = this.tryConsume("CHAR") || this.tryConsume("ESCAPED"); )
-        i += o;
-      return i;
+      let f = "", s;
+      for (; s = this.tryConsume("CHAR") || this.tryConsume("ESCAPED"); )
+        f += s;
+      return f;
     }
   }
-  class k {
-    constructor(i) {
-      this.tokens = i;
+  class E {
+    constructor(f) {
+      this.tokens = f;
     }
   }
-  C.TokenData = k;
-  function P(c, i = {}) {
+  C.TokenData = E;
+  function v(c, f = {}) {
     const {
-      encodePath: o = t
-    } = i, p = new E(w(c));
-    function l(O) {
+      encodePath: s = t
+    } = f, m = new P(w(c));
+    function d(b) {
       const g = [];
       for (; ; ) {
-        const N = p.text();
+        const N = m.text();
         N && g.push({
           type: "text",
-          value: o(N)
+          value: s(N)
         });
-        const D = p.tryConsume("PARAM");
-        if (D) {
+        const R = m.tryConsume("PARAM");
+        if (R) {
           g.push({
             type: "param",
-            name: D
+            name: R
           });
           continue;
         }
-        const B = p.tryConsume("WILDCARD");
-        if (B) {
+        const L = m.tryConsume("WILDCARD");
+        if (L) {
           g.push({
             type: "wildcard",
-            name: B
+            name: L
           });
           continue;
         }
-        if (p.tryConsume("{")) {
+        if (m.tryConsume("{")) {
           g.push({
             type: "group",
-            tokens: l("}")
+            tokens: d("}")
           });
           continue;
         }
-        return p.consume(O), g;
+        return m.consume(b), g;
       }
     }
-    const d = l("END");
-    return new k(d);
+    const p = d("END");
+    return new E(p);
   }
-  function A(c, i = {}) {
+  function j(c, f = {}) {
     const {
-      encode: o = encodeURIComponent,
-      delimiter: p = e
-    } = i, l = c instanceof k ? c : P(c, i), d = S(l.tokens, p, o);
+      encode: s = encodeURIComponent,
+      delimiter: m = e
+    } = f, d = c instanceof E ? c : v(c, f), p = S(d.tokens, m, s);
     return function(g = {}) {
-      const [N, ...D] = d(g);
-      if (D.length)
-        throw new TypeError(`Missing parameters: ${D.join(", ")}`);
+      const [N, ...R] = p(g);
+      if (R.length)
+        throw new TypeError(`Missing parameters: ${R.join(", ")}`);
       return N;
     };
   }
-  function S(c, i, o) {
-    const p = c.map((l) => v(l, i, o));
-    return (l) => {
-      const d = [""];
-      for (const O of p) {
-        const [g, ...N] = O(l);
-        d[0] += g, d.push(...N);
+  function S(c, f, s) {
+    const m = c.map((d) => A(d, f, s));
+    return (d) => {
+      const p = [""];
+      for (const b of m) {
+        const [g, ...N] = b(d);
+        p[0] += g, p.push(...N);
       }
-      return d;
+      return p;
     };
   }
-  function v(c, i, o) {
+  function A(c, f, s) {
     if (c.type === "text") return () => [c.value];
     if (c.type === "group") {
-      const l = S(c.tokens, i, o);
-      return (d) => {
-        const [O, ...g] = l(d);
-        return g.length ? [""] : [O];
+      const d = S(c.tokens, f, s);
+      return (p) => {
+        const [b, ...g] = d(p);
+        return g.length ? [""] : [b];
       };
     }
-    const p = o || t;
-    return c.type === "wildcard" && o !== !1 ? (l) => {
-      const d = l[c.name];
-      if (d == null) return ["", c.name];
-      if (!Array.isArray(d) || d.length === 0)
+    const m = s || t;
+    return c.type === "wildcard" && s !== !1 ? (d) => {
+      const p = d[c.name];
+      if (p == null) return ["", c.name];
+      if (!Array.isArray(p) || p.length === 0)
         throw new TypeError(`Expected "${c.name}" to be a non-empty array`);
-      return [d.map((O, g) => {
-        if (typeof O != "string")
+      return [p.map((b, g) => {
+        if (typeof b != "string")
           throw new TypeError(`Expected "${c.name}/${g}" to be a string`);
-        return p(O);
-      }).join(i)];
-    } : (l) => {
-      const d = l[c.name];
-      if (d == null) return ["", c.name];
-      if (typeof d != "string")
+        return m(b);
+      }).join(f)];
+    } : (d) => {
+      const p = d[c.name];
+      if (p == null) return ["", c.name];
+      if (typeof p != "string")
         throw new TypeError(`Expected "${c.name}" to be a string`);
-      return [p(d)];
+      return [m(p)];
     };
   }
-  function y(c, i = {}) {
+  function k(c, f = {}) {
     const {
-      decode: o = decodeURIComponent,
-      delimiter: p = e
-    } = i, {
-      regexp: l,
-      keys: d
-    } = R(c, i), O = d.map((g) => o === !1 ? t : g.type === "param" ? o : (N) => N.split(p).map(o));
+      decode: s = decodeURIComponent,
+      delimiter: m = e
+    } = f, {
+      regexp: d,
+      keys: p
+    } = l(c, f), b = p.map((g) => s === !1 ? t : g.type === "param" ? s : (N) => N.split(m).map(s));
     return function(N) {
-      const D = l.exec(N);
-      if (!D) return !1;
-      const B = D[0], z = /* @__PURE__ */ Object.create(null);
-      for (let L = 1; L < D.length; L++) {
-        if (D[L] === void 0) continue;
-        const M = d[L - 1], K = O[L - 1];
-        z[M.name] = K(D[L]);
+      const R = d.exec(N);
+      if (!R) return !1;
+      const L = R[0], U = /* @__PURE__ */ Object.create(null);
+      for (let z = 1; z < R.length; z++) {
+        if (R[z] === void 0) continue;
+        const q = p[z - 1], K = b[z - 1];
+        U[q.name] = K(R[z]);
       }
       return {
-        path: B,
-        params: z
+        path: L,
+        params: U
       };
     };
   }
-  function R(c, i = {}) {
+  function l(c, f = {}) {
     const {
-      delimiter: o = e,
-      end: p = !0,
-      sensitive: l = !1,
-      trailing: d = !0
-    } = i, O = [], g = [], N = l ? "" : "i", B = (Array.isArray(c) ? c : [c]).map((M) => M instanceof k ? M : P(M, i));
+      delimiter: s = e,
+      end: m = !0,
+      sensitive: d = !1,
+      trailing: p = !0
+    } = f, b = [], g = [], N = d ? "" : "i", L = (Array.isArray(c) ? c : [c]).map((q) => q instanceof E ? q : v(q, f));
     for (const {
-      tokens: M
-    } of B)
-      for (const K of h(M, 0, [])) {
-        const we = b(K, o, O);
-        g.push(we);
+      tokens: q
+    } of L)
+      for (const K of y(q, 0, [])) {
+        const Oe = h(K, s, b);
+        g.push(Oe);
       }
-    let z = `^(?:${g.join("|")})`;
-    return d && (z += `(?:${f(o)}$)?`), z += p ? "$" : `(?=${f(o)}|$)`, {
-      regexp: new RegExp(z, N),
-      keys: O
+    let U = `^(?:${g.join("|")})`;
+    return p && (U += `(?:${u(s)}$)?`), U += m ? "$" : `(?=${u(s)}|$)`, {
+      regexp: new RegExp(U, N),
+      keys: b
     };
   }
-  function* h(c, i, o) {
-    if (i === c.length)
-      return yield o;
-    const p = c[i];
-    if (p.type === "group") {
-      const l = o.slice();
-      for (const d of h(p.tokens, 0, l))
-        yield* h(c, i + 1, d);
+  function* y(c, f, s) {
+    if (f === c.length)
+      return yield s;
+    const m = c[f];
+    if (m.type === "group") {
+      const d = s.slice();
+      for (const p of y(m.tokens, 0, d))
+        yield* y(c, f + 1, p);
     } else
-      o.push(p);
-    yield* h(c, i + 1, o);
+      s.push(m);
+    yield* y(c, f + 1, s);
   }
-  function b(c, i, o) {
-    let p = "", l = "", d = !0;
-    for (let O = 0; O < c.length; O++) {
-      const g = c[O];
+  function h(c, f, s) {
+    let m = "", d = "", p = !0;
+    for (let b = 0; b < c.length; b++) {
+      const g = c[b];
       if (g.type === "text") {
-        p += f(g.value), l += g.value, d || (d = g.value.includes(i));
+        m += u(g.value), d += g.value, p || (p = g.value.includes(f));
         continue;
       }
       if (g.type === "param" || g.type === "wildcard") {
-        if (!d && !l)
+        if (!p && !d)
           throw new TypeError(`Missing text after "${g.name}": ${a}`);
-        g.type === "param" ? p += `(${m(i, d ? "" : l)}+)` : p += "([\\s\\S]+)", o.push(g), l = "", d = !1;
+        g.type === "param" ? m += `(${$(f, p ? "" : d)}+)` : m += "([\\s\\S]+)", s.push(g), d = "", p = !1;
         continue;
       }
     }
-    return p;
+    return m;
   }
-  function m(c, i) {
-    return i.length < 2 ? c.length < 2 ? `[^${f(c + i)}]` : `(?:(?!${f(c)})[^${f(i)}])` : c.length < 2 ? `(?:(?!${f(i)})[^${f(c)}])` : `(?:(?!${f(i)}|${f(c)})[\\s\\S])`;
+  function $(c, f) {
+    return f.length < 2 ? c.length < 2 ? `[^${u(c + f)}]` : `(?:(?!${u(c)})[^${u(f)}])` : c.length < 2 ? `(?:(?!${u(f)})[^${u(c)}])` : `(?:(?!${u(f)}|${u(c)})[\\s\\S])`;
   }
-  function F(c) {
-    return c.tokens.map(function i(o, p, l) {
-      if (o.type === "text") return s(o.value);
-      if (o.type === "group")
-        return `{${o.tokens.map(i).join("")}}`;
-      const O = q(o.name) && I(l[p + 1]) ? o.name : JSON.stringify(o.name);
-      if (o.type === "param") return `:${O}`;
-      if (o.type === "wildcard") return `*${O}`;
-      throw new TypeError(`Unexpected token: ${o}`);
+  function M(c) {
+    return c.tokens.map(function f(s, m, d) {
+      if (s.type === "text") return o(s.value);
+      if (s.type === "group")
+        return `{${s.tokens.map(f).join("")}}`;
+      const b = _(s.name) && V(d[m + 1]) ? s.name : JSON.stringify(s.name);
+      if (s.type === "param") return `:${b}`;
+      if (s.type === "wildcard") return `*${b}`;
+      throw new TypeError(`Unexpected token: ${s}`);
     }).join("");
   }
-  function q(c) {
-    const [i, ...o] = c;
-    return r.test(i) ? o.every((p) => n.test(p)) : !1;
+  function _(c) {
+    const [f, ...s] = c;
+    return r.test(f) ? s.every((m) => n.test(m)) : !1;
   }
-  function I(c) {
+  function V(c) {
     return (c == null ? void 0 : c.type) !== "text" ? !0 : !n.test(c.value[0]);
   }
   return C;
 }
-var re = ve();
-const Ee = Symbol("any"), ke = Symbol("number"), Pe = Symbol("string"), Ae = Symbol("array"), Re = Symbol("boolean"), T = {
+var ne = ve();
+const Ee = Symbol("any"), Pe = Symbol("number"), Ae = Symbol("string"), ke = Symbol("array"), Ne = Symbol("boolean"), D = {
   any: Ee,
-  number: ke,
-  string: Pe,
-  array: Ae,
-  boolean: Re
+  number: Pe,
+  string: Ae,
+  array: ke,
+  boolean: Ne
 };
-function te(e, t) {
+function ae(e, t) {
   for (const r of e)
     if (t.includes(r))
       return !0;
   return !1;
 }
-function ne(e, t) {
+function se(e, t) {
   for (const r in t) {
     const n = t[r];
     if (Array.isArray(n) && (!e[r] || JSON.stringify(n) !== e[r]))
@@ -534,27 +528,27 @@ function ne(e, t) {
       }
     }
     switch (n) {
-      case T.any: {
+      case D.any: {
         if (!e[r])
           return !1;
         break;
       }
-      case T.string: {
+      case D.string: {
         if (!e[r] || Array.isArray(e[r]))
           return !1;
         break;
       }
-      case T.array: {
+      case D.array: {
         if (!e[r] || !Array.isArray(e[r]))
           return !1;
         break;
       }
-      case T.number: {
+      case D.number: {
         if (!e[r] || Array.isArray(e[r]) || isNaN(parseInt(e[r])) && isNaN(parseFloat(e[r])))
           return !1;
         break;
       }
-      case T.boolean: {
+      case D.boolean: {
         if (!e[r] || Array.isArray(e[r]) || !["0", "1", "false", "true"].includes(e[r]))
           return !1;
         break;
@@ -563,172 +557,162 @@ function ne(e, t) {
   }
   return !0;
 }
-function Ne(e, t) {
+function Re(e, t) {
   const r = {};
   for (const n in t) {
-    const a = t[n], u = e[n];
+    const a = t[n], i = e[n];
     if (Array.isArray(a)) {
-      const s = e[n];
-      r[n] = s;
+      const o = e[n];
+      r[n] = o;
       continue;
     }
     switch (typeof a) {
       case "number": {
-        r[n] = isNaN(parseInt(u)) ? parseFloat(u) : parseInt(u);
+        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
         break;
       }
       case "object": {
-        r[n] = JSON.parse(u);
+        r[n] = JSON.parse(i);
         break;
       }
       case "string":
-        r[n] = u;
+        r[n] = i;
       case "boolean": {
-        r[n] = u === "1" || u === "true";
+        r[n] = i === "1" || i === "true";
         break;
       }
     }
     switch (a) {
-      case T.any:
-      case T.string:
-      case T.array: {
+      case D.any:
+      case D.string:
+      case D.array: {
         r[n] = e[n];
         break;
       }
-      case T.number: {
-        const s = e[n];
-        r[n] = isNaN(parseInt(s)) ? parseFloat(s) : parseInt(s);
+      case D.number: {
+        const o = e[n];
+        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
         break;
       }
-      case T.boolean: {
-        const s = e[n];
-        r[n] = s === "1" || s === "true";
+      case D.boolean: {
+        const o = e[n];
+        r[n] = o === "1" || o === "true";
         break;
       }
     }
   }
   return r;
 }
-function De(e) {
+function Ce(e) {
   let {
     $activeRoutes: t,
-    $path: r,
-    $query: n,
-    navigateFx: a
+    $query: r,
+    navigate: n
   } = e;
-  return (u) => {
+  return (a) => {
     const {
-      parameters: s,
-      forRoutes: f
-    } = u, w = _(!1, {
+      parameters: i,
+      forRoutes: o
+    } = a, u = T(!1, {
       name: "$entered",
-      sid: "jh7pkx"
-    }), E = $({
+      sid: "vsdvtz"
+    }), w = O({
       name: "entered",
-      sid: "-savym4"
-    }), k = $({
+      sid: "-fzpsd2"
+    }), P = O({
       name: "exited",
-      sid: "m5ggn3"
-    }), P = $({
+      sid: "ygmmw5"
+    }), E = O({
       name: "exit",
-      sid: "-bgcxp1"
-    }), A = $({
+      sid: "-934tq2"
+    }), v = O({
       name: "changeEntered",
-      sid: "-2ei1v0"
+      sid: "-19xw1"
     });
     return x({
       and: [{
-        clock: A,
-        target: w
+        clock: v,
+        target: u
       }],
       or: {
-        sid: "-hckvl5"
+        sid: "-h9twmc"
       }
     }), x({
       and: [{
         source: {
           activeRoutes: t,
-          query: n
+          query: r
         },
-        filter: (S) => {
+        filter: (j) => {
           let {
-            activeRoutes: v,
-            query: y
-          } = S;
-          return (!f || te(f, v)) && ne(y, s);
+            activeRoutes: S,
+            query: A
+          } = j;
+          return (!o || ae(o, S)) && se(A, i);
         },
-        fn: (S) => {
+        fn: (j) => {
           let {
-            query: v
-          } = S;
-          return Ne(v, s);
+            query: S
+          } = j;
+          return Re(S, i);
         },
-        target: [E, A.prepend(() => !0)]
+        target: [w, v.prepend(() => !0)]
       }],
       or: {
-        sid: "-h9twmc"
+        sid: "-gvj96y"
       }
     }), x({
       and: [{
         source: {
           activeRoutes: t,
-          query: n,
-          entered: w
+          query: r,
+          entered: u
         },
-        filter: (S) => {
+        filter: (j) => {
           let {
-            activeRoutes: v,
-            query: y,
-            entered: R
-          } = S;
-          return R && !((!f || te(f, v)) && ne(y, s));
+            activeRoutes: S,
+            query: A,
+            entered: k
+          } = j;
+          return k && !((!o || ae(o, S)) && se(A, i));
         },
-        target: [k.prepend(() => {
-        }), A.prepend(() => !1)]
+        target: [P.prepend(() => {
+        }), v.prepend(() => !1)]
       }],
       or: {
-        sid: "-gtc2ti"
+        sid: "-gf1fe4"
       }
     }), x({
       and: [{
-        clock: P,
-        source: {
-          path: r,
-          query: n
-        },
-        fn: (S, v) => {
-          let {
-            path: y,
-            query: R
-          } = S;
-          if (v && v.ignoreParams) {
-            const h = {};
-            for (const b of v.ignoreParams)
-              R[b] && (h[b] = R[b]);
+        clock: E,
+        source: r,
+        fn: (j, S) => {
+          if (S && S.ignoreParams) {
+            const A = {};
+            for (const k of S.ignoreParams)
+              j[k] && (A[k] = j[k]);
             return {
-              query: h,
-              path: y
+              query: A
             };
           }
           return {
-            query: {},
-            path: y
+            query: {}
           };
         },
-        target: a
+        target: n
       }],
       or: {
-        sid: "-fyjlla"
+        sid: "-fvsmmh"
       }
     }), {
-      entered: E,
-      exited: k,
-      exit: P
+      entered: w,
+      exited: P,
+      exit: E
     };
   };
 }
-const fe = "%[a-f0-9]{2}", ae = new RegExp("(" + fe + ")|([^%]+?)", "gi"), se = new RegExp("(" + fe + ")+", "gi");
-function W(e, t) {
+const le = "%[a-f0-9]{2}", oe = new RegExp("(" + le + ")|([^%]+?)", "gi"), ie = new RegExp("(" + le + ")+", "gi");
+function G(e, t) {
   try {
     return [decodeURIComponent(e.join(""))];
   } catch {
@@ -737,32 +721,32 @@ function W(e, t) {
     return e;
   t = t || 1;
   const r = e.slice(0, t), n = e.slice(t);
-  return Array.prototype.concat.call([], W(r), W(n));
+  return Array.prototype.concat.call([], G(r), G(n));
 }
-function Ie(e) {
+function De(e) {
   try {
     return decodeURIComponent(e);
   } catch {
-    let t = e.match(ae) || [];
+    let t = e.match(oe) || [];
     for (let r = 1; r < t.length; r++)
-      e = W(t, r).join(""), t = e.match(ae) || [];
+      e = G(t, r).join(""), t = e.match(oe) || [];
     return e;
   }
 }
-function Ce(e) {
+function Ie(e) {
   const t = {
     "%FE%FF": "��",
     "%FF%FE": "��"
   };
-  let r = se.exec(e);
+  let r = ie.exec(e);
   for (; r; ) {
     try {
       t[r[0]] = decodeURIComponent(r[0]);
     } catch {
-      const a = Ie(r[0]);
+      const a = De(r[0]);
       a !== r[0] && (t[r[0]] = a);
     }
-    r = se.exec(e);
+    r = ie.exec(e);
   }
   t["%C2"] = "�";
   const n = Object.keys(t);
@@ -776,10 +760,10 @@ function Te(e) {
   try {
     return decodeURIComponent(e);
   } catch {
-    return Ce(e);
+    return Ie(e);
   }
 }
-function Ue(e, t) {
+function _e(e, t) {
   const r = {};
   if (Array.isArray(t))
     for (const n of t) {
@@ -790,13 +774,13 @@ function Ue(e, t) {
     for (const n of Reflect.ownKeys(e)) {
       const a = Object.getOwnPropertyDescriptor(e, n);
       if (a.enumerable) {
-        const u = e[n];
-        t(n, u, e) && Object.defineProperty(r, n, a);
+        const i = e[n];
+        t(n, i, e) && Object.defineProperty(r, n, a);
       }
     }
   return r;
 }
-function le(e, t) {
+function de(e, t) {
   if (!(typeof e == "string" && typeof t == "string"))
     throw new TypeError("Expected the arguments to be of type `string`");
   if (e === "" || t === "")
@@ -804,26 +788,26 @@ function le(e, t) {
   const r = e.indexOf(t);
   return r === -1 ? [] : [e.slice(0, r), e.slice(r + t.length)];
 }
-const _e = (e) => e == null, qe = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), G = Symbol("encodeFragmentIdentifier");
-function ze(e) {
+const Ue = (e) => e == null, ze = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), X = Symbol("encodeFragmentIdentifier");
+function qe(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, [j(t, e), "[", a, "]"].join("")] : [...r, [j(t, e), "[", j(a, e), "]=", j(n, e)].join("")];
+        return n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [F(t, e), "[", a, "]"].join("")] : [...r, [F(t, e), "[", F(a, e), "]=", F(n, e)].join("")];
       };
     case "bracket":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [j(t, e), "[]"].join("")] : [...r, [j(t, e), "[]=", j(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [F(t, e), "[]"].join("")] : [...r, [F(t, e), "[]=", F(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, [j(t, e), ":list="].join("")] : [...r, [j(t, e), ":list=", j(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [F(t, e), ":list="].join("")] : [...r, [F(t, e), ":list=", F(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 ? [[j(r, e), t, j(a, e)].join("")] : [[n, j(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 ? [[F(r, e), t, F(a, e)].join("")] : [[n, F(a, e)].join(e.arrayFormatSeparator)]);
     }
     default:
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, j(t, e)] : [...r, [j(t, e), "=", j(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, F(t, e)] : [...r, [F(t, e), "=", F(n, e)].join("")];
   }
 }
 function Le(e) {
@@ -864,24 +848,24 @@ function Le(e) {
     case "comma":
     case "separator":
       return (r, n, a) => {
-        const u = typeof n == "string" && n.includes(e.arrayFormatSeparator), s = typeof n == "string" && !u && U(n, e).includes(e.arrayFormatSeparator);
-        n = s ? U(n, e) : n;
-        const f = u || s ? n.split(e.arrayFormatSeparator).map((w) => U(w, e)) : n === null ? n : U(n, e);
-        a[r] = f;
+        const i = typeof n == "string" && n.includes(e.arrayFormatSeparator), o = typeof n == "string" && !i && I(n, e).includes(e.arrayFormatSeparator);
+        n = o ? I(n, e) : n;
+        const u = i || o ? n.split(e.arrayFormatSeparator).map((w) => I(w, e)) : n === null ? n : I(n, e);
+        a[r] = u;
       };
     case "bracket-separator":
       return (r, n, a) => {
-        const u = /(\[])$/.test(r);
-        if (r = r.replace(/\[]$/, ""), !u) {
-          a[r] = n && U(n, e);
+        const i = /(\[])$/.test(r);
+        if (r = r.replace(/\[]$/, ""), !i) {
+          a[r] = n && I(n, e);
           return;
         }
-        const s = n === null ? [] : U(n, e).split(e.arrayFormatSeparator);
+        const o = n === null ? [] : I(n, e).split(e.arrayFormatSeparator);
         if (a[r] === void 0) {
-          a[r] = s;
+          a[r] = o;
           return;
         }
-        a[r] = [...a[r], ...s];
+        a[r] = [...a[r], ...o];
       };
     default:
       return (r, n, a) => {
@@ -893,20 +877,20 @@ function Le(e) {
       };
   }
 }
-function de(e) {
+function pe(e) {
   if (typeof e != "string" || e.length !== 1)
     throw new TypeError("arrayFormatSeparator must be single character string");
 }
-function j(e, t) {
-  return t.encode ? t.strict ? qe(e) : encodeURIComponent(e) : e;
+function F(e, t) {
+  return t.encode ? t.strict ? ze(e) : encodeURIComponent(e) : e;
 }
-function U(e, t) {
+function I(e, t) {
   return t.decode ? Te(e) : e;
 }
-function pe(e) {
-  return Array.isArray(e) ? e.sort() : typeof e == "object" ? pe(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
-}
 function me(e) {
+  return Array.isArray(e) ? e.sort() : typeof e == "object" ? me(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
+}
+function ye(e) {
   const t = e.indexOf("#");
   return t !== -1 && (e = e.slice(0, t)), e;
 }
@@ -915,15 +899,15 @@ function Me(e) {
   const r = e.indexOf("#");
   return r !== -1 && (t = e.slice(r)), t;
 }
-function oe(e, t, r) {
+function ce(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 X(e) {
-  e = me(e);
+function Y(e) {
+  e = ye(e);
   const t = e.indexOf("?");
   return t === -1 ? "" : e.slice(t + 1);
 }
-function Y(e, t) {
+function Z(e, t) {
   t = {
     decode: !0,
     sort: !0,
@@ -933,30 +917,30 @@ function Y(e, t) {
     parseBooleans: !1,
     types: /* @__PURE__ */ Object.create(null),
     ...t
-  }, de(t.arrayFormatSeparator);
+  }, pe(t.arrayFormatSeparator);
   const r = Le(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 u = t.decode ? a.replaceAll("+", " ") : a;
-    let [s, f] = le(u, "=");
-    s === void 0 && (s = u), f = f === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? f : U(f, t), r(U(s, t), f, n);
+    const i = t.decode ? a.replaceAll("+", " ") : a;
+    let [o, u] = de(i, "=");
+    o === void 0 && (o = i), u = u === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? u : I(u, t), r(I(o, t), u, n);
   }
-  for (const [a, u] of Object.entries(n))
-    if (typeof u == "object" && u !== null && t.types[a] !== "string")
-      for (const [s, f] of Object.entries(u)) {
+  for (const [a, i] of Object.entries(n))
+    if (typeof i == "object" && i !== null && t.types[a] !== "string")
+      for (const [o, u] of Object.entries(i)) {
         const w = t.types[a] ? t.types[a].replace("[]", "") : void 0;
-        u[s] = oe(f, t, w);
+        i[o] = ce(u, t, w);
       }
-    else typeof u == "object" && u !== null && t.types[a] === "string" ? n[a] = Object.values(u).join(t.arrayFormatSeparator) : n[a] = oe(u, t, t.types[a]);
-  return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, u) => {
-    const s = n[u];
-    return a[u] = s && typeof s == "object" && !Array.isArray(s) ? pe(s) : s, a;
+    else typeof i == "object" && i !== null && t.types[a] === "string" ? n[a] = Object.values(i).join(t.arrayFormatSeparator) : n[a] = ce(i, t, t.types[a]);
+  return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, i) => {
+    const o = n[i];
+    return a[i] = o && typeof o == "object" && !Array.isArray(o) ? me(o) : o, a;
   }, /* @__PURE__ */ Object.create(null));
 }
-function ye(e, t) {
+function ge(e, t) {
   if (!e)
     return "";
   t = {
@@ -965,85 +949,85 @@ function ye(e, t) {
     arrayFormat: "none",
     arrayFormatSeparator: ",",
     ...t
-  }, de(t.arrayFormatSeparator);
-  const r = (s) => t.skipNull && _e(e[s]) || t.skipEmptyString && e[s] === "", n = ze(t), a = {};
-  for (const [s, f] of Object.entries(e))
-    r(s) || (a[s] = f);
-  const u = Object.keys(a);
-  return t.sort !== !1 && u.sort(t.sort), u.map((s) => {
-    const f = e[s];
-    return f === void 0 ? "" : f === null ? j(s, t) : Array.isArray(f) ? f.length === 0 && t.arrayFormat === "bracket-separator" ? j(s, t) + "[]" : f.reduce(n(s), []).join("&") : j(s, t) + "=" + j(f, t);
-  }).filter((s) => s.length > 0).join("&");
+  }, pe(t.arrayFormatSeparator);
+  const r = (o) => t.skipNull && Ue(e[o]) || t.skipEmptyString && e[o] === "", n = qe(t), a = {};
+  for (const [o, u] of Object.entries(e))
+    r(o) || (a[o] = u);
+  const i = Object.keys(a);
+  return t.sort !== !1 && i.sort(t.sort), i.map((o) => {
+    const u = e[o];
+    return u === void 0 ? "" : u === null ? F(o, t) : Array.isArray(u) ? u.length === 0 && t.arrayFormat === "bracket-separator" ? F(o, t) + "[]" : u.reduce(n(o), []).join("&") : F(o, t) + "=" + F(u, t);
+  }).filter((o) => o.length > 0).join("&");
 }
-function ge(e, t) {
+function he(e, t) {
   var a;
   t = {
     decode: !0,
     ...t
   };
-  let [r, n] = le(e, "#");
+  let [r, n] = de(e, "#");
   return r === void 0 && (r = e), {
     url: ((a = r == null ? void 0 : r.split("?")) == null ? void 0 : a[0]) ?? "",
-    query: Y(X(e), t),
+    query: Z(Y(e), t),
     ...t && t.parseFragmentIdentifier && n ? {
-      fragmentIdentifier: U(n, t)
+      fragmentIdentifier: I(n, t)
     } : {}
   };
 }
-function he(e, t) {
+function be(e, t) {
   t = {
     encode: !0,
     strict: !0,
-    [G]: !0,
+    [X]: !0,
     ...t
   };
-  const r = me(e.url).split("?")[0] || "", n = X(e.url), a = {
-    ...Y(n, {
+  const r = ye(e.url).split("?")[0] || "", n = Y(e.url), a = {
+    ...Z(n, {
       sort: !1
     }),
     ...e.query
   };
-  let u = ye(a, t);
-  u && (u = `?${u}`);
-  let s = Me(e.url);
+  let i = ge(a, t);
+  i && (i = `?${i}`);
+  let o = Me(e.url);
   if (typeof e.fragmentIdentifier == "string") {
-    const f = new URL(r);
-    f.hash = e.fragmentIdentifier, s = t[G] ? f.hash : `#${e.fragmentIdentifier}`;
+    const u = new URL(r);
+    u.hash = e.fragmentIdentifier, o = t[X] ? u.hash : `#${e.fragmentIdentifier}`;
   }
-  return `${r}${u}${s}`;
+  return `${r}${i}${o}`;
 }
-function be(e, t, r) {
+function we(e, t, r) {
   r = {
     parseFragmentIdentifier: !0,
-    [G]: !1,
+    [X]: !1,
     ...r
   };
   const {
     url: n,
     query: a,
-    fragmentIdentifier: u
-  } = ge(e, r);
-  return he({
+    fragmentIdentifier: i
+  } = he(e, r);
+  return be({
     url: n,
-    query: Ue(a, t),
-    fragmentIdentifier: u
+    query: _e(a, t),
+    fragmentIdentifier: i
   }, r);
 }
 function Be(e, t, r) {
-  const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, u) => !t(a, u);
-  return be(e, n, r);
+  const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, i) => !t(a, i);
+  return we(e, n, r);
 }
 const Q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   exclude: Be,
-  extract: X,
-  parse: Y,
-  parseUrl: ge,
-  pick: be,
-  stringify: ye,
-  stringifyUrl: he
+  extract: Y,
+  parse: Z,
+  parseUrl: he,
+  pick: we,
+  stringify: ge,
+  stringifyUrl: be
 }, Symbol.toStringTag, { value: "Module" }));
-function ie(e, t) {
+function fe(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -1053,12 +1037,12 @@ function ie(e, t) {
   }
   return r;
 }
-function ce(e) {
+function W(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? ie(Object(r), !0).forEach(function(n) {
+    t % 2 ? fe(Object(r), !0).forEach(function(n) {
       He(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : ie(Object(r)).forEach(function(n) {
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : fe(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
@@ -1085,208 +1069,174 @@ function Xe(e) {
   const {
     base: t = "/",
     routes: r
-  } = e, n = _({
-    skipUpdate: !1
-  }, {
-    name: "$meta",
-    sid: "ku65ys"
-  }), a = _(null, {
+  } = e, n = T(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "23j1rc"
-  }), u = _({}, {
+    sid: "31majq"
+  }), a = T({}, {
     name: "$query",
-    sid: "3deub8"
-  }), s = _(null, {
+    sid: "4bi33m"
+  }), i = T(null, {
     name: "$path",
-    sid: "ld3nhr"
-  }), f = $({
+    sid: "mb6wa5"
+  }), o = O({
     name: "setHistory",
-    sid: "hzl7xm"
-  }), w = $({
+    sid: "svmj03"
+  }), u = O({
     name: "navigate",
-    sid: "-82vbjo"
-  }), E = $({
+    sid: "-74s2ra"
+  }), w = O({
     name: "back",
-    sid: "-icnnoo"
-  }), k = $({
+    sid: "-hekewa"
+  }), P = O({
     name: "forward",
-    sid: "-72o1my"
-  }), P = $({
+    sid: "-64ksuk"
+  }), E = O({
     name: "locationUpdated",
-    sid: "d8lu52"
-  }), A = r.map((h) => {
-    let b = h;
-    const m = [];
-    for (m.unshift(b.internal.path); b.internal.parent; )
-      b = b.internal.parent, b.internal.path !== "/" && m.unshift(b.internal.path);
-    const F = t === "/" ? m.join("") : [t, ...m].join("");
+    sid: "e6p2xg"
+  }), v = r.map((l) => {
+    let y = l;
+    const h = [];
+    for (h.unshift(y.internal.path); y.internal.parent; )
+      y = y.internal.parent, y.internal.path !== "/" && h.unshift(y.internal.path);
+    const $ = t === "/" ? h.join("") : [t, ...h].join("");
     return {
-      route: h,
-      path: F,
-      toPath: re.compile(F),
-      fromPath: re.match(F)
+      route: l,
+      path: $,
+      toPath: ne.compile($),
+      fromPath: ne.match($)
     };
-  }), S = s.map((h) => {
-    const b = [];
+  }), j = i.map((l) => {
+    const y = [];
     for (const {
-      route: m,
-      fromPath: F
-    } of A)
-      F(h) && b.push(m);
-    return b;
-  }), v = J({
+      route: h,
+      fromPath: $
+    } of v)
+      $(l) && y.push(h);
+    return y;
+  }), S = ee({
     and: {
-      source: {
-        history: a,
-        meta: n
-      },
-      effect: async (h, b) => {
+      source: n,
+      effect: (l, y) => {
         let {
-          history: m,
-          meta: F
-        } = h, {
-          path: q,
-          query: I,
-          replace: c
-        } = b;
-        if (!m)
+          path: h,
+          query: $,
+          replace: M
+        } = y;
+        if (!l)
           throw new Error("history not found");
-        if (F.skipUpdate) {
-          F.skipUpdate = !1;
-          return;
-        }
-        const i = {
-          pathname: q,
-          search: "?".concat(Q.stringify(I))
+        const _ = {
+          pathname: h,
+          search: "?".concat(Q.stringify($))
         };
-        c ? m.replace(i) : m.push(i, {
-          skipUpdate: !0
-        });
+        M ? l.replace(_) : l.push(_);
       }
     },
     or: {
       name: "navigateFx",
-      sid: "sry1hc"
-    }
-  }), y = J({
-    and: {
-      source: n,
-      effect: (h, b) => {
-        var m;
-        const F = Oe(P);
-        if (F({
-          pathname: b.location.pathname,
-          query: ce({}, Q.parse(b.location.search)),
-          state: (m = b.location.state) !== null && m !== void 0 ? m : {}
-        }), !b)
-          throw new Error();
-        b.listen((q) => {
-          var I;
-          let {
-            location: c
-          } = q;
-          const i = (I = c.state) !== null && I !== void 0 ? I : {};
-          i.skipUpdate && (h.skipUpdate = !0), F({
-            pathname: c.pathname,
-            query: ce({}, Q.parse(c.search)),
-            state: i
-          });
-        });
-      }
-    },
-    or: {
-      name: "subscribeHistoryFx",
-      sid: "-9srjw2"
+      sid: "t8znvj"
     }
-  }), R = J({
+  }), A = B((l) => {
+    const y = J(E);
+    if (y({
+      pathname: l.location.pathname,
+      query: W({}, Q.parse(l.location.search))
+    }), !l)
+      throw new Error();
+    l.listen((h) => {
+      let {
+        location: $
+      } = h;
+      y({
+        pathname: $.pathname,
+        query: W({}, Q.parse($.search))
+      });
+    });
+  }, {
+    name: "subscribeHistoryFx",
+    sid: "hmilkw"
+  }), k = ee({
     and: {
       source: {
-        query: u,
-        path: s
+        query: a,
+        path: i
       },
-      effect: async (h) => {
+      effect: async (l) => {
         let {
-          query: b,
-          path: m
-        } = h;
+          query: y,
+          path: h
+        } = l;
         for (const {
-          route: F,
-          fromPath: q
-        } of A) {
-          const I = q(m);
-          if (I)
-            await F.internal.openFx({
-              query: b,
-              params: I.params,
-              historyIgnore: !0
-            });
-          else {
-            F.internal.close();
-            continue;
-          }
+          route: $,
+          fromPath: M
+        } of v) {
+          const _ = M(h), [V, c] = [J($.internal.close), J($.internal.navigated)];
+          _ ? c({
+            query: y,
+            params: _.params
+          }) : V();
         }
       }
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "-ro72fe"
+      sid: "eh61hv"
     }
   });
   for (const {
-    route: h,
-    toPath: b
-  } of A)
+    route: l,
+    toPath: y
+  } of v)
     x({
       and: [{
-        clock: h.opened,
-        filter: (m) => !(m != null && m.historyIgnore),
-        fn: (m) => {
-          var F;
+        clock: l.internal.openFx.doneData,
+        filter: (h) => (h == null ? void 0 : h.navigate) !== !1,
+        fn: (h) => {
+          var $;
           return {
-            path: b(m && "params" in m ? m.params : void 0),
-            query: (F = m == null ? void 0 : m.query) !== null && F !== void 0 ? F : {},
-            replace: m == null ? void 0 : m.replace
+            path: y(h && "params" in h ? h.params : void 0),
+            query: ($ = h == null ? void 0 : h.query) !== null && $ !== void 0 ? $ : {},
+            replace: h == null ? void 0 : h.replace
           };
         },
-        target: w
+        target: u
       }],
       or: {
-        sid: "gfvtvu"
+        sid: "fuznc4"
       }
     });
   return x({
     and: [{
-      clock: f,
-      target: a
+      clock: o,
+      target: n
     }],
     or: {
-      sid: "hbrw92"
+      sid: "gfc18r"
     }
   }), x({
     and: [{
-      clock: a,
+      clock: n,
       filter: Boolean,
-      target: y
+      target: A
     }],
     or: {
-      sid: "heiv7v"
+      sid: "gtmoo5"
     }
   }), x({
     and: [{
-      clock: P,
-      fn: (h) => ({
-        path: h.pathname,
-        query: h.query
+      clock: E,
+      fn: (l) => ({
+        path: l.pathname,
+        query: l.query
       }),
       target: xe({
-        sid: "-f70n8p",
-        fn: () => $e({
+        sid: "rwfpgy",
+        fn: () => Fe({
           targets: {
-            path: s,
-            query: u
+            path: i,
+            query: a
           }
         }),
         name: "target",
@@ -1294,108 +1244,98 @@ function Xe(e) {
       })
     }],
     or: {
-      sid: "htdb8m"
+      sid: "gwxg8b"
     }
   }), x({
     and: [{
-      clock: P,
-      fn: (h) => ({
-        path: h.pathname,
-        query: h.query
+      clock: E,
+      fn: (l) => ({
+        path: l.pathname,
+        query: l.query
       }),
-      target: R
-    }],
-    or: {
-      sid: "icm409"
-    }
-  }), x({
-    and: [{
-      clock: w,
-      target: v
+      target: k
     }],
     or: {
-      sid: "sr2036"
+      sid: "hrpxgj"
     }
   }), x({
     and: [{
-      clock: [u, s],
-      source: {
-        query: u,
-        path: s
-      },
-      fn: (h) => h,
-      target: w
+      clock: u,
+      source: i,
+      fn: (l, y) => W({
+        path: l
+      }, y),
+      target: S
     }],
     or: {
-      sid: "t5cnik"
+      sid: "i87r9d"
     }
   }), {
-    $query: u,
-    $path: s,
-    $activeRoutes: S,
-    back: E,
-    forward: k,
-    navigate: w,
+    $query: a,
+    $path: i,
+    $activeRoutes: j,
+    back: w,
+    forward: P,
+    navigate: u,
     routes: r,
-    setHistory: f,
-    mappedRoutes: A,
-    trackQuery: De({
-      $activeRoutes: S,
-      $path: s,
-      $query: u,
-      navigateFx: v
+    setHistory: o,
+    mappedRoutes: v,
+    trackQuery: Ce({
+      $activeRoutes: j,
+      $query: a,
+      navigate: u
     }),
     "@@unitShape": () => ({
-      query: u,
-      path: s,
-      activeRoutes: S,
-      onBack: E,
-      onForward: k,
-      onNavigate: w
+      query: a,
+      path: i,
+      activeRoutes: j,
+      onBack: w,
+      onForward: P,
+      onNavigate: u
     })
   };
 }
 function Je(e) {
-  const t = _(null, {
+  const t = T(null, {
     name: "$params",
     sid: "-ui6zqo"
-  }), r = _(!1, {
+  }), r = T(!1, {
     name: "$isOpened",
     sid: "p6gokr"
-  }), n = e, a = $({
+  }), n = e, a = O({
     name: "open",
     sid: "55xtzu"
-  }), u = $({
+  }), i = O({
     name: "opened",
     sid: "tidivr"
-  }), s = $({
+  }), o = O({
     name: "openedOnServer",
     sid: "8drh93"
-  }), f = $({
+  }), u = O({
     name: "openedOnClient",
     sid: "-pj4ssy"
-  }), w = $({
+  }), w = O({
     name: "close",
     sid: "-9osjjv"
-  }), E = $({
+  }), P = O({
     name: "closed",
     sid: "hnb5jj"
   });
   return x({
     and: [{
       clock: a,
-      target: u
+      target: i
     }],
     or: {
       sid: "-v1zz6f"
     }
   }), ue({
     and: [{
-      source: u,
+      source: i,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: s,
-        client: f
+        server: o,
+        client: u
       }
     }],
     or: {
@@ -1404,14 +1344,14 @@ function Je(e) {
   }), x({
     and: [{
       clock: w,
-      target: E
+      target: P
     }],
     or: {
       sid: "-u77hy7"
     }
   }), x({
     and: [{
-      clock: [u.map(() => !0), E.map(() => !1)],
+      clock: [i.map(() => !0), P.map(() => !1)],
       target: r
     }],
     or: {
@@ -1422,11 +1362,11 @@ function Je(e) {
     $isOpened: r,
     $isPending: n,
     open: a,
-    opened: u,
-    openedOnClient: f,
-    openedOnServer: s,
+    opened: i,
+    openedOnClient: u,
+    openedOnServer: o,
     close: w,
-    closed: E,
+    closed: P,
     "@@unitShape": () => ({
       params: t,
       isOpened: r,
@@ -1441,17 +1381,17 @@ function Ye(e) {
     beforeOpen: r,
     openOn: n,
     cancelOn: a
-  } = e, u = V(async (f) => {
+  } = e, i = B(async (u) => {
     for (const w of [].concat(r))
-      await w(f);
+      await w(u);
   }, {
     name: "openFx",
     sid: "14ykg2"
-  }), s = Je(u.pending);
+  }), o = Je(i.pending);
   return x({
     and: [{
-      clock: t.opened,
-      target: u
+      clock: t.open,
+      target: i
     }],
     or: {
       sid: "-s8ttzz"
@@ -1459,8 +1399,8 @@ function Ye(e) {
   }), x({
     and: [{
       clock: t.opened,
-      fn: (f) => f && "params" in f ? f.params : null,
-      target: s.$params
+      fn: (u) => u && "params" in u ? u.params : null,
+      target: o.$params
     }],
     or: {
       sid: "-1t3nrm"
@@ -1469,17 +1409,17 @@ function Ye(e) {
     and: [{
       clock: n,
       source: {
-        params: s.$params
+        params: o.$params
       },
-      fn: (f) => {
+      fn: (u) => {
         let {
           params: w
-        } = f;
+        } = u;
         return {
           params: w
         };
       },
-      target: s.open
+      target: o.open
     }],
     or: {
       sid: "-1cltx2"
@@ -1487,16 +1427,16 @@ function Ye(e) {
   }), a && x({
     and: [{
       clock: [t.closed].concat(a),
-      target: s.close
+      target: o.close
     }],
     or: {
       sid: "-w4048"
     }
-  }), s;
+  }), o;
 }
 export {
   Ye as chainRoute,
   Ge as createRoute,
   Xe as createRouter,
-  T as parameters
+  D as parameters
 };