@kitbag/router 0.0.2 → 0.0.3

package/dist/kitbag-router.js

@@ -1,8 +1,8 @@
 var ft = Object.defineProperty;
 var lt = (e, t, n) => t in e ? ft(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var H = (e, t, n) => (lt(e, typeof t != "symbol" ? t + "" : t, n), n);
-import { inject as te, watch as ht, onUnmounted as $e, defineComponent as fe, computed as C, readonly as ne, openBlock as se, createElementBlock as pt, normalizeClass as dt, renderSlot as je, normalizeProps as mt, guardReactiveProps as yt, provide as Rt, defineAsyncComponent as gt, unref as oe, createBlock as we, resolveDynamicComponent as Ee, reactive as vt, h as wt, ref as Et, markRaw as ce } from "vue";
-class re extends Error {
+import { inject as re, watch as ht, onUnmounted as Ne, defineComponent as le, computed as C, readonly as oe, openBlock as ie, createElementBlock as pt, normalizeClass as dt, renderSlot as _e, normalizeProps as mt, guardReactiveProps as yt, provide as gt, defineAsyncComponent as Rt, unref as ce, createBlock as ke, resolveDynamicComponent as Se, reactive as vt, h as wt, ref as Et, markRaw as ue } from "vue";
+class ae extends Error {
   /**
    * Constructs a new DuplicateParamsError instance with a message indicating the problematic parameter.
    * @param paramName - The name of the parameter that was duplicated.
@@ -11,7 +11,7 @@ class re extends Error {
     super(`Invalid Param "${t}": Router does not support multiple params by the same name. All param names must be unique.`);
   }
 }
-class le extends Error {
+class he extends Error {
   constructor() {
     super("Router not installed");
   }
@@ -27,29 +27,29 @@ class bt extends Error {
     super(`useRoute called with incorrect route. Given ${t}, expected ${n}`);
   }
 }
-const Ne = Symbol();
+const Ve = Symbol();
 function Pt() {
-  const e = te(Ne);
+  const e = re(Ve);
   if (!e)
-    throw new le();
+    throw new he();
   return e;
 }
-const _e = Symbol();
-function he() {
-  const e = te(_e);
+const Ce = Symbol();
+function pe() {
+  const e = re(Ce);
   if (!e)
-    throw new le();
+    throw new he();
   return e;
 }
 function qe(e, t) {
   return [e, t].filter((n) => !!n).join(".");
 }
-function bn(e) {
-  const t = he();
+function Sn(e) {
+  const t = pe();
   function n() {
     if (!e)
       return;
-    const r = t.route.matches.map((s) => s.name);
+    const r = t.route.matches.map((c) => c.name);
     if (!kt(r).includes(e))
       throw new bt(e, t.route.key);
   }
@@ -65,9 +65,9 @@ function kt(e) {
     ] : o;
   }, []);
 }
-const Ce = Symbol();
-function pe() {
-  return te(Ce, 0);
+const Oe = Symbol();
+function de() {
+  return re(Oe, 0);
 }
 class z {
   constructor() {
@@ -79,7 +79,7 @@ class z {
     H(this, "onAfterRouteLeave", /* @__PURE__ */ new Set());
   }
 }
