cabloy 5.1.16 → 5.1.19

package/{vona/.github/workflows/actions-cov-pg.yml → .github/workflows/vona-cov-pg.yml}

@@ -1,4 +1,4 @@
-name: actions-cov-pg
+name: vona-cov-pg
 on:
   push:
     branches:
@@ -30,16 +30,14 @@ jobs:
       - uses: pnpm/action-setup@v5
         with:
           version: 10.19.0
-      - run: cp package.original.json package.json
-      - run: npm run init
-      - uses: nick-fields/retry@v4
-        with:
-          timeout_minutes: 5
-          max_attempts: 10
-          command: |
-            DATABASE_DEFAULT_CLIENT=pg npm run cov -- --ci
+      - name: init
+        run: npm run init
+      - name: cov
+        run: DATABASE_DEFAULT_CLIENT=pg npm run cov -- --ci
+        working-directory: vona
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          directory: vona
           verbose: true

package/{vona/.github/workflows/project-test.yml → .github/workflows/vona-test-crud.yml}

@@ -1,4 +1,4 @@
-name: project-test
+name: vona-test-crud
 on:
   push:
     branches:
@@ -23,17 +23,17 @@ jobs:
       - uses: pnpm/action-setup@v5
         with:
           version: 10.19.0
-      - run: npm i vona-cli -g
-      - run: vona :create:project vona-test --template=cabloy-basic
-      - run: vona :create:module demo-student --suite --ci
-        working-directory: vona-test
-      - run: pnpm install --no-frozen-lockfile
-        working-directory: vona-test
-      - run: vona :tools:crud student --module=demo-student
-        working-directory: vona-test
+      - name: init
+        run: npm run init
+      - run: npm run vona :create:module demo-student -- --suite --ci
+        working-directory: vona
+      - run: npm run vona :tools:deps
+        working-directory: vona
+      - run: npm run vona :tools:crud student -- --module=demo-student
+        working-directory: vona
       - run: npm run test
-        working-directory: vona-test
+        working-directory: vona
       - run: npm run build -- --flavor=ci
-        working-directory: vona-test
+        working-directory: vona
       - run: npm run play -- --mode=prod --flavor=ci
-        working-directory: vona-test
+        working-directory: vona

package/{vona/.github/workflows/actions-test-mysql.yml → .github/workflows/vona-test-mysql.yml}

@@ -1,4 +1,4 @@
-name: actions-test-mysql
+name: vona-test-mysql
 on:
   push:
     branches:
@@ -30,8 +30,11 @@ jobs:
       - uses: pnpm/action-setup@v5
         with:
           version: 10.19.0
-      - run: cp package.original.json package.json
-      - run: npm run init
+      - name: init
+        run: npm run init
       - run: DATABASE_DEFAULT_CLIENT=mysql DATABASE_CLIENT_MYSQL_HOST=127.0.0.1 DATABASE_CLIENT_MYSQL_PASSWORD=root npm run test
+        working-directory: vona
       - run: DATABASE_DEFAULT_CLIENT=mysql DATABASE_CLIENT_MYSQL_HOST=127.0.0.1 DATABASE_CLIENT_MYSQL_PASSWORD=root npm run build -- --flavor=ci
+        working-directory: vona
       - run: DATABASE_DEFAULT_CLIENT=mysql DATABASE_CLIENT_MYSQL_HOST=127.0.0.1 DATABASE_CLIENT_MYSQL_PASSWORD=root npm run play -- --mode=prod --flavor=ci
+        working-directory: vona

package/{vona/.github/workflows/actions-test-pg.yml → .github/workflows/vona-test-pg.yml}

@@ -1,4 +1,4 @@
-name: actions-test-pg
+name: vona-test-pg
 on:
   push:
     branches:
@@ -30,8 +30,11 @@ jobs:
       - uses: pnpm/action-setup@v5
         with:
           version: 10.19.0
-      - run: cp package.original.json package.json
-      - run: npm run init
+      - name: init
+        run: npm run init
       - run: DATABASE_DEFAULT_CLIENT=pg npm run test
+        working-directory: vona
       - run: DATABASE_DEFAULT_CLIENT=pg npm run build -- --flavor=ci
