cabloy 5.1.52 → 5.1.53

package/zova/src/front/config/config/config.ts

@@ -39,7 +39,7 @@ export default function (sys: ZovaSys) {
   config.ssr = {
     cookie: env.SSR_COOKIE === 'true',
     withVona: env.SSR_WITH_VONA === 'true',
-    ignoreCookieOnServer: process.env.SERVER && env.SSR_COOKIE === 'false',
+    cookieDisabledOnServer: process.env.SERVER && env.SSR_COOKIE === 'false',
     hmr: env.SSR_WITH_VONA === 'true' && env.META_MODE === 'development',
   };
 

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `demo-basic::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-devui/modules/devui-adapter/src/bean/meta.themeHandler.ts

@@ -26,6 +26,7 @@ export class MetaThemeHandler extends BeanBase implements IThemeHandler {
     } else {
       // server
       if (!this.sys.config.ssr.cookie) {
+        // BeanTheme applies twice in SSR Web mode so both dark/light markers are available here.
         this.$useMeta({ bodyAttr: { [`data-ssr-theme-dark-${dark}`]: themeName } });
       } else {
         this.$useMeta({

package/zova/src/suite/a-home/modules/home-base/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-base::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -15,7 +15,7 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
   protected onRouterGuards(router: BeanRouter) {
     router.beforeEach(async to => {
       if (
-        !this.sys.config.ssr.ignoreCookieOnServer &&
+        !this.sys.config.ssr.cookieDisabledOnServer &&
         to.meta.requiresAuth !== false &&
         !this.$passport.isAuthenticated
       ) {

package/zova/src/suite/a-home/modules/home-base/src/service/ssrLayout.ts

@@ -20,6 +20,7 @@ export class ServiceSsrLayout extends BeanBase {
       this.ctx.meta.$ssr.context.onRendered((err?: Error) => {
         if (err) return;
         if (!this.sys.config.ssr.cookie) {
+          // Apply the final browser-selected theme from the SSR dual markers as early as possible.
           this.ctx.meta.$ssr.context._meta.bodyTags += `<script id="__prefersColorSchemeDarkJS">
             document.body.setAttribute('data-theme', window.ssr_themedark_data);
             if(window.ssr_local_themename==='home-theme:orange'){

package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-layoutadmin::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-layoutweb::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

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

@@ -1,4 +1,4 @@
-import { BeanControllerBase, Use, useComputed, UseScope } from 'zova';
+import { BeanControllerBase, Use, UseScope } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryAutoLoad } from 'zova-module-a-model';
 import { ModelTabs, ModelTabsOptions, RouteTabInitial } from 'zova-module-a-routertabs';
@@ -37,7 +37,7 @@ export class ControllerLayoutWeb extends BeanControllerBase {
 
   protected async __init__() {
     // belowBreakpoint
-    this.belowBreakpoint = useComputed(() => {
+    this.belowBreakpoint = this.$computed(() => {
       let width;
       if (process.env.SERVER) {
         width = 0;

package/zova/src/suite/a-home/modules/home-login/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-login::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

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

@@ -37,7 +37,7 @@ export class ModelPassport extends BeanModelBase {
       : this.$useStateMem({ queryKey: ['passport'] });
     this.jwt = this.$useStateLocal({ queryKey: ['jwt'] });
     this.expireTime = this.$useStateLocal({ queryKey: ['expireTime'] });
-    this.accessToken = this.sys.config.ssr.ignoreCookieOnServer
+    this.accessToken = this.sys.config.ssr.cookieDisabledOnServer
       ? undefined
       : this.$useStateCookie({ queryKey: ['token'] });
     if (process.env.CLIENT) {
@@ -153,7 +153,7 @@ export class ModelPassport extends BeanModelBase {
 
   async ensurePassport() {
     if (process.env.CLIENT) return this.passport;
-    if (!this.sys.config.ssr.ignoreCookieOnServer && !this.isAuthenticated && this.accessToken) {
+    if (!this.sys.config.ssr.cookieDisabledOnServer && !this.isAuthenticated && this.accessToken) {
       this.passport = await this.$api.homeUserPassport.current();
       this._setLocaleTz();
     }

package/zova/src/suite/cabloy-basic/modules/basic-captcha/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-captcha::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-form/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-form::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-page/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-page::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-pageentry/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-pageentry::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-table/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-table::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

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

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

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

@@ -55,7 +55,7 @@ export class InterceptorJwt
     authToken: string | boolean | undefined,
   ): Promise<string | undefined> {
     if (!this.sys.config.api.jwt) return;
-    if (this.sys.config.ssr.ignoreCookieOnServer) return;
+    if (this.sys.config.ssr.cookieDisabledOnServer) return;
     // use default in scope.config rather than IInterceptorOptionsJwt.options
     const authTokenCurrent = authToken ?? this.scope.config.authToken.default;
     // authToken = authToken ?? this.scope.config.authToken.default;

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

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

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

@@ -164,6 +164,7 @@ export class CtxSSRMetaStore extends BeanSimple {
           ssr_local_themedark=window.matchMedia('(prefers-color-scheme: dark)').matches;
         }
         window.ssr_themedark=window.ssr_local_themedark=ssr_local_themedark;`;
+    // Resolve the final browser theme from the SSR dual markers emitted before page render.
     ssr_local_themedark += `Object.defineProperty(window, 'ssr_themedark_data', {
           get: () => {
             let _data=document.body.getAttribute('data-ssr-theme-dark-'+window.ssr_themedark);

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

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

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

@@ -66,7 +66,7 @@ export class BeanTheme extends BeanModelBase {
     }
 
     // not use watch.immediate for await done
-    await this._applyThemeWrapper();
+    await this._applyInitialThemeAndSsrDualOutput();
   }
 
   protected __dispose__() {
@@ -77,9 +77,12 @@ export class BeanTheme extends BeanModelBase {
     this._dark = this._getDarkFromDarkMode(this.darkMode);
   }
 
-  async _applyThemeWrapper() {
+  async _applyInitialThemeAndSsrDualOutput() {
+    // When server-side theme cookies are disabled, apply twice during SSR initialization so the
+    // server emits both data-ssr-theme-dark-false/true markers and the browser can resolve the
+    // final data-theme during bootstrap.
     await this._applyTheme();
-    if (this.sys.config.ssr.ignoreCookieOnServer) {
+    if (this.sys.config.ssr.cookieDisabledOnServer) {
       this.toggleDark();
       await this._applyTheme();
     }

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

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

package/zova/src/suite-vendor/a-zova/modules/a-zod/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `a-zod::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.61",
+  "version": "5.1.62",
   "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.55"
+    "zova-jsx": "^1.1.56"
   },
   "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.93",
+  "version": "5.1.94",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "zova-module-a-fetch": "^5.1.17",
     "zova-module-a-form": "^5.1.32",
     "zova-module-a-icon": "^5.1.20",
-    "zova-module-a-interceptor": "^5.1.22",
+    "zova-module-a-interceptor": "^5.1.23",
     "zova-module-a-logger": "^5.1.20",
     "zova-module-a-meta": "^5.1.15",
     "zova-module-a-model": "^5.1.24",
@@ -26,13 +26,13 @@
     "zova-module-a-router": "^5.1.23",
     "zova-module-a-routerstack": "^5.1.20",
     "zova-module-a-routertabs": "^5.1.25",
-    "zova-module-a-ssr": "^5.1.19",
+    "zova-module-a-ssr": "^5.1.20",
     "zova-module-a-ssrhmr": "^5.1.16",
     "zova-module-a-ssrserver": "^5.1.16",
-    "zova-module-a-style": "^5.1.25",
+    "zova-module-a-style": "^5.1.26",
     "zova-module-a-table": "^5.1.27",
-    "zova-module-a-zod": "^5.1.23",
-    "zova-module-a-zova": "^5.1.61"
+    "zova-module-a-zod": "^5.1.24",
+    "zova-module-a-zova": "^5.1.62"
   },
   "title": "a-zova"
 }