vona-module-a-orm 5.1.5 → 5.1.7

package/src/lib/dto/dtoGet.ts

@@ -2,7 +2,14 @@ import type { Constructable } from 'vona';
 
 import { ensureArray, hashkey } from '@cabloy/utils';
 import { $Class, appResource } from 'vona';
-import { addSchemaDynamic, Api, getSchemaDynamic, SymbolSchemaDynamicRefId, v } from 'vona-module-a-openapiutils';
+import {
+  addSchemaDynamic,
+  Api,
+  getSchemaDynamic,
+  schemaRenderVisible,
+  SymbolSchemaDynamicRefId,
+  v,
+} from 'vona-module-a-openapiutils';
 import z from 'zod';
 
 import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
@@ -12,21 +19,35 @@ import type { IModelRelationIncludeWrapper } from '../../types/model.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../../types/onion/model.ts';
 import type { IRelationItem } from '../../types/relationsDef.ts';
 
-import { getClassEntityFromClassModel, prepareClassModel, prepareColumns } from '../../common/utils.ts';
+import {
+  getClassEntityFromClassModel,
+  prepareClassModel,
+  prepareColumns,
+} from '../../common/utils.ts';
 import { handleRelationsCollection } from '../utils.ts';
 import { DtoAggregate } from './dtoAggregate.ts';
 import { DtoGroup } from './dtoGroup.ts';
 import { _DtoMutate_raw } from './dtoMutate.ts';
 
