vona-module-a-orm 5.0.65 → 5.0.67

package/cli/model/metadata/generate.ts

@@ -40,7 +40,7 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
       deleteBulk<T extends IModelDeleteOptions<${entityName},${className}>>(ids: TableIdentity[], options?: T): Promise<void>;
       mutate<T extends IModelMutateOptions<${entityName},${className}>>(data?: TypeModelMutateRelationData<${entityName},${className}, T>, options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T>>;
       mutateBulk<T extends IModelMutateOptions<${entityName},${className}>>(items: TypeModelMutateRelationData<${entityName},${className}, T>[], options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T>[]>;
-      count<T extends IModelSelectCountParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<BigNumber | undefined>;
+      count<T extends IModelSelectCountParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
       aggregate<T extends IModelSelectAggrParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
       group<T extends IModelSelectGroupParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<${entityName}, T>[]>;
       ${magics.join('\n')}

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

@@ -1,7 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { ServiceDb } from '../../service/db_.ts';
 import type { IDatabaseClientRecord, IModelDeleteOptions, IModelGetOptions, IModelInsertOptions, IModelMethodOptions, IModelMethodOptionsGeneral, IModelMutateOptions, IModelRecord, IModelSelectAggrParams, IModelSelectCountParams, IModelSelectGroupParams, IModelSelectParams, IModelUpdateOptions, ITableRecord, 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';
@@ -21,7 +20,7 @@ export declare class BeanModelCache<TRecord extends {} = {}> extends BeanModelCr
     __mutateBulk_raw(table: keyof ITableRecord | undefined, items: Partial<TRecord>[], options?: IModelMutateOptions<TRecord>): Promise<TRecord[]>;
     mget<T extends IModelGetOptions<TRecord>>(ids: TableIdentity[], options?: T): Promise<Partial<TRecord>[]>;
     private __mget_raw;
-    count<T extends IModelSelectCountParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, _modelJoins?: ModelJoins): Promise<BigNumber | undefined>;
+    count<T extends IModelSelectCountParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, _modelJoins?: ModelJoins): Promise<string | undefined>;
     aggregate<T extends IModelSelectAggrParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, _modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
     private __aggregate_raw;
     group<T extends IModelSelectGroupParams<TRecord>, ModelJoins extends TypeModelsClassLikeGeneral | undefined>(params?: T, options?: IModelMethodOptions, _modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<TRecord, T>[]>;

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

@@ -1,4 +1,3 @@
-import type BigNumber from 'bignumber.js';
 import type { TableIdentity } from 'table-identity';
 import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectParams, IModelUpdateOptionsGeneral, TypeModelWhere } from '../../types/index.ts';
 import { BeanModelCrudInner } from './bean.model_crud_inner.ts';
@@ -6,7 +5,7 @@ export declare class BeanModelCrud<TRecord extends {} = {}> extends BeanModelCru
     mget(ids: TableIdentity[], options?: IModelGetOptionsGeneral<TRecord>): Promise<Partial<TRecord>[]>;
     select(params?: IModelSelectParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<Partial<TRecord>[]>;
     get(where: TypeModelWhere<TRecord>, options?: IModelGetOptionsGeneral<TRecord>): Promise<Partial<TRecord> | undefined>;
-    count(params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<BigNumber | undefined>;
+    count(params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<string | undefined>;
     insert(data?: Partial<TRecord>, options?: IModelMethodOptionsGeneral): Promise<TRecord>;
     insertBulk(data: Partial<TRecord>[], options?: IModelMethodOptionsGeneral): Promise<TRecord[]>;
     update(data: Partial<TRecord>, options?: IModelUpdateOptionsGeneral<TRecord>): Promise<Partial<TRecord>>;

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

@@ -1,4 +1,3 @@
-import type BigNumber from 'bignumber.js';
 import type { Knex } from 'knex';
 import type { TableIdentity } from 'table-identity';
 import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectGeneralParams, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
@@ -9,7 +8,7 @@ export declare class BeanModelCrudInner<TRecord extends {}> extends BeanModelVie
     protected _select<T extends IModelSelectParams<TRecord>>(table?: keyof ITableRecord, params?: T, options?: IModelMethodOptionsGeneral, builder?: Knex.QueryBuilder<TRecord, TRecord[]>): Promise<TRecord[]>;
     protected _select_buildParams<T extends IModelSelectGeneralParams<TRecord>>(table: keyof ITableRecord, params?: T, options?: IModelMethodOptionsGeneral): Knex.QueryBuilder<TRecord, TRecord[]>;
     protected _get(table: keyof ITableRecord | undefined, where: TypeModelWhere<TRecord>, options?: IModelGetOptionsGeneral<TRecord>): Promise<TRecord | undefined>;
-    protected _count(table?: keyof ITableRecord, params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<BigNumber | undefined>;
+    protected _count(table?: keyof ITableRecord, params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<string | undefined>;
     protected _insertBulk(table?: keyof ITableRecord, data?: Partial<TRecord> | Partial<TRecord>[], options?: IModelMethodOptionsGeneral): Promise<TRecord | TRecord[]>;
     protected _update(table: keyof ITableRecord | undefined, data: Partial<TRecord>, options?: IModelUpdateOptionsGeneral<TRecord>): Promise<Partial<TRecord>>;
     protected _delete(table?: keyof ITableRecord, where?: TypeModelWhere<TRecord>, options?: IModelMethodOptionsGeneral): Promise<void>;

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

@@ -1,4 +1,3 @@
-import type BigNumber from 'bignumber.js';
 import type { TableIdentity } from 'table-identity';
 import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
 import { BeanModelCrudInner } from './bean.model_crud_inner.ts';
@@ -6,7 +5,7 @@ export declare class BeanModelCrudTable<TRecord extends {}> extends BeanModelCru
     mget(table: keyof ITableRecord, ids: TableIdentity[], options?: Omit<IModelGetOptionsGeneral<TRecord>, 'include' | 'with'>): Promise<TRecord[]>;
     select(table: keyof ITableRecord, params?: Omit<IModelSelectParams<TRecord>, 'include' | 'with'>, options?: IModelMethodOptionsGeneral): Promise<TRecord[]>;
     get(table: keyof ITableRecord, where: TypeModelWhere<TRecord>, options?: Omit<IModelGetOptionsGeneral<TRecord>, 'include' | 'with'>): Promise<TRecord | undefined>;
-    count(table: keyof ITableRecord, params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<BigNumber | undefined>;
+    count(table: keyof ITableRecord, params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<string | undefined>;
     insert(table: keyof ITableRecord, data?: Partial<TRecord>, options?: IModelMethodOptionsGeneral): Promise<TRecord>;
     insertBulk(table: keyof ITableRecord, data: Partial<TRecord>[], options?: IModelMethodOptionsGeneral): Promise<TRecord[]>;
     update(table: keyof ITableRecord, data: Partial<TRecord>, options?: IModelUpdateOptionsGeneral<TRecord>): Promise<Partial<TRecord>>;

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

@@ -29,9 +29,8 @@ export declare class BeanModelUtils<TRecord extends {}> extends BeanModelMeta<TR
     prepareHaving(builder: Knex.QueryBuilder, having?: TypeModelWhere<TRecord, TypeModelSelectGroupParamsColumns<TRecord>>): void;
     buildHaving(builder: Knex.QueryBuilder, having: TypeModelWhere<TRecord, TypeModelSelectGroupParamsColumns<TRecord>>): void;
     prepareWhere(builder: Knex.QueryBuilder, table?: keyof ITableRecord, where?: TypeModelWhere<TRecord>, options?: IModelMethodOptionsGeneral): void;
-    convertItemsToBigNumber(items: {}[]): {}[];
-    extractCount(result: Array<object> | object, columnName?: string): BigNumber;
-    extractFirstNumber<T = number | BigNumber | undefined>(result: Array<object> | object, defaultValue?: T, columnName?: string): T extends undefined ? BigNumber | undefined : BigNumber;
+    extractCount(result: Array<object> | object, columnName?: string): string;
+    extractFirstNumber<T = number | string | undefined>(result: Array<object> | object, defaultValue?: T, columnName?: string): T extends undefined ? string | undefined : string;
     extractFirstValue(result: Array<object> | object, defaultValue?: any, columnName?: string): any | undefined;
     private _extractFirstValue;
     protected _prepareWhereByOptions(table: keyof ITableRecord, where: any, options?: IModelMethodOptionsGeneral): any;

package/dist/common/buildWhere.d.ts

@@ -1,4 +1,3 @@
 import type { Knex } from 'knex';
 import type { TypeModelWhere } from '../types/modelWhere.ts';
 export declare function buildWhere<TRecord>(knex: Knex, builder: Knex.QueryBuilder, wheres: TypeModelWhere<TRecord>, having?: boolean): void;
-export declare function isAggrColumn(column: string): boolean;

package/dist/index.js

@@ -1,4 +1,4 @@
-import BigNumber$1, { BigNumber } from 'bignumber.js';
+import BigNumber from 'bignumber.js';
 import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, appResource, Virtual, beanFullNameFromOnionName, cast, 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';
@@ -1115,11 +1115,6 @@ function _checkHavingColumn(knex, column) {
   if (aggr === 'count' && name === 'all') name = '*';
   return knex.raw(`${_safeOp(aggr)}(${_safeColumn(name)})`);
 }
-function isAggrColumn(column) {
-  const [aggr, name] = cast(column).split('_');
-  if (!OpAggrs.includes(aggr) || !name) return false;
-  return true;
-}
 function _checkOpJoint(op) {
   for (const item of OpJointValues) {
     if (op.startsWith(item)) {
@@ -1691,25 +1686,13 @@ class BeanModelUtils extends BeanModelMeta {
     // build
     this.buildWhere(builder, where);
   }
-  convertItemsToBigNumber(items) {
-    for (const item of items) {
-      for (const key in item) {
-        if (isAggrColumn(key)) {
-          if (!isNil(item[key])) {
-            item[key] = BigNumber(item[key]);
-          }
-        }
-      }
-    }
-    return items;
-  }
   extractCount(result, columnName) {
     return this.extractFirstNumber(result, 0, columnName);
   }
   extractFirstNumber(result, defaultValue, columnName) {
     const value = this.extractFirstValue(result, defaultValue, columnName);
     if (value === undefined || value === null) return undefined;
-    return BigNumber(value);
+    return String(value);
   }
   extractFirstValue(result, defaultValue, columnName) {
     const value = this._extractFirstValue(result, columnName);
@@ -3047,7 +3030,7 @@ class BeanModelCache extends BeanModelCrud {
     table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     const items = await this.__select_cache(table, params, options);
-    return this.convertItemsToBigNumber(items);
+    return items;
   }
   async group(params, options, _modelJoins) {
     return await this.__group_raw(undefined, params, options);
@@ -3057,7 +3040,7 @@ class BeanModelCache extends BeanModelCrud {
     table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     const items = await this.__select_cache(table, params, options);
-    return this.convertItemsToBigNumber(items);
+    return items;
   }
   async selectAndCount(params, options, modelJoins) {
     // pageNo/pageSize
@@ -3072,16 +3055,16 @@ class BeanModelCache extends BeanModelCrud {
       offset: undefined
     });
     let count = await this.count(paramsCount, options, modelJoins);
-    if (!count) count = BigNumber$1(0);
+    if (!count) count = '0';
     // list
     let list;
-    if (count.eq(0)) {
+    if (count === '0') {
       list = [];
     } else {
       list = await this.select(params, options, modelJoins);
     }
     // pageNo/pageSize/pageCount
-    const pageCount = Math.ceil(count.div(pageSize).toNumber());
+    const pageCount = Math.ceil(BigNumber(count).div(pageSize).toNumber());
     // ok
     return {
       list,
@@ -3730,7 +3713,7 @@ function config(_app) {
       }
     },
     table: {
-      identityType: 'string'
+      identityType: 'bigint'
     },
     model: {
       disableDeleted: false,
@@ -3805,10 +3788,12 @@ function ExtendTableBuilder(app) {
     options = options || {};
     if (options.id !== false) {
       const _identityType = identityType ?? scope.config.table.identityType;
-      if (_identityType === 'string') {
+      if (_identityType === 'bigint') {
         this.bigIncrements();
       } else if (_identityType === 'number') {
         this.increments();
+      } else {
+        throw new Error('Should create column id by yourself');
       }
     }
     if (options.timestamps !== false) this.timestamps(true, true, true);
@@ -3826,10 +3811,12 @@ function ExtendTableBuilder(app) {
   });
   knex.TableBuilder.extend('tableIdentity', function (columnName) {
     const _identityType = scope.config.table.identityType;
-    if (_identityType === 'string') {
+    if (_identityType === 'bigint') {
       return this.bigInteger(columnName); // default value is null
     } else if (_identityType === 'number') {
       return this.integer(columnName); // default value is null
+    } else {
+      throw new Error(`Should create column ${columnName} by yourself`);
     }
   });
   knex.TableBuilder.extend('userId', function (columnName) {
@@ -3959,7 +3946,7 @@ function _DtoAggregate_inner(classTarget, _modelLike, aggrs) {
     if (!columns) continue;
     for (const column of columns) {
       const column2 = `${key}_${column === '*' ? 'all' : column}`;
-      Api.field(v.optional(), v.bigNumber())(classTarget.prototype, column2);
+      Api.field(v.optional(), z.string())(classTarget.prototype, column2);
     }
   }
   return classTarget;
@@ -4184,7 +4171,7 @@ 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');
+  Api.field(z.string())(TargetClass.prototype, 'total');
   Api.field(z.number())(TargetClass.prototype, 'pageCount');
   Api.field(z.number())(TargetClass.prototype, 'pageSize');
   Api.field(z.number())(TargetClass.prototype, 'pageNo');
@@ -4415,4 +4402,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, Database, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, 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, Database, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, 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, isRaw, isRef, locales, prepareClassModel, prepareColumns };

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

@@ -1,10 +1,9 @@
-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;
+    total: string;
     pageCount: number;
     pageSize: number;
     pageNo: number;

package/dist/types/relations.d.ts

@@ -1,4 +1,3 @@
-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';
@@ -100,7 +99,7 @@ export type TypeUtilEntityPartial<TRecord, TColumns> = [
 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;
+    total: string;
     pageCount: number;
     pageSize: number;
     pageNo: number;

package/dist/types/relationsAggr.d.ts

@@ -1,4 +1,3 @@
-import type BigNumber from 'bignumber.js';
 import type { TypeUtilGetParamsAggrs, TypeUtilGetRelationOptionsAggrs } from './relations.ts';
 export type TypeModelAggrRelationResult<TOptions> = TypeUtilGetParamsAggrs<TOptions> extends {} ? TypeModelAggrRelationResultAggrs<TypeUtilGetParamsAggrs<TOptions>> : {};
 export type TypeModelAggrRelationResultAggrs<Aggrs> = Aggrs extends {} ? TypeRecordAggrsValuesToObject<TypeRecordAggrsValues<{
@@ -8,7 +7,7 @@ export type TypeModelAggrRelationResultAggr<Aggr extends string, Columns extends
 export type TypeUtilAggrPrepareColumns<TColumns> = TColumns extends string[] ? TColumns[number] : TColumns extends string ? TColumns : undefined;
 export type TypeRecordAggrsValues<TRecord extends Record<string, any>> = TRecord[keyof TRecord];
 export type TypeRecordAggrsValuesToObject<AggrValues extends string> = {
-    [K in AggrValues]: BigNumber | undefined;
+    [K in AggrValues]: string | undefined;
 };
 export type TypeUtilGetAggrsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetRelationOptionsAggrs<Relation> extends {} ? TypeUtilGetParamsAggrs<IncludeWrapper> extends {} ? TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<TypeUtilGetRelationOptionsAggrs<Relation>, TypeUtilGetParamsAggrs<IncludeWrapper>> : TypeUtilGetRelationOptionsAggrs<Relation> : undefined;
 export type TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<RelationAggrs extends {}, IncludeWrapperAggrs extends {}> = {

package/dist/types/relationsGroup.d.ts

@@ -16,6 +16,6 @@ export type TypeModelSelectGroupParamsColumns<TRecord, ColumnNames extends TypeM
     [K in TypeUtilAggrPrepareColumns<ColumnNames>]: K extends keyof TRecord ? TRecord[K] : never;
 } : {}) & TypeModelAggrRelationResultAggrsToNumberType<TypeModelAggrRelationResultAggrs<Aggrs>>;
 export type TypeModelAggrRelationResultAggrsToNumberType<Columns> = {
-    [K in keyof Columns]: number | string;
+    [K in keyof Columns]: string;
 };
 export type TypeUtilGetGroupsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetParamsGroups<IncludeWrapper> extends string | string[] ? TypeUtilGetParamsGroups<IncludeWrapper> : TypeUtilGetRelationOptionsGroups<Relation>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.65",
+  "version": "5.0.67",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {
@@ -9,7 +9,6 @@
     },
     "dependencies": {},
     "globalDependencies": {
-      "bignumber.js": true,
       "knex": true,
       "table-identity": true
     },
@@ -59,9 +58,8 @@
     "static"
   ],
   "dependencies": {
-    "bignumber.js": "^9.3.1",
     "knex": "^3.1.0",
-    "table-identity": "^1.0.10"
+    "table-identity": "^1.0.11"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",