cabloy 5.1.236 → 5.1.239

package/vona/pnpm-lock.yaml

@@ -174,7 +174,7 @@ overrides:
   zod: npm:@cabloy/zod@4.3.8
 
 patchedDependencies:
-  zova-core@5.1.94: 144450bd7a567a6067e5857c0cf4c780981b7e90bc48745c09e1696a9b6f1b97
+  zova-core@5.1.95: 44197c3f359a73a1a5bb3dc0a8a97e705a55b30f9a434717aa24d75a96f2c6b6
 
 importers:
 
@@ -737,11 +737,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.176
-        version: 5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.177
+        version: 5.1.177(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.94
-        version: 1.1.94(typescript@5.9.3)
+        specifier: ^1.1.95
+        version: 1.1.95(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.23
         version: 5.1.23
@@ -803,8 +803,8 @@ importers:
         specifier: ^5.1.36
         version: 5.1.36
       zova-module-a-ssr:
-        specifier: ^5.1.41
-        version: 5.1.41
+        specifier: ^5.1.42
+        version: 5.1.42
       zova-module-a-ssrhmr:
         specifier: ^5.1.24
         version: 5.1.24
@@ -821,8 +821,8 @@ importers:
         specifier: ^5.1.39
         version: 5.1.39
       zova-module-a-zova:
-        specifier: ^5.1.113
-        version: 5.1.113(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.114
+        version: 5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-module-pay-mock:
         specifier: ^5.0.6
         version: 5.0.6
@@ -866,11 +866,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.176
-        version: 5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.177
+        version: 5.1.177(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.94
-        version: 1.1.94(typescript@5.9.3)
+        specifier: ^1.1.95
+        version: 1.1.95(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.23
         version: 5.1.23
@@ -932,8 +932,8 @@ importers:
         specifier: ^5.1.36
         version: 5.1.36
       zova-module-a-ssr:
-        specifier: ^5.1.41
-        version: 5.1.41
+        specifier: ^5.1.42
+        version: 5.1.42
       zova-module-a-ssrhmr:
         specifier: ^5.1.24
         version: 5.1.24
@@ -950,8 +950,8 @@ importers:
         specifier: ^5.1.39
         version: 5.1.39
       zova-module-a-zova:
-        specifier: ^5.1.113
-        version: 5.1.113(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.114
+        version: 5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-module-pay-mock:
         specifier: ^5.0.6
         version: 5.0.6
@@ -1990,7 +1990,7 @@ importers:
         specifier: ^5.0.3
         version: link:modules/a-markdown
       vona-module-a-rbac:
-        specifier: ^5.0.16
+        specifier: ^5.0.17
         version: link:modules/a-rbac
       vona-module-a-socket:
         specifier: workspace:^
@@ -9415,9 +9415,15 @@ packages:
   zova-core@5.1.94:
     resolution: {integrity: sha512-puo3pqa4/ngwZj//Md457XMloZ4FRaoJlmwf+zyPyxKL7GoV81BaJeUPi9szzY8aM9EkoWXBhSVA0cp6mTXBhw==}
 
+  zova-core@5.1.95:
+    resolution: {integrity: sha512-nvBb3zVdJEQ9SWi+cl5j2PLs/T0FRRIULfHqU3SBFUn3jFSZFizniRlak+qoSq3mzj+LGD61BfnFJQb2JJ8+Zg==}
+
   zova-jsx@1.1.94:
     resolution: {integrity: sha512-4QGgNE5J32PXYCgHBt8JBrTRp8CXADgZzIBUsovQmKfIwtMY6DK5+zPQeWBVqHoV5vK95RKhRPwdAKFGOLupeg==}
 
+  zova-jsx@1.1.95:
+    resolution: {integrity: sha512-gzmR01Qt4oBrMCejH4W0fqfFx62L+XQOfOROs6mBVdFYGmbyXzy/lDXtTH4v4WjlrmVbuoAyZE/BrYmNxn2swA==}
+
   zova-module-a-api@5.1.23:
     resolution: {integrity: sha512-qKOZOgaEr92GJDO1y56P1s0RA9lz0i4xa2VpY3Eu8KBU+KixiXLKEo0LKW9E0qpWphsXK8l1JHQwxSAPBogFvA==}
 
@@ -9481,6 +9487,9 @@ packages:
   zova-module-a-ssr@5.1.41:
     resolution: {integrity: sha512-2p19mMzc9MjvYDdEbV6qjOngxuM7vdzwA1+Z4+/81pOfptU7nBobqDaDUNZxblHEoiIHrDM8NCeghPBO6Fz2sg==}
 
+  zova-module-a-ssr@5.1.42:
+    resolution: {integrity: sha512-XaZcUHwDxwyQi4VNLK6CxkdG4lV5aUNgPNkiLjN3LWh9l2yS0u8CQqGV8+gEKcpOOj7XhZIubu4gb4GUNNQoGw==}
+
   zova-module-a-ssrhmr@5.1.24:
     resolution: {integrity: sha512-wB3ud1BYabj0GH8IQea1skcbMquHTtRHJsxDlFNfKtf+jiofN8YuWgrw3XKyOPW98BaMnHPRvpy4G+3Uh4hnOA==}
 
@@ -9499,6 +9508,9 @@ packages:
   zova-module-a-zova@5.1.113:
     resolution: {integrity: sha512-PuasOjYgRz8F94oVPSjQepwVxL+LySauwJQKNzly+yD7YCbQJcHy6tw7IejwcaSTjlBe3M1Iy6IWX7IwrOrfyw==}
 
+  zova-module-a-zova@5.1.114:
+    resolution: {integrity: sha512-H16jQ2YRw3Q9KSO7RDKMl+QRFZSZ7J/AkUUD71BTQA1oDLY+zBLuKTABwicEgS3S44R4qJC79rR/yuTXLlZnkw==}
+
   zova-module-pay-mock@5.0.6:
     resolution: {integrity: sha512-i133rYinCELjb0WkcRKs1LPNxNxlJ9XUV+NgimSNXUHi6O7TLEHq28Ygq5D6HvG9t+TevXbYS5TxTfPtXpPkOg==}
 
@@ -9514,9 +9526,15 @@ packages:
   zova-suite-a-zova@5.1.175:
     resolution: {integrity: sha512-cjN97iaDZ3WhvOtu27YnqfZpEnnKptLGqqpllIhAtOFaTXtuMGiGVTmH7Q1tc/k9OPEHzvvCThsYKRxzYbR5DQ==}
 
+  zova-suite-a-zova@5.1.176:
+    resolution: {integrity: sha512-w7JQ0cutO3zaZosxfsSLn9/mcY5deftZWTGkiPJTTG6I6eGGZlFJRDCQpu+dBd8eYI66xe4kstdH3KGhLSt74A==}
+
   zova@5.1.176:
     resolution: {integrity: sha512-7E/Kc9QkuB6ckDX2ual9DFmiVrcPy/umDVlC+QlRFy5A30L8D5/WNKzWxmBubXYsXWmsAd/VZQUQPwditMmNkA==}
 
+  zova@5.1.177:
+    resolution: {integrity: sha512-35jZVs08Qn4cybwNqu1/PE3qz1J7Vi64y7AgTD98rVv5uOnDPkuwIIIVgMYZllV/C3kCsWPBLoC3tz/UG4SEcA==}
+
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
 
@@ -15862,7 +15880,38 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  zova-core@5.1.94(patch_hash=144450bd7a567a6067e5857c0cf4c780981b7e90bc48745c09e1696a9b6f1b97)(typescript@5.9.3):
+  zova-core@5.1.94(typescript@5.9.3):
+    dependencies:
+      '@cabloy/compose': link:packages-utils/compose
+      '@cabloy/extend': link:packages-utils/extend
+      '@cabloy/json5': link:packages-utils/json5
+      '@cabloy/localeutil': link:packages-utils/localeutil
+      '@cabloy/logger': 1.1.25
+      '@cabloy/module-info': 2.0.3
+      '@cabloy/utils': link:packages-utils/utils
+      '@cabloy/vue-compiler-sfc': 3.5.14
+      '@cabloy/vue-reactivity': 3.5.16
+      '@cabloy/vue-router': 4.4.18(vue@3.5.43(typescript@5.9.3))
+      '@cabloy/vue-runtime-core': 3.5.57
+      '@cabloy/vue-runtime-dom': 3.5.13
+      '@cabloy/vue-server-renderer': 3.5.18(vue@3.5.43(typescript@5.9.3))
+      '@cabloy/word-utils': 2.1.14
+      '@cabloy/zod-errors-custom': link:packages-utils/zod-errors-custom
+      '@cabloy/zod-openapi': link:packages-utils/zod-openapi
+      '@cabloy/zod-query': link:packages-utils/zod-query
+      '@types/js-cookie': 3.0.6
+      '@types/ms': 2.1.0
+      '@vue/shared': 3.5.36
+      deep-equal: 2.2.3
+      ms: 2.1.3
+      reflect-metadata: 0.2.2
+      vue: 3.5.43(typescript@5.9.3)
+      vue-plugin-render-freeze: 2.0.4(vue@3.5.43(typescript@5.9.3))
+      zod: '@cabloy/zod@4.3.8'
+    transitivePeerDependencies:
+      - typescript
+
+  zova-core@5.1.95(patch_hash=44197c3f359a73a1a5bb3dc0a8a97e705a55b30f9a434717aa24d75a96f2c6b6)(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
       '@cabloy/extend': link:packages-utils/extend
@@ -15900,7 +15949,18 @@ snapshots:
       '@cabloy/word-utils': 2.1.14
       typestyle: 2.4.0
       vue: 3.5.43(typescript@5.9.3)
-      zova-core: 5.1.94(patch_hash=144450bd7a567a6067e5857c0cf4c780981b7e90bc48745c09e1696a9b6f1b97)(typescript@5.9.3)
+      zova-core: 5.1.94(typescript@5.9.3)
+    transitivePeerDependencies:
+      - typescript
+
+  zova-jsx@1.1.95(typescript@5.9.3):
+    dependencies:
+      '@cabloy/compose': link:packages-utils/compose
+      '@cabloy/utils': link:packages-utils/utils
+      '@cabloy/word-utils': 2.1.14
+      typestyle: 2.4.0
+      vue: 3.5.43(typescript@5.9.3)
+      zova-core: 5.1.95(patch_hash=44197c3f359a73a1a5bb3dc0a8a97e705a55b30f9a434717aa24d75a96f2c6b6)(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
@@ -15978,6 +16038,11 @@ snapshots:
       devalue: 5.9.4
       ms: 2.1.3
 
+  zova-module-a-ssr@5.1.42:
+    dependencies:
+      devalue: 5.9.4
+      ms: 2.1.3
+
   zova-module-a-ssrhmr@5.1.24:
     dependencies:
       '@cabloy/socket': link:packages-utils/socket
@@ -16022,6 +16087,22 @@ snapshots:
       - typescript
       - vue
 
+  zova-module-a-zova@5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
+    dependencies:
+      '@cabloy/compose': link:packages-utils/compose
+      '@cabloy/deps': link:packages-utils/deps
+      '@cabloy/json5': link:packages-utils/json5
+      '@cabloy/module-info': 2.0.3
+      '@cabloy/utils': link:packages-utils/utils
+      '@cabloy/vue-router': 4.4.18(vue@3.5.43(typescript@5.9.3))
+      '@cabloy/word-utils': 2.1.14
+      defu: 6.1.7
+      luxon: 3.7.2
+      zova-jsx: 1.1.95(typescript@5.9.3)
+    transitivePeerDependencies:
+      - typescript
+      - vue
+
   zova-module-pay-mock@5.0.6: {}
 
   zova-module-pay-paypal@5.0.3: {}
@@ -16063,9 +16144,42 @@ snapshots:
       - typescript
       - vue
 
+  zova-suite-a-zova@5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
+    dependencies:
+      zova-module-a-api: 5.1.23
+      zova-module-a-app: 5.1.27
+      zova-module-a-bean: 5.1.37
+      zova-module-a-behavior: 5.1.28
+      zova-module-a-behaviors: 5.1.23
+      zova-module-a-command: 5.1.36
+      zova-module-a-fetch: 5.1.26(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)
+      zova-module-a-form: 5.1.55(vue@3.5.43(typescript@5.9.3))
+      zova-module-a-icon: 5.1.28
+      zova-module-a-interceptor: 5.1.32
+      zova-module-a-logger: 5.1.29
+      zova-module-a-meta: 5.1.23
+      zova-module-a-model: 5.1.39(vue@3.5.43(typescript@5.9.3))
+      zova-module-a-openapi: 5.1.59
+      zova-module-a-router: 5.1.43
+      zova-module-a-routerstack: 5.1.30
+      zova-module-a-routertabs: 5.1.36
+      zova-module-a-ssr: 5.1.42
+      zova-module-a-ssrhmr: 5.1.24
+      zova-module-a-ssrserver: 5.1.27
+      zova-module-a-style: 5.1.36
+      zova-module-a-table: 5.1.45(vue@3.5.43(typescript@5.9.3))
+      zova-module-a-zod: 5.1.39
+      zova-module-a-zova: 5.1.114(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - debug
+      - supports-color
+      - typescript
+      - vue
+
   zova@5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
     dependencies:
-      zova-core: 5.1.94(patch_hash=144450bd7a567a6067e5857c0cf4c780981b7e90bc48745c09e1696a9b6f1b97)(typescript@5.9.3)
+      zova-core: 5.1.94(typescript@5.9.3)
       zova-suite-a-zova: 5.1.175(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -16074,6 +16188,17 @@ snapshots:
       - typescript
       - vue
 
+  zova@5.1.177(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3)):
+    dependencies:
+      zova-core: 5.1.95(patch_hash=44197c3f359a73a1a5bb3dc0a8a97e705a55b30f9a434717aa24d75a96f2c6b6)(typescript@5.9.3)
+      zova-suite-a-zova: 5.1.176(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - debug
+      - supports-color
+      - typescript
+      - vue
+
   zwitch@1.0.5: {}
 
   zwitch@2.0.4: {}

package/vona/pnpm-workspace.yaml

@@ -52,4 +52,4 @@ allowBuilds:
   vue-demi: true
 
 patchedDependencies:
-  zova-core@5.1.94: patches/zova-core@5.1.94.patch
+  zova-core@5.1.95: patches/zova-core@5.1.95.patch

package/vona/src/backend/config/config/config.ts

@@ -39,6 +39,15 @@ export default async function (app: VonaApplication) {
     mode: env.META_MODE,
   };
 
+  // Language availability is application policy, independent of installed dictionaries.
+  config.locale = {
+    items: {
+      'en-us': 'LanguageEnglish',
+      'zh-cn': 'LanguageChinese',
+    },
+    default: 'en-us',
+  };
+
   // instance
   config.instance = {
     getInstanceName: undefined,

package/vona/src/suite/a-home/modules/home-base/src/main.ts

@@ -10,10 +10,7 @@ export class Main extends BeanSimple implements IModuleMain {
       'en-us': en,
       'zh-cn': zhCN,
     };
-    this.app.util.setLocaleErrors(
-      localeErrors,
-      this.app.scope('a-locale').config.locale.defaultLocale,
-    );
+    this.app.util.setLocaleErrors(localeErrors, this.app.config.locale.default);
   }
 
   async configLoaded(_config: any) {}

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-rbac",
-  "version": "5.0.16",
+  "version": "5.0.17",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.68",
+  "version": "5.1.69",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -10,7 +10,7 @@
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-layoutprofile": "^5.0.2",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.16",
+    "vona-module-a-rbac": "^5.0.17",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

package/vona/src/suite-vendor/a-vona/modules/a-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.67",
+  "version": "5.1.68",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-hmr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-hmr",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-hmr/src/service/watch.ts

@@ -15,6 +15,7 @@ const __pathesWatch = [
   'src/backend/config/config/*.tsx',
   '**/src/config/errors.ts',
   '**/src/config/locale/*.ts',
+  '**/src/locales/*.ts',
   '**/src/config/config.ts',
   '**/src/config/constants.ts',
   '**/src/controller/*.ts(x)?',

package/vona/src/suite-vendor/a-vona/modules/a-locale/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-locale",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-locale/src/config/config.ts

@@ -1,13 +1,12 @@
-import type { ILocaleRecord, IProtocolKeyRecord, VonaApplication } from 'vona';
+import type { IProtocolKeyRecord, VonaApplication } from 'vona';
 
 import { $protocolKey } from 'vona';
 
 export interface I18nConfigLocale {
-  defaultLocale: keyof ILocaleRecord;
   queryField?: keyof IProtocolKeyRecord;
   headerField?: keyof IProtocolKeyRecord;
   cookieField?: string;
-  localeAlias: any;
+  localeAlias: Record<string, string>;
   writeCookie: boolean;
   cookieMaxAge: number;
   cookieDomain?: string;
@@ -31,7 +30,6 @@ export interface I18nConfig {
 export function config(_app: VonaApplication) {
   return {
     locale: {
-      defaultLocale: 'en-us',
       queryField: $protocolKey('x-vona-locale'),
       headerField: $protocolKey('x-vona-locale'),
       cookieField: 'locale',

package/vona/src/suite-vendor/a-vona/modules/a-locale/src/main.ts

@@ -1,6 +1,6 @@
 import type { IModuleMain, VonaContext } from 'vona';
 
-import { BeanSimple } from 'vona';
+import { BeanSimple, resolveEnabledLocale, resolveLocale, validateLocaleConfig } from 'vona';
 
 import type { I18nConfigLocale, I18nConfigTz } from './config/config.ts';
 
@@ -15,11 +15,12 @@ export class Main extends BeanSimple implements IModuleMain {
   async moduleLoading() {}
   async moduleLoaded() {
     const options = this.app.scope(__ThisModule__).config;
+    validateLocaleConfig(this.app.config.locale);
     this.app.context.__getLocale = function (this: VonaContext) {
       return __getLocale(this, options.locale);
     };
     this.app.context.__setLocale = function (this: VonaContext, locale: string) {
-      return __setLocale(this, locale);
+      return __setLocale(this, locale, options.locale);
     };
     this.app.context.__getTz = function (this: VonaContext) {
       return __getTz(this, options.tz);
@@ -32,8 +33,8 @@ export class Main extends BeanSimple implements IModuleMain {
   async configLoaded(_config: any) {}
 }
 
-function __setLocale(ctx: VonaContext, locale: string) {
-  ctx[SymbolLocale] = locale;
+function __setLocale(ctx: VonaContext, locale: string, options: I18nConfigLocale) {
+  ctx[SymbolLocale] = resolveLocale(locale, ctx.app.config.locale, options.localeAlias);
   ctx[SymbolLocaleOrigin] = 'set';
 }
 
@@ -42,7 +43,7 @@ function __getLocale(ctx: VonaContext, options: I18nConfigLocale) {
     return ctx[SymbolLocale];
   }
 
-  const localeNames = Object.keys(ctx.app.meta.locales);
+  const policy = ctx.app.config.locale;
 
   const queryField = options.queryField;
   const headerField = options.headerField;
@@ -89,9 +90,10 @@ function __getLocale(ctx: VonaContext, options: I18nConfigLocale) {
         }
         if (languages.length > 0) {
           for (let i = 0; i < languages.length; i++) {
-            const lang = formatLocale(languages[i]);
-            if (localeNames.includes(lang) || options.localeAlias[lang]) {
-              locale = lang;
+            const lang = resolveEnabledLocale(languages[i], policy, options.localeAlias);
+            if (lang) {
+              // Keep the input until final resolution so an alias is applied only once.
+              locale = languages[i];
               localeOrigin = 'header';
               break;
             }
@@ -104,23 +106,8 @@ function __getLocale(ctx: VonaContext, options: I18nConfigLocale) {
     }
   }
 
-  // all missing, set it to defaultLocale
-  if (!locale) {
-    locale = options.defaultLocale;
-    localeOrigin = 'default';
-  }
-
-  // cookie alias
-  if ((locale as string) in options.localeAlias) {
-    locale = options.localeAlias[locale as string];
-  }
-
-  locale = formatLocale(locale);
-
-  // validate locale
-  if (!localeNames.includes(locale)) {
-    locale = options.defaultLocale;
-  }
+  if (!locale) localeOrigin = 'default';
+  locale = resolveLocale(locale, policy, options.localeAlias);
 
   // if header not send, set the locale cookie
   if (cookieField && options.writeCookie && cookieLocale !== locale && !ctx.headerSent) {
@@ -217,11 +204,6 @@ function updateCookie(ctx: VonaContext, options: I18nConfigLocale | I18nConfigTz
   ctx.cookies.set(options.cookieField!, locale, cookieOptions);
 }
 
-function formatLocale(locale) {
-  // support zh_CN, en_US => zh-CN, en-US
-  return parseTokenSafe(locale).replace('_', '-').toLowerCase();
-}
-
 function parseTokenSafe(token?: string) {
   if (!token) return '';
   return token.replace(/[\\.*#%'"`;, ]/g, '');

package/vona/src/suite-vendor/a-vona/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapi",
-  "version": "5.1.26",
+  "version": "5.1.27",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-openapi/src/bean/bean.openapi.ts

@@ -8,6 +8,8 @@ import { Bean } from 'vona-module-a-bean';
 import { Caching } from 'vona-module-a-caching';
 import { $schema } from 'vona-module-a-openapiutils';
 
+import type { IGenerateJsonOfControllerActionOptions } from '../types/contract.ts';
+
 @Bean()
 export class BeanOpenapi extends BeanBase {
   public async clearAllCaches() {
@@ -65,11 +67,11 @@ export class BeanOpenapi extends BeanBase {
   }
 
   protected generateJsonOfControllerActionCacheKey(info: ICachingActionKeyInfo) {
-    const [controller, actionKey, version] = info.args;
+    const [controller, actionKey, version, options] = info.args;
     const beanOptions = appResource.getBean(controller)!;
     const beanFullName = beanOptions.beanFullName;
     const locale = this.ctx.locale;
-    return `${info.prop}_${beanFullName}_${actionKey}_${version ?? 'V31'}_${locale}`;
+    return `${info.prop}_${beanFullName}_${actionKey}_${version ?? 'V31'}_${locale}_${options?.includeExcluded === true}`;
   }
 
   @Caching.get({ cacheName: 'a-openapi:json', cacheKeyFn: 'generateJsonCacheKey' })
@@ -94,6 +96,7 @@ export class BeanOpenapi extends BeanBase {
     controller: Constructable,
     actionKey: string,
     version: K = 'V31' as any,
+    options: IGenerateJsonOfControllerActionOptions = {},
   ): Promise<IOpenapiObject[K]> {
     const registry = new OpenAPIRegistry();
     const beanOptions = appResource.getBean(controller);
@@ -103,6 +106,7 @@ export class BeanOpenapi extends BeanBase {
       beanOptions.module,
       controller,
       actionKey,
+      options,
     );
     const generator =
       version === 'V30'