cabloy 5.1.79 → 5.1.81

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 5.1.81
+
+### Improvements
+
+- Refresh the `vona` `zova-core` patch for v5.1.66.
+
+## 5.1.80
+
+### Bug Fixes
+
+- Harden the `zova-core` release compensation flow.
+
 ## 5.1.79
 
 ### Improvements

package/package.json

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

package/scripts/release.ts

@@ -159,8 +159,8 @@ function readLocalZovaCoreVersion(): string {
   return version;
 }
 
-function normalizeVonaPatchedDependency(version: string): void {
-  const patchLine = `  zova-core@${version}: patches/zova-core@${version}.patch`;
+function updateVonaPatchedDependency(version?: string): void {
+  const patchLine = version ? `  zova-core@${version}: patches/zova-core@${version}.patch` : null;
   const lines = readFileSync(VONA_WORKSPACE_PATH, 'utf-8').split('\n');
   const patchedDependenciesIndex = lines.findIndex(line => line.trim() === 'patchedDependencies:');
   if (patchedDependenciesIndex === -1) {
@@ -180,13 +180,19 @@ function normalizeVonaPatchedDependency(version: string): void {
     );
   const newLines = [
     ...lines.slice(0, patchedDependenciesIndex + 1),
-    patchLine,
+    ...(patchLine ? [patchLine] : []),
     ...preservedBlockLines,
     ...lines.slice(blockEndIndex),
   ];
   writeFileSync(VONA_WORKSPACE_PATH, `${newLines.join('\n').replace(/\n+$/, '\n')}\n`);
 }
 
+function ensureFileExists(filePath: string): void {
+  if (!existsSync(filePath)) {
+    writeFileSync(filePath, '');
+  }
+}
+
 function replaceOrThrow(
   content: string,
   search: RegExp,
@@ -222,7 +228,7 @@ function applyKnownZovaCorePatchEdits(editDir: string): void {
   const envContent = readFileSync(envPath, 'utf-8');
   const envNext = replaceOrThrow(
     envContent,
-    /declare global \{\n {4}namespace NodeJS \{\n        interface ProcessEnv \{[\s\S]*?\n        \}\n    \}\n\}\n?/,
+    /declare global \{\n {4}namespace NodeJS \{\n {8}interface ProcessEnv \{[\s\S]*?\n        \}\n    \}\n\}\n?/,
     '',
     'the NodeJS.ProcessEnv augmentation',
   );
@@ -231,7 +237,7 @@ function applyKnownZovaCorePatchEdits(editDir: string): void {
   const moduleContent = readFileSync(modulePath, 'utf-8');
   const moduleNext = replaceOrThrow(
     moduleContent,
-    /declare module '@cabloy\/module-info' \{\n {4}interface IModule \{[\s\S]*?\n    \}\n\}\n?/,
+    /declare module '@cabloy\/module-info' \{\n {4}interface IModule \{[\s\S]*?\n {4}\}\n\}\n?/,
     '',
     'the @cabloy/module-info augmentation',
   );
@@ -275,17 +281,28 @@ function regenerateVonaZovaCorePatch(
   console.log(`\n🩹 Regenerating the Vona zova-core patch for ${targetVersion}...`);
 
   if (dryRun) {
+    // 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`,
       true,
     );
     // eslint-disable-next-line
     console.log('  [dry-run] Apply the known zova-core declaration-file patch edits');
-    exec(`pnpm --dir "${VONA_DIR}" patch-commit "${editDir}"`, true);
     // eslint-disable-next-line
-    console.log(`  [dry-run] Normalize ${VONA_WORKSPACE_PATH}`);
+    console.log(`  [dry-run] Ensure ${newPatchFilePath} exists before patch-commit`);
+    exec(
+      `pnpm --dir "${VONA_DIR}" patch-commit "${editDir}" --patches-dir "${VONA_PATCHES_DIR}"`,
+      true,
+    );
+    // 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);
     return;
   }
 
@@ -293,20 +310,27 @@ function regenerateVonaZovaCorePatch(
   mkdirSync(dirname(editDir), { recursive: true });
 
   try {
+    updateVonaPatchedDependency();
+    execInherited(`pnpm --dir "${VONA_DIR}" install`);
+
     execInherited(
       `pnpm --dir "${VONA_DIR}" patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
     );
     applyKnownZovaCorePatchEdits(editDir);
-    execInherited(`pnpm --dir "${VONA_DIR}" patch-commit "${editDir}"`);
 
-    normalizeVonaPatchedDependency(targetVersion);
+    ensureFileExists(newPatchFilePath);
+    execInherited(
+      `pnpm --dir "${VONA_DIR}" patch-commit "${editDir}" --patches-dir "${VONA_PATCHES_DIR}"`,
+    );
 
+    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`);
   } finally {
     rmSync(editDir, { recursive: true, force: true });
   }
@@ -380,12 +404,6 @@ async function postReleaseCompensation(options: ReleaseOptions): Promise<void> {
     return;
   }
 
-  if (compareVersions(localZovaCoreVersion, currentPatchedVersion) <= 0) {
-    // eslint-disable-next-line
-    console.log('No newer local zova-core version needs patch compensation. Skipping.');
-    return;
-  }
-
   regenerateVonaZovaCorePatch(currentPatchedVersion, localZovaCoreVersion, options.dryRun);
   refreshVonaLockfile(options.dryRun);
   verifyCompensationPatch(options.dryRun);

package/vona/patches/zova-core@5.1.66.patch

@@ -0,0 +1,56 @@
+diff --git a/dist/bean/resource/error/errorGlobal.d.ts b/dist/bean/resource/error/errorGlobal.d.ts
+index 73cebe18f3e260c295bdf42a3d1ab9e86fa2de87..cb0ff5c3b541f646105198ee23ac0fc3d805023e 100644
+--- a/dist/bean/resource/error/errorGlobal.d.ts
++++ b/dist/bean/resource/error/errorGlobal.d.ts
+@@ -1,9 +1 @@
+-import type { TypeScopesErrorCodes } from '../../type.ts';
+-declare global {
+-    export interface Error {
+-        code?: TypeScopesErrorCodes | number | undefined;
+-        status?: number | string | undefined;
+-    }
+-}
+ export {};
+-//# 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
+--- a/dist/types/interface/module.d.ts
++++ b/dist/types/interface/module.d.ts
+@@ -23,12 +23,6 @@ export interface IModuleResource {
+     components: TypeModuleResourceComponents;
+ }
+ export declare const SymbolInstalled: unique symbol;
+-declare module '@cabloy/module-info' {
+-    interface IModule {
+-        resource: IModuleResource;
+-        info: IModuleInfo;
+-    }
+-}
+ 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
+--- a/dist/types/utils/env.d.ts
++++ b/dist/types/utils/env.d.ts
+@@ -34,19 +34,4 @@ export interface ZovaConfigEnv {
+     MOCK_BUILD: string | undefined;
+     MOCK_BUILD_PORT: string | undefined;
+ }
+-declare global {
+-    namespace NodeJS {
+-        interface ProcessEnv {
+-            NODE_ENV: ZovaMetaMode;
+-            META_FLAVOR: ZovaMetaFlavor;
+-            META_MODE: ZovaMetaMode;
+-            META_APP_MODE: ZovaMetaAppMode;
+-            SSR: boolean;
+-            DEV: boolean;
+-            PROD: boolean;
+-            CLIENT: boolean;
+-            SERVER: boolean;
+-        }
+-    }
+-}
+ //# sourceMappingURL=env.d.ts.map

package/vona/pnpm-lock.yaml

@@ -16,7 +16,7 @@ overrides:
   zod: npm:@cabloy/zod@4.3.8
 
 patchedDependencies:
-  zova-core@5.1.64: 19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d
+  zova-core@5.1.66: 19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d
 
 importers:
 
@@ -474,11 +474,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.121
-        version: 5.1.121(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.122
+        version: 5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.69
-        version: 1.1.69(typescript@5.9.3)
+        specifier: ^1.1.70
+        version: 1.1.70(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.121
-        version: 5.1.121(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.122
+        version: 5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.69
-        version: 1.1.69(typescript@5.9.3)
+        specifier: ^1.1.70
+        version: 1.1.70(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.64:
-    resolution: {integrity: sha512-reskEHAs8G42RTXJJjFlalyNglpE3x1rkBILLpcEnZHG+3pUOz2ajUScZavvumHVZ4pT7Qo6cfWMqEdcUqRZOA==}
+  zova-core@5.1.66:
+    resolution: {integrity: sha512-1zADVAYTSOmqqHdF1/30qIXSbd6TVi2/UwkEK+Wmk00qAUZsEWpbTMF9cRm/TijOipJrzGwFMAgHAk3eqUCzLg==}
 
-  zova-jsx@1.1.69:
-    resolution: {integrity: sha512-DD0NCtOF9iXO9pUstqvp9snFhJkXKdxaOHT4bH41K5Gwwap5AFgnNfURZwJ77S5hFecSlb6gqC7vRXeu9W13oA==}
+  zova-jsx@1.1.70:
+    resolution: {integrity: sha512-UEBqyh9a6mNrT8k1v1FhfQoA4L5yX0afhwZj2sCwE38m3XHRMvC95kAEn0jNuKEXnJAUKKmG/5bp6bH3/mr+Gw==}
 
   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.84:
-    resolution: {integrity: sha512-ZdjUMHImKZ1bnui84hkzUgFP8dvG5h/en7W1hPu97b1VlcN7a7eHP8uSDLDtEbDIGyoEjJ/EgXuph0XE98fTpw==}
+  zova-module-a-zova@5.1.85:
+    resolution: {integrity: sha512-L4s4oNLrWYJJzgdlwuK0NfLKQoV0clzTWwtSt5rqXKLNXi6URslYoZGiT14Hp6F3s1e6JmlCtc2NQugKQr8uVg==}
 
   zova-module-rest-resource@5.1.40:
     resolution: {integrity: sha512-rMqZaXSK6nJ4LW2O1yO/jZqxI7joCiWylzjutMTKpx7EfNmtK1t1nVoWFd+gCTxqgbbv9uXh0vfFaSFA7GKYFg==}
 
-  zova-suite-a-zova@5.1.120:
-    resolution: {integrity: sha512-blLGBOhUXZGsJcB6xEdkVrT2sjCQ3757gly3+DoTaUvfCU7BoaEohHj/AahXOcpuxDWkbJod19MP7thBRBWl+Q==}
+  zova-suite-a-zova@5.1.121:
+    resolution: {integrity: sha512-9xeqe7lUCVkDVtLlOM1qjxqxDwCPWTf1NvkNCrBSQR+kyfLaxhUlD6ZapPHTlL8Jf0KSw3EqN/s95P78N41d4w==}
 
-  zova@5.1.121:
-    resolution: {integrity: sha512-KExyNjd8HlwZtYzIS9mMD/TGrkMIsUaSHS6XENm5pcdG1j1O/8zuae2Df4VbJsqzaZRJZV9Ul2iaqDj4T6Mg4w==}
+  zova@5.1.122:
+    resolution: {integrity: sha512-hsXGeOXPsB5CwOlnMjQOiP/6e0/V3Doq/fi6HuwU7hyWwBKwkk3RtlS9rY9KR9KAA59SEf6Ms2u7SoCR6KL+Eg==}
 
   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.64(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(typescript@5.9.3):
+  zova-core@5.1.66(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(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.69(typescript@5.9.3):
+  zova-jsx@1.1.70(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.64(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(typescript@5.9.3)
+      zova-core: 5.1.66(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(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.84(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-module-a-zova@5.1.85(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.69(typescript@5.9.3)
+      zova-jsx: 1.1.70(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
       - vue
 
   zova-module-rest-resource@5.1.40: {}
 
-  zova-suite-a-zova@5.1.120(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.121(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.84(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-zova: 5.1.85(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.121(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova@5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
-      zova-core: 5.1.64(patch_hash=19f064dcd545b69ae05dff4e470afe2152fc27b7970b4c7ffa9a501e1b241a7d)(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.120(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      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))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/vona/pnpm-workspace.yaml

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.69",
+  "version": "1.1.70",
   "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.64"
+    "zova-core": "^5.1.66"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.84",
+  "version": "5.1.85",
   "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.69"
+    "zova-jsx": "^1.1.70"
   },
   "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.120",
+  "version": "5.1.121",
   "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.84"
+    "zova-module-a-zova": "^5.1.85"
   },
   "title": "a-zova"
 }