-export function DtoGet<ModelLike extends BeanModelMeta | keyof IModelClassRecord, T extends IDtoGetParams<ModelLike> | undefined = undefined>(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+export function DtoGet<
+  ModelLike extends BeanModelMeta | keyof IModelClassRecord,
+  T extends IDtoGetParams<ModelLike> | undefined = undefined,
+>(
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   params?: T,
 ): Constructable<TypeDtoGetResult<ModelLike, T>> {
   return _DtoGet_raw(modelLike, params);
 }
 
-function _DtoGet_raw<ModelLike extends BeanModelMeta | keyof IModelClassRecord, T extends IDtoGetParams<ModelLike> | undefined = undefined>(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+function _DtoGet_raw<
+  ModelLike extends BeanModelMeta | keyof IModelClassRecord,
+  T extends IDtoGetParams<ModelLike> | undefined = undefined,
+>(
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   params?: T,
 ): Constructable<TypeDtoGetResult<ModelLike, T>> {
   // model
@@ -74,21 +95,39 @@ function _DtoGet_relation_handle<TRecord extends {}>(
     if (type === 'belongsToMany') {
       schema = v.array(z.object({ id: v.tableIdentity()(), deleted: z.boolean().optional() }));
     } else if (type === 'hasOne') {
-      const schemaLazy = _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload, mutateTypeTopLevel, relation);
-      schema = v.lazy(v.visible(false), schemaLazy);
+      const schemaLazy = _DtoGet_relation_handle_schemaLazy(
+        modelTarget,
+        optionsReal,
+        autoload,
+        mutateTypeTopLevel,
+        relation,
+      );
+      schema = v.lazy(schemaRenderVisible(false), schemaLazy);
       // optional = true;
     } else {
       // hasMany
-      const schemaLazy = _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload, mutateTypeTopLevel, relation);
+      const schemaLazy = _DtoGet_relation_handle_schemaLazy(
+        modelTarget,
+        optionsReal,
+        autoload,
+        mutateTypeTopLevel,
+        relation,
+      );
       schema = v.array(v.lazy(schemaLazy));
     }
     Api.field(v.optional(), schema)(entityClass.prototype, relationName);
   } else {
-    const schemaLazy = _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload, mutateTypeTopLevel, relation);
+    const schemaLazy = _DtoGet_relation_handle_schemaLazy(
+      modelTarget,
+      optionsReal,
+      autoload,
+      mutateTypeTopLevel,
+      relation,
+    );
     let schema;
     let optional = false;
     if (type === 'hasOne' || type === 'belongsTo') {
-      schema = v.lazy(v.visible(false), schemaLazy);
+      schema = v.lazy(schemaRenderVisible(false), schemaLazy);
       optional = true;
     } else {
       if (optionsReal.groups) {
@@ -108,10 +147,21 @@ function _DtoGet_relation_handle<TRecord extends {}>(
   }
 }
 
-function _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload, mutateTypeTopLevel?: TypeDtoMutateType, relation?: IRelationItem) {
+function _DtoGet_relation_handle_schemaLazy(
+  modelTarget,
+  optionsReal,
+  autoload,
+  mutateTypeTopLevel?: TypeDtoMutateType,
+  relation?: IRelationItem,
+) {
   return () => {
     if (!autoload) {
-      return _DtoGet_relation_handle_schemaLazy_raw(modelTarget, optionsReal, mutateTypeTopLevel, relation);
+      return _DtoGet_relation_handle_schemaLazy_raw(
+        modelTarget,
+        optionsReal,
+        mutateTypeTopLevel,
+        relation,
+      );
     }
     // dynamic
     const entityClass = getClassEntityFromClassModel(modelTarget);
@@ -120,7 +170,12 @@ function _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload,
     const dynamicName = `${beanFullName}_${_hashkey}`;
     let entityTarget = getSchemaDynamic(dynamicName);
     if (!entityTarget) {
-      entityTarget = _DtoGet_relation_handle_schemaLazy_raw(modelTarget, optionsReal, mutateTypeTopLevel, relation);
+      entityTarget = _DtoGet_relation_handle_schemaLazy_raw(
+        modelTarget,
+        optionsReal,
+        mutateTypeTopLevel,
+        relation,
+      );
       entityTarget[SymbolSchemaDynamicRefId] = dynamicName;
       addSchemaDynamic(dynamicName, entityTarget);
     }
@@ -128,7 +183,12 @@ function _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload,
   };
 }
 
-function _DtoGet_relation_handle_schemaLazy_raw(modelTarget, optionsReal, mutateTypeTopLevel?: TypeDtoMutateType, relation?: IRelationItem) {
+function _DtoGet_relation_handle_schemaLazy_raw(
+  modelTarget,
+  optionsReal,
+  mutateTypeTopLevel?: TypeDtoMutateType,
+  relation?: IRelationItem,
+) {
   if (mutateTypeTopLevel) {
     return _DtoMutate_raw(modelTarget, optionsReal, mutateTypeTopLevel, undefined, false, relation); // columnsOmitDefault: undefined
   } else {
@@ -142,11 +202,16 @@ function _DtoGet_relation_handle_schemaLazy_raw(modelTarget, optionsReal, mutate
   }
 }
 
-function _DtoGet_relation_handle_schemaLazy_hashkey(optionsReal, mutateTypeTopLevel?: TypeDtoMutateType) {
+function _DtoGet_relation_handle_schemaLazy_hashkey(
+  optionsReal,
+  mutateTypeTopLevel?: TypeDtoMutateType,
+) {
   const columns = prepareColumns(optionsReal.columns);
   const aggrs = ensureArray(optionsReal.aggrs);
   const groups = ensureArray(optionsReal.groups);
-  return columns || aggrs || groups || mutateTypeTopLevel ? hashkey({ columns, aggrs, groups, mutate: mutateTypeTopLevel }) : 'none';
+  return columns || aggrs || groups || mutateTypeTopLevel
+    ? hashkey({ columns, aggrs, groups, mutate: mutateTypeTopLevel })
+    : 'none';
 }
 
 function _DtoGet_relations_collection<TModel extends BeanModelMeta>(

package/src/lib/dto/dtoGroup.ts

@@ -16,28 +16,44 @@ import { _DtoAggregate_inner } from './dtoAggregate.ts';
 export function DtoGroup<
   ModelLike extends BeanModelMeta | keyof IModelClassRecord,
   Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>,
-  Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]> | undefined = undefined,
-  Columns extends TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]> | undefined = undefined,
+  Aggrs extends
+    | TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
+  Columns extends
+    | TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
 >(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   groups: Groups,
   aggrs?: Aggrs,
   columns?: Columns,
-): Constructable<TypeDtoGroupResult<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], Aggrs, Groups, Columns>> {
+): Constructable<
+  TypeDtoGroupResult<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], Aggrs, Groups, Columns>
+> {
   return _DtoGroup_raw(modelLike, groups, aggrs, columns);
 }
 
 function _DtoGroup_raw<
   ModelLike extends BeanModelMeta | keyof IModelClassRecord,
   Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>,
-  Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]> | undefined = undefined,
-  Columns extends TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]> | undefined = undefined,
+  Aggrs extends
+    | TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
+  Columns extends
+    | TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
 >(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   groups: Groups,
   aggrs?: Aggrs,
   columns?: Columns,
-): Constructable<TypeDtoGroupResult<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], Aggrs, Groups, Columns>> {
+): Constructable<
+  TypeDtoGroupResult<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], Aggrs, Groups, Columns>
+> {
   abstract class TargetClass {}
   // model
   const modelClass = prepareClassModel(modelLike);

package/src/lib/dto/dtoListAndCount.ts

@@ -5,7 +5,9 @@ import z from 'zod';
 
 import type { TypeDtoListAndCountResult } from '../../types/dto/dtoListAndCount.ts';
 
-export function DtoListAndCount<T>(classRef: Constructable<T>): Constructable<TypeDtoListAndCountResult<T>> {
+export function DtoListAndCount<T>(
+  classRef: Constructable<T>,
+): Constructable<TypeDtoListAndCountResult<T>> {
   abstract class TargetClass {}
   Api.field(v.array(classRef))(TargetClass.prototype, 'list');
   Api.field(z.string())(TargetClass.prototype, 'total');

package/src/lib/dto/dtoMutate.ts

@@ -4,17 +4,30 @@ 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, TypeDtoMutateType } from '../../types/dto/dtoMutate.ts';
+import type {
+  IDtoMutateParams,
+  TypeDtoMutateResult,
+  TypeDtoMutateType,
+} from '../../types/dto/dtoMutate.ts';
 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 { getClassEntityFromClassModel, prepareClassModel, prepareColumns } from '../../common/utils.ts';
+import {
+  getClassEntityFromClassModel,
+  prepareClassModel,
+  prepareColumns,
+} from '../../common/utils.ts';
 import { _DtoGet_relations } from './dtoGet.ts';
 
-export function DtoMutate<ModelLike extends BeanModelMeta | keyof IModelClassRecord, T extends IDtoMutateParams<ModelLike> | undefined = undefined>(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+export function DtoMutate<
+  ModelLike extends BeanModelMeta | keyof IModelClassRecord,
+  T extends IDtoMutateParams<ModelLike> | undefined = undefined,
+>(
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   params?: T,
 ): Constructable<TypeDtoMutateResult<ModelLike, T, 'mutate', undefined, true>> {
   return _DtoMutate_raw(modelLike, params, 'mutate', undefined, true, undefined);
@@ -23,9 +36,13 @@ export function DtoMutate<ModelLike extends BeanModelMeta | keyof IModelClassRec
 export function _DtoMutate_raw<
   ModelLike extends BeanModelMeta | keyof IModelClassRecord,
   T extends IDtoMutateParams<ModelLike> | undefined = undefined,
-  ColumnsOmitDefault extends TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]> | undefined = undefined,
+  ColumnsOmitDefault extends
+    | TypeModelColumnsStrict<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity]>
+    | undefined = undefined,
 >(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   params?: T,
   mutateTypeTopLevel?: TypeDtoMutateType,
   columnsOmitDefault?: ColumnsOmitDefault,
@@ -63,7 +80,9 @@ export function _DtoMutate_raw<
   } else {
     const columns =
       columnsOmitDefault ??
-      (mutateTypeTopLevel === 'create' ? ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'] : ['iid', 'createdAt', 'updatedAt']);
+      (mutateTypeTopLevel === 'create'
+        ? ['id', 'iid', 'deleted', 'createdAt', 'updatedAt']
+        : ['iid', 'createdAt', 'updatedAt']);
     entityClass = $Class.omit(entityClass, prepareColumns(columns as any) as any);
   }
   if (!topLevel && mutateTypeTopLevel !== 'create') {

package/src/lib/dto/dtoQueryPage.ts

@@ -4,6 +4,9 @@ import { $Class } from 'vona';
 
 import { DtoQueryPageBase } from '../../types/dto/dtoQueryPageBase.ts';
 
-export function DtoQueryPage<T, KEYS extends Array<keyof T>>(classRef: Constructable<T>, keys: KEYS) {
+export function DtoQueryPage<T, KEYS extends Array<keyof T>>(
+  classRef: Constructable<T>,
+  keys: KEYS,
+) {
   return $Class.mixin(DtoQueryPageBase, $Class.partial($Class.pick(classRef, keys)));
 }

package/src/lib/dto/dtoSelectAndCount.ts

@@ -12,7 +12,9 @@ export function DtoSelectAndCount<
   ModelLike extends BeanModelMeta | keyof IModelClassRecord,
   T extends IDtoGetParams<ModelLike> | undefined = undefined,
 >(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   params?: T,
 ): Constructable<TypeDtoSelectAndCountResult<ModelLike, T>> {
   const DtoGetResult = DtoGet(modelLike, params);

package/src/lib/dto/dtoUpdate.ts

@@ -6,11 +6,31 @@ import type { IModelClassRecord } from '../../types/onion/model.ts';
 
 import { _DtoMutate_raw } from './dtoMutate.ts';
 
-export function DtoUpdate<ModelLike extends BeanModelMeta | keyof IModelClassRecord, T extends IDtoMutateParams<ModelLike> | undefined = undefined>(
-  modelLike: ModelLike extends BeanModelMeta ? (() => Constructable<ModelLike>) | Constructable<ModelLike> : ModelLike,
+export function DtoUpdate<
+  ModelLike extends BeanModelMeta | keyof IModelClassRecord,
+  T extends IDtoMutateParams<ModelLike> | undefined = undefined,
+>(
+  modelLike: ModelLike extends BeanModelMeta
+    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
+    : ModelLike,
   params?: T,
-): Constructable<TypeDtoMutateResult<ModelLike, T, 'update', 'id' | 'iid' | 'deleted' | 'createdAt' | 'updatedAt', true>> {
-  return _DtoMutate_raw(modelLike, params, 'update', ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'] as any, true, undefined);
+): Constructable<
+  TypeDtoMutateResult<
+    ModelLike,
+    T,
+    'update',
+    'id' | 'iid' | 'deleted' | 'createdAt' | 'updatedAt',
+    true
+  >
+> {
+  return _DtoMutate_raw(
+    modelLike,
+    params,
+    'update',
+    ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'] as any,
+    true,
+    undefined,
+  );
 }
 
 // not use Partial/$Class.partial, for form render at frontend

package/src/lib/entity.ts

@@ -1,13 +1,19 @@
 import { createBeanDecorator } from 'vona';
-import { mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
+import { mergeDtoFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
 
 import type { IDecoratorEntityOptions } from '../types/onion/entity.ts';
 
 // const __tableNames = new Set();
 
 export function Entity<T extends IDecoratorEntityOptions<any>>(options?: T): ClassDecorator;
-export function Entity<T extends IDecoratorEntityOptions<any>>(table?: string, options?: Omit<T, 'table'>): ClassDecorator;
-export function Entity<T extends IDecoratorEntityOptions<any>>(table?: T | string, options?: T): ClassDecorator {
+export function Entity<T extends IDecoratorEntityOptions<any>>(
+  table?: string,
+  options?: Omit<T, 'table'>,
+): ClassDecorator;
+export function Entity<T extends IDecoratorEntityOptions<any>>(
+  table?: T | string,
+  options?: T,
+): ClassDecorator {
   if (typeof table === 'string') {
     options = Object.assign({}, options, { table });
   } else {
@@ -20,6 +26,6 @@ export function Entity<T extends IDecoratorEntityOptions<any>>(table?: T | strin
   // }
   // __tableNames.add(tableName);
   return createBeanDecorator('entity', options, false, target => {
-    mergeFieldsOpenapiMetadata(target);
+    mergeDtoFieldsOpenapiMetadata(target);
   });
 }

package/src/lib/modelCacheBase.ts

@@ -32,13 +32,18 @@ export class ModelCacheBase extends BeanBase {
     const cacheModelCacheInstances = getCacheModelCacheInstances(this.app);
     if (!cacheModelCacheInstances[beanFullName]) cacheModelCacheInstances[beanFullName] = {};
     if (!cacheModelCacheInstances[beanFullName][cacheName]) {
-      cacheModelCacheInstances[beanFullName][cacheName] = this.app.bean.summer.cache<any, any>(cacheName, this.options);
+      cacheModelCacheInstances[beanFullName][cacheName] = this.app.bean.summer.cache<any, any>(
+        cacheName,
+        this.options,
+      );
     }
     return cacheModelCacheInstances[beanFullName][cacheName];
   }
 
   public getName(table: keyof ITableRecord) {
-    const clientNameReal = this.$scope.orm.service.database.prepareClientNameReal(this._model.db.clientName);
+    const clientNameReal = this.$scope.orm.service.database.prepareClientNameReal(
+      this._model.db.clientName,
+    );
     return `${this._model.$beanFullName}:${clientNameReal}:${table}:${this._cacheType}`;
   }
 
@@ -67,7 +72,8 @@ export class ModelCacheBase extends BeanBase {
   private _getCacheOptionsInner() {
     if (this._model.options.cache?.[this._cacheType] === false) return false;
     // options
-    let _cacheOptions = (this._model.options.cache?.[this._cacheType] ?? {}) as IDecoratorSummerCacheOptions;
+    let _cacheOptions = (this._model.options.cache?.[this._cacheType] ??
+      {}) as IDecoratorSummerCacheOptions;
     // preset
     let configPreset;
     let preset = _cacheOptions.preset;

package/src/lib/relations.ts

@@ -1,9 +1,20 @@
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
-import type { TypeModelClassLike, TypeModelOfModelLike, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from '../types/relations.ts';
-import type { IModelRelationOptionsManyStatic, IModelRelationOptionsOneStatic } from './relationsStatic.ts';
+import type {
+  TypeModelClassLike,
+  TypeModelOfModelLike,
+  TypeModelsClassLikeGeneral,
+  TypeSymbolKeyEntity,
+} from '../types/relations.ts';
+import type {
+  IModelRelationOptionsManyStatic,
+  IModelRelationOptionsOneStatic,
+} from './relationsStatic.ts';
 
-function hasOne<MODEL extends BeanModelMeta | keyof IModelClassRecord, OPTIONS extends IModelRelationOptionsOneStatic<TypeModelOfModelLike<MODEL>>>(
+function hasOne<
+  MODEL extends BeanModelMeta | keyof IModelClassRecord,
+  OPTIONS extends IModelRelationOptionsOneStatic<TypeModelOfModelLike<MODEL>>,
+>(
   classModel: TypeModelClassLike<MODEL>,
   key: keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
   options?: OPTIONS,
@@ -58,7 +69,14 @@ function belongsToMany<
   _group?: Group,
 ): any {
   // : IModelRelationBelongsToMany<MODELMiddle, MODEL, AUTOLOAD, COLUMNS, ModelJoins> {
-  return { type: 'belongsToMany', modelMiddle: classModelMiddle, model: classModel, keyFrom, keyTo, options };
+  return {
+    type: 'belongsToMany',
+    modelMiddle: classModelMiddle,
+    model: classModel,
+    keyFrom,
+    keyTo,
+    options,
+  };
 }
 
 export const $relation = {

package/src/lib/relationsDynamic.ts

@@ -1,6 +1,11 @@
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
-import type { TypeModelClassLike, TypeModelOfModelLike, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from '../types/relations.ts';
+import type {
+  TypeModelClassLike,
+  TypeModelOfModelLike,
+  TypeModelsClassLikeGeneral,
+  TypeSymbolKeyEntity,
+} from '../types/relations.ts';
 import type {
   IModelRelationBelongsToDynamic,
   IModelRelationBelongsToManyDynamic,
@@ -13,15 +18,21 @@ import type {
 function hasOne<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
-  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined,
->(classModel: TypeModelClassLike<MODEL>, key: KEY, options?: OPTIONS): IModelRelationHasOneDynamic<MODEL, KEY, OPTIONS> {
+  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined =
+    undefined,
+>(
+  classModel: TypeModelClassLike<MODEL>,
+  key: KEY,
+  options?: OPTIONS,
+): IModelRelationHasOneDynamic<MODEL, KEY, OPTIONS> {
   return { type: 'hasOne', model: classModel, key, options };
 }
 
 function belongsTo<
   MODELSelf extends BeanModelMeta | keyof IModelClassRecord,
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
-  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined,
+  OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined =
+    undefined,
 >(
   _classModelSelf: TypeModelClassLike<MODELSelf>,
   classModel: TypeModelClassLike<MODEL>,
@@ -35,7 +46,9 @@ function hasMany<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
   // not use `| undefined = undefined` or `= {}`
-  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,
 >(
@@ -52,7 +65,9 @@ function belongsToMany<
   MODELMiddle extends BeanModelMeta | keyof IModelClassRecord,
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   // not use `| undefined = undefined` or `= {}`
-  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,
 >(
@@ -64,7 +79,14 @@ function belongsToMany<
   _modelJoins?: ModelJoins,
   _group?: Group,
 ): IModelRelationBelongsToManyDynamic<MODELMiddle, MODEL, OPTIONS, ModelJoins, Group> {
-  return { type: 'belongsToMany', modelMiddle: classModelMiddle, model: classModel, keyFrom, keyTo, options };
+  return {
+    type: 'belongsToMany',
+    modelMiddle: classModelMiddle,
+    model: classModel,
+    keyFrom,
+    keyTo,
+    options,
+  };
 }
 
 export const $relationDynamic = {

package/src/lib/relationsMutate.ts

@@ -1,7 +1,15 @@
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
-import type { TypeModelClassLike, TypeModelOfModelLike, TypeSymbolKeyEntity } from '../types/relations.ts';
-import type { IModelRelationBelongsToManyDynamic, IModelRelationHasManyDynamic, IModelRelationHasOneDynamic } from '../types/relationsDefDynamic.ts';
+import type {
+  TypeModelClassLike,
+  TypeModelOfModelLike,
+  TypeSymbolKeyEntity,
+} from '../types/relations.ts';
+import type {
+  IModelRelationBelongsToManyDynamic,
+  IModelRelationHasManyDynamic,
+  IModelRelationHasOneDynamic,
+} from '../types/relationsDefDynamic.ts';
 import type {
   IModelRelationOptionsBelongsToManyMutate,
   IModelRelationOptionsManyMutate,
@@ -12,7 +20,11 @@ function hasOne<
   MODEL extends BeanModelMeta | keyof IModelClassRecord,
   KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
   OPTIONS extends IModelRelationOptionsOneMutate<TypeModelOfModelLike<MODEL>>,
->(classModel: TypeModelClassLike<MODEL>, key: KEY, options?: OPTIONS): IModelRelationHasOneDynamic<MODEL, KEY, OPTIONS> {
+>(
+  classModel: TypeModelClassLike<MODEL>,
+  key: KEY,
+  options?: OPTIONS,
+): IModelRelationHasOneDynamic<MODEL, KEY, OPTIONS> {
   return { type: 'hasOne', model: classModel, key, options };
 }
 
@@ -34,7 +46,11 @@ function hasMany<
   KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity],
   // not use `| undefined = undefined` or `= {}`
   OPTIONS extends IModelRelationOptionsManyMutate<TypeModelOfModelLike<MODEL>>,
->(classModel: TypeModelClassLike<MODEL>, key: KEY, options?: OPTIONS): IModelRelationHasManyDynamic<MODEL, KEY, OPTIONS> {
+>(
+  classModel: TypeModelClassLike<MODEL>,
+  key: KEY,
+  options?: OPTIONS,
+): IModelRelationHasManyDynamic<MODEL, KEY, OPTIONS> {
   return { type: 'hasMany', model: classModel, key, options };
 }
 
@@ -49,7 +65,14 @@ function belongsToMany<
   keyTo: keyof TypeModelOfModelLike<MODELMiddle>[TypeSymbolKeyEntity],
   options?: OPTIONS,
 ): IModelRelationBelongsToManyDynamic<MODELMiddle, MODEL, OPTIONS> {
-  return { type: 'belongsToMany', modelMiddle: classModelMiddle, model: classModel, keyFrom, keyTo, options };
+  return {
+    type: 'belongsToMany',
+    modelMiddle: classModelMiddle,
+    model: classModel,
+    keyFrom,
+    keyTo,
+    options,
+  };
 }
 
 export const $relationMutate = {

package/src/lib/relationsStatic.ts

@@ -1,6 +1,9 @@
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeModelsClassLikeGeneral } from '../types/relations.ts';
-import type { IModelRelationOptionsManyDynamic, IModelRelationOptionsOneDynamic } from '../types/relationsDefDynamic.ts';
+import type {
+  IModelRelationOptionsManyDynamic,
+  IModelRelationOptionsOneDynamic,
+} from '../types/relationsDefDynamic.ts';
 
 export interface IModelRelationOptionsManyStatic<
   MODEL extends BeanModelMeta,

package/src/lib/utils.ts

@@ -3,7 +3,10 @@ import { deepExtend } from 'vona';
 import type { IModelRelationIncludeWrapper } from '../types/model.ts';
 import type { IRelationItem } from '../types/relationsDef.ts';
 
-export function handleRelationsCollection(relationsStatic?: Record<string, any>, includeWrapper?: IModelRelationIncludeWrapper): IRelationItem[] {
+export function handleRelationsCollection(
+  relationsStatic?: Record<string, any>,
+  includeWrapper?: IModelRelationIncludeWrapper,
+): IRelationItem[] {
   // collect
   const relations: IRelationItem[] = [];
   // include
@@ -38,7 +41,13 @@ export function handleRelationsCollection(relationsStatic?: Record<string, any>,
     for (const key in includeWrapper.with) {
       const relationReal: any = includeWrapper.with[key];
       if (!relationReal) continue;
-      relations.push([key, relationReal, relationReal.options?.include, relationReal.options?.with, false]);
+      relations.push([
+        key,
+        relationReal,
+        relationReal.options?.include,
+        relationReal.options?.with,
+        false,
+      ]);
     }
   }
   return relations;

package/src/main.ts

@@ -12,7 +12,13 @@ const SymbolTransactionConsistency = Symbol('SymbolTransactionConsistency');
 export class Main extends BeanSimple implements IModuleMain {
   async moduleLoading() {
     // config
-    const _configDefault = await combineConfigDefault<ConfigDatabase>(this.app, configDefault, configDev, configProd, configTest);
+    const _configDefault = await combineConfigDefault<ConfigDatabase>(
+      this.app,
+      configDefault,
+      configDev,
+      configProd,
+      configTest,
+    );
     this.app.config.database = deepExtend({}, _configDefault, this.app.config.database);
   }
 
@@ -31,7 +37,9 @@ export class Main extends BeanSimple implements IModuleMain {
       enumerable: false,
       get(this: VonaContext) {
         if (!this[SymbolTransactionConsistency]) {
-          this[SymbolTransactionConsistency] = this.app.bean._newBean(ServiceTransactionConsistency‌);
+          this[SymbolTransactionConsistency] = this.app.bean._newBean(
+            ServiceTransactionConsistency‌,
+          );
         }
         return this[SymbolTransactionConsistency];
       },