cabloy 5.1.236 → 5.1.239

package/zova/packages-zova/zova-core/src/core/sys/sys.ts

@@ -9,7 +9,7 @@ import type { ZovaConstant } from './constant.ts';
 import { BeanContainer } from '../../bean/beanContainer.ts';
 import { cast } from '../../types/utils/cast.ts';
 import { zodEnhanceSys } from '../../utils/zod-enhance.ts';
-import { configDefault } from './config.ts';
+import { configDefault, validateLocaleConfig } from './config.ts';
 import { constantDefault } from './constant.ts';
 import { SysMeta } from './meta.ts';
 import { appResource } from './resource.ts';
@@ -123,8 +123,13 @@ export class ZovaSys {
   private async _combineConfig(config: TypeModuleResourceConfig[]): Promise<ZovaConfig> {
     const _config = deepExtend({}, configDefault(this.env));
     for (const configFn of config) {
-      deepExtend(_config, await configFn(this));
+      const layer = await configFn(this);
+      deepExtend(_config, layer);
+      // The enabled set is a policy replacement, not an additive dictionary.
+      const items = (layer as Partial<ZovaConfig>).locale?.items;
+      if (items !== undefined) _config.locale.items = { ...items };
     }
+    validateLocaleConfig(_config.locale);
     return _config;
   }
 

package/zova/packages-zova/zova-core/src/types/interface/module.ts

@@ -28,6 +28,7 @@ export interface IModuleResource {
   Main: Constructable<IModuleMain>;
   Monkey: Constructable<IMonkeyModule & IMonkeyApp & IMonkeyController>;
   locales: TypeModuleResourceLocales;
+  localesProvider: TypeModuleResourceLocales;
   errors: TypeModuleResourceErrors;
   config: TypeModuleResourceConfig;
   constants: unknown;

package/zova/packages-zova/zova-core/src/utils/zod-enhance.ts

@@ -8,7 +8,7 @@ import type { ILocaleRecord } from '../bean/resource/locale/type.ts';
 import type { ZovaApplication } from '../core/app/application.ts';
 
 export type ZodLocaleError = () => { localeError: z.core.$ZodErrorMap };
-export type ZodLocaleErrors = Record<keyof ILocaleRecord, ZodLocaleError>;
+export type ZodLocaleErrors = Partial<Record<keyof ILocaleRecord, ZodLocaleError>>;
 
 export function zodEnhance(app: ZovaApplication) {
   setLocaleAdapter((text: string, iss?: object) => {

package/zova/pnpm-lock.yaml

@@ -294,7 +294,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.94
+        specifier: ^1.1.95
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -890,7 +890,7 @@ importers:
         specifier: ^3.5.38
         version: 3.5.42(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.94
+        specifier: ^5.1.95
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -1031,10 +1031,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.94
+        specifier: ^5.1.95
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.175
+        specifier: ^5.1.176
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -1279,7 +1279,7 @@ importers:
         specifier: ^5.1.36
         version: link:modules/a-routertabs
       zova-module-a-ssr:
-        specifier: ^5.1.41
+        specifier: ^5.1.42
         version: link:modules/a-ssr
       zova-module-a-ssrhmr:
         specifier: ^5.1.24
@@ -1297,7 +1297,7 @@ importers:
         specifier: ^5.1.39
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.113
+        specifier: ^5.1.114
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1630,7 +1630,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.94
+        specifier: ^1.1.95
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':

package/zova/src/suite/a-home/modules/home-base/src/config/locale/en-us.ts

@@ -4,6 +4,7 @@ export default {
   Retry: 'Retry',
   LanguageEnglish: 'English',
   LanguageChinese: 'Chinese',
+  LanguageJapanese: 'Japanese',
   VonaIntegratedSsr: 'Vona integrated SSR',
   ZovaStandaloneSsr: 'Zova standalone SSR',
   SsrSite: 'SSR Site',

package/zova/src/suite/a-home/modules/home-base/src/config/locale/zh-cn.ts

@@ -4,6 +4,7 @@ export default {
   Retry: '重试',
   LanguageEnglish: '英语',
   LanguageChinese: '简体中文',
+  LanguageJapanese: '日语',
   VonaIntegratedSsr: 'Vona 集成式 SSR',
   ZovaStandaloneSsr: 'Zova 独立式 SSR',
   SsrSite: 'SSR 站点',

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

@@ -8,7 +8,7 @@ export class RenderLocale extends BeanRenderBase {
   public render() {
     const currentRoute = this.$currentRoute;
     const metaLocale = currentRoute?.meta?.locale;
-    const locales = currentRoute?.meta?.locales ?? this.sys.config.locale.items;
+    const locales = this.app.meta.locale.getItems(currentRoute?.meta?.locales);
     return (
       <li>
         <details>

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

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

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

@@ -1,7 +1,10 @@
+import type {
+  RouteLocationNormalizedGeneric,
+  RouteLocationResolvedGeneric,
+} from '@cabloy/vue-router';
 import type { ComponentInternalInstance, Ref, VNode } from 'vue';
 import type { Functionable, IControllerLoadEvent, 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';
@@ -20,6 +23,7 @@ import type {
 } from '../types/ssr.ts';
 
 import { CtxSSRMetaStore } from './ssrMetaStore.ts';
+import { getCanonicalLocaleRoutePath } from './ssrNavigation.ts';
 import { resolveSsrProfile, resolveSsrProfileOptions } from './ssrProfile.ts';
 
 const SymbolIsRuntimeSsrPreHydration = Symbol('SymbolIsRuntimeSsrPreHydration');
@@ -212,6 +216,14 @@ export class CtxSSR extends BeanSimple {
   public _setLocale(route: RouteLocationResolvedGeneric | RouteLocationNormalizedGeneric) {
     if (route.meta.locale) {
       this.app.meta.locale.current = route.params?.locale as unknown as keyof ILocaleRecord;
+      if (process.env.SERVER) {
+        const canonicalPath = getCanonicalLocaleRoutePath(
+          route,
+          this.app.meta.locale,
+          this.sys.config.locale.default,
+        );
+        if (canonicalPath) this.app.$redirect(canonicalPath);
+      }
     }
   }
 

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

@@ -3,6 +3,30 @@ import type {
   RouteLocationResolvedGeneric,
 } from '@cabloy/vue-router';
 
+import { combineParamsAndQuery } from '@cabloy/utils';
+
+// Keep the matched route/alias and existing optional-default URL policy. No new identity.
+export function getCanonicalLocaleRoutePath(
+  route: TypeSsrNavigationRoute,
+  locale: { normalize(value: unknown): string },
+  defaultLocale: string,
+): string | undefined {
+  if (!route.meta.locale) return;
+  const value = locale.normalize(route.params?.locale);
+  const canonical = value === defaultLocale ? '' : value;
+  if ((route.params?.locale ?? '') === canonical) return;
+  // A synthetic layout parent may retain its original path while its child matches
+  // the public alias. The deepest matching record owns the actual destination URL.
+  const matched = route.matched.findLast(record => record.path.includes(':locale'));
+  if (!matched) return;
+  const path =
+    combineParamsAndQuery(matched.path, {
+      params: { ...route.params, locale: canonical || undefined },
+      query: route.query,
+    }) + (route.hash ?? '');
+  return path !== route.fullPath ? path : undefined;
+}
+
 export type TypeSsrNavigationRoute = RouteLocationNormalizedGeneric | RouteLocationResolvedGeneric;
 
 export interface ISsrNavigationSync {

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

@@ -15,7 +15,7 @@ import { BeanSimple, cast } from 'zova';
 
 import type { SSRMetaOptions } from './types/ssr.ts';
 
-import { createSsrNavigationSync } from './lib/ssrNavigation.ts';
+import { createSsrNavigationSync, getCanonicalLocaleRoutePath } from './lib/ssrNavigation.ts';
 import { useMeta } from './lib/useMeta.ts';
 
 export class Monkey
@@ -60,6 +60,13 @@ export class Monkey
           },
         });
         router.beforeEach(to => {
+          const canonicalPath = getCanonicalLocaleRoutePath(
+            to,
+            this.app.meta.locale,
+            this.sys.config.locale.default,
+          );
+          if (canonicalPath)
+            return { path: canonicalPath, query: to.query, hash: to.hash, replace: true };
           navigationSync.beforeEach(to);
         });
         router.afterEach((to, from, failure) => {

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

@@ -1,9 +1,14 @@
+import { createMemoryHistory, createRouter } from '@cabloy/vue-router';
 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';
+import { AppLocale } from '../../../../../../../packages-zova/zova-core/src/core/component/locale.ts';
+import {
+  createSsrNavigationSync,
+  getCanonicalLocaleRoutePath,
+} from '../../src/lib/ssrNavigation.ts';
 
 function createRoute(locale?: string): TypeSsrNavigationRoute {
   return {
@@ -67,3 +72,51 @@ test('SSR navigation keeps destination profile and locale after success', () =>
   assert.equal(locale, 'zh-cn');
   assert.equal(profileRoute, to);
 });
+
+test('matched locale routes canonicalize disabled, noncanonical and default input through actual router', async () => {
+  const locale = Object.assign(new AppLocale(), {
+    sys: {
+      config: { locale: { default: 'en-us', items: { 'en-us': 'English', 'zh-cn': 'Chinese' } } },
+    },
+  });
+  const router = createRouter({
+    history: createMemoryHistory(),
+    routes: [
+      {
+        name: '$:home-indexweb:home',
+        path: '/home/indexweb/home/:locale?',
+        alias: '/:locale([a-z]{2}-[a-z]{2}|[a-z]{2})?',
+        component: {},
+        children: [
+          {
+            name: 'home-indexweb:home',
+            path: '',
+            // SysRouter preserves the authored alias on the child as well as its layout.
+            alias: '/:locale([a-z]{2}-[a-z]{2}|[a-z]{2})?',
+            component: {},
+            meta: { locale: true, requiresAuth: false, ssrProfile: 'public' },
+          },
+        ],
+      },
+      { name: 'static', path: '/static', component: {} },
+    ],
+  });
+  const canonical = (path: string) =>
+    getCanonicalLocaleRoutePath(router.resolve(path), locale, 'en-us');
+  assert.equal(canonical('/ja-jp?tab=one#section'), '/?tab=one#section');
+  assert.equal(canonical('/home/indexweb/home/ja-jp'), '/home/indexweb/home/');
+  assert.equal(canonical('/home/indexweb/home/ZH_CN'), '/home/indexweb/home/zh-cn');
+  assert.equal(canonical('/en-us'), '/');
+  assert.equal(canonical('/zh-cn'), undefined);
+  assert.equal(canonical('/'), undefined);
+  assert.equal(canonical('/static'), undefined);
+  router.beforeEach(to => {
+    const path = getCanonicalLocaleRoutePath(to, locale, 'en-us');
+    if (path) return { path, query: to.query, hash: to.hash, replace: true };
+  });
+  await router.push('/ja-jp?tab=one#section');
+  assert.equal(router.currentRoute.value.fullPath, '/?tab=one#section');
+  assert.equal(router.currentRoute.value.name, 'home-indexweb:home');
+  assert.equal(router.currentRoute.value.meta.ssrProfile, 'public');
+  assert.equal(router.currentRoute.value.meta.requiresAuth, false);
+});

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.113",
+  "version": "5.1.114",
   "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.94"
+    "zova-jsx": "^1.1.95"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.31",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.175",
+  "version": "5.1.176",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -25,13 +25,13 @@
     "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.41",
+    "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",
     "zova-module-a-zod": "^5.1.39",
-    "zova-module-a-zova": "^5.1.113"
+    "zova-module-a-zova": "^5.1.114"
   },
   "title": "a-zova"
 }