cabloy 5.1.47 → 5.1.49

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 5.1.49
+
+### Features
+
+- Add typed locale parameters for the home page.
+- Support route parameters in router navigation.
+
+### Bug Fixes
+
+- Resolve localized menu page paths.
+
+### Improvements
+
+- Update `render.tabs.tsx`.
+
+## 5.1.48
+
+### Bug Fixes
+
+- Prevent crashes caused by disposed modules during SSR history navigation.
+
+### Improvements
+
+- Update the `ssrMenuGroup` demo.
+
 ## 5.1.47
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.47",
+  "version": "5.1.49",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/vona/src/suite/a-demo/modules/demo-basic/src/bean/ssrMenuGroup.demo.ts

@@ -13,7 +13,7 @@ export interface ISsrMenuGroupOptionsDemo extends IDecoratorSsrMenuGroupOptions<
   item: {
     title: $locale('Demo'),
     order: $order(2),
-    icon: ':editor:code-block',
+    icon: undefined,
   },
   site: ['basic-siteweb:web'],
 })

package/zova/env/.env.cabloyBasicWeb

@@ -1,3 +1,5 @@
+ROUTER_PAGE_HOME = /:locale
+
 LAYOUT_COMPONENT_DEFAULT = home-layoutweb:layoutWeb
 LAYOUT_SIDEBAR_LEFTOPENPC = false
 

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.53",
+  "version": "1.1.54",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.32",
-    "zova-core": "^5.1.47"
+    "zova-core": "^5.1.48"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.90",
+  "version": "5.1.92",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.47",
-    "zova-suite-a-zova": "^5.1.89"
+    "zova-core": "^5.1.48",
+    "zova-suite-a-zova": "^5.1.91"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.47",
+  "version": "5.1.48",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/core/component/module.ts

@@ -11,6 +11,7 @@ import type {
   IMonkeyApp,
   IMonkeyController,
   IMonkeyModule,
+  PluginZovaModulesMeta,
   TypeMonkeyName,
 } from '../../types/index.ts';
 
