zova-module-a-router 5.0.38 → 5.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.0.38",
+  "version": "5.0.40",
   "title": "a-router",
   "zovaModule": {
     "capabilities": {
@@ -37,5 +37,5 @@
   "dependencies": {
     "vue-router": "^4.3.2"
   },
-  "gitHead": "90bb78df182aa8db862d6b44e86d23aa33b195fa"
+  "gitHead": "8816955c45f2fc3911d5eebf5b09764f54777123"
 }

package/src/bean/bean.router.ts

@@ -5,9 +5,9 @@ import { IModuleRoute, IModuleRouteComponent } from '../types.js';
 
 const SymbolRouter = Symbol('SymbolRouter');
 
-export type BeanRouterLike = BeanRouter & Router;
+export interface BeanRouter extends Router {}
 
-@Bean({ scene: 'bean', name: 'router', containerScope: 'ctx' })
+@Bean()
 export class BeanRouter extends BeanBase {
   [SymbolRouter]: Router;
   eventRouterGuards: TypeEventOff;
@@ -27,7 +27,8 @@ export class BeanRouter extends BeanBase {
       if (!router) {
         throw new Error('Should provide router');
       }
-      this.bean.provide('a-router:router', Cast<BeanRouterLike>(this));
+      this.app.vue.provide('a-router:router', this);
+      this.bean.provide('a-router:router', this);
       // event
       this.eventRouterGuards = this.app.meta.event.on('a-router:routerGuards', async (context, next) => {
         this._routerGuards(context.data);
@@ -98,7 +99,7 @@ export class BeanRouter extends BeanBase {
     return `${fullPath}${join}${query2str}`;
   }
 
-  private _routerGuards(router: BeanRouterLike) {
+  private _routerGuards(router: BeanRouter) {
     router.beforeEach(async to => {
       // fullPath
       const fullPath = to.fullPath;

package/src/bean/virtual.router.ts

@@ -1,5 +1,5 @@
 import { BeanBase, TypeEventOff, Virtual } from 'zova';
-import { BeanRouterLike } from './bean.router.js';
+import { BeanRouter } from './bean.router.js';
 
 @Virtual()
 export class BeanRouterBase<TScopeModule = unknown> extends BeanBase<TScopeModule> {
@@ -18,5 +18,5 @@ export class BeanRouterBase<TScopeModule = unknown> extends BeanBase<TScopeModul
     }
   }
 
-  protected onRouterGuards(_router: BeanRouterLike) {}
+  protected onRouterGuards(_router: BeanRouter) {}
 }

package/src/monkey.ts

@@ -13,10 +13,10 @@ import {
 } from 'zova';
 import * as ModuleInfo from '@cabloy/module-info';
 import { useRoute } from 'vue-router';
-import { BeanRouterLike } from './bean/bean.router.js';
+import { BeanRouter } from './bean/bean.router.js';
 
 export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule, IMonkeyController {
-  private _beanRouter: BeanRouterLike;
+  private _beanRouter: BeanRouter;
   private _moduleSelf: IModule;
 
   constructor(moduleSelf: IModule) {
@@ -26,15 +26,15 @@ 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 BeanRouterLike;
+      this._beanRouter = (await this.bean._getBean('a-router.bean.router', false)) as BeanRouter;
     }
     return this._beanRouter;
   }
 
   async appInitialize(_bean: BeanContainerLike) {}
-  async appInitialized(_bean: BeanContainerLike) {
+  async appInitialized(bean: BeanContainerLike) {
     // emit event
-    const router = this.bean.inject('a-router:router');
+    const router = bean.inject('a-router:router');
     await this.app.meta.event.emit('a-router:routerGuards', router);
   }
   async beanInit(bean: BeanContainerLike, beanInstance: BeanBase) {

package/src/resource/events.ts

@@ -1,9 +1,9 @@
-import { BeanRouterLike } from './beans.js';
+import { BeanRouter } from './beans.js';
 
 import 'zova';
 declare module 'zova' {
   export interface IEventRecord {
-    'a-router:routerGuards': BeanRouterLike;
+    'a-router:routerGuards': BeanRouter;
   }
 
   export interface IEventResultRecord {

package/src/resource/injects.ts

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

package/src/types.ts

@@ -1,6 +1,6 @@
 import { IComponentLayoutRecord, TypePageSchemas } from 'zova';
 import { RouteComponent, RouteLocationNormalizedLoaded, RouteRecordRaw } from 'vue-router';
-import { BeanRouterLike } from './bean/bean.router.js';
+import { BeanRouter } from './bean/bean.router.js';
 
 export type Lazy<T> = () => Promise<T>;
 export type IModuleRouteComponent = RouteComponent | Lazy<RouteComponent>;
@@ -17,7 +17,7 @@ declare module 'vue-router' {
 
 declare module 'zova' {
   export interface BeanBase {
-    $router: BeanRouterLike;
+    $router: BeanRouter;
   }
 
   export interface IModuleResource {