vona-module-a-orm 5.1.8 → 5.1.13

package/src/common/buildWhere.ts

@@ -1,6 +1,5 @@
 import type { Knex } from 'knex';
 
-import { isNil } from '@cabloy/utils';
 import { cast } from 'vona';
 
 import type { ServiceDb } from '../service/db_.ts';
@@ -31,8 +30,8 @@ function _buildWhereInner<TRecord>(
   wheres: TypeModelWhere<TRecord>,
   column?: keyof TRecord,
 ) {
-  // skip
-  if (wheres === Op.skip) {
+  // omit
+  if (wheres === Op.omit) {
     return;
   }
   // raw
@@ -73,8 +72,8 @@ function _buildWhereOpJoint<TRecord>(
   wheres: TypeModelWhere<TRecord>,
   op: TypeOpsJoint,
 ) {
-  // skip
-  if (wheres === Op.skip) {
+  // omit
+  if (wheres === Op.omit) {
     return;
   }
   // and/or
@@ -127,8 +126,8 @@ function _buildWhereColumn<TRecord>(
     | TypeModelWhereFieldAll<TRecord, TRecord[keyof TRecord]>,
   op?: TypeOpsNormal,
 ) {
-  // skip
-  if (value === Op.skip) {
+  // omit condition
+  if (value === Op.omit) {
     return;
   }
   // raw
@@ -136,8 +135,8 @@ function _buildWhereColumn<TRecord>(
     _buildWhereColumnOpNormal(having, db, builder, column, value, op ?? Op.eq);
     return;
   }
-  // null/undefined
-  if (isNil(value)) {
+  // null
+  if (value === null) {
     _buildWhereColumnOpNormal(having, db, builder, column, value, op ?? Op.is);
     return;
   }

package/src/common/utils.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { appResource, beanFullNameFromOnionName } from 'vona';
 import { prepareClassType } from 'vona-module-a-openapiutils';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { TypeModelColumn, TypeModelColumns } from '../types/modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../types/onion/model.ts';
 

package/src/index.ts

@@ -3,7 +3,7 @@ import 'bignumber.js';
 export * from './.metadata/index.ts';
 
 export * from './.metadata/locales.ts';
-export * from './bean/bean.model/bean.model_meta.ts';
+export * from './lib/bean.model/bean.model_meta.ts';
 export * from './common/index.ts';
 export * from './extend/index.ts';
 export * from './lib/index.ts';

package/src/{bean → lib}/bean.model/bean.model_cache.ts

@@ -5,6 +5,7 @@ import { parseFirstWord, toLowerCaseFirstChar } from '@cabloy/word-utils';
 import BigNumber from 'bignumber.js';
 import { cast, deepExtend, disposeInstance } from 'vona';
 
+import type { TypeQueueDoubleDeleteJobData } from '../../bean/queue.doubleDelete.ts';
 import type { ServiceDb } from '../../service/db_.ts';
 import type {
   IDatabaseClientRecord,
@@ -31,7 +32,6 @@ import type {
   TypeModelsClassLikeGeneral,
   TypeModelWhere,
 } from '../../types/index.ts';
-import type { TypeQueueDoubleDeleteJobData } from '../queue.doubleDelete.ts';
 
 import { getTargetColumnName } from '../../common/utils.ts';
 import { getCacheModelsClear } from '../../lib/const.ts';
@@ -860,7 +860,7 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
       if (!fieldName) throw new Error(`invalid magic method: ${prop}`);
       return (fieldValue: any, data: any, options?: any) => {
         const where = __combineMagicWhere(fieldName, op!, fieldValue);
-        if (fieldName === 'id') {
+        if (fieldName === 'id' && where.id !== null) {
           data = Object.assign({}, data, where);
         } else {
           options = deepExtend({}, options, { where });
@@ -879,15 +879,21 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
 }
 
 function __combineMagicWhere(fieldName: string, op: string, fieldValue?: any) {
+  if (fieldValue === undefined) {
+    if (op === 'eq') {
+      return {
+        [fieldName]: null,
+      };
+    }
+    throw new Error(`should specify the value for magic method: ${fieldName}/${op}`);
+  }
   return {
     [fieldName]:
-      fieldValue === undefined
-        ? undefined
-        : op === 'eq'
-          ? fieldValue
-          : {
-              [`_${op}_`]: fieldValue,
-            },
+      op === 'eq'
+        ? fieldValue
+        : {
+            [`_${op}_`]: fieldValue,
+          },
   };
 }
 

package/src/{bean → lib}/bean.model/bean.model_meta.ts

@@ -15,7 +15,7 @@ import type {
   TypeModelOptionsTable,
   TypeModelRelationOptionsMetaClient,
 } from '../../types/index.ts';
-import type { BeanModel } from '../bean.model.ts';
+import type { BeanModel } from '../../bean/bean.model.ts';
 
 import { getTableOrTableAlias, prepareClassModel } from '../../common/utils.ts';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from '../../types/index.ts';

package/src/{bean → lib}/bean.modelBase.ts

@@ -1,8 +1,3 @@
-import { Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
-
 import { BeanModelCache } from './bean.model/bean.model_cache.ts';
 
-@Bean()
-@Virtual()
 export class BeanModelBase<TRecord extends {} = any> extends BeanModelCache<TRecord> {}

package/src/lib/dto/dto.ts

@@ -3,6 +3,7 @@ import { DtoCreate } from './dtoCreate.ts';
 import { DtoGet } from './dtoGet.ts';
 import { DtoGroup } from './dtoGroup.ts';
 import { DtoListAndCount } from './dtoListAndCount.ts';
+import { DtoMutate } from './dtoMutate.ts';
 import { DtoQuery } from './dtoQuery.ts';
 import { DtoQueryPage } from './dtoQueryPage.ts';
 import { DtoSelectAndCount } from './dtoSelectAndCount.ts';
@@ -11,6 +12,7 @@ import { DtoUpdate } from './dtoUpdate.ts';
 export const $Dto = {
   create: DtoCreate,
   update: DtoUpdate,
+  mutate: DtoMutate,
   get: DtoGet,
   aggregate: DtoAggregate,
   group: DtoGroup,

package/src/lib/dto/dtoAggregate.ts

@@ -4,7 +4,7 @@ import { ensureArray } from '@cabloy/utils';
 import { Api, v } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { TypeDtoAggrResult } from '../../types/dto/dtoAggregate.ts';
 import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';

package/src/lib/dto/dtoCreate.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 

package/src/lib/dto/dtoGet.ts

@@ -12,12 +12,12 @@ import {
 } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
 import type { IDtoGetParams, TypeDtoGetResult } from '../../types/dto/dtoGet.ts';
 import type { TypeDtoMutateType } from '../../types/dto/dtoMutate.ts';
 import type { IModelRelationIncludeWrapper } from '../../types/model.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../../types/onion/model.ts';
 import type { IRelationItem } from '../../types/relationsDef.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 
 import {
   getClassEntityFromClassModel,
@@ -53,7 +53,7 @@ function _DtoGet_raw<
   // model
   const modelClass = prepareClassModel(modelLike);
   // entity
-  let entityClass = getClassEntityFromClassModel(modelClass);
+  let entityClass = params?.dtoClass ?? getClassEntityFromClassModel(modelClass);
   // columns
   const columns = prepareColumns(params?.columns);
   // always create a new class, no matter if columns empty
@@ -164,7 +164,7 @@ function _DtoGet_relation_handle_schemaLazy(
       );
     }
     // dynamic
-    const entityClass = getClassEntityFromClassModel(modelTarget);
+    const entityClass = optionsReal.dtoClass ?? getClassEntityFromClassModel(modelTarget);
     const beanFullName = appResource.getBeanFullName(entityClass);
     const _hashkey = _DtoGet_relation_handle_schemaLazy_hashkey(optionsReal, mutateTypeTopLevel);
     const dynamicName = `${beanFullName}_${_hashkey}`;

package/src/lib/dto/dtoGroup.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { ensureArray } from '@cabloy/utils';
 import { PickClassInner } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { TypeDtoGroupResult } from '../../types/dto/dtoGroup.ts';
 import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
 import type { TypeModelColumnsStrict } from '../../types/modelWhere.ts';

package/src/lib/dto/dtoMutate.ts

@@ -3,7 +3,6 @@ import type { Constructable } from 'vona';
 import { mutate } from 'mutate-on-copy';
 import { $Class } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
 import type {
   IDtoMutateParams,
   TypeDtoMutateResult,
@@ -13,6 +12,7 @@ import type { TypeModelColumnsStrict } from '../../types/modelWhere.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 import type { TypeModelOfModelLike, TypeSymbolKeyEntity } from '../../types/relations.ts';
 import type { IRelationItem } from '../../types/relationsDef.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 
 import {
   getClassEntityFromClassModel,
@@ -52,7 +52,7 @@ export function _DtoMutate_raw<
   // model
   const modelClass = prepareClassModel(modelLike);
   // entity
-  let entityClass = getClassEntityFromClassModel(modelClass);
+  let entityClass = params?.dtoClass ?? getClassEntityFromClassModel(modelClass);
   // columns
   let columns = prepareColumns(params?.columns);
   if (columns) {

package/src/lib/dto/dtoSelectAndCount.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../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';

package/src/lib/dto/dtoUpdate.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 

package/src/lib/index.ts

@@ -3,6 +3,7 @@ export * from './databaseDialect.ts';
 export * from './dto/index.ts';
 export * from './entity.ts';
 export * from './model.ts';
+export * from './bean.modelBase.ts';
 export * from './relations.ts';
 export * from './relationsDynamic.ts';
 export * from './relationsMutate.ts';

package/src/lib/modelCacheBase.ts

@@ -1,8 +1,8 @@
-import type { BeanSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
+import type { ServiceSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
 
 import { BeanBase, deepExtend } from 'vona';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from './bean.model/bean.model_cache.ts';
 import type { TypeModelCacheType } from '../types/model.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
@@ -25,7 +25,7 @@ export class ModelCacheBase extends BeanBase {
     return this.$scope.orm;
   }
 
-  public getInstance(table: keyof ITableRecord): BeanSummerCacheBase {
+  public getInstance(table: keyof ITableRecord): ServiceSummerCacheBase {
     if (this.options === false) throw new Error('cache disabled');
     const beanFullName = this._model.$beanFullName;
     const cacheName = this.getName(table);

package/src/lib/relations.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

package/src/lib/relationsDynamic.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

package/src/lib/relationsMutate.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

package/src/lib/relationsStatic.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { TypeModelsClassLikeGeneral } from '../types/relations.ts';
 import type {
   IModelRelationOptionsManyDynamic,

package/src/service/cacheEntity_.ts

@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
 
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';

package/src/service/cacheQuery_.ts

@@ -1,6 +1,6 @@
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';

package/src/service/database.ts

@@ -2,7 +2,7 @@ import { isNil } from '@cabloy/utils';
 import { appResource, BeanBase, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanDatabaseDialectBase } from '../bean/bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type {
   IDatabaseClientDialectRecord,
@@ -61,7 +61,7 @@ export class ServiceDatabase extends BeanBase {
 
   prepareClientNameSelector(
     dbInfo: IDbInfo,
-    dialect: BeanDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
+    dialect: ServiceDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
   ) {
     const dialect2 = typeof dialect === 'string' ? this.bean.database.getDialect(dialect) : dialect;
     if (!dialect2.capabilities.level) return dbInfo.clientName;

package/src/{bean/bean.databaseDialectBase.ts → service/databaseDialectBase_.ts}

@@ -3,7 +3,7 @@ import type { TableIdentity } from 'table-identity';
 
 import { isNil, safeBoolean } from '@cabloy/utils';
 import { BeanBase, Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
+import { Service } from 'vona-module-a-bean';
 
 import type { ITableColumn } from '../types/columns.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
@@ -14,9 +14,22 @@ import type {
   TypeDatabaseDialectTableColumnsFn,
 } from '../types/dialect.ts';
 
-@Bean()
+const BOOLEAN_COLUMN_TYPES = ['bit', 'bool', 'boolean'];
+const NUMBER_COLUMN_TYPES = ['int'];
+const TIMESTAMP_COLUMN_TYPE_PREFIXES = ['timestamp'];
+const FLOAT_COLUMN_TYPE_PREFIXES = ['float', 'double'];
+const INTEGER_COLUMN_TYPE_PREFIXES = [
+  'tinyint',
+  'smallint',
+  'mediumint',
+  'bigint',
+  'numeric',
+  'integer',
+];
+
+@Service()
 @Virtual()
-export class BeanDatabaseDialectBase extends BeanBase {
+export class ServiceDatabaseDialectBase extends BeanBase {
   protected _capabilities?: IDatabaseDialectCapabilities;
   protected _configBase?: Partial<ConfigDatabaseClient>;
 
@@ -75,11 +88,8 @@ export class BeanDatabaseDialectBase extends BeanBase {
   }
 
   coerceColumn(column: Knex.ColumnInfo): ITableColumn {
-    // result
     const result = { type: column.type } as ITableColumn;
-    // coerce
     result.default = this._coerceColumnValue(column.type, column.defaultValue);
-    // ok
     return result;
   }
 
@@ -111,22 +121,22 @@ export class BeanDatabaseDialectBase extends BeanBase {
     datas: any[],
   ): Promise<[TableIdentity[], Knex.QueryBuilder]> {
     if (datas.length === 0) return [[], builder];
-    if (isNil(datas[0].id)) {
-      let builderFirst: Knex.QueryBuilder | undefined = undefined;
-      const ids: TableIdentity[] = [];
-      for (const data of datas) {
-        const builder2 = builder.clone();
-        builder2.insert(data);
-        const items = await builder2;
-        ids.push(items[0]);
-        if (!builderFirst) builderFirst = builder2;
-      }
-      return [ids, builderFirst ?? builder];
-    } else {
+    if (!isNil(datas[0].id)) {
       builder.insert(datas);
       await builder;
       return [datas.map(item => item.id), builder];
     }
+
+    let builderFirst: Knex.QueryBuilder | undefined = undefined;
+    const ids: TableIdentity[] = [];
+    for (const data of datas) {
+      const builder2 = builder.clone();
+      builder2.insert(data);
+      const items = await builder2;
+      ids.push(items[0]);
+      if (!builderFirst) builderFirst = builder2;
+    }
+    return [ids, builderFirst ?? builder];
   }
 
   protected async insertAsPg(
@@ -134,41 +144,28 @@ export class BeanDatabaseDialectBase extends BeanBase {
     datas: any[],
   ): Promise<[TableIdentity[], Knex.QueryBuilder]> {
     if (datas.length === 0) return [[], builder];
-    if (isNil(datas[0].id)) {
-      builder.insert(datas).returning('id');
-      const items = await builder;
-      return [items.map(item => item.id), builder];
-    } else {
+    if (!isNil(datas[0].id)) {
       builder.insert(datas);
       await builder;
       return [datas.map(item => item.id), builder];
     }
+
+    builder.insert(datas).returning('id');
+    const items = await builder;
+    return [items.map(item => item.id), builder];
   }
 
   protected _coerceColumnValue(type: string, value) {
-    // null
     if (isNil(value)) return undefined;
-    // type
-    if (['bit', 'bool', 'boolean'].includes(type)) return safeBoolean(value);
-    if (['int'].includes(type)) return this._safeNumber(value);
-    if (this._columnTypePrefixes(type, ['timestamp']) && value === 'CURRENT_TIMESTAMP')
+    if (BOOLEAN_COLUMN_TYPES.includes(type)) return safeBoolean(value);
+    if (NUMBER_COLUMN_TYPES.includes(type)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, TIMESTAMP_COLUMN_TYPE_PREFIXES) && value === 'CURRENT_TIMESTAMP') {
       return undefined; // new Date();
-    if (this._columnTypePrefixes(type, ['float', 'double'])) return this._safeNumber(value);
-    if (
-      this._columnTypePrefixes(type, [
-        'tinyint',
-        'smallint',
-        'mediumint',
-        'bigint',
-        'numeric',
-        'integer',
-      ])
-    ) {
-      return this._safeNumber(value);
     }
+    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
     // pg: NULL::character varying
     if (value.indexOf('NULL::') === 0) return undefined;
-    // others
     return value;
   }
 

package/src/service/db_.ts

@@ -3,7 +3,7 @@ import type { FunctionAny } from 'vona';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanDatabaseDialectBase } from '../bean/bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
 import type { IDatabaseClientDialectRecord, IDbInfo } from '../types/database.ts';
 import type { ITransactionConsistencyCommitOptions } from '../types/transaction.ts';
 import type { ServiceDatabaseClient } from './databaseClient_.ts';
@@ -63,7 +63,7 @@ export class ServiceDb extends BeanBase {
     return this.client.clientConfig.client;
   }
 
-  get dialect(): BeanDatabaseDialectBase {
+  get dialect(): ServiceDatabaseDialectBase {
     return this.bean.database.getDialect(this.dialectName);
   }
 

package/src/service/relations_.ts

@@ -4,9 +4,9 @@ import { isNil } from '@cabloy/utils';
 import { BeanBase, cast, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
-import type { BeanModelCrud } from '../bean/bean.model/bean.model_crud.ts';
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
+import type { BeanModelCrud } from '../lib/bean.model/bean.model_crud.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelMethodOptions, IModelRelationIncludeWrapper } from '../types/model.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type { TypeModelClassLike } from '../types/relations.ts';

package/src/types/database.ts

@@ -1,6 +1,5 @@
 import type { FunctionAny } from 'vona';
 
-import type { BeanModel } from '../bean/bean.model.ts';
 import type { ServiceDb } from '../service/db_.ts';
 import type { ConfigDatabase } from './config.ts';
 
@@ -28,10 +27,6 @@ export interface IDatabaseSwitchOptions {
 }
 
 declare module 'vona' {
-  export interface IBeanRecordGlobal {
-    model: BeanModel;
-  }
-
   export interface VonaConfig {
     database: ConfigDatabase;
   }

package/src/types/dto/dtoGet.ts

@@ -1,4 +1,6 @@
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { Constructable } from 'vona';
+
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumns } from '../modelWhere.ts';
 import type { IModelClassRecord } from '../onion/model.ts';
@@ -19,6 +21,7 @@ export interface IBuildDtoGetParams<TRecord, Model extends BeanModelMeta>
 
 export interface IBuildDtoGetParamsBasic<TRecord> {
   columns?: TypeModelColumns<TRecord>;
+  dtoClass?: Constructable<unknown>;
 }
 
 export type TypeDtoGetResult<

package/src/types/dto/dtoMutate.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
-import type { OmitNever, TypeOmitStringUnion } from 'vona';
+import type { Constructable, OmitNever, TypeOmitStringUnion } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumnsStrict } from '../modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../onion/model.ts';
@@ -38,6 +38,7 @@ export interface IBuildDtoMutateParams<TRecord, Model extends BeanModelMeta>
 
 export interface IBuildDtoMutateParamsBasic<TRecord> {
   columns?: TypeModelColumnsStrict<TRecord>;
+  dtoClass?: Constructable<unknown>;
 }
 
 export type TypeDtoMutateResult<

package/src/types/dto/dtoSelectAndCount.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../onion/model.ts';
 import type { TypeDtoGetResult } from './dtoGet.ts';
 

package/src/types/model.ts

@@ -1,7 +1,7 @@
 import type { Knex } from 'knex';
 import type { TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   TypeModelColumn,
   TypeModelColumns,

package/src/types/modelAggr.ts

@@ -1,6 +1,6 @@
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumns, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/src/types/modelCount.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumn, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/src/types/modelGeneral.ts

@@ -1,4 +1,6 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { Constructable } from 'vona';
+
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   IModelRelationIncludeWrapper,
   IModelSelectParamsJoin,
@@ -54,6 +56,7 @@ export interface IBuildModelSelectGeneralParamsBasic<
       ? TColumn | Array<TColumn>
       : TColumn
     : TypeModelColumnsPatch<TRecord, TColumn>;
+  dtoClass?: Constructable<unknown>;
   aggrs?: Aggrs;
   groups?: Groups;
   having?: TypeModelWhere<TRecord, TypeModelSelectGroupParamsColumns<TRecord, Groups, Aggrs>>;

package/src/types/modelGroup.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin, IModelSelectParamsOrder } from './model.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { TypeModelColumnsStrict, TypeModelWhere } from './modelWhere.ts';