cabloy 5.1.125 → 5.1.126

package/scripts/initAppName.test.ts

@@ -0,0 +1,72 @@
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { basename, resolve } from 'node:path';
+import test from 'node:test';
+
+import { isLinkedGitWorktree, updateBaseAppName } from './initAppName.ts';
+
+function git(cwd: string, args: string[]): void {
+  execFileSync('git', args, { cwd, stdio: 'ignore' });
+}
+
+function writeBaseEnvFiles(rootDir: string, appName: string): void {
+  for (const relativePath of ['vona/env/.env', 'zova/env/.env']) {
+    const filePath = resolve(rootDir, relativePath);
+    mkdirSync(resolve(filePath, '..'), { recursive: true });
+    writeFileSync(filePath, `APP_NAME = ${appName}\nOTHER_VALUE = preserved\n`);
+  }
+}
+
+function readBaseEnvFiles(rootDir: string): string[] {
+  return ['vona/env/.env', 'zova/env/.env'].map(relativePath =>
+    readFileSync(resolve(rootDir, relativePath), 'utf-8'),
+  );
+}
+
+test('classifies project roots before updating base APP_NAME files', { concurrency: false }, () => {
+  const tempDir = mkdtempSync(resolve(tmpdir(), 'cabloy-init-app-name-'));
+  const primaryDir = resolve(tempDir, 'primary');
+  const linkedDir = resolve(tempDir, 'linked');
+  try {
+    mkdirSync(primaryDir);
+    git(primaryDir, ['init']);
+    git(primaryDir, ['config', 'user.email', 'test@example.com']);
+    git(primaryDir, ['config', 'user.name', 'Cabloy Test']);
+    writeBaseEnvFiles(primaryDir, 'original');
+    git(primaryDir, ['add', '.']);
+    git(primaryDir, ['commit', '-m', 'initial fixture']);
+
+    assert.equal(isLinkedGitWorktree(primaryDir), false);
+    assert.equal(updateBaseAppName(primaryDir), true);
+    for (const content of readBaseEnvFiles(primaryDir)) {
+      assert.equal(content, `APP_NAME = ${basename(primaryDir)}\nOTHER_VALUE = preserved\n`);
+    }
+
+    git(primaryDir, ['checkout', '--', '.']);
+    git(primaryDir, ['worktree', 'add', '--detach', linkedDir, 'HEAD']);
+    const linkedBefore = readBaseEnvFiles(linkedDir);
+    assert.equal(isLinkedGitWorktree(linkedDir), true);
+    assert.equal(updateBaseAppName(linkedDir), false);
+    assert.deepEqual(readBaseEnvFiles(linkedDir), linkedBefore);
+
+    const nestedProjectDir = resolve(linkedDir, 'created-project');
+    writeBaseEnvFiles(nestedProjectDir, 'original');
+    assert.equal(isLinkedGitWorktree(nestedProjectDir), false);
+    assert.equal(updateBaseAppName(nestedProjectDir), true);
+    for (const content of readBaseEnvFiles(nestedProjectDir)) {
+      assert.equal(content, `APP_NAME = ${basename(nestedProjectDir)}\nOTHER_VALUE = preserved\n`);
+    }
+
+    const nonGitProjectDir = resolve(tempDir, 'non-git-project');
+    writeBaseEnvFiles(nonGitProjectDir, 'original');
+    assert.equal(isLinkedGitWorktree(nonGitProjectDir), false);
+    assert.equal(updateBaseAppName(nonGitProjectDir), true);
+    for (const content of readBaseEnvFiles(nonGitProjectDir)) {
+      assert.equal(content, `APP_NAME = ${basename(nonGitProjectDir)}\nOTHER_VALUE = preserved\n`);
+    }
+  } finally {
+    rmSync(tempDir, { recursive: true, force: true });
+  }
+});

package/scripts/initAppName.ts

