cabloy 5.1.81 → 5.1.83

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 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.83",
   "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 "${VONA_PATCHES_DIR}"`, 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 "${VONA_PATCHES_DIR}"`, 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 --dir "${VONA_DIR}" install`);
+    } 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/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.70",
+  "version": "1.1.71",
   "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.68"
   },
   "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.123",
   "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.68",
+    "zova-suite-a-zova": "^5.1.122"
   },
   "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.68",
   "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.85",
+  "version": "5.1.86",
   "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.71"
   },
   "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.122",
   "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.86"
   },
   "title": "a-zova"
 }