-class be extends Error {
+class xe extends Error {
 }
 class F extends Error {
   constructor(n) {
@@ -88,7 +88,7 @@ class F extends Error {
     this.to = n;
   }
 }
-class ae extends Error {
+class se extends Error {
   constructor(n) {
     super(`Routing action rejected: ${n}`);
     H(this, "type");
@@ -101,51 +101,51 @@ function M(e) {
 function St(e, t) {
   const n = new z();
   return e.matches.forEach((r, o) => {
-    r.onBeforeRouteEnter && de(e, t, o) && M(r.onBeforeRouteEnter).forEach((a) => n.onBeforeRouteEnter.add(a)), r.onBeforeRouteUpdate && ye(e, t, o) && M(r.onBeforeRouteUpdate).forEach((a) => n.onBeforeRouteUpdate.add(a));
+    r.onBeforeRouteEnter && me(e, t, o) && M(r.onBeforeRouteEnter).forEach((a) => n.onBeforeRouteEnter.add(a)), r.onBeforeRouteUpdate && ge(e, t, o) && M(r.onBeforeRouteUpdate).forEach((a) => n.onBeforeRouteUpdate.add(a));
   }), t.matches.forEach((r, o) => {
-    r.onBeforeRouteLeave && me(e, t, o) && M(r.onBeforeRouteLeave).forEach((a) => n.onBeforeRouteLeave.add(a));
+    r.onBeforeRouteLeave && ye(e, t, o) && M(r.onBeforeRouteLeave).forEach((a) => n.onBeforeRouteLeave.add(a));
   }), n;
 }
-function At(e, t) {
+function xt(e, t) {
   const n = new z();
   return e.matches.forEach((r, o) => {
-    r.onAfterRouteEnter && de(e, t, o) && M(r.onAfterRouteEnter).forEach((a) => n.onAfterRouteEnter.add(a)), r.onAfterRouteUpdate && ye(e, t, o) && M(r.onAfterRouteUpdate).forEach((a) => n.onAfterRouteUpdate.add(a));
+    r.onAfterRouteEnter && me(e, t, o) && M(r.onAfterRouteEnter).forEach((a) => n.onAfterRouteEnter.add(a)), r.onAfterRouteUpdate && ge(e, t, o) && M(r.onAfterRouteUpdate).forEach((a) => n.onAfterRouteUpdate.add(a));
   }), t.matches.forEach((r, o) => {
-    r.onAfterRouteLeave && me(e, t, o) && M(r.onAfterRouteLeave).forEach((a) => n.onAfterRouteLeave.add(a));
+    r.onAfterRouteLeave && ye(e, t, o) && M(r.onAfterRouteLeave).forEach((a) => n.onAfterRouteLeave.add(a));
   }), n;
 }
 function I(e) {
   return typeof e != "string" ? !1 : /^(https?:\/\/|\/).*/g.test(e);
 }
-function xt() {
-  const e = (s) => {
-    throw new ae(s);
-  }, t = (...s) => {
-    throw new F(s);
-  }, n = (s, i, u) => {
-    if (I(s)) {
-      const R = i ?? {};
-      throw new F([s, { ...R, replace: !0 }]);
+function At() {
+  const e = (c) => {
+    throw new se(c);
+  }, t = (...c) => {
+    throw new F(c);
+  }, n = (c, s, u) => {
+    if (I(c)) {
+      const g = s ?? {};
+      throw new F([c, { ...g, replace: !0 }]);
     }
-    const d = i, m = u ?? {};
-    throw new F([s, d, { ...m, replace: !0 }]);
+    const d = s, m = u ?? {};
+    throw new F([c, d, { ...m, replace: !0 }]);
   }, r = () => {
-    throw new be();
+    throw new xe();
   };
-  async function o({ to: s, from: i, hooks: u }) {
-    const { global: d, component: m } = u, R = St(s, i), x = [
+  async function o({ to: c, from: s, hooks: u }) {
+    const { global: d, component: m } = u, g = St(c, s), A = [
       ...d.onBeforeRouteEnter,
-      ...R.onBeforeRouteEnter,
+      ...g.onBeforeRouteEnter,
       ...d.onBeforeRouteUpdate,
-      ...R.onBeforeRouteUpdate,
+      ...g.onBeforeRouteUpdate,
       ...m.onBeforeRouteUpdate,
       ...d.onBeforeRouteLeave,
-      ...R.onBeforeRouteLeave,
+      ...g.onBeforeRouteLeave,
       ...m.onBeforeRouteLeave
     ];
     try {
-      const h = x.map((k) => k(s, {
-        from: i,
+      const h = A.map((k) => k(c, {
+        from: s,
         reject: e,
         push: t,
         replace: n,
@@ -158,12 +158,12 @@ function xt() {
           status: "PUSH",
           to: h.to
         };
-      if (h instanceof ae)
+      if (h instanceof se)
         return {
           status: "REJECT",
           type: h.type
         };
-      if (h instanceof be)
+      if (h instanceof xe)
         return {
           status: "ABORT"
         };
@@ -173,21 +173,21 @@ function xt() {
       status: "SUCCESS"
     };
   }
-  async function a({ to: s, from: i, hooks: u }) {
-    const { global: d, component: m } = u, R = At(s, i), x = [
+  async function a({ to: c, from: s, hooks: u }) {
+    const { global: d, component: m } = u, g = xt(c, s), A = [
       ...m.onAfterRouteLeave,
-      ...R.onAfterRouteLeave,
+      ...g.onAfterRouteLeave,
       ...d.onAfterRouteLeave,
       ...m.onAfterRouteUpdate,
-      ...R.onAfterRouteUpdate,
+      ...g.onAfterRouteUpdate,
       ...d.onAfterRouteUpdate,
       ...m.onAfterRouteEnter,
-      ...R.onAfterRouteEnter,
+      ...g.onAfterRouteEnter,
       ...d.onAfterRouteEnter
     ];
     try {
-      const h = x.map((k) => k(s, {
-        from: i,
+      const h = A.map((k) => k(c, {
+        from: s,
         reject: e,
         push: t,
         replace: n
@@ -199,7 +199,7 @@ function xt() {
           status: "PUSH",
           to: h.to
         };
-      if (h instanceof ae)
+      if (h instanceof se)
         return {
           status: "REJECT",
           type: h.type
@@ -215,80 +215,80 @@ function xt() {
     runAfterRouteHooks: a
   };
 }
-const de = (e, t, n) => {
+const me = (e, t, n) => {
   const r = e.matches, o = (t == null ? void 0 : t.matches) ?? [];
   return r.length < n || r[n] !== o[n];
-}, me = (e, t, n) => {
+}, ye = (e, t, n) => {
   const r = e.matches, o = (t == null ? void 0 : t.matches) ?? [];
   return r.length < n || r[n] !== o[n];
-}, ye = (e, t, n) => e.matches[n] === (t == null ? void 0 : t.matches[n]);
-function Pe(e) {
+}, ge = (e, t, n) => e.matches[n] === (t == null ? void 0 : t.matches[n]);
+function Ae(e) {
   switch (e) {
     case "onBeforeRouteEnter":
     case "onAfterRouteEnter":
-      return de;
+      return me;
     case "onBeforeRouteUpdate":
     case "onAfterRouteUpdate":
-      return ye;
+      return ge;
     case "onBeforeRouteLeave":
     case "onAfterRouteLeave":
-      return me;
+      return ye;
     default:
       throw new Error(`Switch is not exhaustive for lifecycle: ${e}`);
   }
 }
-class Bt {
+class Lt {
   constructor() {
     H(this, "global", new z());
     H(this, "component", new z());
   }
   addBeforeRouteHook({ lifecycle: t, timing: n, depth: r, hook: o }) {
-    const a = Pe(t), s = this[n][t], i = (u, d) => {
+    const a = Ae(t), c = this[n][t], s = (u, d) => {
       if (a(u, d.from, r))
         return o(u, d);
     };
-    return s.add(i), () => s.delete(i);
+    return c.add(s), () => c.delete(s);
   }
   addAfterRouteHook({ lifecycle: t, timing: n, depth: r, hook: o }) {
-    const a = Pe(t), s = this[n][t], i = (u, d) => {
+    const a = Ae(t), c = this[n][t], s = (u, d) => {
       if (a(u, d.from, r))
         return o(u, d);
     };
-    return s.add(i), () => s.delete(i);
+    return c.add(s), () => c.delete(s);
   }
 }
-const Ve = Symbol();
-function Lt() {
-  const e = new Bt();
+const De = Symbol();
+function Bt() {
+  const e = new Lt();
   return {
-    onBeforeRouteEnter: (i) => e.addBeforeRouteHook({ lifecycle: "onBeforeRouteEnter", hook: i, timing: "global", depth: 0 }),
-    onBeforeRouteUpdate: (i) => e.addBeforeRouteHook({ lifecycle: "onBeforeRouteUpdate", hook: i, timing: "global", depth: 0 }),
-    onBeforeRouteLeave: (i) => e.addBeforeRouteHook({ lifecycle: "onBeforeRouteLeave", hook: i, timing: "global", depth: 0 }),
-    onAfterRouteEnter: (i) => e.addAfterRouteHook({ lifecycle: "onAfterRouteEnter", hook: i, timing: "global", depth: 0 }),
-    onAfterRouteUpdate: (i) => e.addAfterRouteHook({ lifecycle: "onAfterRouteUpdate", hook: i, timing: "global", depth: 0 }),
-    onAfterRouteLeave: (i) => e.addAfterRouteHook({ lifecycle: "onAfterRouteLeave", hook: i, timing: "global", depth: 0 }),
+    onBeforeRouteEnter: (s) => e.addBeforeRouteHook({ lifecycle: "onBeforeRouteEnter", hook: s, timing: "global", depth: 0 }),
+    onBeforeRouteUpdate: (s) => e.addBeforeRouteHook({ lifecycle: "onBeforeRouteUpdate", hook: s, timing: "global", depth: 0 }),
+    onBeforeRouteLeave: (s) => e.addBeforeRouteHook({ lifecycle: "onBeforeRouteLeave", hook: s, timing: "global", depth: 0 }),
+    onAfterRouteEnter: (s) => e.addAfterRouteHook({ lifecycle: "onAfterRouteEnter", hook: s, timing: "global", depth: 0 }),
+    onAfterRouteUpdate: (s) => e.addAfterRouteHook({ lifecycle: "onAfterRouteUpdate", hook: s, timing: "global", depth: 0 }),
+    onAfterRouteLeave: (s) => e.addAfterRouteHook({ lifecycle: "onAfterRouteLeave", hook: s, timing: "global", depth: 0 }),
     hooks: e
   };
 }
-function Oe() {
-  const e = te(Ve);
+function Te() {
+  const e = re(De);
   if (!e)
-    throw new le();
+    throw new he();
   return e;
 }
-function De(e) {
+function Me(e) {
   return (t) => {
-    const n = pe(), o = Oe().addBeforeRouteHook({ lifecycle: e, hook: t, depth: n, timing: "component" });
-    return $e(o), o;
+    const n = de(), o = Te().addBeforeRouteHook({ lifecycle: e, hook: t, depth: n, timing: "component" });
+    return Ne(o), o;
   };
 }
 function Re(e) {
   return (t) => {
-    const n = pe(), o = Oe().addAfterRouteHook({ lifecycle: e, hook: t, depth: n, timing: "component" });
-    return $e(o), o;
+    const n = de(), o = Te().addAfterRouteHook({ lifecycle: e, hook: t, depth: n, timing: "component" });
+    return Ne(o), o;
   };
 }
-const Pn = De("onBeforeRouteUpdate"), kn = De("onBeforeRouteLeave"), Sn = Re("onAfterRouteEnter"), An = Re("onAfterRouteUpdate"), xn = Re("onAfterRouteLeave"), Ut = ["href"], Ht = /* @__PURE__ */ fe({
+const xn = Me("onBeforeRouteUpdate"), An = Me("onBeforeRouteLeave"), Ln = Re("onAfterRouteEnter"), Bn = Re("onAfterRouteUpdate"), Un = Re("onAfterRouteLeave"), Ut = ["href"], Ht = /* @__PURE__ */ le({
   __name: "routerLink",
   props: {
     to: { type: [String, Function] },
@@ -296,63 +296,63 @@ const Pn = De("onBeforeRouteUpdate"), kn = De("onBeforeRouteLeave"), Sn = Re("on
     replace: { type: Boolean }
   },
   setup(e) {
-    const t = e, n = he(), r = C(() => I(t.to) ? t.to : t.to(n.resolve)), o = C(() => {
-      const { to: R, ...x } = t;
-      return x;
+    const t = e, n = pe(), r = C(() => I(t.to) ? t.to : t.to(n.resolve)), o = C(() => {
+      const { to: g, ...A } = t;
+      return A;
     }), a = C(() => {
-      var R;
-      return (R = n.find(r.value, o.value)) == null ? void 0 : R.matched;
-    }), s = C(() => !!a.value && n.route.matches.includes(ne(a.value))), i = C(() => !!a.value && n.route.matched === a.value), u = C(() => ({
-      "router-link--match": s.value,
-      "router-link--exact-match": i.value
+      var g;
+      return (g = n.find(r.value, o.value)) == null ? void 0 : g.matched;
+    }), c = C(() => !!a.value && n.route.matches.includes(oe(a.value))), s = C(() => !!a.value && n.route.matched === a.value), u = C(() => ({
+      "router-link--match": c.value,
+      "router-link--exact-match": s.value
     })), d = C(() => {
-      const { host: R } = new URL(r.value, window.location.origin);
-      return R !== window.location.host;
+      const { host: g } = new URL(r.value, window.location.origin);
+      return g !== window.location.host;
     });
-    function m(R) {
-      R.preventDefault(), n.push(r.value, o.value);
+    function m(g) {
+      g.preventDefault(), n.push(r.value, o.value);
     }
-    return (R, x) => (se(), pt("a", {
+    return (g, A) => (ie(), pt("a", {
       href: r.value,
       class: dt(u.value),
       onClick: m
     }, [
-      je(R.$slots, "default", mt(yt({ resolved: r.value, match: s.value, exactMatch: i.value, isExternal: d.value })))
+      _e(g.$slots, "default", mt(yt({ resolved: r.value, match: c.value, exactMatch: s.value, isExternal: d.value })))
     ], 10, Ut));
   }
-}), Te = /* @__PURE__ */ fe({
+}), Ke = /* @__PURE__ */ le({
   __name: "routerView",
   setup(e) {
-    const t = he(), n = Pt(), r = pe();
-    Rt(Ce, r + 1);
+    const t = pe(), n = Pt(), r = de();
+    gt(Oe, r + 1);
     const o = C(() => {
-      var s;
-      const a = (s = t.route.matches[r]) == null ? void 0 : s.component;
-      return a ? typeof a == "function" ? gt(a) : a : null;
+      var c;
+      const a = (c = t.route.matches[r]) == null ? void 0 : c.component;
+      return a ? typeof a == "function" ? Rt(a) : a : null;
     });
-    return (a, s) => oe(n) ? (se(), we(Ee(oe(n).component), { key: 0 })) : je(a.$slots, "default", {
+    return (a, c) => ce(n) ? (ie(), ke(Se(ce(n).component), { key: 0 })) : _e(a.$slots, "default", {
       key: 1,
-      route: oe(t).route,
+      route: ce(t).route,
       component: o.value
     }, () => [
-      (se(), we(Ee(o.value)))
+      (ie(), ke(Se(o.value)))
     ]);
   }
 });
-function V() {
-  return V = Object.assign ? Object.assign.bind() : function(e) {
+function q() {
+  return q = Object.assign ? Object.assign.bind() : function(e) {
     for (var t = 1; t < arguments.length; t++) {
       var n = arguments[t];
       for (var r in n)
         Object.prototype.hasOwnProperty.call(n, r) && (e[r] = n[r]);
     }
     return e;
-  }, V.apply(this, arguments);
+  }, q.apply(this, arguments);
 }
-var B;
+var L;
 (function(e) {
   e.Pop = "POP", e.Push = "PUSH", e.Replace = "REPLACE";
-})(B || (B = {}));
+})(L || (L = {}));
 var K = process.env.NODE_ENV !== "production" ? function(e) {
   return Object.freeze(e);
 } : function(e) {
@@ -367,30 +367,30 @@ function D(e, t) {
     }
   }
 }
-var Y = "beforeunload", $t = "hashchange", Me = "popstate";
-function ke(e) {
+var Y = "beforeunload", $t = "hashchange", We = "popstate";
+function Le(e) {
   e === void 0 && (e = {});
   var t = e, n = t.window, r = n === void 0 ? document.defaultView : n, o = r.history;
   function a() {
-    var l = r.location, c = l.pathname, f = l.search, v = l.hash, w = o.state || {};
+    var l = r.location, i = l.pathname, f = l.search, v = l.hash, w = o.state || {};
     return [w.idx, K({
-      pathname: c,
+      pathname: i,
       search: f,
       hash: v,
       state: w.usr || null,
       key: w.key || "default"
     })];
   }
-  var s = null;
-  function i() {
-    if (s)
-      h.call(s), s = null;
+  var c = null;
+  function s() {
+    if (c)
+      h.call(c), c = null;
     else {
-      var l = B.Pop, c = a(), f = c[0], v = c[1];
+      var l = L.Pop, i = a(), f = i[0], v = i[1];
       if (h.length)
         if (f != null) {
           var w = m - f;
-          w && (s = {
+          w && (c = {
             action: l,
             location: v,
             retry: function() {
@@ -406,53 +406,53 @@ function ke(e) {
             "You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."
           );
       else
-        L(l);
+        B(l);
     }
   }
-  r.addEventListener(Me, i);
-  var u = B.Pop, d = a(), m = d[0], R = d[1], x = W(), h = W();
-  m == null && (m = 0, o.replaceState(V({}, o.state, {
+  r.addEventListener(We, s);
+  var u = L.Pop, d = a(), m = d[0], g = d[1], A = W(), h = W();
+  m == null && (m = 0, o.replaceState(q({}, o.state, {
     idx: m
   }), ""));
   function k(l) {
     return typeof l == "string" ? l : T(l);
   }
-  function $(l, c) {
-    return c === void 0 && (c = null), K(V({
-      pathname: R.pathname,
+  function $(l, i) {
+    return i === void 0 && (i = null), K(q({
+      pathname: g.pathname,
       hash: "",
       search: ""
-    }, typeof l == "string" ? J(l) : l, {
-      state: c,
+    }, typeof l == "string" ? Q(l) : l, {
+      state: i,
       key: Z()
     }));
   }
-  function j(l, c) {
+  function j(l, i) {
     return [{
       usr: l.state,
       key: l.key,
-      idx: c
+      idx: i
     }, k(l)];
   }
-  function U(l, c, f) {
+  function U(l, i, f) {
     return !h.length || (h.call({
       action: l,
-      location: c,
+      location: i,
       retry: f
     }), !1);
   }
-  function L(l) {
+  function B(l) {
     u = l;
-    var c = a();
-    m = c[0], R = c[1], x.call({
+    var i = a();
+    m = i[0], g = i[1], A.call({
       action: u,
-      location: R
+      location: g
     });
   }
-  function p(l, c) {
-    var f = B.Push, v = $(l, c);
+  function p(l, i) {
+    var f = L.Push, v = $(l, i);
     function w() {
-      p(l, c);
+      p(l, i);
     }
     if (U(f, v, w)) {
       var S = j(v, m + 1), y = S[0], P = S[1];
@@ -461,17 +461,17 @@ function ke(e) {
       } catch {
         r.location.assign(P);
       }
-      L(f);
+      B(f);
     }
   }
-  function g(l, c) {
-    var f = B.Replace, v = $(l, c);
+  function R(l, i) {
+    var f = L.Replace, v = $(l, i);
     function w() {
-      g(l, c);
+      R(l, i);
     }
     if (U(f, v, w)) {
       var S = j(v, m), y = S[0], P = S[1];
-      o.replaceState(y, "", P), L(f);
+      o.replaceState(y, "", P), B(f);
     }
   }
   function E(l) {
@@ -482,11 +482,11 @@ function ke(e) {
       return u;
     },
     get location() {
-      return R;
+      return g;
     },
     createHref: k,
     push: p,
-    replace: g,
+    replace: R,
     go: E,
     back: function() {
       E(-1);
@@ -494,11 +494,11 @@ function ke(e) {
     forward: function() {
       E(1);
     },
-    listen: function(c) {
-      return x.push(c);
+    listen: function(i) {
+      return A.push(i);
     },
-    block: function(c) {
-      var f = h.push(c);
+    block: function(i) {
+      var f = h.push(i);
       return h.length === 1 && r.addEventListener(Y, X), function() {
         f(), h.length || r.removeEventListener(Y, X);
       };
@@ -510,26 +510,26 @@ function jt(e) {
   e === void 0 && (e = {});
   var t = e, n = t.window, r = n === void 0 ? document.defaultView : n, o = r.history;
   function a() {
-    var c = J(r.location.hash.substr(1)), f = c.pathname, v = f === void 0 ? "/" : f, w = c.search, S = w === void 0 ? "" : w, y = c.hash, P = y === void 0 ? "" : y, A = o.state || {};
-    return [A.idx, K({
+    var i = Q(r.location.hash.substr(1)), f = i.pathname, v = f === void 0 ? "/" : f, w = i.search, S = w === void 0 ? "" : w, y = i.hash, P = y === void 0 ? "" : y, x = o.state || {};
+    return [x.idx, K({
       pathname: v,
       search: S,
       hash: P,
-      state: A.usr || null,
-      key: A.key || "default"
+      state: x.usr || null,
+      key: x.key || "default"
     })];
   }
-  var s = null;
-  function i() {
-    if (s)
-      h.call(s), s = null;
+  var c = null;
+  function s() {
+    if (c)
+      h.call(c), c = null;
     else {
-      var c = B.Pop, f = a(), v = f[0], w = f[1];
+      var i = L.Pop, f = a(), v = f[0], w = f[1];
       if (h.length)
         if (v != null) {
           var S = m - v;
-          S && (s = {
-            action: c,
+          S && (c = {
+            action: i,
             location: w,
             retry: function() {
               b(S * -1);
@@ -544,97 +544,97 @@ function jt(e) {
             "You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."
           );
       else
-        p(c);
+        p(i);
     }
   }
-  r.addEventListener(Me, i), r.addEventListener($t, function() {
-    var c = a(), f = c[1];
-    T(f) !== T(R) && i();
+  r.addEventListener(We, s), r.addEventListener($t, function() {
+    var i = a(), f = i[1];
+    T(f) !== T(g) && s();
   });
-  var u = B.Pop, d = a(), m = d[0], R = d[1], x = W(), h = W();
-  m == null && (m = 0, o.replaceState(V({}, o.state, {
+  var u = L.Pop, d = a(), m = d[0], g = d[1], A = W(), h = W();
+  m == null && (m = 0, o.replaceState(q({}, o.state, {
     idx: m
   }), ""));
   function k() {
-    var c = document.querySelector("base"), f = "";
-    if (c && c.getAttribute("href")) {
+    var i = document.querySelector("base"), f = "";
+    if (i && i.getAttribute("href")) {
       var v = r.location.href, w = v.indexOf("#");
       f = w === -1 ? v : v.slice(0, w);
     }
     return f;
   }
-  function $(c) {
-    return k() + "#" + (typeof c == "string" ? c : T(c));
+  function $(i) {
+    return k() + "#" + (typeof i == "string" ? i : T(i));
   }
-  function j(c, f) {
-    return f === void 0 && (f = null), K(V({
-      pathname: R.pathname,
+  function j(i, f) {
+    return f === void 0 && (f = null), K(q({
+      pathname: g.pathname,
       hash: "",
       search: ""
-    }, typeof c == "string" ? J(c) : c, {
+    }, typeof i == "string" ? Q(i) : i, {
       state: f,
       key: Z()
     }));
   }
-  function U(c, f) {
+  function U(i, f) {
     return [{
-      usr: c.state,
-      key: c.key,
+      usr: i.state,
+      key: i.key,
       idx: f
-    }, $(c)];
+    }, $(i)];
   }
-  function L(c, f, v) {
+  function B(i, f, v) {
     return !h.length || (h.call({
-      action: c,
+      action: i,
       location: f,
       retry: v
     }), !1);
   }
-  function p(c) {
-    u = c;
+  function p(i) {
+    u = i;
     var f = a();
-    m = f[0], R = f[1], x.call({
+    m = f[0], g = f[1], A.call({
       action: u,
-      location: R
+      location: g
     });
   }
-  function g(c, f) {
-    var v = B.Push, w = j(c, f);
+  function R(i, f) {
+    var v = L.Push, w = j(i, f);
     function S() {
-      g(c, f);
+      R(i, f);
     }
-    if (process.env.NODE_ENV !== "production" && D(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(c) + ")"), L(v, w, S)) {
-      var y = U(w, m + 1), P = y[0], A = y[1];
+    if (process.env.NODE_ENV !== "production" && D(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(i) + ")"), B(v, w, S)) {
+      var y = U(w, m + 1), P = y[0], x = y[1];
       try {
-        o.pushState(P, "", A);
+        o.pushState(P, "", x);
       } catch {
-        r.location.assign(A);
+        r.location.assign(x);
       }
       p(v);
     }
   }
-  function E(c, f) {
-    var v = B.Replace, w = j(c, f);
+  function E(i, f) {
+    var v = L.Replace, w = j(i, f);
     function S() {
-      E(c, f);
+      E(i, f);
     }
-    if (process.env.NODE_ENV !== "production" && D(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(c) + ")"), L(v, w, S)) {
-      var y = U(w, m), P = y[0], A = y[1];
-      o.replaceState(P, "", A), p(v);
+    if (process.env.NODE_ENV !== "production" && D(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(i) + ")"), B(v, w, S)) {
+      var y = U(w, m), P = y[0], x = y[1];
+      o.replaceState(P, "", x), p(v);
     }
   }
-  function b(c) {
-    o.go(c);
+  function b(i) {
+    o.go(i);
   }
   var l = {
     get action() {
       return u;
     },
     get location() {
-      return R;
+      return g;
     },
     createHref: $,
-    push: g,
+    push: R,
     replace: E,
     go: b,
     back: function() {
@@ -644,7 +644,7 @@ function jt(e) {
       b(1);
     },
     listen: function(f) {
-      return x.push(f);
+      return A.push(f);
     },
     block: function(f) {
       var v = h.push(f);
@@ -655,76 +655,76 @@ function jt(e) {
   };
   return l;
 }
-function Se(e) {
+function Be(e) {
   e === void 0 && (e = {});
   var t = e, n = t.initialEntries, r = n === void 0 ? ["/"] : n, o = t.initialIndex, a = r.map(function(p) {
-    var g = K(V({
+    var R = K(q({
       pathname: "/",
       search: "",
       hash: "",
       state: null,
       key: Z()
-    }, typeof p == "string" ? J(p) : p));
-    return process.env.NODE_ENV !== "production" && D(g.pathname.charAt(0) === "/", "Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: " + JSON.stringify(p) + ")"), g;
-  }), s = Ae(o ?? a.length - 1, 0, a.length - 1), i = B.Pop, u = a[s], d = W(), m = W();
-  function R(p) {
+    }, typeof p == "string" ? Q(p) : p));
+    return process.env.NODE_ENV !== "production" && D(R.pathname.charAt(0) === "/", "Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: " + JSON.stringify(p) + ")"), R;
+  }), c = Ue(o ?? a.length - 1, 0, a.length - 1), s = L.Pop, u = a[c], d = W(), m = W();
+  function g(p) {
     return typeof p == "string" ? p : T(p);
   }
-  function x(p, g) {
-    return g === void 0 && (g = null), K(V({
+  function A(p, R) {
+    return R === void 0 && (R = null), K(q({
       pathname: u.pathname,
       search: "",
       hash: ""
-    }, typeof p == "string" ? J(p) : p, {
-      state: g,
+    }, typeof p == "string" ? Q(p) : p, {
+      state: R,
       key: Z()
     }));
   }
-  function h(p, g, E) {
+  function h(p, R, E) {
     return !m.length || (m.call({
       action: p,
-      location: g,
+      location: R,
       retry: E
     }), !1);
   }
-  function k(p, g) {
-    i = p, u = g, d.call({
-      action: i,
+  function k(p, R) {
+    s = p, u = R, d.call({
+      action: s,
       location: u
     });
   }
-  function $(p, g) {
-    var E = B.Push, b = x(p, g);
+  function $(p, R) {
+    var E = L.Push, b = A(p, R);
     function l() {
-      $(p, g);
+      $(p, R);
     }
-    process.env.NODE_ENV !== "production" && D(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.push(" + JSON.stringify(p) + ")"), h(E, b, l) && (s += 1, a.splice(s, a.length, b), k(E, b));
+    process.env.NODE_ENV !== "production" && D(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.push(" + JSON.stringify(p) + ")"), h(E, b, l) && (c += 1, a.splice(c, a.length, b), k(E, b));
   }
-  function j(p, g) {
-    var E = B.Replace, b = x(p, g);
+  function j(p, R) {
+    var E = L.Replace, b = A(p, R);
     function l() {
-      j(p, g);
+      j(p, R);
     }
-    process.env.NODE_ENV !== "production" && D(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.replace(" + JSON.stringify(p) + ")"), h(E, b, l) && (a[s] = b, k(E, b));
+    process.env.NODE_ENV !== "production" && D(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.replace(" + JSON.stringify(p) + ")"), h(E, b, l) && (a[c] = b, k(E, b));
   }
   function U(p) {
-    var g = Ae(s + p, 0, a.length - 1), E = B.Pop, b = a[g];
+    var R = Ue(c + p, 0, a.length - 1), E = L.Pop, b = a[R];
     function l() {
       U(p);
     }
-    h(E, b, l) && (s = g, k(E, b));
+    h(E, b, l) && (c = R, k(E, b));
   }
-  var L = {
+  var B = {
     get index() {
-      return s;
+      return c;
     },
     get action() {
-      return i;
+      return s;
     },
     get location() {
       return u;
     },
-    createHref: R,
+    createHref: g,
     push: $,
     replace: j,
     go: U,
@@ -734,16 +734,16 @@ function Se(e) {
     forward: function() {
       U(1);
     },
-    listen: function(g) {
-      return d.push(g);
+    listen: function(R) {
+      return d.push(R);
     },
-    block: function(g) {
-      return m.push(g);
+    block: function(R) {
+      return m.push(R);
     }
   };
-  return L;
+  return B;
 }
-function Ae(e, t, n) {
+function Ue(e, t, n) {
   return Math.min(Math.max(e, t), n);
 }
 function X(e) {
@@ -773,10 +773,10 @@ function Z() {
   return Math.random().toString(36).substr(2, 8);
 }
 function T(e) {
-  var t = e.pathname, n = t === void 0 ? "/" : t, r = e.search, o = r === void 0 ? "" : r, a = e.hash, s = a === void 0 ? "" : a;
-  return o && o !== "?" && (n += o.charAt(0) === "?" ? o : "?" + o), s && s !== "#" && (n += s.charAt(0) === "#" ? s : "#" + s), n;
+  var t = e.pathname, n = t === void 0 ? "/" : t, r = e.search, o = r === void 0 ? "" : r, a = e.hash, c = a === void 0 ? "" : a;
+  return o && o !== "?" && (n += o.charAt(0) === "?" ? o : "?" + o), c && c !== "#" && (n += c.charAt(0) === "#" ? c : "#" + c), n;
 }
-function J(e) {
+function Q(e) {
   var t = {};
   if (e) {
     var n = e.indexOf("#");
@@ -789,30 +789,30 @@ function J(e) {
 function Nt(e, t) {
   function n(r, o, a) {
     if (typeof r == "object") {
-      const i = {
+      const s = {
         ...e.params,
         ...r
       };
-      return t(e.key, i, o);
+      return t(e.key, s, o);
     }
-    const s = {
+    const c = {
       ...e.params,
       [r]: o
     };
-    return t(e.key, s, a);
+    return t(e.key, c, a);
   }
   return new Proxy(e, {
     get: (r, o, a) => o === "update" ? n : o === "params" ? new Proxy(e.params, {
-      set(s, i, u) {
-        return n(i, u), !0;
+      set(c, s, u) {
+        return n(s, u), !0;
       }
     }) : Reflect.get(r, o, a)
   });
 }
 function _t(e, t) {
-  const n = vt({ ...e }), r = (s) => {
-    Object.assign(n, { ...s });
-  }, o = ne(n), a = Nt(o, t);
+  const n = vt({ ...e }), r = (c) => {
+    Object.assign(n, { ...c });
+  }, o = oe(n), a = Nt(o, t);
   return {
     currentRoute: o,
     routerRoute: a,
@@ -821,33 +821,33 @@ function _t(e, t) {
 }
 class ee extends Error {
 }
-function qt(e) {
+function Vt(e) {
   return e !== String && e !== Boolean && e !== Number;
 }
 function Ct(e) {
-  return typeof e == "function" && qt(e);
+  return typeof e == "function" && Vt(e);
 }
-function Ke(e) {
+function Fe(e) {
   return typeof e == "object" && "get" in e && typeof e.get == "function" && "set" in e && typeof e.set == "function";
 }
-function ie(e) {
+function te(e) {
   return typeof e == "string" && e.length > 0;
 }
-function Vt(e, t) {
+function qt(e, t) {
   return e[t] ?? String;
 }
-const We = Symbol();
-function Fe(e) {
-  return We in e;
+const Ie = Symbol();
+function Qe(e) {
+  return Ie in e;
 }
 function Ot(e) {
   return {
-    [We]: !0,
+    [Ie]: !0,
     get: (t) => {
-      if (ie(t))
-        return Qe(t, e);
+      if (te(t))
+        return ve(t, e);
     },
-    set: (t) => ie(t) ? Ge(t, e) : ""
+    set: (t) => te(t) ? we(t, e) : ""
   };
 }
 const N = {
@@ -861,7 +861,7 @@ const N = {
       throw t();
     return e;
   }
-}, Ie = {
+}, Je = {
   get: (e, { invalid: t }) => {
     if (e === "true")
       return !0;
@@ -874,7 +874,7 @@ const N = {
       throw t();
     return e.toString();
   }
-}, Je = {
+}, Ge = {
   get: (e, { invalid: t }) => {
     const n = Number(e);
     if (isNaN(n))
@@ -887,21 +887,21 @@ const N = {
     return e.toString();
   }
 };
-function Qe(e, t) {
+function ve(e, t) {
   if (e === void 0) {
-    if (Fe(t))
+    if (Qe(t))
       return t.get(e, N);
     throw new ee();
   }
   if (t === String)
     return Dt.get(e, N);
   if (t === Boolean)
-    return Ie.get(e, N);
-  if (t === Number)
     return Je.get(e, N);
+  if (t === Number)
+    return Ge.get(e, N);
   if (Ct(t))
     return t(e, N);
-  if (Ke(t))
+  if (Fe(t))
     return t.get(e, N);
   if (t instanceof RegExp) {
     if (t.test(e))
@@ -910,12 +910,12 @@ function Qe(e, t) {
   }
   return e;
 }
-function Ge(e, t) {
+function we(e, t) {
   if (t === Boolean)
-    return Ie.set(e, N);
-  if (t === Number)
     return Je.set(e, N);
-  if (Ke(t))
+  if (t === Number)
+    return Ge.set(e, N);
+  if (Fe(t))
     return t.set(e, N);
   try {
     return e.toString();
@@ -924,44 +924,51 @@ function Ge(e, t) {
   }
 }
 function Tt(e) {
-  const t = ge(e.path.toString());
+  const t = Ee(e.path.toString());
   return new RegExp(`^${t}$`, "i");
 }
 function Mt(e) {
   const t = new URLSearchParams(e.query.toString());
-  return Array.from(t.entries()).filter(([, n]) => !Ft(n)).map(([n, r]) => new RegExp(`${n}=${ge(r)}(&|$)`, "i"));
+  return Array.from(t.entries()).filter(([, n]) => !Ye(n)).map(([n, r]) => new RegExp(`${n}=${Ee(r)}(&|$)`, "i"));
 }
-function ge(e) {
+function Ee(e) {
   return [
-    Wt,
-    It
+    Kt,
+    Wt
   ].reduce((t, n) => n(t), e);
 }
-const ze = /(:\?[\w]+)(?=\W|$)/g, Kt = /(:[\w]+)(?=\W|$)/g;
+const be = ":\\?([\\w]+)(?=\\W|$)", ze = ":([\\w]+)(?=\\W|$)";
+function Kt(e) {
+  return e.replace(new RegExp(be, "g"), "[^\\/]*");
+}
+function Ye(e) {
+  return new RegExp(be, "g").test(e);
+}
 function Wt(e) {
-  return e.replace(ze, "[^\\/]*");
+  return e.replace(new RegExp(ze, "g"), "[^\\/]+");
 }
 function Ft(e) {
-  return ze.test(e);
+  const [t] = ne(e, new RegExp(be, "g")), [n] = ne(e, new RegExp(ze, "g"));
+  return t ?? n;
 }
-function It(e) {
-  return e.replace(Kt, "[^\\/]+");
+function ne(e, t) {
+  return Array.from(e.matchAll(t)).flatMap(([, ...r]) => r.map((o) => te(o) ? o : ""));
 }
-function Ye(e, t, n) {
-  const r = Xe(t.toString(), n), [o] = Ze(e, r);
+function Xe(e, t, n) {
+  const r = Ze(t, n), [o] = ne(e, r);
   return o;
 }
-function Jt(e, t) {
+function It(e, t) {
   if (!t)
     return e;
-  const { name: n, param: r, value: o } = t, a = Xe(e, n);
-  return Ze(e, a).reduce((i, u) => i.replace(u, () => Ge(o, r)), e);
+  const { name: n, param: r, value: o } = t, a = Ze(e, n);
+  return ne(e, a).reduce((s, u) => u === void 0 ? s : s.replace(u, () => we(o, r)), e);
 }
-function Xe(e, t) {
+function Ze(e, t) {
   const n = [
     Qt,
-    Gt,
-    ge
+    Jt,
+    Ee
   ].reduce((r, o) => o(r, t), e);
   return new RegExp(n, "g");
 }
@@ -969,13 +976,10 @@ function Qt(e, t) {
   const n = new RegExp(`(:\\?${t})(?=\\W|$)`, "g");
   return e.replace(n, "([^\\/]*)");
 }
-function Gt(e, t) {
+function Jt(e, t) {
   const n = new RegExp(`(:${t})(?=\\W|$)`, "g");
   return e.replace(n, "([^\\/]+)");
 }
-function Ze(e, t) {
-  return Array.from(e.matchAll(t)).flatMap(([, ...r]) => r.map((o) => ie(o) ? o : ""));
-}
 function et(e, ...t) {
   return t.reduce((n, r) => {
     if (!r)
@@ -984,43 +988,55 @@ function et(e, ...t) {
     return Object.keys(o).length === 0 ? n : n.includes("?") ? `${n}&${o}` : `${n}?${o}`;
   }, e);
 }
-function zt(e, t = {}) {
-  const { params: n = {}, query: r } = t, o = Object.entries({ ...e.pathParams, ...e.queryParams }), a = e.path.toString(), s = e.query.toString(), i = xe(a, o, n), u = xe(s, o, n);
-  return et(i, u, r);
+function Gt(e, t = {}) {
+  const { params: n = {}, query: r } = t, o = { ...e.path.params, ...e.query.params }, a = e.path.toString(), c = e.query.toString(), s = zt(a, o, n), u = Yt(c, o, n);
+  return et(s, u, r);
+}
+function zt(e, t, n) {
+  return e.length ? Object.entries(t).reduce((r, [o, a]) => It(r, { name: o, param: a, value: n[o] }), e) : e;
 }
-function xe(e, t, n) {
-  return e.length ? t.reduce((r, [o, a]) => Jt(r, { name: o, param: a, value: n[o] }), e) : e;
+function Yt(e, t, n) {
+  if (!e.length)
+    return {};
+  const r = new URLSearchParams(e);
+  return Array.from(r.entries()).reduce((o, [a, c]) => {
+    const s = Ft(c);
+    if (!s)
+      return { ...o, [a]: c };
+    const u = we(n[s], t[s]);
+    return Ye(c) && n[s] === void 0 && u === "" ? o : { ...o, [a]: u };
+  }, {});
 }
 function tt(e) {
   return (t, n, r) => {
     if (I(t))
       return et(t, (n ?? {}).query);
-    const o = n ?? {}, a = r ?? {}, s = e.find((u) => u.key === t);
-    if (!s)
+    const o = n ?? {}, a = r ?? {}, c = e.find((u) => u.key === t);
+    if (!c)
       throw `Route not found: "${String(t)}"`;
-    if (s.matched.disabled)
+    if (c.matched.disabled)
       throw `Route disabled: "${String(t)}"`;
-    return zt(s, {
+    return Gt(c, {
       params: o,
       query: a.query
     });
   };
 }
-function Q(e) {
-  return !e.startsWith("http") ? Xt(e) : Yt(e);
+function J(e) {
+  return !e.startsWith("http") ? Zt(e) : Xt(e);
 }
-function Yt(e) {
-  const { protocol: t, host: n, pathname: r, search: o, searchParams: a, hash: s } = new URL(e, e);
+function Xt(e) {
+  const { protocol: t, host: n, pathname: r, search: o, searchParams: a, hash: c } = new URL(e, e);
   return {
     protocol: t,
     host: n,
     pathname: r,
     search: o,
     searchParams: a,
-    hash: s
+    hash: c
   };
 }
-function Xt(e) {
+function Zt(e) {
   const { pathname: t, search: n, searchParams: r, hash: o } = new URL(e, "https://localhost");
   return {
     pathname: t,
@@ -1036,7 +1052,7 @@ function nt(e) {
     getAll: (n) => t.getAll(n)
   };
 }
-const Zt = (e, t) => {
+const en = (e, t) => {
   try {
     rt(e, t);
   } catch {
@@ -1044,55 +1060,65 @@ const Zt = (e, t) => {
   }
   return !0;
 }, rt = (e, t) => {
-  const { pathname: n, search: r } = Q(t);
+  const { pathname: n, search: r } = J(t);
   return {
-    ...Be(e.pathParams, e.path.toString(), n),
-    ...Be(e.queryParams, e.query.toString(), r)
+    ...tn(e.path, n),
+    ...nn(e.query, r)
   };
-}, Be = (e, t, n) => {
-  const r = {}, o = decodeURIComponent(n);
-  for (const [a, s] of Object.entries(e)) {
-    const i = Ye(o, t, a), u = Qe(i, s);
-    r[a] = u;
+};
+function tn(e, t) {
+  const n = {}, r = decodeURIComponent(t);
+  for (const [o, a] of Object.entries(e.params)) {
+    const c = Xe(r, e.toString(), o), s = ve(c, a);
+    n[o] = s;
   }
-  return r;
-}, en = (e, t) => {
-  const { pathname: n } = Q(t);
+  return n;
+}
+function nn(e, t) {
+  const n = {}, r = new URLSearchParams(t);
+  for (const [o, a] of Object.entries(e.params)) {
+    const c = r.get(o) ?? void 0, s = ve(c, a);
+    n[o] = s;
+  }
+  return n;
+}
+const rn = (e, t) => {
+  const { pathname: n } = J(t);
   return Tt(e).test(n);
-}, tn = (e, t) => {
-  const { search: n } = Q(t);
+}, on = (e, t) => {
+  const { search: n } = J(t);
   return Mt(e).every((o) => o.test(n));
 };
-function nn(e) {
-  const { searchParams: t, pathname: n } = Q(e), r = -1, o = 1;
-  return (a, s) => {
-    const i = Ue(a, t), u = Le(a, n), d = Ue(s, t), m = Le(s, n);
-    return i + u > d + m ? r : i + u < d + m ? o : a.depth > s.depth ? r : a.depth < s.depth ? o : 0;
+function an(e) {
+  const { searchParams: t, pathname: n } = J(e), r = -1, o = 1;
+  return (a, c) => {
+    const s = $e(a, t), u = He(a, n), d = $e(c, t), m = He(c, n);
+    return s + u > d + m ? r : s + u < d + m ? o : a.depth > c.depth ? r : a.depth < c.depth ? o : 0;
   };
 }
-function Le(e, t) {
-  const n = Object.entries(e.pathParams).filter(([, o]) => Fe(o)).map(([o]) => o), r = n.filter((o) => Ye(t, e.path.toString(), o) === void 0);
+function He(e, t) {
+  const n = Object.entries(e.path.params).filter(([, o]) => Qe(o)).map(([o]) => o), r = n.filter((o) => Xe(t, e.path.toString(), o) === void 0);
   return n.length - r.length;
 }
-function Ue(e, t) {
+function $e(e, t) {
   const n = new URLSearchParams(e.query.toString()), r = Array.from(n.keys()), o = r.filter((a) => !t.has(a));
   return r.length - o.length;
 }
 function ot(e, t) {
-  const n = [rn, en, tn, Zt], r = nn(t), o = e.filter((d) => n.every((m) => m(d, t))).sort(r);
+  const n = [cn, rn, on, en], r = an(t), o = e.filter((d) => n.every((m) => m(d, t))).sort(r);
   if (o.length === 0)
     return;
-  const [a] = o, { search: s } = Q(t), i = nt(s), u = rt(a, t);
-  return ne({
+  const [a] = o, { search: c } = J(t), s = nt(c), u = rt(a, t);
+  return oe({
     matched: a.matched,
     matches: a.matches,
     key: a.key,
-    query: i,
+    query: s,
     params: u
   });
 }
-const rn = (e) => "name" in e.matched && !!e.matched.name;
-function on(e) {
+const cn = (e) => "name" in e.matched && !!e.matched.name;
+function sn(e) {
   return (t, n = {}) => {
     const o = tt(e)(t, n);
     return ot(e, o);
@@ -1101,8 +1127,8 @@ function on(e) {
 function at() {
   return typeof window < "u" && typeof window.document < "u";
 }
-function an({ mode: e, listener: t }) {
-  const n = sn(e), r = (u, d) => {
+function un({ mode: e, listener: t }) {
+  const n = fn(e), r = (u, d) => {
     if (d != null && d.replace)
       return n.replace(u);
     n.push(u);
@@ -1123,14 +1149,14 @@ function an({ mode: e, listener: t }) {
     }
   };
 }
-function sn(e = "auto") {
+function fn(e = "auto") {
   switch (e) {
     case "auto":
-      return at() ? ke() : Se();
+      return at() ? Le() : Be();
     case "browser":
-      return ke();
+      return Le();
     case "memory":
-      return Se();
+      return Be();
     case "hash":
       return jt();
     default:
@@ -1138,43 +1164,43 @@ function sn(e = "auto") {
       throw new Error(`Switch is not exhaustive for mode: ${t}`);
   }
 }
-function cn(e) {
-  return fe(() => () => wt("h1", e), {
+function ln(e) {
+  return le(() => () => wt("h1", e), {
     name: e,
     props: []
   });
 }
-const He = Symbol();
-function un({
+const je = Symbol();
+function hn({
   rejections: e
 }) {
-  const t = (s) => {
-    const i = {
+  const t = (c) => {
+    const s = {
       ...e
     };
-    return ce(i[s] ?? cn(s));
-  }, n = (s) => {
-    const i = ce(t(s)), u = {
-      name: s,
+    return ue(s[c] ?? ln(c));
+  }, n = (c) => {
+    const s = ue(t(c)), u = {
+      name: c,
       path: "",
-      component: i,
+      component: s,
       meta: {}
     };
-    return ne({
+    return oe({
       matched: u,
       matches: [u],
-      key: s,
+      key: c,
       query: nt(""),
       params: {},
-      [He]: !0
+      [je]: !0
     });
-  }, r = (s) => s[He] === !0, o = (s) => {
-    if (!s) {
+  }, r = (c) => c[je] === !0, o = (c) => {
+    if (!c) {
       a.value = null;
       return;
     }
-    const i = t(s);
-    a.value = { type: s, component: i };
+    const s = t(c);
+    a.value = { type: c, component: s };
   }, a = Et(null);
   return {
     setRejection: o,
@@ -1183,37 +1209,37 @@ function un({
     isRejectionRoute: r
   };
 }
-class fn extends Error {
+class pn extends Error {
   constructor() {
     super("initialUrl must be set if window.location is unavailable");
   }
 }
-function ln(e) {
+function dn(e) {
   if (e)
     return e;
   if (at())
     return window.location.toString();
-  throw new fn();
+  throw new pn();
 }
-function Bn(e, t = {}) {
-  const n = tt(e), r = an({
+function Hn(e, t = {}) {
+  const n = tt(e), r = un({
     mode: t.historyMode,
     listener: () => {
       const y = T(location);
       h(y);
     }
-  }), { runBeforeRouteHooks: o, runAfterRouteHooks: a } = xt(), {
-    hooks: s,
-    onBeforeRouteEnter: i,
+  }), { runBeforeRouteHooks: o, runAfterRouteHooks: a } = At(), {
+    hooks: c,
+    onBeforeRouteEnter: s,
     onAfterRouteUpdate: u,
     onBeforeRouteLeave: d,
     onAfterRouteEnter: m,
-    onBeforeRouteUpdate: R,
-    onAfterRouteLeave: x
-  } = Lt();
+    onBeforeRouteUpdate: g,
+    onAfterRouteLeave: A
+  } = Bt();
   async function h(y, { replace: P } = {}) {
     r.stopListening();
-    const A = ot(e, y) ?? g("NotFound"), _ = { ...b }, O = await o({ to: A, from: _, hooks: s });
+    const x = ot(e, y) ?? R("NotFound"), _ = { ...b }, O = await o({ to: x, from: _, hooks: c });
     switch (O.status) {
       case "ABORT":
         return;
@@ -1221,49 +1247,49 @@ function Bn(e, t = {}) {
         r.update(y, { replace: P }), await k(...O.to);
         return;
       case "REJECT":
-        r.update(y, { replace: P }), L(O.type), c(A);
+        r.update(y, { replace: P }), B(O.type), i(x);
         break;
       case "SUCCESS":
-        r.update(y, { replace: P }), L(null), c(A);
+        r.update(y, { replace: P }), B(null), i(x);
         break;
       default:
         throw new Error(`Switch is not exhaustive for before hook response status: ${JSON.stringify(O)}`);
     }
-    const q = await a({ to: A, from: _, hooks: s });
-    switch (q.status) {
+    const V = await a({ to: x, from: _, hooks: c });
+    switch (V.status) {
       case "PUSH":
-        await k(...q.to);
+        await k(...V.to);
         break;
       case "REJECT":
-        L(q.type);
+        B(V.type);
         break;
       case "SUCCESS":
         break;
       default:
-        const G = q;
+        const G = V;
         throw new Error(`Switch is not exhaustive for after hook response status: ${JSON.stringify(G)}`);
     }
     r.startListening();
   }
-  const k = (y, P, A) => {
+  const k = (y, P, x) => {
     if (I(y)) {
       const G = { ...P }, ut = n(y, G);
       return h(ut, { replace: G.replace });
     }
-    const _ = { ...A }, q = n(y, P ?? {}, _);
-    return h(q, { replace: _.replace });
-  }, $ = (y, P, A) => {
+    const _ = { ...x }, V = n(y, P ?? {}, _);
+    return h(V, { replace: _.replace });
+  }, $ = (y, P, x) => {
     if (I(y)) {
-      const q = { ...P, replace: !0 };
-      return k(y, q);
+      const V = { ...P, replace: !0 };
+      return k(y, V);
     }
-    const _ = P ?? {}, O = { ...A, replace: !0 };
+    const _ = P ?? {}, O = { ...x, replace: !0 };
     return k(y, _, O);
-  }, j = (y) => L(y), U = on(e), { setRejection: L, rejection: p, getRejectionRoute: g } = un(t), E = g("NotFound"), { currentRoute: b, routerRoute: l, updateRoute: c } = _t(E, k);
+  }, j = (y) => B(y), U = sn(e), { setRejection: B, rejection: p, getRejectionRoute: R } = hn(t), E = R("NotFound"), { currentRoute: b, routerRoute: l, updateRoute: i } = _t(E, k);
   r.startListening();
-  const f = ln(t.initialUrl), v = h(f, { replace: !0 });
+  const f = dn(t.initialUrl), v = h(f, { replace: !0 });
   function w(y) {
-    y.component("RouterView", Te), y.component("RouterLink", Ht), y.provide(_e, S), y.provide(Ne, p), y.provide(Ve, s);
+    y.component("RouterView", Ke), y.component("RouterLink", Ht), y.provide(Ce, S), y.provide(Ve, p), y.provide(De, c);
   }
   const S = {
     route: l,
@@ -1278,32 +1304,32 @@ function Bn(e, t = {}) {
     go: r.go,
     install: w,
     initialized: v,
-    onBeforeRouteEnter: i,
+    onBeforeRouteEnter: s,
     onAfterRouteUpdate: u,
     onBeforeRouteLeave: d,
     onAfterRouteEnter: m,
-    onBeforeRouteUpdate: R,
-    onAfterRouteLeave: x
+    onBeforeRouteUpdate: g,
+    onAfterRouteLeave: A
   };
   return S;
 }
-function st(e, t) {
+function ct(e, t) {
   const n = /:\??([\w]+)(?=\W|$)/g;
-  return Array.from(e.matchAll(n)).reduce((o, [a, s]) => {
-    const i = a.startsWith(":?"), u = Vt(t, s);
-    if (s in o)
-      throw new re(s);
-    return o[s] = i ? Ot(u) : u, o;
+  return Array.from(e.matchAll(n)).reduce((o, [a, c]) => {
+    const s = a.startsWith(":?"), u = qt(t, c);
+    if (c in o)
+      throw new ae(c);
+    return o[c] = s ? Ot(u) : u, o;
   }, {});
 }
-function ct(e, t) {
+function st(e, t) {
   return {
     path: e,
-    params: st(e, t),
+    params: ct(e, t),
     toString: () => e
   };
 }
-function ve(e, t) {
+function Pe(e, t) {
   const n = Object.keys(e), r = Object.keys(t), o = n.find((a) => r.includes(a));
   return o ? {
     key: o,
@@ -1313,98 +1339,97 @@ function ve(e, t) {
     hasDuplicates: !1
   };
 }
-function hn(e, t) {
-  const { hasDuplicates: n, key: r } = ve(e.params, t.params);
+function mn(e, t) {
+  const { hasDuplicates: n, key: r } = Pe(e.params, t.params);
   if (n)
-    throw new re(r);
-  return ct(`${e.path}${t.path}`, { ...e.params, ...t.params });
+    throw new ae(r);
+  return st(`${e.path}${t.path}`, { ...e.params, ...t.params });
 }
-function ue(e, t) {
+function fe(e, t) {
   return {
     query: e,
-    params: st(e, t),
+    params: ct(e, t),
     toString: () => e
   };
 }
-function pn(e, t) {
-  const { hasDuplicates: n, key: r } = ve(e.params, t.params);
+function yn(e, t) {
+  const { hasDuplicates: n, key: r } = Pe(e.params, t.params);
   if (n)
-    throw new re(r);
-  return ue(`${e.query}${t.query}`, { ...e.params, ...t.params });
+    throw new ae(r);
+  const o = [e.query, t.query].filter(te).join("&");
+  return fe(o, { ...e.params, ...t.params });
 }
 function it(e) {
   return typeof e == "object" && e !== null && !Array.isArray(e);
 }
-function dn(e) {
+function gn(e) {
   return it(e) && typeof e.path == "string";
 }
-function mn(e) {
-  return dn(e) ? e : ct(e, {});
+function Rn(e) {
+  return gn(e) ? e : st(e, {});
 }
-function yn(e) {
+function vn(e) {
   return it(e) && typeof e.query == "string";
 }
-function Rn(e) {
-  return e === void 0 ? ue("", {}) : yn(e) ? e : ue(e, {});
+function wn(e) {
+  return e === void 0 ? fe("", {}) : vn(e) ? e : fe(e, {});
 }
-function gn(e) {
+function En(e) {
   return "children" in e;
 }
-function Ln(e) {
+function $n(e) {
   const t = e.reduce((n, r) => {
-    const o = vn({
+    const o = bn({
       ...r,
-      component: r.component ?? Te
+      component: r.component ?? Ke
     });
-    return gn(r) && n.push(...r.children.map((a) => ({
+    return En(r) && n.push(...r.children.map((a) => ({
       ...a,
       key: qe(o.key, a.key),
-      path: hn(o.path, a.path),
-      query: pn(o.query, a.query),
+      path: mn(o.path, a.path),
+      query: yn(o.query, a.query),
       matches: [o.matched, ...a.matches],
       depth: a.depth + 1
     }))), n.push(o), n;
   }, []);
   return t.forEach(({ path: n, query: r }) => {
-    const { hasDuplicates: o, key: a } = ve(n.params, r.params);
+    const { hasDuplicates: o, key: a } = Pe(n.params, r.params);
     if (o)
-      throw new re(a);
+      throw new ae(a);
   }), t;
 }
-function vn(e) {
-  const t = mn(e.path), n = Rn(e.query), r = ce({ meta: {}, ...e });
+function bn(e) {
+  const t = Rn(e.path), n = wn(e.query), r = ue({ meta: {}, ...e });
   return {
     matched: r,
     matches: [r],
     key: e.name,
     path: t,
     query: n,
-    pathParams: t.params,
-    queryParams: n.params,
     depth: 1,
     disabled: e.disabled ?? !1
   };
 }
 export {
-  re as DuplicateParamsError,
+  ae as DuplicateParamsError,
   Ht as RouterLink,
-  le as RouterNotInstalledError,
-  Te as RouterView,
+  he as RouterNotInstalledError,
+  Ke as RouterView,
   bt as UseRouteInvalidError,
-  Bn as createRouter,
-  Ln as createRoutes,
-  Ke as isParamGetSet,
+  Hn as createRouter,
+  $n as createRoutes,
+  Fe as isParamGetSet,
   Ct as isParamGetter,
-  Sn as onAfterRouteEnter,
-  An as onAfterRouteLeave,
-  xn as onAfterRouteUpdate,
-  Pn as onBeforeRouteLeave,
-  kn as onBeforeRouteUpdate,
-  ct as path,
-  ue as query,
-  _e as routerInjectionKey,
-  Ne as routerRejectionKey,
+  Ln as onAfterRouteEnter,
+  Bn as onAfterRouteLeave,
+  Un as onAfterRouteUpdate,
+  xn as onBeforeRouteLeave,
+  An as onBeforeRouteUpdate,
+  st as path,
+  fe as query,
+  Ce as routerInjectionKey,
+  Ve as routerRejectionKey,
   Pt as useRejection,
-  bn as useRoute,
-  he as useRouter
+  Sn as useRoute,
+  pe as useRouter
 };