@@ -0,0 +1,50 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
+import { basename, resolve } from 'node:path';
+
+function gitOutput(rootDir: string, args: string[]): string {
+  return execFileSync('git', args, {
+    cwd: rootDir,
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'ignore'],
+  }).trim();
+}
+
+export function isLinkedGitWorktree(rootDir: string): boolean {
+  const projectRoot = realpathSync(resolve(rootDir));
+  try {
+    const gitRoot = realpathSync(
+      resolve(gitOutput(projectRoot, ['rev-parse', '--path-format=absolute', '--show-toplevel'])),
+    );
+    if (gitRoot !== projectRoot) return false;
+
+    const gitDir = realpathSync(
+      resolve(gitOutput(projectRoot, ['rev-parse', '--path-format=absolute', '--git-dir'])),
+    );
+    const gitCommonDir = realpathSync(
+      resolve(gitOutput(projectRoot, ['rev-parse', '--path-format=absolute', '--git-common-dir'])),
+    );
+    return gitDir !== gitCommonDir;
+  } catch {
+    return false;
+  }
+}
+
+export function updateBaseAppName(rootDir: string): boolean {
+  if (isLinkedGitWorktree(rootDir)) return false;
+
+  const projectRoot = resolve(rootDir);
+  const projectName = basename(projectRoot);
+  const envFiles = [resolve(projectRoot, 'vona/env/.env'), resolve(projectRoot, 'zova/env/.env')];
+  for (const filePath of envFiles) {
+    if (!existsSync(filePath)) continue;
+    const content = readFileSync(filePath, 'utf-8').replace(
+      /^APP_NAME.*/m,
+      `APP_NAME = ${projectName}`,
+    );
+    writeFileSync(filePath, content);
+    // eslint-disable-next-line
+    console.log(`[init] Set APP_NAME = ${projectName} in ${filePath}`);
+  }
+  return true;
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.82",
+  "version": "5.1.83",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/pnpm-lock.yaml

@@ -717,11 +717,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.142
-        version: 5.1.142(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.144
+        version: 5.1.144(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.79
-        version: 1.1.79(typescript@5.9.3)
+        specifier: ^1.1.81
+        version: 1.1.81(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.21
         version: 5.1.21
@@ -750,8 +750,8 @@ importers:
         specifier: ^5.1.47
         version: 5.1.47
       zova-module-a-pay:
-        specifier: ^5.0.0
-        version: 5.0.0
+        specifier: ^5.0.2
+        version: 5.0.2
       zova-module-a-router:
         specifier: ^5.1.31
         version: 5.1.31
@@ -768,8 +768,8 @@ importers:
         specifier: ^5.1.37
         version: 5.1.37(vue@3.5.39(typescript@5.9.3))
       zova-module-pay-mock:
-        specifier: ^5.0.0
-        version: 5.0.0
+        specifier: ^5.0.2
+        version: 5.0.2
       zova-module-rest-resource:
         specifier: ^5.1.42
         version: 5.1.42
@@ -795,11 +795,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.142
-        version: 5.1.142(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.144
+        version: 5.1.144(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.79
-        version: 1.1.79(typescript@5.9.3)
+        specifier: ^1.1.81
+        version: 1.1.81(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.21
         version: 5.1.21
@@ -828,8 +828,8 @@ importers:
         specifier: ^5.1.47
         version: 5.1.47
       zova-module-a-pay:
-        specifier: ^5.0.0
-        version: 5.0.0
+        specifier: ^5.0.2
+        version: 5.0.2
       zova-module-a-router:
         specifier: ^5.1.31
         version: 5.1.31
@@ -846,8 +846,8 @@ importers:
         specifier: ^5.1.37
         version: 5.1.37(vue@3.5.39(typescript@5.9.3))
       zova-module-pay-mock:
-        specifier: ^5.0.0
-        version: 5.0.0
+        specifier: ^5.0.2
+        version: 5.0.2
       zova-module-rest-resource:
         specifier: ^5.1.42
         version: 5.1.42
@@ -1834,16 +1834,16 @@ importers:
   src/suite-vendor/a-pay:
     dependencies:
       vona-module-a-pay:
-        specifier: ^5.0.1
+        specifier: ^5.0.2
         version: link:modules/a-pay
       vona-module-pay-mock:
-        specifier: ^5.0.1
+        specifier: ^5.0.2
         version: link:modules/pay-mock
       vona-module-pay-paypal:
-        specifier: ^5.0.1
+        specifier: ^5.0.2
         version: link:modules/pay-paypal
       vona-module-pay-stripe:
-        specifier: ^5.0.1
+        specifier: ^5.0.2
         version: link:modules/pay-stripe
 
   src/suite-vendor/a-pay/modules/a-pay:
@@ -1870,6 +1870,9 @@ importers:
 
   src/suite-vendor/a-pay/modules/pay-paypal:
     dependencies:
+      '@cabloy/paypal-server-sdk':
+        specifier: 2.2.0
+        version: 2.2.0(supports-color@5.5.0)
       vona-module-a-pay:
         specifier: workspace:*
         version: link:../a-pay
@@ -1919,7 +1922,7 @@ importers:
         specifier: ^5.0.8
         version: link:modules/test-file
       vona-module-test-pay:
-        specifier: ^5.0.0
+        specifier: ^5.0.1
         version: link:modules/test-pay
 
   src/suite-vendor/a-test/modules/test-auth:
@@ -3077,6 +3080,9 @@ importers:
       vona-module-a-pay:
         specifier: workspace:*
         version: link:../../../../suite-vendor/a-pay/modules/a-pay
+      vona-module-pay-paypal:
+        specifier: workspace:*
+        version: link:../../../../suite-vendor/a-pay/modules/pay-paypal
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -8556,15 +8562,9 @@ packages:
     peerDependencies:
       zod: ^3.25.28 || ^4
 
-  zova-core@5.1.79:
-    resolution: {integrity: sha512-q04JWAjwa5x0py9/FCFPX9I8cNA4zzZ/Z+8mm2mVsRBMqDFcafwVqNumOAkZ+DuA10b4YIoncyQKYz5PhhmBUw==}
-
   zova-core@5.1.81:
     resolution: {integrity: sha512-gLmLWXpd9xNmc+fXx33QEgRZ2ZsNjRlVWDC1HEQLLnq3ZCakDf87qXhfdk+JH5csS2BjGAdckfmbiLqGL15o1Q==}
 
-  zova-jsx@1.1.79:
-    resolution: {integrity: sha512-iFp9UpW/3Cbaq0H25xyR04LYyaqB2wlAGOL1dEL7OyuIzHI0IHcBwfZRbRGy7ewgDVHit2ULG03kO1sSjjPuWQ==}
-
   zova-jsx@1.1.81:
     resolution: {integrity: sha512-WVUc4DYsVcjPfcfWgFY2vQbiK8ARIwv2K6o6Auyqvts/vSfJ7BCzD4XqCVHANVY5yJ8povdJUzpiCIAhioWRkg==}
 
@@ -8613,9 +8613,6 @@ packages:
   zova-module-a-openapi@5.1.47:
     resolution: {integrity: sha512-iar4YR9GGdCQ9N60yt9yV+RkiM1seKlmbhoyZqLAZ7aR5tLnw2ZL7ElamHEGO5iBtFXRU8QH8RaU+8PnnyaLkg==}
 
-  zova-module-a-pay@5.0.0:
-    resolution: {integrity: sha512-jt9acZZPKnkJs8t4qOBOmqO7gyOGnByujCyNsuohAYLQSXkjdTKOJqXDe6dj0KcdayHry0ZvJiaErzQJsiNbWA==}
-
   zova-module-a-pay@5.0.2:
     resolution: {integrity: sha512-BOKkM7R//Kju54PhZxnyJ0O8gHnyKrwxXpAAr85wJurHQAl3NIsdRwINj+i+hIe3Btc+UJmi/H1kpg0d3YuoZQ==}
 
@@ -8646,30 +8643,18 @@ packages:
   zova-module-a-zod@5.1.36:
     resolution: {integrity: sha512-4gEjxJBelVOA84aP2XWSNSmzQr+AYh14Ha5QCj9yZIpSnEajSgYLoyLw4dwiVcscuEw7xAAOOnWbZS9uXSpJzg==}
 
-  zova-module-a-zova@5.1.94:
-    resolution: {integrity: sha512-c2qbu3YiNYRSMpprPkBbZ9RaQ9KKF4Y/cEumDJaCpPoZEbJClI/WBZMrY/ZpG9Rsp/87DJ63Vkbu+iSTOh7csg==}
-
   zova-module-a-zova@5.1.96:
     resolution: {integrity: sha512-lP6LgzbrSlHBqyA1QhMZ66B0DQBLcXcEcWBh3zESFnhFzbomlfABjG+cnju5ki771YhT2CuPeo3m9v01WYc3Bg==}
 
-  zova-module-pay-mock@5.0.0:
-    resolution: {integrity: sha512-WORyFqRNkrcGZCzLaesu4BDziQ2iOUIeRMVbwXx/Wzp2W0EpwMvqqAPqO8U3PKjvWtAw3YwTJFsXs1Qh66l4zQ==}
-
   zova-module-pay-mock@5.0.2:
     resolution: {integrity: sha512-G6ld4ZZJ3crSUQ1fH+Tn2p9/05ngfJYtDtTtq7K1Xo9ei2fjbp13Jrbjh3cKR+dhWuK9Q1gwAs7xwhu7NIiTKA==}
 
   zova-module-rest-resource@5.1.42:
     resolution: {integrity: sha512-eMWhc4428U5Hs4BHqFJoF7yaH+bK8t71scIrCnpLbQS7M80lNkoHxY9s/Kl4i8Uo3+lVWbSbuaXWtR+zVLNqpA==}
 
-  zova-suite-a-zova@5.1.141:
-    resolution: {integrity: sha512-fqeynyYUL12PTZMQ1ZxryHEFcCfaQL2hLTs8MxxdbHCKDhOjNEaOTW5MGR5DzSRM7uMXNCq1crPvbYvDmmeUdg==}
-
   zova-suite-a-zova@5.1.143:
     resolution: {integrity: sha512-DMaYtWO1HVu0BIeNguAYqlcOGa9MVfejDLvLqw6mOqmPSSLrvGSSC+lzYGhI/J9xQBbGRFaWbIdMhetCpuZdwg==}
 
-  zova@5.1.142:
-    resolution: {integrity: sha512-qvrKhrS9y4BVI2Nszre3TSvDJu5BjTo2adzAXP2qC3TeoW4IZ8njvV2ROoAPe//X6SiJ1Il60oTNSc1PnkXvWg==}
-
   zova@5.1.144:
     resolution: {integrity: sha512-YEgsYl7hL635nK9134oH8GMUqHp41IAp0I+rWz27f2QCkp8QGLqvQIbrvXoFnYwJyuYmaCz/eBMMrl1y+mzs0w==}
 
@@ -14591,35 +14576,6 @@ snapshots:
     dependencies:
       zod: '@cabloy/zod@4.3.8'
 
-  zova-core@5.1.79(typescript@5.9.3):
-    dependencies:
-      '@cabloy/compose': link:packages-utils/compose
-      '@cabloy/extend': link:packages-utils/extend
-      '@cabloy/json5': link:packages-utils/json5
-      '@cabloy/localeutil': link:packages-utils/localeutil
-      '@cabloy/logger': 1.1.24
-      '@cabloy/module-info': 2.0.3
-      '@cabloy/utils': link:packages-utils/utils
-      '@cabloy/vue-compiler-sfc': 3.5.14
-      '@cabloy/vue-reactivity': 3.5.16
-      '@cabloy/vue-router': 4.4.16(vue@3.5.39(typescript@5.9.3))
-      '@cabloy/vue-runtime-core': 3.5.57
-      '@cabloy/vue-runtime-dom': 3.5.13
-      '@cabloy/vue-server-renderer': 3.5.18(vue@3.5.39(typescript@5.9.3))
-      '@cabloy/word-utils': 2.1.14
-      '@cabloy/zod-errors-custom': link:packages-utils/zod-errors-custom
-      '@cabloy/zod-openapi': link:packages-utils/zod-openapi
-      '@cabloy/zod-query': link:packages-utils/zod-query
-      '@types/js-cookie': 3.0.6
-      '@vue/shared': 3.5.36
-      deep-equal: 2.2.3
-      reflect-metadata: 0.2.2
-      vue: 3.5.39(typescript@5.9.3)
-      vue-plugin-render-freeze: 2.0.4(vue@3.5.39(typescript@5.9.3))
-      zod: '@cabloy/zod@4.3.8'
-    transitivePeerDependencies:
-      - typescript
-
   zova-core@5.1.81(patch_hash=ff659aa5f659be32501f56841b72f148c24acf1546f79cce551586e27fcde2ce)(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
@@ -14649,17 +14605,6 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  zova-jsx@1.1.79(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.79(typescript@5.9.3)
-    transitivePeerDependencies:
-      - typescript
-
   zova-jsx@1.1.81(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
@@ -14730,8 +14675,6 @@ snapshots:
       openapi3-ts: 4.6.0
       typestyle: 2.4.0
 
-  zova-module-a-pay@5.0.0: {}
-
   zova-module-a-pay@5.0.2: {}
 
   zova-module-a-router@5.1.31: {}
@@ -14773,22 +14716,6 @@ snapshots:
       '@cabloy/zod-query': link:packages-utils/zod-query
       zod: '@cabloy/zod@4.3.8'
 
-  zova-module-a-zova@5.1.94(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
-      '@cabloy/json5': link:packages-utils/json5
-      '@cabloy/module-info': 2.0.3
-      '@cabloy/utils': link:packages-utils/utils
-      '@cabloy/vue-router': 4.4.16(vue@3.5.39(typescript@5.9.3))
-      '@cabloy/word-utils': 2.1.14
-      defu: 6.1.7
-      luxon: 3.7.2
-      zova-jsx: 1.1.79(typescript@5.9.3)
-    transitivePeerDependencies:
-      - typescript
-      - vue
-
   zova-module-a-zova@5.1.96(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
@@ -14805,46 +14732,10 @@ snapshots:
       - typescript
       - vue
 
-  zova-module-pay-mock@5.0.0: {}
-
   zova-module-pay-mock@5.0.2: {}
 
   zova-module-rest-resource@5.1.42: {}
 
-  zova-suite-a-zova@5.1.141(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.25
-      zova-module-a-bean: 5.1.32
-      zova-module-a-behavior: 5.1.25
-      zova-module-a-behaviors: 5.1.21
-      zova-module-a-boundary: 5.1.21
-      zova-module-a-command: 5.1.33
-      zova-module-a-fetch: 5.1.24
-      zova-module-a-form: 5.1.46(vue@3.5.39(typescript@5.9.3))
-      zova-module-a-icon: 5.1.26
-      zova-module-a-interceptor: 5.1.29
-      zova-module-a-logger: 5.1.26
-      zova-module-a-meta: 5.1.21
-      zova-module-a-model: 5.1.33(vue@3.5.39(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.47
-      zova-module-a-router: 5.1.31
-      zova-module-a-routerstack: 5.1.26
-      zova-module-a-routertabs: 5.1.33
-      zova-module-a-ssr: 5.1.32
-      zova-module-a-ssrhmr: 5.1.22
-      zova-module-a-ssrserver: 5.1.23
-      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.36
-      zova-module-a-zova: 5.1.94(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - debug
-      - supports-color
-      - typescript
-      - vue
-
   zova-suite-a-zova@5.1.143(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.21
@@ -14879,17 +14770,6 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.142(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
-    dependencies:
-      zova-core: 5.1.79(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.141(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - debug
-      - supports-color
-      - typescript
-      - vue
-
   zova@5.1.144(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.81(patch_hash=ff659aa5f659be32501f56841b72f148c24acf1546f79cce551586e27fcde2ce)(typescript@5.9.3)

package/vona/src/suite/a-commerce/modules/commerce-member/src/dto/addressMineCreate.tsx

@@ -1,35 +1,14 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { Api, v } from 'vona-module-a-openapiutils';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 
-import { $locale } from '../.metadata/locales.ts';
+import { addressMineWriteColumns } from '../lib/addressMine.ts';
+import { ModelAddress } from '../model/address.ts';
 
 export interface IDtoOptionsAddressMineCreate extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsAddressMineCreate>()
-export class DtoAddressMineCreate {
-  @Api.field(v.title($locale('RecipientName')), v.required(), v.min(2), v.max(100))
-  recipientName: string;
-
-  @Api.field(v.title($locale('Phone')), v.required(), v.min(1), v.max(50))
-  phone: string;
-
-  @Api.field(v.title($locale('CountryCode')), v.required(), v.min(2), v.max(10))
-  countryCode: string;
-
-  @Api.field(v.title($locale('Region')), v.required(), v.min(1), v.max(100))
-  region: string;
-
-  @Api.field(v.title($locale('City')), v.required(), v.min(1), v.max(100))
-  city: string;
-
-  @Api.field(v.title($locale('PostalCode')), v.required(), v.min(1), v.max(30))
-  postalCode: string;
-
-  @Api.field(v.title($locale('AddressLine1')), v.required(), v.min(1), v.max(255))
-  addressLine1: string;
-
-  @Api.field(v.title($locale('AddressLine2')), v.optional(), v.max(255))
-  addressLine2?: string;
-}
+export class DtoAddressMineCreate extends $Dto.create(() => ModelAddress, {
+  columns: addressMineWriteColumns,
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-member/src/dto/addressMineItem.tsx

@@ -1,39 +1,14 @@
-import type { TableIdentity } from 'table-identity';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { Api, v } from 'vona-module-a-openapiutils';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 
-import { $locale } from '../.metadata/locales.ts';
+import { addressMineReadColumns } from '../lib/addressMine.ts';
+import { ModelAddress } from '../model/address.ts';
 
 export interface IDtoOptionsAddressMineItem extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsAddressMineItem>()
-export class DtoAddressMineItem {
-  @Api.field(v.tableIdentity())
-  id: TableIdentity;
-
-  @Api.field(v.title($locale('RecipientName')), v.required(), v.min(2), v.max(100))
-  recipientName: string;
-
-  @Api.field(v.title($locale('Phone')), v.required(), v.min(1), v.max(50))
-  phone: string;
-
-  @Api.field(v.title($locale('CountryCode')), v.required(), v.min(2), v.max(10))
-  countryCode: string;
-
-  @Api.field(v.title($locale('Region')), v.required(), v.min(1), v.max(100))
-  region: string;
-
-  @Api.field(v.title($locale('City')), v.required(), v.min(1), v.max(100))
-  city: string;
-
-  @Api.field(v.title($locale('PostalCode')), v.required(), v.min(1), v.max(30))
-  postalCode: string;
-
-  @Api.field(v.title($locale('AddressLine1')), v.required(), v.min(1), v.max(255))
-  addressLine1: string;
-
-  @Api.field(v.title($locale('AddressLine2')), v.optional(), v.max(255))
-  addressLine2?: string;
-}
+export class DtoAddressMineItem extends $Dto.get(() => ModelAddress, {
+  columns: addressMineReadColumns,
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-member/src/dto/addressMineUpdate.tsx

@@ -1,10 +1,14 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 
-import { DtoAddressMineCreate } from './addressMineCreate.tsx';
+import { addressMineWriteColumns } from '../lib/addressMine.ts';
+import { ModelAddress } from '../model/address.ts';
 
 export interface IDtoOptionsAddressMineUpdate extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsAddressMineUpdate>()
-export class DtoAddressMineUpdate extends DtoAddressMineCreate {}
+export class DtoAddressMineUpdate extends $Dto.update(() => ModelAddress, {
+  columns: addressMineWriteColumns,
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-member/src/lib/addressMine.ts

@@ -0,0 +1,16 @@
+import type { EntityAddress } from '../entity/address.tsx';
+
+export const addressMineWriteColumns = [
+  'recipientName',
+  'phone',
+  'countryCode',
+  'region',
+  'city',
+  'postalCode',
+  'addressLine1',
+  'addressLine2',
+] satisfies Array<keyof EntityAddress>;
+
+export const addressMineReadColumns = ['id', ...addressMineWriteColumns] satisfies Array<
+  keyof EntityAddress
+>;

package/vona/src/suite/a-commerce/modules/commerce-member/src/service/address.ts

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams, TypeModelColumns } from 'vona-module-a-orm';
+import type { IQueryParams } from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
@@ -10,22 +10,9 @@ import type { DtoAddressMineUpdate } from '../dto/addressMineUpdate.tsx';
 import type { DtoAddressMineView } from '../dto/addressMineView.tsx';
 import type { DtoAddressSelectRes } from '../dto/addressSelectRes.tsx';
 import type { DtoAddressView } from '../dto/addressView.tsx';
-import type { EntityAddress } from '../entity/address.tsx';
 import type { ModelAddress } from '../model/address.ts';
 
-const addressColumns: TypeModelColumns<EntityAddress> = [
-  'id',
-  'recipientName',
-  'phone',
-  'countryCode',
-  'region',
-  'city',
-  'postalCode',
-  'addressLine1',
-  'addressLine2',
-  'createdAt',
-  'updatedAt',
-];
+import { addressMineReadColumns } from '../lib/addressMine.ts';
 
 @Service()
 export class ServiceAddress extends BeanBase {
@@ -43,7 +30,7 @@ export class ServiceAddress extends BeanBase {
   async mine(params?: IQueryParams<ModelAddress>): Promise<DtoAddressMineRes> {
     return await this.scope.model.address.selectAndCount({
       ...params,
-      columns: addressColumns,
+      columns: addressMineReadColumns,
       where: { ...params?.where, userId: this._getCurrentUserId() },
       orders: params?.orders ?? [['id', 'asc']],
     });
@@ -79,7 +66,7 @@ export class ServiceAddress extends BeanBase {
   private async _getOwnedAddress(id: TableIdentity) {
     return await this.scope.model.address.get(
       { id, userId: this._getCurrentUserId() },
-      { columns: addressColumns },
+      { columns: addressMineReadColumns },
     );
   }
 }