zova-module-a-router 5.0.42 → 5.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.0.42",
+  "version": "5.0.44",
   "title": "a-router",
   "zovaModule": {
     "capabilities": {
@@ -40,5 +40,5 @@
   "dependencies": {
     "vue-router": "^4.3.2"
   },
-  "gitHead": "6b24f8fbc3857e405882791f096d19d146675077"
+  "gitHead": "35a08c3d5f5376918c3ce38fcd51134632f829ca"
 }

package/src/bean/bean.router.ts

@@ -109,10 +109,14 @@ export class BeanRouter extends BeanBase {
         // donothing
         return;
       }
-      const module = this.app.meta.module.get(moduleInfo.relativeName);
+      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;
       // use module
-      await this.app.meta.module.use(fullPath);
+      await this.app.meta.module.use(moduleName);
       // redirect again
       return fullPath;
     });

package/src/config/config.ts

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

package/src/monkey.ts

@@ -14,10 +14,13 @@ import {
 import * as ModuleInfo from '@cabloy/module-info';
 import { useRoute } from 'vue-router';
 import { BeanRouter } from './bean/bean.router.js';
+import { ScopeModule, __ThisModule__ } from './resource/this.js';
+import { markRaw } from 'vue';
 
 export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule, IMonkeyController {
-  private _beanRouter: BeanRouter;
   private _moduleSelf: IModule;
+  private _beanRouter: BeanRouter;
+  private _beanComponentDefault: any;
 
   constructor(moduleSelf: IModule) {
     super();
@@ -33,11 +36,15 @@ export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule,
 
   async appInitialize(_bean: BeanContainer) {}
   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);
   }
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
+    const self = this;
     bean.defineProperty(beanInstance, '$router', {
       enumerable: false,
       configurable: true,
@@ -45,6 +52,13 @@ export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule,
         return bean.inject('a-router:router');
       },
     });
+    bean.defineProperty(beanInstance, '$component', {
+      enumerable: false,
+      configurable: true,
+      get() {
+        return markRaw(self._beanComponentDefault.component);
+      },
+    });
   }
   async beanInited(_bean: BeanContainer, _beanInstance: BeanBase) {}
   beanDispose(_bean: BeanContainer, _beanInstance: BeanBase) {}