vitarx-router 4.0.0-beta.21 → 4.0.0-beta.22

package/dist/core/common/utils.js

@@ -71,7 +71,7 @@ export function parseHashContent(hashContent) {
     // 同样限制分割数为 2，防止路径中包含 ?
     const [pathname, queryString] = pathAndQuery.split('?', 2);
     // 3. 格式化路径
-    path = normalizePath(pathname || '/');
+    path = pathname ? normalizePath(pathname) : '/';
     // 4. 解析查询参数
     if (queryString) {
         query = parseQuery(queryString);

package/dist/core/common/variable.js

@@ -97,7 +97,7 @@ export function mergePathVariable(path, params) {
         return String(value).replace(/\s+/g, '_');
     });
     // 使用 formatPath 处理可能出现的双斜杠 (如 /user//) 或首尾斜杠问题
-    return normalizePath(fullPath);
+    return normalizePath(fullPath, true);
 }
 /**
  * 合并两个路由模式对象

package/dist/core/router/manager.d.ts

@@ -9,7 +9,9 @@ export interface RouteManagerOptions {
     /**
      * 是否启用严格模式
      *
-     * 启用后路径匹配将严格匹配，即路径末尾的斜杠会被视为重要字符
+     * 启用后路径匹配将严格匹配即 /user/ 结尾存在斜杠会匹配失败
+     *
+     * 禁用后路径匹配将宽匹配即 /user/ 会匹配 /user
      *
      * @default false
      */
