vona-module-a-orm 5.1.5 → 5.1.6

package/src/types/relationsDef.ts

@@ -3,10 +3,22 @@ import type { ServiceDb } from '../service/db_.ts';
 import type { IDatabaseClientRecord } from './database.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { IBuildModelSelectGeneralParamsBasic } from './modelGeneral.ts';
-import type { TypeModelColumn, TypeModelColumnsPatch, TypeModelColumnsStrict } from './modelWhere.ts';
+import type {
+  TypeModelColumn,
+  TypeModelColumnsPatch,
+  TypeModelColumnsStrict,
+} from './modelWhere.ts';
 import type { IModelClassRecord, TypeModelOptionsTable } from './onion/model.ts';
-import type { TypeModelClassLike, TypeModelOfModelLike, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
+import type {
+  TypeModelClassLike,
+  TypeModelOfModelLike,
+  TypeModelsClassLikeGeneral,
+  TypeSymbolKeyEntity,
+} from './relations.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 export type TypeModelRelationType = 'hasOne' | 'belongsTo' | 'hasMany' | 'belongsToMany';
@@ -22,11 +34,11 @@ export type TypeModelRelationType = 'hasOne' | 'belongsTo' | 'hasMany' | 'belong
 // use optional ? for app config
 export interface IModelRelationHasOne<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
-  KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined = keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
+  KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined =
+    keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
-    TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]
-  >,
+  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined =
+    TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>,
 > {
   type?: 'hasOne';
   model?: TypeModelClassLike<MODEL>;
@@ -38,9 +50,8 @@ export interface IModelRelationBelongsTo<
   MODELSelf extends BeanModelMeta | keyof IModelClassRecord,
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
-    TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]
-  >,
+  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined =
+    TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>,
 > {
   type?: 'belongsTo';
   model?: TypeModelClassLike<MODEL>;
@@ -50,44 +61,67 @@ export interface IModelRelationBelongsTo<
 
 export interface IModelRelationHasMany<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
-  KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined = keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
+  KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined =
+    keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
-    TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]
-  >,
+  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined =
+    TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
-  Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined,
-  Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined,
+  Aggrs extends
+    | TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
+  Groups extends
+    | TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
 > {
   type?: 'hasMany';
   model?: TypeModelClassLike<MODEL>;
   key?: KEY;
-  options?: IModelRelationOptionsMany<TypeModelOfModelLike<MODEL>, AUTOLOAD, COLUMNS, ModelJoins, Aggrs, Groups>;
+  options?: IModelRelationOptionsMany<
+    TypeModelOfModelLike<MODEL>,
+    AUTOLOAD,
+    COLUMNS,
+    ModelJoins,
+    Aggrs,
+    Groups
+  >;
 }
 
 export interface IModelRelationBelongsToMany<
   MODELMiddle extends BeanModelMeta | keyof IModelClassRecord,
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
-    TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]
-  >,
+  COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined =
+    TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
-  Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined,
-  Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined,
+  Aggrs extends
+    | TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
+  Groups extends
+    | TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
 > {
   type?: 'belongsToMany';
   modelMiddle?: TypeModelClassLike<MODELMiddle>;
   model?: TypeModelClassLike<MODEL>;
   keyFrom?: keyof TypeModelOfModelLike<MODELMiddle>[TypeSymbolKeyEntity];
   keyTo?: keyof TypeModelOfModelLike<MODELMiddle>[TypeSymbolKeyEntity];
-  options?: IModelRelationOptionsMany<TypeModelOfModelLike<MODEL>, AUTOLOAD, COLUMNS, ModelJoins, Aggrs, Groups>;
+  options?: IModelRelationOptionsMany<
+    TypeModelOfModelLike<MODEL>,
+    AUTOLOAD,
+    COLUMNS,
+    ModelJoins,
+    Aggrs,
+    Groups
+  >;
 }
 
 export interface IModelRelationOptionsOne<
   MODEL extends BeanModelMeta,
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<MODEL[TypeSymbolKeyEntity]>,
+  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
+    MODEL[TypeSymbolKeyEntity]
+  >,
 > extends IModelRelationOptionsMetaWrapper {
   autoload?: AUTOLOAD;
   columns?: TypeModelColumnsPatch<MODEL[TypeSymbolKeyEntity], COLUMNS>;
@@ -96,17 +130,23 @@ export interface IModelRelationOptionsOne<
 export interface IModelRelationOptionsMany<
   MODEL extends BeanModelMeta,
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<MODEL[TypeSymbolKeyEntity]>,
+  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
+    MODEL[TypeSymbolKeyEntity]
+  >,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
   Aggrs extends TypeModelSelectAggrParamsAggrs<MODEL[TypeSymbolKeyEntity]> | undefined = undefined,
   Groups extends TypeModelColumnsStrict<MODEL[TypeSymbolKeyEntity]> | undefined = undefined,
 >
-  extends IModelRelationOptionsMetaWrapper, IModelRelationOptionsMany_Raw<MODEL, AUTOLOAD, COLUMNS, ModelJoins, Aggrs, Groups> {}
+  extends
+    IModelRelationOptionsMetaWrapper,
+    IModelRelationOptionsMany_Raw<MODEL, AUTOLOAD, COLUMNS, ModelJoins, Aggrs, Groups> {}
 
 export type IModelRelationOptionsMany_Raw<
   MODEL extends BeanModelMeta,
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<MODEL[TypeSymbolKeyEntity]>,
+  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<
+    MODEL[TypeSymbolKeyEntity]
+  >,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
   Aggrs extends TypeModelSelectAggrParamsAggrs<MODEL[TypeSymbolKeyEntity]> | undefined = undefined,
   Groups extends TypeModelColumnsStrict<MODEL[TypeSymbolKeyEntity]> | undefined = undefined,
@@ -130,7 +170,15 @@ export interface IBuildModelRelationOptionsMany<
   Columns extends {} | undefined = undefined,
   Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined = undefined,
   Groups extends TypeModelColumnsStrict<TRecord> | undefined = undefined,
-> extends IBuildModelSelectGeneralParamsBasic<TRecord, COLUMNS, TableNames, ColumnNames, Columns, Aggrs, Groups> {
+> extends IBuildModelSelectGeneralParamsBasic<
+  TRecord,
+  COLUMNS,
+  TableNames,
+  ColumnNames,
+  Columns,
+  Aggrs,
+  Groups
+> {
   autoload?: AUTOLOAD;
 }
 
@@ -147,6 +195,11 @@ export interface IModelRelationOptionsMetaWrapper {
   meta?: IModelRelationOptionsMeta;
 }
 
-export type TypeModelRelationOptionsMetaClient = '_auto_' | '_initial_' | '_inherit_' | keyof IDatabaseClientRecord | ServiceDb;
+export type TypeModelRelationOptionsMetaClient =
+  | '_auto_'
+  | '_initial_'
+  | '_inherit_'
+  | keyof IDatabaseClientRecord
+  | ServiceDb;
 
 export type IRelationItem = [string, any, any, any, boolean];

package/src/types/relationsDefDynamic.ts

@@ -1,10 +1,27 @@
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
-import type { IModelRelationIncludeWrapper, IModelSelectParamsJoin, IModelSelectParamsOrder } from './model.ts';
+import type {
+  IModelRelationIncludeWrapper,
+  IModelSelectParamsJoin,
+  IModelSelectParamsOrder,
+} from './model.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
-import type { TypeModelColumn, TypeModelColumnsPatch, TypeModelColumnsStrict, TypeModelWhere } from './modelWhere.ts';
+import type {
+  TypeModelColumn,
+  TypeModelColumnsPatch,
+  TypeModelColumnsStrict,
+  TypeModelWhere,
+} from './modelWhere.ts';
 import type { IModelClassRecord } from './onion/model.ts';
-import type { TypeModelClassLike, TypeModelOfModelLike, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
+import type {
+  TypeModelClassLike,
+  TypeModelOfModelLike,
+  TypeModelsClassLikeGeneral,
+  TypeSymbolKeyEntity,
+} from './relations.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
 import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
 import type { TypeModelSelectGroupParamsColumnNames } from './relationsGroup.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
@@ -18,7 +35,8 @@ import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 export interface IModelRelationHasOneDynamic<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
-  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined,
+  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined =
+    undefined,
 > {
   type?: 'hasOne';
   model?: TypeModelClassLike<MODEL>;
@@ -29,7 +47,8 @@ export interface IModelRelationHasOneDynamic<
 export interface IModelRelationBelongsToDynamic<
   MODELSelf extends BeanModelMeta | keyof IModelClassRecord,
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
-  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined,
+  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined =
+    undefined,
 > {
   type?: 'belongsTo';
   model?: TypeModelClassLike<MODEL>;
@@ -40,7 +59,9 @@ export interface IModelRelationBelongsToDynamic<
 export interface IModelRelationHasManyDynamic<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
-  OPTIONS extends IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group> | undefined = undefined,
+  OPTIONS extends
+    | IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group>
+    | undefined = undefined,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
   Group extends boolean | undefined = undefined,
 > {
@@ -53,7 +74,9 @@ export interface IModelRelationHasManyDynamic<
 export interface IModelRelationBelongsToManyDynamic<
   MODELMiddle extends BeanModelMeta | keyof IModelClassRecord,
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
-  OPTIONS extends IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group> | undefined = undefined,
+  OPTIONS extends
+    | IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group>
+    | undefined = undefined,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
   Group extends boolean | undefined = undefined,
 > {
@@ -67,7 +90,10 @@ export interface IModelRelationBelongsToManyDynamic<
 
 export interface IModelRelationOptionsOneDynamic<MODEL extends BeanModelMeta>
   extends IModelRelationOptionsMetaWrapper, IModelRelationIncludeWrapper<MODEL> {
-  columns?: TypeModelColumnsPatch<MODEL[TypeSymbolKeyEntity], TypeModelColumn<MODEL[TypeSymbolKeyEntity]>>;
+  columns?: TypeModelColumnsPatch<
+    MODEL[TypeSymbolKeyEntity],
+    TypeModelColumn<MODEL[TypeSymbolKeyEntity]>
+  >;
 }
 
 export interface IModelRelationOptionsManyDynamic<
@@ -78,12 +104,23 @@ export interface IModelRelationOptionsManyDynamic<
   extends
     IModelRelationOptionsMetaWrapper,
     IModelRelationIncludeWrapper<MODEL>,
-    Omit<IModelRelationOptionsManyDynamic_Raw<MODEL, false, TypeModelColumn<MODEL[TypeSymbolKeyEntity]>, ModelJoins, Group>, 'autoload'> {}
+    Omit<
+      IModelRelationOptionsManyDynamic_Raw<
+        MODEL,
+        false,
+        TypeModelColumn<MODEL[TypeSymbolKeyEntity]>,
+        ModelJoins,
+        Group
+      >,
+      'autoload'
+    > {}
 
 export type IModelRelationOptionsManyDynamic_Raw<
   MODEL extends BeanModelMeta,
   AUTOLOAD extends boolean = false,
-  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> = TypeModelColumn<MODEL[TypeSymbolKeyEntity]>,
+  COLUMNS extends TypeModelColumn<MODEL[TypeSymbolKeyEntity]> = TypeModelColumn<
+    MODEL[TypeSymbolKeyEntity]
+  >,
   ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined,
   Group extends boolean | undefined = undefined,
 > = IBuildModelRelationOptionsManyDynamic<
@@ -104,7 +141,14 @@ export interface IBuildModelRelationOptionsManyDynamic<
   ColumnNames = keyof TRecord,
   Columns extends {} | undefined = undefined,
   Group extends boolean | undefined = undefined,
-> extends IBuildModelSelectGeneralParamsBasicDynamic<TRecord, COLUMNS, TableNames, ColumnNames, Columns, Group> {
+> extends IBuildModelSelectGeneralParamsBasicDynamic<
+  TRecord,
+  COLUMNS,
+  TableNames,
+  ColumnNames,
+  Columns,
+  Group
+> {
   autoload?: AUTOLOAD;
 }
 
@@ -122,7 +166,9 @@ export interface IBuildModelSelectGeneralParamsBasicDynamic<
   groups?: TypeModelColumnsStrict<TRecord>;
   where?: TypeModelWhere<TRecord, Columns>;
   joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
-  orders?: Group extends true ? IModelSelectParamsOrder<TypeModelSelectGroupParamsColumnNames<TRecord>>[] : IModelSelectParamsOrder<ColumnNames>[];
+  orders?: Group extends true
+    ? IModelSelectParamsOrder<TypeModelSelectGroupParamsColumnNames<TRecord>>[]
+    : IModelSelectParamsOrder<ColumnNames>[];
   limit?: number;
   offset?: number;
 }

package/src/types/relationsDefMutate.ts

@@ -8,4 +8,6 @@ export interface IModelRelationOptionsOneMutate<MODEL extends BeanModelMeta>
 export interface IModelRelationOptionsManyMutate<MODEL extends BeanModelMeta>
   extends IModelRelationOptionsMetaWrapper, IModelRelationIncludeWrapper<MODEL> {}
 
-export interface IModelRelationOptionsBelongsToManyMutate<_MODEL extends BeanModelMeta> extends IModelRelationOptionsMetaWrapper {}
+export interface IModelRelationOptionsBelongsToManyMutate<
+  _MODEL extends BeanModelMeta,
+> extends IModelRelationOptionsMetaWrapper {}

package/src/types/relationsGroup.ts

@@ -1,6 +1,11 @@
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { TypeModelColumnsStrict } from './modelWhere.ts';
-import type { TypeUtilGetParamsAggrs, TypeUtilGetParamsColumns, TypeUtilGetParamsGroups, TypeUtilGetRelationOptionsGroups } from './relations.ts';
+import type {
+  TypeUtilGetParamsAggrs,
+  TypeUtilGetParamsColumns,
+  TypeUtilGetParamsGroups,
+  TypeUtilGetRelationOptionsGroups,
+} from './relations.ts';
 import type {
   TypeModelAggrRelationResultAggr,
   TypeModelAggrRelationResultAggrs,
@@ -16,18 +21,24 @@ export type TypeModelGroupRelationResult<TRecord, TOptions> = TypeModelGroupRela
   TypeUtilGetParamsColumns<TOptions>
 >;
 
-export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns> = Groups extends string | string[]
+export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns> = Groups extends
+  | string
+  | string[]
   ? TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> &
       (Aggrs extends {}
         ? TypeRecordAggrsValuesToObject<
             TypeRecordAggrsValues<{
-              [K in keyof Aggrs]: K extends string ? TypeModelAggrRelationResultAggr<K, TypeUtilAggrPrepareColumns<Aggrs[K]>> : never;
+              [K in keyof Aggrs]: K extends string
+                ? TypeModelAggrRelationResultAggr<K, TypeUtilAggrPrepareColumns<Aggrs[K]>>
+                : never;
             }>
           >
         : {})
   : {}; // not use undefined
 
-export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> = Columns extends string | string[]
+export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> = Columns extends
+  | string
+  | string[]
   ? { [K in TypeUtilAggrPrepareColumns<Columns>]: K extends keyof TRecord ? TRecord[K] : never }
   : Groups extends string | string[]
     ? { [K in TypeUtilAggrPrepareColumns<Groups>]: K extends keyof TRecord ? TRecord[K] : never }
@@ -36,23 +47,34 @@ export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> =
 export type TypeModelSelectGroupParamsColumnNames<
   TRecord,
   ColumnNames extends TypeModelColumnsStrict<TRecord> | undefined = TypeModelColumnsStrict<TRecord>,
-  Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined = TypeModelSelectAggrParamsAggrs<TRecord>,
+  Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined =
+    TypeModelSelectAggrParamsAggrs<TRecord>,
 > =
-  | (ColumnNames extends TypeModelColumnsStrict<TRecord> ? TypeUtilAggrPrepareColumns<ColumnNames> : never)
-  | (Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> ? keyof TypeModelAggrRelationResultAggrs<Aggrs> : never);
+  | (ColumnNames extends TypeModelColumnsStrict<TRecord>
+      ? TypeUtilAggrPrepareColumns<ColumnNames>
+      : never)
+  | (Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord>
+      ? keyof TypeModelAggrRelationResultAggrs<Aggrs>
+      : never);
 
 export type TypeModelSelectGroupParamsColumns<
   TRecord,
   ColumnNames extends TypeModelColumnsStrict<TRecord> | undefined = TypeModelColumnsStrict<TRecord>,
-  Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined = TypeModelSelectAggrParamsAggrs<TRecord>,
+  Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined =
+    TypeModelSelectAggrParamsAggrs<TRecord>,
 > = (TypeUtilAggrPrepareColumns<ColumnNames> extends string
   ? { [K in TypeUtilAggrPrepareColumns<ColumnNames>]: K extends keyof TRecord ? TRecord[K] : never }
   : {}) &
   TypeModelAggrRelationResultAggrsToNumberType<TypeModelAggrRelationResultAggrs<Aggrs>>;
 
-export type TypeModelAggrRelationResultAggrsToNumberType<Columns> = { [K in keyof Columns]: string }; // not use BigNumber or number | string
+export type TypeModelAggrRelationResultAggrsToNumberType<Columns> = {
+  [K in keyof Columns]: string;
+}; // not use BigNumber or number | string
 
-export type TypeUtilGetGroupsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> =
+export type TypeUtilGetGroupsFromRelationAndIncludeWrapper<
+  Relation,
+  IncludeWrapper extends {} | undefined | unknown,
+> =
   TypeUtilGetParamsGroups<IncludeWrapper> extends string | string[]
     ? TypeUtilGetParamsGroups<IncludeWrapper>
     : TypeUtilGetRelationOptionsGroups<Relation>;

package/src/types/relationsMutate.ts

@@ -15,16 +15,18 @@ import type {
 } from './relations.ts';
 import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
 
-export type TypeModelMutateParamsInclude<MODEL extends BeanModelMeta | undefined> = TypeModelMutateParamsIncludeByModelOptions<
-  TypeUtilGetModelOptions<MODEL>
->;
+export type TypeModelMutateParamsInclude<MODEL extends BeanModelMeta | undefined> =
+  TypeModelMutateParamsIncludeByModelOptions<TypeUtilGetModelOptions<MODEL>>;
 
-export type TypeModelMutateParamsIncludeByModelOptions<ModelOptions extends IDecoratorModelOptions | undefined> =
-  ModelOptions extends IDecoratorModelOptions
-    ? {
-        [relationName in keyof ModelOptions['relations']]?: TypeModelMutateParamsRelationOptions<ModelOptions['relations'][relationName]>;
-      }
-    : never;
+export type TypeModelMutateParamsIncludeByModelOptions<
+  ModelOptions extends IDecoratorModelOptions | undefined,
+> = ModelOptions extends IDecoratorModelOptions
+  ? {
+      [relationName in keyof ModelOptions['relations']]?: TypeModelMutateParamsRelationOptions<
+        ModelOptions['relations'][relationName]
+      >;
+    }
+  : never;
 
 export type TypeModelMutateParamsRelationOptions<Relation> =
   | boolean
@@ -40,13 +42,28 @@ export type TypeModelMutateRelationResultMergeInclude<
 > = {
   [RelationName in keyof TModelOptions['relations']]: TInclude extends {} // not use ?: for OmitNever take effect
     ? TInclude[RelationName] extends {} | boolean
-      ? TypeModelMutateRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], TForInsertResult>
-      : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult>
-    : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult>;
+      ? TypeModelMutateRelationResultMergeIncludeWrapper<
+          TModelOptions['relations'][RelationName],
+          TInclude[RelationName],
+          TForInsertResult
+        >
+      : TypeModelMutateRelationResultMergeAutoload<
+          TModelOptions['relations'][RelationName],
+          TForInsertResult
+        >
+    : TypeModelMutateRelationResultMergeAutoload<
+        TModelOptions['relations'][RelationName],
+        TForInsertResult
+      >;
 };
 
-export type TypeModelMutateRelationResultMergeAutoload<Relation, TForInsertResult extends boolean | undefined = undefined> =
-  TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined, TForInsertResult> : never;
+export type TypeModelMutateRelationResultMergeAutoload<
+  Relation,
+  TForInsertResult extends boolean | undefined = undefined,
+> =
+  TypeUtilGetRelationOptionsAutoload<Relation> extends true
+    ? TypeUtilMutateGetRelationEntityByType<Relation, undefined, TForInsertResult>
+    : never;
 
 export type TypeModelMutateRelationResultMergeIncludeWrapper<
   Relation,
@@ -83,13 +100,22 @@ export type TypeUtilMutateGetEntityByType<
   : TYPE extends 'belongsToMany'
     ? Array<{ id: TableIdentity; deleted?: boolean }> | undefined
     : TYPE extends 'hasMany'
-      ? Array<TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper, TForInsertResult>> | undefined
+      ?
+          | 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> } : {};
+> = TWith extends {}
+  ? {
+      [RelationName in keyof TWith]: TypeModelMutateRelationResultMergeWithRelation<
+        TWith[RelationName],
+        TForInsertResult
+      >;
+    }
+  : {};
 
 export type TypeModelMutateRelationResultMergeWithRelation<
   WithRelation,
@@ -99,7 +125,11 @@ export type TypeModelMutateRelationResultMergeWithRelation<
   : WithRelation extends true
     ? never
     : WithRelation extends {}
-      ? TypeUtilMutateGetRelationEntityByType<WithRelation, TypeUtilGetRelationOptions<WithRelation>, TForInsertResult>
+      ? TypeUtilMutateGetRelationEntityByType<
+          WithRelation,
+          TypeUtilGetRelationOptions<WithRelation>,
+          TForInsertResult
+        >
       : never;
 
 export type TypeModelMutateRelationData<
@@ -111,8 +141,19 @@ export type TypeModelMutateRelationData<
   (TModel extends BeanModelMeta
     ? Partial<
         OmitNever<
-          TypeModelMutateRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, TForInsertResult>
+          TypeModelMutateRelationResultMergeInclude<
+            TypeUtilGetModelOptions<TModel>,
+            TypeUtilGetParamsInlcude<TOptionsRelation>,
+            TForInsertResult
+          >
         >
       > &
-        Partial<OmitNever<TypeModelMutateRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, TForInsertResult>>>
+        Partial<
+          OmitNever<
+            TypeModelMutateRelationResultMergeWith<
+              TypeUtilGetParamsWith<TOptionsRelation>,
+              TForInsertResult
+            >
+          >
+        >
     : {});

package/src/types/relationsTables.ts

@@ -10,23 +10,25 @@ import type {
   TypeUtilGetRelationEntityMeta,
 } from './relations.ts';
 
-export type TypeEntityTableNames<EntityMeta extends { $table: string } | undefined> = EntityMeta extends { $table: infer TableName }
-  ? TableName
-  : never;
+export type TypeEntityTableNames<EntityMeta extends { $table: string } | undefined> =
+  EntityMeta extends { $table: infer TableName } ? TableName : never;
 
-export type TypeEntityTableNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> = TModelOptions['relations'] extends {}
-  ? TypeRecordValues<{
-      [RelationName in keyof TModelOptions['relations']]: TypeEntityTableNames<
-        TypeUtilGetRelationEntityMeta<TModelOptions['relations'][RelationName]>
-      >;
-    }>
-  : never;
+export type TypeEntityTableNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> =
+  TModelOptions['relations'] extends {}
+    ? TypeRecordValues<{
+        [RelationName in keyof TModelOptions['relations']]: TypeEntityTableNames<
+          TypeUtilGetRelationEntityMeta<TModelOptions['relations'][RelationName]>
+        >;
+      }>
+    : never;
 
-export type TypeEntityTableNamesOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> = TypeEntityTableNames<
-  TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>[TypeSymbolKeyEntityMeta]
->;
+export type TypeEntityTableNamesOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> =
+  TypeEntityTableNames<
+    TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>[TypeSymbolKeyEntityMeta]
+  >;
 
-export type TypeEntityTableNamesOfModelClass<TModel extends BeanModelMeta> = TypeEntityTableNamesOfModelOptions<TypeUtilGetModelOptions<TModel>>;
+export type TypeEntityTableNamesOfModelClass<TModel extends BeanModelMeta> =
+  TypeEntityTableNamesOfModelOptions<TypeUtilGetModelOptions<TModel>>;
 
 export type TypeEntityTableNamesOfGeneral<
   TModelJoins extends TypeModelsClassLikeGeneral | undefined,

package/src/types/transaction.ts

@@ -7,9 +7,21 @@ export const TransactionIsolationLevelsMap = {
   SNAPSHOT: 'snapshot',
 };
 
-export type TypeTransactionIsolationLevels = 'DEFAULT' | 'READ_UNCOMMITTED' | 'READ_COMMITTED' | 'REPEATABLE_READ' | 'SERIALIZABLE' | 'SNAPSHOT';
+export type TypeTransactionIsolationLevels =
+  | 'DEFAULT'
+  | 'READ_UNCOMMITTED'
+  | 'READ_COMMITTED'
+  | 'REPEATABLE_READ'
+  | 'SERIALIZABLE'
+  | 'SNAPSHOT';
 
-export type TypeTransactionPropagation = 'REQUIRED' | 'SUPPORTS' | 'MANDATORY' | 'REQUIRES_NEW' | 'NOT_SUPPORTED' | 'NEVER';
+export type TypeTransactionPropagation =
+  | 'REQUIRED'
+  | 'SUPPORTS'
+  | 'MANDATORY'
+  | 'REQUIRES_NEW'
+  | 'NOT_SUPPORTED'
+  | 'NEVER';
 
 // export type TransactionPropagation=''
 export interface ITransactionOptions {