@argon-router/core 0.2.3 → 0.3.0

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 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) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -10,25 +10,25 @@ function V(e, t) {
   }
   return r;
 }
-function C(e) {
+function T(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 ? 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) {
       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 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 me(e) {
-  var t = ye(e, "string");
+function ye(e) {
+  var t = ge(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function ye(e, t) {
+function ge(e, t) {
   if (typeof e != "object" || !e) return e;
   var r = e[Symbol.toPrimitive];
   if (r !== void 0) {
@@ -38,128 +38,131 @@ function ye(e, t) {
   }
   return (t === "string" ? String : Number)(e);
 }
-function Qe(e) {
+function We(e) {
   let t;
-  const r = N(() => {
-    var p;
-    return (p = t) === null || p === void 0 ? void 0 : p();
+  const r = R(() => {
+    var d;
+    return (d = t) === null || d === void 0 ? void 0 : d();
   }, {
     name: "waitForAsyncBundleFx",
     sid: "tw7mq7"
-  }), n = N(async () => {
-    for (const l of (p = e.beforeOpen) !== null && p !== void 0 ? p : []) {
-      var p;
-      await l();
+  }), n = R(async () => {
+    for (const O of (d = e.beforeOpen) !== null && d !== void 0 ? d : []) {
+      var d;
+      await O();
     }
   }, {
     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 = R(async (d) => {
+    await r(), await n();
+    const O = e.parent;
+    return O && await O.internal.openFx(T(T({}, d ?? {
+      params: {}
+    }), {}, {
+      historyIgnore: !0
+    })), d;
+  }, {
     name: "openFx",
     sid: "-hz9h5i"
-  }), s = j({}, {
+  }), s = A({}, {
     name: "$params",
-    sid: "fyp6wk"
-  }), i = j(!1, {
+    sid: "gwsfoy"
+  }), o = A(!1, {
     name: "$isOpened",
-    sid: "nq2be0"
-  }), o = a.pending, f = x({
+    sid: "ym3mgh"
+  }), i = a.pending, c = x({
     name: "open",
-    sid: "-e84o6b"
+    sid: "-da1fdx"
   }), u = x({
     name: "close",
-    sid: "5yq009"
-  }), y = x({
+    sid: "6wt8sn"
+  }), m = x({
     name: "opened",
-    sid: "28lguv"
-  }), d = x({
+    sid: "36opn9"
+  }), y = x({
     name: "openedOnServer",
-    sid: "-rnqoit"
-  }), b = x({
+    sid: "-qpnfqf"
+  }), h = x({
     name: "openedOnClient",
-    sid: "-rq76gu"
-  }), w = x({
+    sid: "-qs3xog"
+  }), F = x({
     name: "closed",
-    sid: "-atkmcq"
+    sid: "2gopr"
   });
-  return F({
+  return w({
     and: [{
-      clock: f,
+      clock: c,
       target: a
     }],
     or: {
-      sid: "t5oqwf"
+      sid: "t6sc35"
     }
-  }), fe({
+  }), ue({
     and: [{
       source: a.doneData,
       match: () => typeof window > "u" ? "server" : "client",
       cases: {
-        server: d,
-        client: b
+        server: y,
+        client: h
       }
     }],
     or: {
-      sid: "t8fpv8"
+      sid: "t9jb1y"
     }
-  }), F({
+  }), w({
     and: [{
-      clock: [b, d],
-      target: y
+      clock: [h, y],
+      target: m
     }],
     or: {
-      sid: "tphc9f"
+      sid: "tqkxg5"
     }
-  }), F({
+  }), w({
     and: [{
-      clock: y,
+      clock: m,
       fn: () => !0,
-      target: i
+      target: o
     }],
     or: {
-      sid: "u3rzot"
+      sid: "u4vkvj"
     }
-  }), F({
+  }), w({
     and: [{
       clock: u,
-      target: w
+      target: F
     }],
     or: {
-      sid: "u72r8z"
+      sid: "u86cfp"
     }
-  }), F({
+  }), w({
     and: [{
-      clock: w,
+      clock: F,
       fn: () => !1,
-      target: i
+      target: o
     }],
     or: {
-      sid: "ykn3cq"
+      sid: "ylqojg"
     }
   }), {
     $params: s,
-    $isOpened: i,
-    $isPending: o,
-    open: f,
-    closed: w,
-    opened: y,
-    openedOnClient: b,
-    openedOnServer: d,
-    internal: C({
-      index: !1,
+    $isOpened: o,
+    $isPending: i,
+    open: c,
+    closed: F,
+    opened: m,
+    openedOnClient: h,
+    openedOnServer: y,
+    internal: T({
       close: u,
       openFx: a,
-      setAsyncImport: (p) => t = p
+      setAsyncImport: (d) => t = d
     }, e),
     "@@unitShape": () => ({
       params: s,
-      isPending: o,
-      isOpened: i,
-      onOpen: f
+      isPending: i,
+      isOpened: o,
+      onOpen: c
     })
   };
 }
@@ -168,11 +171,11 @@ 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 = {
+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.
   "{": "{",
   "}": "}",
@@ -185,19 +188,19 @@ const U = "/", _ = (e) => e, X = /^[$_\p{ID_Start}]$/u, q = /^[$\u200c\u200d\p{I
   "?": "?",
   "!": "!"
 };
-function we(e) {
+function xe(e) {
   return e.replace(/[{}()\[\]+?!:*]/g, "\\$&");
 }
 function $(e) {
   return e.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
 }
-function* xe(e) {
+function* Fe(e) {
   const t = [...e];
   let r = 0;
   function n() {
     let a = "";
-    if (X.test(t[++r]))
-      for (a += t[r]; q.test(t[++r]); )
+    if (Y.test(t[++r]))
+      for (a += t[r]; L.test(t[++r]); )
         a += t[r];
     else if (t[r] === '"') {
       let s = r;
@@ -209,14 +212,14 @@ function* xe(e) {
         t[r] === "\\" ? a += t[++r] : a += t[r];
       }
       if (s)
-        throw new TypeError(`Unterminated quote at ${s}: ${I}`);
+        throw new TypeError(`Unterminated quote at ${s}: ${k}`);
     }
     if (!a)
-      throw new TypeError(`Missing parameter name at ${r}: ${I}`);
+      throw new TypeError(`Missing parameter name at ${r}: ${k}`);
     return a;
   }
   for (; r < t.length; ) {
-    const a = t[r], s = be[a];
+    const a = t[r], s = we[a];
     if (s)
       yield {
         type: s,
@@ -230,18 +233,18 @@ function* xe(e) {
         value: t[r++]
       };
     else if (a === ":") {
-      const i = n();
+      const o = n();
       yield {
         type: "PARAM",
         index: r,
-        value: i
+        value: o
       };
     } else if (a === "*") {
-      const i = n();
+      const o = n();
       yield {
         type: "WILDCARD",
         index: r,
-        value: i
+        value: o
       };
     } else
       yield {
@@ -256,7 +259,7 @@ function* xe(e) {
     value: ""
   };
 }
-class Fe {
+class $e {
   constructor(t) {
     this.tokens = t;
   }
@@ -279,7 +282,7 @@ class Fe {
       type: n,
       index: a
     } = this.peek();
-    throw new TypeError(`Unexpected ${n} at ${a}, expected ${t}: ${I}`);
+    throw new TypeError(`Unexpected ${n} at ${a}, expected ${t}: ${k}`);
   }
   text() {
     let t = "", r;
@@ -288,95 +291,95 @@ class Fe {
     return t;
   }
 }
-class k {
+class P {
   constructor(t) {
     this.tokens = t;
   }
 }
-E.TokenData = k;
-function L(e, t = {}) {
+E.TokenData = P;
+function M(e, t = {}) {
   const {
-    encodePath: r = _
-  } = t, n = new Fe(xe(e));
-  function a(i) {
-    const o = [];
+    encodePath: r = q
+  } = t, n = new $e(Fe(e));
+  function a(o) {
+    const i = [];
     for (; ; ) {
-      const f = n.text();
-      f && o.push({
+      const c = n.text();
+      c && i.push({
         type: "text",
-        value: r(f)
+        value: r(c)
       });
       const u = n.tryConsume("PARAM");
       if (u) {
-        o.push({
+        i.push({
           type: "param",
           name: u
         });
         continue;
       }
-      const y = n.tryConsume("WILDCARD");
-      if (y) {
-        o.push({
+      const m = n.tryConsume("WILDCARD");
+      if (m) {
+        i.push({
           type: "wildcard",
-          name: y
+          name: m
         });
         continue;
       }
       if (n.tryConsume("{")) {
-        o.push({
+        i.push({
           type: "group",
           tokens: a("}")
         });
         continue;
       }
-      return n.consume(i), o;
+      return n.consume(o), i;
     }
   }
   const s = a("END");
-  return new k(s);
+  return new P(s);
 }
-function $e(e, t = {}) {
+function Se(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);
+    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 f;
+    return c;
   };
 }
-function Y(e, t, r) {
-  const n = e.map((a) => Se(a, t, r));
+function Z(e, t, r) {
+  const n = e.map((a) => Oe(a, t, r));
   return (a) => {
     const s = [""];
-    for (const i of n) {
-      const [o, ...f] = i(a);
-      s[0] += o, s.push(...f);
+    for (const o of n) {
+      const [i, ...c] = o(a);
+      s[0] += i, s.push(...c);
     }
     return s;
   };
 }
-function Se(e, t, r) {
+function Oe(e, t, r) {
   if (e.type === "text") return () => [e.value];
   if (e.type === "group") {
-    const a = Y(e.tokens, t, r);
+    const a = Z(e.tokens, t, r);
     return (s) => {
-      const [i, ...o] = a(s);
-      return o.length ? [""] : [i];
+      const [o, ...i] = a(s);
+      return i.length ? [""] : [o];
     };
   }
-  const n = r || _;
+  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((i, o) => {
-      if (typeof i != "string")
-        throw new TypeError(`Expected "${e.name}/${o}" to be a string`);
-      return n(i);
+    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];
@@ -386,112 +389,112 @@ function Se(e, t, r) {
     return [n(s)];
   };
 }
-function Oe(e, t = {}) {
+function je(e, t = {}) {
   const {
     decode: r = decodeURIComponent,
-    delimiter: n = U
+    delimiter: n = _
   } = 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);
+  } = 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 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]);
+    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: y,
-      params: d
+      path: m,
+      params: y
     };
   };
 }
-function Z(e, t = {}) {
+function ee(e, t = {}) {
   const {
-    delimiter: r = U,
+    delimiter: r = _,
     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));
+  } = t, o = [], i = [], c = a ? "" : "i", m = (Array.isArray(e) ? e : [e]).map((F) => F instanceof P ? F : M(F, t));
   for (const {
-    tokens: w
-  } of y)
-    for (const p of R(w, 0, [])) {
-      const l = Ee(p, r, i);
-      o.push(l);
+    tokens: F
+  } of m)
+    for (const d of I(F, 0, [])) {
+      const O = Ee(d, r, o);
+      i.push(O);
     }
-  let d = `^(?:${o.join("|")})`;
-  return s && (d += `(?:${$(r)}$)?`), d += n ? "$" : `(?=${$(r)}|$)`, {
-    regexp: new RegExp(d, f),
-    keys: i
+  let y = `^(?:${i.join("|")})`;
+  return s && (y += `(?:${$(r)}$)?`), y += n ? "$" : `(?=${$(r)}|$)`, {
+    regexp: new RegExp(y, c),
+    keys: o
   };
 }
-function* R(e, t, r) {
+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 R(n.tokens, 0, a))
-      yield* R(e, t + 1, s);
+    for (const s of I(n.tokens, 0, a))
+      yield* I(e, t + 1, s);
   } else
     r.push(n);
-  yield* R(e, t + 1, r);
+  yield* I(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));
+  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 (o.type === "param" || o.type === "wildcard") {
+    if (i.type === "param" || i.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;
+        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;
     }
   }
   return n;
 }
-function je(e, t) {
+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 Ae(e) {
+function Ne(e) {
   return e.tokens.map(function t(r, n, a) {
-    if (r.type === "text") return we(r.value);
+    if (r.type === "text") return xe(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}`;
+    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 Ne(e) {
+function Re(e) {
   const [t, ...r] = e;
-  return X.test(t) ? r.every((n) => q.test(n)) : !1;
+  return Y.test(t) ? r.every((n) => L.test(n)) : !1;
 }
-function Re(e) {
-  return (e == null ? void 0 : e.type) !== "text" ? !0 : !q.test(e.value[0]);
+function Ie(e) {
+  return (e == null ? void 0 : e.type) !== "text" ? !0 : !L.test(e.value[0]);
 }
-const Ie = Symbol("any"), ke = Symbol("number"), Pe = Symbol("string"), Ce = Symbol("array"), O = {
-  any: Ie,
-  number: ke,
-  string: Pe,
-  array: Ce
+const ke = Symbol("any"), Pe = Symbol("number"), Ce = Symbol("string"), Te = Symbol("array"), j = {
+  any: ke,
+  number: Pe,
+  string: Ce,
+  array: Te
 };
-function K(e, t) {
+function J(e, t) {
   for (const r of e)
     if (!t.includes(r))
       return !1;
   return !0;
 }
-function J(e, t) {
+function Q(e, t) {
   for (const r in t) {
     const n = t[r];
     if (Array.isArray(n) && (!e[r] || JSON.stringify(n) !== e[r]))
@@ -519,22 +522,22 @@ function J(e, t) {
       }
     }
     switch (n) {
-      case O.any: {
+      case j.any: {
         if (!e[r])
           return !1;
         break;
       }
-      case O.string: {
+      case j.string: {
         if (!e[r] || Array.isArray(e[r]))
           return !1;
         break;
       }
-      case O.array: {
+      case j.array: {
         if (!e[r] || !Array.isArray(e[r]))
           return !1;
         break;
       }
-      case O.number: {
+      case j.number: {
         if (!e[r] || Array.isArray(e[r]) || isNaN(parseInt(e[r])) && isNaN(parseFloat(e[r])))
           return !1;
         break;
@@ -543,7 +546,7 @@ function J(e, t) {
   }
   return !0;
 }
-function Te(e, t) {
+function ve(e, t) {
   const r = {};
   for (const n in t) {
     const a = t[n], s = e[n];
@@ -553,8 +556,8 @@ function Te(e, t) {
     }
     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": {
@@ -564,21 +567,21 @@ function Te(e, t) {
       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 j.any:
+      case j.string:
+      case j.array: {
         r[n] = e[n];
         break;
       }
-      case O.number: {
-        const i = e[n];
-        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
+      case j.number: {
+        const o = e[n];
+        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
         break;
       }
     }
@@ -593,66 +596,66 @@ function De(e, t) {
     } = r, s = x({
       name: "entered",
       sid: "-d3obu6"
-    }), i = x({
+    }), o = x({
       name: "exited",
       sid: "-xofyk3"
-    }), o = x({
+    }), i = x({
       name: "exit",
       sid: "-673d76"
     });
-    return F({
+    return w({
       and: [{
         source: {
           activeRoutes: e,
           query: t
         },
-        filter: (f) => {
+        filter: (c) => {
           let {
             activeRoutes: u,
-            query: y
-          } = f;
-          return (!a || K(a, u)) && J(y, n);
+            query: m
+          } = c;
+          return (!a || J(a, u)) && Q(m, n);
         },
-        fn: (f) => {
+        fn: (c) => {
           let {
             query: u
-          } = f;
-          return Te(u, n);
+          } = c;
+          return ve(u, n);
         }
       }],
       or: {
         sid: "-so0f9q"
       }
-    }), F({
+    }), w({
       and: [{
         source: {
           activeRoutes: e,
           query: t
         },
-        filter: (f) => {
+        filter: (c) => {
           let {
             activeRoutes: u,
-            query: y
-          } = f;
-          return !((!a || K(a, u)) && J(y, n));
+            query: m
+          } = c;
+          return !((!a || J(a, u)) && Q(m, 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;
+      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;
       }, {})
     };
   };
 }
-const ee = "%[a-f0-9]{2}", Q = new RegExp("(" + ee + ")|([^%]+?)", "gi"), W = new RegExp("(" + ee + ")+", "gi");
+const re = "%[a-f0-9]{2}", W = new RegExp("(" + re + ")|([^%]+?)", "gi"), G = new RegExp("(" + re + ")+", "gi");
 function D(e, t) {
   try {
     return [decodeURIComponent(e.join(""))];
@@ -664,30 +667,30 @@ function D(e, t) {
   const r = e.slice(0, t), n = e.slice(t);
   return Array.prototype.concat.call([], D(r), D(n));
 }
-function ve(e) {
+function Ue(e) {
   try {
     return decodeURIComponent(e);
   } catch {
-    let t = e.match(Q) || [];
+    let t = e.match(W) || [];
     for (let r = 1; r < t.length; r++)
-      e = D(t, r).join(""), t = e.match(Q) || [];
+      e = D(t, r).join(""), t = e.match(W) || [];
     return e;
   }
 }
-function Ue(e) {
+function _e(e) {
   const t = {
     "%FE%FF": "��",
     "%FF%FE": "��"
   };
-  let r = W.exec(e);
+  let r = G.exec(e);
   for (; r; ) {
     try {
       t[r[0]] = decodeURIComponent(r[0]);
     } catch {
-      const a = ve(r[0]);
+      const a = Ue(r[0]);
       a !== r[0] && (t[r[0]] = a);
     }
-    r = W.exec(e);
+    r = G.exec(e);
   }
   t["%C2"] = "�";
   const n = Object.keys(t);
@@ -695,16 +698,16 @@ function Ue(e) {
     e = e.replace(new RegExp(a, "g"), t[a]);
   return e;
 }
-function _e(e) {
+function qe(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 _e(e);
   }
 }
-function qe(e, t) {
+function Le(e, t) {
   const r = {};
   if (Array.isArray(t))
     for (const n of t) {
@@ -721,7 +724,7 @@ function qe(e, t) {
     }
   return r;
 }
-function re(e, t) {
+function te(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 +732,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 Me = (e) => e == null, Be = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), U = Symbol("encodeFragmentIdentifier");
+function He(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, [p(t, e), "[", a, "]"].join("")] : [...r, [p(t, e), "[", p(a, e), "]=", p(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, [p(t, e), "[]"].join("")] : [...r, [p(t, e), "[]=", p(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, [p(t, e), ":list="].join("")] : [...r, [p(t, e), ":list=", p(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 ? [[p(r, e), t, p(a, e)].join("")] : [[n, p(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, p(t, e)] : [...r, [p(t, e), "=", p(n, e)].join("")];
   }
 }
-function Be(e) {
+function Ve(e) {
   let t;
   switch (e.arrayFormat) {
     case "index":
@@ -789,10 +792,10 @@ 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 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;
       };
     case "bracket-separator":
       return (r, n, a) => {
@@ -801,12 +804,12 @@ function Be(e) {
           a[r] = n && S(n, e);
           return;
         }
-        const i = n === null ? [] : S(n, e).split(e.arrayFormatSeparator);
+        const o = n === null ? [] : S(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 +821,37 @@ function Be(e) {
       };
   }
 }
-function te(e) {
+function ne(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 p(e, t) {
+  return t.encode ? t.strict ? Be(e) : encodeURIComponent(e) : e;
 }
 function S(e, t) {
-  return t.decode ? _e(e) : e;
-}
-function ne(e) {
-  return Array.isArray(e) ? e.sort() : typeof e == "object" ? ne(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
+  return t.decode ? qe(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 se(e) {
   const t = e.indexOf("#");
   return t !== -1 && (e = e.slice(0, t)), e;
 }
-function He(e) {
+function ze(e) {
   let t = "";
   const r = e.indexOf("#");
   return r !== -1 && (t = e.slice(r)), t;
 }
-function G(e, t, r) {
+function X(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 B(e) {
+  e = se(e);
   const t = e.indexOf("?");
   return t === -1 ? "" : e.slice(t + 1);
 }
-function z(e, t) {
+function H(e, t) {
   t = {
     decode: !0,
     sort: !0,
@@ -858,30 +861,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);
+  }, ne(t.arrayFormatSeparator);
+  const r = Ve(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);
+    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);
   }
   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 [o, i] of Object.entries(s)) {
+        const c = t.types[a] ? t.types[a].replace("[]", "") : void 0;
+        s[o] = X(i, t, c);
       }
-    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]);
+    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 i = n[s];
-    return a[s] = i && typeof i == "object" && !Array.isArray(i) ? ne(i) : i, a;
+    const o = n[s];
+    return a[s] = o && typeof o == "object" && !Array.isArray(o) ? ae(o) : o, a;
   }, /* @__PURE__ */ Object.create(null));
 }
-function se(e, t) {
+function oe(e, t) {
   if (!e)
     return "";
   t = {
@@ -890,15 +893,15 @@ 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);
+  }, 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((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("&");
+  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("&");
 }
 function ie(e, t) {
   var a;
@@ -906,41 +909,41 @@ function ie(e, t) {
     decode: !0,
     ...t
   };
-  let [r, n] = re(e, "#");
+  let [r, n] = te(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: H(B(e), t),
     ...t && t.parseFragmentIdentifier && n ? {
       fragmentIdentifier: S(n, t)
     } : {}
   };
 }
-function oe(e, t) {
+function ce(e, t) {
   t = {
     encode: !0,
     strict: !0,
-    [v]: !0,
+    [U]: !0,
     ...t
   };
-  const r = ae(e.url).split("?")[0] || "", n = M(e.url), a = {
-    ...z(n, {
+  const r = se(e.url).split("?")[0] || "", n = B(e.url), a = {
+    ...H(n, {
       sort: !1
     }),
     ...e.query
   };
-  let s = se(a, t);
+  let s = oe(a, t);
   s && (s = `?${s}`);
-  let i = He(e.url);
+  let o = ze(e.url);
   if (typeof e.fragmentIdentifier == "string") {
-    const o = new URL(r);
-    o.hash = e.fragmentIdentifier, i = t[v] ? o.hash : `#${e.fragmentIdentifier}`;
+    const i = new URL(r);
+    i.hash = e.fragmentIdentifier, o = t[U] ? i.hash : `#${e.fragmentIdentifier}`;
   }
-  return `${r}${s}${i}`;
+  return `${r}${s}${o}`;
 }
-function ce(e, t, r) {
+function fe(e, t, r) {
   r = {
     parseFragmentIdentifier: !0,
-    [v]: !1,
+    [U]: !1,
     ...r
   };
   const {
@@ -948,141 +951,144 @@ function ce(e, t, r) {
     query: a,
     fragmentIdentifier: s
   } = ie(e, r);
-  return oe({
+  return ce({
     url: n,
-    query: qe(a, t),
+    query: Le(a, t),
     fragmentIdentifier: s
   }, r);
 }
-function Ve(e, t, r) {
+function Ke(e, t, r) {
   const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, s) => !t(a, s);
-  return ce(e, n, r);
+  return fe(e, n, r);
 }
-const T = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const v = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  exclude: Ve,
-  extract: M,
-  parse: z,
+  exclude: Ke,
+  extract: B,
+  parse: H,
   parseUrl: ie,
-  pick: ce,
-  stringify: se,
-  stringifyUrl: oe
+  pick: fe,
+  stringify: oe,
+  stringifyUrl: ce
 }, Symbol.toStringTag, { value: "Module" }));
-function We(e) {
+function Ge(e) {
   const {
     base: t = "/",
     routes: r
-  } = e, n = j(null, {
+  } = e, n = A(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "ftu36z"
-  }), a = j([], {
+    sid: "31majq"
+  }), a = A([], {
     and: {
       serialize: "ignore"
     },
     name: "$activeRoutes",
-    sid: "z30ma4"
-  }), s = j({}, {
+    sid: "mastmv"
+  }), s = A({}, {
     name: "$query",
-    sid: "hkri52"
-  }), i = j(null, {
+    sid: "4sjpht"
+  }), o = A(null, {
     name: "$path",
-    sid: "-zgnqnj"
-  }), o = x({
+    sid: "wq6kyf"
+  }), i = x({
     name: "setHistory",
-    sid: "w6xvrg"
-  }), f = x({
-    name: "back",
-    sid: "-4mcm91"
+    sid: "tco5ea"
+  }), c = x({
+    name: "navigate",
+    sid: "-6nqgd3"
   }), u = x({
+    name: "back",
+    sid: "-gxisi3"
+  }), m = x({
     name: "forward",
-    sid: "6nmzsp"
+    sid: "-5nj6gd"
   }), y = x({
     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: "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("");
     return {
       route: l,
-      path: g,
-      toPath: he(g),
-      fromPath: ge(g)
+      path: b,
+      toPath: he(b),
+      fromPath: be(b)
     };
-  }), b = H({
+  }), F = z({
     and: {
       source: {
         history: n
       },
-      effect: async (l, h) => {
+      effect: async (l, g) => {
         let {
-          history: c
+          history: f
         } = l, {
-          path: g,
-          query: P,
-          replace: A
-        } = h;
-        if (!c)
+          path: b,
+          query: C,
+          replace: N
+        } = g;
+        if (!f)
           throw new Error("history not found");
-        const B = {
-          pathname: g,
-          search: "?".concat(T.stringify(P))
+        const V = {
+          pathname: b,
+          search: "?".concat(v.stringify(C))
         };
-        A ? c.replace(B) : c.push(B);
+        N ? f.replace(V) : f.push(V);
       }
     },
     or: {
       name: "navigateFx",
-      sid: "qepxid"
+      sid: "e3jr9b"
     }
-  }), w = N((l) => {
-    const h = ue(y);
-    if (h({
+  }), d = R((l) => {
+    const g = le(y);
+    if (g({
       pathname: l.location.pathname,
-      query: T.parse(l.location.search)
+      query: v.parse(l.location.search)
     }), !l)
       throw new Error();
-    l.listen((c) => {
+    l.listen((f) => {
       let {
-        location: g
-      } = c;
-      h({
-        pathname: g.pathname,
-        query: T.parse(g.search)
+        location: b
+      } = f;
+      g({
+        pathname: b.pathname,
+        query: v.parse(b.search)
       });
     });
   }, {
     name: "subscribeHistoryFx",
-    sid: "es8v7q"
-  }), p = H({
+    sid: "2h2oyo"
+  }), O = z({
     and: {
       source: {
         query: s,
-        path: i
+        path: o
       },
       effect: async (l) => {
         let {
-          query: h,
-          path: c
+          query: g,
+          path: f
         } = l;
         for (const {
-          route: g,
-          fromPath: P
-        } of d) {
-          const A = P(c);
-          if (A)
-            await g.internal.openFx({
-              query: h,
-              params: A.params,
+          route: b,
+          fromPath: C
+        } of h) {
+          const N = C(f);
+          if (N)
+            await b.internal.openFx({
+              query: g,
+              params: N.params,
               historyIgnore: !0
             });
           else {
-            g.internal.close();
+            b.internal.close();
             continue;
           }
         }
@@ -1090,115 +1096,138 @@ function We(e) {
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "bmwb4p"
+      sid: "-o9v4d"
     }
   });
   for (const {
     route: l,
-    toPath: h
-  } of d)
-    F({
+    toPath: g
+  } of h)
+    w({
       and: [{
         clock: l.opened,
         source: a,
-        filter: (c) => !c.includes(l),
-        fn: (c) => [...c, l],
+        filter: (f) => !f.includes(l),
+        fn: (f) => [...f, l],
         target: a
       }],
       or: {
-        sid: "ff1m4n"
+        sid: "f0qyp9"
       }
-    }), F({
+    }), w({
       and: [{
         clock: l.opened,
-        filter: (c) => !(c != null && c.historyIgnore),
-        fn: (c) => {
-          var g;
+        filter: (f) => !(f != null && f.historyIgnore),
+        fn: (f) => {
+          var b;
           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: 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
           };
         },
-        target: b
+        target: c
       }],
       or: {
-        sid: "fuznc4"
+        sid: "fgozwq"
       }
-    }), F({
+    }), w({
       and: [{
         clock: l.closed,
         source: a,
-        fn: (c) => c.filter((g) => g !== l),
+        fn: (f) => f.filter((b) => b !== l),
         target: a
       }],
       or: {
-        sid: "ges8p4"
+        sid: "gc19qb"
       }
     });
-  return F({
+  return w({
     and: [{
-      clock: o,
+      clock: i,
       target: n
     }],
     or: {
-      sid: "guq9uv"
+      sid: "ggfmfh"
     }
-  }), F({
+  }), w({
     and: [{
       clock: n,
       filter: Boolean,
-      target: w
+      target: d
     }],
     or: {
-      sid: "gxh8to"
+      sid: "guq9uv"
     }
-  }), F({
+  }), w({
     and: [{
       clock: y,
       fn: (l) => {
-        var h;
+        var g;
         return {
           path: l.pathname,
-          query: (h = l.query) !== null && h !== void 0 ? h : {}
+          query: (g = l.query) !== null && g !== void 0 ? g : {}
         };
       },
-      target: [le({
-        sid: "-38mmc2",
-        fn: () => de({
+      target: [de({
+        sid: "-3mx9rg",
+        fn: () => pe({
           targets: {
-            path: i,
+            path: o,
             query: s
           }
         }),
         name: "target",
         method: "spread"
-      }), p]
+      }), O]
+    }],
+    or: {
+      sid: "h9kpvm"
+    }
+  }), w({
+    and: [{
+      clock: c,
+      target: F
+    }],
+    or: {
+      sid: "hugwfc"
+    }
+  }), w({
+    and: [{
+      clock: [s, o],
+      source: {
+        query: s,
+        path: o
+      },
+      fn: (l) => l,
+      target: c
     }],
     or: {
-      sid: "hcbouf"
+      sid: "i8rjuq"
     }
   }), {
     $query: s,
-    $path: i,
+    $path: o,
     $activeRoutes: a,
-    back: f,
-    forward: u,
+    back: u,
+    forward: m,
+    navigate: c,
     routes: r,
-    setHistory: o,
-    mappedRoutes: d,
+    setHistory: i,
+    mappedRoutes: h,
     trackQuery: De(a, s),
     "@@unitShape": () => ({
       query: s,
-      path: i,
+      path: o,
       activeRoutes: a,
-      onBack: f,
-      onForward: u
+      onBack: u,
+      onForward: m,
+      onNavigate: c
     })
   };
 }
 export {
-  Qe as createRoute,
-  We as createRouter,
-  O as parameters
+  We as createRoute,
+  Ge as createRouter,
+  j as parameters
 };