+        working-directory: vona
       - run: DATABASE_DEFAULT_CLIENT=pg npm run play -- --mode=prod --flavor=ci
+        working-directory: vona

package/{vona/.github/workflows/actions-test-sqlite3.yml → .github/workflows/vona-test-sqlite3.yml}

@@ -1,4 +1,4 @@
-name: actions-test-sqlite3
+name: vona-test-sqlite3
 on:
   push:
     branches:
@@ -23,8 +23,11 @@ jobs:
       - uses: pnpm/action-setup@v5
         with:
           version: 10.19.0
-      - run: cp package.original.json package.json
-      - run: npm run init
+      - name: init
+        run: npm run init
       - run: DATABASE_DEFAULT_CLIENT=sqlite3 npm run test
+        working-directory: vona
       - run: DATABASE_DEFAULT_CLIENT=sqlite3 npm run build -- --flavor=ci
+        working-directory: vona
       - run: DATABASE_DEFAULT_CLIENT=sqlite3 npm run play -- --mode=prod --flavor=ci
+        working-directory: vona

package/{vona/.github/workflows/actions-tsc.yml → .github/workflows/vona-tsc.yml}

@@ -1,4 +1,4 @@
-name: actions-tsc
+name: vona-tsc
 on:
   push:
     branches:
@@ -18,6 +18,8 @@ jobs:
       - uses: pnpm/action-setup@v5
         with:
           version: 10.19.0
-      - run: cp package.original.json package.json
-      - run: npm run init
-      - run: npm run tsc
+      - name: init
+        run: npm run init
+      - name: tsc
+        run: npm run tsc
+        working-directory: vona

package/.github/workflows/zova-ui.yml

@@ -0,0 +1,39 @@
+name: zova-ui
+on:
+  push:
+    branches:
+      - main
+jobs:
+  unittest:
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [24]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
+        with:
+          node-version: ${{ matrix.node-version }}
+      - uses: pnpm/action-setup@v5
+        with:
+          version: 10.19.0
+      - name: init
+        run: npm run init
+      - name: suite
+        run: npm run zova :create:suite test-demo
+        working-directory: zova
+      - name: module
+        run: npm run zova :create:module test-demo -- --suite=test-demo --ci
+        working-directory: zova
+      - run: npm run zova :tools:deps
+        working-directory: zova
+      - name: page
+        run: npm run zova :create:page first -- --module=test-demo
+        working-directory: zova
+      - name: component
+        run: npm run zova :create:component child -- --module=test-demo
+        working-directory: zova
+      - name: npm run build
+        run: npm run build
+        working-directory: zova

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.16",
+  "version": "5.1.19",
   "description": "A Node.js fullstack framework",
   "keywords": [
     "cabloy",
@@ -19,10 +19,32 @@
     "url": "git+https://github.com/cabloy/cabloy.git"
   },
   "type": "module",
