@argon-router/core 0.2.3 → 0.3.1

package/dist/index.js

@@ -1,6 +1,6 @@
-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 V(e, t) {
+import { createEffect as V, createStore as L, createEvent as P, sample as $, split as xe, attach as Z, scopeBind as Fe, withFactory as je } from "effector";
+import { spread as Se } from "patronum";
+function ee(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -10,488 +10,505 @@ function V(e, t) {
   }
   return r;
 }
-function C(e) {
+function H(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? V(Object(r), !0).forEach(function(n) {
-      pe(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : V(Object(r)).forEach(function(n) {
+    t % 2 ? ee(Object(r), !0).forEach(function(n) {
+      $e(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : ee(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function pe(e, t, r) {
-  return (t = me(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
+function $e(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 me(e) {
-  var t = ye(e, "string");
+function Ee(e) {
+  var t = Pe(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function ye(e, t) {
+function Pe(e, t) {
   if (typeof e != "object" || !e) return e;
   var r = e[Symbol.toPrimitive];
   if (r !== void 0) {
-    var n = r.call(e, t || "default");
+    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 Qe(e) {
+function er(e) {
   let t;
-  const r = N(() => {
-    var p;
-    return (p = t) === null || p === void 0 ? void 0 : p();
+  const r = V(() => {
+    var O;
+    return (O = t) === null || O === void 0 ? void 0 : O();
   }, {
     name: "waitForAsyncBundleFx",
     sid: "tw7mq7"
-  }), n = N(async () => {
-    for (const l of (p = e.beforeOpen) !== null && p !== void 0 ? p : []) {
-      var p;
-      await l();
+  }), n = V(async () => {
+    for (const m of (O = e.beforeOpen) !== null && O !== void 0 ? O : []) {
+      var O;
+      await m();
     }
   }, {
     name: "beforeOpenFx",
     sid: "ls74w9"
-  }), a = N(async (p) => (await r(), await n(), e.parent && await e.parent.internal.openFx(C(C({}, p ?? {
-    params: {}
-  }), {}, {
-    historyIgnore: !0
-  })), p), {
+  }), a = V(async (O) => {
+    await r(), await n();
+    const m = e.parent;
+    return m && await m.internal.openFx(H(H({}, O ?? {
+      params: {}
+    }), {}, {
+      historyIgnore: !0
+    })), O;
+  }, {
     name: "openFx",
     sid: "-hz9h5i"
-  }), s = j({}, {
+  }), f = L({}, {
     name: "$params",
-    sid: "fyp6wk"
-  }), i = j(!1, {
+    sid: "rstqrf"
+  }), o = L(!1, {
     name: "$isOpened",
-    sid: "nq2be0"
-  }), o = a.pending, f = x({
+    sid: "-zgx6q9"
+  }), l = a.pending, w = P({
     name: "open",
-    sid: "-e84o6b"
-  }), u = x({
+    sid: "-cby6lj"
+  }), j = P({
     name: "close",
-    sid: "5yq009"
-  }), y = x({
+    sid: "7uwhl1"
+  }), S = P({
     name: "opened",
-    sid: "28lguv"
-  }), d = x({
+    sid: "44ryfn"
+  }), E = P({
     name: "openedOnServer",
-    sid: "-rnqoit"
-  }), b = x({
+    sid: "-prk6y1"
+  }), N = P({
     name: "openedOnClient",
-    sid: "-rq76gu"
-  }), w = x({
+    sid: "-fw2mlz"
+  }), I = P({
     name: "closed",
-    sid: "-atkmcq"
+    sid: "10jxi5"
   });
-  return F({
+  $({
     and: [{
-      clock: f,
+      clock: w,
       target: a
     }],
     or: {
-      sid: "t5oqwf"
+      sid: "t7vx9v"
+    }
+  });
+  const U = {};
+  return $({
+    and: [{
+      clock: a.doneData,
+      fn: (O) => O && "params" in O ? H({}, O.params) : U,
+      target: f
+    }],
+    or: {
+      sid: "tna5vz"
     }
-  }), fe({
+  }), xe({
     and: [{
       source: a.doneData,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: d,
-        client: b
+        server: E,
+        client: N
       }
     }],
     or: {
-      sid: "t8fpv8"
+      sid: "u5fdgw"
     }
-  }), F({
+  }), $({
     and: [{
-      clock: [b, d],
-      target: y
+      clock: [N, E],
+      target: S
     }],
     or: {
-      sid: "tphc9f"
+      sid: "ylqojg"
     }
-  }), F({
+  }), $({
     and: [{
-      clock: y,
+      clock: S,
       fn: () => !0,
-      target: i
+      target: o
     }],
     or: {
-      sid: "u3rzot"
+      sid: "yohni9"
     }
-  }), F({
+  }), $({
     and: [{
-      clock: u,
-      target: w
+      clock: j,
+      target: I
     }],
     or: {
-      sid: "u72r8z"
+      sid: "z3c3j0"
     }
-  }), F({
+  }), $({
     and: [{
-      clock: w,
+      clock: I,
       fn: () => !1,
-      target: i
+      target: o
     }],
     or: {
-      sid: "ykn3cq"
+      sid: "z632ht"
     }
   }), {
-    $params: s,
-    $isOpened: i,
-    $isPending: o,
-    open: f,
-    closed: w,
-    opened: y,
-    openedOnClient: b,
-    openedOnServer: d,
-    internal: C({
-      index: !1,
-      close: u,
+    $params: f,
+    $isOpened: o,
+    $isPending: l,
+    open: w,
+    closed: I,
+    opened: S,
+    openedOnClient: N,
+    openedOnServer: E,
+    internal: H({
+      close: j,
       openFx: a,
-      setAsyncImport: (p) => t = p
+      setAsyncImport: (O) => t = O
     }, e),
     "@@unitShape": () => ({
-      params: s,
-      isPending: o,
-      isOpened: i,
-      onOpen: f
+      params: f,
+      isPending: l,
+      isOpened: o,
+      onOpen: w
     })
   };
 }
-var E = {};
-Object.defineProperty(E, "__esModule", {
-  value: !0
-});
-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.
-  "{": "{",
-  "}": "}",
-  // Reserved.
-  "(": "(",
-  ")": ")",
-  "[": "[",
-  "]": "]",
-  "+": "+",
-  "?": "?",
-  "!": "!"
-};
-function we(e) {
-  return e.replace(/[{}()\[\]+?!:*]/g, "\\$&");
-}
-function $(e) {
-  return e.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
+function Ae(e) {
+  return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
 }
-function* xe(e) {
-  const t = [...e];
-  let r = 0;
-  function n() {
-    let a = "";
-    if (X.test(t[++r]))
-      for (a += t[r]; q.test(t[++r]); )
-        a += t[r];
-    else if (t[r] === '"') {
-      let s = r;
-      for (; r < t.length; ) {
-        if (t[++r] === '"') {
-          r++, s = 0;
-          break;
+var R = {}, re;
+function ve() {
+  if (re) return R;
+  re = 1, Object.defineProperty(R, "__esModule", {
+    value: !0
+  }), R.TokenData = void 0, R.parse = E, R.compile = N, R.match = O, R.pathToRegexp = m, R.stringify = B;
+  const e = "/", t = (c) => c, r = /^[$_\p{ID_Start}]$/u, n = /^[$\u200c\u200d\p{ID_Continue}]$/u, a = "https://git.new/pathToRegexpError", f = {
+    // Groups.
+    "{": "{",
+    "}": "}",
+    // Reserved.
+    "(": "(",
+    ")": ")",
+    "[": "[",
+    "]": "]",
+    "+": "+",
+    "?": "?",
+    "!": "!"
+  };
+  function o(c) {
+    return c.replace(/[{}()\[\]+?!:*]/g, "\\$&");
+  }
+  function l(c) {
+    return c.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
+  }
+  function* w(c) {
+    const i = [...c];
+    let s = 0;
+    function y() {
+      let u = "";
+      if (r.test(i[++s]))
+        for (u += i[s]; n.test(i[++s]); )
+          u += i[s];
+      else if (i[s] === '"') {
+        let d = s;
+        for (; s < i.length; ) {
+          if (i[++s] === '"') {
+            s++, d = 0;
+            break;
+          }
+          i[s] === "\\" ? u += i[++s] : u += i[s];
         }
-        t[r] === "\\" ? a += t[++r] : a += t[r];
+        if (d)
+          throw new TypeError(`Unterminated quote at ${d}: ${a}`);
       }
-      if (s)
-        throw new TypeError(`Unterminated quote at ${s}: ${I}`);
+      if (!u)
+        throw new TypeError(`Missing parameter name at ${s}: ${a}`);
+      return u;
     }
-    if (!a)
-      throw new TypeError(`Missing parameter name at ${r}: ${I}`);
-    return a;
-  }
-  for (; r < t.length; ) {
-    const a = t[r], s = be[a];
-    if (s)
-      yield {
-        type: s,
-        index: r++,
-        value: a
-      };
-    else if (a === "\\")
-      yield {
-        type: "ESCAPED",
-        index: r++,
-        value: t[r++]
-      };
-    else if (a === ":") {
-      const i = n();
-      yield {
-        type: "PARAM",
-        index: r,
-        value: i
-      };
-    } else if (a === "*") {
-      const i = n();
-      yield {
-        type: "WILDCARD",
-        index: r,
-        value: i
-      };
-    } else
-      yield {
-        type: "CHAR",
-        index: r,
-        value: t[r++]
-      };
+    for (; s < i.length; ) {
+      const u = i[s], d = f[u];
+      if (d)
+        yield {
+          type: d,
+          index: s++,
+          value: u
+        };
+      else if (u === "\\")
+        yield {
+          type: "ESCAPED",
+          index: s++,
+          value: i[s++]
+        };
+      else if (u === ":") {
+        const b = y();
+        yield {
+          type: "PARAM",
+          index: s,
+          value: b
+        };
+      } else if (u === "*") {
+        const b = y();
+        yield {
+          type: "WILDCARD",
+          index: s,
+          value: b
+        };
+      } else
+        yield {
+          type: "CHAR",
+          index: s,
+          value: i[s++]
+        };
+    }
+    return {
+      type: "END",
+      index: s,
+      value: ""
+    };
   }
-  return {
-    type: "END",
-    index: r,
-    value: ""
-  };
-}
-class Fe {
-  constructor(t) {
-    this.tokens = t;
+  class j {
+    constructor(i) {
+      this.tokens = i;
+    }
+    peek() {
+      if (!this._peek) {
+        const i = this.tokens.next();
+        this._peek = i.value;
+      }
+      return this._peek;
+    }
+    tryConsume(i) {
+      const s = this.peek();
+      if (s.type === i)
+        return this._peek = void 0, s.value;
+    }
+    consume(i) {
+      const s = this.tryConsume(i);
+      if (s !== void 0) return s;
+      const {
+        type: y,
+        index: u
+      } = this.peek();
+      throw new TypeError(`Unexpected ${y} at ${u}, expected ${i}: ${a}`);
+    }
+    text() {
+      let i = "", s;
+      for (; s = this.tryConsume("CHAR") || this.tryConsume("ESCAPED"); )
+        i += s;
+      return i;
+    }
   }
-  peek() {
-    if (!this._peek) {
-      const t = this.tokens.next();
-      this._peek = t.value;
+  class S {
+    constructor(i) {
+      this.tokens = i;
     }
-    return this._peek;
   }
-  tryConsume(t) {
-    const r = this.peek();
-    if (r.type === t)
-      return this._peek = void 0, r.value;
+  R.TokenData = S;
+  function E(c, i = {}) {
+    const {
+      encodePath: s = t
+    } = i, y = new j(w(c));
+    function u(b) {
+      const g = [];
+      for (; ; ) {
+        const A = y.text();
+        A && g.push({
+          type: "text",
+          value: s(A)
+        });
+        const v = y.tryConsume("PARAM");
+        if (v) {
+          g.push({
+            type: "param",
+            name: v
+          });
+          continue;
+        }
+        const M = y.tryConsume("WILDCARD");
+        if (M) {
+          g.push({
+            type: "wildcard",
+            name: M
+          });
+          continue;
+        }
+        if (y.tryConsume("{")) {
+          g.push({
+            type: "group",
+            tokens: u("}")
+          });
+          continue;
+        }
+        return y.consume(b), g;
+      }
+    }
+    const d = u("END");
+    return new S(d);
   }
-  consume(t) {
-    const r = this.tryConsume(t);
-    if (r !== void 0) return r;
+  function N(c, i = {}) {
     const {
-      type: n,
-      index: a
-    } = this.peek();
-    throw new TypeError(`Unexpected ${n} at ${a}, expected ${t}: ${I}`);
+      encode: s = encodeURIComponent,
+      delimiter: y = e
+    } = i, u = c instanceof S ? c : E(c, i), d = I(u.tokens, y, s);
+    return function(g = {}) {
+      const [A, ...v] = d(g);
+      if (v.length)
+        throw new TypeError(`Missing parameters: ${v.join(", ")}`);
+      return A;
+    };
   }
-  text() {
-    let t = "", r;
-    for (; r = this.tryConsume("CHAR") || this.tryConsume("ESCAPED"); )
-      t += r;
-    return t;
+  function I(c, i, s) {
+    const y = c.map((u) => U(u, i, s));
+    return (u) => {
+      const d = [""];
+      for (const b of y) {
+        const [g, ...A] = b(u);
+        d[0] += g, d.push(...A);
+      }
+      return d;
+    };
   }
-}
-class k {
-  constructor(t) {
-    this.tokens = t;
+  function U(c, i, s) {
+    if (c.type === "text") return () => [c.value];
+    if (c.type === "group") {
+      const u = I(c.tokens, i, s);
+      return (d) => {
+        const [b, ...g] = u(d);
+        return g.length ? [""] : [b];
+      };
+    }
+    const y = s || t;
+    return c.type === "wildcard" && s !== !1 ? (u) => {
+      const d = u[c.name];
+      if (d == null) return ["", c.name];
+      if (!Array.isArray(d) || d.length === 0)
+        throw new TypeError(`Expected "${c.name}" to be a non-empty array`);
+      return [d.map((b, g) => {
+        if (typeof b != "string")
+          throw new TypeError(`Expected "${c.name}/${g}" to be a string`);
+        return y(b);
+      }).join(i)];
+    } : (u) => {
+      const d = u[c.name];
+      if (d == null) return ["", c.name];
+      if (typeof d != "string")
+        throw new TypeError(`Expected "${c.name}" to be a string`);
+      return [y(d)];
+    };
   }
-}
-E.TokenData = k;
-function L(e, t = {}) {
-  const {
-    encodePath: r = _
-  } = t, n = new Fe(xe(e));
-  function a(i) {
-    const o = [];
-    for (; ; ) {
-      const f = n.text();
-      f && o.push({
-        type: "text",
-        value: r(f)
-      });
-      const u = n.tryConsume("PARAM");
-      if (u) {
-        o.push({
-          type: "param",
-          name: u
-        });
-        continue;
+  function O(c, i = {}) {
+    const {
+      decode: s = decodeURIComponent,
+      delimiter: y = e
+    } = i, {
+      regexp: u,
+      keys: d
+    } = m(c, i), b = d.map((g) => s === !1 ? t : g.type === "param" ? s : (A) => A.split(y).map(s));
+    return function(A) {
+      const v = u.exec(A);
+      if (!v) return !1;
+      const M = v[0], C = /* @__PURE__ */ Object.create(null);
+      for (let T = 1; T < v.length; T++) {
+        if (v[T] === void 0) continue;
+        const _ = d[T - 1], K = b[T - 1];
+        C[_.name] = K(v[T]);
       }
-      const y = n.tryConsume("WILDCARD");
-      if (y) {
-        o.push({
-          type: "wildcard",
-          name: y
-        });
+      return {
+        path: M,
+        params: C
+      };
+    };
+  }
+  function m(c, i = {}) {
+    const {
+      delimiter: s = e,
+      end: y = !0,
+      sensitive: u = !1,
+      trailing: d = !0
+    } = i, b = [], g = [], A = u ? "" : "i", M = (Array.isArray(c) ? c : [c]).map((_) => _ instanceof S ? _ : E(_, i));
+    for (const {
+      tokens: _
+    } of M)
+      for (const K of h(_, 0, [])) {
+        const Oe = p(K, s, b);
+        g.push(Oe);
+      }
+    let C = `^(?:${g.join("|")})`;
+    return d && (C += `(?:${l(s)}$)?`), C += y ? "$" : `(?=${l(s)}|$)`, {
+      regexp: new RegExp(C, A),
+      keys: b
+    };
+  }
+  function* h(c, i, s) {
+    if (i === c.length)
+      return yield s;
+    const y = c[i];
+    if (y.type === "group") {
+      const u = s.slice();
+      for (const d of h(y.tokens, 0, u))
+        yield* h(c, i + 1, d);
+    } else
+      s.push(y);
+    yield* h(c, i + 1, s);
+  }
+  function p(c, i, s) {
+    let y = "", u = "", d = !0;
+    for (let b = 0; b < c.length; b++) {
+      const g = c[b];
+      if (g.type === "text") {
+        y += l(g.value), u += g.value, d || (d = g.value.includes(i));
         continue;
       }
-      if (n.tryConsume("{")) {
-        o.push({
-          type: "group",
-          tokens: a("}")
-        });
+      if (g.type === "param" || g.type === "wildcard") {
+        if (!d && !u)
+          throw new TypeError(`Missing text after "${g.name}": ${a}`);
+        g.type === "param" ? y += `(${x(i, d ? "" : u)}+)` : y += "([\\s\\S]+)", s.push(g), u = "", d = !1;
         continue;
       }
-      return n.consume(i), o;
     }
+    return y;
   }
-  const s = a("END");
-  return new k(s);
-}
-function $e(e, t = {}) {
-  const {
-    encode: r = encodeURIComponent,
-    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 i of n) {
-      const [o, ...f] = i(a);
-      s[0] += o, s.push(...f);
-    }
-    return s;
-  };
-}
-function Se(e, t, r) {
-  if (e.type === "text") return () => [e.value];
-  if (e.type === "group") {
-    const a = Y(e.tokens, t, r);
-    return (s) => {
-      const [i, ...o] = a(s);
-      return o.length ? [""] : [i];
-    };
+  function x(c, i) {
+    return i.length < 2 ? c.length < 2 ? `[^${l(c + i)}]` : `(?:(?!${l(c)})[^${l(i)}])` : c.length < 2 ? `(?:(?!${l(i)})[^${l(c)}])` : `(?:(?!${l(i)}|${l(c)})[\\s\\S])`;
   }
-  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((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];
-    if (s == null) return ["", e.name];
-    if (typeof s != "string")
-      throw new TypeError(`Expected "${e.name}" to be a string`);
-    return [n(s)];
-  };
-}
-function Oe(e, t = {}) {
-  const {
-    decode: r = decodeURIComponent,
-    delimiter: n = U
-  } = t, {
-    regexp: a,
-    keys: s
-  } = 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: y,
-      params: d
-    };
-  };
-}
-function Z(e, t = {}) {
-  const {
-    delimiter: r = U,
-    end: n = !0,
-    sensitive: a = !1,
-    trailing: s = !0
-  } = 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 y)
-    for (const p of R(w, 0, [])) {
-      const l = Ee(p, r, i);
-      o.push(l);
-    }
-  let d = `^(?:${o.join("|")})`;
-  return s && (d += `(?:${$(r)}$)?`), d += n ? "$" : `(?=${$(r)}|$)`, {
-    regexp: new RegExp(d, f),
-    keys: i
-  };
-}
-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 R(n.tokens, 0, a))
-      yield* R(e, t + 1, s);
-  } else
-    r.push(n);
-  yield* R(e, t + 1, r);
-}
-function Ee(e, t, r) {
-  let n = "", a = "", s = !0;
-  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 (o.type === "param" || o.type === "wildcard") {
-      if (!s && !a)
-        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;
-    }
+  function B(c) {
+    return c.tokens.map(function i(s, y, u) {
+      if (s.type === "text") return o(s.value);
+      if (s.type === "group")
+        return `{${s.tokens.map(i).join("")}}`;
+      const b = q(s.name) && z(u[y + 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("");
   }
-  return n;
-}
-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) {
-  return e.tokens.map(function t(r, n, a) {
-    if (r.type === "text") return we(r.value);
-    if (r.type === "group")
-      return `{${r.tokens.map(t).join("")}}`;
-    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("");
-}
-function Ne(e) {
-  const [t, ...r] = e;
-  return X.test(t) ? r.every((n) => q.test(n)) : !1;
-}
-function Re(e) {
-  return (e == null ? void 0 : e.type) !== "text" ? !0 : !q.test(e.value[0]);
+  function q(c) {
+    const [i, ...s] = c;
+    return r.test(i) ? s.every((y) => n.test(y)) : !1;
+  }
+  function z(c) {
+    return (c == null ? void 0 : c.type) !== "text" ? !0 : !n.test(c.value[0]);
+  }
+  return R;
 }
-const Ie = Symbol("any"), ke = Symbol("number"), Pe = Symbol("string"), Ce = Symbol("array"), O = {
-  any: Ie,
-  number: ke,
-  string: Pe,
-  array: Ce
+var te = ve();
+const Ne = Symbol("any"), Re = Symbol("number"), De = Symbol("string"), Ie = Symbol("array"), k = {
+  any: Ne,
+  number: Re,
+  string: De,
+  array: Ie
 };
-function K(e, t) {
+function ne(e, t) {
   for (const r of e)
     if (!t.includes(r))
       return !1;
   return !0;
 }
-function J(e, t) {
+function ae(e, t) {
   for (const r in t) {
     const n = t[r];
     if (Array.isArray(n) && (!e[r] || JSON.stringify(n) !== e[r]))
@@ -519,22 +536,22 @@ function J(e, t) {
       }
     }
     switch (n) {
-      case O.any: {
+      case k.any: {
         if (!e[r])
           return !1;
         break;
       }
-      case O.string: {
+      case k.string: {
         if (!e[r] || Array.isArray(e[r]))
           return !1;
         break;
       }
-      case O.array: {
+      case k.array: {
         if (!e[r] || !Array.isArray(e[r]))
           return !1;
         break;
       }
-      case O.number: {
+      case k.number: {
         if (!e[r] || Array.isArray(e[r]) || isNaN(parseInt(e[r])) && isNaN(parseFloat(e[r])))
           return !1;
         break;
@@ -543,117 +560,144 @@ function J(e, t) {
   }
   return !0;
 }
-function Te(e, t) {
+function ke(e, t) {
   const r = {};
   for (const n in t) {
-    const a = t[n], s = e[n];
+    const a = t[n], f = e[n];
     if (Array.isArray(a)) {
-      r[n] = s === "1" || s === "true";
+      r[n] = f === "1" || f === "true";
       continue;
     }
     switch (typeof a) {
       case "number": {
-        const i = e[n];
-        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
+        const o = e[n];
+        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
         break;
       }
       case "object": {
-        r[n] = JSON.parse(s);
+        r[n] = JSON.parse(f);
         break;
       }
       case "string":
         r[n] = e[n];
       case "boolean": {
-        const i = e[n];
-        r[n] = i === "0" ? parseFloat(i) : parseInt(i);
+        const o = e[n];
+        r[n] = o === "0" ? parseFloat(o) : parseInt(o);
         break;
       }
     }
     switch (a) {
-      case O.any:
-      case O.string:
-      case O.array: {
+      case k.any:
+      case k.string:
+      case k.array: {
         r[n] = e[n];
         break;
       }
-      case O.number: {
-        const i = e[n];
-        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
+      case k.number: {
+        const o = e[n];
+        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
         break;
       }
     }
   }
   return r;
 }
-function De(e, t) {
+function Ce(e, t) {
   return (r) => {
     const {
       parameters: n,
       forRoutes: a
-    } = r, s = x({
+    } = r, f = P({
       name: "entered",
       sid: "-d3obu6"
-    }), i = x({
+    }), o = P({
       name: "exited",
       sid: "-xofyk3"
-    }), o = x({
+    }), l = P({
       name: "exit",
       sid: "-673d76"
     });
-    return F({
+    return $({
       and: [{
         source: {
           activeRoutes: e,
           query: t
         },
-        filter: (f) => {
+        filter: (w) => {
           let {
-            activeRoutes: u,
-            query: y
-          } = f;
-          return (!a || K(a, u)) && J(y, n);
+            activeRoutes: j,
+            query: S
+          } = w;
+          return (!a || ne(a, j)) && ae(S, n);
         },
-        fn: (f) => {
+        fn: (w) => {
           let {
-            query: u
-          } = f;
-          return Te(u, n);
+            query: j
+          } = w;
+          return ke(j, n);
         }
       }],
       or: {
         sid: "-so0f9q"
       }
-    }), F({
+    }), $({
       and: [{
         source: {
           activeRoutes: e,
           query: t
         },
-        filter: (f) => {
+        filter: (w) => {
           let {
-            activeRoutes: u,
-            query: y
-          } = f;
-          return !((!a || K(a, u)) && J(y, n));
+            activeRoutes: j,
+            query: S
+          } = w;
+          return !((!a || ne(a, j)) && ae(S, n));
         },
-        target: i
+        target: o
       }],
       or: {
         sid: "-s82e29"
       }
     }), {
-      entered: s,
-      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;
+      entered: f,
+      exited: o,
+      exit: l,
+      getPayload: (w) => Object.entries(w).reduce((j, S) => {
+        let [E, N] = S;
+        return typeof n[E] == "symbol" ? j[E] = N : j[E] = n[E], j;
       }, {})
     };
   };
 }
-const ee = "%[a-f0-9]{2}", Q = new RegExp("(" + ee + ")|([^%]+?)", "gi"), W = new RegExp("(" + ee + ")+", "gi");
-function D(e, t) {
+var J, se;
+function Te() {
+  return se || (se = 1, J = function e(t, r) {
+    if (t === r) return !0;
+    if (t && r && typeof t == "object" && typeof r == "object") {
+      if (t.constructor !== r.constructor) return !1;
+      var n, a, f;
+      if (Array.isArray(t)) {
+        if (n = t.length, n != r.length) return !1;
+        for (a = n; a-- !== 0; ) if (!e(t[a], r[a])) return !1;
+        return !0;
+      }
+      if (t.constructor === RegExp) return t.source === r.source && t.flags === r.flags;
+      if (t.valueOf !== Object.prototype.valueOf) return t.valueOf() === r.valueOf();
+      if (t.toString !== Object.prototype.toString) return t.toString() === r.toString();
+      if (f = Object.keys(t), n = f.length, n !== Object.keys(r).length) return !1;
+      for (a = n; a-- !== 0; ) if (!Object.prototype.hasOwnProperty.call(r, f[a])) return !1;
+      for (a = n; a-- !== 0; ) {
+        var o = f[a];
+        if (!e(t[o], r[o])) return !1;
+      }
+      return !0;
+    }
+    return t !== t && r !== r;
+  }), J;
+}
+var _e = Te();
+const Ue = /* @__PURE__ */ Ae(_e), le = "%[a-f0-9]{2}", oe = new RegExp("(" + le + ")|([^%]+?)", "gi"), ie = new RegExp("(" + le + ")+", "gi");
+function W(e, t) {
   try {
     return [decodeURIComponent(e.join(""))];
   } catch {
@@ -662,32 +706,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([], W(r), W(n));
 }
-function ve(e) {
+function qe(e) {
   try {
     return decodeURIComponent(e);
   } catch {
-    let t = e.match(Q) || [];
+    let t = e.match(oe) || [];
     for (let r = 1; r < t.length; r++)
-      e = D(t, r).join(""), t = e.match(Q) || [];
+      e = W(t, r).join(""), t = e.match(oe) || [];
     return e;
   }
 }
-function Ue(e) {
+function Me(e) {
   const t = {
     "%FE%FF": "��",
     "%FF%FE": "��"
   };
-  let r = W.exec(e);
+  let r = ie.exec(e);
   for (; r; ) {
     try {
       t[r[0]] = decodeURIComponent(r[0]);
     } catch {
-      const a = ve(r[0]);
+      const a = qe(r[0]);
       a !== r[0] && (t[r[0]] = a);
     }
-    r = W.exec(e);
+    r = ie.exec(e);
   }
   t["%C2"] = "�";
   const n = Object.keys(t);
@@ -695,16 +739,16 @@ function Ue(e) {
     e = e.replace(new RegExp(a, "g"), t[a]);
   return e;
 }
-function _e(e) {
+function Le(e) {
   if (typeof e != "string")
     throw new TypeError("Expected `encodedURI` to be of type `string`, got `" + typeof e + "`");
   try {
     return decodeURIComponent(e);
   } catch {
-    return Ue(e);
+    return Me(e);
   }
 }
-function qe(e, t) {
+function Be(e, t) {
   const r = {};
   if (Array.isArray(t))
     for (const n of t) {
@@ -715,13 +759,13 @@ function qe(e, t) {
     for (const n of Reflect.ownKeys(e)) {
       const a = Object.getOwnPropertyDescriptor(e, n);
       if (a.enumerable) {
-        const s = e[n];
-        t(n, s, e) && Object.defineProperty(r, n, a);
+        const f = e[n];
+        t(n, f, e) && Object.defineProperty(r, n, a);
       }
     }
   return r;
 }
-function re(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 === "")
@@ -729,29 +773,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()}`), v = Symbol("encodeFragmentIdentifier");
-function ze(e) {
+const ze = (e) => e == null, He = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), G = Symbol("encodeFragmentIdentifier");
+function Ve(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, [m(t, e), "[", a, "]"].join("")] : [...r, [m(t, e), "[", m(a, e), "]=", m(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, [m(t, e), "[]"].join("")] : [...r, [m(t, e), "[]=", m(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, [m(t, e), ":list="].join("")] : [...r, [m(t, e), ":list=", m(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 ? [[m(r, e), t, m(a, e)].join("")] : [[n, m(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, m(t, e)] : [...r, [m(t, e), "=", m(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 Be(e) {
+function Ke(e) {
   let t;
   switch (e.arrayFormat) {
     case "index":
@@ -789,24 +833,24 @@ function Be(e) {
     case "comma":
     case "separator":
       return (r, n, a) => {
-        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;
+        const f = typeof n == "string" && n.includes(e.arrayFormatSeparator), o = typeof n == "string" && !f && D(n, e).includes(e.arrayFormatSeparator);
+        n = o ? D(n, e) : n;
+        const l = f || o ? n.split(e.arrayFormatSeparator).map((w) => D(w, e)) : n === null ? n : D(n, e);
+        a[r] = l;
       };
     case "bracket-separator":
       return (r, n, a) => {
-        const s = /(\[])$/.test(r);
-        if (r = r.replace(/\[]$/, ""), !s) {
-          a[r] = n && S(n, e);
+        const f = /(\[])$/.test(r);
+        if (r = r.replace(/\[]$/, ""), !f) {
+          a[r] = n && D(n, e);
           return;
         }
-        const i = n === null ? [] : S(n, e).split(e.arrayFormatSeparator);
+        const o = n === null ? [] : D(n, e).split(e.arrayFormatSeparator);
         if (a[r] === void 0) {
-          a[r] = i;
+          a[r] = o;
           return;
         }
-        a[r] = [...a[r], ...i];
+        a[r] = [...a[r], ...o];
       };
     default:
       return (r, n, a) => {
@@ -818,37 +862,37 @@ function Be(e) {
       };
   }
 }
-function te(e) {
+function pe(e) {
   if (typeof e != "string" || e.length !== 1)
     throw new TypeError("arrayFormatSeparator must be single character string");
 }
-function m(e, t) {
-  return t.encode ? t.strict ? Me(e) : encodeURIComponent(e) : e;
+function F(e, t) {
+  return t.encode ? t.strict ? He(e) : encodeURIComponent(e) : e;
 }
-function S(e, t) {
-  return t.decode ? _e(e) : e;
+function D(e, t) {
+  return t.decode ? Le(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;
+function ye(e) {
+  return Array.isArray(e) ? e.sort() : typeof e == "object" ? ye(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
 }
-function ae(e) {
+function me(e) {
   const t = e.indexOf("#");
   return t !== -1 && (e = e.slice(0, t)), e;
 }
-function He(e) {
+function Je(e) {
   let t = "";
   const r = e.indexOf("#");
   return r !== -1 && (t = e.slice(r)), t;
 }
-function G(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 M(e) {
-  e = ae(e);
+function X(e) {
+  e = me(e);
   const t = e.indexOf("?");
   return t === -1 ? "" : e.slice(t + 1);
 }
-function z(e, t) {
+function Y(e, t) {
   t = {
     decode: !0,
     sort: !0,
@@ -858,30 +902,30 @@ function z(e, t) {
     parseBooleans: !1,
     types: /* @__PURE__ */ Object.create(null),
     ...t
-  }, te(t.arrayFormatSeparator);
-  const r = Be(t), n = /* @__PURE__ */ Object.create(null);
+  }, pe(t.arrayFormatSeparator);
+  const r = Ke(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 [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);
+    const f = t.decode ? a.replaceAll("+", " ") : a;
+    let [o, l] = de(f, "=");
+    o === void 0 && (o = f), l = l === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? l : D(l, t), r(D(o, t), l, n);
   }
-  for (const [a, s] of Object.entries(n))
-    if (typeof s == "object" && s !== null && t.types[a] !== "string")
-      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);
+  for (const [a, f] of Object.entries(n))
+    if (typeof f == "object" && f !== null && t.types[a] !== "string")
+      for (const [o, l] of Object.entries(f)) {
+        const w = t.types[a] ? t.types[a].replace("[]", "") : void 0;
+        f[o] = ce(l, t, w);
       }
-    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 i = n[s];
-    return a[s] = i && typeof i == "object" && !Array.isArray(i) ? ne(i) : i, a;
+    else typeof f == "object" && f !== null && t.types[a] === "string" ? n[a] = Object.values(f).join(t.arrayFormatSeparator) : n[a] = ce(f, t, t.types[a]);
+  return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, f) => {
+    const o = n[f];
+    return a[f] = o && typeof o == "object" && !Array.isArray(o) ? ye(o) : o, a;
   }, /* @__PURE__ */ Object.create(null));
 }
-function se(e, t) {
+function ge(e, t) {
   if (!e)
     return "";
   t = {
@@ -890,199 +934,240 @@ function se(e, t) {
     arrayFormat: "none",
     arrayFormatSeparator: ",",
     ...t
-  }, te(t.arrayFormatSeparator);
-  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((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("&");
+  }, pe(t.arrayFormatSeparator);
+  const r = (o) => t.skipNull && ze(e[o]) || t.skipEmptyString && e[o] === "", n = Ve(t), a = {};
+  for (const [o, l] of Object.entries(e))
+    r(o) || (a[o] = l);
+  const f = Object.keys(a);
+  return t.sort !== !1 && f.sort(t.sort), f.map((o) => {
+    const l = e[o];
+    return l === void 0 ? "" : l === null ? F(o, t) : Array.isArray(l) ? l.length === 0 && t.arrayFormat === "bracket-separator" ? F(o, t) + "[]" : l.reduce(n(o), []).join("&") : F(o, t) + "=" + F(l, t);
+  }).filter((o) => o.length > 0).join("&");
 }
-function ie(e, t) {
+function he(e, t) {
   var a;
   t = {
     decode: !0,
     ...t
   };
-  let [r, n] = re(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: z(M(e), t),
+    query: Y(X(e), t),
     ...t && t.parseFragmentIdentifier && n ? {
-      fragmentIdentifier: S(n, t)
+      fragmentIdentifier: D(n, t)
     } : {}
   };
 }
-function oe(e, t) {
+function be(e, t) {
   t = {
     encode: !0,
     strict: !0,
-    [v]: !0,
+    [G]: !0,
     ...t
   };
-  const r = ae(e.url).split("?")[0] || "", n = M(e.url), a = {
-    ...z(n, {
+  const r = me(e.url).split("?")[0] || "", n = X(e.url), a = {
+    ...Y(n, {
       sort: !1
     }),
     ...e.query
   };
-  let s = se(a, t);
-  s && (s = `?${s}`);
-  let i = He(e.url);
+  let f = ge(a, t);
+  f && (f = `?${f}`);
+  let o = Je(e.url);
   if (typeof e.fragmentIdentifier == "string") {
-    const o = new URL(r);
-    o.hash = e.fragmentIdentifier, i = t[v] ? o.hash : `#${e.fragmentIdentifier}`;
+    const l = new URL(r);
+    l.hash = e.fragmentIdentifier, o = t[G] ? l.hash : `#${e.fragmentIdentifier}`;
   }
-  return `${r}${s}${i}`;
+  return `${r}${f}${o}`;
 }
-function ce(e, t, r) {
+function we(e, t, r) {
   r = {
     parseFragmentIdentifier: !0,
-    [v]: !1,
+    [G]: !1,
     ...r
   };
   const {
     url: n,
     query: a,
-    fragmentIdentifier: s
-  } = ie(e, r);
-  return oe({
+    fragmentIdentifier: f
+  } = he(e, r);
+  return be({
     url: n,
-    query: qe(a, t),
-    fragmentIdentifier: s
+    query: Be(a, t),
+    fragmentIdentifier: f
   }, 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);
+function Qe(e, t, r) {
+  const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, f) => !t(a, f);
+  return we(e, n, r);
 }
-const T = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  exclude: Ve,
-  extract: M,
-  parse: z,
-  parseUrl: ie,
-  pick: ce,
-  stringify: se,
-  stringifyUrl: oe
+  exclude: Qe,
+  extract: X,
+  parse: Y,
+  parseUrl: he,
+  pick: we,
+  stringify: ge,
+  stringifyUrl: be
 }, Symbol.toStringTag, { value: "Module" }));
-function We(e) {
+function fe(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 ue(e) {
+  for (var t = 1; t < arguments.length; t++) {
+    var r = arguments[t] != null ? arguments[t] : {};
+    t % 2 ? fe(Object(r), !0).forEach(function(n) {
+      We(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : fe(Object(r)).forEach(function(n) {
+      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
+    });
+  }
+  return e;
+}
+function We(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 = Xe(e, "string");
+  return typeof t == "symbol" ? t : t + "";
+}
+function Xe(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 rr(e) {
   const {
     base: t = "/",
     routes: r
-  } = e, n = j(null, {
+  } = e, n = L(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "ftu36z"
-  }), a = j([], {
+    sid: "3inwxx"
+  }), a = L([], {
     and: {
       serialize: "ignore"
     },
     name: "$activeRoutes",
-    sid: "z30ma4"
-  }), s = j({}, {
+    sid: "mrug12"
+  }), f = L({}, {
     name: "$query",
-    sid: "hkri52"
-  }), i = j(null, {
+    sid: "f7je63"
+  }), o = L(null, {
     name: "$path",
-    sid: "-zgnqnj"
-  }), o = x({
+    sid: "x787cm"
+  }), l = P({
     name: "setHistory",
-    sid: "w6xvrg"
-  }), f = x({
+    sid: "ttprsh"
+  }), w = P({
+    name: "navigate",
+    sid: "-66otyw"
+  }), j = P({
     name: "back",
-    sid: "-4mcm91"
-  }), u = x({
+    sid: "-ggh63w"
+  }), S = P({
     name: "forward",
-    sid: "6nmzsp"
-  }), y = x({
+    sid: "-56hk26"
+  }), E = P({
     name: "locationUpdated",
-    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("");
+    sid: "f4sbpu"
+  }), N = r.map((m) => {
+    let h = m;
+    const p = [];
+    for (p.unshift(h.internal.path); h.internal.parent; )
+      h = h.internal.parent, h.internal.path !== "/" && p.unshift(h.internal.path);
+    const x = t === "/" ? p.join("") : [t, ...p].join("");
     return {
-      route: l,
-      path: g,
-      toPath: he(g),
-      fromPath: ge(g)
+      route: m,
+      path: x,
+      toPath: te.compile(x),
+      fromPath: te.match(x)
     };
-  }), b = H({
+  }), I = Z({
     and: {
       source: {
         history: n
       },
-      effect: async (l, h) => {
+      effect: async (m, h) => {
         let {
-          history: c
-        } = l, {
-          path: g,
-          query: P,
-          replace: A
+          history: p
+        } = m, {
+          path: x,
+          query: B,
+          replace: q
         } = h;
-        if (!c)
+        if (!p)
           throw new Error("history not found");
-        const B = {
-          pathname: g,
-          search: "?".concat(T.stringify(P))
+        const z = {
+          pathname: x,
+          search: "?".concat(Q.stringify(B))
         };
-        A ? c.replace(B) : c.push(B);
+        q ? p.replace(z) : p.push(z);
       }
     },
     or: {
       name: "navigateFx",
-      sid: "qepxid"
+      sid: "ekldni"
     }
-  }), w = N((l) => {
-    const h = ue(y);
+  }), U = V((m) => {
+    const h = Fe(E);
     if (h({
-      pathname: l.location.pathname,
-      query: T.parse(l.location.search)
-    }), !l)
+      pathname: m.location.pathname,
+      query: ue({}, Q.parse(m.location.search))
+    }), !m)
       throw new Error();
-    l.listen((c) => {
+    m.listen((p) => {
       let {
-        location: g
-      } = c;
+        location: x
+      } = p;
       h({
-        pathname: g.pathname,
-        query: T.parse(g.search)
+        pathname: x.pathname,
+        query: ue({}, Q.parse(x.search))
       });
     });
   }, {
     name: "subscribeHistoryFx",
-    sid: "es8v7q"
-  }), p = H({
+    sid: "2y4bcv"
+  }), O = Z({
     and: {
       source: {
-        query: s,
-        path: i
+        query: f,
+        path: o
       },
-      effect: async (l) => {
+      effect: async (m) => {
         let {
           query: h,
-          path: c
-        } = l;
+          path: p
+        } = m;
         for (const {
-          route: g,
-          fromPath: P
-        } of d) {
-          const A = P(c);
-          if (A)
-            await g.internal.openFx({
+          route: x,
+          fromPath: B
+        } of N) {
+          const q = B(p);
+          if (q)
+            await x.internal.openFx({
               query: h,
-              params: A.params,
+              params: q.params,
               historyIgnore: !0
             });
           else {
-            g.internal.close();
+            x.internal.close();
             continue;
           }
         }
@@ -1090,115 +1175,146 @@ function We(e) {
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "bmwb4p"
+      sid: "-788q6"
     }
   });
   for (const {
-    route: l,
+    route: m,
     toPath: h
-  } of d)
-    F({
+  } of N)
+    $({
       and: [{
-        clock: l.opened,
+        clock: m.opened,
         source: a,
-        filter: (c) => !c.includes(l),
-        fn: (c) => [...c, l],
+        filter: (p) => !p.includes(m),
+        fn: (p) => [...p, m],
         target: a
       }],
       or: {
-        sid: "ff1m4n"
+        sid: "f1aram"
       }
-    }), F({
+    }), $({
       and: [{
-        clock: l.opened,
-        filter: (c) => !(c != null && c.historyIgnore),
-        fn: (c) => {
-          var g;
+        clock: m.opened,
+        filter: (p) => !(p != null && p.historyIgnore),
+        fn: (p) => {
+          var x;
           return {
-            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
+            path: h(p && "params" in p ? p.params : void 0),
+            query: (x = p == null ? void 0 : p.query) !== null && x !== void 0 ? x : {},
+            replace: p == null ? void 0 : p.replace
           };
         },
-        target: b
+        target: w
       }],
       or: {
-        sid: "fuznc4"
+        sid: "fh8si3"
       }
-    }), F({
+    }), $({
       and: [{
-        clock: l.closed,
+        clock: m.closed,
         source: a,
-        fn: (c) => c.filter((g) => g !== l),
+        fn: (p) => p.filter((x) => x !== m),
         target: a
       }],
       or: {
-        sid: "ges8p4"
+        sid: "gcl2bo"
       }
     });
-  return F({
+  return $({
     and: [{
-      clock: o,
+      clock: l,
       target: n
     }],
     or: {
-      sid: "guq9uv"
+      sid: "gsj3hf"
     }
-  }), F({
+  }), $({
     and: [{
       clock: n,
       filter: Boolean,
-      target: w
+      target: U
     }],
     or: {
-      sid: "gxh8to"
+      sid: "gva2g8"
     }
-  }), F({
+  }), $({
     and: [{
-      clock: y,
-      fn: (l) => {
-        var h;
-        return {
-          path: l.pathname,
-          query: (h = l.query) !== null && h !== void 0 ? h : {}
-        };
+      clock: E,
+      source: {
+        query: f,
+        path: o
       },
-      target: [le({
-        sid: "-38mmc2",
-        fn: () => de({
+      filter: (m, h) => {
+        let {
+          query: p,
+          path: x
+        } = m;
+        return x !== h.pathname || !Ue(p, h.query);
+      },
+      fn: (m, h) => ({
+        path: h.pathname,
+        query: h.query
+      }),
+      target: [je({
+        sid: "-396exf",
+        fn: () => Se({
           targets: {
-            path: i,
-            query: s
+            path: o,
+            query: f
           }
         }),
         name: "target",
         method: "spread"
-      }), p]
+      }), O]
+    }],
+    or: {
+      sid: "ha4igz"
+    }
+  }), $({
+    and: [{
+      clock: w,
+      target: I
+    }],
+    or: {
+      sid: "i87r9d"
+    }
+  }), $({
+    and: [{
+      clock: [f, o],
+      source: {
+        query: f,
+        path: o
+      },
+      fn: (m) => m,
+      target: w
     }],
     or: {
-      sid: "hcbouf"
+      sid: "iayq86"
     }
   }), {
-    $query: s,
-    $path: i,
+    $query: f,
+    $path: o,
     $activeRoutes: a,
-    back: f,
-    forward: u,
+    back: j,
+    forward: S,
+    navigate: w,
     routes: r,
-    setHistory: o,
-    mappedRoutes: d,
-    trackQuery: De(a, s),
+    setHistory: l,
+    mappedRoutes: N,
+    trackQuery: Ce(a, f),
     "@@unitShape": () => ({
-      query: s,
-      path: i,
+      query: f,
+      path: o,
       activeRoutes: a,
-      onBack: f,
-      onForward: u
+      onBack: j,
+      onForward: S,
+      onNavigate: w
     })
   };
 }
 export {
-  Qe as createRoute,
-  We as createRouter,
-  O as parameters
+  er as createRoute,
+  rr as createRouter,
+  k as parameters
 };