vitarx-router 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/vitarx-router.d.ts

@@ -361,7 +361,7 @@ export declare interface Route<WIDGET extends AllowedRouteWidget = AllowedRouteW
 /**
  * 路由索引
  */
-export declare type RouteIndex = RoutePath | RouteName | VitarxRouterRouteIndexTyped;
+export declare type RouteIndex = VitarxRouterRouteIndexTyped;
 
 /**
  * 路由匹配的详情数据

package/dist/vitarx-router.js

@@ -5,12 +5,30 @@ var H = (e) => {
 var K = (e, t, i) => t in e ? q(e, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : e[t] = i;
 var u = (e, t, i) => K(e, typeof t != "symbol" ? t + "" : t, i), I = (e, t, i) => t.has(e) || H("Cannot " + i);
 var f = (e, t, i) => (I(e, t, "read from private field"), i ? i.call(e) : t.get(e)), _ = (e, t, i) => t.has(e) ? H("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, i), v = (e, t, i, n) => (I(e, t, "write to private field"), n ? n.call(e, i) : t.set(e, i), i);
-import { reactive as J, shallowReactive as Q, markRaw as k, createElement as V, LazyWidget as X, deepClone as Z, deepEqual as S, Widget as M, shallowRef as N, inject as tt, provide as et, watch as it, Fragment as nt, Computed as L, isString as st } from "vitarx";
+import { reactive as J, shallowReactive as Q, markRaw as k, createElement as V, LazyWidget as X, deepClone as Z, isDeepEqual as S, Widget as M, shallowRef as N, inject as tt, provide as et, watch as it, Fragment as nt, Computed as L, isString as st } from "vitarx";
 var p = /* @__PURE__ */ ((e) => (e[e.success = 0] = "success", e[e.aborted = 1] = "aborted", e[e.cancelled = 2] = "cancelled", e[e.duplicated = 3] = "duplicated", e[e.not_matched = 4] = "not_matched", e[e.exception = 5] = "exception", e))(p || {});
+const rt = ["path", "hash", "index", "fullPath"];
+function ot(e, t) {
+  at(e.matched, t.matched), j(e.params, t.params), j(e.query, t.query), j(e.meta, t.meta);
+  for (const i of rt)
+    e[i] !== t[i] && (e[i] = t[i]);
+}
+function at(e, t) {
+  for (let i = 0; i < t.length; i++)
+    e[i] !== t[i] && (e[i] = t[i]);
+  e.length > t.length && (e.length = t.length);
+}
+function j(e, t) {
+  const i = Object.keys(e), n = Object.keys(t);
+  for (const s of n)
+    Object.prototype.hasOwnProperty.call(t, s) && (e[s] = t[s]);
+  for (const s in i)
+    s in t || delete e[s];
+}
 function B(e) {
   return typeof e == "boolean" || typeof e == "function" || typeof e == "object" && e !== null;
 }