+  "devDependencies": {
+    "@cabloy/lint": "^5.1.21",
+    "@cabloy/process-helper": "^3.1.3",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.19.17",
+    "husky": "^9.1.7",
+    "lint-staged": "^17.0.5",
+    "minimist": "^1.2.8",
+    "oxfmt": "^0.45.0",
+    "oxlint": "^1.65.0",
+    "textlint": "^15.7.0",
+    "textlint-rule-en-no-mixed-period": "^3.0.2",
+    "textlint-rule-ja-no-mixed-period": "^3.0.2",
+    "textlint-rule-ja-space-between-half-and-full-width": "^2.4.2",
+    "textlint-rule-period-in-list-item": "^1.0.1",
+    "typescript": "^5.9.3"
+  },
+  "engines": {
+    "node": ">=24.4.0"
+  },
   "scripts": {
     "init": "pnpm install --no-frozen-lockfile && node scripts/init.ts",
     "upgrade": "node scripts/upgrade.ts",
     "upgrade:dry-run": "node scripts/upgrade.ts --dry-run",
+    "vona": "node ./vona/packages-cli/cli/src/bin/vona.ts --projectPath=vona",
+    "zova": "node ./zova/packages-cli/cli/src/bin/zova.ts --projectPath=zova",
     "dev": "cd vona && npm run dev",
     "build": "pnpm --dir zova run build:ssr:cabloyBasicBatch && pnpm --dir vona run build",
     "build:docker": "pnpm --dir zova run build:ssr:cabloyBasicBatch && pnpm --dir vona run build:docker",
@@ -41,28 +63,6 @@
     "release:dry-run": "node scripts/release.ts --dry-run",
     "release:changelog": "node scripts/release.ts --changelog-only",
     "release:publish": "node scripts/release.ts --publish-only",
-    "release:github": "node scripts/release.ts --release-only",
-    "prepare": "husky"
-  },
-  "devDependencies": {
-    "@cabloy/lint": "^5.1.21",
-    "@cabloy/process-helper": "^3.1.3",
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.19.17",
-    "husky": "^9.1.7",
-    "lint-staged": "^17.0.5",
-    "minimist": "^1.2.8",
-    "oxfmt": "^0.45.0",
-    "oxlint": "^1.65.0",
-    "textlint": "^15.7.0",
-    "textlint-rule-en-no-mixed-period": "^3.0.2",
-    "textlint-rule-ja-no-mixed-period": "^3.0.2",
-    "textlint-rule-ja-space-between-half-and-full-width": "^2.4.2",
-    "textlint-rule-period-in-list-item": "^1.0.1",
-    "typescript": "^5.9.3"
-  },
-  "engines": {
-    "node": ">=24.4.0"
-  },
-  "packageManager": "pnpm@10.19.0"
-}
+    "release:github": "node scripts/release.ts --release-only"
+  }
+}

package/scripts/init.ts

@@ -1,6 +1,14 @@
 import { execSync } from 'node:child_process';
 import { randomBytes, randomInt, randomUUID } from 'node:crypto';
-import { copyFileSync, cpSync, existsSync, readFileSync, writeFileSync } from 'node:fs';
+import {
+  copyFileSync,
+  cpSync,
+  existsSync,
+  readdirSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+} from 'node:fs';
 import { basename } from 'node:path';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -28,6 +36,17 @@ function exec(cmd: string): void {
   execSync(cmd, { stdio: 'inherit', cwd: ROOT_DIR });
 }
 
