vona-module-a-orm 5.1.5 → 5.1.7

package/src/types/relations.ts

@@ -3,8 +3,14 @@ import type { Constructable, OmitNever } from 'vona';
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeDepthPrev, TypeDepthPrevMax } from './depth.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from './onion/model.ts';
-import type { TypeModelAggrRelationResultAggrs, TypeUtilGetAggrsFromRelationAndIncludeWrapper } from './relationsAggr.ts';
-import type { TypeModelGroupRelationResultGroups, TypeUtilGetGroupsFromRelationAndIncludeWrapper } from './relationsGroup.ts';
+import type {
+  TypeModelAggrRelationResultAggrs,
+  TypeUtilGetAggrsFromRelationAndIncludeWrapper,
+} from './relationsAggr.ts';
+import type {
+  TypeModelGroupRelationResultGroups,
+  TypeUtilGetGroupsFromRelationAndIncludeWrapper,
+} from './relationsGroup.ts';
 
 export const SymbolKeyEntity = Symbol('$entity');
 export const SymbolKeyEntityMeta = Symbol('$entityMeta');
@@ -30,9 +36,8 @@ export type TypeModelOfModelLike<
         ? MODEL
         : ModelLike;
 
-export type TypeModelClassLike<MODEL extends BeanModelMeta | keyof IModelClassRecord> = MODEL extends BeanModelMeta
-  ? (() => Constructable<MODEL>) | Constructable<MODEL>
-  : MODEL;
+export type TypeModelClassLike<MODEL extends BeanModelMeta | keyof IModelClassRecord> =
+  MODEL extends BeanModelMeta ? (() => Constructable<MODEL>) | Constructable<MODEL> : MODEL;
 
 export type TypeModelClassLikeGeneral<MODEL extends BeanModelMeta = BeanModelMeta> =
   | (() => Constructable<MODEL>)
@@ -45,14 +50,18 @@ export type TypeModelsClassLikeGeneral<MODEL extends BeanModelMeta = BeanModelMe
   | TypeModelClassLikeGeneral<MODEL>
   | Array<TypeModelClassLikeGeneral<MODEL>>;
 
-export type TypeModelParamsInclude<MODEL extends BeanModelMeta | undefined> = TypeModelParamsIncludeByModelOptions<TypeUtilGetModelOptions<MODEL>>;
+export type TypeModelParamsInclude<MODEL extends BeanModelMeta | undefined> =
+  TypeModelParamsIncludeByModelOptions<TypeUtilGetModelOptions<MODEL>>;
 
-export type TypeModelParamsIncludeByModelOptions<ModelOptions extends IDecoratorModelOptions | undefined> =
-  ModelOptions extends IDecoratorModelOptions
-    ? {
-        [relationName in keyof ModelOptions['relations']]?: TypeModelParamsRelationOptions<ModelOptions['relations'][relationName]>;
-      }
-    : never;
+export type TypeModelParamsIncludeByModelOptions<
+  ModelOptions extends IDecoratorModelOptions | undefined,
+> = ModelOptions extends IDecoratorModelOptions
+  ? {
+      [relationName in keyof ModelOptions['relations']]?: TypeModelParamsRelationOptions<
+        ModelOptions['relations'][relationName]
+      >;
+    }
+  : never;
 
 export type TypeModelParamsRelationOptions<Relation> =
   | boolean
@@ -61,13 +70,21 @@ export type TypeModelParamsRelationOptions<Relation> =
       with?: Record<string, unknown>;
     });
 
-export type TypeUtilGetRelationType<Relation> = Relation extends { type?: infer TYPE } ? TYPE : undefined;
-export type TypeUtilGetRelationKey<Relation> = Relation extends { key?: infer KEY } ? KEY : undefined;
+export type TypeUtilGetRelationType<Relation> = Relation extends { type?: infer TYPE }
+  ? TYPE
+  : undefined;
+export type TypeUtilGetRelationKey<Relation> = Relation extends { key?: infer KEY }
+  ? KEY
+  : undefined;
 export type TypeUtilGetRelationModel<Relation> = Relation extends {
-  model?: (() => Constructable<infer MODEL extends BeanModelMeta>) | Constructable<infer MODEL extends BeanModelMeta>;
+  model?:
+    | (() => Constructable<infer MODEL extends BeanModelMeta>)
+    | Constructable<infer MODEL extends BeanModelMeta>;
 }
   ? MODEL
