cabloy 5.1.125 → 5.1.127

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.3
         version: link:modules/a-pay
       vona-module-pay-mock:
-        specifier: ^5.0.1
+        specifier: ^5.0.3
         version: link:modules/pay-mock
       vona-module-pay-paypal:
-        specifier: ^5.0.1
+        specifier: ^5.0.3
         version: link:modules/pay-paypal
       vona-module-pay-stripe:
-        specifier: ^5.0.1
+        specifier: ^5.0.3
         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.2
         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-catalog/src/.metadata/index.ts

@@ -142,7 +142,12 @@ declare module 'vona' {
 import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-commerce-catalog' {
-  export interface IModelOptionsProduct {
+  export interface IModelOptionsCategory {
+        relations: {
+          parent: IModelRelationBelongsTo<'commerce-catalog:category', 'commerce-catalog:category', false, 'id'|'name'>;
+        };
+      }
+export interface IModelOptionsProduct {
         relations: {
           category: IModelRelationBelongsTo<'commerce-catalog:product', 'commerce-catalog:category', false, '*'>;
 skus: IModelRelationHasMany<'commerce-catalog:sku', 'productId', false, '*', undefined, undefined, undefined>;
@@ -159,7 +164,17 @@ export interface IModelOptionsSku {
       [SymbolKeyEntityMeta]: EntityCategoryMeta;
       [SymbolKeyModelOptions]: IModelOptionsCategory;
       get<T extends IModelGetOptions<EntityCategory,ModelCategory>>(where: TypeModelWhere<EntityCategory>, options?: T): Promise<TypeModelRelationResult<EntityCategory, ModelCategory, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntityCategory,ModelCategory>>(where: TypeModelWhere<EntityCategory>, options?: T): Promise<TypeModelRelationResult<EntityCategory, ModelCategory, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntityCategory,ModelCategory>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityCategory, ModelCategory, T> | undefined>;
       mget<T extends IModelGetOptions<EntityCategory,ModelCategory>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityCategory, ModelCategory, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityCategory,ModelCategory,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityCategory, ModelCategory, T>>;
@@ -190,7 +205,17 @@ export interface ModelProduct {
       [SymbolKeyEntityMeta]: EntityProductMeta;
       [SymbolKeyModelOptions]: IModelOptionsProduct;
       get<T extends IModelGetOptions<EntityProduct,ModelProduct>>(where: TypeModelWhere<EntityProduct>, options?: T): Promise<TypeModelRelationResult<EntityProduct, ModelProduct, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntityProduct,ModelProduct>>(where: TypeModelWhere<EntityProduct>, options?: T): Promise<TypeModelRelationResult<EntityProduct, ModelProduct, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntityProduct,ModelProduct>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityProduct, ModelProduct, T> | undefined>;
       mget<T extends IModelGetOptions<EntityProduct,ModelProduct>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityProduct, ModelProduct, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityProduct,ModelProduct,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityProduct, ModelProduct, T>>;
@@ -217,7 +242,17 @@ export interface ModelSku {
       [SymbolKeyEntityMeta]: EntitySkuMeta;
       [SymbolKeyModelOptions]: IModelOptionsSku;
       get<T extends IModelGetOptions<EntitySku,ModelSku>>(where: TypeModelWhere<EntitySku>, options?: T): Promise<TypeModelRelationResult<EntitySku, ModelSku, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntitySku,ModelSku>>(where: TypeModelWhere<EntitySku>, options?: T): Promise<TypeModelRelationResult<EntitySku, ModelSku, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntitySku,ModelSku>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntitySku, ModelSku, T> | undefined>;
       mget<T extends IModelGetOptions<EntitySku,ModelSku>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntitySku, ModelSku, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntitySku,ModelSku,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntitySku, ModelSku, T>>;

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/en-us.ts

@@ -9,6 +9,7 @@ export default {
   Product: 'Product',
   ProductTitle: 'Product title',
   Published: 'Published',
+  Unpublished: 'Unpublished',
   Sku: 'SKU',
   SkuAttributeName: 'SKU attribute name',
   SkuAttributeValue: 'SKU attribute value',

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/zh-cn.ts

@@ -9,6 +9,7 @@ export default {
   Product: '商品',
   ProductTitle: '商品标题',
   Published: '已发布',
+  Unpublished: '未发布',
   Sku: 'SKU',
   SkuAttributeName: 'SKU 属性名',
   SkuAttributeValue: 'SKU 属性值',

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/categorySelectResItem.tsx

@@ -46,7 +46,9 @@ export interface IDtoOptionsCategorySelectResItem extends IDecoratorDtoOptions {
     }),
   ],
 })
-export class DtoCategorySelectResItem extends $Dto.get(() => ModelCategory) {
+export class DtoCategorySelectResItem extends $Dto.get(() => ModelCategory, {
+  include: { parent: true },
+}) {
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/categoryView.tsx

@@ -22,4 +22,6 @@ export interface IDtoOptionsCategoryView extends IDecoratorDtoOptions {}
     }),
   ],
 })
-export class DtoCategoryView extends $Dto.get(() => ModelCategory) {}
+export class DtoCategoryView extends $Dto.get(() => ModelCategory, {
+  include: { parent: true },
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/entity/category.tsx

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 
-import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, $resourceName, Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
@@ -9,6 +9,11 @@ import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsCategory extends IDecoratorEntityOptions {}
 
+export const categoryPublicationItems = [
+  { value: false, title: $locale('Unpublished') },
+  { value: true, title: $locale('Published') },
+];
+
 @Entity<IEntityOptionsCategory>('commerceCatalogCategory', {
   openapi: { title: $locale('Category') },
   fields: {
@@ -41,11 +46,25 @@ export class EntityCategory extends EntityBase {
     v.title($locale('ParentCategory')),
     v.optional(),
     ZovaRender.order(2),
+    ZovaRender.field('basic-resource:formFieldResourcePicker', {
+      resource: $resourceName('commerce-catalog:category'),
+      relationName: 'parent',
+    }),
+    ZovaRender.cell('basic-resource:resourcePicker', {
+      resource: $resourceName('commerce-catalog:category'),
+      relationName: 'parent',
+    }),
     v.tableIdentity(),
   )
   parentId?: TableIdentity;
 
-  @Api.field(v.title($locale('Published')), v.default(false), ZovaRender.order(3))
+  @Api.field(
+    v.title($locale('Published')),
+    v.default(false),
+    ZovaRender.order(3),
+    ZovaRender.field('basic-select:formFieldSelect', { items: categoryPublicationItems }),
+    ZovaRender.cell('basic-select:select', { items: categoryPublicationItems }),
+  )
   published: boolean;
 
   @Api.field(v.title($locale('Description')), v.optional(), ZovaRender.order(4))

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/model/category.ts

@@ -1,6 +1,6 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
 
-import { BeanModelBase, Model } from 'vona-module-a-orm';
+import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
 
 import { EntityCategory } from '../entity/category.tsx';
 
@@ -8,6 +8,16 @@ export interface IModelOptionsCategory extends IDecoratorModelOptions<EntityCate
 
 @Model<IModelOptionsCategory>({
   entity: EntityCategory,
+  relations: {
+    parent: $relation.belongsTo(
+      'commerce-catalog:category',
+      'commerce-catalog:category',
+      'parentId',
+      {
+        columns: ['id', 'name'],
+      },
+    ),
+  },
   cache: {
     modelsClear: 'commerce-catalog:product',
   },

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/service/category.ts

@@ -19,11 +19,16 @@ export class ServiceCategory extends BeanBase {
   }
 
   async select(params?: IQueryParams<ModelCategory>): Promise<DtoCategorySelectRes> {
-    return await this.scope.model.category.selectAndCount(params);
+    return await this.scope.model.category.selectAndCount({
+      ...params,
+      include: { parent: true },
+    });
   }
 
   async view(id: TableIdentity): Promise<DtoCategoryView | undefined> {
-    return await this.scope.model.category.getById(id);
+    return await this.scope.model.category.getById(id, {
+      include: { parent: true },
+    });
   }
 
   async update(id: TableIdentity, category: DtoCategoryUpdate) {