cabloy 5.1.126 → 5.1.128

package/vona/pnpm-lock.yaml

@@ -24,7 +24,7 @@ importers:
     dependencies:
       '@babel/core':
         specifier: ^7.29.0
-        version: 7.29.7(supports-color@5.5.0)
+        version: 7.29.7
       '@babel/traverse':
         specifier: ^7.29.0
         version: 7.29.7
@@ -69,7 +69,7 @@ importers:
         version: 8.0.1
       bullmq:
         specifier: ^5.74.1
-        version: 5.79.1(supports-color@5.5.0)
+        version: 5.79.1
       chalk:
         specifier: ^5.6.2
         version: 5.6.2
@@ -81,7 +81,7 @@ importers:
         version: 11.3.5
       ioredis:
         specifier: ^5.10.1
-        version: 5.11.1(supports-color@5.5.0)
+        version: 5.11.1
       knex:
         specifier: ^3.3.0
         version: 3.3.0(better-sqlite3@12.11.1)
@@ -1834,16 +1834,16 @@ importers:
   src/suite-vendor/a-pay:
     dependencies:
       vona-module-a-pay:
-        specifier: ^5.0.2
+        specifier: ^5.0.3
         version: link:modules/a-pay
       vona-module-pay-mock:
-        specifier: ^5.0.2
+        specifier: ^5.0.3
         version: link:modules/pay-mock
       vona-module-pay-paypal:
-        specifier: ^5.0.2
+        specifier: ^5.0.3
         version: link:modules/pay-paypal
       vona-module-pay-stripe:
-        specifier: ^5.0.2
+        specifier: ^5.0.3
         version: link:modules/pay-stripe
 
   src/suite-vendor/a-pay/modules/a-pay:
@@ -1922,7 +1922,7 @@ importers:
         specifier: ^5.0.8
         version: link:modules/test-file
       vona-module-test-pay:
-        specifier: ^5.0.1
+        specifier: ^5.0.2
         version: link:modules/test-pay
 
   src/suite-vendor/a-test/modules/test-auth:
@@ -2756,7 +2756,7 @@ importers:
     dependencies:
       bullmq:
         specifier: ^5.74.1
-        version: 5.79.1(supports-color@5.5.0)
+        version: 5.79.1
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -2778,7 +2778,7 @@ importers:
     dependencies:
       ioredis:
         specifier: ^5.10.1
-        version: 5.11.1(supports-color@5.5.0)
+        version: 5.11.1
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -8962,26 +8962,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/core@7.29.7(supports-color@5.5.0)':
-    dependencies:
-      '@babel/code-frame': 7.29.7
-      '@babel/generator': 7.29.7
-      '@babel/helper-compilation-targets': 7.29.7
-      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@5.5.0))
-      '@babel/helpers': 7.29.7
-      '@babel/parser': 7.29.7
-      '@babel/template': 7.29.7
-      '@babel/traverse': 7.29.7
-      '@babel/types': 7.29.7
-      '@jridgewell/remapping': 2.3.5
-      convert-source-map: 2.0.0
-      debug: 4.4.3(supports-color@5.5.0)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/generator@7.29.7':
     dependencies:
       '@babel/parser': 7.29.7
@@ -9031,15 +9011,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@5.5.0))':
-    dependencies:
-      '@babel/core': 7.29.7(supports-color@5.5.0)
-      '@babel/helper-module-imports': 7.29.7
-      '@babel/helper-validator-identifier': 7.29.7
-      '@babel/traverse': 7.29.7
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
@@ -10006,7 +9977,7 @@ snapshots:
 
   '@sesamecare-oss/redlock@1.4.0(ioredis@5.11.1)':
     dependencies:
-      ioredis: 5.11.1(supports-color@5.5.0)
+      ioredis: 5.11.1
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
@@ -10912,10 +10883,10 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  bullmq@5.79.1(supports-color@5.5.0):
+  bullmq@5.79.1:
     dependencies:
       cron-parser: 4.9.0
-      ioredis: 5.10.1(supports-color@5.5.0)
+      ioredis: 5.10.1
       msgpackr: 2.0.2
       node-abort-controller: 3.1.1
       semver: 7.8.1
