zova-module-a-router 5.0.60 → 5.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.0.60",
+  "version": "5.0.63",
   "title": "a-router",
   "zovaModule": {
     "capabilities": {
@@ -38,7 +38,7 @@
     "_prepublishOnly": "npm run tsc:publish"
   },
   "dependencies": {
-    "vue-router": "^4.3.2"
+    "vue-router": "^4.4.5"
   },
-  "gitHead": "b87bdd8540395b181993a617d33cad57b3c4d446"
+  "gitHead": "200ff5791bd6362080428f5b6c6c8f2a82c7d9d0"
 }

package/src/bean/bean.router.ts

@@ -26,6 +26,8 @@ export class BeanRouter extends BeanBase {
     if (mainRouter) {
       // config.routes
       this._loadConfigRoutes();
+      // legacy routes
+      this._loadLegacyRoutes();
     } else {
       // emit event
       await this.app.meta.event.emit('a-router:routerGuards', this);
@@ -68,7 +70,11 @@ export class BeanRouter extends BeanBase {
   }
 
   public checkPathValid(to?: { name?: string; path?: string } | string): boolean {
+    const _name = to && typeof to === 'object' ? to.name : undefined;
     const _path = to && typeof to === 'object' ? (to.name ?? to.path) : to;
+    // legacy
+    if (this._findLegacyRoute(_name, _path)) return true;
+    // general check
     if (!_path) return true;
     const moduleName = ModuleInfo.parseName(_path);
     if (!moduleName) return true;
@@ -104,17 +110,17 @@ export class BeanRouter extends BeanBase {
 
   /** @internal */
   public _registerRoutes(module: IModule) {
-    if (!module.resource.routes) return null;
+    if (!module.resource.routes) return;
     for (const route of module.resource.routes) {
-      this._registerRoute(module, route);
+      this._registerRoute(route, module);
     }
   }
 
-  private _registerRoute(module: IModule, route: IModuleRoute) {
+  private _registerRoute(route: IModuleRoute, module?: IModule) {
     // path
     let path: string | undefined;
     if (route.path !== undefined) {
-      if (route.meta?.absolute === true) {
+      if (!module || route.meta?.absolute === true) {
         path = route.path;
       } else {
         path = route.path
@@ -125,7 +131,7 @@ export class BeanRouter extends BeanBase {
     // name
     let name: string | undefined;
     if (route.name) {
-      if (route.meta?.absolute === true) {
+      if (!module || route.meta?.absolute === true) {
         name = String(route.name);
       } else {
         name = `${module.info.relativeName}:${String(route.name)}`;
@@ -193,6 +199,14 @@ export class BeanRouter extends BeanBase {
     }
   }
 
+  private _loadLegacyRoutes() {
+    const legacyRoutes = Cast(this.app.meta).legacyRoutes;
+    if (!legacyRoutes) return;
+    for (const route of legacyRoutes) {
+      this._registerRoute(route);
+    }
+  }
+
   private _loadConfigRoute(route: IModuleRoute) {
     this.router.addRoute(route);
   }
@@ -206,6 +220,19 @@ export class BeanRouter extends BeanBase {
     return name ? this.app.config.routes.name[name] : this.app.config.routes.path[path!];
   }
 
+  /** @internal */
+  public _findLegacyRoute(
+    name: string | symbol | null | undefined,
+    path: string | undefined,
+  ): IModuleRoute | undefined {
+    const legacyRoutes = Cast(this.app.meta).legacyRoutes;
+    if (!legacyRoutes) return;
+    name = this.getRealRouteName(name);
+    return legacyRoutes.find(item => {
+      return name ? item.name === name : item.path === path;
+    });
+  }
+
   getRealRouteName(name?: string | symbol | null): string | undefined {
     return getRealRouteName(name);
   }

package/src/bean/local.router.ts

@@ -17,6 +17,9 @@ export class LocalRouter extends BeanRouterBase<ScopeModule> {
         match = match.aliasOf;
       } else {
         match = to.matched[to.matched.length - 1];
+        // legacy
+        const legacyRoute = this.$$router._findLegacyRoute(match?.name, match?.path);
+        if (legacyRoute) return;
         // alias
         const configRoute = this.$$router._findConfigRoute(match?.name, match?.path);
         const alias = configRoute?.alias;

package/src/config/config.ts

@@ -2,6 +2,6 @@ import { IBeanScopeRecord, ZovaApplication } from 'zova';
 
 export const config = (_app: ZovaApplication) => {
   return {
-    defaultComponent: 'home-component' as keyof IBeanScopeRecord,
+    defaultComponent: 'home-base' as keyof IBeanScopeRecord,
   };
 };

package/src/monkey.ts

@@ -38,18 +38,18 @@ export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule,
     return this._beanRouter;
   }
 
-  async appInitialize(bean: BeanContainer) {
+  async appInitialize() {
     // router
-    this.localRouter = await bean._newBean(LocalRouter, false);
+    this.localRouter = await this.bean._newBean(LocalRouter, false);
   }
-  async appInitialized(bean: BeanContainer) {
+  async appInitialized() {
     // component default
-    const scope: ScopeModule = await bean.getScope(__ThisModule__);
-    this._beanComponentDefault = await bean.getScope(scope.config.defaultComponent);
+    const scope: ScopeModule = await this.bean.getScope(__ThisModule__);
+    this._beanComponentDefault = await this.bean.getScope(scope.config.defaultComponent);
     // emit event
     await this.app.meta.event.emit('a-router:routerGuards', this._beanRouter);
   }
-  async appReady(_bean: BeanContainer) {
+  async appReady() {
     // use router
     this.app.vue.use(this._beanRouter);
     // ssr