zova-module-a-router 5.0.56 → 5.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.0.56",
+  "version": "5.0.60",
   "title": "a-router",
   "zovaModule": {
     "capabilities": {
@@ -35,10 +35,10 @@
   "scripts": {
     "clean": "tsc -b --clean",
     "tsc:publish": "npm run clean && tsc -b",
-    "prepublishOnly": "npm run tsc:publish"
+    "_prepublishOnly": "npm run tsc:publish"
   },
   "dependencies": {
     "vue-router": "^4.3.2"
   },
-  "gitHead": "ff62e324389a802952e49a39e07a84aa9c057084"
+  "gitHead": "b87bdd8540395b181993a617d33cad57b3c4d446"
 }

package/src/.metadata/index.ts

@@ -0,0 +1,36 @@
+/** beans: begin */
+export * from '../bean/bean.router.js';
+export * from '../bean/bean.routerBase.js';
+import { BeanRouter } from '../bean/bean.router.js';
+import { BeanRouterBase } from '../bean/bean.routerBase.js';
+import 'zova';
+declare module 'zova' {
+  export interface IBeanRecord {
+    'a-router.bean.router': BeanRouter;
+    'a-router.bean.routerBase': BeanRouterBase;
+  }
+}
+/** beans: end */
+/** config: begin */
+export * from '../config/config.js';
+import { config } from '../config/config.js';
+/** config: end */
+/** scope: begin */
+import { BeanScopeBase, Scope, TypeModuleResource } from 'zova';
+
+@Scope()
+export class ScopeModuleARouter extends BeanScopeBase {}
+
+export interface ScopeModuleARouter extends TypeModuleResource<any, typeof config, any, any, any, any> {}
+
+import 'zova';
+declare module 'zova' {
+  export interface IBeanScopeRecord {
+    'a-router': ScopeModuleARouter;
+  }
+
+  export interface IBeanScopeConfig {
+    'a-router': ReturnType<typeof config>;
+  }
+}
+/** scope: end */

package/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'a-router';
+export { ScopeModuleARouter as ScopeModule } from './index.js';

package/src/bean/bean.router.ts

@@ -33,7 +33,7 @@ export class BeanRouter extends BeanBase {
   }
 
   private _createRouter() {
-    const createHistory = this.app.config.env.appServer
+    const createHistory = process.env.SERVER
       ? createMemoryHistory
       : this.app.config.env.appRouterMode === 'history'
         ? createWebHistory
@@ -68,7 +68,7 @@ export class BeanRouter extends BeanBase {
   }
 
   public checkPathValid(to?: { name?: string; path?: string } | string): boolean {
-    const _path = to && typeof to === 'object' ? to.name ?? to.path : to;
+    const _path = to && typeof to === 'object' ? (to.name ?? to.path) : to;
     if (!_path) return true;
     const moduleName = ModuleInfo.parseName(_path);
     if (!moduleName) return true;
@@ -113,11 +113,13 @@ export class BeanRouter extends BeanBase {
   private _registerRoute(module: IModule, route: IModuleRoute) {
     // path
     let path: string | undefined;
-    if (route.path) {
+    if (route.path !== undefined) {
       if (route.meta?.absolute === true) {
         path = route.path;
       } else {
-        path = `/${module.info.pid}/${module.info.name}/${route.path}`;
+        path = route.path
+          ? `/${module.info.pid}/${module.info.name}/${route.path}`
+          : `/${module.info.pid}/${module.info.name}`;
       }
     }
     // name

package/src/bean/local.router.ts

@@ -1,7 +1,7 @@
 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 { ScopeModule } from '../.metadata/this.js';
+import { BeanRouterBase } from './bean.routerBase.js';
 import { BeanRouter } from './bean.router.js';
 
 @Local()

package/src/index.ts

@@ -1,8 +1,3 @@
-export * from './config/index.js';
-export * from './resource/index.js';
-export * from './api/index.js';
-export * from './routes.js';
+export * from './.metadata/index.js';
 export * from './types.js';
 export * from './monkey.js';
-
-import './typings.js';

package/src/monkey.ts

@@ -14,7 +14,7 @@ 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 { ScopeModule, __ThisModule__ } from './.metadata/this.js';
 import { markRaw } from 'vue';
 import { getRealRouteName } from './utils.js';
 import { LocalRouter } from './bean/local.router.js';
@@ -52,6 +52,15 @@ export class Monkey extends BeanSimple implements IMonkeySystem, IMonkeyModule,
   async appReady(_bean: BeanContainer) {
     // use router
     this.app.vue.use(this._beanRouter);
+    // ssr
+    if (process.env.SERVER) {
+      // push
+      const url = this.ctx.meta.ssr.context.req.url;
+      this._beanRouter.push(url);
+      await this._beanRouter.isReady();
+    } else if (process.env.CLIENT && this.ctx.meta.ssr.isRuntimeSsrPreHydration) {
+      await this._beanRouter.isReady();
+    }
   }
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
     const self = this;

package/src/types.ts

@@ -42,4 +42,12 @@ declare module 'zova' {
     path: Record<keyof IPagePathRecord, IModuleRoute>;
     name: Record<keyof IPageNameRecord, IModuleRoute>;
   }
+
+  export interface IEventRecord {
+    'a-router:routerGuards': BeanRouter;
+  }
+
+  export interface IEventResultRecord {
+    'a-router:routerGuards': void;
+  }
 }

package/src/api/index.ts

@@ -1,2 +0,0 @@
-export * from './interface/index.js';
-export * from './service/index.js';

package/src/api/interface/index.ts

@@ -1 +0,0 @@
-export {};

package/src/api/service/index.ts

@@ -1 +0,0 @@
-export const services = {};

package/src/config/constants.ts

@@ -1 +0,0 @@
-export const constants = null;

package/src/config/errors.ts

@@ -1 +0,0 @@
-export enum Errors {}

package/src/config/index.ts

@@ -1,4 +0,0 @@
-export * from './locales.js';
-export * from './errors.js';
-export * from './config.js';
-export * from './constants.js';

package/src/config/locale/en-us.ts

@@ -1 +0,0 @@
-export default {};

package/src/config/locale/zh-cn.ts

@@ -1 +0,0 @@
-export default {};

package/src/config/locales.ts

@@ -1,7 +0,0 @@
-import en_us from './locale/en-us.js';
-import zh_cn from './locale/zh-cn.js';
-
-export const locales = {
-  'en-us': en_us,
-  'zh-cn': zh_cn,
-};

package/src/resource/beans.ts

@@ -1,9 +0,0 @@
-export * from '../bean/bean.router.js';
-export * from '../bean/virtual.router.js';
-import { BeanRouter } from '../bean/bean.router.js';
-import 'zova';
-declare module 'zova' {
-  export interface IBeanRecord {
-    'a-router.bean.router': BeanRouter;
-  }
-}

package/src/resource/components.ts

@@ -1 +0,0 @@
-export const components = {};

package/src/resource/events.ts

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

package/src/resource/index.ts

@@ -1,4 +0,0 @@
-export * from './scope.js';
-export * from './beans.js';
-export * from './components.js';
-export * from './events.js';

package/src/resource/scope.ts

@@ -1,32 +0,0 @@
-import { BeanScopeBase, Scope, TypeLocaleBase, TypeModuleResource } from 'zova';
-import { config, Errors, locales, constants } from '../config/index.js';
-import { components } from './components.js';
-import { services } from '../api/service/index.js';
-
-@Scope()
-export class ScopeModuleARouter extends BeanScopeBase {}
-
-export interface ScopeModuleARouter
-  extends TypeModuleResource<
-    typeof components,
-    typeof config,
-    typeof Errors,
-    (typeof locales)[TypeLocaleBase],
-    typeof constants,
-    typeof services
-  > {}
-
-import 'zova';
-declare module 'zova' {
-  export interface IBeanScopeRecord {
-    'a-router': ScopeModuleARouter;
-  }
-
-  export interface IBeanScopeConfig {
-    'a-router': ReturnType<typeof config>;
-  }
-
-  export interface IBeanScopeLocale {
-    'a-router': (typeof locales)[TypeLocaleBase];
-  }
-}

package/src/resource/this.ts

@@ -1,4 +0,0 @@
-export const __ThisModule__ = 'a-router';
-export type __ThisModuleType__ = typeof __ThisModule__;
-
-export { ScopeModuleARouter as ScopeModule } from './scope.js';

package/src/routes.ts

@@ -1,3 +0,0 @@
-import { IModuleRoute } from 'zova-module-a-router';
-
-export const routes: IModuleRoute[] = [];

package/src/typings.ts

@@ -1 +0,0 @@
-export {};