-function rt(e) {
+function ct(e) {
   if (e.widget === void 0) return;
   if (!("injectProps" in e)) {
     e.injectProps = W(e, !0);
@@ -18,7 +36,7 @@ function rt(e) {
   }
   const t = e.injectProps;
   if (typeof t == "object")
-    ot(t) ? at(e, t) : ct(e, t);
+    ht(t) ? ut(e, t) : lt(e, t);
   else if (B(t))
     e.injectProps = W(e, t);
   else
@@ -26,16 +44,16 @@ function rt(e) {
       `[Vitarx.Router][TYPE_ERROR]：${e.path} 路由线路配置的 injectProps 类型有误，它可以是布尔值、函数，亦或是一个{string:any}类型的对象。`
     );
 }
-function ot(e) {
+function ht(e) {
   return Object.keys(e).length === 1 && "default" in e;
 }
-function at(e, t) {
+function ut(e, t) {
   if (!B(t.default))
     throw new TypeError(
       `[Vitarx.Router][TYPE_ERROR]：${e.path} 路由线路配置的 injectProps.default 类型有误，它可以是布尔值、函数，亦或是一个{string:any}类型的对象。`
     );
 }
-function ct(e, t) {
+function lt(e, t) {
   for (const i of Object.keys(e.widget))
     if (i in t) {
       if (!B(t[i]))
@@ -51,7 +69,7 @@ function W(e, t) {
     i[n] = t;
   return i;
 }
-function ht(e) {
+function ft(e) {
   if (!("widget" in e)) {
     if (e.children.length === 0)
       throw new TypeError(
@@ -80,14 +98,14 @@ const U = Symbol("LazyLoader");
 function T(e) {
   return /\{[^}]+}/.test(e);
 }
-function ut(e) {
+function dt(e) {
   const t = e.replace(/\s+/g, ""), i = /\{[\w-]+\?}/g, n = t.match(i);
   return n ? n.length : 0;
 }
 function A(e) {
   return "children" in e && e.children !== void 0 && e.children.length > 0;
 }
-function lt(e, t, i, n) {
+function pt(e, t, i, n) {
   let s = 0;
   const r = (h, a) => {
     const $ = t[h];
@@ -124,7 +142,7 @@ function C(e, t) {
     return String(t[s]).replace(/\s+/g, "_");
   }), m(e);
 }
-function ft(e) {
+function Rt(e) {
   return typeof e == "function" && e[U];
 }
 function D(e, t) {
@@ -137,11 +155,11 @@ function z(e) {
   ), i = {};
   return t.forEach((n, s) => i[s] = n), i;
 }
-function dt(e) {
+function gt(e) {
   const t = new URLSearchParams(e).toString();
   return t ? `?${t}` : "";
 }
-function pt(e, t, i) {
+function mt(e, t, i) {
   let n = decodeURIComponent(e.pathname), s = decodeURIComponent(e.hash), r = z(e.search);
   if (n = m(n.startsWith(i) ? n.slice(i.length) : n), t === "hash" && s.includes("#/")) {
     const o = s.slice(1), [l, c] = o.split("#"), [h, a] = l.split("?");
@@ -149,7 +167,7 @@ function pt(e, t, i) {
   }
   return { index: n, hash: s, query: r };
 }
-function Rt(e) {
+function wt(e) {
   const t = G(e);
   return t && (e = e.slice(0, -t.length)), {
     path: e,
@@ -160,7 +178,7 @@ function G(e) {
   const t = e.match(/^(.*?)(\.[a-zA-Z0-9]+)$/);
   return t ? t[2] : "";
 }
-function gt(e) {
+function yt(e) {
   if (typeof e != "object" || e === null) return !1;
   const t = [
     "index",
@@ -176,32 +194,14 @@ function gt(e) {
     if (!Object.prototype.hasOwnProperty.call(e, i)) return !1;
   return !0;
 }
-function mt(e) {
+function _t(e) {
   if (e.meta = e.meta || {}, e.pattern = e.pattern || {}, e.children = e.children || [], !Array.isArray(e.children))
     throw new TypeError(
       `[Vitarx.Router][TYPE_ERROR]：${e.path} 路由线路配置 children 类型错误，它必须是数组类型。`
     );
   if (!e.path.trim())
     throw new TypeError("[Vitarx.Router][TYPE_ERROR]：路由线路配置 path 不能为空");
-  return e.path = m(e.path), ht(e), rt(e), e;
-}
-const wt = ["path", "hash", "index", "fullPath"];
-function yt(e, t) {
-  _t(e.matched, t.matched), j(e.params, t.params), j(e.query, t.query), j(e.meta, t.meta);
-  for (const i of wt)
-    e[i] !== t[i] && (e[i] = t[i]);
-}
-function _t(e, t) {
-  for (let i = 0; i < t.length; i++)
-    e[i] !== t[i] && (e[i] = t[i]);
-  e.length > t.length && (e.length = t.length);
-}
-function j(e, t) {
-  const i = Object.keys(e), n = Object.keys(t);
-  for (const s of n)
-    Object.prototype.hasOwnProperty.call(t, s) && (e[s] = t[s]);
-  for (const s in i)
-    s in t || delete e[s];
+  return e.path = m(e.path), ft(e), ct(e), e;
 }
 var g;
 const R = class R {
@@ -409,7 +409,7 @@ const R = class R {
     const n = t.widget;
     if (!Object.prototype.hasOwnProperty.call(n, i)) return;
     const s = n[i];
-    return ft(s) ? V(X, { children: s, key: t.path }) : V(s);
+    return Rt(s) ? V(X, { children: s, key: t.path }) : V(s);
   }
   /**
    * 后退到上一个历史记录
@@ -546,7 +546,7 @@ const R = class R {
    * @param {RouteTarget} target - 路由目标
    */
   createRouteLocation(t) {
-    if (gt(t)) return t;
+    if (yt(t)) return t;
     const i = this.findRoute(t), { index: n, query: s = {}, params: r = {}, hash: o = "" } = t;
     let l;
     const c = [];
@@ -682,7 +682,7 @@ const R = class R {
    */
   matchRoute(t) {
     if (t = m(t), this._options.strict || (t = t.toLowerCase()), this.suffix) {
-      const { path: s, suffix: r } = Rt(t);
+      const { path: s, suffix: r } = wt(t);
       if (!this.isAllowedSuffix(r))
         return;
       t = s;
@@ -713,7 +713,7 @@ const R = class R {
    * @return {string}
    */
   makeFullPath(t, i, n) {
-    return n && !n.startsWith("#") && (n = `#${n}`), typeof i == "object" && (i = dt(i)), this.mode === "hash" ? m(`${this.basePath}/#${t}${i}${n}`) : m(`${this.basePath}${t}${i}${n}`);
+    return n && !n.startsWith("#") && (n = `#${n}`), typeof i == "object" && (i = gt(i)), this.mode === "hash" ? m(`${this.basePath}/#${t}${i}${n}`) : m(`${this.basePath}${t}${i}${n}`);
   }
   /**
    * 判断是否相同的导航请求
@@ -753,7 +753,7 @@ const R = class R {
    * @param {RouteLocation} newLocation - 新的路由数据对象
    */
   updateRouteLocation(t) {
-    yt(this._currentRouteLocation, t);
+    ot(this._currentRouteLocation, t);
   }
   /**
    * 判断是否为允许的后缀
@@ -818,7 +818,7 @@ const R = class R {
       }
     };
     s(n);
-    const r = ut(t);
+    const r = dt(t);
     if (r > 0)
       for (let o = 1; o <= r; o++)
         s(n - o);
@@ -840,7 +840,7 @@ const R = class R {
    * @protected
    */
   registerRoute(t, i) {
-    const n = mt(t);
+    const n = _t(t);
     if (i && (n.path = m(`${i.path}${n.path}`), this._parentRoute.set(n, i)), A(n)) {
       t.widget && this.recordRoute(n);
       for (const s of n.children)
@@ -881,7 +881,7 @@ const R = class R {
    * @param route
    */
   recordDynamicRoute(t) {
-    const { regex: i, length: n, optional: s } = lt(
+    const { regex: i, length: n, optional: s } = pt(
       t.path,
       t.pattern,
       this.options.strict,
@@ -909,7 +909,7 @@ class xt extends d {
    * @returns {RouteTarget} - 包含 index、hash 和 query 的对象
    */
   get currentRouteTarget() {
-    return pt(window.location, this.mode, this.basePath);
+    return mt(window.location, this.mode, this.basePath);
   }
   /**
    * window.history

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitarx-router",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "type": "module",
   "main": "dist/vitarx-router.js",
   "types": "dist/vitarx-router.d.ts",
@@ -13,7 +13,7 @@
     "push": "npm publish --access=public"
   },
   "peerDependencies": {
-    "vitarx": "^1.0.0-beta.20"
+    "vitarx": "^1.0.0-beta.21"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",