cabloy 5.1.111 → 5.1.113

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

@@ -51,24 +51,43 @@ export class MonkeySys
       error.message = process.env.SERVER ? error.url : error.pagePath;
       throw error;
     };
-    app.$gotoPage = (pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult => {
-      const query = options?.query ?? {};
+    app.$getPagePath = (pagePath, options) => {
+      const query = { ...options?.query };
       // returnTo
       if (options?.returnTo) {
         const returnTo =
-          typeof options?.returnTo === 'string' ? options?.returnTo : app.$getCurrentPagePath();
+          typeof options.returnTo === 'string' ? options.returnTo : app.$getCurrentPagePath();
         if (returnTo !== app.$getPagePathHome()) {
           query[app.sys.env.ROUTER_KEY_RETURNTO] = returnTo;
         }
       }
-      // combineParamsAndQuery
-      pagePath = app.meta.$router.getPagePath(
+      return app.meta.$router.getPagePath(
         pagePath as never,
         {
           params: options?.params,
           query,
         } as never,
       );
+    };
+    app.$getPagePathLogin = (returnTo?: string, cause?: string) => {
+      const query: any = {};
+      if (cause) {
+        query.cause = cause;
+      }
+      const returnTo2 = returnTo === app.sys.env.ROUTER_PAGE_LOGIN ? undefined : returnTo;
+      return app.$getPagePath(
+        app.sys.env.ROUTER_PAGE_LOGIN as never,
+        {
+          query,
+          returnTo: returnTo2,
+        } as never,
+      );
+    };
+    app.$getPagePathAccessDenied = () => {
+      return app.$getPagePath('/home/base/errorAccessDenied' as never);
+    };
+    app.$gotoPage = (pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult => {
+      pagePath = app.$getPagePath(pagePath as never, options as never);
       // redirect
       if (process.env.SERVER || options?.forceRedirect) {
         return app.$redirect(pagePath);
@@ -91,15 +110,12 @@ export class MonkeySys
       ) {
         return;
       }
-      const query: any = {};
-      if (cause) {
-        query.cause = cause;
-      }
-      const returnTo2 = returnTo === app.sys.env.ROUTER_PAGE_LOGIN ? undefined : (returnTo ?? true);
-      return app.$gotoPage(app.sys.env.ROUTER_PAGE_LOGIN, { query, returnTo: returnTo2 });
+      const returnTo2 = returnTo ?? app.$getCurrentPagePath();
+      const pagePath = app.$getPagePathLogin(returnTo2, cause);
+      return app.$gotoPage(pagePath);
     };
     app.$gotoAccessDenied = () => {
-      const pagePath = '/home/base/errorAccessDenied';
+      const pagePath = app.$getPagePathAccessDenied();
       if (cast(app.meta.$router.currentRoute)?.path === pagePath) return;
       return app.$gotoPage(pagePath, { replace: true });
     };

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

@@ -33,18 +33,16 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
           const resLoadModule = await this._forceLoadModule(router, match?.name, match?.path);
           if (resLoadModule && resLoadModule !== true) return resLoadModule;
           if (resLoadModule === false) return to.fullPath;
-          if (router.getRealRouteName(match?.name)) {
-            const routeAlias = router.resolveName(
-              `$alias:${match?.name as string}` as never,
+          const name = router.getRealRouteName(match?.name);
+          if (name) {
+            const routeAlias = router.getAliasPath(
+              name as never,
               {
                 params: to.params,
                 query: to.query,
-              } as any,
+              } as never,
             );
-            const fullPath = routeAlias.startsWith('/__alias__')
-              ? routeAlias.substring('/__alias__'.length)
-              : routeAlias;
-            return fullPath || '/';
+            return routeAlias || '/';
           } else {
             return {
               path: Array.isArray(alias) ? alias[0] : alias,

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

@@ -17,7 +17,7 @@ import type {
 
 import type { BeanRouter } from '../bean/bean.router.js';
 import type { BeanRouterViewBase } from '../lib/routerViewBase.js';
-import type { IGotoPageOptions } from './utils.js';
+import type { IGetPagePathOptions, IGotoPageOptions } from './utils.js';
 import 'vue-router';
 
 export type Lazy<T> = () => Promise<T>;
@@ -49,6 +49,12 @@ declare module '@cabloy/vue-router' {
 declare module 'zova' {
   export interface ZovaApplication {
     $redirect(pagePath: string, status?: 301 | 302): never;
+    $getPagePath<K extends keyof IPagePathRecord>(
+      pagePath: K,
+      options?: IPagePathRecord[K] & IGetPagePathOptions,
+    ): string;
+    $getPagePathLogin(returnTo?: string, cause?: string): string;
+    $getPagePathAccessDenied(): string;
     $gotoPage(pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoHome(options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoLogin(returnTo?: string, cause?: string): TypeGotoPageResult;
@@ -122,8 +128,14 @@ export interface TypePageSchema {
 }
 export type TypePageSchemas = Record<string, TypePageSchema>;
 
+type TypePagePathParams<PARAMS> = PARAMS extends object
+  ? {
+      [K in keyof PARAMS]: K extends 'locale' ? PARAMS[K] | true : PARAMS[K];
+    }
+  : PARAMS;
+
 export interface TypePagePathSchema<PARAMS = unknown, QUERY = unknown> {
-  params?: PARAMS;
+  params?: TypePagePathParams<PARAMS>;
   query?: QUERY;
 }
 

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

@@ -2,8 +2,11 @@ import { IParamsAndQuery } from '@cabloy/utils';
 
 export const SymbolRouterHistory = Symbol('SymbolRouterHistory');
 
-export interface IGotoPageOptions extends IParamsAndQuery {
+export interface IGetPagePathOptions extends IParamsAndQuery {
   returnTo?: string | boolean;
+}
+
+export interface IGotoPageOptions extends IGetPagePathOptions {
   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.137",
+  "version": "5.1.138",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -10,20 +10,20 @@
   "dependencies": {
     "zova-module-a-api": "^5.1.21",
     "zova-module-a-app": "^5.1.25",
-    "zova-module-a-bean": "^5.1.31",
+    "zova-module-a-bean": "^5.1.32",
     "zova-module-a-behavior": "^5.1.25",
     "zova-module-a-behaviors": "^5.1.21",
     "zova-module-a-boundary": "^5.1.21",
     "zova-module-a-command": "^5.1.33",
-    "zova-module-a-fetch": "^5.1.23",
+    "zova-module-a-fetch": "^5.1.24",
     "zova-module-a-form": "^5.1.45",
     "zova-module-a-icon": "^5.1.26",
     "zova-module-a-interceptor": "^5.1.29",
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
     "zova-module-a-model": "^5.1.33",
-    "zova-module-a-openapi": "^5.1.45",
-    "zova-module-a-router": "^5.1.30",
+    "zova-module-a-openapi": "^5.1.46",
+    "zova-module-a-router": "^5.1.31",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.33",
     "zova-module-a-ssr": "^5.1.31",

package/CLAUDE.local.md

@@ -1,4 +0,0 @@
-# Local Claude Code Instructions
-
-After implementation, do not launch broad review automatically.
-If a review is needed, keep it scoped to the current diff and report only high-confidence issues.