cabloy 5.1.56 → 5.1.57

package/.gitignore

@@ -62,6 +62,7 @@ zova/.quasar
 **/.vitepress/cache
 **/.rollup.cache
 **/.temp-dynamic-*
+/.cabloy-version
 vona/package.json
 zova/package.json
 vona/docker-compose.yml

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 5.1.57
+
+### Features
+
+- Track the Cabloy version during initialization and upgrade.
+
 ## 5.1.56
 
 ### Features

package/package.json

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

package/scripts/init.ts

@@ -19,6 +19,7 @@ const VONA_DIR = resolve(ROOT_DIR, 'vona');
 const ZOVA_DIR = resolve(ROOT_DIR, 'zova');
 const CABLOY_DOCS_DIR = resolve(ROOT_DIR, 'cabloy-docs');
 const PNPM_VERSION = '11.5.2';
+const VERSION_MARKER_FILE = '.cabloy-version';
 
 // --- Helpers ---
 
@@ -70,6 +71,50 @@ function deleteGitkeepFiles(dir: string): void {
   }
 }
 
+function isValidVersion(version: string): boolean {
+  return /^\d+\.\d+\.\d+$/.test(version);
+}
+
+function readPackageVersion(): string {
+  const filePath = resolve(ROOT_DIR, 'package.json');
+  const packageContent = JSON.parse(readFileSync(filePath, 'utf-8')) as { version?: string };
+  const version = packageContent.version?.trim();
+  if (!version || !isValidVersion(version)) {
+    throw new Error(`Invalid Cabloy version in package.json: ${version ?? '<missing>'}`);
+  }
+  return version;
+}
+
+function readVersionMarker(): string | undefined {
+  const filePath = resolve(ROOT_DIR, VERSION_MARKER_FILE);
+  if (!existsSync(filePath)) return undefined;
+  const version = readFileSync(filePath, 'utf-8').trim();
+  if (!version) return undefined;
+  if (!isValidVersion(version)) {
+    throw new Error(`Invalid Cabloy version marker: ${version}`);
+  }
+  return version;
+}
+
+function resolveVersionMarker(): string {
+  const versionFromEnv = process.env.CABLOY_VERSION?.trim();
+  if (versionFromEnv) {
+    if (!isValidVersion(versionFromEnv)) {
+      throw new Error(`Invalid CABLOY_VERSION: ${versionFromEnv}`);
+    }
+    return versionFromEnv;
+  }
+  return readVersionMarker() ?? readPackageVersion();
+}
+
+function writeVersionMarker(): void {
+  const version = resolveVersionMarker();
+  const filePath = resolve(ROOT_DIR, VERSION_MARKER_FILE);
+  writeFileSync(filePath, `${version}\n`);
+  // eslint-disable-next-line
+  console.log(`[init] Marked Cabloy version: ${version}`);
+}
+
 // --- Step 0: Set APP_NAME in .env files ---
 
 function setAppName(): void {
@@ -245,5 +290,6 @@ initVona();
 initZova();
 initCabloyDocs();
 buildSsrCabloyBasicStartBatch();
+writeVersionMarker();
 // eslint-disable-next-line
 console.log('[init] Done!');

package/scripts/upgrade.ts

@@ -1,5 +1,13 @@
 import { execSync } from 'node:child_process';
-import { cpSync, createWriteStream, existsSync, mkdirSync, rmSync, unlinkSync } from 'node:fs';
+import {
+  cpSync,
+  createWriteStream,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  rmSync,
+  unlinkSync,
+} from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { pipeline } from 'node:stream/promises';
@@ -11,6 +19,7 @@ const ROOT_DIR = resolve(__dirname, '..');
 const NPM_REGISTRY = 'https://registry.npmjs.org';
 const PACKAGE_NAME = 'cabloy';
 const TEMP_DIR = resolve(ROOT_DIR, 'node_modules/.cabloy-upgrade');
+const VERSION_MARKER_FILE = '.cabloy-version';
 
 // --- Whitelist ---
 
@@ -78,13 +87,22 @@ const WHITELIST_FILES: string[] = [
   'zova/openapi.config.ts',
 ];
 
+type LatestPackageInfo = {
+  version: string;
+  tarballUrl: string;
+};
+
 // --- Helpers ---
 
 // oxlint-disable no-console
 const log = console.log; // eslint-disable-line no-console
 
-function exec(cmd: string): void {
-  execSync(cmd, { stdio: 'inherit', cwd: ROOT_DIR });
+function exec(cmd: string, env?: NodeJS.ProcessEnv): void {
+  execSync(cmd, {
+    stdio: 'inherit',
+    cwd: ROOT_DIR,
+    env: env ? { ...process.env, ...env } : process.env,
+  });
 }
 
 function shouldCopyPath(path: string): boolean {
@@ -95,6 +113,54 @@ function copyDirectory(src: string, dest: string): void {
   cpSync(src, dest, { recursive: true, filter: shouldCopyPath });
 }
 
+function isValidVersion(version: string): boolean {
+  return /^\d+\.\d+\.\d+$/.test(version);
+}
+
+function parseVersion(version: string): [number, number, number] {
+  if (!isValidVersion(version)) {
+    throw new Error(`Invalid Cabloy version: ${version}`);
+  }
+  const [major, minor, patch] = version.split('.').map(item => Number.parseInt(item, 10));
+  return [major, minor, patch];
+}
+
+function compareVersions(left: string, right: string): number {
+  const leftParts = parseVersion(left);
+  const rightParts = parseVersion(right);
+  for (let i = 0; i < leftParts.length; i++) {
+    if (leftParts[i] > rightParts[i]) return 1;
+    if (leftParts[i] < rightParts[i]) return -1;
+  }
+  return 0;
+}
+
+function readVersionMarker(): string | undefined {
+  const filePath = resolve(ROOT_DIR, VERSION_MARKER_FILE);
+  if (!existsSync(filePath)) return undefined;
+  const version = readFileSync(filePath, 'utf-8').trim();
+  if (!version) {
+    throw new Error(`Invalid Cabloy version marker in ${VERSION_MARKER_FILE}: <empty>`);
+  }
+  if (!isValidVersion(version)) {
+    throw new Error(`Invalid Cabloy version marker in ${VERSION_MARKER_FILE}: ${version}`);
+  }
+  return version;
+}
+
+function readRequiredVersionMarker(expectedVersion: string): string {
+  const version = readVersionMarker();
+  if (!version) {
+    throw new Error(`Expected ${VERSION_MARKER_FILE} to be created after upgrade`);
+  }
+  if (version !== expectedVersion) {
+    throw new Error(
+      `Expected ${VERSION_MARKER_FILE} to be ${expectedVersion} after upgrade, received ${version}`,
+    );
+  }
+  return version;
+}
+
 async function extractTarball(tarballPath: string, targetDir: string): Promise<void> {
   rmSync(targetDir, { recursive: true, force: true });
   mkdirSync(targetDir, { recursive: true });
@@ -120,14 +186,22 @@ function preflight(): void {
 
 // --- Step 2: Download & extract ---
 
-async function fetchLatestTarballUrl(): Promise<string> {
+async function fetchLatestPackageInfo(): Promise<LatestPackageInfo> {
   const url = `${NPM_REGISTRY}/${PACKAGE_NAME}/latest`;
   const res = await fetch(url);
   if (!res.ok) {
     throw new Error(`Failed to fetch package info: ${res.status} ${res.statusText}`);
   }
-  const data = (await res.json()) as { dist: { tarball: string } };
-  return data.dist.tarball;
+  const data = (await res.json()) as { version?: string; dist?: { tarball?: string } };
+  const version = data.version?.trim();
+  const tarballUrl = data.dist?.tarball?.trim();
+  if (!version || !isValidVersion(version)) {
+    throw new Error(`Invalid latest Cabloy version from npm: ${version ?? '<missing>'}`);
+  }
+  if (!tarballUrl) {
+    throw new Error('Missing tarball URL in npm latest metadata');
+  }
+  return { version, tarballUrl };
 }
 
 async function downloadTarball(tarballUrl: string): Promise<string> {
@@ -145,8 +219,7 @@ async function downloadTarball(tarballUrl: string): Promise<string> {
   return tmpFile;
 }
 
-async function downloadAndExtract(): Promise<void> {
-  const tarballUrl = await fetchLatestTarballUrl();
+async function downloadAndExtract(tarballUrl: string): Promise<void> {
   const tarballPath = await downloadTarball(tarballUrl);
   try {
     await extractTarball(tarballPath, TEMP_DIR);
@@ -190,9 +263,12 @@ function selectiveOverwrite(dryRun?: boolean): void {
   // Delete directories
   for (const dir of BLACKLIST_DIRS) {
     const dest = resolve(ROOT_DIR, dir);
-    if (existsSync(dest)) {
-      rmSync(dest, { recursive: true, force: true });
+    if (!existsSync(dest)) continue;
+    if (dryRun) {
+      log(`  [dry-run] Delete directory: ${dir}`);
+      continue;
     }
+    rmSync(dest, { recursive: true, force: true });
   }
 
   // Overwrite files
@@ -210,12 +286,12 @@ function selectiveOverwrite(dryRun?: boolean): void {
 
 // --- Step 4: Run init ---
 
-function runInit(dryRun?: boolean): void {
+function runInit(dryRun: boolean, version: string): void {
   if (dryRun) {
     log('  [dry-run] Run: npm run init');
     return;
   }
-  exec('npm run init');
+  exec('npm run init', { CABLOY_VERSION: version } as any);
 }
 
 // --- Step 5: Cleanup ---
@@ -240,25 +316,61 @@ async function main(): Promise<void> {
   // 1. Pre-flight
   preflight();
 
-  // 2. Download & extract
-  log('Downloading latest cabloy from npm registry...');
-  await downloadAndExtract();
-  log('Downloaded and extracted successfully!\n');
+  const latestPackageInfo = await fetchLatestPackageInfo();
+  const currentVersion = readVersionMarker();
+
+  if (currentVersion) {
+    log(`Current project Cabloy version: ${currentVersion}`);
+  } else {
+    log(
+      `Warning: Missing ${VERSION_MARKER_FILE}, continuing with upgrade for backward compatibility.`,
+    );
+  }
+  log(`Latest Cabloy version: ${latestPackageInfo.version}`);
+
+  if (currentVersion) {
+    const comparison = compareVersions(currentVersion, latestPackageInfo.version);
+    if (comparison === 0) {
+      log(`Cabloy is already up to date (current: ${currentVersion}). Skipping upgrade.`);
+      return;
+    }
+    if (comparison > 0) {
+      throw new Error(
+        `Project Cabloy version ${currentVersion} is newer than npm latest ${latestPackageInfo.version}. Aborting upgrade.`,
+      );
+    }
+    log(`Upgrading Cabloy from ${currentVersion} to ${latestPackageInfo.version}...\n`);
+  } else {
+    log(`Upgrading Cabloy to ${latestPackageInfo.version}...\n`);
+  }
 
-  // 3. Selective overwrite
-  log('Overwriting framework-owned files...');
-  selectiveOverwrite(dryRun);
-  log('');
+  try {
+    // 2. Download & extract
+    log('Downloading latest cabloy from npm registry...');
+    await downloadAndExtract(latestPackageInfo.tarballUrl);
+    log('Downloaded and extracted successfully!\n');
 
-  // 4. Run init
-  log('Running npm run init...');
-  runInit(dryRun);
-  log('');
+    // 3. Selective overwrite
+    log('Overwriting framework-owned files...');
+    selectiveOverwrite(dryRun);
+    log('');
 
-  // 5. Cleanup
-  cleanup(dryRun);
+    // 4. Run init
+    log('Running npm run init...');
+    runInit(dryRun, latestPackageInfo.version);
+    log('');
 
-  log('Upgrade complete!');
+    if (dryRun) {
+      log(`[dry-run] Current Cabloy version would become: ${latestPackageInfo.version}`);
+    } else {
+      log(`Current Cabloy version: ${readRequiredVersionMarker(latestPackageInfo.version)}`);
+    }
+
+    log('Upgrade complete!');
+  } finally {
+    // 5. Cleanup
+    cleanup(dryRun);
+  }
 }
 
 main().catch(err => {

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.59",
+  "version": "1.1.60",
   "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.53"
+    "zova-core": "^5.1.54"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.98",
+  "version": "5.1.99",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.53",
-    "zova-suite-a-zova": "^5.1.97"
+    "zova-core": "^5.1.54",
+    "zova-suite-a-zova": "^5.1.98"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

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

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

@@ -9,7 +9,7 @@ declare module 'vue' {
     };
   }
 
-  export interface AllowedComponentProps {}
+  export interface AllowedComponentProps extends IComponentIntrinsicAttributes {}
 }
 
 export interface IComponentIntrinsicAttributes {
@@ -40,7 +40,7 @@ export interface IComponentIntrinsicAttributes {
 declare module 'vue/jsx-runtime' {
   namespace JSX {
     // need define class/style in IntrinsicAttributes
-    export interface IntrinsicAttributes extends IComponentIntrinsicAttributes {}
+    export interface IntrinsicAttributes {}
   }
 }
 

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.65",
+  "version": "5.1.66",
   "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.59"
+    "zova-jsx": "^1.1.60"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.17",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.97",
+  "version": "5.1.98",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.29",
     "zova-module-a-table": "^5.1.30",
     "zova-module-a-zod": "^5.1.27",
-    "zova-module-a-zova": "^5.1.65"
+    "zova-module-a-zova": "^5.1.66"
   },
   "title": "a-zova"
 }