+function deleteGitkeepFiles(dir: string): void {
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = resolve(dir, entry.name);
+    if (entry.isDirectory()) {
+      deleteGitkeepFiles(fullPath);
+    } else if (entry.name === '.gitkeep') {
+      rmSync(fullPath);
+    }
+  }
+}
+
 // --- Step 0: Set APP_NAME in .env files ---
 
 function setAppName(): void {
@@ -63,7 +82,6 @@ function generateEnvProdLocal(): void {
 
 function generateEnvProdDockerLocal(): void {
   const envFilePath = resolve(ROOT_DIR, 'vona/env/.env.prod.docker.local');
-  const composeFilePath = resolve(ROOT_DIR, 'vona/docker-compose.yml');
   if (existsSync(envFilePath)) {
     // eslint-disable-next-line
     console.log('[init] vona/env/.env.prod.docker.local already exists, skipping');
@@ -87,8 +105,9 @@ function generateEnvProdDockerLocal(): void {
   if (!existsSync(composeDirTarget)) {
     cpSync(composeDirOriginal, composeDirTarget, {
       recursive: true,
-      filter: src => !src.includes('.DS_Store'),
+      filter: src => !src.includes('.DS_Store') && !src.endsWith('docker-compose.original.yml'),
     });
+    deleteGitkeepFiles(composeDirTarget);
     // eslint-disable-next-line
     console.log('[init] Generated vona/docker-compose directory');
   } else {
@@ -96,8 +115,12 @@ function generateEnvProdDockerLocal(): void {
     console.log('[init] vona/docker-compose directory already exists, skipping');
   }
 
-  // Generate docker-compose.yml from original
-  const composeOriginalPath = resolve(ROOT_DIR, 'vona/docker-compose.original.yml');
+  // Generate docker-compose.yml from template
+  const composeOriginalPath = resolve(
+    ROOT_DIR,
+    'vona/docker-compose-original/docker-compose.original.yml',
+  );
+  const composeFilePath = resolve(ROOT_DIR, 'vona/docker-compose/docker-compose.yml');
   let composeContent = readFileSync(composeOriginalPath, 'utf-8');
   composeContent = composeContent.replace(
     /POSTGRES_PASSWORD:\s*'<placeholder>'/,
@@ -113,7 +136,7 @@ function generateEnvProdDockerLocal(): void {
   );
   writeFileSync(composeFilePath, composeContent);
   // eslint-disable-next-line
-  console.log('[init] Generated vona/docker-compose.yml');
+  console.log('[init] Generated vona/docker-compose/docker-compose.yml');
 }
 
 // --- Step C: init:vona ---

package/vona/docker-compose-original/docker-compose.original.yml

@@ -0,0 +1,51 @@
+services:
+  app:
+    depends_on:
+      - pg
+      - redis
+    build:
+      context: ..
+      dockerfile: docker-compose/docker-compose-dockerfile-app
+    restart: always
+    ports:
+      - '7202:7102'
+    volumes:
+      - ./output/dist/docker:/opt/node/app/dist/docker
+      - ./output/app/.vona:/root/.vona
+    command: [./scripts/wait-for-it.sh, 'pg:5432', 'redis:6379', -s, --, ./scripts/app-init.sh]
+
+  nginx:
+    image: nginx:latest
+    depends_on:
+      - app
+    restart: always
+    ports:
+      - '80:80'
+    volumes:
+      - ./output/app/.vona:/usr/share/nginx/app/.vona
+      - ./logs/nginx:/var/log/nginx
+      - ./config/nginx/conf.d:/etc/nginx/conf.d
+
+  pg:
+    image: postgres:17
+    restart: always
+    ports:
+      - '35432:5432'
+    # set shared memory limit when using docker compose
+    shm_size: 128mb
+    # or set shared memory limit when deploy via swarm stack
+    volumes:
+      - ./data/pg:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: vona
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: '<placeholder>'
+
+  redis:
+    image: redis:latest
+    command: [redis-server, --appendonly, yes]
+    restart: always
+    ports:
+      - '36379:6379'
+    volumes:
+      - ./data/redis:/data

package/vona/env/.env.prod.docker

@@ -5,11 +5,14 @@ SERVER_WORKERS = 1
 
 # build
 
+BUILD_MINIFY = false
 BUILD_COPY_DIST = ./docker-compose/output/dist
 
 # database
 
-DATABASE_DEFAULT_CLIENT = 'sqlite3' # sqlite3/pg/mysql
+DATABASE_DEFAULT_CLIENT = 'pg' # sqlite3/pg/mysql
+
+DATABASE_CLIENT_SQLITE3_NATIVEBINDING = false
 
 DATABASE_CLIENT_PG_HOST = pg # see: docker-compose.yml
 DATABASE_CLIENT_PG_PORT = 5432

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

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

package/vona/packages-cli/cabloy-cli/src/start.ts

@@ -7,6 +7,7 @@ import type { ICommandArgv } from './types/argv.ts';
 import { BeanCli } from './lib/bean.cli.ts';
 import { CliCommand } from './lib/cli.ts';
 import { collectCommands } from './lib/commands.ts';
+import { parseProjectPath } from './utils.ts';
 
 const DISPATCH = Symbol.for('eb:Command#dispatch');
 const PARSE = Symbol.for('eb:Command#parse');
@@ -42,24 +43,20 @@ export class CabloyCommand extends CommonBin {
     const parsed = await this[PARSE](this.rawArgv);
     // argv
     const argv = {
-      projectPath: process.cwd(),
+      projectPath: parseProjectPath(parsed.projectPath),
     } as ICommandArgv;
     // indexBrandName
-    const indexBrandName = this.rawArgv.indexOf(this.brandName);
+    const indexBrandName = parsed._.indexOf(this.brandName);
     // cli
-    const indexCommand = indexBrandName > -1 ? indexBrandName + 1 : 0;
-    Object.assign(argv, this._prepareCliFullName(parsed._[indexCommand]));
+    const commandName = parsed._[indexBrandName + 1];
+    const indexCommand = this.rawArgv.indexOf(commandName);
+    Object.assign(argv, this._prepareCliFullName(commandName));
     // cli meta
     const context = { brandName: this.brandName, argv };
     const beanCli = new BeanCli();
     const meta = await beanCli.meta({ context });
     // cli run
-    const rawArgv = this.rawArgv.slice();
-    if (indexBrandName > -1) {
-      rawArgv.splice(0, indexBrandName + 2);
-    } else {
-      rawArgv.splice(0, 1);
-    }
+    const rawArgv = this.rawArgv.slice(indexCommand + 1);
     const command = new CliCommand(rawArgv, { meta, argv });
     await command[DISPATCH]();
     // should not force exit, let app shutdown gracefully

package/vona/packages-cli/cabloy-cli/src/utils.ts

@@ -3,6 +3,7 @@ import type { VonaMetaFlavor } from '@cabloy/module-info';
 import boxen from 'boxen';
 import chalk from 'chalk';
 import { createRequire } from 'node:module';
+import path from 'node:path';
 import semver from 'semver';
 import urllib from 'urllib';
 
@@ -59,3 +60,10 @@ export function patchFlavor(
 ): VonaMetaFlavor | undefined {
   return Array.isArray(flavor) ? flavor[flavor.length - 1] : flavor;
 }
+
+export function parseProjectPath(projectPath?: string) {
+  const projectPathDefault = process.cwd();
+  if (!projectPath) return projectPathDefault;
+  if (path.isAbsolute(projectPath)) return projectPath;
+  return path.join(projectPathDefault, projectPath);
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.102",
+  "version": "1.1.103",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [
@@ -38,6 +38,7 @@
     "@cabloy/cli": "workspace:^",
     "@cabloy/process-helper": "workspace:^",
     "fs-extra": "^11.3.4",
+    "mri": "^1.2.0",
     "semver": "^7.7.4",
     "vona-cli-set-api": "workspace:^"
   },

package/vona/packages-cli/cli/src/bin/vona.ts

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
+import { parseProjectPath } from '@cabloy/cli';
 import { ProcessHelper } from '@cabloy/process-helper';
+import mri from 'mri';
 import semver from 'semver';
 
 import { playAttach } from '../play.ts';
@@ -30,22 +32,31 @@ async function checkPnpm() {
 }
 
 async function main() {
+  const rawArgv = process.argv.slice(2);
+  const _args = mri(rawArgv, {
+    boolean: ['force', 'help', 'version'],
+    alias: { h: 'help', v: 'version' },
+  });
+  const projectPath = parseProjectPath(_args.projectPath);
   // args
   let args: string[] = [];
-  const rawArgv = process.argv.slice(2);
-  const isPlay = rawArgv[0] === 'play';
+  const isPlay = _args._[0] === 'play';
   const isPlayAttach = isPlay && (rawArgv.includes('-a') || rawArgv.includes('--attach'));
   if (isPlay) {
     if (!isPlayAttach) {
       args = args.concat([':bin:play']);
     }
-    args = args.concat(rawArgv.slice(1)).concat(['--dummy']);
+    const indexPlay = rawArgv.indexOf('play');
+    args = args.concat(rawArgv.slice(indexPlay + 1)).concat(['--dummy']);
+    if (_args.projectPath) {
+      args = [`--projectPath=${_args.projectPath}`].concat(args);
+    }
   } else {
     args = rawArgv;
   }
   // run
   if (isPlayAttach) {
-    await playAttach(process.cwd(), args);
+    await playAttach(projectPath, args);
   } else {
     if (!isPlay) {
       await checkPnpm();

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

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

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

@@ -50,7 +50,16 @@ export class CliBinTest extends BeanCliBase {
   async _run(projectPath: string, modulesMeta: Awaited<ReturnType<typeof glob>>) {
     const { argv } = this.context;
     // globs
-    const patterns = this._combineTestPatterns(projectPath, modulesMeta);
+    let patterns;
+    if (argv._.length > 0) {
+      patterns = argv._.map(item => {
+        if (item.startsWith('src/')) return item;
+        if (item.startsWith('vona/src/')) return item.substring('vona/'.length);
+        return `src/**/test/**/${item}`;
+      });
+    } else {
+      patterns = this._combineTestPatterns(projectPath, modulesMeta);
+    }
     // testFile
     let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/test.ts');
     if (!fse.existsSync(testFile)) {