cabloy 5.1.81 → 5.1.84

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 5.1.84
+
+### Improvements
+
+- Publish version 5.1.84.
+- Bump `zova-core` to v5.1.69.
+- Refresh the Vona `zova-core` patch for v5.1.68.
+
+## 5.1.83
+
+### Bug Fixes
+
+- Automate refresh of the zova-core compensation graph.
+- Harden zova-core compensation rollback handling.
+
 ## 5.1.81
 
 ### Improvements

package/package.json

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

package/scripts/release.ts

@@ -1,6 +1,14 @@
 import minimist from 'minimist';
 import { execSync } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import {
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  writeFileSync,
+} from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -11,8 +19,16 @@ const COMMIT_CAP = 200;
 const RELEASE_SCRIPT_PATH = fileURLToPath(import.meta.url);
 const ROOT_DIR = resolve(dirname(RELEASE_SCRIPT_PATH), '..');
 const VONA_DIR = resolve(ROOT_DIR, 'vona');
+const VONA_PACKAGE_JSON_PATH = resolve(VONA_DIR, 'package.json');
+const VONA_PACKAGE_ORIGINAL_JSON_PATH = resolve(VONA_DIR, 'package.original.json');
 const VONA_WORKSPACE_PATH = resolve(VONA_DIR, 'pnpm-workspace.yaml');
+const VONA_LOCKFILE_PATH = resolve(VONA_DIR, 'pnpm-lock.yaml');
 const VONA_PATCHES_DIR = resolve(VONA_DIR, 'patches');
