@argon-router/core 0.3.0 → 0.3.2

package/dist/index.js

@@ -1,6 +1,6 @@
-import { createEffect as R, createStore as A, createEvent as x, sample as w, split as ue, attach as z, scopeBind as le, withFactory as de } from "effector";
-import { spread as pe } from "patronum";
-function K(e, t) {
+import { createEffect as K, createStore as B, createEvent as E, sample as S, split as we, attach as J, scopeBind as xe, withFactory as Oe } from "effector";
+import { spread as Fe } from "patronum";
+function Z(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -10,29 +10,29 @@ function K(e, t) {
   }
   return r;
 }
-function T(e) {
+function H(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? K(Object(r), !0).forEach(function(n) {
-      me(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : K(Object(r)).forEach(function(n) {
+    t % 2 ? Z(Object(r), !0).forEach(function(n) {
+      $e(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : Z(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function me(e, t, r) {
-  return (t = ye(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 = je(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
 }
-function ye(e) {
-  var t = ge(e, "string");
+function je(e) {
+  var t = Se(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function ge(e, t) {
+function Se(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.");
   }
@@ -40,461 +40,473 @@ function ge(e, t) {
 }
 function We(e) {
   let t;
-  const r = R(() => {
-    var d;
-    return (d = t) === null || d === void 0 ? void 0 : d();
+  const r = K(() => {
+    var y;
+    return (y = t) === null || y === void 0 ? void 0 : y();
   }, {
     name: "waitForAsyncBundleFx",
     sid: "tw7mq7"
-  }), n = R(async () => {
-    for (const O of (d = e.beforeOpen) !== null && d !== void 0 ? d : []) {
-      var d;
-      await O();
+  }), n = K(async () => {
+    for (const k of (y = e.beforeOpen) !== null && y !== void 0 ? y : []) {
+      var y;
+      await k();
     }
   }, {
     name: "beforeOpenFx",
     sid: "ls74w9"
-  }), a = R(async (d) => {
+  }), a = K(async (y) => {
     await r(), await n();
-    const O = e.parent;
-    return O && await O.internal.openFx(T(T({}, d ?? {
+    const k = e.parent;
+    return k && await k.internal.openFx(H(H({}, y ?? {
       params: {}
     }), {}, {
       historyIgnore: !0
-    })), d;
+    })), y;
   }, {
     name: "openFx",
     sid: "-hz9h5i"
-  }), s = A({}, {
+  }), f = B({}, {
     name: "$params",
-    sid: "gwsfoy"
-  }), o = A(!1, {
+    sid: "rstqrf"
+  }), c = B(!1, {
     name: "$isOpened",
-    sid: "ym3mgh"
-  }), i = a.pending, c = x({
+    sid: "-zgx6q9"
+  }), u = a.pending, F = E({
     name: "open",
-    sid: "-da1fdx"
-  }), u = x({
+    sid: "-cby6lj"
+  }), D = E({
     name: "close",
-    sid: "6wt8sn"
-  }), m = x({
+    sid: "7uwhl1"
+  }), v = E({
     name: "opened",
-    sid: "36opn9"
-  }), y = x({
+    sid: "44ryfn"
+  }), P = E({
     name: "openedOnServer",
-    sid: "-qpnfqf"
-  }), h = x({
+    sid: "-prk6y1"
+  }), A = E({
     name: "openedOnClient",
-    sid: "-qs3xog"
-  }), F = x({
+    sid: "-fw2mlz"
+  }), $ = E({
     name: "closed",
-    sid: "2gopr"
+    sid: "10jxi5"
   });
-  return w({
+  S({
     and: [{
-      clock: c,
+      clock: F,
       target: a
     }],
     or: {
-      sid: "t6sc35"
+      sid: "t7vx9v"
     }
-  }), ue({
+  });
+  const j = {};
+  return S({
+    and: [{
+      clock: a.doneData,
+      fn: (y) => y && "params" in y ? H({}, y.params) : j,
+      target: f
+    }],
+    or: {
+      sid: "tna5vz"
+    }
+  }), we({
     and: [{
       source: a.doneData,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: y,
-        client: h
+        server: P,
+        client: A
       }
     }],
     or: {
-      sid: "t9jb1y"
+      sid: "u5fdgw"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: [h, y],
-      target: m
+      clock: [A, P],
+      target: v
     }],
     or: {
-      sid: "tqkxg5"
+      sid: "ylqojg"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: m,
+      clock: v,
       fn: () => !0,
-      target: o
+      target: c
     }],
     or: {
-      sid: "u4vkvj"
+      sid: "yohni9"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: u,
-      target: F
+      clock: D,
+      target: $
     }],
     or: {
-      sid: "u86cfp"
+      sid: "z3c3j0"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: F,
+      clock: $,
       fn: () => !1,
-      target: o
+      target: c
     }],
     or: {
-      sid: "ylqojg"
+      sid: "z632ht"
     }
   }), {
-    $params: s,
-    $isOpened: o,
-    $isPending: i,
-    open: c,
-    closed: F,
-    opened: m,
-    openedOnClient: h,
-    openedOnServer: y,
-    internal: T({
-      close: u,
+    $params: f,
+    $isOpened: c,
+    $isPending: u,
+    open: F,
+    closed: $,
+    opened: v,
+    openedOnClient: A,
+    openedOnServer: P,
+    internal: H({
+      close: D,
       openFx: a,
-      setAsyncImport: (d) => t = d
+      setAsyncImport: (y) => t = y
     }, e),
     "@@unitShape": () => ({
-      params: s,
-      isPending: i,
-      isOpened: o,
-      onOpen: c
+      params: f,
+      isPending: u,
+      isOpened: c,
+      onOpen: F
     })
   };
 }
-var E = {};
-Object.defineProperty(E, "__esModule", {
-  value: !0
-});
-E.TokenData = void 0;
-E.parse = M;
-var he = E.compile = Se, be = E.match = je;
-E.pathToRegexp = ee;
-E.stringify = Ne;
-const _ = "/", q = (e) => e, Y = /^[$_\p{ID_Start}]$/u, L = /^[$\u200c\u200d\p{ID_Continue}]$/u, k = "https://git.new/pathToRegexpError", we = {
-  // Groups.
-  "{": "{",
-  "}": "}",
-  // Reserved.
-  "(": "(",
-  ")": ")",
-  "[": "[",
-  "]": "]",
-  "+": "+",
-  "?": "?",
-  "!": "!"
-};
-function xe(e) {
-  return e.replace(/[{}()\[\]+?!:*]/g, "\\$&");
-}
-function $(e) {
-  return e.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
-}
-function* Fe(e) {
-  const t = [...e];
-  let r = 0;
-  function n() {
-    let a = "";
-    if (Y.test(t[++r]))
-      for (a += t[r]; L.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 C = {}, ee;
+function Ee() {
+  if (ee) return C;
+  ee = 1, Object.defineProperty(C, "__esModule", {
+    value: !0
+  }), C.TokenData = void 0, C.parse = P, C.compile = A, C.match = y, C.pathToRegexp = k, C.stringify = x;
+  const e = "/", t = (i) => i, r = /^[$_\p{ID_Start}]$/u, n = /^[$\u200c\u200d\p{ID_Continue}]$/u, a = "https://git.new/pathToRegexpError", f = {
+    // Groups.
+    "{": "{",
+    "}": "}",
+    // Reserved.
+    "(": "(",
+    ")": ")",
+    "[": "[",
+    "]": "]",
+    "+": "+",
+    "?": "?",
+    "!": "!"
+  };
+  function c(i) {
+    return i.replace(/[{}()\[\]+?!:*]/g, "\\$&");
+  }
+  function u(i) {
+    return i.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
+  }
+  function* F(i) {
+    const o = [...i];
+    let s = 0;
+    function p() {
+      let l = "";
+      if (r.test(o[++s]))
+        for (l += o[s]; n.test(o[++s]); )
+          l += o[s];
+      else if (o[s] === '"') {
+        let d = s;
+        for (; s < o.length; ) {
+          if (o[++s] === '"') {
+            s++, d = 0;
+            break;
+          }
+          o[s] === "\\" ? l += o[++s] : l += o[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}: ${k}`);
+      if (!l)
+        throw new TypeError(`Missing parameter name at ${s}: ${a}`);
+      return l;
     }
-    if (!a)
-      throw new TypeError(`Missing parameter name at ${r}: ${k}`);
-    return a;
-  }
-  for (; r < t.length; ) {
-    const a = t[r], s = we[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 o = n();
-      yield {
-        type: "PARAM",
-        index: r,
-        value: o
-      };
-    } else if (a === "*") {
-      const o = n();
-      yield {
-        type: "WILDCARD",
-        index: r,
-        value: o
-      };
-    } else
-      yield {
-        type: "CHAR",
-        index: r,
-        value: t[r++]
-      };
+    for (; s < o.length; ) {
+      const l = o[s], d = f[l];
+      if (d)
+        yield {
+          type: d,
+          index: s++,
+          value: l
+        };
+      else if (l === "\\")
+        yield {
+          type: "ESCAPED",
+          index: s++,
+          value: o[s++]
+        };
+      else if (l === ":") {
+        const w = p();
+        yield {
+          type: "PARAM",
+          index: s,
+          value: w
+        };
+      } else if (l === "*") {
+        const w = p();
+        yield {
+          type: "WILDCARD",
+          index: s,
+          value: w
+        };
+      } else
+        yield {
+          type: "CHAR",
+          index: s,
+          value: o[s++]
+        };
+    }
+    return {
+      type: "END",
+      index: s,
+      value: ""
+    };
   }
-  return {
-    type: "END",
-    index: r,
-    value: ""
-  };
-}
-class $e {
-  constructor(t) {
-    this.tokens = t;
+  class D {
+    constructor(o) {
+      this.tokens = o;
+    }
+    peek() {
+      if (!this._peek) {
+        const o = this.tokens.next();
+        this._peek = o.value;
+      }
+      return this._peek;
+    }
+    tryConsume(o) {
+      const s = this.peek();
+      if (s.type === o)
+        return this._peek = void 0, s.value;
+    }
+    consume(o) {
+      const s = this.tryConsume(o);
+      if (s !== void 0) return s;
+      const {
+        type: p,
+        index: l
+      } = this.peek();
+      throw new TypeError(`Unexpected ${p} at ${l}, expected ${o}: ${a}`);
+    }
+    text() {
+      let o = "", s;
+      for (; s = this.tryConsume("CHAR") || this.tryConsume("ESCAPED"); )
+        o += s;
+      return o;
+    }
   }
-  peek() {
-    if (!this._peek) {
-      const t = this.tokens.next();
-      this._peek = t.value;
+  class v {
+    constructor(o) {
+      this.tokens = o;
     }
-    return this._peek;
   }
-  tryConsume(t) {
-    const r = this.peek();
-    if (r.type === t)
-      return this._peek = void 0, r.value;
+  C.TokenData = v;
+  function P(i, o = {}) {
+    const {
+      encodePath: s = t
+    } = o, p = new D(F(i));
+    function l(w) {
+      const h = [];
+      for (; ; ) {
+        const N = p.text();
+        N && h.push({
+          type: "text",
+          value: s(N)
+        });
+        const R = p.tryConsume("PARAM");
+        if (R) {
+          h.push({
+            type: "param",
+            name: R
+          });
+          continue;
+        }
+        const z = p.tryConsume("WILDCARD");
+        if (z) {
+          h.push({
+            type: "wildcard",
+            name: z
+          });
+          continue;
+        }
+        if (p.tryConsume("{")) {
+          h.push({
+            type: "group",
+            tokens: l("}")
+          });
+          continue;
+        }
+        return p.consume(w), h;
+      }
+    }
+    const d = l("END");
+    return new v(d);
   }
-  consume(t) {
-    const r = this.tryConsume(t);
-    if (r !== void 0) return r;
+  function A(i, o = {}) {
     const {
-      type: n,
-      index: a
-    } = this.peek();
-    throw new TypeError(`Unexpected ${n} at ${a}, expected ${t}: ${k}`);
+      encode: s = encodeURIComponent,
+      delimiter: p = e
+    } = o, l = i instanceof v ? i : P(i, o), d = $(l.tokens, p, s);
+    return function(h = {}) {
+      const [N, ...R] = d(h);
+      if (R.length)
+        throw new TypeError(`Missing parameters: ${R.join(", ")}`);
+      return N;
+    };
   }
-  text() {
-    let t = "", r;
-    for (; r = this.tryConsume("CHAR") || this.tryConsume("ESCAPED"); )
-      t += r;
-    return t;
+  function $(i, o, s) {
+    const p = i.map((l) => j(l, o, s));
+    return (l) => {
+      const d = [""];
+      for (const w of p) {
+        const [h, ...N] = w(l);
+        d[0] += h, d.push(...N);
+      }
+      return d;
+    };
   }
-}
-class P {
-  constructor(t) {
-    this.tokens = t;
+  function j(i, o, s) {
+    if (i.type === "text") return () => [i.value];
+    if (i.type === "group") {
+      const l = $(i.tokens, o, s);
+      return (d) => {
+        const [w, ...h] = l(d);
+        return h.length ? [""] : [w];
+      };
+    }
+    const p = s || t;
+    return i.type === "wildcard" && s !== !1 ? (l) => {
+      const d = l[i.name];
+      if (d == null) return ["", i.name];
+      if (!Array.isArray(d) || d.length === 0)
+        throw new TypeError(`Expected "${i.name}" to be a non-empty array`);
+      return [d.map((w, h) => {
+        if (typeof w != "string")
+          throw new TypeError(`Expected "${i.name}/${h}" to be a string`);
+        return p(w);
+      }).join(o)];
+    } : (l) => {
+      const d = l[i.name];
+      if (d == null) return ["", i.name];
+      if (typeof d != "string")
+        throw new TypeError(`Expected "${i.name}" to be a string`);
+      return [p(d)];
+    };
   }
-}
-E.TokenData = P;
-function M(e, t = {}) {
-  const {
-    encodePath: r = q
-  } = t, n = new $e(Fe(e));
-  function a(o) {
-    const i = [];
-    for (; ; ) {
-      const c = n.text();
-      c && i.push({
-        type: "text",
-        value: r(c)
-      });
-      const u = n.tryConsume("PARAM");
-      if (u) {
-        i.push({
-          type: "param",
-          name: u
-        });
-        continue;
+  function y(i, o = {}) {
+    const {
+      decode: s = decodeURIComponent,
+      delimiter: p = e
+    } = o, {
+      regexp: l,
+      keys: d
+    } = k(i, o), w = d.map((h) => s === !1 ? t : h.type === "param" ? s : (N) => N.split(p).map(s));
+    return function(N) {
+      const R = l.exec(N);
+      if (!R) return !1;
+      const z = R[0], q = /* @__PURE__ */ Object.create(null);
+      for (let L = 1; L < R.length; L++) {
+        if (R[L] === void 0) continue;
+        const M = d[L - 1], V = w[L - 1];
+        q[M.name] = V(R[L]);
       }
-      const m = n.tryConsume("WILDCARD");
-      if (m) {
-        i.push({
-          type: "wildcard",
-          name: m
-        });
+      return {
+        path: z,
+        params: q
+      };
+    };
+  }
+  function k(i, o = {}) {
+    const {
+      delimiter: s = e,
+      end: p = !0,
+      sensitive: l = !1,
+      trailing: d = !0
+    } = o, w = [], h = [], N = l ? "" : "i", z = (Array.isArray(i) ? i : [i]).map((M) => M instanceof v ? M : P(M, o));
+    for (const {
+      tokens: M
+    } of z)
+      for (const V of g(M, 0, [])) {
+        const be = b(V, s, w);
+        h.push(be);
+      }
+    let q = `^(?:${h.join("|")})`;
+    return d && (q += `(?:${u(s)}$)?`), q += p ? "$" : `(?=${u(s)}|$)`, {
+      regexp: new RegExp(q, N),
+      keys: w
+    };
+  }
+  function* g(i, o, s) {
+    if (o === i.length)
+      return yield s;
+    const p = i[o];
+    if (p.type === "group") {
+      const l = s.slice();
+      for (const d of g(p.tokens, 0, l))
+        yield* g(i, o + 1, d);
+    } else
+      s.push(p);
+    yield* g(i, o + 1, s);
+  }
+  function b(i, o, s) {
+    let p = "", l = "", d = !0;
+    for (let w = 0; w < i.length; w++) {
+      const h = i[w];
+      if (h.type === "text") {
+        p += u(h.value), l += h.value, d || (d = h.value.includes(o));
         continue;
       }
-      if (n.tryConsume("{")) {
-        i.push({
-          type: "group",
-          tokens: a("}")
-        });
+      if (h.type === "param" || h.type === "wildcard") {
+        if (!d && !l)
+          throw new TypeError(`Missing text after "${h.name}": ${a}`);
+        h.type === "param" ? p += `(${m(o, d ? "" : l)}+)` : p += "([\\s\\S]+)", s.push(h), l = "", d = !1;
         continue;
       }
-      return n.consume(o), i;
     }
+    return p;
   }
-  const s = a("END");
-  return new P(s);
-}
-function Se(e, t = {}) {
-  const {
-    encode: r = encodeURIComponent,
-    delimiter: n = _
-  } = t, a = e instanceof P ? e : M(e, t), s = Z(a.tokens, n, r);
-  return function(i = {}) {
-    const [c, ...u] = s(i);
-    if (u.length)
-      throw new TypeError(`Missing parameters: ${u.join(", ")}`);
-    return c;
-  };
-}
-function Z(e, t, r) {
-  const n = e.map((a) => Oe(a, t, r));
-  return (a) => {
-    const s = [""];
-    for (const o of n) {
-      const [i, ...c] = o(a);
-      s[0] += i, s.push(...c);
-    }
-    return s;
-  };
-}
-function Oe(e, t, r) {
-  if (e.type === "text") return () => [e.value];
-  if (e.type === "group") {
-    const a = Z(e.tokens, t, r);
-    return (s) => {
-      const [o, ...i] = a(s);
-      return i.length ? [""] : [o];
-    };
+  function m(i, o) {
+    return o.length < 2 ? i.length < 2 ? `[^${u(i + o)}]` : `(?:(?!${u(i)})[^${u(o)}])` : i.length < 2 ? `(?:(?!${u(o)})[^${u(i)}])` : `(?:(?!${u(o)}|${u(i)})[\\s\\S])`;
   }
-  const n = r || q;
-  return e.type === "wildcard" && r !== !1 ? (a) => {
-    const s = a[e.name];
-    if (s == null) return ["", e.name];
-    if (!Array.isArray(s) || s.length === 0)
-      throw new TypeError(`Expected "${e.name}" to be a non-empty array`);
-    return [s.map((o, i) => {
-      if (typeof o != "string")
-        throw new TypeError(`Expected "${e.name}/${i}" to be a string`);
-      return n(o);
-    }).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 je(e, t = {}) {
-  const {
-    decode: r = decodeURIComponent,
-    delimiter: n = _
-  } = t, {
-    regexp: a,
-    keys: s
-  } = ee(e, t), o = s.map((i) => r === !1 ? q : i.type === "param" ? r : (c) => c.split(n).map(r));
-  return function(c) {
-    const u = a.exec(c);
-    if (!u) return !1;
-    const m = u[0], y = /* @__PURE__ */ Object.create(null);
-    for (let h = 1; h < u.length; h++) {
-      if (u[h] === void 0) continue;
-      const F = s[h - 1], d = o[h - 1];
-      y[F.name] = d(u[h]);
-    }
-    return {
-      path: m,
-      params: y
-    };
-  };
-}
-function ee(e, t = {}) {
-  const {
-    delimiter: r = _,
-    end: n = !0,
-    sensitive: a = !1,
-    trailing: s = !0
-  } = t, o = [], i = [], c = a ? "" : "i", m = (Array.isArray(e) ? e : [e]).map((F) => F instanceof P ? F : M(F, t));
-  for (const {
-    tokens: F
-  } of m)
-    for (const d of I(F, 0, [])) {
-      const O = Ee(d, r, o);
-      i.push(O);
-    }
-  let y = `^(?:${i.join("|")})`;
-  return s && (y += `(?:${$(r)}$)?`), y += n ? "$" : `(?=${$(r)}|$)`, {
-    regexp: new RegExp(y, c),
-    keys: o
-  };
-}
-function* I(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 I(n.tokens, 0, a))
-      yield* I(e, t + 1, s);
-  } else
-    r.push(n);
-  yield* I(e, t + 1, r);
-}
-function Ee(e, t, r) {
-  let n = "", a = "", s = !0;
-  for (let o = 0; o < e.length; o++) {
-    const i = e[o];
-    if (i.type === "text") {
-      n += $(i.value), a += i.value, s || (s = i.value.includes(t));
-      continue;
-    }
-    if (i.type === "param" || i.type === "wildcard") {
-      if (!s && !a)
-        throw new TypeError(`Missing text after "${i.name}": ${k}`);
-      i.type === "param" ? n += `(${Ae(t, s ? "" : a)}+)` : n += "([\\s\\S]+)", r.push(i), a = "", s = !1;
-      continue;
-    }
+  function x(i) {
+    return i.tokens.map(function o(s, p, l) {
+      if (s.type === "text") return c(s.value);
+      if (s.type === "group")
+        return `{${s.tokens.map(o).join("")}}`;
+      const w = _(s.name) && I(l[p + 1]) ? s.name : JSON.stringify(s.name);
+      if (s.type === "param") return `:${w}`;
+      if (s.type === "wildcard") return `*${w}`;
+      throw new TypeError(`Unexpected token: ${s}`);
+    }).join("");
   }
-  return n;
-}
-function Ae(e, t) {
-  return t.length < 2 ? e.length < 2 ? `[^${$(e + t)}]` : `(?:(?!${$(e)})[^${$(t)}])` : e.length < 2 ? `(?:(?!${$(t)})[^${$(e)}])` : `(?:(?!${$(t)}|${$(e)})[\\s\\S])`;
-}
-function Ne(e) {
-  return e.tokens.map(function t(r, n, a) {
-    if (r.type === "text") return xe(r.value);
-    if (r.type === "group")
-      return `{${r.tokens.map(t).join("")}}`;
-    const o = Re(r.name) && Ie(a[n + 1]) ? r.name : JSON.stringify(r.name);
-    if (r.type === "param") return `:${o}`;
-    if (r.type === "wildcard") return `*${o}`;
-    throw new TypeError(`Unexpected token: ${r}`);
-  }).join("");
-}
-function Re(e) {
-  const [t, ...r] = e;
-  return Y.test(t) ? r.every((n) => L.test(n)) : !1;
-}
-function Ie(e) {
-  return (e == null ? void 0 : e.type) !== "text" ? !0 : !L.test(e.value[0]);
+  function _(i) {
+    const [o, ...s] = i;
+    return r.test(o) ? s.every((p) => n.test(p)) : !1;
+  }
+  function I(i) {
+    return (i == null ? void 0 : i.type) !== "text" ? !0 : !n.test(i.value[0]);
+  }
+  return C;
 }
-const ke = Symbol("any"), Pe = Symbol("number"), Ce = Symbol("string"), Te = Symbol("array"), j = {
-  any: ke,
+var re = Ee();
+const ve = Symbol("any"), Pe = Symbol("number"), Ae = Symbol("string"), ke = Symbol("array"), Ne = Symbol("boolean"), T = {
+  any: ve,
   number: Pe,
-  string: Ce,
-  array: Te
+  string: Ae,
+  array: ke,
+  boolean: Ne
 };
-function J(e, t) {
+function te(e, t) {
   for (const r of e)
-    if (!t.includes(r))
-      return !1;
-  return !0;
+    if (t.includes(r))
+      return !0;
+  return !1;
 }
-function Q(e, t) {
+function ne(e, t) {
   for (const r in t) {
     const n = t[r];
     if (Array.isArray(n) && (!e[r] || JSON.stringify(n) !== e[r]))
@@ -522,141 +534,201 @@ function Q(e, t) {
       }
     }
     switch (n) {
-      case j.any: {
+      case T.any: {
         if (!e[r])
           return !1;
         break;
       }
-      case j.string: {
+      case T.string: {
         if (!e[r] || Array.isArray(e[r]))
           return !1;
         break;
       }
-      case j.array: {
+      case T.array: {
         if (!e[r] || !Array.isArray(e[r]))
           return !1;
         break;
       }
-      case j.number: {
+      case T.number: {
         if (!e[r] || Array.isArray(e[r]) || isNaN(parseInt(e[r])) && isNaN(parseFloat(e[r])))
           return !1;
         break;
       }
+      case T.boolean: {
+        if (!e[r] || Array.isArray(e[r]) || !["0", "1", "false", "true"].includes(e[r]))
+          return !1;
+        break;
+      }
     }
   }
   return !0;
 }
-function ve(e, t) {
+function Re(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";
+      const c = e[n];
+      r[n] = c;
       continue;
     }
     switch (typeof a) {
       case "number": {
-        const o = e[n];
-        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+        r[n] = isNaN(parseInt(f)) ? parseFloat(f) : parseInt(f);
         break;
       }
       case "object": {
-        r[n] = JSON.parse(s);
+        r[n] = JSON.parse(f);
         break;
       }
       case "string":
-        r[n] = e[n];
+        r[n] = f;
       case "boolean": {
-        const o = e[n];
-        r[n] = o === "0" ? parseFloat(o) : parseInt(o);
+        r[n] = f === "1" || f === "true";
         break;
       }
     }
     switch (a) {
-      case j.any:
-      case j.string:
-      case j.array: {
+      case T.any:
+      case T.string:
+      case T.array: {
         r[n] = e[n];
         break;
       }
-      case j.number: {
-        const o = e[n];
-        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+      case T.number: {
+        const c = e[n];
+        r[n] = isNaN(parseInt(c)) ? parseFloat(c) : parseInt(c);
+        break;
+      }
+      case T.boolean: {
+        const c = e[n];
+        r[n] = c === "1" || c === "true";
         break;
       }
     }
   }
   return r;
 }
-function De(e, t) {
-  return (r) => {
+function De(e) {
+  let {
+    $activeRoutes: t,
+    $path: r,
+    $query: n,
+    navigateFx: a
+  } = e;
+  return (f) => {
     const {
-      parameters: n,
-      forRoutes: a
-    } = r, s = x({
+      parameters: c,
+      forRoutes: u
+    } = f, F = B(!1, {
+      name: "$entered",
+      sid: "jh7pkx"
+    }), D = E({
       name: "entered",
-      sid: "-d3obu6"
-    }), o = x({
+      sid: "-savym4"
+    }), v = E({
       name: "exited",
-      sid: "-xofyk3"
-    }), i = x({
+      sid: "m5ggn3"
+    }), P = E({
       name: "exit",
-      sid: "-673d76"
+      sid: "-bgcxp1"
+    }), A = E({
+      name: "changeEntered",
+      sid: "-2ei1v0"
     });
-    return w({
+    return S({
+      and: [{
+        clock: A,
+        target: F
+      }],
+      or: {
+        sid: "-hckvl5"
+      }
+    }), S({
       and: [{
         source: {
-          activeRoutes: e,
-          query: t
+          activeRoutes: t,
+          query: n
         },
-        filter: (c) => {
+        filter: ($) => {
           let {
-            activeRoutes: u,
-            query: m
-          } = c;
-          return (!a || J(a, u)) && Q(m, n);
+            activeRoutes: j,
+            query: y
+          } = $;
+          return (!u || te(u, j)) && ne(y, c);
         },
-        fn: (c) => {
+        fn: ($) => {
           let {
-            query: u
-          } = c;
-          return ve(u, n);
-        }
+            query: j
+          } = $;
+          return Re(j, c);
+        },
+        target: [D, A.prepend(() => !0)]
       }],
       or: {
-        sid: "-so0f9q"
+        sid: "-h9twmc"
       }
-    }), w({
+    }), S({
       and: [{
         source: {
-          activeRoutes: e,
-          query: t
+          activeRoutes: t,
+          query: n,
+          entered: F
         },
-        filter: (c) => {
+        filter: ($) => {
           let {
-            activeRoutes: u,
-            query: m
-          } = c;
-          return !((!a || J(a, u)) && Q(m, n));
+            activeRoutes: j,
+            query: y,
+            entered: k
+          } = $;
+          return k && !((!u || te(u, j)) && ne(y, c));
+        },
+        target: [v.prepend(() => {
+        }), A.prepend(() => !1)]
+      }],
+      or: {
+        sid: "-gtc2ti"
+      }
+    }), S({
+      and: [{
+        clock: P,
+        source: {
+          path: r,
+          query: n
+        },
+        fn: ($, j) => {
+          let {
+            path: y,
+            query: k
+          } = $;
+          if (j && j.ignoreParams) {
+            const g = {};
+            for (const b of j.ignoreParams)
+              k[b] && (g[b] = k[b]);
+            return {
+              query: g,
+              path: y
+            };
+          }
+          return {
+            query: {},
+            path: y
+          };
         },
-        target: o
+        target: a
       }],
       or: {
-        sid: "-s82e29"
+        sid: "-fyjlla"
       }
     }), {
-      entered: s,
-      exited: o,
-      exit: i,
-      getPayload: (c) => Object.entries(c).reduce((u, m) => {
-        let [y, h] = m;
-        return typeof n[y] == "symbol" ? u[y] = h : u[y] = n[y], u;
-      }, {})
+      entered: D,
+      exited: v,
+      exit: P
     };
   };
 }
-const re = "%[a-f0-9]{2}", W = new RegExp("(" + re + ")|([^%]+?)", "gi"), G = new RegExp("(" + re + ")+", "gi");
-function D(e, t) {
+const fe = "%[a-f0-9]{2}", ae = new RegExp("(" + fe + ")|([^%]+?)", "gi"), se = new RegExp("(" + fe + ")+", "gi");
+function W(e, t) {
   try {
     return [decodeURIComponent(e.join(""))];
   } catch {
@@ -665,32 +737,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 Ue(e) {
+function Ie(e) {
   try {
     return decodeURIComponent(e);
   } catch {
-    let t = e.match(W) || [];
+    let t = e.match(ae) || [];
     for (let r = 1; r < t.length; r++)
-      e = D(t, r).join(""), t = e.match(W) || [];
+      e = W(t, r).join(""), t = e.match(ae) || [];
     return e;
   }
 }
-function _e(e) {
+function Ce(e) {
   const t = {
     "%FE%FF": "��",
     "%FF%FE": "��"
   };
-  let r = G.exec(e);
+  let r = se.exec(e);
   for (; r; ) {
     try {
       t[r[0]] = decodeURIComponent(r[0]);
     } catch {
-      const a = Ue(r[0]);
+      const a = Ie(r[0]);
       a !== r[0] && (t[r[0]] = a);
     }
-    r = G.exec(e);
+    r = se.exec(e);
   }
   t["%C2"] = "�";
   const n = Object.keys(t);
@@ -698,16 +770,16 @@ function _e(e) {
     e = e.replace(new RegExp(a, "g"), t[a]);
   return e;
 }
-function qe(e) {
+function Te(e) {
   if (typeof e != "string")
     throw new TypeError("Expected `encodedURI` to be of type `string`, got `" + typeof e + "`");
   try {
     return decodeURIComponent(e);
   } catch {
-    return _e(e);
+    return Ce(e);
   }
 }
-function Le(e, t) {
+function Ue(e, t) {
   const r = {};
   if (Array.isArray(t))
     for (const n of t) {
@@ -718,13 +790,13 @@ function Le(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 te(e, t) {
+function ue(e, t) {
   if (!(typeof e == "string" && typeof t == "string"))
     throw new TypeError("Expected the arguments to be of type `string`");
   if (e === "" || t === "")
@@ -732,29 +804,29 @@ function te(e, t) {
   const r = e.indexOf(t);
   return r === -1 ? [] : [e.slice(0, r), e.slice(r + t.length)];
 }
-const Me = (e) => e == null, Be = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), U = Symbol("encodeFragmentIdentifier");
-function He(e) {
+const _e = (e) => e == null, qe = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), G = Symbol("encodeFragmentIdentifier");
+function Le(e) {
   switch (e.arrayFormat) {
     case "index":
       return (t) => (r, n) => {
         const a = r.length;
-        return n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [p(t, e), "[", a, "]"].join("")] : [...r, [p(t, e), "[", p(a, e), "]=", p(n, e)].join("")];
+        return n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [O(t, e), "[", a, "]"].join("")] : [...r, [O(t, e), "[", O(a, e), "]=", O(n, e)].join("")];
       };
     case "bracket":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [p(t, e), "[]"].join("")] : [...r, [p(t, e), "[]=", p(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [O(t, e), "[]"].join("")] : [...r, [O(t, e), "[]=", O(n, e)].join("")];
     case "colon-list-separator":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [p(t, e), ":list="].join("")] : [...r, [p(t, e), ":list=", p(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [O(t, e), ":list="].join("")] : [...r, [O(t, e), ":list=", O(n, e)].join("")];
     case "comma":
     case "separator":
     case "bracket-separator": {
       const t = e.arrayFormat === "bracket-separator" ? "[]=" : "=";
-      return (r) => (n, a) => a === void 0 || e.skipNull && a === null || e.skipEmptyString && a === "" ? n : (a = a === null ? "" : a, n.length === 0 ? [[p(r, e), t, p(a, e)].join("")] : [[n, p(a, e)].join(e.arrayFormatSeparator)]);
+      return (r) => (n, a) => a === void 0 || e.skipNull && a === null || e.skipEmptyString && a === "" ? n : (a = a === null ? "" : a, n.length === 0 ? [[O(r, e), t, O(a, e)].join("")] : [[n, O(a, e)].join(e.arrayFormatSeparator)]);
     }
     default:
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, p(t, e)] : [...r, [p(t, e), "=", p(n, e)].join("")];
+      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, O(t, e)] : [...r, [O(t, e), "=", O(n, e)].join("")];
   }
 }
-function Ve(e) {
+function Me(e) {
   let t;
   switch (e.arrayFormat) {
     case "index":
@@ -792,24 +864,24 @@ function Ve(e) {
     case "comma":
     case "separator":
       return (r, n, a) => {
-        const s = typeof n == "string" && n.includes(e.arrayFormatSeparator), o = typeof n == "string" && !s && S(n, e).includes(e.arrayFormatSeparator);
-        n = o ? S(n, e) : n;
-        const i = s || o ? n.split(e.arrayFormatSeparator).map((c) => S(c, e)) : n === null ? n : S(n, e);
-        a[r] = i;
+        const f = typeof n == "string" && n.includes(e.arrayFormatSeparator), c = typeof n == "string" && !f && U(n, e).includes(e.arrayFormatSeparator);
+        n = c ? U(n, e) : n;
+        const u = f || c ? n.split(e.arrayFormatSeparator).map((F) => U(F, e)) : n === null ? n : U(n, e);
+        a[r] = u;
       };
     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 && U(n, e);
           return;
         }
-        const o = n === null ? [] : S(n, e).split(e.arrayFormatSeparator);
+        const c = n === null ? [] : U(n, e).split(e.arrayFormatSeparator);
         if (a[r] === void 0) {
-          a[r] = o;
+          a[r] = c;
           return;
         }
-        a[r] = [...a[r], ...o];
+        a[r] = [...a[r], ...c];
       };
     default:
       return (r, n, a) => {
@@ -821,37 +893,37 @@ function Ve(e) {
       };
   }
 }
-function ne(e) {
+function le(e) {
   if (typeof e != "string" || e.length !== 1)
     throw new TypeError("arrayFormatSeparator must be single character string");
 }
-function p(e, t) {
-  return t.encode ? t.strict ? Be(e) : encodeURIComponent(e) : e;
+function O(e, t) {
+  return t.encode ? t.strict ? qe(e) : encodeURIComponent(e) : e;
 }
-function S(e, t) {
-  return t.decode ? qe(e) : e;
+function U(e, t) {
+  return t.decode ? Te(e) : e;
 }
-function ae(e) {
-  return Array.isArray(e) ? e.sort() : typeof e == "object" ? ae(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
+function de(e) {
+  return Array.isArray(e) ? e.sort() : typeof e == "object" ? de(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
 }
-function se(e) {
+function pe(e) {
   const t = e.indexOf("#");
   return t !== -1 && (e = e.slice(0, t)), e;
 }
-function ze(e) {
+function Be(e) {
   let t = "";
   const r = e.indexOf("#");
   return r !== -1 && (t = e.slice(r)), t;
 }
-function X(e, t, r) {
+function oe(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 B(e) {
-  e = se(e);
+function X(e) {
+  e = pe(e);
   const t = e.indexOf("?");
   return t === -1 ? "" : e.slice(t + 1);
 }
-function H(e, t) {
+function Y(e, t) {
   t = {
     decode: !0,
     sort: !0,
@@ -861,30 +933,30 @@ function H(e, t) {
     parseBooleans: !1,
     types: /* @__PURE__ */ Object.create(null),
     ...t
-  }, ne(t.arrayFormatSeparator);
-  const r = Ve(t), n = /* @__PURE__ */ Object.create(null);
+  }, le(t.arrayFormatSeparator);
+  const r = Me(t), n = /* @__PURE__ */ Object.create(null);
   if (typeof e != "string" || (e = e.trim().replace(/^[?#&]/, ""), !e))
     return n;
   for (const a of e.split("&")) {
     if (a === "")
       continue;
-    const s = t.decode ? a.replaceAll("+", " ") : a;
-    let [o, i] = te(s, "=");
-    o === void 0 && (o = s), i = i === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? i : S(i, t), r(S(o, t), i, n);
+    const f = t.decode ? a.replaceAll("+", " ") : a;
+    let [c, u] = ue(f, "=");
+    c === void 0 && (c = f), u = u === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? u : U(u, t), r(U(c, t), u, n);
   }
-  for (const [a, s] of Object.entries(n))
-    if (typeof s == "object" && s !== null && t.types[a] !== "string")
-      for (const [o, i] of Object.entries(s)) {
-        const c = t.types[a] ? t.types[a].replace("[]", "") : void 0;
-        s[o] = X(i, t, c);
+  for (const [a, f] of Object.entries(n))
+    if (typeof f == "object" && f !== null && t.types[a] !== "string")
+      for (const [c, u] of Object.entries(f)) {
+        const F = t.types[a] ? t.types[a].replace("[]", "") : void 0;
+        f[c] = oe(u, t, F);
       }
-    else typeof s == "object" && s !== null && t.types[a] === "string" ? n[a] = Object.values(s).join(t.arrayFormatSeparator) : n[a] = X(s, t, t.types[a]);
-  return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, s) => {
-    const o = n[s];
-    return a[s] = o && typeof o == "object" && !Array.isArray(o) ? ae(o) : o, a;
+    else typeof f == "object" && f !== null && t.types[a] === "string" ? n[a] = Object.values(f).join(t.arrayFormatSeparator) : n[a] = oe(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 c = n[f];
+    return a[f] = c && typeof c == "object" && !Array.isArray(c) ? de(c) : c, a;
   }, /* @__PURE__ */ Object.create(null));
 }
-function oe(e, t) {
+function me(e, t) {
   if (!e)
     return "";
   t = {
@@ -893,202 +965,266 @@ function oe(e, t) {
     arrayFormat: "none",
     arrayFormatSeparator: ",",
     ...t
-  }, ne(t.arrayFormatSeparator);
-  const r = (o) => t.skipNull && Me(e[o]) || t.skipEmptyString && e[o] === "", n = He(t), a = {};
-  for (const [o, i] of Object.entries(e))
-    r(o) || (a[o] = i);
-  const s = Object.keys(a);
-  return t.sort !== !1 && s.sort(t.sort), s.map((o) => {
-    const i = e[o];
-    return i === void 0 ? "" : i === null ? p(o, t) : Array.isArray(i) ? i.length === 0 && t.arrayFormat === "bracket-separator" ? p(o, t) + "[]" : i.reduce(n(o), []).join("&") : p(o, t) + "=" + p(i, t);
-  }).filter((o) => o.length > 0).join("&");
+  }, le(t.arrayFormatSeparator);
+  const r = (c) => t.skipNull && _e(e[c]) || t.skipEmptyString && e[c] === "", n = Le(t), a = {};
+  for (const [c, u] of Object.entries(e))
+    r(c) || (a[c] = u);
+  const f = Object.keys(a);
+  return t.sort !== !1 && f.sort(t.sort), f.map((c) => {
+    const u = e[c];
+    return u === void 0 ? "" : u === null ? O(c, t) : Array.isArray(u) ? u.length === 0 && t.arrayFormat === "bracket-separator" ? O(c, t) + "[]" : u.reduce(n(c), []).join("&") : O(c, t) + "=" + O(u, t);
+  }).filter((c) => c.length > 0).join("&");
 }
-function ie(e, t) {
+function ye(e, t) {
   var a;
   t = {
     decode: !0,
     ...t
   };
-  let [r, n] = te(e, "#");
+  let [r, n] = ue(e, "#");
   return r === void 0 && (r = e), {
     url: ((a = r == null ? void 0 : r.split("?")) == null ? void 0 : a[0]) ?? "",
-    query: H(B(e), t),
+    query: Y(X(e), t),
     ...t && t.parseFragmentIdentifier && n ? {
-      fragmentIdentifier: S(n, t)
+      fragmentIdentifier: U(n, t)
     } : {}
   };
 }
-function ce(e, t) {
+function he(e, t) {
   t = {
     encode: !0,
     strict: !0,
-    [U]: !0,
+    [G]: !0,
     ...t
   };
-  const r = se(e.url).split("?")[0] || "", n = B(e.url), a = {
-    ...H(n, {
+  const r = pe(e.url).split("?")[0] || "", n = X(e.url), a = {
+    ...Y(n, {
       sort: !1
     }),
     ...e.query
   };
-  let s = oe(a, t);
-  s && (s = `?${s}`);
-  let o = ze(e.url);
+  let f = me(a, t);
+  f && (f = `?${f}`);
+  let c = Be(e.url);
   if (typeof e.fragmentIdentifier == "string") {
-    const i = new URL(r);
-    i.hash = e.fragmentIdentifier, o = t[U] ? i.hash : `#${e.fragmentIdentifier}`;
+    const u = new URL(r);
+    u.hash = e.fragmentIdentifier, c = t[G] ? u.hash : `#${e.fragmentIdentifier}`;
   }
-  return `${r}${s}${o}`;
+  return `${r}${f}${c}`;
 }
-function fe(e, t, r) {
+function ge(e, t, r) {
   r = {
     parseFragmentIdentifier: !0,
-    [U]: !1,
+    [G]: !1,
     ...r
   };
   const {
     url: n,
     query: a,
-    fragmentIdentifier: s
-  } = ie(e, r);
-  return ce({
+    fragmentIdentifier: f
+  } = ye(e, r);
+  return he({
     url: n,
-    query: Le(a, t),
-    fragmentIdentifier: s
+    query: Ue(a, t),
+    fragmentIdentifier: f
   }, r);
 }
-function Ke(e, t, r) {
-  const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, s) => !t(a, s);
-  return fe(e, n, r);
+function ze(e, t, r) {
+  const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, f) => !t(a, f);
+  return ge(e, n, r);
 }
-const v = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  exclude: Ke,
-  extract: B,
-  parse: H,
-  parseUrl: ie,
-  pick: fe,
-  stringify: oe,
-  stringifyUrl: ce
+  exclude: ze,
+  extract: X,
+  parse: Y,
+  parseUrl: ye,
+  pick: ge,
+  stringify: me,
+  stringifyUrl: he
 }, Symbol.toStringTag, { value: "Module" }));
+function ie(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 ce(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) {
+      He(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : ie(Object(r)).forEach(function(n) {
+      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
+    });
+  }
+  return e;
+}
+function He(e, t, r) {
+  return (t = Ve(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
+}
+function Ve(e) {
+  var t = Ke(e, "string");
+  return typeof t == "symbol" ? t : t + "";
+}
+function Ke(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 Ge(e) {
   const {
     base: t = "/",
     routes: r
-  } = e, n = A(null, {
+  } = e, n = B({
+    skipUpdate: !1
+  }, {
+    name: "$meta",
+    sid: "ku65ys"
+  }), a = B(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "31majq"
-  }), a = A([], {
-    and: {
-      serialize: "ignore"
-    },
-    name: "$activeRoutes",
-    sid: "mastmv"
-  }), s = A({}, {
+    sid: "23j1rc"
+  }), f = B({}, {
     name: "$query",
-    sid: "4sjpht"
-  }), o = A(null, {
+    sid: "3deub8"
+  }), c = B(null, {
     name: "$path",
-    sid: "wq6kyf"
-  }), i = x({
+    sid: "ld3nhr"
+  }), u = E({
     name: "setHistory",
-    sid: "tco5ea"
-  }), c = x({
+    sid: "hzl7xm"
+  }), F = E({
     name: "navigate",
-    sid: "-6nqgd3"
-  }), u = x({
+    sid: "-82vbjo"
+  }), D = E({
     name: "back",
-    sid: "-gxisi3"
-  }), m = x({
+    sid: "-icnnoo"
+  }), v = E({
     name: "forward",
-    sid: "-5nj6gd"
-  }), y = x({
+    sid: "-72o1my"
+  }), P = E({
     name: "locationUpdated",
-    sid: "enqpbn"
-  }), h = r.map((l) => {
-    let g = l;
-    const f = [];
-    for (f.unshift(g.internal.path); g.internal.parent; )
-      g = g.internal.parent, g.internal.path !== "/" && f.unshift(g.internal.path);
-    const b = t === "/" ? f.join("") : [t, ...f].join("");
+    sid: "d8lu52"
+  }), A = r.map((g) => {
+    let b = g;
+    const m = [];
+    for (m.unshift(b.internal.path); b.internal.parent; )
+      b = b.internal.parent, b.internal.path !== "/" && m.unshift(b.internal.path);
+    const x = t === "/" ? m.join("") : [t, ...m].join("");
     return {
-      route: l,
-      path: b,
-      toPath: he(b),
-      fromPath: be(b)
+      route: g,
+      path: x,
+      toPath: re.compile(x),
+      fromPath: re.match(x)
     };
-  }), F = z({
+  }), $ = c.map((g) => {
+    const b = [];
+    for (const {
+      route: m,
+      fromPath: x
+    } of A)
+      x(g) && b.push(m);
+    return b;
+  }), j = J({
     and: {
       source: {
-        history: n
+        history: a,
+        meta: n
       },
-      effect: async (l, g) => {
+      effect: async (g, b) => {
         let {
-          history: f
-        } = l, {
-          path: b,
-          query: C,
-          replace: N
-        } = g;
-        if (!f)
+          history: m,
+          meta: x
+        } = g, {
+          path: _,
+          query: I,
+          replace: i
+        } = b;
+        if (!m)
           throw new Error("history not found");
-        const V = {
-          pathname: b,
-          search: "?".concat(v.stringify(C))
+        if (x.skipUpdate) {
+          x.skipUpdate = !1;
+          return;
+        }
+        const o = {
+          pathname: _,
+          search: "?".concat(Q.stringify(I))
         };
-        N ? f.replace(V) : f.push(V);
+        i ? m.replace(o) : m.push(o, {
+          skipUpdate: !0
+        });
       }
     },
     or: {
       name: "navigateFx",
-      sid: "e3jr9b"
+      sid: "sry1hc"
     }
-  }), d = R((l) => {
-    const g = le(y);
-    if (g({
-      pathname: l.location.pathname,
-      query: v.parse(l.location.search)
-    }), !l)
-      throw new Error();
-    l.listen((f) => {
-      let {
-        location: b
-      } = f;
-      g({
-        pathname: b.pathname,
-        query: v.parse(b.search)
-      });
-    });
-  }, {
-    name: "subscribeHistoryFx",
-    sid: "2h2oyo"
-  }), O = z({
+  }), y = J({
+    and: {
+      source: n,
+      effect: (g, b) => {
+        var m;
+        const x = xe(P);
+        if (x({
+          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((_) => {
+          var I;
+          let {
+            location: i
+          } = _;
+          const o = (I = i.state) !== null && I !== void 0 ? I : {};
+          o.skipUpdate && (g.skipUpdate = !0), x({
+            pathname: i.pathname,
+            query: ce({}, Q.parse(i.search)),
+            state: o
+          });
+        });
+      }
+    },
+    or: {
+      name: "subscribeHistoryFx",
+      sid: "-9srjw2"
+    }
+  }), k = J({
     and: {
       source: {
-        query: s,
-        path: o
+        query: f,
+        path: c
       },
-      effect: async (l) => {
+      effect: async (g) => {
         let {
-          query: g,
-          path: f
-        } = l;
+          query: b,
+          path: m
+        } = g;
         for (const {
-          route: b,
-          fromPath: C
-        } of h) {
-          const N = C(f);
-          if (N)
-            await b.internal.openFx({
-              query: g,
-              params: N.params,
+          route: x,
+          fromPath: _
+        } of A) {
+          const I = _(m);
+          if (I)
+            await x.internal.openFx({
+              query: b,
+              params: I.params,
               historyIgnore: !0
             });
           else {
-            b.internal.close();
+            x.internal.close();
             continue;
           }
         }
@@ -1096,138 +1232,131 @@ function Ge(e) {
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "-o9v4d"
+      sid: "-ro72fe"
     }
   });
   for (const {
-    route: l,
-    toPath: g
-  } of h)
-    w({
+    route: g,
+    toPath: b
+  } of A)
+    S({
       and: [{
-        clock: l.opened,
-        source: a,
-        filter: (f) => !f.includes(l),
-        fn: (f) => [...f, l],
-        target: a
-      }],
-      or: {
-        sid: "f0qyp9"
-      }
-    }), w({
-      and: [{
-        clock: l.opened,
-        filter: (f) => !(f != null && f.historyIgnore),
-        fn: (f) => {
-          var b;
+        clock: g.opened,
+        filter: (m) => !(m != null && m.historyIgnore),
+        fn: (m) => {
+          var x;
           return {
-            path: g(f && "params" in f ? f.params : void 0),
-            query: (b = f == null ? void 0 : f.query) !== null && b !== void 0 ? b : {},
-            replace: f == null ? void 0 : f.replace
+            path: b(m && "params" in m ? m.params : void 0),
+            query: (x = m == null ? void 0 : m.query) !== null && x !== void 0 ? x : {},
+            replace: m == null ? void 0 : m.replace
           };
         },
-        target: c
-      }],
-      or: {
-        sid: "fgozwq"
-      }
-    }), w({
-      and: [{
-        clock: l.closed,
-        source: a,
-        fn: (f) => f.filter((b) => b !== l),
-        target: a
+        target: F
       }],
       or: {
-        sid: "gc19qb"
+        sid: "gfvtvu"
       }
     });
-  return w({
+  return S({
     and: [{
-      clock: i,
-      target: n
+      clock: u,
+      target: a
     }],
     or: {
-      sid: "ggfmfh"
+      sid: "hbrw92"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: n,
+      clock: a,
       filter: Boolean,
-      target: d
+      target: y
     }],
     or: {
-      sid: "guq9uv"
+      sid: "heiv7v"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: y,
-      fn: (l) => {
-        var g;
-        return {
-          path: l.pathname,
-          query: (g = l.query) !== null && g !== void 0 ? g : {}
-        };
-      },
-      target: [de({
-        sid: "-3mx9rg",
-        fn: () => pe({
+      clock: P,
+      fn: (g) => ({
+        path: g.pathname,
+        query: g.query
+      }),
+      target: Oe({
+        sid: "-f70n8p",
+        fn: () => Fe({
           targets: {
-            path: o,
-            query: s
+            path: c,
+            query: f
           }
         }),
         name: "target",
         method: "spread"
-      }), O]
+      })
     }],
     or: {
-      sid: "h9kpvm"
+      sid: "htdb8m"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: c,
-      target: F
+      clock: P,
+      fn: (g) => ({
+        path: g.pathname,
+        query: g.query
+      }),
+      target: k
     }],
     or: {
-      sid: "hugwfc"
+      sid: "icm409"
     }
-  }), w({
+  }), S({
     and: [{
-      clock: [s, o],
+      clock: F,
+      target: j
+    }],
+    or: {
+      sid: "sr2036"
+    }
+  }), S({
+    and: [{
+      clock: [f, c],
       source: {
-        query: s,
-        path: o
+        query: f,
+        path: c
       },
-      fn: (l) => l,
-      target: c
+      fn: (g) => g,
+      target: F
     }],
     or: {
-      sid: "i8rjuq"
+      sid: "t5cnik"
     }
   }), {
-    $query: s,
-    $path: o,
-    $activeRoutes: a,
-    back: u,
-    forward: m,
-    navigate: c,
+    $query: f,
+    $path: c,
+    $activeRoutes: $,
+    back: D,
+    forward: v,
+    navigate: F,
     routes: r,
-    setHistory: i,
-    mappedRoutes: h,
-    trackQuery: De(a, s),
+    setHistory: u,
+    mappedRoutes: A,
+    trackQuery: De({
+      $activeRoutes: $,
+      $path: c,
+      $query: f,
+      navigateFx: j
+    }),
     "@@unitShape": () => ({
-      query: s,
-      path: o,
-      activeRoutes: a,
-      onBack: u,
-      onForward: m,
-      onNavigate: c
+      query: f,
+      path: c,
+      activeRoutes: $,
+      onBack: D,
+      onForward: v,
+      onNavigate: F
     })
   };
 }
 export {
   We as createRoute,
   Ge as createRouter,
-  j as parameters
+  T as parameters
 };