vona-module-a-orm 5.0.48 → 5.0.50

package/cli/model/metadata/generate.ts

@@ -28,9 +28,10 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
       [SymbolKeyModelOptions]: ${opionsName};
       get<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
       mget<T extends IModelGetOptions<${entityName},${className}>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
+      selectAndCount<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<${entityName}, ${className}, T>>;
       select<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
-      insert<T extends IModelInsertOptions<${entityName},${className}>>(data?: TypeModelMutateRelationData<${entityName},${className}, T>, options?: T): Promise<Required<TypeModelMutateRelationData<${entityName},${className}, T>>>;
-      insertBulk<T extends IModelInsertOptions<${entityName},${className}>>(items: TypeModelMutateRelationData<${entityName},${className}, T>[], options?: T): Promise<Required<TypeModelMutateRelationData<${entityName},${className}, T>>[]>;
+      insert<T extends IModelInsertOptions<${entityName},${className}>>(data?: TypeModelMutateRelationData<${entityName},${className}, T>, options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T, true>>;
+      insertBulk<T extends IModelInsertOptions<${entityName},${className}>>(items: TypeModelMutateRelationData<${entityName},${className}, T>[], options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T, true>[]>;
       update<T extends IModelUpdateOptions<${entityName},${className}>>(data: TypeModelMutateRelationData<${entityName},${className}, T>, options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T>>;
       updateBulk<T extends IModelUpdateOptions<${entityName},${className}>>(items: TypeModelMutateRelationData<${entityName},${className}, T>[], options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T>[]>;
       delete<T extends IModelDeleteOptions<${entityName},${className}>>(where?: TypeModelWhere<${entityName}>, options?: T): Promise<void>;
@@ -52,7 +53,7 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
   if (contentRelations.length === 0 && contentRecords.length === 0 && contentModels.length === 0) return '';
   // combine
   const content = `/** ${sceneName}: begin */
-import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TableIdentity, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
+import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TableIdentity, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-${moduleName}' {
   ${contentRelations.join('\n')}

package/dist/bean/bean.model/bean.model_cache.d.ts

@@ -1,6 +1,6 @@
-import type BigNumber from 'bignumber.js';
 import type { ServiceDb } from '../../service/db_.ts';
 import type { IDatabaseClientRecord, IModelDeleteOptions, IModelGetOptions, IModelInsertOptions, IModelMethodOptions, IModelMethodOptionsGeneral, IModelMutateOptions, IModelRecord, IModelSelectAggrParams, IModelSelectCountParams, IModelSelectGroupParams, IModelSelectParams, IModelUpdateOptions, ITableRecord, TableIdentity, TypeModelAggrRelationResult, TypeModelClassLikeGeneral, TypeModelGroupRelationResult, TypeModelsClassLikeGeneral, TypeModelWhere } from '../../types/index.ts';
+import BigNumber from 'bignumber.js';
 import { ServiceCacheEntity } from '../../service/cacheEntity_.ts';
 import { ServiceCacheQuery } from '../../service/cacheQuery_.ts';
 import { ServiceRelations } from '../../service/relations_.ts';
@@ -25,6 +25,7 @@ export declare class BeanModelCache<TRecord extends {} = {}> extends BeanModelCr
     private __aggregate_raw;
     group<T extends IModelSelectGroupParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, _modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<TRecord, T>[]>;
     private __group_raw;
+    selectAndCount<T extends IModelSelectParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<any>;
     select<T extends IModelSelectParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, _modelJoins?: ModelJoins): Promise<any[]>;
     private __select_raw;
     private __select_cache;

package/dist/config/config.d.ts

@@ -5,6 +5,14 @@ import type { IDatabaseClientDialectRecord } from '../types/database.ts';
 import type { TableIdentityType } from '../types/tableIdentity.ts';
 export type TypeDataBaseConfigDialects = Record<keyof IDatabaseClientDialectRecord, TypeBeanRecordGeneralSelectorKeys<'databaseDialect'>>;
 export declare function config(_app: VonaApplication): {
+    rest: {
+        query: {
+            pageSize: {
+                default: number;
+                max: number;
+            };
+        };
+    };
     table: {
         identityType: TableIdentityType;
     };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import BigNumber$1, { BigNumber } from 'bignumber.js';
 import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, Virtual, appResource, beanFullNameFromOnionName, cast, appMetadata, useApp, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class } from 'vona';
 import { AopMethod, Aspect } from 'vona-module-a-aspect';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
@@ -9,6 +9,7 @@ import { swapDeps } from '@cabloy/deps';
 import { prepareClassType, getTargetDecoratorRules, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapi';
 import { ZodMetadata } from '@cabloy/zod-query';
 import { SymbolDecoratorRuleColumn } from 'vona-module-a-openapiutils';
+import z from 'zod';
 export * from 'table-identity';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
 import { Event, BeanEventBase } from 'vona-module-a-event';
@@ -16,23 +17,22 @@ import { Schedule } from 'vona-module-a-schedule';
 import { configAllWithIgnoreNull, configAll, configRedisWithIgnoreNull, configRedis } from 'vona-module-a-summer';
 import { ServiceDatabaseAsyncLocalStorage as ServiceDatabaseAsyncLocalStorage$1, ServiceTransactionConsistency‌ as ServiceTransactionConsistency_ } from 'vona-module-a-orm';
 import { mutate } from 'mutate-on-copy';
-import z from 'zod';
 
-var _dec$u, _dec2$u, _class$u;
-let AopMethodTransaction = (_dec$u = AopMethod(), _dec2$u = BeanInfo({
+var _dec$w, _dec2$w, _class$w;
+let AopMethodTransaction = (_dec$w = AopMethod(), _dec2$w = BeanInfo({
   module: "a-orm"
-}), _dec$u(_class$u = _dec2$u(_class$u = class AopMethodTransaction extends BeanAopMethodBase {
+}), _dec$w(_class$w = _dec2$w(_class$w = class AopMethodTransaction extends BeanAopMethodBase {
   execute(options, _args, next, _receiver, _prop) {
     return this.bean.database.current.transaction.begin(() => {
       return next();
     }, options);
   }
-}) || _class$u) || _class$u);
+}) || _class$w) || _class$w);
 
-var _dec$t, _dec2$t, _class$t;
-let ServiceDatabaseAsyncLocalStorage = (_dec$t = Service(), _dec2$t = BeanInfo({
+var _dec$v, _dec2$v, _class$v;
+let ServiceDatabaseAsyncLocalStorage = (_dec$v = Service(), _dec2$v = BeanInfo({
   module: "a-orm"
-}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
+}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.dbStorage = void 0;
@@ -51,14 +51,14 @@ let ServiceDatabaseAsyncLocalStorage = (_dec$t = Service(), _dec2$t = BeanInfo({
       return fn();
     });
   }
-}) || _class$t) || _class$t);
+}) || _class$v) || _class$v);
 
-var _dec$s, _dec2$s, _class$s;
+var _dec$u, _dec2$u, _class$u;
 const SymbolColumnsCache = Symbol('SymbolColumnsCache');
 const SymbolColumnsDefaultCache = Symbol('SymbolColumnsDefaultCache');
-let ServiceColumnsCache = (_dec$s = Service(), _dec2$s = BeanInfo({
+let ServiceColumnsCache = (_dec$u = Service(), _dec2$u = BeanInfo({
   module: "a-orm"
-}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceColumnsCache extends BeanBase {
+}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceColumnsCache extends BeanBase {
   constructor(...args) {
     super(...args);
     this.clientName = void 0;
@@ -113,12 +113,12 @@ let ServiceColumnsCache = (_dec$s = Service(), _dec2$s = BeanInfo({
       return exists;
     }
   }
-}) || _class$s) || _class$s);
+}) || _class$u) || _class$u);
 
-var _dec$r, _dec2$r, _class$r;
-let ServiceColumns = (_dec$r = Service(), _dec2$r = BeanInfo({
+var _dec$t, _dec2$t, _class$t;
+let ServiceColumns = (_dec$t = Service(), _dec2$t = BeanInfo({
   module: "a-orm"
-}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceColumns extends BeanBase {
+}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceColumns extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -169,7 +169,7 @@ let ServiceColumns = (_dec$r = Service(), _dec2$r = BeanInfo({
   columnsClear(tableName) {
     return this.scope.service.database.columnsClear(this.db.clientName, tableName);
   }
-}) || _class$r) || _class$r);
+}) || _class$t) || _class$t);
 
 const TransactionIsolationLevelsMap = {
   DEFAULT: undefined,
@@ -182,10 +182,10 @@ const TransactionIsolationLevelsMap = {
 
 // export type TransactionPropagation=''
 
-var _dec$q, _dec2$q, _class$q;
-let ServiceDatabase = (_dec$q = Service(), _dec2$q = BeanInfo({
+var _dec$s, _dec2$s, _class$s;
+let ServiceDatabase = (_dec$s = Service(), _dec2$s = BeanInfo({
   module: "a-orm"
-}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceDatabase extends BeanBase {
+}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceDatabase extends BeanBase {
   getDialect(client) {
     if (!client) throw new Error('database dialect not specified');
     const beanFullName = this.scope.config.dialects[client];
@@ -271,12 +271,12 @@ let ServiceDatabase = (_dec$q = Service(), _dec2$q = BeanInfo({
     });
     this.__columnsClearRaw(clientName);
   }
-}) || _class$q) || _class$q);
+}) || _class$s) || _class$s);
 
-var _dec$p, _dec2$p, _class$p;
-let ServiceTransactionConsistency‌ = (_dec$p = Service(), _dec2$p = BeanInfo({
+var _dec$r, _dec2$r, _class$r;
+let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
   module: "a-orm"
-}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionConsistency‌ extends BeanBase {
+}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionConsistency‌ extends BeanBase {
   constructor(...args) {
     super(...args);
     this._commitCallbacks = [];
@@ -304,12 +304,12 @@ let ServiceTransactionConsistency‌ = (_dec$p = Service(), _dec2$p = BeanInfo({
     }
     this._commitCallbacks = [];
   }
-}) || _class$p) || _class$p);
+}) || _class$r) || _class$r);
 
-var _dec$o, _dec2$o, _class$o;
-let ServiceTransactionFiber = (_dec$o = Service(), _dec2$o = BeanInfo({
+var _dec$q, _dec2$q, _class$q;
+let ServiceTransactionFiber = (_dec$q = Service(), _dec2$q = BeanInfo({
   module: "a-orm"
-}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransactionFiber extends BeanBase {
+}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionFiber extends BeanBase {
   constructor(...args) {
     super(...args);
     this._connection = void 0;
@@ -338,12 +338,12 @@ let ServiceTransactionFiber = (_dec$o = Service(), _dec2$o = BeanInfo({
     await this._transactionConsistency.compensateDone();
     this._connection = undefined;
   }
-}) || _class$o) || _class$o);
+}) || _class$q) || _class$q);
 
-var _dec$n, _dec2$n, _class$n;
-let ServiceTransactionState = (_dec$n = Service(), _dec2$n = BeanInfo({
+var _dec$p, _dec2$p, _class$p;
+let ServiceTransactionState = (_dec$p = Service(), _dec2$p = BeanInfo({
   module: "a-orm"
-}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceTransactionState extends BeanBase {
+}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionState extends BeanBase {
   constructor(...args) {
     super(...args);
     this._fibers = {};
@@ -365,12 +365,12 @@ let ServiceTransactionState = (_dec$n = Service(), _dec2$n = BeanInfo({
     const selector = this.serviceDatabase.prepareClientNameSelector(dbInfo);
     delete this._fibers[selector];
   }
-}) || _class$n) || _class$n);
+}) || _class$p) || _class$p);
 
-var _dec$m, _dec2$m, _class$m;
-let ServiceTransactionAsyncLocalStorage = (_dec$m = Service(), _dec2$m = BeanInfo({
+var _dec$o, _dec2$o, _class$o;
+let ServiceTransactionAsyncLocalStorage = (_dec$o = Service(), _dec2$o = BeanInfo({
   module: "a-orm"
-}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceTransactionAsyncLocalStorage extends BeanBase {
+}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransactionAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.transactionStorage = void 0;
@@ -391,12 +391,12 @@ let ServiceTransactionAsyncLocalStorage = (_dec$m = Service(), _dec2$m = BeanInf
       return fn();
     });
   }
-}) || _class$m) || _class$m);
+}) || _class$o) || _class$o);
 
-var _dec$l, _dec2$l, _class$l;
-let ServiceTransaction = (_dec$l = Service(), _dec2$l = BeanInfo({
+var _dec$n, _dec2$n, _class$n;
+let ServiceTransaction = (_dec$n = Service(), _dec2$n = BeanInfo({
   module: "a-orm"
-}), _dec$l(_class$l = _dec2$l(_class$l = class ServiceTransaction extends BeanBase {
+}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceTransaction extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -517,7 +517,7 @@ let ServiceTransaction = (_dec$l = Service(), _dec2$l = BeanInfo({
     }
     return res;
   }
-}) || _class$l) || _class$l);
+}) || _class$n) || _class$n);
 function _translateTransactionOptions(options) {
   if (!options) return undefined;
   return {
@@ -526,10 +526,10 @@ function _translateTransactionOptions(options) {
   };
 }
 
-var _dec$k, _dec2$k, _class$k;
-let ServiceDb = (_dec$k = Service(), _dec2$k = BeanInfo({
+var _dec$m, _dec2$m, _class$m;
+let ServiceDb = (_dec$m = Service(), _dec2$m = BeanInfo({
   module: "a-orm"
-}), _dec$k(_class$k = _dec2$k(_class$k = class ServiceDb extends BeanBase {
+}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceDb extends BeanBase {
   constructor(...args) {
     super(...args);
     this._client = void 0;
@@ -584,12 +584,12 @@ let ServiceDb = (_dec$k = Service(), _dec2$k = BeanInfo({
   compensate(cb) {
     return this.transaction.compensate(cb);
   }
-}) || _class$k) || _class$k);
+}) || _class$m) || _class$m);
 
-var _dec$j, _dec2$j, _class$j;
-let ServiceDatabaseClient = (_dec$j = Service(), _dec2$j = BeanInfo({
+var _dec$l, _dec2$l, _class$l;
+let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
   module: "a-orm"
-}), _dec$j(_class$j = _dec2$j(_class$j = class ServiceDatabaseClient extends BeanBase {
+}), _dec$l(_class$l = _dec2$l(_class$l = class ServiceDatabaseClient extends BeanBase {
   constructor(...args) {
     super(...args);
     this.level = void 0;
@@ -695,12 +695,12 @@ let ServiceDatabaseClient = (_dec$j = Service(), _dec2$j = BeanInfo({
     // reload
     await this.reload(config);
   }
-}) || _class$j) || _class$j);
+}) || _class$l) || _class$l);
 
-var _dec$i, _dec2$i, _class$i;
-let BeanDatabase = (_dec$i = Bean(), _dec2$i = BeanInfo({
+var _dec$k, _dec2$k, _class$k;
+let BeanDatabase = (_dec$k = Bean(), _dec2$k = BeanInfo({
   module: "a-orm"
-}), _dec$i(_class$i = _dec2$i(_class$i = class BeanDatabase extends BeanBase {
+}), _dec$k(_class$k = _dec2$k(_class$k = class BeanDatabase extends BeanBase {
   get current() {
     return this.bean._getBean(ServiceDatabaseAsyncLocalStorage).current;
   }
@@ -730,12 +730,12 @@ let BeanDatabase = (_dec$i = Bean(), _dec2$i = BeanInfo({
       return this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn);
     });
   }
-}) || _class$i) || _class$i);
+}) || _class$k) || _class$k);
 
-var _dec$h, _dec2$h, _dec3$5, _class$h;
-let BeanDatabaseDialectBase = (_dec$h = Bean(), _dec2$h = Virtual(), _dec3$5 = BeanInfo({
+var _dec$j, _dec2$j, _dec3$7, _class$j;
+let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = BeanInfo({
   module: "a-orm"
-}), _dec$h(_class$h = _dec2$h(_class$h = _dec3$5(_class$h = class BeanDatabaseDialectBase extends BeanBase {
+}), _dec$j(_class$j = _dec2$j(_class$j = _dec3$7(_class$j = class BeanDatabaseDialectBase extends BeanBase {
   getConfigBase() {
     return undefined;
   }
@@ -795,7 +795,7 @@ let BeanDatabaseDialectBase = (_dec$h = Bean(), _dec2$h = Virtual(), _dec3$5 = B
   _columnTypePrefixes(type, prefixes) {
     return prefixes.some(prefix => type.includes(prefix));
   }
-}) || _class$h) || _class$h) || _class$h);
+}) || _class$j) || _class$j) || _class$j);
 
 const OpAggrs = ['count', 'sum', 'avg', 'max', 'min'];
 const OpJoint = {
@@ -1161,8 +1161,6 @@ function _prepareClassEntity(classEntity) {
   return isClass(classEntity) ? classEntity : cast(classEntity)();
 }
 
-const SymbolKeyFieldsMore = Symbol('$fieldsMore');
-
 function _applyDecoratedDescriptor(i, e, r, n, l) {
   var a = {};
   return Object.keys(n).forEach(function (i) {
@@ -1180,6 +1178,57 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
+var _dec$i, _dec2$i, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _class$i, _descriptor$4, _descriptor2$2, _descriptor3$1;
+let DtoQueryBase = (_dec$i = Api.field(v.optional(), v.array(String, {
+  separator: ','
+})), _dec2$i = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.object({}).passthrough()), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Reflect.metadata("design:type", Object), _class$i = class DtoQueryBase {
+  constructor() {
+    _initializerDefineProperty(this, "columns", _descriptor$4, this);
+    _initializerDefineProperty(this, "where", _descriptor2$2, this);
+    _initializerDefineProperty(this, "orders", _descriptor3$1, this);
+  }
+}, _descriptor$4 = _applyDecoratedDescriptor(_class$i.prototype, "columns", [_dec$i, _dec2$i], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2$2 = _applyDecoratedDescriptor(_class$i.prototype, "where", [_dec3$6, _dec4$4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3$1 = _applyDecoratedDescriptor(_class$i.prototype, "orders", [_dec5$1, _dec6$1], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class$i);
+
+var _dec$h, _dec2$h, _dec3$5, _dec4$3, _class$h, _descriptor$3, _descriptor2$1;
+const app = useApp();
+const ormConfig = app.util.getModuleConfigRaw('a-orm');
+const pageSizeDefault = ormConfig?.rest?.query?.pageSize?.default ?? 20;
+const pageSizeMax = ormConfig?.rest?.query?.pageSize?.max ?? 100;
+let DtoQueryPageBase = (_dec$h = Api.field(z.number().min(1).default(1)), _dec2$h = Reflect.metadata("design:type", Number), _dec3$5 = Api.field(z.number().min(1).max(pageSizeMax).default(pageSizeDefault)), _dec4$3 = Reflect.metadata("design:type", Number), _class$h = class DtoQueryPageBase extends DtoQueryBase {
+  constructor(...args) {
+    super(...args);
+    _initializerDefineProperty(this, "pageNo", _descriptor$3, this);
+    _initializerDefineProperty(this, "pageSize", _descriptor2$1, this);
+  }
+}, _descriptor$3 = _applyDecoratedDescriptor(_class$h.prototype, "pageNo", [_dec$h, _dec2$h], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2$1 = _applyDecoratedDescriptor(_class$h.prototype, "pageSize", [_dec3$5, _dec4$3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class$h);
+
+const SymbolKeyFieldsMore = Symbol('$fieldsMore');
+
 class EntityBaseEmpty {}
 
 var _dec$g, _dec2$g, _dec3$4, _dec4$2, _dec5, _dec6, _dec7, _dec8, _class$g, _descriptor$2, _descriptor2, _descriptor3, _descriptor4;
@@ -2912,6 +2961,29 @@ class BeanModelCache extends BeanModelCrud {
     const items = await this.__select_cache(table, params, options);
     return this.convertItemsToBigNumber(items);
   }
+  async selectAndCount(params, options, modelJoins) {
+    // count
+    const paramsCount = Object.assign({}, params, {
+      columns: undefined,
+      orders: undefined,
+      limit: undefined,
+      offset: undefined
+    });
+    let count = await this.count(paramsCount, options, modelJoins);
+    if (!count) count = BigNumber$1(0);
+    // list
+    let list;
+    if (count.eq(0)) {
+      list = [];
+    } else {
+      list = await this.select(params, options, modelJoins);
+    }
+    // ok
+    return {
+      list,
+      total: count
+    };
+  }
   async select(params, options, _modelJoins) {
     const items = await this.__select_raw(undefined, params, options);
     return await this.relations.handleRelationsMany(items, params, options);
@@ -3191,7 +3263,7 @@ class BeanModelCache extends BeanModelCrud {
       const modelTarget = this.newInstanceTarget(modelClear);
       const modelsClearedByFn = modelTarget.options.cache?.modelsClearedByFn;
       if (modelsClearedByFn) {
-        await modelsClearedByFn(this.ctx, modelTarget);
+        await modelsClearedByFn(this.ctx, modelTarget, this);
       } else {
         await modelTarget.cacheQueryClear();
       }
@@ -3399,6 +3471,14 @@ let ScheduleSoftDeletionPrune = (_dec$1 = Schedule({
 
 function config(_app) {
   return {
+    rest: {
+      query: {
+        pageSize: {
+          default: 20,
+          max: 100
+        }
+      }
+    },
     table: {
       identityType: 'string'
     },
@@ -3922,6 +4002,22 @@ function DtoCreate(modelLike, params) {
   return _DtoMutate_raw(modelLike, params, 'create', ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'], true);
 }
 
+function DtoQuery(classRef, keys) {
+  return $Class.mixin(DtoQueryBase, $Class.partial($Class.pick(classRef, keys)));
+}
+
+function DtoQueryPage(classRef, keys) {
+  return $Class.mixin(DtoQueryPageBase, $Class.partial($Class.pick(classRef, keys)));
+}
+
+function DtoSelectAndCount(modelLike, params) {
+  class TargetClass {}
+  const DtoGetResult = DtoGet(modelLike, params);
+  Api.field(v.array(DtoGetResult))(TargetClass.prototype, 'list');
+  Api.field(v.bigNumber())(TargetClass.prototype, 'total');
+  return TargetClass;
+}
+
 function DtoUpdate(modelLike, params) {
   return _DtoMutate_raw(modelLike, params, 'update', ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'], true);
 }
@@ -3933,7 +4029,10 @@ const $Dto = {
   update: DtoUpdate,
   get: DtoGet,
   aggregate: DtoAggregate,
-  group: DtoGroup
+  group: DtoGroup,
+  query: DtoQuery,
+  queryPage: DtoQueryPage,
+  selectAndCount: DtoSelectAndCount
 };
 
 // const __tableNames = new Set();
@@ -4143,4 +4242,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };
+export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/dist/lib/dto/dto.d.ts

@@ -2,6 +2,9 @@ import { DtoAggregate } from './dtoAggregate.ts';
 import { DtoCreate } from './dtoCreate.ts';
 import { DtoGet } from './dtoGet.ts';
 import { DtoGroup } from './dtoGroup.ts';
+import { DtoQuery } from './dtoQuery.ts';
+import { DtoQueryPage } from './dtoQueryPage.ts';
+import { DtoSelectAndCount } from './dtoSelectAndCount.ts';
 import { DtoUpdate } from './dtoUpdate.ts';
 export declare const $Dto: {
     create: typeof DtoCreate;
@@ -9,4 +12,7 @@ export declare const $Dto: {
     get: typeof DtoGet;
     aggregate: typeof DtoAggregate;
     group: typeof DtoGroup;
+    query: typeof DtoQuery;
+    queryPage: typeof DtoQueryPage;
+    selectAndCount: typeof DtoSelectAndCount;
 };

package/dist/lib/dto/dtoQuery.d.ts

@@ -0,0 +1,3 @@
+import type { Constructable } from 'vona';
+import { DtoQueryBase } from '../../types/dto/dtoQueryBase.ts';
+export declare function DtoQuery<T, K extends keyof T>(classRef: Constructable<T>, keys: K[]): new (...args: any[]) => ((k: DtoQueryBase) => void) | (Partial<Pick<T, K>> extends infer T_1 ? T_1 extends Partial<Pick<T, K>> ? T_1 extends any ? (k: T_1) => void : never : never : never) extends (k: infer I) => void ? I : never;

package/dist/lib/dto/dtoQueryPage.d.ts

@@ -0,0 +1,3 @@
+import type { Constructable } from 'vona';
+import { DtoQueryPageBase } from '../../types/dto/dtoQueryPageBase.ts';
+export declare function DtoQueryPage<T, KEYS extends Array<keyof T>>(classRef: Constructable<T>, keys: KEYS): new (...args: any[]) => ((k: DtoQueryPageBase) => void) | (Partial<Pick<T, KEYS[number]>> extends infer T_1 ? T_1 extends Partial<Pick<T, KEYS[number]>> ? T_1 extends any ? (k: T_1) => void : never : never : never) extends (k: infer I) => void ? I : never;

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

@@ -0,0 +1,6 @@
+import type { Constructable } from 'vona';
+import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { IDtoGetParams } from '../../types/dto/dtoGet.ts';
+import type { TypeDtoSelectAndCountResult } from '../../types/dto/dtoSelectAndCount.ts';
+import type { IModelClassRecord } from '../../types/onion/model.ts';
+export declare function DtoSelectAndCount<ModelLike extends BeanModelMeta | (keyof IModelClassRecord), T extends IDtoGetParams<ModelLike> | undefined = undefined>(modelLike: ModelLike extends BeanModelMeta ? ((() => Constructable<ModelLike>) | Constructable<ModelLike>) : ModelLike, params?: T): Constructable<TypeDtoSelectAndCountResult<ModelLike, T>>;

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

@@ -0,0 +1,5 @@
+export declare class DtoQueryBase {
+    columns?: string[];
+    where?: object;
+    orders?: string | string[][];
+}

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

@@ -0,0 +1,5 @@
+import { DtoQueryBase } from './dtoQueryBase.ts';
+export declare class DtoQueryPageBase extends DtoQueryBase {
+    pageNo: number;
+    pageSize: number;
+}

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

@@ -0,0 +1,8 @@
+import type BigNumber from 'bignumber.js';
+import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { IModelClassRecord } from '../onion/model.ts';
+import type { TypeDtoGetResult } from './dtoGet.ts';
+export interface TypeDtoSelectAndCountResult<ModelLike extends BeanModelMeta | (keyof IModelClassRecord), TOptionsRelation> {
+    list: TypeDtoGetResult<ModelLike, TOptionsRelation>[];
+    total: BigNumber;
+}

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

@@ -2,3 +2,6 @@ export * from './dtoAggregate.ts';
 export * from './dtoGet.ts';
 export * from './dtoGroup.ts';
 export * from './dtoMutate.ts';
+export * from './dtoQueryBase.ts';
+export * from './dtoQueryPageBase.ts';
+export * from './dtoSelectAndCount.ts';

package/dist/types/model.d.ts

@@ -1,7 +1,7 @@
 import type { Knex } from 'knex';
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeModelColumn, TypeModelColumns, TypeModelColumnsPatch, TypeModelWhere } from './modelWhere.ts';
-import type { TypeModelParamsInclude, TypeModelsClassLikeGeneral } from './relations.ts';
+import type { TypeModelOfModelLike, TypeModelParamsInclude, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from './relations.ts';
 import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
 import type { TypeModelMutateParamsInclude } from './relationsMutate.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
@@ -29,6 +29,7 @@ export interface IBuildModelSelectParamsBasic<TRecord, COLUMNS extends TypeModel
     limit?: number;
     offset?: number;
 }
+export type IQueryParams<Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IModelSelectParams<TypeModelOfModelLike<Model>[TypeSymbolKeyEntity], Model, ModelJoins>;
 export type IModelSelectParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelSelectParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
 export interface IBuildModelCountParams<TRecord, _Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
     distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];

package/dist/types/modelWhere.d.ts

@@ -57,7 +57,7 @@ export declare const Op: {
 };
 export declare const OpJointValues: ("_and_" | "_or_" | "_not_" | "_exists_" | "_notExists_")[];
 export declare const OpNormalValues: ("_eq_" | "_notEq_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_")[];
-export declare const OpValues: ("_and_" | "_or_" | "_not_" | "_exists_" | "_notExists_" | "_skip_" | "_eq_" | "_notEq_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_")[];
+export declare const OpValues: ("_eq_" | "_notEq_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_" | "_and_" | "_or_" | "_not_" | "_exists_" | "_notExists_" | "_skip_")[];
 export type TypeOpsJointPostfix<Op> = {
     [KEY in keyof Op]: Op[KEY] | (KEY extends string ? `_${KEY}_${number}` : never);
 };

package/dist/types/onion/model.d.ts

@@ -12,7 +12,7 @@ export interface IModelClassRecord {
 }
 export type TypeDynamicTableName = (ctx: VonaContext, defaultTable: keyof ITableRecord, modelInstance: any) => string;
 export type TypeDynamicClientName = (ctx: VonaContext, modelInstance: any) => keyof IDatabaseClientRecord;
-export type TypeModelsClearedByFn = (ctx: VonaContext, modelInstance: any) => Promise<void>;
+export type TypeModelsClearedByFn = (ctx: VonaContext, modelTarget: any, modelSource: any) => Promise<void>;
 export type TypeSoftDeletionPruneHandler = (ctx: VonaContext, modelInstance: any, options: ISoftDeletionPruneHandlerOptions) => Promise<void>;
 export interface ISoftDeletionPruneHandlerOptions {
     expired: number;

package/dist/types/relations.d.ts

@@ -1,3 +1,4 @@
+import type BigNumber from 'bignumber.js';
 import type { Constructable, OmitNever } from 'vona';
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeDepthPrev, TypeDepthPrevMax } from './depth.ts';
@@ -94,6 +95,10 @@ export type TypeUtilEntityPartial<TRecord, TColumns> = [
     TColumns
 ] extends [keyof TRecord] ? Partial<Pick<TRecord, TColumns>> & Omit<TRecord, TColumns> : TRecord;
 export type TypeUtilGetColumnsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetParamsColumns<IncludeWrapper> extends string | string[] ? TypeUtilGetParamsColumns<IncludeWrapper> : TypeUtilGetRelationOptionsColumns<Relation>;
+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;
+}
 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>>) : {});
 export type TypeModelRelationResultMergeInclude<TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = {

package/dist/types/relationsMutate.d.ts

@@ -12,18 +12,18 @@ export type TypeModelMutateParamsRelationOptions<Relation> = boolean | (IModelRe
     include?: TypeModelMutateParamsInclude<TypeUtilGetRelationModel<Relation>>;
     with?: Record<string, unknown>;
 });
-export type TypeModelMutateRelationResultMergeInclude<TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown> = {
-    [RelationName in (keyof TModelOptions['relations'])]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeModelMutateRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName]> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName]> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName]>;
+export type TypeModelMutateRelationResultMergeInclude<TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown, TForInsertResult extends boolean | undefined = undefined> = {
+    [RelationName in (keyof TModelOptions['relations'])]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeModelMutateRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], TForInsertResult> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult>;
 };
-export type TypeModelMutateRelationResultMergeAutoload<Relation> = TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined> : never;
-export type TypeModelMutateRelationResultMergeIncludeWrapper<Relation, IncludeWrapper> = IncludeWrapper extends false ? never : IncludeWrapper extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined> : IncludeWrapper extends {} ? TypeUtilMutateGetRelationEntityByType<Relation, IncludeWrapper> : never;
-export type TypeUtilMutateGetRelationEntityByType<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilMutateGetEntityByType<TypeUtilGetRelationEntity<Relation>, TypeUtilGetRelationType<Relation>, TypeUtilGetRelationModel<Relation>, IncludeWrapper>;
-export type TypeUtilMutateGetEntityByType<TRecord, TYPE, TModel extends BeanModelMeta | undefined, IncludeWrapper extends {} | undefined | unknown> = TYPE extends 'belongsTo' ? never : TYPE extends 'belongsToMany' ? Array<{
+export type TypeModelMutateRelationResultMergeAutoload<Relation, TForInsertResult extends boolean | undefined = undefined> = TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined, TForInsertResult> : never;
+export type TypeModelMutateRelationResultMergeIncludeWrapper<Relation, IncludeWrapper, TForInsertResult extends boolean | undefined = undefined> = IncludeWrapper extends false ? never : IncludeWrapper extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined, TForInsertResult> : IncludeWrapper extends {} ? TypeUtilMutateGetRelationEntityByType<Relation, IncludeWrapper, TForInsertResult> : never;
+export type TypeUtilMutateGetRelationEntityByType<Relation, IncludeWrapper extends {} | undefined | unknown, TForInsertResult extends boolean | undefined = undefined> = TypeUtilMutateGetEntityByType<TypeUtilGetRelationEntity<Relation>, TypeUtilGetRelationType<Relation>, TypeUtilGetRelationModel<Relation>, IncludeWrapper, TForInsertResult>;
+export type TypeUtilMutateGetEntityByType<TRecord, TYPE, TModel extends BeanModelMeta | undefined, IncludeWrapper extends {} | undefined | unknown, TForInsertResult extends boolean | undefined = undefined> = TYPE extends 'belongsTo' ? never : TYPE extends 'belongsToMany' ? Array<{
     id: TableIdentity;
     deleted?: boolean;
-}> | undefined : TYPE extends 'hasMany' ? Array<TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper>> | undefined : TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper> | undefined;
-export type TypeModelMutateRelationResultMergeWith<TWith extends {} | undefined | unknown> = TWith extends {} ? {
-    [RelationName in (keyof TWith)]: TypeModelMutateRelationResultMergeWithRelation<TWith[RelationName]>;
+}> | undefined : TYPE extends 'hasMany' ? Array<TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper, TForInsertResult>> | undefined : TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper, TForInsertResult> | undefined;
+export type TypeModelMutateRelationResultMergeWith<TWith extends {} | undefined | unknown, TForInsertResult extends boolean | undefined = undefined> = TWith extends {} ? {
+    [RelationName in (keyof TWith)]: TypeModelMutateRelationResultMergeWithRelation<TWith[RelationName], TForInsertResult>;
 } : {};
-export type TypeModelMutateRelationResultMergeWithRelation<WithRelation> = WithRelation extends false ? never : WithRelation extends true ? never : WithRelation extends {} ? TypeUtilMutateGetRelationEntityByType<WithRelation, TypeUtilGetRelationOptions<WithRelation>> : never;
-export type TypeModelMutateRelationData<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation> = Partial<TRecord> & (TModel extends BeanModelMeta ? (Partial<OmitNever<TypeModelMutateRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>>>> & Partial<OmitNever<TypeModelMutateRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>>>>) : {});
+export type TypeModelMutateRelationResultMergeWithRelation<WithRelation, TForInsertResult extends boolean | undefined = undefined> = WithRelation extends false ? never : WithRelation extends true ? never : WithRelation extends {} ? TypeUtilMutateGetRelationEntityByType<WithRelation, TypeUtilGetRelationOptions<WithRelation>, TForInsertResult> : never;
+export type TypeModelMutateRelationData<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TForInsertResult extends boolean | undefined = undefined> = (TForInsertResult extends true ? TRecord : Partial<TRecord>) & (TModel extends BeanModelMeta ? (Partial<OmitNever<TypeModelMutateRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, TForInsertResult>>> & Partial<OmitNever<TypeModelMutateRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, TForInsertResult>>>) : {});

package/package.json

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