vona-module-a-orm 5.0.63 → 5.0.65

package/dist/index.js

@@ -1970,7 +1970,7 @@ class BeanModelCrudInner extends BeanModelView {
     // builder
     builder = builder ?? this._select_buildParams(table, params, options);
     // ready
-    this.$loggerChild('model').debug('model.select: %s', builder.toQuery());
+    this.$loggerChild('model').debug(() => `model.select: ${builder.toQuery()}`);
     return await builder;
   }
   _select_buildParams(table, params, options) {
@@ -2032,7 +2032,7 @@ class BeanModelCrudInner extends BeanModelView {
     // where
     this.prepareWhere(builder, table, params.where, options);
     // ready
-    this.$loggerChild('model').debug('model.count: %s', builder.toQuery());
+    this.$loggerChild('model').debug(() => `model.count: ${builder.toQuery()}`);
     const res = await builder;
     return this.extractFirstNumber(res);
   }
@@ -2060,7 +2060,7 @@ class BeanModelCrudInner extends BeanModelView {
     // builder
     const builder = this.builder(table);
     // // debug
-    // this.$loggerChild('model').debug('model.insert: %s', builder.toQuery());
+    // this.$loggerChild('model').debug(() => `model.insert: ${builder.toQuery()}`);
     // dialect insert
     const ids = await this.dialect.insert(builder, datas);
     // combine
@@ -2102,7 +2102,7 @@ class BeanModelCrudInner extends BeanModelView {
     // where
     this.prepareWhere(builder, table, where, options);
     // debug
-    this.$loggerChild('model').debug('model.update: %s', builder.toQuery());
+    this.$loggerChild('model').debug(() => `model.update: ${builder.toQuery()}`);
     // ready
     await builder;
     // ok
@@ -2130,7 +2130,7 @@ class BeanModelCrudInner extends BeanModelView {
     // where
     this.prepareWhere(builder, table, where, options);
     // debug
-    this.$loggerChild('model').debug('model.delete: %s', builder.toQuery());
+    this.$loggerChild('model').debug(() => `model.delete: ${builder.toQuery()}`);
     // ready
     await builder;
   }
@@ -3060,6 +3060,10 @@ class BeanModelCache extends BeanModelCrud {
     return this.convertItemsToBigNumber(items);
   }
   async selectAndCount(params, options, modelJoins) {
+    // pageNo/pageSize
+    const pageSize = params?.limit;
+    if (!pageSize) throw new Error('should specify the page size');
+    const pageNo = Math.floor(params.offset / pageSize) + 1;
     // count
     const paramsCount = Object.assign({}, params, {
       columns: undefined,
@@ -3076,10 +3080,15 @@ class BeanModelCache extends BeanModelCrud {
     } else {
       list = await this.select(params, options, modelJoins);
     }
+    // pageNo/pageSize/pageCount
+    const pageCount = Math.ceil(count.div(pageSize).toNumber());
     // ok
     return {
       list,
-      total: count
+      total: count,
+      pageCount,
+      pageSize,
+      pageNo
     };
   }
   async select(params, options, _modelJoins) {
@@ -4176,6 +4185,9 @@ function DtoSelectAndCount(modelLike, params) {
   const DtoGetResult = DtoGet(modelLike, params);
   Api.field(v.array(DtoGetResult))(TargetClass.prototype, 'list');
   Api.field(v.bigNumber())(TargetClass.prototype, 'total');
+  Api.field(z.number())(TargetClass.prototype, 'pageCount');
+  Api.field(z.number())(TargetClass.prototype, 'pageSize');
+  Api.field(z.number())(TargetClass.prototype, 'pageNo');
   return TargetClass;
 }
 

package/dist/types/dto/dtoSelectAndCount.d.ts

@@ -5,4 +5,7 @@ import type { TypeDtoGetResult } from './dtoGet.ts';
 export interface TypeDtoSelectAndCountResult<ModelLike extends BeanModelMeta | (keyof IModelClassRecord), TOptionsRelation> {
     list: TypeDtoGetResult<ModelLike, TOptionsRelation>[];
     total: BigNumber;
+    pageCount: number;
+    pageSize: number;
+    pageNo: number;
 }

package/dist/types/relations.d.ts

@@ -101,6 +101,9 @@ export type TypeUtilGetColumnsFromRelationAndIncludeWrapper<Relation, IncludeWra
 export interface TypeModelSelectAndCount<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Aggrs = undefined, Groups = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> {
     list: TypeModelRelationResult<TRecord, TModel, TOptionsRelation, TColumns, Aggrs, Groups, Depth>[];
     total: BigNumber;
+    pageCount: number;
+    pageSize: number;
+    pageNo: number;
 }
 export type TypeModelRelationResult<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Aggrs = undefined, Groups = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = Groups extends string | string[] ? TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, TColumns> : Aggrs extends {} ? TypeModelAggrRelationResultAggrs<Aggrs> : TypeModelRelationResult_Normal<TRecord, TModel, TOptionsRelation, TColumns, Depth>;
 export type TypeModelRelationResult_Normal<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TypeUtilEntitySelector<TRecord, TypeUtilPrepareColumns<TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>>> & (TModel extends BeanModelMeta ? (OmitNever<TypeModelRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, Depth>> & OmitNever<TypeModelRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, Depth>>) : {});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.63",
+  "version": "5.0.65",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {