vitarx-router 4.0.0-beta.6 → 4.0.0-beta.7

package/dist/file-router/config/validate.js

@@ -55,6 +55,13 @@ function validatePagesDirItem(item, index) {
         if (config.exclude !== undefined && !Array.isArray(config.exclude)) {
             throw new Error(`options.pages[${index}].exclude 必须是数组`);
         }
+        if (config.group === true &&
+            config.prefix !== undefined &&
+            typeof config.prefix === 'string' &&
+            config.prefix !== '/' &&
+            config.prefix.endsWith('/')) {
+            throw new Error(`options.pages[${index}].prefix 当 group 为 true 时不能以 '/' 结尾，请使用 '${config.prefix.slice(0, -1)}'`);
+        }
         return;
     }
     throw new Error(`options.pages[${index}] 必须是字符串或对象`);

package/dist/file-router/index.d.ts

@@ -9,10 +9,10 @@ import { ResolvedConfig } from './config/index.js';
 import { type GenerateResult } from './generator/index.js';
 import { type FilterOptions } from './parser/index.js';
 import type { FileRouterOptions, ParsedNode } from './types/index.js';
+export { resolvePageConfigs } from './config/resolve.js';
+export type { GenerateResult } from './generator/index.js';
 export type * from './types/index.js';
 export * from './utils/logger.js';
-export type { GenerateResult } from './generator/index.js';
-export { resolvePageConfigs } from './config/resolve.js';
 /**
  * 文件路由管理器
  */

package/dist/file-router/index.js

@@ -18,8 +18,8 @@ import { isEqualPageOptions, mergePageOptions, parseDefinePage, removeDefinePage
 import { checkDefaultExport, isPageFile, isPageFileInDirs } from './parser/index.js';
 import { parseRoutePath } from './parser/parsePage.js';
 import { applyPathStrategy, info, normalizePathSeparator, readFileContent, resolvePathVariable, validateOptions, warn } from './utils/index.js';
-export * from './utils/logger.js';
 export { resolvePageConfigs } from './config/resolve.js';
+export * from './utils/logger.js';
 /**
  * 文件路由管理器
  */
@@ -108,7 +108,7 @@ export class FileRouter {
                     filePath: page.dir,
                     path: this.applyPathStrategy(page.prefix)
                 };
-                route.children = this.scanPageDir(page, route);
+                route.children = this.scanPageDir({ ...page, prefix: '' }, route);
                 // 如果有子路由则添加到页面列表中
                 if (route.children.size > 0) {
                     pages.push(route);
@@ -162,7 +162,7 @@ export class FileRouter {
      * @private
      */
     processDir(filePath, fileName, page, parent) {
-        const pathPrefix = page.prefix;
+        const pathPrefix = parent ? '' : page.prefix;
         const route = {
             parent,
             filePath,
@@ -234,7 +234,7 @@ export class FileRouter {
         if (!pageOptions?.redirect && !checkDefaultExport(content, filePath))
             return null;
         // 最终 path
-        const finalPath = this.applyPathStrategy(page.prefix + (routePath === 'index' ? '' : routePath));
+        const finalPath = this.applyPathStrategy((parent ? '' : page.prefix) + (routePath === 'index' ? '' : routePath));
         // 创建路由对象
         const route = {
             parent,

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

@@ -50,9 +50,10 @@ function createExportDeclarationVisitor(result, variableDeclarations) {
             switch (declaration.type) {
                 case 'FunctionDeclaration':
                 case 'FunctionExpression':
+                case 'ArrowFunctionExpression':
                     result.isFunction = true;
                     break;
-                case 'ArrowFunctionExpression':
+                case 'CallExpression':
                     result.isFunction = true;
                     break;
                 case 'Identifier':

package/package.json

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