-  : Relation extends { model?: (() => infer MODEL extends BeanModelMeta) | (infer MODEL extends BeanModelMeta) }
+  : Relation extends {
+        model?: (() => infer MODEL extends BeanModelMeta) | (infer MODEL extends BeanModelMeta);
+      }
     ? MODEL
     : Relation extends { model?: () => Constructable<infer MODEL extends BeanModelMeta> }
       ? MODEL
@@ -81,22 +98,46 @@ export type TypeUtilGetRelationModel<Relation> = Relation extends {
               ? IModelClassRecord[MODELNAME]
               : undefined;
 
-export type TypeUtilGetRelationModelOptions<Relation> = TypeUtilGetModelOptions<TypeUtilGetRelationModel<Relation>>;
-export type TypeUtilGetRelationEntity<Relation> = TypeUtilGetModelEntity<TypeUtilGetRelationModel<Relation>>;
-export type TypeUtilGetRelationEntityMeta<Relation> = TypeUtilGetModelEntityMeta<TypeUtilGetRelationModel<Relation>>;
-export type TypeUtilGetRelationOptions<Relation> = Relation extends { options?: infer OPTIONS } ? OPTIONS : undefined;
-export type TypeUtilGetRelationOptionsAutoload<Relation> = Relation extends { options?: { autoload?: infer AUTOLOAD } } ? AUTOLOAD : undefined;
-export type TypeUtilGetRelationOptionsColumns<Relation> = Relation extends { options?: { columns?: infer COLUMNS } } ? COLUMNS : undefined;
-export type TypeUtilGetRelationOptionsAggrs<Relation> = Relation extends { options?: { aggrs?: infer Aggrs } } ? Aggrs : undefined;
-export type TypeUtilGetRelationOptionsGroups<Relation> = Relation extends { options?: { groups?: infer Groups } } ? Groups : undefined;
-export type TypeUtilGetModelOptions<Model extends BeanModelMeta | undefined> = Model extends BeanModelMeta
-  ? Model[TypeSymbolKeyModelOptions]
+export type TypeUtilGetRelationModelOptions<Relation> = TypeUtilGetModelOptions<
+  TypeUtilGetRelationModel<Relation>
+>;
+export type TypeUtilGetRelationEntity<Relation> = TypeUtilGetModelEntity<
+  TypeUtilGetRelationModel<Relation>
+>;
+export type TypeUtilGetRelationEntityMeta<Relation> = TypeUtilGetModelEntityMeta<
+  TypeUtilGetRelationModel<Relation>
+>;
+export type TypeUtilGetRelationOptions<Relation> = Relation extends { options?: infer OPTIONS }
+  ? OPTIONS
+  : undefined;
+export type TypeUtilGetRelationOptionsAutoload<Relation> = Relation extends {
+  options?: { autoload?: infer AUTOLOAD };
+}
+  ? AUTOLOAD
   : undefined;
-export type TypeUtilGetModelEntity<Model extends BeanModelMeta | undefined> = Model extends BeanModelMeta ? Model[TypeSymbolKeyEntity] : undefined;
-export type TypeUtilGetModelEntityMeta<Model extends BeanModelMeta | undefined> = Model extends BeanModelMeta
-  ? Model[TypeSymbolKeyEntityMeta]
+export type TypeUtilGetRelationOptionsColumns<Relation> = Relation extends {
+  options?: { columns?: infer COLUMNS };
+}
+  ? COLUMNS
   : undefined;
-export type TypeUtilGetModelOnionName<Model extends BeanModelMeta | undefined> = Model extends BeanModelMeta ? Model['$onionName'] : undefined;
+export type TypeUtilGetRelationOptionsAggrs<Relation> = Relation extends {
+  options?: { aggrs?: infer Aggrs };
+}
+  ? Aggrs
+  : undefined;
+export type TypeUtilGetRelationOptionsGroups<Relation> = Relation extends {
+  options?: { groups?: infer Groups };
+}
+  ? Groups
+  : undefined;
+export type TypeUtilGetModelOptions<Model extends BeanModelMeta | undefined> =
+  Model extends BeanModelMeta ? Model[TypeSymbolKeyModelOptions] : undefined;
+export type TypeUtilGetModelEntity<Model extends BeanModelMeta | undefined> =
+  Model extends BeanModelMeta ? Model[TypeSymbolKeyEntity] : undefined;
+export type TypeUtilGetModelEntityMeta<Model extends BeanModelMeta | undefined> =
+  Model extends BeanModelMeta ? Model[TypeSymbolKeyEntityMeta] : undefined;
+export type TypeUtilGetModelOnionName<Model extends BeanModelMeta | undefined> =
+  Model extends BeanModelMeta ? Model['$onionName'] : undefined;
 
 export type TypeUtilGetRelationEntityByType<
   Relation,
@@ -130,13 +171,33 @@ export type TypeUtilGetEntityByType<
       : Array<TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns>>
   : [Depth] extends [never]
     ? undefined
-    : TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, undefined, undefined, TypeDepthPrev[Depth]> | undefined;
+    :
+        | TypeModelRelationResult<
+            TRecord,
+            TModel,
+            IncludeWrapper,
+            Columns,
+            undefined,
+            undefined,
+            TypeDepthPrev[Depth]
+          >
+        | undefined;
 
-export type TypeUtilGetParamsAggrs<TParams> = TParams extends { aggrs?: infer Aggrs } ? Aggrs : undefined;
-export type TypeUtilGetParamsGroups<TParams> = TParams extends { groups?: infer Groups } ? Groups : undefined; // not use Groups extends string |string[]
-export type TypeUtilGetParamsInlcude<TParams> = TParams extends { include?: infer INCLUDE } ? INCLUDE : undefined;
-export type TypeUtilGetParamsWith<TParams> = TParams extends { with?: infer WITH } ? WITH : undefined;
-export type TypeUtilGetParamsColumns<TParams> = TParams extends { columns?: infer COLUMNS } ? COLUMNS : undefined;
+export type TypeUtilGetParamsAggrs<TParams> = TParams extends { aggrs?: infer Aggrs }
+  ? Aggrs
+  : undefined;
+export type TypeUtilGetParamsGroups<TParams> = TParams extends { groups?: infer Groups }
+  ? Groups
+  : undefined; // not use Groups extends string |string[]
+export type TypeUtilGetParamsInlcude<TParams> = TParams extends { include?: infer INCLUDE }
+  ? INCLUDE
+  : undefined;
+export type TypeUtilGetParamsWith<TParams> = TParams extends { with?: infer WITH }
+  ? WITH
+  : undefined;
+export type TypeUtilGetParamsColumns<TParams> = TParams extends { columns?: infer COLUMNS }
+  ? COLUMNS
+  : undefined;
 export type TypeUtilPrepareColumns<TColumns> = TColumns extends '*' | ['*']
   ? undefined
   : TColumns extends string[]
@@ -144,12 +205,19 @@ export type TypeUtilPrepareColumns<TColumns> = TColumns extends '*' | ['*']
     : TColumns extends string
       ? TColumns
       : undefined;
-export type TypeUtilEntitySelector<TRecord, TColumns> = [TColumns] extends [keyof TRecord] ? Pick<TRecord, TColumns> : TRecord;
-export type TypeUtilEntityOmit<TRecord, TColumns> = [TColumns] extends [keyof TRecord] ? Omit<TRecord, TColumns> : TRecord;
+export type TypeUtilEntitySelector<TRecord, TColumns> = [TColumns] extends [keyof TRecord]
+  ? Pick<TRecord, TColumns>
+  : TRecord;
+export type TypeUtilEntityOmit<TRecord, TColumns> = [TColumns] extends [keyof TRecord]
+  ? Omit<TRecord, TColumns>
+  : TRecord;
 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> =
+export type TypeUtilGetColumnsFromRelationAndIncludeWrapper<
+  Relation,
+  IncludeWrapper extends {} | undefined | unknown,
+> =
   TypeUtilGetParamsColumns<IncludeWrapper> extends string | string[]
     ? TypeUtilGetParamsColumns<IncludeWrapper>
     : TypeUtilGetRelationOptionsColumns<Relation>;
@@ -163,7 +231,15 @@ export interface TypeModelSelectAndCount<
   Groups = undefined,
   Depth extends TypeDepthPrev[number] = TypeDepthPrevMax,
 > {
-  list: TypeModelRelationResult<TRecord, TModel, TOptionsRelation, TColumns, Aggrs, Groups, Depth>[];
+  list: TypeModelRelationResult<
+    TRecord,
+    TModel,
+    TOptionsRelation,
+    TColumns,
+    Aggrs,
+    Groups,
+    Depth
+  >[];
   total: string;
   pageCount: number;
   pageSize: number;
@@ -192,10 +268,18 @@ export type TypeModelRelationResult_Normal<
   Depth extends TypeDepthPrev[number] = TypeDepthPrevMax,
 > = TypeUtilEntitySelector<
   TRecord,
-  TypeUtilPrepareColumns<TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>>
+  TypeUtilPrepareColumns<
+    TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>
+  >
 > &
   (TModel extends BeanModelMeta
-    ? OmitNever<TypeModelRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, Depth>> &
+    ? OmitNever<
+        TypeModelRelationResultMergeInclude<
+          TypeUtilGetModelOptions<TModel>,
+          TypeUtilGetParamsInlcude<TOptionsRelation>,
+          Depth
+        >
+      > &
         OmitNever<TypeModelRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, Depth>>
     : {});
 
@@ -206,7 +290,11 @@ export type TypeModelRelationResultMergeInclude<
 > = {
   [RelationName in keyof TModelOptions['relations']]: TInclude extends {}
     ? TInclude[RelationName] extends {} | boolean
-      ? TypeModelRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], Depth>
+      ? TypeModelRelationResultMergeIncludeWrapper<
+          TModelOptions['relations'][RelationName],
+          TInclude[RelationName],
+          Depth
+        >
       : TypeModelRelationResultMergeAutoload<TModelOptions['relations'][RelationName], Depth>
     : TypeModelRelationResultMergeAutoload<TModelOptions['relations'][RelationName], Depth>;
 };
@@ -214,10 +302,22 @@ export type TypeModelRelationResultMergeInclude<
 export type TypeModelRelationResultMergeWith<
   TWith extends {} | undefined | unknown,
   Depth extends TypeDepthPrev[number] = TypeDepthPrevMax,
-> = TWith extends {} ? { [RelationName in keyof TWith]: TypeModelRelationResultMergeWithRelation<TWith[RelationName], Depth> } : {};
+> = TWith extends {}
+  ? {
+      [RelationName in keyof TWith]: TypeModelRelationResultMergeWithRelation<
+        TWith[RelationName],
+        Depth
+      >;
+    }
+  : {};
 
-export type TypeModelRelationResultMergeAutoload<Relation, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> =
-  TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilGetRelationEntityByType<Relation, undefined, Depth> : never;
+export type TypeModelRelationResultMergeAutoload<
+  Relation,
+  Depth extends TypeDepthPrev[number] = TypeDepthPrevMax,
+> =
+  TypeUtilGetRelationOptionsAutoload<Relation> extends true
+    ? TypeUtilGetRelationEntityByType<Relation, undefined, Depth>
+    : never;
 
 export type TypeModelRelationResultMergeIncludeWrapper<
   Relation,
@@ -239,5 +339,9 @@ export type TypeModelRelationResultMergeWithRelation<
   : WithRelation extends true
     ? never
     : WithRelation extends {}
-      ? TypeUtilGetRelationEntityByType<WithRelation, TypeUtilGetRelationOptions<WithRelation>, Depth>
+      ? TypeUtilGetRelationEntityByType<
+          WithRelation,
+          TypeUtilGetRelationOptions<WithRelation>,
+          Depth
+        >
       : never;

package/src/types/relationsAggr.ts

@@ -1,31 +1,55 @@
 import type { TypeUtilGetParamsAggrs, TypeUtilGetRelationOptionsAggrs } from './relations.ts';
 
 export type TypeModelAggrRelationResult<TOptions> =
-  TypeUtilGetParamsAggrs<TOptions> extends {} ? TypeModelAggrRelationResultAggrs<TypeUtilGetParamsAggrs<TOptions>> : {}; // not use undefined
+  TypeUtilGetParamsAggrs<TOptions> extends {}
+    ? TypeModelAggrRelationResultAggrs<TypeUtilGetParamsAggrs<TOptions>>
+    : {}; // not use undefined
 
 export type TypeModelAggrRelationResultAggrs<Aggrs> = 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;
       }>
     >
   : {};
 