@@ -12061,7 +12032,7 @@ snapshots:
 
   interpret@2.2.0: {}
 
-  ioredis@5.10.1(supports-color@5.5.0):
+  ioredis@5.10.1:
     dependencies:
       '@ioredis/commands': 1.5.1
       cluster-key-slot: 1.1.2
@@ -12075,7 +12046,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ioredis@5.11.1(supports-color@5.5.0):
+  ioredis@5.11.1:
     dependencies:
       '@ioredis/commands': 1.10.0
       cluster-key-slot: 1.1.1

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/index.ts

@@ -142,9 +142,14 @@ 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: {
-          category: IModelRelationBelongsTo<'commerce-catalog:product', 'commerce-catalog:category', false, '*'>;
+          parent: IModelRelationBelongsTo<'commerce-catalog:category', 'commerce-catalog:category', false, 'id'|'name'>;
+        };
+      }
+export interface IModelOptionsProduct {
+        relations: {
+          category: IModelRelationBelongsTo<'commerce-catalog:product', 'commerce-catalog:category', false, 'id'|'name'|'published'>;
 skus: IModelRelationHasMany<'commerce-catalog:sku', 'productId', false, '*', undefined, undefined, undefined>;
 skuAvailables: IModelRelationHasMany<'commerce-catalog:sku', 'productId', false, 'id'|'code'|'productId'|'priceCents', ['commerce-trade:stockBalance'], 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/dto/productSelectResItem.tsx

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

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

@@ -22,4 +22,6 @@ export interface IDtoOptionsProductView extends IDecoratorDtoOptions {}
     }),
   ],
 })
-export class DtoProductView extends $Dto.get(() => ModelProduct) {}
+export class DtoProductView extends $Dto.get(() => ModelProduct, {
+  include: { category: 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/entity/product.tsx

@@ -1,11 +1,12 @@
 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';
 
 import { $locale } from '../.metadata/locales.ts';
+import { categoryPublicationItems } from './category.tsx';
 
 export interface IEntityOptionsProduct extends IDecoratorEntityOptions {}
 
@@ -37,10 +38,29 @@ export class EntityProduct extends EntityBase {
   )
   title: string;
 
-  @Api.field(v.title($locale('Category')), v.required(), ZovaRender.order(2), v.tableIdentity())
+  @Api.field(
+    v.title($locale('Category')),
+    v.required(),
+    ZovaRender.order(2),
+    ZovaRender.field('basic-resource:formFieldResourcePicker', {
+      resource: $resourceName('commerce-catalog:category'),
+      relationName: 'category',
+    }),
+    ZovaRender.cell('basic-resource:resourcePicker', {
+      resource: $resourceName('commerce-catalog:category'),
+      relationName: 'category',
+    }),
+    v.tableIdentity(),
+  )
   categoryId: 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/model/product.ts

@@ -13,6 +13,7 @@ export interface IModelOptionsProduct extends IDecoratorModelOptions<EntityProdu
       'commerce-catalog:product',
       'commerce-catalog:category',
       'categoryId',
+      { columns: ['id', 'name', 'published'] },
     ),
     skus: $relation.hasMany('commerce-catalog:sku', 'productId'),
     skuAvailables: $relation.hasMany(

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) {

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

@@ -22,7 +22,10 @@ export class ServiceProduct extends BeanBase {
   }
 
   async select(params?: IQueryParams<ModelProduct>): Promise<DtoProductSelectRes> {
-    return await this.scope.model.product.selectAndCount(params);
+    return await this.scope.model.product.selectAndCount({
+      ...params,
+      include: { ...params?.include, category: true },
+    });
   }
 
   async selectPublic(params: IQueryParams<ModelProduct>): Promise<DtoProductPublicSelectRes> {
@@ -50,7 +53,9 @@ export class ServiceProduct extends BeanBase {
   }
 
   async view(id: TableIdentity): Promise<DtoProductView | undefined> {
-    return await this.scope.model.product.getById(id);
+    return await this.scope.model.product.getById(id, {
+      include: { category: true },
+    });
   }
 
   async viewPublic(id: TableIdentity): Promise<DtoProductPublic | undefined> {