vitarx-router 4.0.0-beta.13 → 4.0.0-beta.14

package/dist/components/RouterView.js

@@ -12,7 +12,7 @@ import { __ROUTER_VIEW_DEPTH_KEY__, useRouter } from '../core/index.js';
  * @returns {View} 返回渲染的视图
  */
 export function RouterView(props) {
-    const { children, name = 'default' } = props;
+    const { children } = props;
     // 获取路由实例
     const router = useRouter();
     // 获取父级 index
@@ -20,6 +20,7 @@ export function RouterView(props) {
     const index = parentIndex + 1; // 计算当前视图的索引
     provide(__ROUTER_VIEW_DEPTH_KEY__, index); // 向子组件提供当前索引
     // 匹配的路由线路
+    const viewName = computed(() => props.name || 'default');
     const matchedRoute = computed(() => {
         return router.route.matched[index] ?? null;
     });
@@ -28,8 +29,7 @@ export function RouterView(props) {
         const currentRoute = matchedRoute.value;
         if (!currentRoute)
             return null;
-        const name = props.name || 'default'; // 获取视图名称，默认为 'default'
-        let injectProps = currentRoute.props?.[name] ?? router.config.props ?? false;
+        let injectProps = currentRoute.props?.[viewName.value] ?? router.config.props ?? false;
         if (injectProps === false)
             return null; // 如果属性为 false，返回null
         if (injectProps === true && currentRoute.pattern) {
@@ -52,7 +52,7 @@ export function RouterView(props) {
         const route = matchedRoute.value; // 获取匹配的路由记录
         if (!route)
             return null;
-        return route.component?.[name] ?? null;
+        return route.component?.[viewName.value] ?? null;
     });
     // 如果传入了 children 函数，则调用并返回其结果
     if (isFunction(children)) {
@@ -61,6 +61,7 @@ export function RouterView(props) {
         }
         catch (e) {
             logger.error('[RouterView] Error occurred while executing children function', e);
+            return createCommentView(`router-view:error`);
         }
     }
     let lastView = null;

package/dist/core/common/constant.d.ts

@@ -2,12 +2,11 @@
  * 导航状态
  *
  * 枚举值：
- * 0. success: 导航成功
- * 1. aborted: 导航被阻止
- * 2. cancelled: 导航被取消
- * 3. duplicated: 重复导航
- * 4. notfound: 路由未匹配
- * 5. exception: 捕获到异常
+ * 1. success: 导航成功
+ * 2. aborted: 导航被阻止
+ * 4. cancelled: 导航被取消
+ * 8. duplicated: 重复导航
+ * 16. notfound: 路由未匹配
  */
 export declare enum NavState {
     /**

package/dist/core/common/constant.js

@@ -2,12 +2,11 @@
  * 导航状态
  *
  * 枚举值：
- * 0. success: 导航成功
- * 1. aborted: 导航被阻止
- * 2. cancelled: 导航被取消
- * 3. duplicated: 重复导航
- * 4. notfound: 路由未匹配
- * 5. exception: 捕获到异常
+ * 1. success: 导航成功
+ * 2. aborted: 导航被阻止
+ * 4. cancelled: 导航被取消
+ * 8. duplicated: 重复导航
+ * 16. notfound: 路由未匹配
  */
 export var NavState;
 (function (NavState) {

package/dist/core/router/web.js

@@ -1,4 +1,5 @@
 import { isString, logger } from 'vitarx';
+import { NavState } from '../common/constant.js';
 import { parseHashContent } from '../common/utils.js';
 import { normalizePath, parseQuery } from '../shared/utils.js';
 import { Router } from './router.js';
@@ -49,7 +50,11 @@ export class WebRouter extends Router {
             }
         });
         // 初始化路由
-        this.replace(this.urlToNavigateTarget()).then();
+        this.replace(this.urlToNavigateTarget()).then(res => {
+            if (res.state !== NavState.success) {
+                logger.error(`[Router] Initialization failed: ${res.message}`, res);
+            }
+        });
         // 初始化时监听 popstate 事件，处理历史记录返回时的路由恢复
         window.addEventListener('popstate', this.onPopState);
         if (this.config.mode === 'hash') {

package/dist/file-router/index.js

@@ -194,7 +194,7 @@ export class FileRouter {
      */
     processFile(filePath, page, pageMapping, parent) {
         // 分离出路由 path 和视图命名
-        const { routePath, viewName = 'default' } = parseRoutePath(filePath, this.config.pathParser);
+        const { routePath, viewName } = parseRoutePath(filePath, this.config.pathParser);
         const fileType = this.getPageType(filePath, routePath, page);
         if (fileType === 'ignore')
             return null;

package/dist/file-router/parser/parsePage.d.ts

@@ -1,4 +1,4 @@
-import type { PathParser, PathParseResult } from '../types/index.js';
+import type { PathParser } from '../types/index.js';
 /**
  * 路径解析错误类
  *
@@ -22,6 +22,13 @@ export declare class PathParseError extends TypeError {
      */
     toString(): string;
 }
+/**
+ * 解析结果接口
+ */
+interface ParseResult {
+    routePath: string;
+    viewName: string;
+}
 /**
  * 解析路由路径和视图名称
  *
@@ -32,4 +39,5 @@ export declare class PathParseError extends TypeError {
  * @returns 路由路径和视图名称
  * @throws {PathParseError} 当路径解析失败时抛出
  */
-export declare function parseRoutePath(filePath: string, parser?: PathParser): Exclude<PathParseResult, string>;
+export declare function parseRoutePath(filePath: string, parser?: PathParser): ParseResult;
+export {};

package/dist/file-router/parser/parsePage.js

@@ -74,10 +74,10 @@ export class PathParseError extends TypeError {
 export function parseRoutePath(filePath, parser) {
     const { basename } = extractFileInfo(filePath);
     if (!parser) {
-        return parseDefaultRoutePath(basename);
+        return defaultPathParser(basename);
     }
     const result = parser(basename, filePath);
-    return parseCustomRouteResult(result, filePath);
+    return parseCustomResult(result, filePath);
 }
 /**
  * 提取文件信息
@@ -96,24 +96,32 @@ function extractFileInfo(filePath) {
  * @param basename - 文件基本名称
  * @returns 解析结果
  */
-function parseDefaultRoutePath(basename) {
-    const [routePath, viewName] = basename.split('@', 2);
+function defaultPathParser(basename) {
+    const [rawPath, viewName] = basename.split('@', 2);
+    const routePath = normalizeRoutePath(rawPath);
+    if (!routePath) {
+        throw new PathParseError('pathParser returned empty routePath', {
+            filePath: basename,
+            originalValue: rawPath,
+            field: 'routePath'
+        });
+    }
     return {
         routePath,
         viewName: viewName || 'default'
     };
 }
 /**
- * 解析自定义路由结果
+ * 解析自定义解析器结果
  *
  * @param result - 解析器返回的结果
  * @param filePath - 文件路径（用于错误上下文）
  * @returns 解析结果
  * @throws {PathParseError} 当结果无效时抛出
  */
-function parseCustomRouteResult(result, filePath) {
+function parseCustomResult(result, filePath) {
     if (typeof result === 'string') {
-        return parseStringResult(result, filePath);
+        return defaultPathParser(result);
     }
     if (result && typeof result === 'object' && !Array.isArray(result)) {
         return parseObjectResult(result, filePath);
@@ -124,25 +132,6 @@ function parseCustomRouteResult(result, filePath) {
         field: 'result'
     });
 }
-/**
- * 解析字符串类型的结果
- *
- * @param result - 字符串结果
- * @param filePath - 文件路径
- * @returns 解析结果
- * @throws {PathParseError} 当路径无效时抛出
- */
-function parseStringResult(result, filePath) {
-    const routePath = normalizeRoutePath(result);
-    if (!routePath) {
-        throw new PathParseError('pathParser returned empty routePath', {
-            filePath,
-            originalValue: result,
-            field: 'routePath'
-        });
-    }
-    return { routePath, viewName: 'default' };
-}
 /**
  * 解析对象类型的结果
  *
@@ -210,11 +199,14 @@ function validateViewName(viewName, filePath) {
 /**
  * 标准化路由路径
  *
- * 去除路径首尾空白和开头的斜杠。
+ * 去除路径首尾空白和首尾的斜杠，将 . # 等不利于 URL 的字符替换为 -。
  *
  * @param routePath - 原始路由路径
  * @returns 标准化后的路由路径
  */
 function normalizeRoutePath(routePath) {
-    return routePath.trim().replace(/^\/+/, '');
+    return routePath
+        .trim()
+        .replace(/^\/+|\/+$/g, '')
+        .replace(/[.#]/g, '-');
 }

package/dist/file-router/types/options.d.ts

@@ -52,11 +52,14 @@ export type PathStrategy = 'kebab' | 'lowercase' | 'raw';
 export type PageSource = string | PageDirOptions;
 /**
  * 路径解析结果
+ *
+ * - string: 文件名称，交由内置默认的pathParser继续处理。
+ * - `{ routePath: string, viewName?: string }`: 路径和视图名称
  */
 export type PathParseResult = string | {
-    /** 解析后的路径 */
+    /** 解析后的路径 如：home.jsx -> 'home' */
     routePath: string;
-    /** 视图名称 */
+    /** 视图名称 如：home.nav.jsx -> 'nav' */
     viewName?: string;
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitarx-router",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.14",
   "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",