-export type TypeModelAggrRelationResultAggr<Aggr extends string, Columns extends string | number | symbol | undefined> = Columns extends string
-  ? `${Aggr}_${Columns extends '*' ? 'all' : Columns}`
-  : never;
+export type TypeModelAggrRelationResultAggr<
+  Aggr extends string,
+  Columns extends string | number | symbol | undefined,
+> = Columns extends string ? `${Aggr}_${Columns extends '*' ? 'all' : Columns}` : never;
 
-export type TypeUtilAggrPrepareColumns<TColumns> = TColumns extends string[] ? TColumns[number] : TColumns extends string ? TColumns : undefined;
+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]: string | undefined };
+export type TypeRecordAggrsValuesToObject<AggrValues extends string> = {
+  [K in AggrValues]: string | undefined;
+};
 
-export type TypeUtilGetAggrsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> =
+export type TypeUtilGetAggrsFromRelationAndIncludeWrapper<
+  Relation,
+  IncludeWrapper extends {} | undefined | unknown,
+> =
   TypeUtilGetRelationOptionsAggrs<Relation> extends {}
     ? TypeUtilGetParamsAggrs<IncludeWrapper> extends {}
-      ? TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<TypeUtilGetRelationOptionsAggrs<Relation>, TypeUtilGetParamsAggrs<IncludeWrapper>>
+      ? TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<
+          TypeUtilGetRelationOptionsAggrs<Relation>,
+          TypeUtilGetParamsAggrs<IncludeWrapper>
+        >
       : TypeUtilGetRelationOptionsAggrs<Relation>
     : undefined;
 
