cabloy 5.1.136 → 5.1.138

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

@@ -4,15 +4,15 @@ export * from '../model/pageData.js';
 import { IModelOptionsPageData } from '../model/pageData.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'a-router:pageData': IModelOptionsPageData;
     }
 
-  
+
 }
 declare module 'zova-module-a-router' {
-  
+
         export interface ModelPageData {
           /** @internal */
           get scope(): ScopeModuleARouter;
@@ -22,7 +22,7 @@ declare module 'zova-module-a-router' {
           get $beanFullName(): 'a-router.model.pageData';
           get $onionName(): 'a-router:pageData';
           get $onionOptions(): IModelOptionsPageData;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -39,11 +39,11 @@ export * from '../bean/sys.router.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-router' {
-  
+
         export interface SysRouter {
           /** @internal */
           get scope(): ScopeModuleARouter;
@@ -52,8 +52,8 @@ declare module 'zova-module-a-router' {
         export interface SysRouter {
           get $beanFullName(): 'a-router.sys.router';
           get $onionName(): 'a-router:router';
-          
-        } 
+
+        }
 }
 /** sys: end */
 /** sys: begin */
@@ -71,11 +71,11 @@ export * from '../bean/bean.routerGuardsBase.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-router' {
-  
+
         export interface BeanRouter {
           /** @internal */
           get scope(): ScopeModuleARouter;
@@ -84,8 +84,8 @@ declare module 'zova-module-a-router' {
         export interface BeanRouter {
           get $beanFullName(): 'a-router.bean.router';
           get $onionName(): 'a-router:router';
-          
-        } 
+
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -104,15 +104,15 @@ export * from '../service/routerGuards.js';
 
 import 'zova-module-a-bean';
 declare module 'zova-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-router:routerGuards': never;
     }
 
-  
+
 }
 declare module 'zova-module-a-router' {
-  
+
         export interface ServiceRouterGuards {
           /** @internal */
           get scope(): ScopeModuleARouter;
@@ -121,8 +121,8 @@ declare module 'zova-module-a-router' {
         export interface ServiceRouterGuards {
           get $beanFullName(): 'a-router.service.routerGuards';
           get $onionName(): 'a-router:routerGuards';
-          
-        } 
+
+        }
 }
 /** service: end */
 /** service: begin */
@@ -139,15 +139,15 @@ export * from '../component/routerViewEmpty/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-router' {
-  
+
         export interface ControllerRouterViewEmpty {
           /** @internal */
           get scope(): ScopeModuleARouter;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -203,14 +203,14 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'a-router': ScopeModuleARouter;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-router': ReturnType<typeof config>;
   }
 
-  
 
-  
+
+
 }
-  
+
 /** scope: end */

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

@@ -64,17 +64,20 @@ export class Monkey
   }
 
   async appInitialize() {
-    const ssrState = this.ctx.meta.$ssr.state;
-    if (
-      process.env.SERVER &&
-      (ssrState.ssrProfile === undefined || ssrState.ssrProfileOptions === undefined)
-    ) {
+    if (process.env.SERVER) {
       const pagePathFull = this.app.$getCurrentPagePath();
       if (pagePathFull) {
         const sysRouter = await this._getSysRouter();
         const route = await sysRouter.resolveRoute(pagePathFull, true, false);
         if (route) {
-          this.ctx.meta.$ssr._setProfile(route.meta.ssrProfile, route.meta.ssrProfileOptions);
+          // ssr profile
+          this.ctx.meta.$ssr._setProfile(
+            route.meta.ssrProfile,
+            route.meta.ssrProfileOptions,
+            route.meta.locale,
+          );
+          // locale
+          this.ctx.meta.$ssr._setLocale(route);
         }
       }
     }

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

@@ -69,12 +69,12 @@ export class MonkeySys
         } as never,
       );
     };
-    app.$getPagePathLogin = (returnTo?: string, cause?: string) => {
+    app.$getPagePathLogin = (returnTo?: string | boolean, cause?: string) => {
       const query: any = {};
       if (cause) {
         query.cause = cause;
       }
-      const returnTo2 = returnTo === app.sys.env.ROUTER_PAGE_LOGIN ? undefined : returnTo;
+      const returnTo2 = _fixReturnTo(app, returnTo);
       return app.$getPagePath(
         app.sys.env.ROUTER_PAGE_LOGIN as never,
         {
@@ -103,14 +103,14 @@ export class MonkeySys
       const pagePath = app.$getPagePathHome(options);
       return app.$gotoPage(pagePath, { ...options, params: undefined });
     };
-    app.$gotoLogin = (returnTo?: string, cause?: string) => {
+    app.$gotoLogin = (returnTo?: string | boolean, cause?: string) => {
+      const returnTo2 = _fixReturnTo(app, returnTo);
       if (
-        !returnTo &&
+        !returnTo2 &&
         cast(app.meta.$router.currentRoute)?.path === app.sys.env.ROUTER_PAGE_LOGIN
       ) {
         return;
       }
-      const returnTo2 = returnTo ?? app.$getCurrentPagePath();
       const pagePath = app.$getPagePathLogin(returnTo2, cause);
       return app.$gotoPage(pagePath);
     };
@@ -153,3 +153,13 @@ export class MonkeySys
     };
   }
 }
+
+function _fixReturnTo(app: ZovaApplication, returnTo?: string | boolean) {
+  const returnTo2 =
+    returnTo === false
+      ? false
+      : typeof returnTo === 'string'
+        ? returnTo
+        : app.$getCurrentPagePath();
+  return returnTo2 === app.sys.env.ROUTER_PAGE_LOGIN ? false : returnTo2;
+}

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

@@ -53,11 +53,11 @@ declare module 'zova' {
       pagePath: K,
       options?: IPagePathRecord[K] & IGetPagePathOptions,
     ): string;
-    $getPagePathLogin(returnTo?: string, cause?: string): string;
+    $getPagePathLogin(returnTo?: string | boolean, cause?: string): string;
     $getPagePathAccessDenied(): string;
     $gotoPage(pagePath: string, options?: IGotoPageOptions): TypeGotoPageResult;
     $gotoHome(options?: IGotoPageOptions): TypeGotoPageResult;
-    $gotoLogin(returnTo?: string, cause?: string): TypeGotoPageResult;
+    $gotoLogin(returnTo?: string | boolean, cause?: string): TypeGotoPageResult;
     $gotoAccessDenied(): TypeGotoPageResult;
     $gotoReturnTo(returnTo?: string): TypeGotoPageResult;
     $getReturnTo(returnTo?: string): string;

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-routerstack",
-  "version": "5.1.26",
+  "version": "5.1.27",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-routerstack/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../model/stack.js';
 import { IModelOptionsStack } from '../model/stack.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'a-routerstack:stack': IModelOptionsStack;
     }
 
-  
+
 }
 declare module 'zova-module-a-routerstack' {
-  
+
         export interface ModelStack {
           /** @internal */
           get scope(): ScopeModuleARouterstack;
@@ -22,7 +22,7 @@ declare module 'zova-module-a-routerstack' {
           get $beanFullName(): 'a-routerstack.model.stack';
           get $onionName(): 'a-routerstack:stack';
           get $onionOptions(): IModelOptionsStack;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -39,15 +39,15 @@ export * from '../component/routerViewStack/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-routerstack' {
-  
+
         export interface ControllerRouterViewStack {
           /** @internal */
           get scope(): ScopeModuleARouterstack;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -92,12 +92,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'a-routerstack': ScopeModuleARouterstack;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-routertabs",
-  "version": "5.1.33",
+  "version": "5.1.34",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "routertabs",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-routertabs/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../model/tabs.js';
 import { IModelOptionsTabs } from '../model/tabs.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'a-routertabs:tabs': IModelOptionsTabs;
     }
 
-  
+
 }
 declare module 'zova-module-a-routertabs' {
-  
+
         export interface ModelTabs {
           /** @internal */
           get scope(): ScopeModuleARoutertabs;
@@ -22,7 +22,7 @@ declare module 'zova-module-a-routertabs' {
           get $beanFullName(): 'a-routertabs.model.tabs';
           get $onionName(): 'a-routertabs:tabs';
           get $onionOptions(): IModelOptionsTabs;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -39,15 +39,15 @@ export * from '../component/routerViewTabs/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-routertabs' {
-  
+
         export interface ControllerRouterViewTabs {
           /** @internal */
           get scope(): ScopeModuleARoutertabs;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -92,12 +92,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'a-routertabs': ScopeModuleARoutertabs;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.35",
+  "version": "5.1.36",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/.metadata/index.ts

@@ -4,11 +4,11 @@ export * from '../bean/sys.ssrState.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-a-ssr' {
-  
+
         export interface SysSsrState {
           /** @internal */
           get scope(): ScopeModuleASsr;
@@ -17,8 +17,8 @@ declare module 'zova-module-a-ssr' {
         export interface SysSsrState {
           get $beanFullName(): 'a-ssr.sys.ssrState';
           get $onionName(): 'a-ssr:ssrState';
-          
-        } 
+
+        }
 }
 /** sys: end */
 /** sys: begin */
@@ -57,14 +57,14 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'a-ssr': ScopeModuleASsr;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-ssr': ReturnType<typeof config>;
   }
 
-  
 
-  
+
+
 }
-  
+
 /** scope: end */

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssr.ts

@@ -1,6 +1,7 @@
 import type { ComponentInternalInstance, Ref, VNode } from 'vue';
-import type { Functionable, ZovaContext } from 'zova';
+import type { Functionable, ILocaleRecord, ZovaContext } from 'zova';
 
+import { RouteLocationNormalizedGeneric, RouteLocationResolvedGeneric } from '@cabloy/vue-router';
 import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
 import { defu } from 'defu';
 import { normalizeClass, normalizeStyle, ref, useSSRContext } from 'vue';
@@ -85,9 +86,9 @@ export class CtxSSR extends BeanSimple {
     for (const serverContext of serverContexts) {
       if (serverContext.disposed) continue;
       if (serverContext.bean && serverContext.bean !== serverContext.app?.bean) {
-        serverContext.bean.dispose();
+        (<any>serverContext.bean).dispose();
       }
-      serverContext.dispose();
+      (<any>serverContext).dispose();
     }
     serverContexts.clear();
   }
@@ -145,17 +146,26 @@ export class CtxSSR extends BeanSimple {
   public _setProfile(
     routeProfile: TypeSsrProfile | undefined,
     routeProfileOptions?: Readonly<ISsrRouteProfileOptions>,
+    metaLocale?: boolean,
   ) {
     const ssrProfile = resolveSsrProfile(routeProfile, this.sys.env.SSR_PROFILE);
     const ssrProfileOptions = resolveSsrProfileOptions(
       ssrProfile,
       this.sys.config.ssr.profiles,
       routeProfileOptions,
+      metaLocale,
     );
     this.state.ssrProfile = ssrProfile;
     this.state.ssrProfileOptions = ssrProfileOptions;
   }
 
+  /** @internal */
+  public _setLocale(route: RouteLocationResolvedGeneric | RouteLocationNormalizedGeneric) {
+    if (route.meta.locale) {
+      this.app.meta.locale.current = route.params?.locale as unknown as keyof ILocaleRecord;
+    }
+  }
+
   get cookieDisabledOnServer(): boolean {
     return process.env.SERVER && !this.profileOptions.useCookie;
   }
@@ -203,7 +213,8 @@ export class CtxSSR extends BeanSimple {
   }
 
   handleDirectOrOnHydrated(fn: Functionable) {
-    if (process.env.CLIENT && this.isRuntimeSsrPreHydration) {
+    if (!process.env.CLIENT) return;
+    if (this.isRuntimeSsrPreHydration) {
       this.onHydrated(fn);
     } else {
       return fn();

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssrNavigation.ts

@@ -0,0 +1,40 @@
+import type {
+  RouteLocationNormalizedGeneric,
+  RouteLocationResolvedGeneric,
+} from '@cabloy/vue-router';
+
+export type TypeSsrNavigationRoute = RouteLocationNormalizedGeneric | RouteLocationResolvedGeneric;
+
+export interface ISsrNavigationSync {
+  beforeEach(to: TypeSsrNavigationRoute): void;
+  afterEach(to: TypeSsrNavigationRoute, from: TypeSsrNavigationRoute, failure: unknown): void;
+}
+
+export interface ISsrNavigationSyncOptions<L> {
+  getLocale(): L;
+  setLocale(locale: L): void;
+  setProfile(route: TypeSsrNavigationRoute): void;
+  setRouteLocale(route: TypeSsrNavigationRoute): void;
+}
+
+export function createSsrNavigationSync<L>(
+  options: ISsrNavigationSyncOptions<L>,
+): ISsrNavigationSync {
+  const navigationLocales = new WeakMap<object, L>();
+  return {
+    beforeEach(to) {
+      navigationLocales.set(to, options.getLocale());
+      options.setProfile(to);
+      options.setRouteLocale(to);
+    },
+    afterEach(to, from, failure) {
+      const locale = navigationLocales.get(to);
+      navigationLocales.delete(to);
+      if (!failure) return;
+      options.setProfile(from);
+      if (locale !== undefined) {
+        options.setLocale(locale);
+      }
+    },
+  };
+}

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssrProfile.ts

@@ -22,12 +22,17 @@ export function resolveSsrProfileOptions(
   ssrProfile: TypeSsrProfile,
   profiles: Readonly<Record<TypeSsrProfile, ZovaConfigSsrProfile>>,
   routeProfileOptions?: Readonly<ISsrRouteProfileOptions>,
+  metaLocale?: boolean,
 ): Readonly<ISsrProfileOptions> {
   const profileOptions = profiles[ssrProfile];
   if (!profileOptions) {
     throw new Error(`invalid SSR profile: ${ssrProfile}`);
   }
-  const responseCache = routeProfileOptions?.responseCache ?? profileOptions.responseCache;
+  const responseCache =
+    routeProfileOptions?.responseCache ??
+    (ssrProfile === 'public' && metaLocale !== true
+      ? { expires: 0 }
+      : profileOptions.responseCache);
   return Object.freeze({
     useCookie: ssrProfile === 'session' && profileOptions.useCookie,
     responseCache:

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/monkey.ts

@@ -14,6 +14,7 @@ import { BeanSimple, cast } from 'zova';
 
 import type { SSRMetaOptions } from './types/ssr.js';
 
+import { createSsrNavigationSync } from './lib/ssrNavigation.js';
 import { useMeta } from './lib/useMeta.js';
 
 export class Monkey
@@ -30,14 +31,27 @@ export class Monkey
   async appInitialize() {
     this.app.meta.event.on('a-router:routerGuards', async (router, next) => {
       if (process.env.CLIENT) {
-        // Server profile state is prepared before appInitialize; this synchronizes client navigation.
+        const navigationSync = createSsrNavigationSync({
+          getLocale: () => this.app.meta.locale.current,
+          setLocale: locale => {
+            this.app.meta.locale.current = locale;
+          },
+          setProfile: route => {
+            this.ctx.meta.$ssr._setProfile(
+              route.meta.ssrProfile,
+              route.meta.ssrProfileOptions,
+              route.meta.locale,
+            );
+          },
+          setRouteLocale: route => {
+            this.ctx.meta.$ssr._setLocale(route);
+          },
+        });
         router.beforeEach(to => {
-          this.ctx.meta.$ssr._setProfile(to.meta.ssrProfile, to.meta.ssrProfileOptions);
+          navigationSync.beforeEach(to);
         });
-        router.afterEach((_to, from, failure) => {
-          if (failure) {
-            this.ctx.meta.$ssr._setProfile(from.meta.ssrProfile, from.meta.ssrProfileOptions);
-          }
+        router.afterEach((to, from, failure) => {
+          navigationSync.afterEach(to, from, failure);
         });
       }
       return await next();

package/zova/src/suite-vendor/a-zova/modules/a-ssr/test/lib/ssrNavigation.test.ts

@@ -0,0 +1,69 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import type { TypeSsrNavigationRoute } from '../../src/lib/ssrNavigation.ts';
+
+import { createSsrNavigationSync } from '../../src/lib/ssrNavigation.ts';
+
+function createRoute(locale?: string): TypeSsrNavigationRoute {
+  return {
+    meta: { locale: locale !== undefined },
+    params: locale === undefined ? {} : { locale },
+  } as TypeSsrNavigationRoute;
+}
+
+test('SSR navigation rollback restores the prior locale from a non-locale route', () => {
+  const from = createRoute();
+  const to = createRoute('zh-cn');
+  let locale = 'en-us';
+  let profileRoute: TypeSsrNavigationRoute | undefined;
+  const sync = createSsrNavigationSync({
+    getLocale: () => locale,
+    setLocale: value => {
+      locale = value;
+    },
+    setProfile: route => {
+      profileRoute = route;
+    },
+    setRouteLocale: route => {
+      if (route.meta.locale) {
+        locale = route.params.locale as string;
+      }
+    },
+  });
+
+  sync.beforeEach(to);
+  assert.equal(locale, 'zh-cn');
+  assert.equal(profileRoute, to);
+
+  sync.afterEach(to, from, new Error('blocked'));
+  assert.equal(locale, 'en-us');
+  assert.equal(profileRoute, from);
+});
+
+test('SSR navigation keeps destination profile and locale after success', () => {
+  const from = createRoute('en-us');
+  const to = createRoute('zh-cn');
+  let locale = 'en-us';
+  let profileRoute: TypeSsrNavigationRoute | undefined;
+  const sync = createSsrNavigationSync({
+    getLocale: () => locale,
+    setLocale: value => {
+      locale = value;
+    },
+    setProfile: route => {
+      profileRoute = route;
+    },
+    setRouteLocale: route => {
+      if (route.meta.locale) {
+        locale = route.params.locale as string;
+      }
+    },
+  });
+
+  sync.beforeEach(to);
+  sync.afterEach(to, from, undefined);
+
+  assert.equal(locale, 'zh-cn');
+  assert.equal(profileRoute, to);
+});