+const VONA_ZOVA_REST_DIR = resolve(VONA_DIR, '.zova-rest');
+const ZOVA_DIR = resolve(ROOT_DIR, 'zova');
+const ZOVA_PACKAGE_JSON_PATH = resolve(ZOVA_DIR, 'package.json');
+const ZOVA_PACKAGE_ORIGINAL_JSON_PATH = resolve(ZOVA_DIR, 'package.original.json');
+const ZOVA_LOCKFILE_PATH = resolve(ZOVA_DIR, 'pnpm-lock.yaml');
 const ZOVA_CORE_PACKAGE_JSON_PATH = resolve(
   ROOT_DIR,
   'zova',
@@ -22,12 +38,22 @@ const ZOVA_CORE_PACKAGE_JSON_PATH = resolve(
 );
 const PACKAGE_JSON_PATH = resolve(ROOT_DIR, 'package.json');
 const CHANGELOG_PATH = resolve(ROOT_DIR, 'CHANGELOG.md');
+const ZOVA_CORE_PATCH_TARGETS = [
+  'dist/bean/resource/error/errorGlobal.d.ts',
+  'dist/types/utils/env.d.ts',
+  'dist/types/interface/module.d.ts',
+] as const;
 
 interface ExecOptions {
   cwd?: string;
   env?: NodeJS.ProcessEnv;
 }
 
+interface FileSnapshot {
+  filePath: string;
+  content: string | null;
+}
+
 // --- Utility functions ---
 function exec(cmd: string, dryRun?: boolean, options?: ExecOptions): string {
   if (dryRun) {
@@ -187,9 +213,98 @@ function updateVonaPatchedDependency(version?: string): void {
   writeFileSync(VONA_WORKSPACE_PATH, `${newLines.join('\n').replace(/\n+$/, '\n')}\n`);
 }
 
-function ensureFileExists(filePath: string): void {
-  if (!existsSync(filePath)) {
-    writeFileSync(filePath, '');
+function readFileIfExists(filePath: string): string | null {
+  return existsSync(filePath) ? readFileSync(filePath, 'utf-8') : null;
+}
+
+function restoreFileSnapshot(snapshot: FileSnapshot): void {
+  if (snapshot.content === null) {
+    rmSync(snapshot.filePath, { force: true });
+    return;
+  }
+  writeFileSync(snapshot.filePath, snapshot.content);
+}
+
+function createFileSnapshot(filePath: string): FileSnapshot {
+  return {
+    filePath,
+    content: readFileIfExists(filePath),
+  };
+}
+
+function seedVonaZovaRestWorkspaceDependencies(): void {
+  if (!existsSync(VONA_ZOVA_REST_DIR)) return;
+  const pkg = readJson(VONA_PACKAGE_JSON_PATH) as {
+    dependencies?: Record<string, string>;
+  };
+  pkg.dependencies ??= {};
+  let changed = false;
+  for (const entry of readdirSync(VONA_ZOVA_REST_DIR, { 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(VONA_PACKAGE_JSON_PATH, `${JSON.stringify(pkg, null, 2)}\n`);
+}
+
+function refreshZovaDependencyGraph(): void {
+  copyFileSync(ZOVA_PACKAGE_ORIGINAL_JSON_PATH, ZOVA_PACKAGE_JSON_PATH);
+  execInherited('pnpm install', false, { cwd: ZOVA_DIR });
+  execInherited('npm run zova :tools:deps', false, { cwd: ZOVA_DIR });
+  execInherited('npm run build:zova:admin');
+  if (existsSync(resolve(ROOT_DIR, '__CABLOY_BASIC__'))) {
+    execInherited('npm run build:zova:web');
+  }
+}
+
+function prepareVonaBootstrapManifest(): void {
+  copyFileSync(VONA_PACKAGE_ORIGINAL_JSON_PATH, VONA_PACKAGE_JSON_PATH);
+  seedVonaZovaRestWorkspaceDependencies();
+}
+
+function refreshVonaDependencyGraph(): void {
+  prepareVonaBootstrapManifest();
+  execInherited('npm run deps:vona');
+}
+
+function validateGeneratedZovaCorePatch(version: string): void {
+  const patchFilePath = getPatchFilePath(version);
+  const patchContent = readFileIfExists(patchFilePath)?.trim();
+  if (!patchContent) {
+    throw new Error(`Generated zova-core patch is missing or empty: ${patchFilePath}`);
+  }
+  if (!patchContent.includes('diff --git')) {
+    throw new Error(`Generated zova-core patch does not contain any diff hunks: ${patchFilePath}`);
+  }
+  for (const patchTarget of ZOVA_CORE_PATCH_TARGETS) {
+    if (!patchContent.includes(`a/${patchTarget}`) || !patchContent.includes(`b/${patchTarget}`)) {
+      throw new Error(`Generated zova-core patch is missing the expected target: ${patchTarget}`);
+    }
+  }
+  if (!patchContent.includes(' export {};')) {
+    throw new Error('Generated zova-core patch is missing the expected errorGlobal export rewrite');
+  }
+  if (!patchContent.includes("-declare module '@cabloy/module-info'")) {
+    throw new Error(
+      'Generated zova-core patch is missing the expected @cabloy/module-info removal',
+    );
+  }
+  if (
+    !patchContent.includes('-declare global {') ||
+    !patchContent.includes('-        interface ProcessEnv {')
+  ) {
+    throw new Error('Generated zova-core patch is missing the expected ProcessEnv removal');
+  }
+}
+
+function ensurePatchedLockfileVersion(version: string): void {
+  const lockfileContent = readFileIfExists(VONA_LOCKFILE_PATH);
+  if (!lockfileContent?.includes(`zova-core@${version}:`)) {
+    throw new Error(`Vona lockfile is missing the patched zova-core@${version} entry`);
   }
 }
 
@@ -228,7 +343,7 @@ function applyKnownZovaCorePatchEdits(editDir: string): void {
   const envContent = readFileSync(envPath, 'utf-8');
   const envNext = replaceOrThrow(
     envContent,
-    /declare global \{\n {4}namespace NodeJS \{\n {8}interface ProcessEnv \{[\s\S]*?\n        \}\n    \}\n\}\n?/,
+    /declare global \{\n {4}namespace NodeJS \{\n {8}interface ProcessEnv \{[\s\S]*?\n {8}\}\n {4}\}\n\}\n?/,
     '',
     'the NodeJS.ProcessEnv augmentation',
   );
@@ -281,56 +396,105 @@ function regenerateVonaZovaCorePatch(
   console.log(`\n🩹 Regenerating the Vona zova-core patch for ${targetVersion}...`);
 
   if (dryRun) {
+    // eslint-disable-next-line
+    console.log('  [dry-run] Refresh the Zova dependency graph from package.original.json');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Run pnpm install in zova');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Run npm run zova :tools:deps in zova');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Run npm run build:zova:admin');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Run npm run build:zova:web when the active edition requires it');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Refresh the Vona dependency graph from package.original.json');
     // eslint-disable-next-line
     console.log(
       '  [dry-run] Temporarily remove the current zova-core patched dependency registration',
     );
-    exec(`pnpm --dir "${VONA_DIR}" install`, true);
-    exec(
-      `pnpm --dir "${VONA_DIR}" patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
+    // eslint-disable-next-line
+    console.log('  [dry-run] Seed Vona .zova-rest workspace dependencies if needed');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Run npm run deps:vona');
+    // eslint-disable-next-line
+    console.log('  [dry-run] Run pnpm install in vona without the old patch registration');
+    execInherited('pnpm install', true, { cwd: VONA_DIR });
+    execInherited(
+      `pnpm patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
       true,
+      { cwd: VONA_DIR },
     );
     // eslint-disable-next-line
     console.log('  [dry-run] Apply the known zova-core declaration-file patch edits');
+    execInherited(`pnpm patch-commit "${editDir}" --patches-dir patches`, true, {
+      cwd: VONA_DIR,
+    });
     // eslint-disable-next-line
-    console.log(`  [dry-run] Ensure ${newPatchFilePath} exists before patch-commit`);
-    exec(
-      `pnpm --dir "${VONA_DIR}" patch-commit "${editDir}" --patches-dir "${VONA_PATCHES_DIR}"`,
-      true,
-    );
+    console.log(`  [dry-run] Validate ${newPatchFilePath}`);
     // eslint-disable-next-line
     console.log(`  [dry-run] Restore ${VONA_WORKSPACE_PATH} to point at ${newPatchFilePath}`);
     // eslint-disable-next-line
     console.log(`  [dry-run] Remove ${oldPatchFilePath} if it still exists`);
-    exec(`pnpm --dir "${VONA_DIR}" install`, true);
+    execInherited('pnpm install', true, { cwd: VONA_DIR });
     return;
   }
 
+  const snapshots = [
+    createFileSnapshot(ZOVA_PACKAGE_JSON_PATH),
+    createFileSnapshot(ZOVA_LOCKFILE_PATH),
+    createFileSnapshot(VONA_PACKAGE_JSON_PATH),
+    createFileSnapshot(VONA_WORKSPACE_PATH),
+    createFileSnapshot(VONA_LOCKFILE_PATH),
+    createFileSnapshot(oldPatchFilePath),
+    createFileSnapshot(newPatchFilePath),
+  ];
+
   rmSync(editDir, { recursive: true, force: true });
   mkdirSync(dirname(editDir), { recursive: true });
 
   try {
+    refreshZovaDependencyGraph();
     updateVonaPatchedDependency();
-    execInherited(`pnpm --dir "${VONA_DIR}" install`);
+    refreshVonaDependencyGraph();
+    execInherited('pnpm install', false, { cwd: VONA_DIR });
 
     execInherited(
-      `pnpm --dir "${VONA_DIR}" patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
+      `pnpm patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
+      false,
+      {
+        cwd: VONA_DIR,
+      },
     );
     applyKnownZovaCorePatchEdits(editDir);
-
-    ensureFileExists(newPatchFilePath);
-    execInherited(
-      `pnpm --dir "${VONA_DIR}" patch-commit "${editDir}" --patches-dir "${VONA_PATCHES_DIR}"`,
-    );
+    execInherited(`pnpm patch-commit "${editDir}" --patches-dir patches`, false, {
+      cwd: VONA_DIR,
+    });
+    validateGeneratedZovaCorePatch(targetVersion);
 
     updateVonaPatchedDependency(targetVersion);
-    if (!existsSync(newPatchFilePath)) {
-      throw new Error(`Expected regenerated patch file is missing: ${newPatchFilePath}`);
-    }
     if (currentPatchedVersion !== targetVersion && existsSync(oldPatchFilePath)) {
       rmSync(oldPatchFilePath);
     }
-    execInherited(`pnpm --dir "${VONA_DIR}" install`);
+    execInherited('pnpm install', false, { cwd: VONA_DIR });
+    if (readCurrentPatchedZovaCoreVersion() !== targetVersion) {
+      throw new Error(
+        `Vona patchedDependencies entry was not updated to zova-core@${targetVersion}`,
+      );
+    }
+    ensurePatchedLockfileVersion(targetVersion);
+  } catch (error) {
+    for (const snapshot of snapshots) {
+      restoreFileSnapshot(snapshot);
+    }
+    try {
+      execInherited('pnpm install', false, { cwd: VONA_DIR });
+    } catch {
+      // eslint-disable-next-line
+      console.warn(
+        'Warning: failed to restore the Vona install state after compensation rollback.',
+      );
+    }
+    throw error;
   } finally {
     rmSync(editDir, { recursive: true, force: true });
   }
@@ -352,10 +516,13 @@ function verifyCompensationPatch(dryRun?: boolean): void {
 function commitCompensationChanges(targetVersion: string, dryRun?: boolean): void {
   // eslint-disable-next-line
   console.log('\n📁 Committing compensation changes...');
-  exec('git add vona/pnpm-workspace.yaml vona/pnpm-lock.yaml vona/patches', dryRun);
+  exec(
+    'git add vona/package.json vona/pnpm-workspace.yaml vona/pnpm-lock.yaml vona/patches',
+    dryRun,
+  );
   if (!dryRun) {
     const staged = execSync(
-      'git diff --cached --name-only -- vona/pnpm-workspace.yaml vona/pnpm-lock.yaml vona/patches',
+      'git diff --cached --name-only -- vona/package.json vona/pnpm-workspace.yaml vona/pnpm-lock.yaml vona/patches',
       { cwd: ROOT_DIR, encoding: 'utf-8' },
     ).trim();
     if (!staged) {

package/vona/patches/{zova-core@5.1.66.patch → zova-core@5.1.68.patch}

@@ -14,7 +14,7 @@ index 73cebe18f3e260c295bdf42a3d1ab9e86fa2de87..cb0ff5c3b541f646105198ee23ac0fc3
 -//# sourceMappingURL=errorGlobal.d.ts.map
 
 diff --git a/dist/types/interface/module.d.ts b/dist/types/interface/module.d.ts
-index 838e299407218b7bfac469d42a12d6ab59820380..314deb46c0c40670e9c0bc0c6146024e23b147d7 100644
+index 838e299407218b7bfac469d42a12d6ab59820380..e8b61cc231e39ee3a270ee513ab43ff5a13fc290 100644
 --- a/dist/types/interface/module.d.ts
 +++ b/dist/types/interface/module.d.ts
 @@ -23,12 +23,6 @@ export interface IModuleResource {
@@ -30,8 +30,9 @@ index 838e299407218b7bfac469d42a12d6ab59820380..314deb46c0c40670e9c0bc0c6146024e
  export interface IModuleApp {
  }
  //# sourceMappingURL=module.d.ts.map
+
 diff --git a/dist/types/utils/env.d.ts b/dist/types/utils/env.d.ts
-index 708c0a584dfec65b8c7ad2d049156f900de49928..df2bfa254283a8dce5122d97e931244e9d86e41a 100644
+index 708c0a584dfec65b8c7ad2d049156f900de49928..a8caacb276794e3ac70591b974f14d6eee3ac302 100644
 --- a/dist/types/utils/env.d.ts
 +++ b/dist/types/utils/env.d.ts
 @@ -34,19 +34,4 @@ export interface ZovaConfigEnv {

package/vona/pnpm-lock.yaml

@@ -16,7 +16,7 @@ overrides:
   zod: npm:@cabloy/zod@4.3.8
 
 patchedDependencies:
-  zova-core@5.1.66: 19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d
+  zova-core@5.1.68: 0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54
 
 importers:
 
@@ -474,11 +474,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.122
-        version: 5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.123
+        version: 5.1.123(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.70
-        version: 1.1.70(typescript@5.9.3)
+        specifier: ^1.1.71
+        version: 1.1.71(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.21
         version: 5.1.21
@@ -546,11 +546,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.122
-        version: 5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.123
+        version: 5.1.123(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.70
-        version: 1.1.70(typescript@5.9.3)
+        specifier: ^1.1.71
+        version: 1.1.71(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.21
         version: 5.1.21
@@ -7535,11 +7535,11 @@ packages:
     peerDependencies:
       zod: ^3.25.28 || ^4
 
-  zova-core@5.1.66:
-    resolution: {integrity: sha512-1zADVAYTSOmqqHdF1/30qIXSbd6TVi2/UwkEK+Wmk00qAUZsEWpbTMF9cRm/TijOipJrzGwFMAgHAk3eqUCzLg==}
+  zova-core@5.1.68:
+    resolution: {integrity: sha512-Lg0uQtnbVfHTAPDXM4EWs7M11/ncqyv8R70RFp+OGJWgLxLRxh31ekkqAmvDbztjbFuRoUANuri3OIapN+UTvA==}
 
-  zova-jsx@1.1.70:
-    resolution: {integrity: sha512-UEBqyh9a6mNrT8k1v1FhfQoA4L5yX0afhwZj2sCwE38m3XHRMvC95kAEn0jNuKEXnJAUKKmG/5bp6bH3/mr+Gw==}
+  zova-jsx@1.1.71:
+    resolution: {integrity: sha512-Mp9DV+akSw6Sc0+MEjhcdVov6Kjix26bzwXeqYp/BAL08O/bZXuBdsaokEorckm7+F8yvo6F31WMJnGvP9vj9A==}
 
   zova-module-a-api@5.1.21:
     resolution: {integrity: sha512-qjm/hfjC4/+7Ap/uzJfBzV0PwRlp2idEmEKwCZYxquaXq6QtJBbTWTznw1iukT4lkJZip2KFkjOvXTzdvZA2UA==}
@@ -7613,17 +7613,17 @@ packages:
   zova-module-a-zod@5.1.35:
     resolution: {integrity: sha512-hCZG81WY5MPG5ozaYLMiNML4FtdCGNOJpi5drEKTP/xpsvzil66ZaOXkWj+XO/3MlkulmcBEThBx7amcHHWszg==}
 
-  zova-module-a-zova@5.1.85:
-    resolution: {integrity: sha512-L4s4oNLrWYJJzgdlwuK0NfLKQoV0clzTWwtSt5rqXKLNXi6URslYoZGiT14Hp6F3s1e6JmlCtc2NQugKQr8uVg==}
+  zova-module-a-zova@5.1.86:
+    resolution: {integrity: sha512-5PEJ63sWSCBmZwbBFAslnGmMgFUHG45COPIgwEugpvf4v9RF7yxRn36ZPbuoM84kCFlZcd6zY8bOWqt9TMSPuw==}
 
   zova-module-rest-resource@5.1.40:
     resolution: {integrity: sha512-rMqZaXSK6nJ4LW2O1yO/jZqxI7joCiWylzjutMTKpx7EfNmtK1t1nVoWFd+gCTxqgbbv9uXh0vfFaSFA7GKYFg==}
 
-  zova-suite-a-zova@5.1.121:
-    resolution: {integrity: sha512-9xeqe7lUCVkDVtLlOM1qjxqxDwCPWTf1NvkNCrBSQR+kyfLaxhUlD6ZapPHTlL8Jf0KSw3EqN/s95P78N41d4w==}
+  zova-suite-a-zova@5.1.122:
+    resolution: {integrity: sha512-HC8Sc7S/ucCQMUr3kV2gILa7ygpriPxCiXs7hK3C8VIZrw4Lcg/u1EDYroG+yvlvFxXByBJuGahJYRZ1Iu/9Zw==}
 
-  zova@5.1.122:
-    resolution: {integrity: sha512-hsXGeOXPsB5CwOlnMjQOiP/6e0/V3Doq/fi6HuwU7hyWwBKwkk3RtlS9rY9KR9KAA59SEf6Ms2u7SoCR6KL+Eg==}
+  zova@5.1.123:
+    resolution: {integrity: sha512-GQO0qbdqUNUo8HFCMN7nLjvA3bpWZGtYsBfnTSUHmxjal6Q2vkPbwZ79aArH31c0fP6mwNS0BOyNFoyDihc5Kw==}
 
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
@@ -13092,7 +13092,7 @@ snapshots:
     dependencies:
       zod: '@cabloy/zod@4.3.8'
 
-  zova-core@5.1.66(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(typescript@5.9.3):
+  zova-core@5.1.68(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
       '@cabloy/extend': link:packages-utils/extend
@@ -13121,14 +13121,14 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  zova-jsx@1.1.70(typescript@5.9.3):
+  zova-jsx@1.1.71(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.39(typescript@5.9.3)
-      zova-core: 5.1.66(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(typescript@5.9.3)
+      zova-core: 5.1.68(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
@@ -13229,7 +13229,7 @@ snapshots:
       '@cabloy/zod-query': link:packages-utils/zod-query
       zod: '@cabloy/zod@4.3.8'
 
-  zova-module-a-zova@5.1.85(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-module-a-zova@5.1.86(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
       '@cabloy/deps': link:packages-utils/deps
@@ -13240,14 +13240,14 @@ snapshots:
       '@cabloy/word-utils': 2.1.14
       defu: 6.1.7
       luxon: 3.7.2
-      zova-jsx: 1.1.70(typescript@5.9.3)
+      zova-jsx: 1.1.71(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
       - vue
 
   zova-module-rest-resource@5.1.40: {}
 
-  zova-suite-a-zova@5.1.121(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.21
       zova-module-a-app: 5.1.24
@@ -13273,7 +13273,7 @@ snapshots:
       zova-module-a-style: 5.1.32
       zova-module-a-table: 5.1.37(vue@3.5.39(typescript@5.9.3))
       zova-module-a-zod: 5.1.35
-      zova-module-a-zova: 5.1.85(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-zova: 5.1.86(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug
@@ -13281,10 +13281,10 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova@5.1.123(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
-      zova-core: 5.1.66(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.121(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-core: 5.1.68(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
+      zova-suite-a-zova: 5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/vona/pnpm-workspace.yaml

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

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.66"
+    "zova-core": "^5.1.70"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.122",
+  "version": "5.1.124",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.66",
-    "zova-suite-a-zova": "^5.1.121"
+    "zova-core": "^5.1.70",
+    "zova-suite-a-zova": "^5.1.123"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.66",
+  "version": "5.1.70",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/pnpm-lock.yaml

@@ -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.67
+        specifier: ^1.1.71
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -309,7 +309,7 @@ importers:
     devDependencies:
       '@cabloy/cli':
         specifier: ^3.1.27
-        version: 3.1.27(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.27(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)))
@@ -384,7 +384,7 @@ importers:
     dependencies:
       '@cabloy/cli':
         specifier: ^3.1.27
-        version: 3.1.27(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.27(vue@3.5.38(typescript@5.9.3))
       '@cabloy/process-helper':
         specifier: ^3.1.8
         version: 3.1.8
@@ -418,7 +418,7 @@ importers:
         version: 7.29.7(@babel/core@7.29.7)
       '@cabloy/cli':
         specifier: ^3.1.27
-        version: 3.1.27(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.27(vue@3.5.38(typescript@5.9.3))
       '@cabloy/extend':
         specifier: ^3.2.8
         version: 3.2.8
@@ -672,7 +672,7 @@ importers:
         specifier: ^3.5.38
         version: 3.5.38(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.62
+        specifier: ^5.1.68
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -813,10 +813,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.62
+        specifier: ^5.1.68
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.119
+        specifier: ^5.1.122
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -1001,7 +1001,7 @@ importers:
         specifier: ^5.1.35
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.83
+        specifier: ^5.1.86
         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
@@ -1340,12 +1340,12 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.68
+        specifier: ^1.1.71
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':
         specifier: ^3.1.27
-        version: 3.1.27(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))
+        version: 3.1.27(vue@3.5.38(typescript@5.9.3))
       '@types/luxon':
         specifier: ^3.7.1
         version: 3.7.2
@@ -8189,7 +8189,7 @@ snapshots:
 
   '@bufbuild/protobuf@2.12.1': {}
 
-  '@cabloy/cli@3.1.27(supports-color@10.2.2)(vue@3.5.38(typescript@5.9.3))':
+  '@cabloy/cli@3.1.27(vue@3.5.38(typescript@5.9.3))':
     dependencies:
       '@babel/parser': 7.29.7
       '@cabloy/module-glob': 5.3.16
@@ -8198,7 +8198,7 @@ snapshots:
       '@cabloy/utils': 2.1.25
       '@cabloy/word-utils': link:packages-utils/word-utils
       '@npmcli/config': 10.11.0
-      '@zhennann/common-bin': 4.0.1(supports-color@10.2.2)
+      '@zhennann/common-bin': 4.0.1
       '@zhennann/ejs': 3.0.1
       boxen: 4.2.0
       chalk: 3.0.0
@@ -10219,7 +10219,7 @@ snapshots:
 
   '@vue/shared@3.5.13': {}
 
-  '@zhennann/common-bin@4.0.1(supports-color@10.2.2)':
+  '@zhennann/common-bin@4.0.1':
     dependencies:
       chalk: 4.1.2
       change-case: 4.1.2
@@ -10253,7 +10253,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:
@@ -10365,11 +10365,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
@@ -11785,9 +11785,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.85",
+  "version": "5.1.87",
   "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.70"
+    "zova-jsx": "^1.1.72"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.27",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.121",
+  "version": "5.1.123",
   "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.35",
-    "zova-module-a-zova": "^5.1.85"
+    "zova-module-a-zova": "^5.1.87"
   },
   "title": "a-zova"
 }