zova-module-a-router 5.0.52 → 5.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.0.52",
+  "version": "5.0.54",
   "title": "a-router",
   "zovaModule": {
     "capabilities": {
@@ -40,5 +40,5 @@
   "dependencies": {
     "vue-router": "^4.3.2"
   },
-  "gitHead": "20d5666c9835e208eb0ab4c4f09f658d314795f4"
+  "gitHead": "38b917802862663cf6c2e6829857de9a2a742dcd"
 }

package/src/bean/bean.router.ts

@@ -1,5 +1,5 @@
-import { Bean, BeanBase, Cast, IModule, IPageNameRecord, IPagePathRecord, TypeEventOff } from 'zova';
-import { Router } from 'vue-router';
+import { Bean, BeanBase, Cast, IModule, IPageNameRecord, IPagePathRecord } from 'zova';
+import { createMemoryHistory, createRouter, createWebHashHistory, createWebHistory, Router } from 'vue-router';
 import * as ModuleInfo from '@cabloy/module-info';
 import { IModuleRoute, IModuleRouteComponent } from '../types.js';
 import { getRealRouteName } from '../utils.js';
@@ -11,7 +11,6 @@ export interface BeanRouter extends Router {}
 @Bean()
 export class BeanRouter extends BeanBase {
   [SymbolRouter]: Router;
-  eventRouterGuards: TypeEventOff;
 
   get router(): Router {
     return this[SymbolRouter];
@@ -21,33 +20,30 @@ export class BeanRouter extends BeanBase {
     return this[SymbolRouter] && this[SymbolRouter][prop];
   }
 
-  protected async __init__(router?: Router) {
-    if (router) {
-      this[SymbolRouter] = router;
-    } else {
-      // app router
-      router = this.bean.inject('a-router:appRouter');
-      if (!router) {
-        throw new Error('Should provide router');
-      }
-      this[SymbolRouter] = router;
-      // provide
-      this.app.vue.provide('a-router:router', this);
-      this.bean.provide('a-router:router', this);
+  public async initialize(mainRouter?: boolean) {
+    // create router
+    this[SymbolRouter] = this._createRouter();
+    if (mainRouter) {
       // config.routes
       this._loadConfigRoutes();
-      // event
-      this.eventRouterGuards = this.app.meta.event.on('a-router:routerGuards', async (context, next) => {
-        this._routerGuards(context.data);
-        await next();
-      });
+    } else {
+      // emit event
+      await this.app.meta.event.emit('a-router:routerGuards', this);
     }
   }
 
-  protected __dispose__() {
-    if (this.eventRouterGuards) {
-      this.eventRouterGuards();
-    }
+  private _createRouter() {
+    const createHistory = this.app.config.env.appServer
+      ? createMemoryHistory
+      : this.app.config.env.appRouterMode === 'history'
+        ? createWebHistory
+        : createWebHashHistory;
+
+    return createRouter({
+      scrollBehavior: () => ({ left: 0, top: 0 }),
+      routes: [],
+      history: createHistory(this.app.config.env.appRouterBase),
+    });
   }
 
   public createAsyncComponent(component: string | IModuleRouteComponent) {
@@ -106,47 +102,6 @@ export class BeanRouter extends BeanBase {
     return `${fullPath}${join}${query2str}`;
   }
 
-  private _routerGuards(router: BeanRouter) {
-    router.beforeEach(async to => {
-      // match path
-      let match = to.matched.find(item => item.aliasOf);
-      if (match) {
-        match = match.aliasOf;
-      } else {
-        match = to.matched[to.matched.length - 1];
-        // alias
-        const configRoute = this._findConfigRoute(match?.name, match?.path);
-        const alias = configRoute?.alias;
-        if (alias) {
-          // force load module
-          const resLoadModule = await this._forceLoadModule(match?.name, match?.path);
-          if (resLoadModule && resLoadModule !== true) return resLoadModule;
-          if (resLoadModule === false) return to.fullPath;
-          if (this.getRealRouteName(match?.name)) {
-            // @ts-ignore ignore
-            const routeAlias = this.resolveName(`$alias:${match?.name}`, {
-              params: to.params,
-              query: to.query,
-            });
-            return routeAlias.startsWith('/__alias__') ? routeAlias.substring('/__alias__'.length) : routeAlias;
-          } else {
-            return {
-              path: Array.isArray(alias) ? alias[0] : alias,
-              params: to.params,
-              query: to.query,
-            };
-          }
-        }
-      }
-      // force load module
-      const resLoadModule = await this._forceLoadModule(match?.name, match?.path);
-      if (resLoadModule === true) return;
-      if (resLoadModule) return resLoadModule;
-      // redirect again
-      return to.fullPath;
-    });
-  }
-
   /** @internal */
   public _registerRoutes(module: IModule) {
     if (!module.resource.routes) return null;
@@ -240,7 +195,8 @@ export class BeanRouter extends BeanBase {
     this.router.addRoute(route);
   }
 
-  private _findConfigRoute(
+  /** @internal */
+  public _findConfigRoute(
     name: string | symbol | null | undefined,
     path: string | undefined,
   ): IModuleRoute | undefined {
@@ -251,27 +207,4 @@ export class BeanRouter extends BeanBase {
   getRealRouteName(name?: string | symbol | null): string | undefined {
     return getRealRouteName(name);
   }
-
-  private async _forceLoadModule(
-    name: string | symbol | null | undefined,
-    path: string | undefined,
-  ): Promise<string | boolean | undefined> {
-    const nameOrPath = this.getRealRouteName(name) || path;
-    // module info
-    const moduleInfo = ModuleInfo.parseInfo(ModuleInfo.parseName(nameOrPath));
-    if (!moduleInfo) {
-      // donothing
-      return true;
-    }
-    const moduleName = moduleInfo.relativeName;
-    // check if exists
-    if (!this.app.meta.module.exists(moduleName)) return '/404';
-    // check if loaded
-    const module = this.app.meta.module.get(moduleName, false);
-    if (module) return true;
-    // use module
-    await this.app.meta.module.use(moduleName);
-    // means need load
-    return false;
-  }
 }

package/src/bean/local.router.ts

@@ -0,0 +1,75 @@
+import { Local, Use } from 'zova';
+import * as ModuleInfo from '@cabloy/module-info';
+import { ScopeModule } from '../resource/this.js';
+import { BeanRouterBase } from './virtual.router.js';
+import { BeanRouter } from './bean.router.js';
+
+@Local()
+export class LocalRouter extends BeanRouterBase<ScopeModule> {
+  @Use()
+  $$router: BeanRouter;
+
+  protected onRouterGuards(router: BeanRouter) {
+    router.beforeEach(async to => {
+      // match path
+      let match = to.matched.find(item => item.aliasOf);
+      if (match) {
+        match = match.aliasOf;
+      } else {
+        match = to.matched[to.matched.length - 1];
+        // alias
+        const configRoute = this.$$router._findConfigRoute(match?.name, match?.path);
+        const alias = configRoute?.alias;
+        if (alias) {
+          // force load module
+          const resLoadModule = await this._forceLoadModule(match?.name, match?.path);
+          if (resLoadModule && resLoadModule !== true) return resLoadModule;
+          if (resLoadModule === false) return to.fullPath;
+          if (this.$$router.getRealRouteName(match?.name)) {
+            // @ts-ignore ignore
+            const routeAlias = this.resolveName(`$alias:${match?.name}`, {
+              params: to.params,
+              query: to.query,
+            });
+            return routeAlias.startsWith('/__alias__') ? routeAlias.substring('/__alias__'.length) : routeAlias;
+          } else {
+            return {
+              path: Array.isArray(alias) ? alias[0] : alias,
+              params: to.params,
+              query: to.query,
+            };
+          }
+        }
+      }
+      // force load module
+      const resLoadModule = await this._forceLoadModule(match?.name, match?.path);
+      if (resLoadModule === true) return;
+      if (resLoadModule) return resLoadModule;
+      // redirect again
+      return to.fullPath;
+    });
+  }
+
+  private async _forceLoadModule(
+    name: string | symbol | null | undefined,
+    path: string | undefined,
+  ): Promise<string | boolean | undefined> {
+    const nameOrPath = this.$$router.getRealRouteName(name) || path;
+    // module info
+    const moduleInfo = ModuleInfo.parseInfo(ModuleInfo.parseName(nameOrPath));
+    if (!moduleInfo) {
+      // donothing
+      return true;
+    }
+    const moduleName = moduleInfo.relativeName;
+    // check if exists
+    if (!this.app.meta.module.exists(moduleName)) return '/404';
+    // check if loaded
+    const module = this.app.meta.module.get(moduleName, false);
+    if (module) return true;
+    // use module
+    await this.app.meta.module.use(moduleName);
+    // means need load
+    return false;
+  }
+}

package/src/monkey.ts

@@ -17,11 +17,13 @@ import { BeanRouter } from './bean/bean.router.js';
 import { ScopeModule, __ThisModule__ } from './resource/this.js';
 import { markRaw } from 'vue';
 import { getRealRouteName } from './utils.js';
+import { LocalRouter } from './bean/local.router.js';
 
 export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule, IMonkeyController {
   private _moduleSelf: IModule;
   private _beanRouter: BeanRouter;
   private _beanComponentDefault: any;
+  localRouter: LocalRouter;
 
   constructor(moduleSelf: IModule) {
     super();
@@ -31,18 +33,25 @@ export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule,
   async getBeanRouter() {
     if (!this._beanRouter) {
       this._beanRouter = (await this.bean._getBean('a-router.bean.router', false)) as BeanRouter;
+      await this._beanRouter.initialize(true);
     }
     return this._beanRouter;
   }
 
-  async appInitialize(_bean: BeanContainer) {}
+  async appInitialize(bean: BeanContainer) {
+    // router
+    this.localRouter = await bean._newBean(LocalRouter, false);
+  }
   async appInitialized(bean: BeanContainer) {
     // component default
     const scope: ScopeModule = await bean.getScope(__ThisModule__);
     this._beanComponentDefault = await bean.getScope(scope.config.defaultComponent);
     // emit event
-    const router = bean.inject('a-router:router');
-    await this.app.meta.event.emit('a-router:routerGuards', router);
+    await this.app.meta.event.emit('a-router:routerGuards', this._beanRouter);
+  }
+  async appReady(_bean: BeanContainer) {
+    // use router
+    this.app.vue.use(this._beanRouter);
   }
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
     const self = this;
@@ -50,7 +59,7 @@ export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule,
       enumerable: false,
       configurable: true,
       get() {
-        return bean.inject('a-router:router');
+        return bean._getBeanFromHost('a-router.bean.router');
       },
     });
     bean.defineProperty(beanInstance, '$component', {

package/src/resource/index.ts

@@ -2,4 +2,3 @@ export * from './scope.js';
 export * from './beans.js';
 export * from './components.js';
 export * from './events.js';
-export * from './injects.js';

package/src/resource/injects.ts

@@ -1,10 +0,0 @@
-import { Router } from 'vue-router';
-import { BeanRouter } from '../bean/bean.router.js';
-
-import 'zova';
-declare module 'zova' {
-  export interface IInjectRecord {
-    'a-router:appRouter': Router;
-    'a-router:router': BeanRouter;
-  }
-}