@@ -23,8 +25,8 @@ export interface RouteManagerOptions {
     /**
      * 是否启用索引回退匹配。
      *
-     * 开启后，当访问深层路径（如 /user/index）未匹配时，
-     * 会尝试移除最后一段路径（/user）再次进行匹配。
+     * 开启后，当访问深层index路径（如 /user/index）未匹配时，
+     * 会尝试移除index路径（/user）再次进行匹配。
      * 匹配成功则渲染组件，且保持 URL 不变。
      *
      * 仅支持匹配静态路径，不做动态路径匹配！
@@ -126,7 +128,7 @@ export declare class RouteManager {
      * @returns 规范化后的路径（根据 ignoreCase 配置转换为小写）
      * @private
      */
-    private normalizePath;
+    private toLookupPath;
     /**
      * 根据路径查找路由
      *

package/dist/core/router/manager.js

@@ -127,7 +127,7 @@ export class RouteManager {
      * @returns 规范化后的路径（根据 ignoreCase 配置转换为小写）
      * @private
      */
-    normalizePath(path) {
+    toLookupPath(path) {
         return this.config.ignoreCase ? path.toLowerCase() : path;
     }
     /**
@@ -137,7 +137,7 @@ export class RouteManager {
      * @returns 路由记录对象，如果未找到则返回 undefined
      */
     findByPath(path) {
-        const normalizedPath = this.normalizePath(path);
+        const normalizedPath = this.toLookupPath(path);
         return this.staticRoutes.get(normalizedPath) ?? this.aliasRoutes.get(normalizedPath) ?? null;
     }
     /**
@@ -183,9 +183,7 @@ export class RouteManager {
             normalizedPath = normalizedPath.slice(0, -1);
         }
         // 1. 标准化路径
-        const lookupPath = this.config.ignoreCase
-            ? normalizedPath.toLowerCase()
-            : normalizedPath;
+        const lookupPath = this.toLookupPath(normalizedPath);
         // 2. 静态路由精确匹配
         const staticRoute = this.staticRoutes.get(lookupPath);
         if (staticRoute) {
@@ -197,14 +195,14 @@ export class RouteManager {
             return { path, route: aliasRoute, params: {} };
         }
         // 3. 动态路由匹配
-        const pathSegments = normalizedPath.split('/').filter(Boolean);
+        const pathSegments = path.split('/').filter(Boolean);
         const segmentCount = pathSegments.length;
         const dynamicCandidates = this.dynamicRoutes.get(segmentCount);
         if (dynamicCandidates) {
             for (const { regex, route } of dynamicCandidates) {
                 regex.lastIndex = 0;
                 // 执行正则匹配
-                const regexResult = regex.exec(normalizedPath);
+                const regexResult = regex.exec(path);
                 if (regexResult) {
                     const params = {};
                     // 解析捕获组参数
@@ -222,6 +220,7 @@ export class RouteManager {
                 }
             }
         }
+        // 4. 结尾斜杠索引回退匹配
         if (lookupPath.endsWith('/index') && this.config.fallbackIndex) {
             const fallbackPath = lookupPath.slice(0, -6);
             const fallbackRoute = this.staticRoutes.get(fallbackPath || '/');
@@ -354,14 +353,14 @@ export class RouteManager {
         // 删除当前路由
         this.routes.delete(route);
         // 删除静态路由映射
-        this.staticRoutes.delete(this.normalizePath(route.path));
+        this.staticRoutes.delete(this.toLookupPath(route.path));
         // 删除命名路由映射
         if (route.name)
             this.namedRoutes.delete(route.name);
         // 删除别名映射
         if (route.aliases) {
             for (const alias of route.aliases) {
-                this.aliasRoutes.delete(this.normalizePath(alias));
+                this.aliasRoutes.delete(this.toLookupPath(alias));
                 // 如果别名是动态路由，也需要从 dynamicRoutes 中移除
                 if (isVariablePath(alias)) {
                     this.removeAliasDynamicRoute(alias, route);
@@ -462,7 +461,7 @@ export class RouteManager {
             record.parent = parent;
         }
         const rawPath = route.path.trim();
-        record.path = normalizePath(parent ? `${parent.path}/${rawPath}` : `/${rawPath}`);
+        record.path = normalizePath(parent ? `${parent.path}/${rawPath}` : `/${rawPath}`, true);
         if (route.name) {
             record.name = route.name;
         }
@@ -513,13 +512,13 @@ export class RouteManager {
                     aliasPath = parent.path;
                 }
                 else if (rawAlias.startsWith('/')) {
-                    aliasPath = normalizePath(rawAlias);
+                    aliasPath = normalizePath(rawAlias, true);
                 }
                 else if (!parent) {
-                    aliasPath = normalizePath(`/${rawAlias}`);
+                    aliasPath = normalizePath(`/${rawAlias}`, true);
                 }
                 else {
-                    aliasPath = normalizePath(`${parent.path}/${rawAlias}`);
+                    aliasPath = normalizePath(`${parent.path}/${rawAlias}`, true);
                 }
                 record.aliases.push(aliasPath);
             }
@@ -552,7 +551,7 @@ export class RouteManager {
             this.registerDynamicRoute(route, route.fullPattern);
         }
         else {
-            const path = this.normalizePath(route.path);
+            const path = this.toLookupPath(route.path);
             // 检查是否已存在相同路径的路由
             if (this.staticRoutes.has(path)) {
                 // 抛出错误：检测到重复的路由路径
@@ -564,7 +563,6 @@ export class RouteManager {
         // 注册别名
         if (route.aliases && route.aliases.length > 0) {
             for (const alias of route.aliases) {
-                const aliasPath = this.normalizePath(alias);
                 if (isVariablePath(alias)) {
                     if (!validateAliasVariables(route.pattern, alias)) {
                         throw new Error(`[Router] Alias "${alias}" variables do not match route "${route.path}" pattern`);
@@ -573,6 +571,7 @@ export class RouteManager {
                     this.registerDynamicRoute(route, regex, alias);
                 }
                 else {
+                    const aliasPath = this.toLookupPath(alias);
                     if (route.pattern && route.pattern.length > 0) {
                         throw new Error(`[Router] Alias "${alias}" for dynamic route "${route.path}" must contain variables`);
                     }

package/dist/core/router/router.js

@@ -965,7 +965,7 @@ export class Router {
         const queryStr = stringifyQuery(query);
         const href = `${path}${queryStr}${hashStr}`;
         return this.config.mode === 'hash'
-            ? normalizePath(`${this.config.base}/#${href}`, true)
+            ? normalizePath(`${this.config.base}#${href}`)
             : normalizePath(`${this.config.base}${href}`);
     }
     /**

package/dist/core/shared/link.js

@@ -130,7 +130,7 @@ export function useLink(props) {
         const matchedRoute = route.value;
         if (!matchedRoute)
             return false;
-        return router.route.href === matchedRoute.href;
+        return router.route.path === matchedRoute.path;
     });
     /**
      * 导航处理函数

package/dist/core/shared/utils.d.ts

@@ -17,19 +17,20 @@ export declare function stringifyQuery(obj: Record<string, string>): `?${string}
 /**
  * 归一化path
  *
- * 去除所有空格、替换重复的斜杠、去除尾部的斜杠
+ * 去除所有空格、替换重复的斜杠
  *
  * @example
  * normalizePath('/  foo') // '/foo'
- * normalizePath('/foo/') // '/foo'
+ * normalizePath('/foo/') // '/foo/'
  * normalizePath('/foo/bar') // '/foo/bar'
  * normalizePath('foo/') // '/foo'
+ * normalizePath('/foo/',true) // '/foo'
  *
  * @param {string} path - 路径字符串
- * @param [hashMode = false] -  是否为hash模式，如果是则兼容`/#/`
+ * @param {boolean} removeEndSlash - 是否去除尾随斜杠
  * @return {string} - 格式化后的路径字符串
  */
-export declare function normalizePath(path: string, hashMode?: boolean): `/${string}`;
+export declare function normalizePath(path: string, removeEndSlash?: boolean): `/${string}`;
 /**
  * 克隆路由位置对象
  *

package/dist/core/shared/utils.js

@@ -28,24 +28,27 @@ export function stringifyQuery(obj) {
 /**
  * 归一化path
  *
- * 去除所有空格、替换重复的斜杠、去除尾部的斜杠
+ * 去除所有空格、替换重复的斜杠
  *
  * @example
  * normalizePath('/  foo') // '/foo'
- * normalizePath('/foo/') // '/foo'
+ * normalizePath('/foo/') // '/foo/'
  * normalizePath('/foo/bar') // '/foo/bar'
  * normalizePath('foo/') // '/foo'
+ * normalizePath('/foo/',true) // '/foo'
  *
  * @param {string} path - 路径字符串
- * @param [hashMode = false] -  是否为hash模式，如果是则兼容`/#/`
+ * @param {boolean} removeEndSlash - 是否去除尾随斜杠
  * @return {string} - 格式化后的路径字符串
  */
-export function normalizePath(path, hashMode = false) {
+export function normalizePath(path, removeEndSlash = false) {
     // 去除所有空格 处理重复//
-    const formated = `/${path.trim()}`.replace(/\s+/g, '').replace(/\/+/g, '/');
-    if (formated === '/' || (hashMode && formated === '/#/'))
-        return formated;
-    return formated.replace(/\/$/, '');
+    let normalizedPath = `/${path.trim()}`.replace(/\s+/g, '').replace(/\/+/g, '/');
+    if (removeEndSlash && normalizedPath.endsWith('/') && normalizedPath !== '/') {
+        normalizedPath = normalizedPath.replace(/\/$/, '');
+    }
+    // 去除尾随斜杠
+    return normalizedPath;
 }
 /**
  * 克隆路由位置对象

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitarx-router",
-  "version": "4.0.0-beta.21",
+  "version": "4.0.0-beta.22",
   "description": "Official routing solution for Vitarx framework with declarative routing, navigation guards, dynamic routes, file-based routing with HMR, and full TypeScript support.",
   "author": "ZhuChonglin <8210856@qq.com>",
   "license": "MIT",