@@ -23,6 +24,14 @@ export class AppModule extends BeanSimple {
   private mainInstances: Record<string, IModuleMain> = {};
   private monkeyInstances: Record<string, IMonkeyModule & IMonkeyApp & IMonkeyController> = {};
 
+  private _ensureModulesMeta(): PluginZovaModulesMeta {
+    const modulesMeta = this.sys.meta.module.getModulesMeta();
+    if (!modulesMeta) {
+      throw new Error('module registry has been disposed');
+    }
+    return modulesMeta;
+  }
+
   /** @internal */
   public async initialize() {
     await this._requireAllSpecifics('preload');
@@ -34,6 +43,7 @@ export class AppModule extends BeanSimple {
   get(moduleName: string, forceLoad?: boolean): IModule | undefined;
   get(moduleName: IModuleInfo, forceLoad?: boolean): IModule | undefined;
   get(moduleName: string | IModuleInfo, forceLoad?: boolean): IModule | undefined {
+    if (!this.sys.meta.module.getModulesMeta()) return undefined;
     // module info
     if (!moduleName) return undefined;
     const moduleInfo =
@@ -67,8 +77,9 @@ export class AppModule extends BeanSimple {
     // should not try check get directly
     // const module = this.getOnly(relativeName);
     // if (module) return module;
+    const modulesMeta = this._ensureModulesMeta();
     // module
-    const moduleRepo = this.sys.meta.module.modulesMeta.modules[relativeName];
+    const moduleRepo = modulesMeta.modules[relativeName];
     if (!moduleRepo) throw new Error(`module not exists: ${relativeName}`);
     // install
     await this._install(relativeName, moduleRepo);
@@ -84,15 +95,16 @@ export class AppModule extends BeanSimple {
   }
 
   private async _requireAllSpecifics(capabilityName: 'preload' | 'monkey' | 'sync') {
-    const moduleNames = this.sys.meta.module.modulesMeta.moduleNames.filter(moduleName => {
-      const module = this.sys.meta.module.modulesMeta.modules[moduleName];
+    const modulesMeta = this._ensureModulesMeta();
+    const moduleNames = modulesMeta.moduleNames.filter(moduleName => {
+      const module = modulesMeta.modules[moduleName];
       return module.info.capabilities?.[capabilityName];
     });
     // if (moduleNames.length > 0) {
     //   this.sys.meta.logger.child('module', 'default').debug(`app modules: ${capabilityName}: ${moduleNames.join(',')}`);
     // }
     for (const moduleName of moduleNames) {
-      const module = this.sys.meta.module.modulesMeta.modules[moduleName];
+      const module = modulesMeta.modules[moduleName];
       await this._install(moduleName, module);
     }
   }
@@ -167,6 +179,8 @@ export class AppModule extends BeanSimple {
     moduleTarget?: IModule,
     ...monkeyData: any[]
   ) {
+    const modulesMeta = this.sys.meta.module.getModulesMeta();
+    if (!modulesMeta) return;
     // self: main
     if (moduleTarget) {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
@@ -178,8 +192,8 @@ export class AppModule extends BeanSimple {
       }
     }
     // module monkey
-    await forEach(this.sys.meta.module.modulesMeta.moduleNames, order, async key => {
-      const moduleMonkey: IModule = this.sys.meta.module.modulesMeta.modules[key];
+    await forEach(modulesMeta.moduleNames, order, async key => {
+      const moduleMonkey: IModule = modulesMeta.modules[key];
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {
@@ -217,6 +231,8 @@ export class AppModule extends BeanSimple {
     moduleTarget?: IModule,
     ...monkeyData: any[]
   ) {
+    const modulesMeta = this.sys.meta.module.getModulesMeta();
+    if (!modulesMeta) return;
     // self: main
     if (moduleTarget) {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
@@ -228,8 +244,8 @@ export class AppModule extends BeanSimple {
       }
     }
     // module monkey
-    forEachSync(this.sys.meta.module.modulesMeta.moduleNames, order, key => {
-      const moduleMonkey: IModule = this.sys.meta.module.modulesMeta.modules[key];
+    forEachSync(modulesMeta.moduleNames, order, key => {
+      const moduleMonkey: IModule = modulesMeta.modules[key];
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {

package/zova/packages-zova/zova-core/src/core/sys/module.ts

@@ -20,7 +20,7 @@ import { StateLock } from '../../utils/stateLock.ts';
 import { deepExtend } from '../sys/util.ts';
 
 export class SysModule extends BeanSimple {
-  public modulesMeta: PluginZovaModulesMeta;
+  public modulesMeta: PluginZovaModulesMeta | undefined;
   private modules: Record<string, IModule> = shallowReactive({});
   private mainInstances: Record<string, IModuleMainSys> = {};
   private monkeyInstances: Record<string, IMonkeyModuleSys & IMonkeySys> = {};
@@ -39,13 +39,26 @@ export class SysModule extends BeanSimple {
 
   /** @internal */
   public dispose() {
-    this.modulesMeta = undefined as any;
+    this.modulesMeta = undefined;
+  }
+
+  public getModulesMeta(): PluginZovaModulesMeta | undefined {
+    return this.modulesMeta;
+  }
+
+  private _ensureModulesMeta(): PluginZovaModulesMeta {
+    const modulesMeta = this.modulesMeta;
+    if (!modulesMeta) {
+      throw new Error('module registry has been disposed');
+    }
+    return modulesMeta;
   }
 
   get<K extends TypeBeanScopeRecordKeys>(moduleName: K): IModule | undefined;
   get(moduleName: string): IModule | undefined;
   get(moduleName: IModuleInfo): IModule | undefined;
   get(moduleName: string | IModuleInfo): IModule | undefined {
+    if (!this.modulesMeta) return undefined;
     // module info
     if (!moduleName) return undefined;
     const moduleInfo =
@@ -75,8 +88,9 @@ export class SysModule extends BeanSimple {
     // should not try check get directly
     // const module = this.getOnly(relativeName);
     // if (module) return module;
+    const modulesMeta = this._ensureModulesMeta();
     // module
-    const moduleRepo = this.modulesMeta.modules[relativeName];
+    const moduleRepo = modulesMeta.modules[relativeName];
     if (!moduleRepo) throw new Error(`module not exists: ${relativeName}`);
     // install
     await this._install(relativeName, moduleRepo);
@@ -88,19 +102,22 @@ export class SysModule extends BeanSimple {
   exists(moduleName: string): boolean;
   exists(moduleName: IModuleInfo): boolean;
   exists(moduleName: string | IModuleInfo): boolean {
+    const modulesMeta = this.modulesMeta;
+    if (!modulesMeta) return false;
     // module info
     if (!moduleName) return false;
     const moduleInfo =
       typeof moduleName === 'string' ? ModuleInfo.parseInfo(moduleName) : moduleName;
     if (!moduleInfo) throw new Error(`invalid module name: ${moduleName}`);
-    const moduleRepo = this.modulesMeta.modules[moduleInfo.relativeName];
+    const moduleRepo = modulesMeta.modules[moduleInfo.relativeName];
     return !!moduleRepo;
   }
 
   private async _loadAllMonkeysAndSyncsAndPreloads() {
+    const modulesMeta = this._ensureModulesMeta();
     const moduleNames: string[] = [];
-    for (const moduleName of this.modulesMeta.moduleNames) {
-      const module = this.modulesMeta.modules[moduleName];
+    for (const moduleName of modulesMeta.moduleNames) {
+      const module = modulesMeta.modules[moduleName];
       const info = module.info;
       const shouldLoad =
         process.env.SERVER ||
@@ -119,10 +136,11 @@ export class SysModule extends BeanSimple {
 
   public async loadModules(moduleNames: string[]) {
     if (moduleNames.length === 0) return;
+    const modulesMeta = this._ensureModulesMeta();
     const promises: Promise<IModuleResource>[] = [];
     const moduleNamesLoading: string[] = [];
     for (const moduleName of moduleNames) {
-      const module = this.modulesMeta.modules[moduleName];
+      const module = modulesMeta.modules[moduleName];
       if (!module) throw new Error(`module not found: ${moduleName}`);
       const moduleResource = module.resource as any;
       if (typeof moduleResource === 'function') {
@@ -137,13 +155,14 @@ export class SysModule extends BeanSimple {
     const modulesResource = await Promise.all(promises);
     for (let i = 0; i < modulesResource.length; i++) {
       const moduleName = moduleNamesLoading[i];
-      this.modulesMeta.modules[moduleName].resource = modulesResource[i];
+      modulesMeta.modules[moduleName].resource = modulesResource[i];
     }
   }
 
   private async _requireAllSpecifics(capabilityName: 'preload' | 'monkey' | 'sync') {
-    const moduleNames = this.modulesMeta.moduleNames.filter(moduleName => {
-      const module = this.modulesMeta.modules[moduleName];
+    const modulesMeta = this._ensureModulesMeta();
+    const moduleNames = modulesMeta.moduleNames.filter(moduleName => {
+      const module = modulesMeta.modules[moduleName];
       return module.info.capabilities?.[capabilityName];
     });
     if (moduleNames.length > 0) {
@@ -152,14 +171,15 @@ export class SysModule extends BeanSimple {
         .debug(`modules ${capabilityName}: ${moduleNames.join(',')}`);
     }
     for (const moduleName of moduleNames) {
-      const module = this.modulesMeta.modules[moduleName];
+      const module = modulesMeta.modules[moduleName];
       await this._install(moduleName, module);
     }
   }
 
   private async _requireAllOthers() {
-    for (const moduleName of this.modulesMeta.moduleNames) {
-      const module = this.modulesMeta.modules[moduleName];
+    const modulesMeta = this._ensureModulesMeta();
+    for (const moduleName of modulesMeta.moduleNames) {
+      const module = modulesMeta.modules[moduleName];
       const info = module.info;
       const shouldInstall =
         !info.capabilities?.monkey && !info.capabilities?.sync && !info.capabilities?.preload;
@@ -273,6 +293,8 @@ export class SysModule extends BeanSimple {
     moduleTarget?: IModule,
     ...monkeyData: any[]
   ) {
+    const modulesMeta = this.modulesMeta;
+    if (!modulesMeta) return;
     // self: main
     if (moduleTarget) {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
@@ -281,8 +303,8 @@ export class SysModule extends BeanSimple {
       }
     }
     // module monkey
-    await forEach(this.modulesMeta.moduleNames, order, async key => {
-      const moduleMonkey: IModule = this.modulesMeta.modules[key];
+    await forEach(modulesMeta.moduleNames, order, async key => {
+      const moduleMonkey: IModule = modulesMeta.modules[key];
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {
@@ -316,6 +338,8 @@ export class SysModule extends BeanSimple {
     moduleTarget?: IModule,
     ...monkeyData: any[]
   ) {
+    const modulesMeta = this.modulesMeta;
+    if (!modulesMeta) return;
     // self: main
     if (moduleTarget) {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
@@ -324,8 +348,8 @@ export class SysModule extends BeanSimple {
       }
     }
     // module monkey
-    forEachSync(this.modulesMeta.moduleNames, order, key => {
-      const moduleMonkey: IModule = this.modulesMeta.modules[key];
+    forEachSync(modulesMeta.moduleNames, order, key => {
+      const moduleMonkey: IModule = modulesMeta.modules[key];
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {

package/zova/packages-zova/zova-core/src/core/sys/sys.ts

@@ -96,11 +96,12 @@ export class ZovaSys {
       viteHot.on('vite:beforeFullReload', hook);
     }
     if (process.env.CLIENT && typeof window !== 'undefined') {
-      const hook = () => {
+      const hook = (event: PageTransitionEvent) => {
+        if (event.persisted) return;
         this.close();
-        window.removeEventListener('beforeunload', hook);
+        window.removeEventListener('pagehide', hook);
       };
-      window.addEventListener('beforeunload', hook);
+      window.addEventListener('pagehide', hook);
     }
   }
 

package/zova/pnpm-lock.yaml

@@ -131,7 +131,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.53
+        specifier: ^1.1.54
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -667,7 +667,7 @@ importers:
         specifier: ^3.5.32
         version: 3.5.34(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.47
+        specifier: ^5.1.48
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -808,10 +808,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.47
+        specifier: ^5.1.48
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.89
+        specifier: ^5.1.90
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -939,7 +939,7 @@ importers:
         specifier: ^5.1.18
         version: link:modules/a-app
       zova-module-a-bean:
-        specifier: ^5.1.24
+        specifier: ^5.1.25
         version: link:modules/a-bean
       zova-module-a-behavior:
         specifier: ^5.1.19
@@ -1005,7 +1005,7 @@ importers:
         specifier: ^5.1.23
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.59
+        specifier: ^5.1.60
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1344,7 +1344,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.53
+        specifier: ^1.1.54
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':

package/zova/src/suite/a-home/modules/home-indexweb/src/.metadata/index.ts

@@ -26,12 +26,13 @@ declare module 'zova' {
 /** controller: end */
 /** pages: begin */
 export * from './page/home.js';
+import { NSControllerPageHome } from './page/home.js';
 export * from '../routes.js';
 import { TypePagePathSchema } from 'zova-module-a-router';
 import 'zova';
 declare module 'zova-module-a-router' {
 export interface IPagePathRecord {
-  '/home/indexweb/home/:locale?': TypePagePathSchema<undefined,undefined>;
+  '/home/indexweb/home/:locale?': TypePagePathSchema<NSControllerPageHome.ParamsInput,undefined>;
 }
 export interface IPageNameRecord {
   'home-indexweb:home': undefined;
@@ -41,10 +42,15 @@ export const pagePathSchemas = {
 
 };
 export const pageNameSchemas = {
-
+'home-indexweb:home': {
+          params: NSControllerPageHome.paramsSchema,
+          
+        },
 };
 declare module 'zova-module-home-indexweb' {
-  
+  export interface ControllerPageHome {
+        $params: NSControllerPageHome.ParamsOutput;
+      }
 }
 /** pages: end */
 

package/zova/src/suite/a-home/modules/home-indexweb/src/.metadata/page/home.ts

@@ -1,5 +1,12 @@
+import { z } from 'zod';
 import { createZovaComponentPage } from 'zova';
 
 import { ControllerPageHome } from '../../page/home/controller.jsx';
+import { ControllerPageHomeSchemaParams } from '../../page/home/controller.jsx';
+export namespace NSControllerPageHome {
+  export const paramsSchema = ControllerPageHomeSchemaParams;
+  export type ParamsInput = z.input<typeof ControllerPageHomeSchemaParams>;
+  export type ParamsOutput = z.output<typeof ControllerPageHomeSchemaParams>;
+}
 
 export const ZPageHome = createZovaComponentPage(ControllerPageHome, undefined, undefined);

package/zova/src/suite/a-home/modules/home-indexweb/src/page/home/controller.tsx

@@ -1,6 +1,11 @@
+import { z } from 'zod';
 import { BeanControllerPageBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
+export const ControllerPageHomeSchemaParams = z.object({
+  locale: z.string().optional(),
+});
+
 @Controller()
 export class ControllerPageHome extends BeanControllerPageBase {
   public message: string;

package/zova/src/suite/a-home/modules/home-layoutadmin/src/model/menu.ts

@@ -49,8 +49,12 @@ export class ModelMenu extends BeanModelBase {
         });
         const menus = data.menus
           ?.map(item => {
-            if (item.link && !this.$router.isRouterName(item.link) && item.meta?.params) {
-              const link = this.sys.util.apiActionPathTranslate(item.link, item.meta?.params);
+            if (item.external || !item.link) return item;
+            if (this.$router.isRouterName(item.link)) {
+              const link = this.$router.resolveName(item.link as never, item.meta as never);
+              return { ...item, link };
+            } else if (item.meta?.params || item.meta?.query) {
+              const link = this.$router.getPagePath(item.link as never, item.meta as never);
               return { ...item, link };
             }
             return item;

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.header.tsx

@@ -17,7 +17,7 @@ export class RenderHeader extends BeanRenderBase {
             <button
               class="btn btn-square btn-ghost"
               onClick={() => {
-                this.app.$gotoHome();
+                this.app.$gotoHome({ params: { locale: true } });
               }}
             >
               <ZIcon name=":social:cabloy" width={24}></ZIcon>

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.tabs.tsx

@@ -146,16 +146,7 @@ export class RenderTabs extends BeanRenderBase {
     if (item.external || !item.link) return false;
     const currentRoute = this.$currentRoute;
     if (!currentRoute) return false;
-    const fullPath = this.$router.isRouterName(item.link)
-      ? this.$router.resolveName(
-          item.link as never,
-          {
-            params: item.meta?.params,
-            query: item.meta?.query,
-          } as never,
-        )
-      : this.$router.resolvePath(item.link as never, item.meta?.query as never);
-    return currentRoute.fullPath === fullPath;
+    return currentRoute.fullPath === item.link;
   }
 
   private _getMenuItemKey(item: TypeMenuItem): string {

package/zova/src/suite/a-home/modules/home-layoutweb/src/model/menu.ts

@@ -49,8 +49,12 @@ export class ModelMenu extends BeanModelBase {
         });
         const menus = data.menus
           ?.map(item => {
-            if (item.link && !this.$router.isRouterName(item.link) && item.meta?.params) {
-              const link = this.sys.util.apiActionPathTranslate(item.link, item.meta?.params);
+            if (item.external || !item.link) return item;
+            if (this.$router.isRouterName(item.link)) {
+              const link = this.$router.resolveName(item.link as never, item.meta as never);
+              return { ...item, link };
+            } else if (item.meta?.params || item.meta?.query) {
+              const link = this.$router.getPagePath(item.link as never, item.meta as never);
               return { ...item, link };
             }
             return item;

package/zova/src/suite-vendor/a-zova/modules/a-bean/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-bean",
-  "version": "5.1.24",
+  "version": "5.1.25",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-bean/src/monkeySys.ts

@@ -4,9 +4,13 @@ import { BeanSimple } from 'zova';
 
 export class MonkeySys extends BeanSimple implements IMonkeySysInitialize {
   async sysInitialize() {
+    const modulesMeta = this.sys.meta.module.getModulesMeta();
+    if (!modulesMeta) {
+      throw new Error('module registry has been disposed');
+    }
     let beansPreload: string[] = [];
-    for (const moduleName in this.sys.meta.module.modulesMeta.modules) {
-      const module = this.sys.meta.module.modulesMeta.modules[moduleName];
+    for (const moduleName in modulesMeta.modules) {
+      const module = modulesMeta.modules[moduleName];
       if (!module.info.onionsMeta?.beansPreload) continue;
       beansPreload = beansPreload.concat(module.info.onionsMeta?.beansPreload);
     }

package/zova/src/suite-vendor/a-zova/modules/a-bean/src/service/onion_.ts

@@ -1,5 +1,6 @@
 import type { ISwapDepsItem } from '@cabloy/deps';
 import type { OnionSceneMeta } from '@cabloy/module-info';
+import type { PluginZovaModulesMeta } from 'zova';
 import type { Next } from 'zova';
 
 import { compose as _compose } from '@cabloy/compose';
@@ -39,19 +40,23 @@ export class ServiceOnion<OPTIONS, ONIONNAME extends string> extends BeanSimple
     if (process.env.DEV && this.bean.containerType !== 'sys') {
       throw new Error('should in sys container');
     }
+    const modulesMeta = this.sys.meta.module.getModulesMeta();
+    if (!modulesMeta) {
+      throw new Error('module registry has been disposed');
+    }
     this.sysOnion = sysOnion;
     this.sceneName = sceneName;
-    this.sceneMeta = getOnionScenesMeta(this.sys.meta.module.modulesMeta.modules)[this.sceneName];
+    this.sceneMeta = getOnionScenesMeta(modulesMeta.modules)[this.sceneName];
     if (this.sceneMeta.optionsPackage) {
-      this._initOnionsAll();
+      this._initOnionsAll(modulesMeta);
       this._swapOnions(this.onionsAll);
     }
   }
 
-  private _initOnionsAll() {
+  private _initOnionsAll(modulesMeta: PluginZovaModulesMeta) {
     this.onionsAll = [];
-    for (const moduleName in this.sys.meta.module.modulesMeta.modules) {
-      const module = this.sys.meta.module.modulesMeta.modules[moduleName];
+    for (const moduleName in modulesMeta.modules) {
+      const module = modulesMeta.modules[moduleName];
       const nodeItems = module.info.onionsMeta?.onionsConfig?.[this.sceneName];
       if (!nodeItems) continue;
       for (const itemName in nodeItems) {

package/zova/src/suite-vendor/a-zova/modules/a-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-router",
-  "version": "5.1.21",
+  "version": "5.1.22",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "router",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-router/src/bean/sys.router.ts

@@ -96,10 +96,16 @@ export class SysRouter extends BeanBase {
     options?: IPagePathRecord[K],
     absolute?: boolean,
   ) {
-    const pagePath = combineParamsAndQuery(path, {
-      params: options?.params,
-      query: options?.query,
-    });
+    const query = options?.query;
+    let params = options?.params;
+    if (cast(params)?.locale === true) {
+      const locale =
+        this.app.meta.locale.current === this.sys.config.locale.default
+          ? undefined
+          : this.app.meta.locale.current;
+      params = Object.assign({}, params, { locale });
+    }
+    const pagePath = combineParamsAndQuery(path, { params, query });
     return absolute ? this.sys.util.getAbsoluteUrlFromPagePath(pagePath) : pagePath;
   }
 
@@ -208,13 +214,6 @@ export class SysRouter extends BeanBase {
     });
   }
 
-  resolvePath<K extends keyof IPagePathRecord>(path: K, query?: IPagePathRecord[K]): string {
-    return this._resolveNameOrPath(query, query => {
-      const route = this.router.resolve({ path, query });
-      return route.fullPath;
-    });
-  }
-
   private _resolveNameOrPath(query, fn) {
     const query1 = {};
     const query2: any = [];

package/zova/src/suite-vendor/a-zova/modules/a-router/src/monkeySys.ts

@@ -2,7 +2,6 @@ import type { IModule } from '@cabloy/module-info';
 import type { IMonkeyModuleSys, IMonkeySysApplicationInitialize, ZovaApplication } from 'zova';
 import type { ErrorSSR } from 'zova-module-a-ssr';
 
-import { combineQueries } from '@cabloy/utils';
 import { BeanSimple, cast, isHttpUrl } from 'zova';
 
 import type { SysRouter } from './bean/sys.router.js';
@@ -62,8 +61,14 @@ export class MonkeySys
           query[app.sys.env.ROUTER_KEY_RETURNTO] = returnTo;
         }
       }
-      // combineQueries
-      pagePath = combineQueries(pagePath, query);
+      // combineParamsAndQuery
+      pagePath = app.meta.$router.getPagePath(
+        pagePath as never,
+        {
+          params: options?.params,
+          query,
+        } as never,
+      );
       // redirect
       if (process.env.SERVER || options?.forceRedirect) {
         return app.$redirect(pagePath);
@@ -75,8 +80,8 @@ export class MonkeySys
         return app.meta.$router[options?.replace ? 'replace' : 'push'](pagePath);
       }
     };
-    app.$gotoHome = () => {
-      return app.$gotoPage(app.sys.env.ROUTER_PAGE_HOME);
+    app.$gotoHome = (options?: IGotoPageOptions) => {
+      return app.$gotoPage(app.sys.env.ROUTER_PAGE_HOME, options);
     };
     app.$gotoLogin = (returnTo?: string, cause?: string) => {
       if (!returnTo && cast(app.meta.$router.currentRoute)?.path === app.sys.env.ROUTER_PAGE_LOGIN)

package/zova/src/suite-vendor/a-zova/modules/a-router/src/types/router.ts

@@ -50,7 +50,7 @@ declare module 'zova' {
   export interface ZovaApplication {
     $redirect(pagePath: string, status?: 301 | 302): never;
     $gotoPage(pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult;
-    $gotoHome(): TypeGotoPageResult;
+    $gotoHome(options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoLogin(returnTo?: string, cause?: string): TypeGotoPageResult;
     $gotoReturnTo(returnTo?: string): TypeGotoPageResult;
     $getReturnTo(returnTo?: string): string;

package/zova/src/suite-vendor/a-zova/modules/a-router/src/types/utils.ts

@@ -1,7 +1,8 @@
+import { IParamsAndQuery } from '@cabloy/utils';
+
 export const SymbolRouterHistory = Symbol('SymbolRouterHistory');
 
-export interface IGotoPageOptions {
-  query?: object;
+export interface IGotoPageOptions extends IParamsAndQuery {
   returnTo?: string | boolean;
   forceRedirect?: boolean;
   replace?: boolean;

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.59",
+  "version": "5.1.60",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.53"
+    "zova-jsx": "^1.1.54"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.14",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.89",
+  "version": "5.1.91",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "dependencies": {
     "zova-module-a-api": "^5.1.15",
     "zova-module-a-app": "^5.1.18",
-    "zova-module-a-bean": "^5.1.24",
+    "zova-module-a-bean": "^5.1.25",
     "zova-module-a-behavior": "^5.1.19",
     "zova-module-a-behaviors": "^5.1.15",
     "zova-module-a-boundary": "^5.1.15",
@@ -23,7 +23,7 @@
     "zova-module-a-meta": "^5.1.15",
     "zova-module-a-model": "^5.1.23",
     "zova-module-a-openapi": "^5.1.30",
-    "zova-module-a-router": "^5.1.21",
+    "zova-module-a-router": "^5.1.22",
     "zova-module-a-routerstack": "^5.1.20",
     "zova-module-a-routertabs": "^5.1.24",
     "zova-module-a-ssr": "^5.1.18",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.25",
     "zova-module-a-table": "^5.1.27",
     "zova-module-a-zod": "^5.1.23",
-    "zova-module-a-zova": "^5.1.59"
+    "zova-module-a-zova": "^5.1.60"
   },
   "title": "a-zova"
 }