cabloy 5.1.73 → 5.1.74

package/.gitignore

@@ -72,6 +72,4 @@ vona/docker-compose.yml
 !/zova/packages-utils/quasar-app-extension-zova/dist
 
 vona/src/suite/cabloy-basic/modules/basic-siteadmin/assets/site
-vona/src/suite/cabloy-basic/modules/basic-siteadmin/zovaRest
 vona/src/suite/cabloy-basic/modules/basic-siteweb/assets/site
-vona/src/suite/cabloy-basic/modules/basic-siteweb/zovaRest

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 5.1.74
+
+### Features
+
+- Update related functionality and project components.
+
+### Bug Fixes
+
+- Alias MariaDB drivers correctly in the Vona build.
+- Reorder initialization to bootstrap Zova REST before other startup steps.
+- Seed Vona Zova REST dependencies before running the initial install.
+
+### Improvements
+
+- Align Zova REST workspace naming.
+- Streamline the Zova REST workspace flow.
+
 ## 5.1.73
 
 ### Features

package/lint-staged.config.mjs

@@ -36,7 +36,6 @@ const OXFMT_IGNORE_PATTERNS = [
   '**/src-capacitor',
   '**/src-cordova',
   // vona-specific
-  '**/zovaRest',
   'vona/packages-cli/cli-set-api/cli/templates',
   // zova-specific
   'zova/packages-cli/cli-set-front/cli/templates',

package/oxfmt.config.ts

@@ -38,7 +38,6 @@ export default defineConfig(
       '**/src-capacitor',
       '**/src-cordova',
       // vona-specific
-      '**/zovaRest',
       'vona/packages-cli/cli-set-api/cli/templates',
       // zova-specific
       'zova/packages-cli/cli-set-front/cli/templates',

package/oxlint.config.ts

@@ -59,7 +59,6 @@ export default defineConfig(
       '**/src-cordova',
       '**/package.json',
       // vona-specific
-      '**/zovaRest',
       'vona/packages-cli/cli-set-api/cli/templates',
       // zova-specific
       'zova/packages-cli/cli-set-front/cli/templates',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.73",
+  "version": "5.1.74",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/scripts/init.ts

@@ -115,6 +115,32 @@ function writeVersionMarker(): void {
   console.log(`[init] Marked Cabloy version: ${version}`);
 }
 
+function seedVonaZovaRestWorkspaceDependencies(pkgPath: string): void {
+  // `package.original.json` intentionally keeps Vona close to a minimal bootstrap state.
+  // During `npm run init`, seed the generated `.zova-rest/*` workspace dependencies back into
+  // `vona/package.json` before the first install so pnpm sees the `zova -> zova-core`
+  // dependency chain and applies the workspace patch instead of reporting it as unused.
+  const zovaRestWorkspaceDir = resolve(VONA_DIR, '.zova-rest');
+  if (!existsSync(zovaRestWorkspaceDir)) return;
+  const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8')) as {
+    dependencies?: Record<string, string>;
+  };
+  pkg.dependencies ??= {};
+  let changed = false;
+  for (const entry of readdirSync(zovaRestWorkspaceDir, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const depName = `zova-rest-${entry.name}`;
+    const depValue = 'workspace:^';
+    if (pkg.dependencies[depName] === depValue) continue;
+    pkg.dependencies[depName] = depValue;
+    changed = true;
+  }
+  if (!changed) return;
+  writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
+  // eslint-disable-next-line
+  console.log('[init] Seeded Vona .zova-rest dependencies');
+}
+
 // --- Step 0: Set APP_NAME in .env files ---
 
 function setAppName(): void {
@@ -215,6 +241,7 @@ function initVona(): void {
   const pkgPath = resolve(VONA_DIR, 'package.json');
   // if (!existsSync(pkgPath)) {
   copyFileSync(resolve(VONA_DIR, 'package.original.json'), pkgPath);
+  seedVonaZovaRestWorkspaceDependencies(pkgPath);
   pnpmInstall(VONA_DIR);
   // }
   exec('npm run vona :tools:deps');
@@ -286,10 +313,10 @@ setAppName();
 generateEnvProdLocal();
 generateEnvProdDockerLocal();
 cleanupWorkspaceYaml();
-initVona();
 initZova();
-initCabloyDocs();
 buildSsrCabloyBasicStartBatch();
+initVona();
+initCabloyDocs();
 writeVersionMarker();
 // eslint-disable-next-line
 console.log('[init] Done!');

package/vona/oxfmt.config.ts

@@ -14,7 +14,6 @@ export default defineConfig(
       '.assets',
       'coverage',
       'docker-compose',
-      'zovaRest',
       'assets',
       '.app',
       '.claude',

package/vona/oxlint.config.ts

@@ -48,7 +48,6 @@ export default defineConfig(
       'coverage',
       'docker-compose',
       'package.json',
-      'zovaRest',
       'assets',
       'packages-cli/cli-set-api/cli/templates',
     ],

package/vona/packages-cli/cabloy-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.26",
+  "version": "3.1.27",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "@cabloy/cli",
   "keywords": [

package/vona/packages-cli/cabloy-cli/src/lib/local.common.ts

@@ -153,7 +153,7 @@ export class LocalCommon {
     }
     _handleDeps('dependencies', deps);
     _handleDeps('devDependencies', depsDev);
-    // zovaRest
+    // zova rest workspace
     await this._generatePackageJson_pkgFromZovaRest(projectPath, pkgOriginal.dependencies);
     // save
     if (
@@ -176,7 +176,7 @@ export class LocalCommon {
     const bundles = await globby('*', { cwd: targetDir, onlyDirectories: true });
     for (const bundle of bundles) {
       const name = `zova-rest-${bundle}`;
-      devDependencies[name] = `file:./.zova-rest/${bundle}`;
+      devDependencies[name] = 'workspace:^';
     }
   }
 
@@ -203,7 +203,7 @@ export class LocalCommon {
         const isZovaRest = key.includes('zova-rest-');
         const isModule = key.includes('vona-module-') || key.includes('zova-module-');
         const isModuleWorkspace = isModule && version.startsWith('workspace:');
-        if (isZovaRest && version.includes('file:')) continue;
+        if (isZovaRest) continue;
         if (isModuleWorkspace) continue;
         // if (deps[key] && !isModule) continue;
         if (isModule) continue;

package/vona/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.124",
+  "version": "1.1.125",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.122",
+  "version": "1.1.123",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.bin.build.ts

@@ -56,6 +56,8 @@ const __dialectDriversAll = [
   'pg',
   'mysql2',
   'better-sqlite3',
+  'mariadb/callback',
+  'mariadb',
   'mysql',
   'oracledb',
   'pg-native',

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.bin.buildModule.ts

@@ -56,6 +56,8 @@ export class CliBinBuildModule extends BeanCliBase {
     const aliasEntries: aliasImport.Alias[] = [];
     for (const name of [
       'better-sqlite3',
+      'mariadb/callback',
+      'mariadb',
       'mysql',
       'oracledb',
       'pg-native',

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.deps.ts

@@ -20,7 +20,7 @@ export class CliToolsDeps extends BeanCliBase {
   }
 
   async _generate(projectPath: string) {
-    // generate zovaRest
+    // verify zova rest workspace
     const needPnpmInstall = await this._generateZovaRest(projectPath);
     // generate package.json
     const pnpmInstalled = await this.common._generatePackageJson(projectPath);
@@ -55,29 +55,16 @@ export class CliToolsDeps extends BeanCliBase {
   }
 
   async _generateZovaRest(projectPath: string) {
-    let needPnpmInstall = false;
     const targetDir = path.join(projectPath, '.zova-rest');
-    for (const module of this.modulesMeta.modulesArray) {
-      const moduleZovaRest = path.join(module.root, 'zovaRest');
-      if (!fse.existsSync(moduleZovaRest)) continue;
-      const bundles = await globby('*', { cwd: moduleZovaRest, onlyDirectories: true });
-      for (const bundle of bundles) {
-        const moduleZovaRestSrc = path.join(moduleZovaRest, bundle);
-        const moduleZovaRestDest = path.join(targetDir, bundle);
-        let needCopy = true;
-        if (fse.existsSync(moduleZovaRestDest)) {
-          const statDest = await fse.stat(path.join(moduleZovaRestDest, 'package.json'));
-          const statSrc = await fse.stat(path.join(moduleZovaRestSrc, 'package.json'));
-          // diff: 5s
-          if (statDest.mtimeMs + 5000 >= statSrc.mtimeMs) {
-            needCopy = false;
-          }
-        }
-        if (!needCopy) continue;
-        await fse.copy(moduleZovaRestSrc, moduleZovaRestDest, { preserveTimestamps: true });
-        needPnpmInstall = true;
-      }
+    if (!fse.existsSync(targetDir)) {
+      throw new Error(
+        'Zova REST workspace .zova-rest not found. Please run `npm run build:zova:admin` or `npm run build:zova:web` first.',
+      );
     }
-    return needPnpmInstall;
+    const bundles = await globby('*', { cwd: targetDir, onlyDirectories: true });
+    if (bundles.length > 0) return false;
+    throw new Error(
+      'No Zova REST bundles found in .zova-rest. Please run `npm run build:zova:admin` or `npm run build:zova:web` first.',
+    );
   }
 }

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.metadata.ts

@@ -286,7 +286,7 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
       return pkg;
     }
     // cli
-    for (const name of ['cli', 'zovaRest']) {
+    for (const name of ['cli']) {
       const pathCheck = path.join(modulePath, name);
       if (!(await fse.pathExists(pathCheck))) continue;
       pkg = await _loadPkg();

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.60",
+  "version": "5.1.61",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/pnpm-lock.yaml

@@ -83,7 +83,7 @@ importers:
         specifier: ^5.10.1
         version: 5.11.1(supports-color@5.5.0)
       knex:
-        specifier: ^3.2.9
+        specifier: ^3.3.0
         version: 3.3.0(better-sqlite3@12.11.1)
       luxon:
         specifier: ^3.7.2
@@ -371,11 +371,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova-rest-cabloy-basic-admin:
-        specifier: file:./.zova-rest/cabloy-basic-admin
-        version: file:.zova-rest/cabloy-basic-admin(typescript@5.9.3)
+        specifier: workspace:^
+        version: link:.zova-rest/cabloy-basic-admin
       zova-rest-cabloy-basic-web:
-        specifier: file:./.zova-rest/cabloy-basic-web
-        version: file:.zova-rest/cabloy-basic-web(typescript@5.9.3)
+        specifier: workspace:^
+        version: link:.zova-rest/cabloy-basic-web
     devDependencies:
       '@cabloy/cli':
         specifier: workspace:^
@@ -453,6 +453,150 @@ importers:
         specifier: ^3.2.2
         version: 3.2.2
 
+  .zova-rest/cabloy-basic-admin:
+    dependencies:
+      '@tanstack/query-core':
+        specifier: ^5.101.1
+        version: 5.101.1
+      '@tanstack/vue-query':
+        specifier: ^5.101.1
+        version: 5.101.1(vue@3.5.39(typescript@5.9.3))
+      openapi3-ts:
+        specifier: ^4.6.0
+        version: 4.6.0
+      table-identity:
+        specifier: ^1.1.7
+        version: link:../../packages-utils/table-identity
+      vue:
+        specifier: ^3.5.38
+        version: 3.5.39(typescript@5.9.3)
+      zod:
+        specifier: npm:@cabloy/zod@4.3.8
+        version: '@cabloy/zod@4.3.8'
+      zova:
+        specifier: ^5.1.118
+        version: 5.1.118(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-jsx:
+        specifier: ^1.1.67
+        version: 1.1.67(typescript@5.9.3)
+      zova-module-a-api:
+        specifier: ^5.1.21
+        version: 5.1.21
+      zova-module-a-bean:
+        specifier: ^5.1.31
+        version: 5.1.31
+      zova-module-a-behavior:
+        specifier: ^5.1.25
+        version: 5.1.25
+      zova-module-a-command:
+        specifier: ^5.1.33
+        version: 5.1.33
+      zova-module-a-form:
+        specifier: ^5.1.43
+        version: 5.1.43(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-icon:
+        specifier: ^5.1.26
+        version: 5.1.26
+      zova-module-a-interceptor:
+        specifier: ^5.1.29
+        version: 5.1.29
+      zova-module-a-model:
+        specifier: ^5.1.30
+        version: 5.1.30(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-openapi:
+        specifier: ^5.1.41
+        version: 5.1.41
+      zova-module-a-router:
+        specifier: ^5.1.29
+        version: 5.1.29
+      zova-module-a-routertabs:
+        specifier: ^5.1.32
+        version: 5.1.32
+      zova-module-a-ssr:
+        specifier: ^5.1.26
+        version: 5.1.26
+      zova-module-a-style:
+        specifier: ^5.1.32
+        version: 5.1.32
+      zova-module-a-table:
+        specifier: ^5.1.37
+        version: 5.1.37(vue@3.5.39(typescript@5.9.3))
+      zova-module-rest-resource:
+        specifier: ^5.1.40
+        version: 5.1.40
+
+  .zova-rest/cabloy-basic-web:
+    dependencies:
+      '@tanstack/query-core':
+        specifier: ^5.101.1
+        version: 5.101.1
+      '@tanstack/vue-query':
+        specifier: ^5.101.1
+        version: 5.101.1(vue@3.5.39(typescript@5.9.3))
+      openapi3-ts:
+        specifier: ^4.6.0
+        version: 4.6.0
+      table-identity:
+        specifier: ^1.1.7
+        version: link:../../packages-utils/table-identity
+      vue:
+        specifier: ^3.5.38
+        version: 3.5.39(typescript@5.9.3)
+      zod:
+        specifier: npm:@cabloy/zod@4.3.8
+        version: '@cabloy/zod@4.3.8'
+      zova:
+        specifier: ^5.1.118
+        version: 5.1.118(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-jsx:
+        specifier: ^1.1.67
+        version: 1.1.67(typescript@5.9.3)
+      zova-module-a-api:
+        specifier: ^5.1.21
+        version: 5.1.21
+      zova-module-a-bean:
+        specifier: ^5.1.31
+        version: 5.1.31
+      zova-module-a-behavior:
+        specifier: ^5.1.25
+        version: 5.1.25
+      zova-module-a-command:
+        specifier: ^5.1.33
+        version: 5.1.33
+      zova-module-a-form:
+        specifier: ^5.1.43
+        version: 5.1.43(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-icon:
+        specifier: ^5.1.26
+        version: 5.1.26
+      zova-module-a-interceptor:
+        specifier: ^5.1.29
+        version: 5.1.29
+      zova-module-a-model:
+        specifier: ^5.1.30
+        version: 5.1.30(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-openapi:
+        specifier: ^5.1.41
+        version: 5.1.41
+      zova-module-a-router:
+        specifier: ^5.1.29
+        version: 5.1.29
+      zova-module-a-routertabs:
+        specifier: ^5.1.32
+        version: 5.1.32
+      zova-module-a-ssr:
+        specifier: ^5.1.26
+        version: 5.1.26
+      zova-module-a-style:
+        specifier: ^5.1.32
+        version: 5.1.32
+      zova-module-a-table:
+        specifier: ^5.1.37
+        version: 5.1.37(vue@3.5.39(typescript@5.9.3))
+      zova-module-rest-resource:
+        specifier: ^5.1.40
+        version: 5.1.40
+
   packages-cli/cabloy-cli:
     dependencies:
       '@babel/parser':
@@ -2035,7 +2179,7 @@ importers:
   src/suite-vendor/a-vona/modules/a-orm:
     dependencies:
       knex:
-        specifier: ^3.2.9
+        specifier: ^3.3.0
         version: 3.3.0(better-sqlite3@12.11.1)
       table-identity:
         specifier: workspace:^
@@ -7472,12 +7616,6 @@ packages:
   zova-module-rest-resource@5.1.40:
     resolution: {integrity: sha512-rMqZaXSK6nJ4LW2O1yO/jZqxI7joCiWylzjutMTKpx7EfNmtK1t1nVoWFd+gCTxqgbbv9uXh0vfFaSFA7GKYFg==}
 
-  zova-rest-cabloy-basic-admin@file:.zova-rest/cabloy-basic-admin:
-    resolution: {directory: .zova-rest/cabloy-basic-admin, type: directory}
-
-  zova-rest-cabloy-basic-web@file:.zova-rest/cabloy-basic-web:
-    resolution: {directory: .zova-rest/cabloy-basic-web, type: directory}
-
   zova-suite-a-zova@5.1.117:
     resolution: {integrity: sha512-Ceo7CqXmmDHCGKvwQ9cb90DLbF5P0s2qT/jYyBeTf8BllpSjIqYqxUPE0Eh88XYWHlTWgH28wP6SD7DeGfPaCA==}
 
@@ -13106,68 +13244,6 @@ snapshots:
 
   zova-module-rest-resource@5.1.40: {}
 
-  zova-rest-cabloy-basic-admin@file:.zova-rest/cabloy-basic-admin(typescript@5.9.3):
-    dependencies:
-      '@tanstack/query-core': 5.101.1
-      '@tanstack/vue-query': 5.101.1(vue@3.5.39(typescript@5.9.3))
-      openapi3-ts: 4.6.0
-      table-identity: link:packages-utils/table-identity
-      vue: 3.5.39(typescript@5.9.3)
-      zod: '@cabloy/zod@4.3.8'
-      zova: 5.1.118(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
-      zova-jsx: 1.1.67(typescript@5.9.3)
-      zova-module-a-api: 5.1.21
-      zova-module-a-bean: 5.1.31
-      zova-module-a-behavior: 5.1.25
-      zova-module-a-command: 5.1.33
-      zova-module-a-form: 5.1.43(vue@3.5.39(typescript@5.9.3))
-      zova-module-a-icon: 5.1.26
-      zova-module-a-interceptor: 5.1.29
-      zova-module-a-model: 5.1.30(vue@3.5.39(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.41
-      zova-module-a-router: 5.1.29
-      zova-module-a-routertabs: 5.1.32
-      zova-module-a-ssr: 5.1.26
-      zova-module-a-style: 5.1.32
-      zova-module-a-table: 5.1.37(vue@3.5.39(typescript@5.9.3))
-      zova-module-rest-resource: 5.1.40
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - debug
-      - supports-color
-      - typescript
-
-  zova-rest-cabloy-basic-web@file:.zova-rest/cabloy-basic-web(typescript@5.9.3):
-    dependencies:
-      '@tanstack/query-core': 5.101.1
-      '@tanstack/vue-query': 5.101.1(vue@3.5.39(typescript@5.9.3))
-      openapi3-ts: 4.6.0
-      table-identity: link:packages-utils/table-identity
-      vue: 3.5.39(typescript@5.9.3)
-      zod: '@cabloy/zod@4.3.8'
-      zova: 5.1.118(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
-      zova-jsx: 1.1.67(typescript@5.9.3)
-      zova-module-a-api: 5.1.21
-      zova-module-a-bean: 5.1.31
-      zova-module-a-behavior: 5.1.25
-      zova-module-a-command: 5.1.33
-      zova-module-a-form: 5.1.43(vue@3.5.39(typescript@5.9.3))
-      zova-module-a-icon: 5.1.26
-      zova-module-a-interceptor: 5.1.29
-      zova-module-a-model: 5.1.30(vue@3.5.39(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.41
-      zova-module-a-router: 5.1.29
-      zova-module-a-routertabs: 5.1.32
-      zova-module-a-ssr: 5.1.26
-      zova-module-a-style: 5.1.32
-      zova-module-a-table: 5.1.37(vue@3.5.39(typescript@5.9.3))
-      zova-module-rest-resource: 5.1.40
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - debug
-      - supports-color
-      - typescript
-
   zova-suite-a-zova@5.1.117(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.21

package/vona/pnpm-workspace.yaml

@@ -1,4 +1,5 @@
 packages:
+  - '.zova-rest/*'
   - 'packages-cli/*'
   - 'packages-utils/*'
   - 'packages-vona/*'

package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/package.json

@@ -10,8 +10,7 @@
   "files": [
     "assets",
     "dist",
-    "src",
-    "zovaRest"
+    "src"
   ],
   "type": "module",
   "exports": {

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/package.json

@@ -9,8 +9,7 @@
   "files": [
     "assets",
     "dist",
-    "src",
-    "zovaRest"
+    "src"
   ],
   "type": "module",
   "exports": {

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.17",
+  "version": "5.1.18",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [
@@ -34,7 +34,7 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "knex": "^3.2.9",
+    "knex": "^3.3.0",
     "table-identity": "workspace:^"
   },
   "devDependencies": {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.53",
+  "version": "5.1.54",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/env/.env.cabloyBasicAdmin

@@ -12,6 +12,6 @@ BUILD_MINIFY = false
 BUILD_SOURCEMAP = false
 
 BUILD_COPY_RELEASE = ../vona/src/suite/cabloy-basic/modules/basic-siteadmin/assets/site
-BUILD_REST_COPY_DIST = ../vona/src/suite/cabloy-basic/modules/basic-siteadmin/zovaRest
+BUILD_REST_COPY_DIST = ../vona/.zova-rest
 
 MOCK_ENABLED = false

package/zova/env/.env.cabloyBasicWeb

@@ -15,6 +15,6 @@ BUILD_MINIFY = false
 BUILD_SOURCEMAP = false
 
 BUILD_COPY_RELEASE = ../vona/src/suite/cabloy-basic/modules/basic-siteweb/assets/site
-BUILD_REST_COPY_DIST = ../vona/src/suite/cabloy-basic/modules/basic-siteweb/zovaRest
+BUILD_REST_COPY_DIST = ../vona/.zova-rest
 
 MOCK_ENABLED = false

package/zova/oxfmt.config.ts

@@ -15,7 +15,6 @@ export default defineConfig(
       'coverage',
       'docker-compose',
       'scripts',
-      'zovaRest',
       'assets',
       'vite.config.ts.timestamp-*',
       'quasar.config.ts.temporary.*',

package/zova/oxlint.config.ts

@@ -49,7 +49,6 @@ export default defineConfig(
       'docker-compose',
       'package.json',
       'scripts',
-      'zovaRest',
       'assets',
       'vite.config.ts.timestamp-*',
       'dist-releases',

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.93",
+  "version": "1.2.94",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -40,11 +40,11 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/cli": "^3.1.26",
+    "@cabloy/cli": "^3.1.27",
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.91"
+    "zova-cli-set-front": "^1.2.92"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.91",
+  "version": "1.2.92",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -41,7 +41,7 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.26",
+    "@cabloy/cli": "^3.1.27",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/module-info": "^2.0.0",
     "@cabloy/openapi-typescript": "^7.9.2",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.118",
+  "version": "5.1.119",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.61",
-    "zova-suite-a-zova": "^5.1.117"
+    "zova-suite-a-zova": "^5.1.118"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -37,8 +37,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@cabloy/utils':
-        specifier: ^2.1.24
-        version: 2.1.24
+        specifier: ^2.1.25
+        version: 2.1.25
       '@cabloy/vue-router':
         specifier: ^4.4.16
         version: 4.4.16(vue@3.5.38(typescript@5.9.3))
@@ -74,7 +74,7 @@ importers:
         version: 10.5.1(postcss@8.5.15)
       axios:
         specifier: ^1.16.1
-        version: 1.18.1(supports-color@10.2.2)
+        version: 1.18.1
       compression:
         specifier: ^1.8.1
         version: 1.8.1
@@ -133,7 +133,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.66
+        specifier: ^1.1.67
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -308,8 +308,8 @@ importers:
         version: link:src/suite/a-training/modules/training-student
     devDependencies:
       '@cabloy/cli':
-        specifier: ^3.1.25
-        version: 3.1.25(vue@3.5.38(typescript@5.9.3))
+        specifier: ^3.1.26
+        version: 3.1.26(vue@3.5.38(typescript@5.9.3))
       '@cabloy/lint':
         specifier: ^5.1.27
         version: 5.1.30(@typescript-eslint/eslint-plugin@8.62.0(@typescript-eslint/parser@8.62.0(eslint@10.5.0(jiti@2.7.0))(typescript@5.9.3))(eslint@10.5.0(jiti@2.7.0))(typescript@5.9.3))(@typescript-eslint/rule-tester@8.62.0(eslint@10.5.0(jiti@2.7.0))(typescript@5.9.3))(@typescript-eslint/typescript-estree@8.62.0(typescript@5.9.3))(@typescript-eslint/utils@8.62.0(eslint@10.5.0(jiti@2.7.0))(typescript@5.9.3))(eslint@10.5.0(jiti@2.7.0))(oxfmt@0.45.0)(oxlint@1.71.0)(supports-color@10.2.2)(typescript@5.9.3)(vue-eslint-parser@10.4.1(eslint@10.5.0(jiti@2.7.0)))
@@ -383,8 +383,8 @@ importers:
   packages-cli/cli:
     dependencies:
       '@cabloy/cli':
-        specifier: ^3.1.25
-        version: 3.1.25(vue@3.5.38(typescript@5.9.3))
+        specifier: ^3.1.26
+        version: 3.1.26(vue@3.5.38(typescript@5.9.3))
       '@cabloy/process-helper':
         specifier: ^3.1.8
         version: 3.1.8
@@ -395,7 +395,7 @@ importers:
         specifier: ^7.6.2
         version: 7.8.5
       zova-cli-set-front:
-        specifier: ^1.2.90
+        specifier: ^1.2.91
         version: link:../cli-set-front
     devDependencies:
       clean-package:
@@ -417,8 +417,8 @@ importers:
         specifier: ^7.28.6
         version: 7.29.7(@babel/core@7.29.7)
       '@cabloy/cli':
-        specifier: ^3.1.25
-        version: 3.1.25(vue@3.5.38(typescript@5.9.3))
+        specifier: ^3.1.26
+        version: 3.1.26(vue@3.5.38(typescript@5.9.3))
       '@cabloy/extend':
         specifier: ^3.2.8
         version: 3.2.8
@@ -429,8 +429,8 @@ importers:
         specifier: ^7.9.2
         version: 7.9.2(typescript@5.9.3)
       '@cabloy/utils':
-        specifier: ^2.1.24
-        version: 2.1.24
+        specifier: ^2.1.25
+        version: 2.1.25
       '@cabloy/vite-plugin-babel':
         specifier: ^1.3.3
         version: 1.3.3(@babel/core@7.29.7)(vite@8.1.0(@types/node@22.20.0)(esbuild@0.27.7)(jiti@2.7.0)(sass-embedded@1.100.0)(sass@1.101.0)(terser@5.48.0)(yaml@2.9.0))
@@ -504,7 +504,7 @@ importers:
         specifier: ^1.1.17
         version: link:../../packages-utils/zova-openapi
       zova-vite:
-        specifier: ^1.1.41
+        specifier: ^1.1.42
         version: link:../../packages-utils/zova-vite
     devDependencies:
       clean-package:
@@ -660,8 +660,8 @@ importers:
         specifier: ^2.1.8
         version: 2.1.8
       '@cabloy/utils':
-        specifier: ^2.1.24
-        version: 2.1.24
+        specifier: ^2.1.25
+        version: 2.1.25
       '@cabloy/word-utils':
         specifier: ^2.1.14
         version: link:../word-utils
@@ -672,7 +672,7 @@ importers:
         specifier: ^3.5.38
         version: 3.5.38(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.60
+        specifier: ^5.1.61
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -713,8 +713,8 @@ importers:
         specifier: ^3.2.8
         version: 3.2.8
       '@cabloy/module-glob':
-        specifier: ^5.3.15
-        version: 5.3.15
+        specifier: ^5.3.16
+        version: 5.3.16
       '@cabloy/module-info':
         specifier: ^2.0.0
         version: 2.0.0
@@ -813,10 +813,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.60
+        specifier: ^5.1.61
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.116
+        specifier: ^5.1.117
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -847,8 +847,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@cabloy/utils':
-        specifier: ^2.1.24
-        version: 2.1.24
+        specifier: ^2.1.25
+        version: 2.1.25
       '@cabloy/vue-compiler-sfc':
         specifier: ^3.5.14
         version: 3.5.14
@@ -1001,7 +1001,7 @@ importers:
         specifier: ^5.1.34
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.80
+        specifier: ^5.1.81
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1075,7 +1075,7 @@ importers:
     dependencies:
       axios:
         specifier: ^1.16.1
-        version: 1.18.1(supports-color@10.2.2)
+        version: 1.18.1
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1325,8 +1325,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@cabloy/utils':
-        specifier: ^2.1.24
-        version: 2.1.24
+        specifier: ^2.1.25
+        version: 2.1.25
       '@cabloy/vue-router':
         specifier: ^4.4.16
         version: 4.4.16(vue@3.5.38(typescript@5.9.3))
@@ -1340,12 +1340,12 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.66
+        specifier: ^1.1.67
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':
-        specifier: ^3.1.25
-        version: 3.1.25(vue@3.5.38(typescript@5.9.3))
+        specifier: ^3.1.26
+        version: 3.1.26(vue@3.5.38(typescript@5.9.3))
       '@types/luxon':
         specifier: ^3.7.1
         version: 3.7.2
@@ -1961,8 +1961,8 @@ packages:
   '@bufbuild/protobuf@2.12.1':
     resolution: {integrity: sha512-BvAMfS6LrgZiryOAZ4pBYucu4wG/Ei/9o9DZ9akbREnMLbPJiom2i8b9C8IsKErQoiKqVhrerzt3kOT/RrzLHg==}
 
-  '@cabloy/cli@3.1.25':
-    resolution: {integrity: sha512-T5MwXUYBK+T998jpuXB43FCzWgwp6lThgYKuOMfeSIJsopXs4W4od6kDyO2HlE/qtbamI+ss8H78Im/MCqpHyA==}
+  '@cabloy/cli@3.1.26':
+    resolution: {integrity: sha512-EPE7N3GDbPiimWPO/pdZ06ZWFlZm2gdtgb7mZ5my2Jgakw0Zp9Zt1aDyHx8il/nO6sHzzsESfbHC2/lXXpENTw==}
 
   '@cabloy/compose@2.1.8':
     resolution: {integrity: sha512-TdEr9BY54BYoIlTjkrOKkzK8yJWmP07OrRTh4punJMnWzM+oDExQ2EGCGAHXnEHjLWqdhyMGm/ejmxnVgBmraQ==}
@@ -1992,8 +1992,8 @@ packages:
   '@cabloy/localeutil@2.1.8':
     resolution: {integrity: sha512-haHUf245W2hmMrTw4UE23kOLcCPFj3XYWkjVYA643C/qhSGD7/ztMPf0VQL/AvmDnvIsjvKWdt79M4vjgOyD/A==}
 
-  '@cabloy/module-glob@5.3.15':
-    resolution: {integrity: sha512-oAEXOcM2/VKC03knfK8XoVOHTweW4E9rNmnGyDRfUYOb9dxEJx3C9PZyUt/1mdL5l13iZDbLw4tE+4d5QYH8Kg==}
+  '@cabloy/module-glob@5.3.16':
+    resolution: {integrity: sha512-+fkKjX01Fgug5i5edHRbcMyLNQSP/atWCnybhfhH/NOgpaw29JxmuUpeNuggmuT4MeDIiPpBE4UKoAGCeKIizQ==}
 
   '@cabloy/module-info@2.0.0':
     resolution: {integrity: sha512-ArN0/Ei4LH2LklWB2fy4+DVvli56A0m4mZPnKnQYoXEfkMtXChxbNDm6DZScY57lfTSyx7ZfGTgNVEbxF6VwYg==}
@@ -2047,8 +2047,8 @@ packages:
   '@cabloy/socket@2.1.9':
     resolution: {integrity: sha512-iuqHddhxlQBg/bftoFPX5iTzELYEkPfm1DLC7YJX+qUvU3rO99EilAmqimpMTVbZNOM4d1Fa2+xgdKoNVDd9cA==}
 
-  '@cabloy/utils@2.1.24':
-    resolution: {integrity: sha512-z3yQBFIB3g3wK3H1LzdsyBpebHVPR3f2DR7Ic8U6EOPv7lNMx7Q3n1MiCOFIO/oRr2QLVmDSXNjekKaLJhy5LA==}
+  '@cabloy/utils@2.1.25':
+    resolution: {integrity: sha512-GA0qAqlXpgqH7mMSUP5eeO06t/FIP+FPkUay6rAMQwRnw5gXxLRgoxpgDUBrfpY8nInf7Dcr2lRfgAlrS8Istg==}
 
   '@cabloy/vite-plugin-babel@1.3.3':
     resolution: {integrity: sha512-fr4XlCREJDFi0bg3rXpm1jmvGN2M7WHGG4vCzpLmXGMzrM3X68Bk/gem16NoVSBteKH/ybm4CaNFIOy6Gqu8cg==}
@@ -8189,13 +8189,13 @@ snapshots:
 
   '@bufbuild/protobuf@2.12.1': {}
 
-  '@cabloy/cli@3.1.25(vue@3.5.38(typescript@5.9.3))':
+  '@cabloy/cli@3.1.26(vue@3.5.38(typescript@5.9.3))':
     dependencies:
       '@babel/parser': 7.29.7
-      '@cabloy/module-glob': 5.3.15
+      '@cabloy/module-glob': 5.3.16
       '@cabloy/module-info': 2.0.0
       '@cabloy/process-helper': 3.1.8
-      '@cabloy/utils': 2.1.24
+      '@cabloy/utils': 2.1.25
       '@cabloy/word-utils': link:packages-utils/word-utils
       '@npmcli/config': 10.11.0
       '@zhennann/common-bin': 4.0.1
@@ -8269,10 +8269,10 @@ snapshots:
 
   '@cabloy/localeutil@2.1.8': {}
 
-  '@cabloy/module-glob@5.3.15':
+  '@cabloy/module-glob@5.3.16':
     dependencies:
       '@cabloy/module-info': 2.0.0
-      '@cabloy/utils': 2.1.24
+      '@cabloy/utils': 2.1.25
       boxen: 4.2.0
       chalk: 3.0.0
       fs-extra: 11.3.5
@@ -8366,7 +8366,7 @@ snapshots:
 
   '@cabloy/socket@2.1.9': {}
 
-  '@cabloy/utils@2.1.24':
+  '@cabloy/utils@2.1.25':
     dependencies:
       '@cabloy/module-info': 2.0.0
       '@cabloy/word-utils': link:packages-utils/word-utils
@@ -10252,7 +10252,7 @@ snapshots:
 
   acorn@8.17.0: {}
 
-  agent-base@6.0.2(supports-color@10.2.2):
+  agent-base@6.0.2:
     dependencies:
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -10364,11 +10364,11 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axios@1.18.1(supports-color@10.2.2):
+  axios@1.18.1:
     dependencies:
       follow-redirects: 1.16.0
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1(supports-color@10.2.2)
+      https-proxy-agent: 5.0.1
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -11784,9 +11784,9 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  https-proxy-agent@5.0.1(supports-color@10.2.2):
+  https-proxy-agent@5.0.1:
     dependencies:
-      agent-base: 6.0.2(supports-color@10.2.2)
+      agent-base: 6.0.2
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.81",
+  "version": "5.1.82",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -46,7 +46,7 @@
     "zova-jsx": "^1.1.67"
   },
   "devDependencies": {
-    "@cabloy/cli": "^3.1.26",
+    "@cabloy/cli": "^3.1.27",
     "@types/luxon": "^3.7.1",
     "clean-package": "^2.2.0",
     "fs-extra": "^11.3.5",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.117",
+  "version": "5.1.118",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.32",
     "zova-module-a-table": "^5.1.37",
     "zova-module-a-zod": "^5.1.34",
-    "zova-module-a-zova": "^5.1.81"
+    "zova-module-a-zova": "^5.1.82"
   },
   "title": "a-zova"
 }