@kitbag/router 0.4.0 → 0.4.2

package/dist/kitbag-router.js

@@ -1,8 +1,8 @@
 var ve = Object.defineProperty;
 var we = (t, e, n) => e in t ? ve(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
 var $ = (t, e, n) => (we(t, typeof e != "symbol" ? e + "" : e, n), n);
-import { inject as st, computed as H, toValue as lt, readonly as ct, watch as Ee, onUnmounted as Ot, defineComponent as it, openBlock as _t, createElementBlock as be, normalizeClass as Pe, renderSlot as qt, normalizeProps as Dt, guardReactiveProps as Mt, unref as Z, provide as Se, defineAsyncComponent as ke, createBlock as xe, resolveDynamicComponent as Ae, h as Tt, reactive as Le, ref as Ue, markRaw as pt } from "vue";
-class ut extends Error {
+import { inject as ct, computed as H, toValue as ft, toRefs as Ee, reactive as Ot, watch as Pe, onUnmounted as _t, defineComponent as Y, openBlock as qt, createElementBlock as be, normalizeClass as Se, renderSlot as Dt, normalizeProps as Mt, guardReactiveProps as Tt, unref as tt, provide as ke, defineAsyncComponent as xe, createBlock as Ae, resolveDynamicComponent as Le, h as et, ref as Ue, markRaw as ht } from "vue";
+class it extends Error {
   /**
    * Constructs a new DuplicateParamsError instance with a message indicating the problematic parameter.
    * @param paramName - The name of the parameter that was duplicated.
@@ -29,38 +29,38 @@ class Be extends Error {
 }
 const Wt = Symbol();
 function Rt() {
-  const t = st(Wt);
+  const t = ct(Wt);
   if (!t)
     throw new mt();
   return t;
 }
-class F extends Error {
+class I extends Error {
 }
-function I(t) {
+function W(t) {
   return typeof t != "string" ? !1 : /^(https?:\/\/|\/).*/g.test(t);
 }
 function He(t, e = {}, n = {}) {
-  const r = Rt(), o = H(() => lt(t)), a = H(() => lt(e)), s = H(() => lt(n)), c = H(() => {
-    if (I(o.value))
+  const r = Rt(), o = H(() => ft(t)), a = H(() => ft(e)), s = H(() => ft(n)), c = H(() => {
+    if (W(o.value))
       return o.value;
     try {
       return r.resolve(o.value, a.value, s.value);
     } catch (d) {
-      throw d instanceof F && console.error(`Failed to resolve route "${o.value.toString()}" in RouterLink.`, d), d;
+      throw d instanceof I && console.error(`Failed to resolve route "${o.value.toString()}" in RouterLink.`, d), d;
     }
-  }), u = H(() => r.find(c.value, s.value)), f = H(() => !!u.value && r.route.matches.includes(ct(u.value.matched))), R = H(() => !!u.value && r.route.matched === u.value.matched);
+  }), u = H(() => r.find(c.value, s.value)), f = H(() => !!u.value && r.route.matches.includes(u.value.matched)), h = H(() => !!u.value && r.route.matched === u.value.matched);
   return {
     route: u,
     href: c,
     isMatch: f,
-    isExactMatch: R,
+    isExactMatch: h,
     push: (d) => r.push(c.value, {}, { ...s.value, ...d }),
     replace: (d) => r.replace(c.value, {}, { ...s.value, ...d })
   };
 }
 const Ft = Symbol();
 function Ne() {
-  const t = st(Ft);
+  const t = ct(Ft);
   if (!t)
     throw new mt();
   return t;
@@ -68,32 +68,40 @@ function Ne() {
 function It(t, e) {
   return [t, e].filter((n) => !!n).join(".");
 }
-const tt = Symbol("isRouterRouteSymbol");
+const Jt = Symbol("isRouterRouteSymbol");
 function $e(t) {
-  return typeof t == "object" && t !== null && tt in t && t[tt] === !0;
+  return typeof t == "object" && t !== null && Jt in t;
 }
 function je(t, e) {
-  function n(r, o, a) {
-    if (typeof r == "object") {
-      const c = {
+  function n(f, h, d) {
+    if (typeof f == "object") {
+      const p = {
         ...t.params,
-        ...r
+        ...f
       };
-      return e(t.key, c, o);
+      return e(t.key, p, h);
     }
-    const s = {
+    const b = {
       ...t.params,
-      [r]: o
+      [f]: h
     };
-    return e(t.key, s, a);
+    return e(t.key, b, d);
   }
-  return new Proxy(t, {
-    has: (r, o) => ["update", "params", tt].includes(o) ? !0 : Reflect.has(r, o),
-    get: (r, o, a) => o === tt ? !0 : o === "update" ? n : o === "params" ? new Proxy(t.params, {
-      set(s, c, u) {
-        return n(c, u), !0;
+  const { matched: r, matches: o, key: a, query: s, params: c } = Ee(t), u = Ot({
+    matched: r,
+    matches: o,
+    query: s,
+    params: c,
+    key: a,
+    update: n,
+    [Jt]: !0
+  });
+  return new Proxy(u, {
+    get: (f, h, d) => h === "params" ? new Proxy(t.params, {
+      set(b, p, E) {
+        return n(p, E), !0;
       }
-    }) : Reflect.get(r, o, a)
+    }) : Reflect.get(f, h, d)
   });
 }
 function Ve(t, e, { exact: n } = {}) {
@@ -126,13 +134,13 @@ function Oe(t, { exact: e } = {}) {
     if (!Ve(n.route, t, { exact: e }))
       throw new Be(t, n.route.key);
   }
-  return Ee(n.route, r, { immediate: !0, deep: !0 }), n.route;
+  return Pe(n.route, r, { immediate: !0, deep: !0 }), n.route;
 }
-const Jt = Symbol();
-function gt() {
-  return st(Jt, 0);
+const Kt = Symbol();
+function yt() {
+  return ct(Kt, 0);
 }
-class et {
+class nt {
   constructor() {
     $(this, "onBeforeRouteEnter", /* @__PURE__ */ new Set());
     $(this, "onBeforeRouteUpdate", /* @__PURE__ */ new Set());
@@ -151,60 +159,60 @@ class G extends Error {
     this.to = n;
   }
 }
-class ht extends Error {
+class lt extends Error {
   constructor(n) {
     super(`Routing action rejected: ${n}`);
     $(this, "type");
     this.type = n;
   }
 }
-function W(t) {
+function F(t) {
   return Array.isArray(t) ? t : [t];
 }
 function _e(t, e) {
-  const n = new et();
+  const n = new nt();
   return t.matches.forEach((r, o) => {
-    r.onBeforeRouteEnter && yt(t, e, o) && W(r.onBeforeRouteEnter).forEach((a) => n.onBeforeRouteEnter.add(a)), r.onBeforeRouteUpdate && wt(t, e, o) && W(r.onBeforeRouteUpdate).forEach((a) => n.onBeforeRouteUpdate.add(a));
+    r.onBeforeRouteEnter && gt(t, e, o) && F(r.onBeforeRouteEnter).forEach((a) => n.onBeforeRouteEnter.add(a)), r.onBeforeRouteUpdate && wt(t, e, o) && F(r.onBeforeRouteUpdate).forEach((a) => n.onBeforeRouteUpdate.add(a));
   }), e.matches.forEach((r, o) => {
-    r.onBeforeRouteLeave && vt(t, e, o) && W(r.onBeforeRouteLeave).forEach((a) => n.onBeforeRouteLeave.add(a));
+    r.onBeforeRouteLeave && vt(t, e, o) && F(r.onBeforeRouteLeave).forEach((a) => n.onBeforeRouteLeave.add(a));
   }), n;
 }
 function qe(t, e) {
-  const n = new et();
+  const n = new nt();
   return t.matches.forEach((r, o) => {
-    r.onAfterRouteEnter && yt(t, e, o) && W(r.onAfterRouteEnter).forEach((a) => n.onAfterRouteEnter.add(a)), r.onAfterRouteUpdate && wt(t, e, o) && W(r.onAfterRouteUpdate).forEach((a) => n.onAfterRouteUpdate.add(a));
+    r.onAfterRouteEnter && gt(t, e, o) && F(r.onAfterRouteEnter).forEach((a) => n.onAfterRouteEnter.add(a)), r.onAfterRouteUpdate && wt(t, e, o) && F(r.onAfterRouteUpdate).forEach((a) => n.onAfterRouteUpdate.add(a));
   }), e.matches.forEach((r, o) => {
-    r.onAfterRouteLeave && vt(t, e, o) && W(r.onAfterRouteLeave).forEach((a) => n.onAfterRouteLeave.add(a));
+    r.onAfterRouteLeave && vt(t, e, o) && F(r.onAfterRouteLeave).forEach((a) => n.onAfterRouteLeave.add(a));
   }), n;
 }
 function De() {
   const t = (s) => {
-    throw new ht(s);
+    throw new lt(s);
   }, e = (...s) => {
     throw new G(s);
   }, n = (s, c, u) => {
-    if (I(s)) {
+    if (W(s)) {
       const d = c ?? {};
       throw new G([s, { ...d, replace: !0 }]);
     }
-    const f = c, R = u ?? {};
-    throw new G([s, f, { ...R, replace: !0 }]);
+    const f = c, h = u ?? {};
+    throw new G([s, f, { ...h, replace: !0 }]);
   }, r = () => {
     throw new Ut();
   };
   async function o({ to: s, from: c, hooks: u }) {
-    const { global: f, component: R } = u, d = _e(s, c), A = [
+    const { global: f, component: h } = u, d = _e(s, c), b = [
       ...f.onBeforeRouteEnter,
       ...d.onBeforeRouteEnter,
       ...f.onBeforeRouteUpdate,
       ...d.onBeforeRouteUpdate,
-      ...R.onBeforeRouteUpdate,
+      ...h.onBeforeRouteUpdate,
       ...f.onBeforeRouteLeave,
       ...d.onBeforeRouteLeave,
-      ...R.onBeforeRouteLeave
+      ...h.onBeforeRouteLeave
     ];
     try {
-      const p = A.map((S) => S(s, {
+      const p = b.map((E) => E(s, {
         from: c,
         reject: t,
         push: e,
@@ -218,7 +226,7 @@ function De() {
           status: "PUSH",
           to: p.to
         };
-      if (p instanceof ht)
+      if (p instanceof lt)
         return {
           status: "REJECT",
           type: p.type
@@ -234,19 +242,19 @@ function De() {
     };
   }
   async function a({ to: s, from: c, hooks: u }) {
-    const { global: f, component: R } = u, d = qe(s, c), A = [
-      ...R.onAfterRouteLeave,
+    const { global: f, component: h } = u, d = qe(s, c), b = [
+      ...h.onAfterRouteLeave,
       ...d.onAfterRouteLeave,
       ...f.onAfterRouteLeave,
-      ...R.onAfterRouteUpdate,
+      ...h.onAfterRouteUpdate,
       ...d.onAfterRouteUpdate,
       ...f.onAfterRouteUpdate,
-      ...R.onAfterRouteEnter,
+      ...h.onAfterRouteEnter,
       ...d.onAfterRouteEnter,
       ...f.onAfterRouteEnter
     ];
     try {
-      const p = A.map((S) => S(s, {
+      const p = b.map((E) => E(s, {
         from: c,
         reject: t,
         push: e,
@@ -259,7 +267,7 @@ function De() {
           status: "PUSH",
           to: p.to
         };
-      if (p instanceof ht)
+      if (p instanceof lt)
         return {
           status: "REJECT",
           type: p.type
@@ -275,7 +283,7 @@ function De() {
     runAfterRouteHooks: a
   };
 }
-const yt = (t, e, n) => {
+const gt = (t, e, n) => {
   const r = t.matches, o = (e == null ? void 0 : e.matches) ?? [];
   return r.length < n || r[n] !== o[n];
 }, vt = (t, e, n) => {
@@ -286,7 +294,7 @@ function Bt(t) {
   switch (t) {
     case "onBeforeRouteEnter":
     case "onAfterRouteEnter":
-      return yt;
+      return gt;
     case "onBeforeRouteUpdate":
     case "onAfterRouteUpdate":
       return wt;
@@ -299,8 +307,8 @@ function Bt(t) {
 }
 class Me {
   constructor() {
-    $(this, "global", new et());
-    $(this, "component", new et());
+    $(this, "global", new nt());
+    $(this, "component", new nt());
   }
   addBeforeRouteHook({ lifecycle: e, timing: n, depth: r, hook: o }) {
     const a = Bt(e), s = this[n][e], c = (u, f) => {
@@ -317,7 +325,7 @@ class Me {
     return s.add(c), () => s.delete(c);
   }
 }
-const Kt = Symbol();
+const Qt = Symbol();
 function Te() {
   const t = new Me();
   return {
@@ -330,25 +338,25 @@ function Te() {
     hooks: t
   };
 }
-function Qt() {
-  const t = st(Kt);
+function Gt() {
+  const t = ct(Qt);
   if (!t)
     throw new mt();
   return t;
 }
-function Gt(t) {
+function zt(t) {
   return (e) => {
-    const n = gt(), o = Qt().addBeforeRouteHook({ lifecycle: t, hook: e, depth: n, timing: "component" });
-    return Ot(o), o;
+    const n = yt(), o = Gt().addBeforeRouteHook({ lifecycle: t, hook: e, depth: n, timing: "component" });
+    return _t(o), o;
   };
 }
 function Et(t) {
   return (e) => {
-    const n = gt(), o = Qt().addAfterRouteHook({ lifecycle: t, hook: e, depth: n, timing: "component" });
-    return Ot(o), o;
+    const n = yt(), o = Gt().addAfterRouteHook({ lifecycle: t, hook: e, depth: n, timing: "component" });
+    return _t(o), o;
   };
 }
-const In = Gt("onBeforeRouteUpdate"), Jn = Gt("onBeforeRouteLeave"), Kn = Et("onAfterRouteEnter"), Qn = Et("onAfterRouteUpdate"), Gn = Et("onAfterRouteLeave"), We = ["href"], Fe = /* @__PURE__ */ it({
+const Jn = zt("onBeforeRouteUpdate"), Kn = zt("onBeforeRouteLeave"), Qn = Et("onAfterRouteEnter"), Gn = Et("onAfterRouteUpdate"), zn = Et("onAfterRouteLeave"), We = ["href"], Fe = /* @__PURE__ */ Y({
   __name: "routerLink",
   props: {
     to: { type: [String, Function] },
@@ -356,9 +364,9 @@ const In = Gt("onBeforeRouteUpdate"), Jn = Gt("onBeforeRouteLeave"), Kn = Et("on
     replace: { type: Boolean }
   },
   setup(t) {
-    const e = t, n = Rt(), r = H(() => I(e.to) ? e.to : e.to(n.resolve)), o = H(() => {
-      const { to: d, ...A } = e;
-      return A;
+    const e = t, n = Rt(), r = H(() => W(e.to) ? e.to : e.to(n.resolve)), o = H(() => {
+      const { to: d, ...b } = e;
+      return b;
     }), { href: a, isMatch: s, isExactMatch: c } = He(r), u = H(() => ({
       "router-link--match": s.value,
       "router-link--exact-match": c.value
@@ -366,23 +374,23 @@ const In = Gt("onBeforeRouteUpdate"), Jn = Gt("onBeforeRouteLeave"), Kn = Et("on
       const { host: d } = new URL(r.value, window.location.origin);
       return d !== window.location.host;
     });
-    function R(d) {
+    function h(d) {
       d.preventDefault(), n.push(a.value, o.value);
     }
-    return (d, A) => (_t(), be("a", {
+    return (d, b) => (qt(), be("a", {
       href: r.value,
-      class: Pe(["router-link", u.value]),
-      onClick: R
+      class: Se(["router-link", u.value]),
+      onClick: h
     }, [
-      qt(d.$slots, "default", Dt(Mt({ resolved: r.value, isMatch: Z(s), isExactMatch: Z(c), isExternal: f.value })))
+      Dt(d.$slots, "default", Mt(Tt({ resolved: r.value, isMatch: tt(s), isExactMatch: tt(c), isExternal: f.value })))
     ], 10, We));
   }
 });
-function zt(t) {
+function Yt(t) {
   return "children" in t;
 }
 function Ie(t) {
-  return zt(t) && !("component" in t) && !("components" in t);
+  return Yt(t) && !("component" in t) && !("components" in t);
 }
 function Je(t) {
   return typeof t == "object" && t !== null && "component" in t;
@@ -390,14 +398,14 @@ function Je(t) {
 function Ke(t) {
   return typeof t == "object" && t !== null && "components" in t;
 }
-const Yt = /* @__PURE__ */ it({
+const Xt = /* @__PURE__ */ Y({
   __name: "routerView",
   props: {
     name: {}
   },
   setup(t) {
-    const { name: e = "default" } = t, n = Oe(), r = Ne(), o = gt();
-    Se(Jt, o + 1);
+    const { name: e = "default" } = t, n = Oe(), r = Ne(), o = yt();
+    ke(Kt, o + 1);
     const a = H(() => {
       if (r.value)
         return r.value.component;
@@ -405,26 +413,190 @@ const Yt = /* @__PURE__ */ it({
       if (!c)
         return null;
       const f = s(c)[e];
-      return f ? typeof f == "function" ? ke(f) : f : null;
+      return f ? typeof f == "function" ? xe(f) : f : null;
     });
     function s(c) {
       return Ke(c) ? c.components : Je(c) ? { default: c.component } : {};
     }
-    return (c, u) => qt(c.$slots, "default", Dt(Mt({ route: Z(n), component: a.value, rejection: Z(r) })), () => [
-      (_t(), xe(Ae(a.value)))
+    return (c, u) => Dt(c.$slots, "default", Mt(Tt({ route: tt(n), component: a.value, rejection: tt(r) })), () => [
+      (qt(), Ae(Le(a.value)))
     ]);
   }
 });
-function zn(t, e) {
-  return it({
+function Yn(t, e) {
+  return Y({
     name: "PropsWrapper",
     expose: [],
+    setup() {
+      const n = e();
+      return "then" in n ? () => et(Qe(t, n)) : () => et(t, n);
+    }
+  });
+}
+function Qe(t, e) {
+  return Y({
+    name: "AsyncPropsWrapper",
+    expose: [],
     async setup() {
-      const n = await e();
-      return () => Tt(t, n);
+      const n = await e;
+      return () => et(t, n);
     }
   });
 }
+const Zt = Symbol();
+function Pt(t) {
+  return Zt in t;
+}
+function Ge(t) {
+  return {
+    [Zt]: !0,
+    ...oe(t)
+  };
+}
+const J = "[", X = "]";
+function ze(t) {
+  return t !== String && t !== Boolean && t !== Number && t !== Date;
+}
+function Ye(t) {
+  return typeof t == "function" && ze(t);
+}
+function ut(t) {
+  return typeof t == "object" && "get" in t && typeof t.get == "function" && "set" in t && typeof t.set == "function";
+}
+function Xe(t) {
+  return ut(t) && t.defaultValue !== void 0;
+}
+function Xn(t, e) {
+  return oe(t, e);
+}
+function bt(t) {
+  return typeof t == "string" && t.length > 0;
+}
+function Ze(t, e) {
+  return t[e] ?? String;
+}
+const N = {
+  invalid: (t) => {
+    throw new I(t);
+  }
+}, tn = {
+  get: (t) => t,
+  set: (t, { invalid: e }) => {
+    if (typeof t != "string")
+      throw e();
+    return t;
+  }
+}, te = {
+  get: (t, { invalid: e }) => {
+    if (t === "true")
+      return !0;
+    if (t === "false")
+      return !1;
+    throw e();
+  },
+  set: (t, { invalid: e }) => {
+    if (typeof t != "boolean")
+      throw e();
+    return t.toString();
+  }
+}, ee = {
+  get: (t, { invalid: e }) => {
+    const n = Number(t);
+    if (isNaN(n))
+      throw e();
+    return n;
+  },
+  set: (t, { invalid: e }) => {
+    if (typeof t != "number")
+      throw e();
+    return t.toString();
+  }
+}, ne = {
+  get: (t, { invalid: e }) => {
+    const n = new Date(t);
+    if (isNaN(n.getTime()))
+      throw e();
+    return n;
+  },
+  set: (t, { invalid: e }) => {
+    if (typeof t != "object" || !(t instanceof Date))
+      throw e();
+    return t.toISOString();
+  }
+}, re = {
+  get: (t, { invalid: e }) => {
+    try {
+      return JSON.parse(t);
+    } catch {
+      throw e();
+    }
+  },
+  set: (t, { invalid: e }) => {
+    try {
+      return JSON.stringify(t);
+    } catch {
+      throw e();
+    }
+  }
+};
+function St(t, e) {
+  if (t === void 0 || !bt(t)) {
+    if (Xe(e))
+      return e.defaultValue;
+    if (Pt(e))
+      return;
+    throw new I();
+  }
+  if (e === String)
+    return tn.get(t, N);
+  if (e === Boolean)
+    return te.get(t, N);
+  if (e === Number)
+    return ee.get(t, N);
+  if (e === Date)
+    return ne.get(t, N);
+  if (e === JSON)
+    return re.get(t, N);
+  if (Ye(e))
+    return e(t, N);
+  if (ut(e))
+    return e.get(t, N);
+  if (e instanceof RegExp) {
+    if (e.test(t))
+      return t;
+    throw new I();
+  }
+  return t;
+}
+function kt(t, e) {
+  if (t === void 0) {
+    if (Pt(e))
+      return "";
+    throw new I();
+  }
+  if (e === Boolean)
+    return te.set(t, N);
+  if (e === Number)
+    return ee.set(t, N);
+  if (e === Date)
+    return ne.set(t, N);
+  if (e === JSON)
+    return re.set(t, N);
+  if (ut(e))
+    return e.set(t, N);
+  try {
+    return t.toString();
+  } catch {
+    throw new I();
+  }
+}
+function oe(t, e) {
+  return ut(t) ? { ...t, defaultValue: e ?? t.defaultValue } : {
+    get: (n) => St(n, t),
+    set: (n) => kt(n, t),
+    defaultValue: e
+  };
+}
 function _() {
   return _ = Object.assign ? Object.assign.bind() : function(t) {
     for (var e = 1; e < arguments.length; e++) {
@@ -439,12 +611,12 @@ var L;
 (function(t) {
   t.Pop = "POP", t.Push = "PUSH", t.Replace = "REPLACE";
 })(L || (L = {}));
-var J = process.env.NODE_ENV !== "production" ? function(t) {
+var K = process.env.NODE_ENV !== "production" ? function(t) {
   return Object.freeze(t);
 } : function(t) {
   return t;
 };
-function D(t, e) {
+function M(t, e) {
   if (!t) {
     typeof console < "u" && console.warn(e);
     try {
@@ -453,13 +625,13 @@ function D(t, e) {
     }
   }
 }
-var nt = "beforeunload", Qe = "hashchange", Xt = "popstate";
+var rt = "beforeunload", en = "hashchange", ae = "popstate";
 function Ht(t) {
   t === void 0 && (t = {});
   var e = t, n = e.window, r = n === void 0 ? document.defaultView : n, o = r.history;
   function a() {
-    var h = r.location, i = h.pathname, l = h.search, v = h.hash, w = o.state || {};
-    return [w.idx, J({
+    var m = r.location, i = m.pathname, l = m.search, v = m.hash, w = o.state || {};
+    return [w.idx, K({
       pathname: i,
       search: l,
       hash: v,
@@ -472,19 +644,19 @@ function Ht(t) {
     if (s)
       p.call(s), s = null;
     else {
-      var h = L.Pop, i = a(), l = i[0], v = i[1];
+      var m = L.Pop, i = a(), l = i[0], v = i[1];
       if (p.length)
         if (l != null) {
-          var w = R - l;
+          var w = h - l;
           w && (s = {
-            action: h,
+            action: m,
             location: v,
             retry: function() {
-              E(w * -1);
+              P(w * -1);
             }
-          }, E(w));
+          }, P(w));
         } else
-          process.env.NODE_ENV !== "production" && D(
+          process.env.NODE_ENV !== "production" && M(
             !1,
             // TODO: Write up a doc that explains our blocking strategy in
             // detail and link to it here so people can understand better what
@@ -492,117 +664,117 @@ function Ht(t) {
             "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
-        U(h);
+        U(m);
     }
   }
-  r.addEventListener(Xt, c);
-  var u = L.Pop, f = a(), R = f[0], d = f[1], A = K(), p = K();
-  R == null && (R = 0, o.replaceState(_({}, o.state, {
-    idx: R
+  r.addEventListener(ae, c);
+  var u = L.Pop, f = a(), h = f[0], d = f[1], b = Q(), p = Q();
+  h == null && (h = 0, o.replaceState(_({}, o.state, {
+    idx: h
   }), ""));
-  function S(h) {
-    return typeof h == "string" ? h : M(h);
+  function E(m) {
+    return typeof m == "string" ? m : T(m);
   }
-  function j(h, i) {
-    return i === void 0 && (i = null), J(_({
+  function j(m, i) {
+    return i === void 0 && (i = null), K(_({
       pathname: d.pathname,
       hash: "",
       search: ""
-    }, typeof h == "string" ? z(h) : h, {
+    }, typeof m == "string" ? z(m) : m, {
       state: i,
-      key: ot()
+      key: at()
     }));
   }
-  function V(h, i) {
+  function V(m, i) {
     return [{
-      usr: h.state,
-      key: h.key,
+      usr: m.state,
+      key: m.key,
       idx: i
-    }, S(h)];
+    }, E(m)];
   }
-  function B(h, i, l) {
+  function B(m, i, l) {
     return !p.length || (p.call({
-      action: h,
+      action: m,
       location: i,
       retry: l
     }), !1);
   }
-  function U(h) {
-    u = h;
+  function U(m) {
+    u = m;
     var i = a();
-    R = i[0], d = i[1], A.call({
+    h = i[0], d = i[1], b.call({
       action: u,
       location: d
     });
   }
-  function m(h, i) {
-    var l = L.Push, v = j(h, i);
+  function R(m, i) {
+    var l = L.Push, v = j(m, i);
     function w() {
-      m(h, i);
+      R(m, i);
     }
     if (B(l, v, w)) {
-      var k = V(v, R + 1), g = k[0], P = k[1];
+      var x = V(v, h + 1), y = x[0], k = x[1];
       try {
-        o.pushState(g, "", P);
+        o.pushState(y, "", k);
       } catch {
-        r.location.assign(P);
+        r.location.assign(k);
       }
       U(l);
     }
   }
-  function y(h, i) {
-    var l = L.Replace, v = j(h, i);
+  function g(m, i) {
+    var l = L.Replace, v = j(m, i);
     function w() {
-      y(h, i);
+      g(m, i);
     }
     if (B(l, v, w)) {
-      var k = V(v, R), g = k[0], P = k[1];
-      o.replaceState(g, "", P), U(l);
+      var x = V(v, h), y = x[0], k = x[1];
+      o.replaceState(y, "", k), U(l);
     }
   }
-  function E(h) {
-    o.go(h);
+  function P(m) {
+    o.go(m);
   }
-  var b = {
+  var S = {
     get action() {
       return u;
     },
     get location() {
       return d;
     },
-    createHref: S,
-    push: m,
-    replace: y,
-    go: E,
+    createHref: E,
+    push: R,
+    replace: g,
+    go: P,
     back: function() {
-      E(-1);
+      P(-1);
     },
     forward: function() {
-      E(1);
+      P(1);
     },
     listen: function(i) {
-      return A.push(i);
+      return b.push(i);
     },
     block: function(i) {
       var l = p.push(i);
-      return p.length === 1 && r.addEventListener(nt, rt), function() {
-        l(), p.length || r.removeEventListener(nt, rt);
+      return p.length === 1 && r.addEventListener(rt, ot), function() {
+        l(), p.length || r.removeEventListener(rt, ot);
       };
     }
   };
-  return b;
+  return S;
 }
-function Ge(t) {
+function nn(t) {
   t === void 0 && (t = {});
   var e = t, n = e.window, r = n === void 0 ? document.defaultView : n, o = r.history;
   function a() {
-    var i = z(r.location.hash.substr(1)), l = i.pathname, v = l === void 0 ? "/" : l, w = i.search, k = w === void 0 ? "" : w, g = i.hash, P = g === void 0 ? "" : g, x = o.state || {};
-    return [x.idx, J({
+    var i = z(r.location.hash.substr(1)), l = i.pathname, v = l === void 0 ? "/" : l, w = i.search, x = w === void 0 ? "" : w, y = i.hash, k = y === void 0 ? "" : y, A = o.state || {};
+    return [A.idx, K({
       pathname: v,
-      search: k,
-      hash: P,
-      state: x.usr || null,
-      key: x.key || "default"
+      search: x,
+      hash: k,
+      state: A.usr || null,
+      key: A.key || "default"
     })];
   }
   var s = null;
@@ -613,16 +785,16 @@ function Ge(t) {
       var i = L.Pop, l = a(), v = l[0], w = l[1];
       if (p.length)
         if (v != null) {
-          var k = R - v;
-          k && (s = {
+          var x = h - v;
+          x && (s = {
             action: i,
             location: w,
             retry: function() {
-              b(k * -1);
+              S(x * -1);
             }
-          }, b(k));
+          }, S(x));
         } else
-          process.env.NODE_ENV !== "production" && D(
+          process.env.NODE_ENV !== "production" && M(
             !1,
             // TODO: Write up a doc that explains our blocking strategy in
             // detail and link to it here so people can understand better
@@ -630,18 +802,18 @@ function Ge(t) {
             "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
-        m(i);
+        R(i);
     }
   }
-  r.addEventListener(Xt, c), r.addEventListener(Qe, function() {
+  r.addEventListener(ae, c), r.addEventListener(en, function() {
     var i = a(), l = i[1];
-    M(l) !== M(d) && c();
+    T(l) !== T(d) && c();
   });
-  var u = L.Pop, f = a(), R = f[0], d = f[1], A = K(), p = K();
-  R == null && (R = 0, o.replaceState(_({}, o.state, {
-    idx: R
+  var u = L.Pop, f = a(), h = f[0], d = f[1], b = Q(), p = Q();
+  h == null && (h = 0, o.replaceState(_({}, o.state, {
+    idx: h
   }), ""));
-  function S() {
+  function E() {
     var i = document.querySelector("base"), l = "";
     if (i && i.getAttribute("href")) {
       var v = r.location.href, w = v.indexOf("#");
@@ -650,16 +822,16 @@ function Ge(t) {
     return l;
   }
   function j(i) {
-    return S() + "#" + (typeof i == "string" ? i : M(i));
+    return E() + "#" + (typeof i == "string" ? i : T(i));
   }
   function V(i, l) {
-    return l === void 0 && (l = null), J(_({
+    return l === void 0 && (l = null), K(_({
       pathname: d.pathname,
       hash: "",
       search: ""
     }, typeof i == "string" ? z(i) : i, {
       state: l,
-      key: ot()
+      key: at()
     }));
   }
   function B(i, l) {
@@ -676,43 +848,43 @@ function Ge(t) {
       retry: v
     }), !1);
   }
-  function m(i) {
+  function R(i) {
     u = i;
     var l = a();
-    R = l[0], d = l[1], A.call({
+    h = l[0], d = l[1], b.call({
       action: u,
       location: d
     });
   }
-  function y(i, l) {
+  function g(i, l) {
     var v = L.Push, w = V(i, l);
-    function k() {
-      y(i, l);
+    function x() {
+      g(i, l);
     }
-    if (process.env.NODE_ENV !== "production" && D(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(i) + ")"), U(v, w, k)) {
-      var g = B(w, R + 1), P = g[0], x = g[1];
+    if (process.env.NODE_ENV !== "production" && M(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.push(" + JSON.stringify(i) + ")"), U(v, w, x)) {
+      var y = B(w, h + 1), k = y[0], A = y[1];
       try {
-        o.pushState(P, "", x);
+        o.pushState(k, "", A);
       } catch {
-        r.location.assign(x);
+        r.location.assign(A);
       }
-      m(v);
+      R(v);
     }
   }
-  function E(i, l) {
+  function P(i, l) {
     var v = L.Replace, w = V(i, l);
-    function k() {
-      E(i, l);
+    function x() {
+      P(i, l);
     }
-    if (process.env.NODE_ENV !== "production" && D(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(i) + ")"), U(v, w, k)) {
-      var g = B(w, R), P = g[0], x = g[1];
-      o.replaceState(P, "", x), m(v);
+    if (process.env.NODE_ENV !== "production" && M(w.pathname.charAt(0) === "/", "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(i) + ")"), U(v, w, x)) {
+      var y = B(w, h), k = y[0], A = y[1];
+      o.replaceState(k, "", A), R(v);
     }
   }
-  function b(i) {
+  function S(i) {
     o.go(i);
   }
-  var h = {
+  var m = {
     get action() {
       return u;
     },
@@ -720,85 +892,85 @@ function Ge(t) {
       return d;
     },
     createHref: j,
-    push: y,
-    replace: E,
-    go: b,
+    push: g,
+    replace: P,
+    go: S,
     back: function() {
-      b(-1);
+      S(-1);
     },
     forward: function() {
-      b(1);
+      S(1);
     },
     listen: function(l) {
-      return A.push(l);
+      return b.push(l);
     },
     block: function(l) {
       var v = p.push(l);
-      return p.length === 1 && r.addEventListener(nt, rt), function() {
-        v(), p.length || r.removeEventListener(nt, rt);
+      return p.length === 1 && r.addEventListener(rt, ot), function() {
+        v(), p.length || r.removeEventListener(rt, ot);
       };
     }
   };
-  return h;
+  return m;
 }
 function Nt(t) {
   t === void 0 && (t = {});
-  var e = t, n = e.initialEntries, r = n === void 0 ? ["/"] : n, o = e.initialIndex, a = r.map(function(m) {
-    var y = J(_({
+  var e = t, n = e.initialEntries, r = n === void 0 ? ["/"] : n, o = e.initialIndex, a = r.map(function(R) {
+    var g = K(_({
       pathname: "/",
       search: "",
       hash: "",
       state: null,
-      key: ot()
-    }, typeof m == "string" ? z(m) : m));
-    return process.env.NODE_ENV !== "production" && D(y.pathname.charAt(0) === "/", "Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: " + JSON.stringify(m) + ")"), y;
-  }), s = $t(o ?? a.length - 1, 0, a.length - 1), c = L.Pop, u = a[s], f = K(), R = K();
-  function d(m) {
-    return typeof m == "string" ? m : M(m);
-  }
-  function A(m, y) {
-    return y === void 0 && (y = null), J(_({
+      key: at()
+    }, typeof R == "string" ? z(R) : R));
+    return process.env.NODE_ENV !== "production" && M(g.pathname.charAt(0) === "/", "Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: " + JSON.stringify(R) + ")"), g;
+  }), s = $t(o ?? a.length - 1, 0, a.length - 1), c = L.Pop, u = a[s], f = Q(), h = Q();
+  function d(R) {
+    return typeof R == "string" ? R : T(R);
+  }
+  function b(R, g) {
+    return g === void 0 && (g = null), K(_({
       pathname: u.pathname,
       search: "",
       hash: ""
-    }, typeof m == "string" ? z(m) : m, {
-      state: y,
-      key: ot()
+    }, typeof R == "string" ? z(R) : R, {
+      state: g,
+      key: at()
     }));
   }
-  function p(m, y, E) {
-    return !R.length || (R.call({
-      action: m,
-      location: y,
-      retry: E
+  function p(R, g, P) {
+    return !h.length || (h.call({
+      action: R,
+      location: g,
+      retry: P
     }), !1);
   }
-  function S(m, y) {
-    c = m, u = y, f.call({
+  function E(R, g) {
+    c = R, u = g, f.call({
       action: c,
       location: u
     });
   }
-  function j(m, y) {
-    var E = L.Push, b = A(m, y);
-    function h() {
-      j(m, y);
+  function j(R, g) {
+    var P = L.Push, S = b(R, g);
+    function m() {
+      j(R, g);
     }
-    process.env.NODE_ENV !== "production" && D(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.push(" + JSON.stringify(m) + ")"), p(E, b, h) && (s += 1, a.splice(s, a.length, b), S(E, b));
+    process.env.NODE_ENV !== "production" && M(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.push(" + JSON.stringify(R) + ")"), p(P, S, m) && (s += 1, a.splice(s, a.length, S), E(P, S));
   }
-  function V(m, y) {
-    var E = L.Replace, b = A(m, y);
-    function h() {
-      V(m, y);
+  function V(R, g) {
+    var P = L.Replace, S = b(R, g);
+    function m() {
+      V(R, g);
     }
-    process.env.NODE_ENV !== "production" && D(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.replace(" + JSON.stringify(m) + ")"), p(E, b, h) && (a[s] = b, S(E, b));
+    process.env.NODE_ENV !== "production" && M(u.pathname.charAt(0) === "/", "Relative pathnames are not supported in memory history.replace(" + JSON.stringify(R) + ")"), p(P, S, m) && (a[s] = S, E(P, S));
   }
-  function B(m) {
-    var y = $t(s + m, 0, a.length - 1), E = L.Pop, b = a[y];
-    function h() {
-      B(m);
+  function B(R) {
+    var g = $t(s + R, 0, a.length - 1), P = L.Pop, S = a[g];
+    function m() {
+      B(R);
     }
-    p(E, b, h) && (s = y, S(E, b));
+    p(P, S, m) && (s = g, E(P, S));
   }
   var U = {
     get index() {
@@ -820,11 +992,11 @@ function Nt(t) {
     forward: function() {
       B(1);
     },
-    listen: function(y) {
-      return f.push(y);
+    listen: function(g) {
+      return f.push(g);
     },
-    block: function(y) {
-      return R.push(y);
+    block: function(g) {
+      return h.push(g);
     }
   };
   return U;
@@ -832,10 +1004,10 @@ function Nt(t) {
 function $t(t, e, n) {
   return Math.min(Math.max(t, e), n);
 }
-function rt(t) {
+function ot(t) {
   t.preventDefault(), t.returnValue = "";
 }
-function K() {
+function Q() {
   var t = [];
   return {
     get length() {
@@ -855,10 +1027,10 @@ function K() {
     }
   };
 }
-function ot() {
+function at() {
   return Math.random().toString(36).substr(2, 8);
 }
-function M(t) {
+function T(t) {
   var e = t.pathname, n = e === void 0 ? "/" : e, r = t.search, o = r === void 0 ? "" : r, a = t.hash, s = a === void 0 ? "" : a;
   return o && o !== "?" && (n += o.charAt(0) === "?" ? o : "?" + o), s && s !== "#" && (n += s.charAt(0) === "#" ? s : "#" + s), n;
 }
@@ -872,240 +1044,84 @@ function z(t) {
   }
   return e;
 }
-function ze(t, e) {
-  const n = Le({ ...t }), r = (s) => {
+function rn(t, e) {
+  const n = Ot({ ...t }), r = (s) => {
     Object.assign(n, { ...s });
-  }, o = ct(n), a = je(o, e);
+  }, o = n, a = je(o, e);
   return {
     currentRoute: o,
     routerRoute: a,
     updateRoute: r
   };
 }
-class Ye extends Error {
+class on extends Error {
   constructor(e) {
     super(`Route disabled: "${e}"`);
   }
 }
-class Xe extends Error {
+class an extends Error {
   constructor(e) {
     super(`Route not found: "${e}"`);
   }
 }
-const Q = "[", Y = "]";
-function Ze(t) {
-  return t !== String && t !== Boolean && t !== Number && t !== Date;
-}
-function tn(t) {
-  return typeof t == "function" && Ze(t);
-}
-function ft(t) {
-  return typeof t == "object" && "get" in t && typeof t.get == "function" && "set" in t && typeof t.set == "function";
-}
-function Zt(t) {
-  return ft(t) ? t : {
-    get: (e) => St(e, t),
-    set: (e) => kt(e, t)
-  };
-}
-const te = Symbol();
-function bt(t) {
-  return te in t;
-}
-function en(t) {
-  return {
-    [te]: !0,
-    ...Zt(t)
-  };
-}
-function nn(t) {
-  return ft(t) && t.defaultValue !== void 0;
-}
-function Yn(t, e) {
-  return {
-    defaultValue: e,
-    ...Zt(t)
-  };
-}
-function Pt(t) {
-  return typeof t == "string" && t.length > 0;
-}
-function rn(t, e) {
-  return t[e] ?? String;
-}
-const N = {
-  invalid: (t) => {
-    throw new F(t);
-  }
-}, on = {
-  get: (t) => t,
-  set: (t, { invalid: e }) => {
-    if (typeof t != "string")
-      throw e();
-    return t;
-  }
-}, ee = {
-  get: (t, { invalid: e }) => {
-    if (t === "true")
-      return !0;
-    if (t === "false")
-      return !1;
-    throw e();
-  },
-  set: (t, { invalid: e }) => {
-    if (typeof t != "boolean")
-      throw e();
-    return t.toString();
-  }
-}, ne = {
-  get: (t, { invalid: e }) => {
-    const n = Number(t);
-    if (isNaN(n))
-      throw e();
-    return n;
-  },
-  set: (t, { invalid: e }) => {
-    if (typeof t != "number")
-      throw e();
-    return t.toString();
-  }
-}, re = {
-  get: (t, { invalid: e }) => {
-    const n = new Date(t);
-    if (isNaN(n.getTime()))
-      throw e();
-    return n;
-  },
-  set: (t, { invalid: e }) => {
-    if (typeof t != "object" || !(t instanceof Date))
-      throw e();
-    return t.toISOString();
-  }
-}, oe = {
-  get: (t, { invalid: e }) => {
-    try {
-      return JSON.parse(t);
-    } catch {
-      throw e();
-    }
-  },
-  set: (t, { invalid: e }) => {
-    try {
-      return JSON.stringify(t);
-    } catch {
-      throw e();
-    }
-  }
-};
-function St(t, e) {
-  if (t === void 0 || !Pt(t)) {
-    if (nn(e))
-      return e.defaultValue;
-    if (bt(e))
-      return;
-    throw new F();
-  }
-  if (e === String)
-    return on.get(t, N);
-  if (e === Boolean)
-    return ee.get(t, N);
-  if (e === Number)
-    return ne.get(t, N);
-  if (e === Date)
-    return re.get(t, N);
-  if (e === JSON)
-    return oe.get(t, N);
-  if (tn(e))
-    return e(t, N);
-  if (ft(e))
-    return e.get(t, N);
-  if (e instanceof RegExp) {
-    if (e.test(t))
-      return t;
-    throw new F();
-  }
-  return t;
-}
-function kt(t, e) {
-  if (t === void 0) {
-    if (bt(e))
-      return "";
-    throw new F();
-  }
-  if (e === Boolean)
-    return ee.set(t, N);
-  if (e === Number)
-    return ne.set(t, N);
-  if (e === Date)
-    return re.set(t, N);
-  if (e === JSON)
-    return oe.set(t, N);
-  if (ft(e))
-    return e.set(t, N);
-  try {
-    return t.toString();
-  } catch {
-    throw new F();
-  }
-}
-function an(t) {
+function sn(t) {
   const e = xt(t.path.toString());
   return new RegExp(`^${e}$`, "i");
 }
-function sn(t) {
+function cn(t) {
   const e = new URLSearchParams(t.query.toString());
-  return Array.from(e.entries()).filter(([, n]) => !se(n)).map(([n, r]) => new RegExp(`${n}=${xt(r)}(&|$)`, "i"));
+  return Array.from(e.entries()).filter(([, n]) => !ce(n)).map(([n, r]) => new RegExp(`${n}=${xt(r)}(&|$)`, "i"));
 }
 function xt(t) {
   return [
-    cn,
-    un
+    un,
+    fn
   ].reduce((e, n) => n(e), t);
 }
-const At = `\\${Q}\\?([\\w-_]+)\\${Y}`, ae = `\\${Q}([\\w-_]+)\\${Y}`;
-function cn(t) {
+const At = `\\${J}\\?([\\w-_]+)\\${X}`, se = `\\${J}([\\w-_]+)\\${X}`;
+function un(t) {
   return t.replace(new RegExp(At, "g"), ".*");
 }
-function se(t) {
+function ce(t) {
   return new RegExp(At, "g").test(t);
 }
-function un(t) {
-  return t.replace(new RegExp(ae, "g"), ".+");
-}
 function fn(t) {
-  const [e] = at(t, new RegExp(At, "g")), [n] = at(t, new RegExp(ae, "g"));
+  return t.replace(new RegExp(se, "g"), ".+");
+}
+function ln(t) {
+  const [e] = st(t, new RegExp(At, "g")), [n] = st(t, new RegExp(se, "g"));
   return e ?? n;
 }
-function at(t, e) {
-  return Array.from(t.matchAll(e)).flatMap(([, ...r]) => r.map((o) => Pt(o) ? o : ""));
+function st(t, e) {
+  return Array.from(t.matchAll(e)).flatMap(([, ...r]) => r.map((o) => bt(o) ? o : ""));
 }
-function ce(t, e, n) {
-  const r = ie(e, n), [o] = at(t, r);
+function ie(t, e, n) {
+  const r = ue(e, n), [o] = st(t, r);
   return o;
 }
-function ln(t, e) {
+function hn(t, e) {
   if (!e)
     return t;
-  const { name: n, param: r, value: o } = e, a = ie(t, n);
-  return at(t, a).reduce((c, u) => u === void 0 ? c : c.replace(u, () => kt(o, r)), t);
+  const { name: n, param: r, value: o } = e, a = ue(t, n);
+  return st(t, a).reduce((c, u) => u === void 0 ? c : c.replace(u, () => kt(o, r)), t);
 }
-function ie(t, e) {
+function ue(t, e) {
   const n = [
-    hn,
     pn,
+    dn,
     xt
   ].reduce((r, o) => o(r, e), t);
   return new RegExp(n, "g");
 }
-function hn(t, e) {
-  const n = new RegExp(`(\\${Q}\\?${e})\\${Y}`, "g");
+function pn(t, e) {
+  const n = new RegExp(`(\\${J}\\?${e})\\${X}`, "g");
   return t.replace(n, "(.*)");
 }
-function pn(t, e) {
-  const n = new RegExp(`(\\${Q}${e})\\${Y}`, "g");
+function dn(t, e) {
+  const n = new RegExp(`(\\${J}${e})\\${X}`, "g");
   return t.replace(n, "(.+)");
 }
-function ue(t, ...e) {
+function fe(t, ...e) {
   return e.reduce((n, r) => {
     if (!r)
       return n;
@@ -1113,42 +1129,42 @@ function ue(t, ...e) {
     return Object.keys(o).length === 0 ? n : n.includes("?") ? `${n}&${o}` : `${n}?${o}`;
   }, t);
 }
-function dn(t, e = {}) {
-  const { params: n = {}, query: r } = e, o = { ...t.path.params, ...t.query.params }, a = t.path.toString(), s = t.query.toString(), c = mn(a, o, n), u = Rn(s, o, n);
-  return ue(c, u, r);
-}
-function mn(t, e, n) {
-  return t.length ? Object.entries(e).reduce((r, [o, a]) => ln(r, { name: o, param: a, value: n[o] }), t) : t;
+function mn(t, e = {}) {
+  const { params: n = {}, query: r } = e, o = { ...t.path.params, ...t.query.params }, a = t.path.toString(), s = t.query.toString(), c = Rn(a, o, n), u = yn(s, o, n);
+  return fe(c, u, r);
 }
 function Rn(t, e, n) {
+  return t.length ? Object.entries(e).reduce((r, [o, a]) => hn(r, { name: o, param: a, value: n[o] }), t) : t;
+}
+function yn(t, e, n) {
   if (!t.length)
     return {};
   const r = new URLSearchParams(t);
   return Array.from(r.entries()).reduce((o, [a, s]) => {
-    const c = fn(s);
+    const c = ln(s);
     if (!c)
       return { ...o, [a]: s };
-    const f = kt(n[c], e[c]), R = n[c] === void 0 && f === "";
-    return se(s) && R ? o : { ...o, [a]: f };
+    const f = kt(n[c], e[c]), h = n[c] === void 0 && f === "";
+    return ce(s) && h ? o : { ...o, [a]: f };
   }, {});
 }
-function fe(t) {
+function le(t) {
   return (e, n, r) => {
-    if (I(e))
-      return ue(e, (n ?? {}).query);
+    if (W(e))
+      return fe(e, (n ?? {}).query);
     const o = n ?? {}, a = r ?? {}, s = t.find((u) => u.key === e);
     if (!s)
-      throw new Xe(String(e));
+      throw new an(String(e));
     if (s.matched.disabled)
-      throw new Ye(String(e));
-    return dn(s, {
+      throw new on(String(e));
+    return mn(s, {
       params: o,
       query: a.query
     });
   };
 }
-function T(t) {
-  return !t.startsWith("http") ? yn(t) : gn(t);
+function q(t) {
+  return !t.startsWith("http") ? vn(t) : gn(t);
 }
 function gn(t) {
   const { protocol: e, host: n, pathname: r, search: o, searchParams: a, hash: s } = new URL(t, t);
@@ -1161,7 +1177,7 @@ function gn(t) {
     hash: s
   };
 }
-function yn(t) {
+function vn(t) {
   const { pathname: e, search: n, searchParams: r, hash: o } = new URL(t, "https://localhost");
   return {
     pathname: e,
@@ -1170,36 +1186,36 @@ function yn(t) {
     hash: o
   };
 }
-function le(t) {
+function he(t) {
   const e = new URLSearchParams(t);
   return {
     get: (n) => e.get(n),
     getAll: (n) => e.getAll(n)
   };
 }
-const vn = (t, e) => {
+const wn = (t, e) => {
   try {
-    he(t, e);
+    pe(t, e);
   } catch {
     return !1;
   }
   return !0;
-}, he = (t, e) => {
-  const { pathname: n, search: r } = T(e);
+}, pe = (t, e) => {
+  const { pathname: n, search: r } = q(e);
   return {
-    ...wn(t.path, n),
-    ...En(t.query, r)
+    ...En(t.path, n),
+    ...Pn(t.query, r)
   };
 };
-function wn(t, e) {
+function En(t, e) {
   const n = {}, r = decodeURIComponent(e);
   for (const [o, a] of Object.entries(t.params)) {
-    const s = ce(r, t.toString(), o), c = St(s, a);
+    const s = ie(r, t.toString(), o), c = St(s, a);
     n[o] = c;
   }
   return n;
 }
-function En(t, e) {
+function Pn(t, e) {
   const n = {}, r = new URLSearchParams(e);
   for (const [o, a] of Object.entries(t.params)) {
     const s = r.get(o) ?? void 0, c = St(s, a);
@@ -1207,67 +1223,72 @@ function En(t, e) {
   }
   return n;
 }
-const bn = (t) => "name" in t.matched && !!t.matched.name, Pn = (t, e) => {
-  const { host: n } = T(e), { host: r } = T(t.path.toString());
+const bn = (t) => "name" in t.matched && !!t.matched.name, Sn = (t, e) => {
+  const { host: n } = q(e), { host: r } = q(t.path.toString());
   return n === r;
-}, Sn = (t, e) => {
-  const { pathname: n } = T(e);
-  return an(t).test(n);
 }, kn = (t, e) => {
-  const { search: n } = T(e);
-  return sn(t).every((o) => o.test(n));
+  const { pathname: n } = q(e);
+  return sn(t).test(n);
+}, xn = (t, e) => {
+  const { search: n } = q(e);
+  return cn(t).every((o) => o.test(n));
 };
-function xn(t) {
-  const { searchParams: e, pathname: n } = T(t), r = -1, o = 1;
+function An(t) {
+  const { searchParams: e, pathname: n } = q(t), r = -1, o = 1;
   return (a, s) => {
-    const c = Vt(a, e), u = jt(a, n), f = Vt(s, e), R = jt(s, n);
-    return c + u > f + R ? r : c + u < f + R ? o : a.depth > s.depth ? r : a.depth < s.depth ? o : 0;
+    const c = Vt(a, e), u = jt(a, n), f = Vt(s, e), h = jt(s, n);
+    return c + u > f + h ? r : c + u < f + h ? o : a.depth > s.depth ? r : a.depth < s.depth ? o : 0;
   };
 }
 function jt(t, e) {
-  const n = Object.entries(t.path.params).filter(([, o]) => bt(o)).map(([o]) => o), r = n.filter((o) => ce(e, t.path.toString(), o) === void 0);
+  const n = Object.entries(t.path.params).filter(([, o]) => Pt(o)).map(([o]) => o), r = n.filter((o) => ie(e, t.path.toString(), o) === void 0);
   return n.length - r.length;
 }
 function Vt(t, e) {
   const n = new URLSearchParams(t.query.toString()), r = Array.from(n.keys()), o = r.filter((a) => !e.has(a));
   return r.length - o.length;
 }
-const An = [
+const Ln = [
   bn,
-  Pn,
   Sn,
   kn,
-  vn
+  xn,
+  wn
 ];
-function pe(t, e) {
-  const n = xn(e), r = t.filter((u) => An.every((f) => f(u, e))).sort(n);
+function pt(t, e) {
+  const n = An(e), r = t.filter((u) => Ln.every((f) => f(u, e))).sort(n);
   if (r.length === 0)
     return;
-  const [o] = r, { search: a } = T(e), s = le(a), c = he(o, e);
-  return ct({
+  const [o] = r, { search: a } = q(e), s = he(a), c = pe(o, e);
+  return {
     matched: o.matched,
     matches: o.matches,
     key: o.key,
     query: s,
     params: c
-  });
+  };
 }
-function Ln(t) {
+function Un(t) {
   return (e, n = {}) => {
-    const o = fe(t)(e, n);
-    return pe(t, o);
+    const r = le(t);
+    if (W(e)) {
+      const a = r(e);
+      return pt(t, a);
+    }
+    const o = r(e, n);
+    return pt(t, o);
   };
 }
 function de() {
   return typeof window < "u" && typeof window.document < "u";
 }
-function Un({ mode: t, listener: e }) {
-  const n = Bn(t), r = (u, f) => {
+function Bn({ mode: t, listener: e }) {
+  const n = Hn(t), r = (u, f) => {
     if (f != null && f.replace)
       return n.replace(u);
     n.push(u);
   }, o = () => {
-    const u = M(n.location);
+    const u = T(n.location);
     return n.replace(u);
   };
   let a;
@@ -1283,7 +1304,7 @@ function Un({ mode: t, listener: e }) {
     }
   };
 }
-function Bn(t = "auto") {
+function Hn(t = "auto") {
   switch (t) {
     case "auto":
       return de() ? Ht() : Nt();
@@ -1292,43 +1313,43 @@ function Bn(t = "auto") {
     case "memory":
       return Nt();
     case "hash":
-      return Ge();
+      return nn();
     default:
       const e = t;
       throw new Error(`Switch is not exhaustive for mode: ${e}`);
   }
 }
-function Hn(t) {
-  return it(() => () => Tt("h1", t), {
+function Nn(t) {
+  return Y(() => () => et("h1", t), {
     name: t,
     props: []
   });
 }
 const Ct = Symbol();
-function Nn({
+function $n({
   rejections: t
 }) {
   const e = (s) => {
     const c = {
       ...t
     };
-    return pt(c[s] ?? Hn(s));
+    return ht(c[s] ?? Nn(s));
   }, n = (s) => {
-    const c = pt(e(s)), u = {
+    const c = ht(e(s)), u = {
       name: s,
       path: "",
       component: c,
       meta: {}
     };
-    return ct({
+    return {
       matched: u,
       matches: [u],
       key: s,
-      query: le(""),
+      query: he(""),
       params: {},
       [Ct]: !0
-    });
-  }, r = (s) => s[Ct] === !0, o = (s) => {
+    };
+  }, r = (s) => Ct in s, o = (s) => {
     if (!s) {
       a.value = null;
       return;
@@ -1343,56 +1364,58 @@ function Nn({
     isRejectionRoute: r
   };
 }
-class $n extends Error {
+class jn extends Error {
   constructor() {
     super("initialUrl must be set if window.location is unavailable");
   }
 }
-function jn(t) {
+function Vn(t) {
   if (t)
     return t;
-  if (de())
-    return window.location.toString();
-  throw new $n();
+  if (de()) {
+    const { pathname: e, search: n, hash: r } = q(window.location.toString());
+    return [e, n, r].join("");
+  }
+  throw new jn();
 }
-function Xn(t, e = {}) {
-  const n = fe(t), r = Un({
+function Zn(t, e = {}) {
+  const n = le(t), r = Bn({
     mode: e.historyMode,
     listener: () => {
-      const g = M(location);
-      p(g);
+      const y = T(location);
+      p(y);
     }
   }), { runBeforeRouteHooks: o, runAfterRouteHooks: a } = De(), {
     hooks: s,
     onBeforeRouteEnter: c,
     onAfterRouteUpdate: u,
     onBeforeRouteLeave: f,
-    onAfterRouteEnter: R,
+    onAfterRouteEnter: h,
     onBeforeRouteUpdate: d,
-    onAfterRouteLeave: A
+    onAfterRouteLeave: b
   } = Te();
-  async function p(g, { replace: P } = {}) {
+  async function p(y, { replace: k } = {}) {
     r.stopListening();
-    const x = pe(t, g) ?? y("NotFound"), C = { ...b }, q = await o({ to: x, from: C, hooks: s });
-    switch (q.status) {
+    const A = pt(t, y) ?? g("NotFound"), C = { ...S }, D = await o({ to: A, from: C, hooks: s });
+    switch (D.status) {
       case "ABORT":
         return;
       case "PUSH":
-        r.update(g, { replace: P }), await S(...q.to);
+        r.update(y, { replace: k }), await E(...D.to);
         return;
       case "REJECT":
-        r.update(g, { replace: P }), U(q.type), i(x);
+        r.update(y, { replace: k }), U(D.type), i(A);
         break;
       case "SUCCESS":
-        r.update(g, { replace: P }), U(null), i(x);
+        r.update(y, { replace: k }), U(null), i(A);
         break;
       default:
-        throw new Error(`Switch is not exhaustive for before hook response status: ${JSON.stringify(q)}`);
+        throw new Error(`Switch is not exhaustive for before hook response status: ${JSON.stringify(D)}`);
     }
-    const O = await a({ to: x, from: C, hooks: s });
+    const O = await a({ to: A, from: C, hooks: s });
     switch (O.status) {
       case "PUSH":
-        await S(...O.to);
+        await E(...O.to);
         break;
       case "REJECT":
         U(O.type);
@@ -1400,35 +1423,35 @@ function Xn(t, e = {}) {
       case "SUCCESS":
         break;
       default:
-        const X = O;
-        throw new Error(`Switch is not exhaustive for after hook response status: ${JSON.stringify(X)}`);
+        const Z = O;
+        throw new Error(`Switch is not exhaustive for after hook response status: ${JSON.stringify(Z)}`);
     }
     r.startListening();
   }
-  const S = (g, P, x) => {
-    if (I(g)) {
-      const X = { ...P }, ye = n(g, X);
-      return p(ye, { replace: X.replace });
+  const E = (y, k, A) => {
+    if (W(y)) {
+      const Z = { ...k }, ge = n(y, Z);
+      return p(ge, { replace: Z.replace });
     }
-    const C = { ...x }, O = n(g, P ?? {}, C);
+    const C = { ...A }, O = n(y, k ?? {}, C);
     return p(O, { replace: C.replace });
-  }, j = (g, P, x) => {
-    if (I(g)) {
-      const O = { ...P, replace: !0 };
-      return S(g, O);
+  }, j = (y, k, A) => {
+    if (W(y)) {
+      const O = { ...k, replace: !0 };
+      return E(y, O);
     }
-    const C = P ?? {}, q = { ...x, replace: !0 };
-    return S(g, C, q);
-  }, V = (g) => U(g), B = Ln(t), { setRejection: U, rejection: m, getRejectionRoute: y } = Nn(e), E = y("NotFound"), { currentRoute: b, routerRoute: h, updateRoute: i } = ze(E, S);
+    const C = k ?? {}, D = { ...A, replace: !0 };
+    return E(y, C, D);
+  }, V = (y) => U(y), B = Un(t), { setRejection: U, rejection: R, getRejectionRoute: g } = $n(e), P = g("NotFound"), { currentRoute: S, routerRoute: m, updateRoute: i } = rn(P, E);
   r.startListening();
-  const l = jn(e.initialUrl), v = p(l, { replace: !0 });
-  function w(g) {
-    g.component("RouterView", Yt), g.component("RouterLink", Fe), g.provide(Wt, k), g.provide(Ft, m), g.provide(Kt, s);
+  const l = Vn(e.initialUrl), v = p(l, { replace: !0 });
+  function w(y) {
+    y.component("RouterView", Xt), y.component("RouterLink", Fe), y.provide(Wt, x), y.provide(Ft, R), y.provide(Qt, s);
   }
-  const k = {
-    route: h,
+  const x = {
+    route: m,
     resolve: n,
-    push: S,
+    push: E,
     replace: j,
     reject: V,
     find: B,
@@ -1441,19 +1464,19 @@ function Xn(t, e = {}) {
     onBeforeRouteEnter: c,
     onAfterRouteUpdate: u,
     onBeforeRouteLeave: f,
-    onAfterRouteEnter: R,
+    onAfterRouteEnter: h,
     onBeforeRouteUpdate: d,
-    onAfterRouteLeave: A
+    onAfterRouteLeave: b
   };
-  return k;
+  return x;
 }
 function me(t, e) {
-  const n = new RegExp(`\\${Q}\\??([\\w-_]+)\\${Y}`, "g");
+  const n = new RegExp(`\\${J}\\??([\\w-_]+)\\${X}`, "g");
   return Array.from(t.matchAll(n)).reduce((o, [a, s]) => {
-    const c = a.startsWith(`${Q}?`), u = rn(e, s);
+    const c = a.startsWith(`${J}?`), u = Ze(e, s);
     if (s in o)
-      throw new ut(s);
-    return o[s] = c ? en(u) : u, o;
+      throw new it(s);
+    return o[s] = c ? Ge(u) : u, o;
   }, {});
 }
 function Re(t, e) {
@@ -1473,10 +1496,10 @@ function Lt(t, e) {
     hasDuplicates: !1
   };
 }
-function Vn(t, e) {
+function Cn(t, e) {
   const { hasDuplicates: n, key: r } = Lt(t.params, e.params);
   if (n)
-    throw new ut(r);
+    throw new it(r);
   return Re(`${t.path}${e.path}`, { ...t.params, ...e.params });
 }
 function dt(t, e) {
@@ -1486,36 +1509,36 @@ function dt(t, e) {
     toString: () => t
   };
 }
-function Cn(t, e) {
+function On(t, e) {
   const { hasDuplicates: n, key: r } = Lt(t.params, e.params);
   if (n)
-    throw new ut(r);
-  const o = [t.query, e.query].filter(Pt).join("&");
+    throw new it(r);
+  const o = [t.query, e.query].filter(bt).join("&");
   return dt(o, { ...t.params, ...e.params });
 }
-function ge(t) {
+function ye(t) {
   return typeof t == "object" && t !== null && !Array.isArray(t);
 }
-function On(t) {
-  return ge(t) && typeof t.path == "string";
-}
 function _n(t) {
-  return On(t) ? t : Re(t, {});
+  return ye(t) && typeof t.path == "string";
 }
 function qn(t) {
-  return ge(t) && typeof t.query == "string";
+  return _n(t) ? t : Re(t, {});
 }
 function Dn(t) {
-  return t === void 0 ? dt("", {}) : qn(t) ? t : dt(t, {});
+  return ye(t) && typeof t.query == "string";
 }
-function Zn(t) {
+function Mn(t) {
+  return t === void 0 ? dt("", {}) : Dn(t) ? t : dt(t, {});
+}
+function tr(t) {
   const e = t.reduce((n, r) => {
-    const o = Mn(r);
-    return zt(r) && n.push(...r.children.map((a) => ({
+    const o = Tn(r);
+    return Yt(r) && n.push(...r.children.map((a) => ({
       ...a,
       key: It(o.key, a.key),
-      path: Vn(o.path, a.path),
-      query: Cn(o.query, a.query),
+      path: Cn(o.path, a.path),
+      query: On(o.query, a.query),
       matches: [o.matched, ...a.matches],
       depth: a.depth + 1
     }))), n.push(o), n;
@@ -1523,48 +1546,49 @@ function Zn(t) {
   return e.forEach(({ path: n, query: r }) => {
     const { hasDuplicates: o, key: a } = Lt(n.params, r.params);
     if (o)
-      throw new ut(a);
+      throw new it(a);
   }), e;
 }
-function Mn(t) {
-  const e = Tn(t), n = _n(t.path), r = Dn(t.query), o = pt({ meta: {}, ...e });
+function Tn(t) {
+  const e = Wn(t), n = qn(t.path), r = Mn(t.query), o = ht({ meta: {}, ...e });
   return {
     matched: o,
     matches: [o],
-    key: t.name,
+    key: t.name ?? "",
     path: n,
     query: r,
     depth: 1,
     disabled: t.disabled ?? !1
   };
 }
-function Tn(t) {
-  return Ie(t) ? { ...t, component: Yt } : t;
+function Wn(t) {
+  return Ie(t) ? { ...t, component: Xt } : t;
 }
 export {
-  ut as DuplicateParamsError,
+  it as DuplicateParamsError,
   Fe as RouterLink,
   mt as RouterNotInstalledError,
-  Yt as RouterView,
+  Xt as RouterView,
   Be as UseRouteInvalidError,
-  zn as component,
-  Xn as createRouter,
-  Zn as createRoutes,
-  ft as isParamGetSet,
-  tn as isParamGetter,
-  nn as isParamWithDefault,
-  zt as isParentRoute,
+  Yn as component,
+  oe as createParam,
+  Zn as createRouter,
+  tr as createRoutes,
+  ut as isParamGetSet,
+  Ye as isParamGetter,
+  Xe as isParamWithDefault,
+  Yt as isParentRoute,
   Ie as isParentRouteWithoutComponent,
   Ve as isRoute,
   Je as isRouteWithComponent,
   Ke as isRouteWithComponents,
-  Kn as onAfterRouteEnter,
-  Qn as onAfterRouteLeave,
-  Gn as onAfterRouteUpdate,
-  In as onBeforeRouteLeave,
-  Jn as onBeforeRouteUpdate,
-  Y as paramEnd,
-  Q as paramStart,
+  Qn as onAfterRouteEnter,
+  Gn as onAfterRouteLeave,
+  zn as onAfterRouteUpdate,
+  Jn as onBeforeRouteLeave,
+  Kn as onBeforeRouteUpdate,
+  X as paramEnd,
+  J as paramStart,
   Re as path,
   dt as query,
   Wt as routerInjectionKey,
@@ -1573,5 +1597,5 @@ export {
   Ne as useRejection,
   Oe as useRoute,
   Rt as useRouter,
-  Yn as withDefault
+  Xn as withDefault
 };