cabloy 5.1.48 → 5.1.49

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # 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

package/package.json

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

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-zova/zova/package.json

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

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-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.90",
+  "version": "5.1.91",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -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",