-export type TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<RelationAggrs extends {}, IncludeWrapperAggrs extends {}> = {
-  [K in keyof RelationAggrs]: K extends string ? (K extends keyof IncludeWrapperAggrs ? IncludeWrapperAggrs[K] : RelationAggrs[K]) : undefined;
+export type TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<
+  RelationAggrs extends {},
+  IncludeWrapperAggrs extends {},
+> = {
+  [K in keyof RelationAggrs]: K extends string
+    ? K extends keyof IncludeWrapperAggrs
+      ? IncludeWrapperAggrs[K]
+      : RelationAggrs[K]
+    : undefined;
 };

package/src/types/relationsColumns.ts

@@ -13,96 +13,119 @@ import type {
   TypeUtilGetRelationModel,
 } from './relations.ts';
 
-export type TypeEntityTableColumnNames<EntityMeta extends { $table: string } | undefined> = EntityMeta extends { $table: string }
-  ? keyof {
-      [K in keyof EntityMeta as K extends '$table' | '$comment' | '$default'
-        ? never
-        : K extends string
-          ? `${EntityMeta['$table']}.${K}`
-          : never]: EntityMeta[K];
-    }
-  : never;
+export type TypeEntityTableColumnNames<EntityMeta extends { $table: string } | undefined> =
+  EntityMeta extends { $table: string }
+    ? keyof {
+        [K in keyof EntityMeta as K extends '$table' | '$comment' | '$default'
+          ? never
+          : K extends string
+            ? `${EntityMeta['$table']}.${K}`
+            : never]: EntityMeta[K];
+      }
+    : never;
 export type TypeEntityTableColumnNamesShort<Entity> = keyof Entity;
 
-export type TypeEntityTableColumns<Entity extends {} | undefined, EntityMeta extends { $table: string } | undefined> = Entity extends {}
+export type TypeEntityTableColumns<
+  Entity extends {} | undefined,
+  EntityMeta extends { $table: string } | undefined,
+> = Entity extends {}
   ? EntityMeta extends { $table: string }
-    ? { [K in keyof Entity as K extends string ? `${EntityMeta['$table']}.${K}` : never]: Entity[K] }
+    ? {
+        [K in keyof Entity as K extends string ? `${EntityMeta['$table']}.${K}` : never]: Entity[K];
+      }
     : {}
   : {};
 export type TypeEntityTableColumnsShort<Entity> = Entity;
 
-export type TypeEntityTableColumnsOfModelDirect<TModel extends BeanModelMeta | undefined> = TModel extends BeanModelMeta
-  ? TypeEntityTableColumns<TModel[TypeSymbolKeyEntity], TModel[TypeSymbolKeyEntityMeta]>
-  : {};
+export type TypeEntityTableColumnsOfModelDirect<TModel extends BeanModelMeta | undefined> =
+  TModel extends BeanModelMeta
+    ? TypeEntityTableColumns<TModel[TypeSymbolKeyEntity], TModel[TypeSymbolKeyEntityMeta]>
+    : {};
 
-export type TypeEntityTableColumnNamesOfModels<A extends BeanModelMeta[]> = TypeEntityTableColumnNames<A[number][TypeSymbolKeyEntityMeta]>;
+export type TypeEntityTableColumnNamesOfModels<A extends BeanModelMeta[]> =
+  TypeEntityTableColumnNames<A[number][TypeSymbolKeyEntityMeta]>;
 
 // export type TypeEntityTableColumnNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> = TypeEntityTableColumnNames<TypeRecordValues<{
 //   [RelationName in keyof TModelOptions['relations']]: TypeUtilGetRelationEntityMeta<TModelOptions['relations'][RelationName]>;
 // }>>;
-export type TypeEntityTableColumnNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> = TModelOptions['relations'] extends {}
-  ? TypeRecordValues<{
-      [RelationName in keyof TModelOptions['relations']]: TypeEntityTableColumnNames<
-        TypeUtilGetRelationEntityMeta<TModelOptions['relations'][RelationName]>
-      >;
-    }>
-  : never;
-
-export type TypeEntityTableColumnsOfModelOptions<TModelOptions extends IDecoratorModelOptions> = TModelOptions['relations'] extends {}
-  ? TypeEntityTableColumnsOfModelDirect<
-      TypeRecordModelValues<{
-        [RelationName in keyof TModelOptions['relations']]: TypeUtilGetRelationModel<TModelOptions['relations'][RelationName]>;
+export type TypeEntityTableColumnNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> =
+  TModelOptions['relations'] extends {}
+    ? TypeRecordValues<{
+        [RelationName in keyof TModelOptions['relations']]: TypeEntityTableColumnNames<
+          TypeUtilGetRelationEntityMeta<TModelOptions['relations'][RelationName]>
+        >;
       }>
-    >
-  : {};
+    : never;
+
+export type TypeEntityTableColumnsOfModelOptions<TModelOptions extends IDecoratorModelOptions> =
+  TModelOptions['relations'] extends {}
+    ? TypeEntityTableColumnsOfModelDirect<
+        TypeRecordModelValues<{
+          [RelationName in keyof TModelOptions['relations']]: TypeUtilGetRelationModel<
+            TModelOptions['relations'][RelationName]
+          >;
+        }>
+      >
+    : {};
+
+export type TypeModelsOfModelOptions<TModelOptions extends IDecoratorModelOptions> =
+  TModelOptions['relations'] extends {}
+    ? TypeRecordModelValues<{
+        [RelationName in keyof TModelOptions['relations']]: TypeUtilGetRelationModel<
+          TModelOptions['relations'][RelationName]
+        >;
+      }>
+    : never;
+
+export type TypeModelOnionNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> =
+  TModelOptions['relations'] extends {}
+    ? TypeRecordValues<{
+        [RelationName in keyof TModelOptions['relations']]: TypeUtilGetModelOnionName<
+          TypeUtilGetRelationModel<TModelOptions['relations'][RelationName]>
+        >;
+      }>
+    : undefined; // not use never
 
-export type TypeModelsOfModelOptions<TModelOptions extends IDecoratorModelOptions> = TModelOptions['relations'] extends {}
-  ? TypeRecordModelValues<{
-      [RelationName in keyof TModelOptions['relations']]: TypeUtilGetRelationModel<TModelOptions['relations'][RelationName]>;
-    }>
-  : never;
+export type TypeRecordModelValues<TRecord extends Record<string, BeanModelMeta | undefined>> =
+  TRecord[keyof TRecord];
 
-export type TypeModelOnionNamesOfModelOptions<TModelOptions extends IDecoratorModelOptions> = TModelOptions['relations'] extends {}
-  ? TypeRecordValues<{
-      [RelationName in keyof TModelOptions['relations']]: TypeUtilGetModelOnionName<
-        TypeUtilGetRelationModel<TModelOptions['relations'][RelationName]>
-      >;
-    }>
-  : undefined; // not use never
+export type TypeEntityTableColumnNamesOfModelClass<TModel extends BeanModelMeta> =
+  TypeEntityTableColumnNamesOfModelOptions<TypeUtilGetModelOptions<TModel>>;
 
-export type TypeRecordModelValues<TRecord extends Record<string, BeanModelMeta | undefined>> = TRecord[keyof TRecord];
+export type TypeEntityTableColumnsOfModelClass<TModel extends BeanModelMeta> =
+  TypeEntityTableColumnsOfModelOptions<TypeUtilGetModelOptions<TModel>>;
 
-export type TypeEntityTableColumnNamesOfModelClass<TModel extends BeanModelMeta> = TypeEntityTableColumnNamesOfModelOptions<
+export type TypeModelsOfModelClass<TModel extends BeanModelMeta> = TypeModelsOfModelOptions<
   TypeUtilGetModelOptions<TModel>
 >;
 
-export type TypeEntityTableColumnsOfModelClass<TModel extends BeanModelMeta> = TypeEntityTableColumnsOfModelOptions<TypeUtilGetModelOptions<TModel>>;
+export type TypeModelOnionNamesOfModelClass<TModel extends BeanModelMeta> =
+  TypeModelOnionNamesOfModelOptions<TypeUtilGetModelOptions<TModel>>;
 
-export type TypeModelsOfModelClass<TModel extends BeanModelMeta> = TypeModelsOfModelOptions<TypeUtilGetModelOptions<TModel>>;
+export type TypeEntityTableColumnNamesOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> =
+  TypeEntityTableColumnNames<
+    TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>[TypeSymbolKeyEntityMeta]
+  >;
 
-export type TypeModelOnionNamesOfModelClass<TModel extends BeanModelMeta> = TypeModelOnionNamesOfModelOptions<TypeUtilGetModelOptions<TModel>>;
-
-export type TypeEntityTableColumnNamesOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> = TypeEntityTableColumnNames<
-  TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>[TypeSymbolKeyEntityMeta]
->;
-
-export type TypeEntityTableColumnsOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> = TypeEntityTableColumnsOfModelDirect<
-  TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>
->;
+export type TypeEntityTableColumnsOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> =
+  TypeEntityTableColumnsOfModelDirect<TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>>;
 
 export type TypeEntityTableColumnNamesOfModelSelf<TModel extends BeanModelMeta> =
   | TypeEntityTableColumnNames<TModel[TypeSymbolKeyEntityMeta]>
   | TypeEntityTableColumnNamesShort<TModel[TypeSymbolKeyEntity]>;
 
-export type TypeEntityTableColumnsOfModelSelf<TModel extends BeanModelMeta> = TypeEntityTableColumnsOfModelDirect<TModel> &
-  TypeEntityTableColumnsShort<TModel[TypeSymbolKeyEntity]>;
+export type TypeEntityTableColumnsOfModelSelf<TModel extends BeanModelMeta> =
+  TypeEntityTableColumnsOfModelDirect<TModel> &
+    TypeEntityTableColumnsShort<TModel[TypeSymbolKeyEntity]>;
 
 export type TypeEntityTableColumnNamesOfGeneral<
   TModelJoins extends TypeModelsClassLikeGeneral | undefined,
   TModel extends BeanModelMeta | undefined,
 > = TModel extends BeanModelMeta
   ? TModelJoins extends TypeModelsClassLikeGeneral
-    ? TypeEntityTableColumnNamesOfModelJoins<TModelJoins> | TypeEntityTableColumnNamesOfModelSelf<TModel>
+    ?
+        | TypeEntityTableColumnNamesOfModelJoins<TModelJoins>
+        | TypeEntityTableColumnNamesOfModelSelf<TModel>
     : TypeEntityTableColumnNamesOfModelClass<TModel> | TypeEntityTableColumnNamesOfModelSelf<TModel>
   : undefined;