vona-module-a-orm 5.1.4 → 5.1.6

package/src/types/dto/dtoSelectAndCount.ts

@@ -2,7 +2,10 @@ 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> {
+export interface TypeDtoSelectAndCountResult<
+  ModelLike extends BeanModelMeta | keyof IModelClassRecord,
+  TOptionsRelation,
+> {
   list: TypeDtoGetResult<ModelLike, TOptionsRelation>[];
   total: string;
   pageCount: number;

package/src/types/entity.ts

@@ -12,4 +12,6 @@ export const SymbolKeyFieldsMore = Symbol('$fieldsMore');
 export type TypeSymbolKeyFieldsMore = typeof SymbolKeyFieldsMore;
 
 export type TypeEntityStudentMetaSimple<T> = Omit<T, '$table' | '$comment' | '$default'>;
-export type TypeEntityStudentMetaSimpleColumns<T> = PickString<keyof TypeEntityStudentMetaSimple<T>>;
+export type TypeEntityStudentMetaSimpleColumns<T> = PickString<
+  keyof TypeEntityStudentMetaSimple<T>
+>;

package/src/types/entityBase.ts

@@ -6,6 +6,6 @@ import { $locale } from '../.metadata/locales.ts';
 import { EntityBaseInner } from './entityBaseInner.ts';
 
 export class EntityBase extends EntityBaseInner {
-  @Api.field(v.order(1, 'core'), v.title($locale('TableIdentity')), v.tableIdentity())
+  @Api.field(v.title($locale('TableIdentity')), v.tableIdentity())
   id: TableIdentity;
 }

package/src/types/entityBaseInner.ts

@@ -4,15 +4,15 @@ import { $locale } from '../.metadata/locales.ts';
 import { EntityBaseEmpty } from './entityBaseEmpty.ts';
 
 export class EntityBaseInner extends EntityBaseEmpty {
-  @Api.field(v.title($locale('CreatedAt')), v.order(-2, 'max'), v.filterDateRange(), v.component('date'))
+  @Api.field(v.title($locale('CreatedAt')))
   createdAt: Date;
 
-  @Api.field(v.title($locale('UpdatedAt')), v.order(-1, 'max'), v.filterDateRange(), v.component('date'))
+  @Api.field(v.title($locale('UpdatedAt')))
   updatedAt: Date;
 
-  @Api.field(v.title($locale('Deleted')), v.visible(false), v.default(false))
+  @Api.field(v.title($locale('Deleted')), v.default(false))
   deleted: boolean;
 
-  @Api.field(v.title($locale('InstanceId')), v.visible(false), v.default(0))
+  @Api.field(v.title($locale('InstanceId')), v.default(0))
   iid: number;
 }

package/src/types/entityBaseSimple.ts

@@ -4,6 +4,6 @@ import { $locale } from '../.metadata/locales.ts';
 import { EntityBaseInner } from './entityBaseInner.ts';
 
 export class EntityBaseSimple extends EntityBaseInner {
-  @Api.field(v.order(1, 'core'), v.title($locale('TableIdentity')))
+  @Api.field(v.title($locale('TableIdentity')))
   id: number;
 }

package/src/types/model.ts

@@ -2,9 +2,22 @@ import type { Knex } from 'knex';
 import type { TSummerCacheActionOptions } from 'vona-module-a-summer';
 
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
-import type { TypeModelColumn, TypeModelColumns, TypeModelColumnsPatch, TypeModelWhere } from './modelWhere.ts';
-import type { TypeModelOfModelLike, TypeModelParamsInclude, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
+import type {
+  TypeModelColumn,
+  TypeModelColumns,
+  TypeModelColumnsPatch,
+  TypeModelWhere,
+} from './modelWhere.ts';
+import type {
+  TypeModelOfModelLike,
+  TypeModelParamsInclude,
+  TypeModelsClassLikeGeneral,
+  TypeSymbolKeyEntity,
+} from './relations.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
 import type { TypeModelMutateParamsInclude } from './relationsMutate.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
@@ -30,7 +43,11 @@ export type IModelSelectParamsJoin<TRecord, TableNames = undefined, ColumnNames
 // order
 export type IModelSelectParamsOrderDirection = 'asc' | 'desc';
 export type IModelSelectParamsOrderNulls = 'first' | 'last';
-export type IModelSelectParamsOrder<ColumnNames> = [ColumnNames, IModelSelectParamsOrderDirection?, IModelSelectParamsOrderNulls?];
+export type IModelSelectParamsOrder<ColumnNames> = [
+  ColumnNames,
+  IModelSelectParamsOrderDirection?,
+  IModelSelectParamsOrderNulls?,
+];
 
 export interface IBuildModelSelectParams<
   TRecord,
@@ -39,7 +56,15 @@ export interface IBuildModelSelectParams<
   ColumnNames = keyof TRecord,
   Columns extends {} | undefined = undefined,
 >
-  extends IModelRelationIncludeWrapper<Model>, IBuildModelSelectParamsBasic<TRecord, TypeModelColumn<TRecord>, TableNames, ColumnNames, Columns> {}
+  extends
+    IModelRelationIncludeWrapper<Model>,
+    IBuildModelSelectParamsBasic<
+      TRecord,
+      TypeModelColumn<TRecord>,
+      TableNames,
+      ColumnNames,
+      Columns
+    > {}
 
 export interface IBuildModelSelectParamsBasic<
   TRecord,
@@ -101,11 +126,26 @@ export type IModelCountParams<
 >;
 
 export type IModelMethodOptions = IModelMethodOptionsGeneral;
-export type IModelInsertOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelInsertOptionsGeneral<TRecord, Model>;
-export type IModelUpdateOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelUpdateOptionsGeneral<TRecord, Model>;
-export type IModelDeleteOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelDeleteOptionsGeneral<TRecord, Model>;
-export type IModelGetOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelGetOptionsGeneral<TRecord, Model>;
-export type IModelMutateOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelMutateOptionsGeneral<TRecord, Model>;
+export type IModelInsertOptions<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+> = IModelInsertOptionsGeneral<TRecord, Model>;
+export type IModelUpdateOptions<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+> = IModelUpdateOptionsGeneral<TRecord, Model>;
+export type IModelDeleteOptions<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+> = IModelDeleteOptionsGeneral<TRecord, Model>;
+export type IModelGetOptions<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+> = IModelGetOptionsGeneral<TRecord, Model>;
+export type IModelMutateOptions<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+> = IModelMutateOptionsGeneral<TRecord, Model>;
 
 export interface IModelMethodOptionsGeneral {
   disableDeleted?: boolean;
@@ -117,23 +157,38 @@ export interface IModelMethodOptionsGeneral {
   cache?: TSummerCacheActionOptions<unknown, unknown>;
 }
 
-export interface IModelInsertOptionsGeneral<_TRecord, Model extends BeanModelMeta | undefined = undefined>
+export interface IModelInsertOptionsGeneral<
+  _TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+>
   extends IModelMethodOptionsGeneral, IModelMutateRelationIncludeWrapper<Model> {}
 
-export interface IModelUpdateOptionsGeneral<TRecord, Model extends BeanModelMeta | undefined = undefined>
+export interface IModelUpdateOptionsGeneral<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+>
   extends IModelMethodOptionsGeneral, IModelMutateRelationIncludeWrapper<Model> {
   where?: TypeModelWhere<TRecord>;
 }
 
-export interface IModelDeleteOptionsGeneral<_TRecord, Model extends BeanModelMeta | undefined = undefined>
+export interface IModelDeleteOptionsGeneral<
+  _TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+>
   extends IModelMethodOptionsGeneral, IModelMutateRelationIncludeWrapper<Model> {}
 
-export interface IModelGetOptionsGeneral<TRecord, Model extends BeanModelMeta | undefined = undefined>
+export interface IModelGetOptionsGeneral<
+  TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+>
   extends IModelMethodOptionsGeneral, IModelRelationIncludeWrapper<Model> {
   columns?: TypeModelColumns<TRecord>;
 }
 
-export interface IModelMutateOptionsGeneral<_TRecord, Model extends BeanModelMeta | undefined = undefined>
+export interface IModelMutateOptionsGeneral<
+  _TRecord,
+  Model extends BeanModelMeta | undefined = undefined,
+>
   extends IModelMethodOptionsGeneral, IModelMutateRelationIncludeWrapper<Model> {}
 
 export interface IModelSelectParamsPage {
@@ -146,7 +201,9 @@ export interface IModelRelationIncludeWrapper<Model extends BeanModelMeta | unde
   with?: Record<string, unknown>;
 }
 
-export interface IModelMutateRelationIncludeWrapper<Model extends BeanModelMeta | undefined = undefined> {
+export interface IModelMutateRelationIncludeWrapper<
+  Model extends BeanModelMeta | undefined = undefined,
+> {
   include?: TypeModelMutateParamsInclude<Model>;
   with?: Record<string, unknown>;
 }

package/src/types/modelAggr.ts

@@ -4,7 +4,10 @@ import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumns, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 // export interface TypeModelSelectAggrParamsAggrs<TRecord> {
@@ -17,13 +20,22 @@ import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 export interface TypeModelSelectAggrParamsAggrs<TRecord> {
   count?: TypeModelColumns<TRecord>;
-  sum?: TypeEntityTableColumnNamesForAggrs<TRecord> | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
-  avg?: TypeEntityTableColumnNamesForAggrs<TRecord> | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
-  max?: TypeEntityTableColumnNamesForAggrs<TRecord> | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
-  min?: TypeEntityTableColumnNamesForAggrs<TRecord> | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
+  sum?:
+    | TypeEntityTableColumnNamesForAggrs<TRecord>
+    | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
+  avg?:
+    | TypeEntityTableColumnNamesForAggrs<TRecord>
+    | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
+  max?:
+    | TypeEntityTableColumnNamesForAggrs<TRecord>
+    | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
+  min?:
+    | TypeEntityTableColumnNamesForAggrs<TRecord>
+    | Array<TypeEntityTableColumnNamesForAggrs<TRecord>>;
 }
 
-export type TypeEntityTableColumnNamesForAggrs<Entity> = keyof TypeEntityTableColumnsForAggrs<Entity>;
+export type TypeEntityTableColumnNamesForAggrs<Entity> =
+  keyof TypeEntityTableColumnsForAggrs<Entity>;
 
 export type TypeEntityTableColumnsForAggrs<Entity> = OmitNever<
   Omit<

package/src/types/modelCount.ts

@@ -2,7 +2,10 @@ import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumn, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 export interface IBuildModelSelectCountParams<

package/src/types/modelGeneral.ts

@@ -1,10 +1,25 @@
 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 { TypeModelsClassLikeGeneral } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
-import type { TypeModelSelectGroupParamsColumnNames, TypeModelSelectGroupParamsColumns } from './relationsGroup.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
+import type {
+  TypeModelSelectGroupParamsColumnNames,
+  TypeModelSelectGroupParamsColumns,
+} from './relationsGroup.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 export interface IBuildModelSelectGeneralParams<
@@ -16,7 +31,13 @@ export interface IBuildModelSelectGeneralParams<
 >
   extends
     IModelRelationIncludeWrapper<Model>,
-    IBuildModelSelectGeneralParamsBasic<TRecord, TypeModelColumn<TRecord>, TableNames, ColumnNames, Columns> {}
+    IBuildModelSelectGeneralParamsBasic<
+      TRecord,
+      TypeModelColumn<TRecord>,
+      TableNames,
+      ColumnNames,
+      Columns
+    > {}
 
 export interface IBuildModelSelectGeneralParamsBasic<
   TRecord,

package/src/types/modelGroup.ts

@@ -3,8 +3,14 @@ import type { IModelSelectParamsJoin, IModelSelectParamsOrder } from './model.ts
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { TypeModelColumnsStrict, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
-import type { TypeModelSelectGroupParamsColumnNames, TypeModelSelectGroupParamsColumns } from './relationsGroup.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
+import type {
+  TypeModelSelectGroupParamsColumnNames,
+  TypeModelSelectGroupParamsColumns,
+} from './relationsGroup.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 export interface IBuildModelSelectGroupParams<

package/src/types/modelIncrement.ts

@@ -4,7 +4,10 @@ import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';
-import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
+import type {
+  TypeEntityTableColumnNamesOfGeneral,
+  TypeEntityTableColumnsOfGeneral,
+} from './relationsColumns.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 
 export type TypeModelIncrementParamsColumns<Entity> = OmitNever<

package/src/types/modelWhere.ts

@@ -52,7 +52,12 @@ export type TypeOpsNormal = TypeRecordValues<typeof OpNormal>;
 export type TypeOpsAll = TypeRecordValues<typeof Op>;
 
 // not use Knex.Raw
-export type TypeModelColumnValue<TRecord, Column> = keyof TRecord | Column | Column[] | null | '_skip_';
+export type TypeModelColumnValue<TRecord, Column> =
+  | keyof TRecord
+  | Column
+  | Column[]
+  | null
+  | '_skip_';
 
 export type TypeModelWhere<TRecord, Columns extends {} | undefined = undefined> = Columns extends {}
   ? TypeModelWhereInner<Columns>
@@ -61,7 +66,9 @@ export type TypeModelWhere<TRecord, Columns extends {} | undefined = undefined>
 // Columns extends {} ? TypeModelWhereInner<Columns> | Knex.Raw : TypeModelWhereInner<TRecord> | Knex.Raw;
 
 export type TypeModelWhereInner<TRecord> = {
-  [prop in keyof TRecord]?: TypeModelColumnValue<TRecord, TRecord[prop]> | TypeModelWhereFieldAll<TRecord, TRecord[prop]>;
+  [prop in keyof TRecord]?:
+    | TypeModelColumnValue<TRecord, TRecord[prop]>
+    | TypeModelWhereFieldAll<TRecord, TRecord[prop]>;
 } & {
   [key in TypeOpsJoint]?: TypeModelWhereInner<TRecord>;
 };
@@ -78,7 +85,9 @@ export type TypeModelWhereFieldJoint<TRecord, Column> = {
 
 export type TypeModelColumn<TRecord> = keyof TRecord | '*';
 export type TypeModelColumns<TRecord> = TypeModelColumn<TRecord> | Array<TypeModelColumn<TRecord>>;
-export type TypeModelColumnPatch<TRecord, TColumn> = TColumn extends '*' ? TypeModelColumn<TRecord> : TColumn;
+export type TypeModelColumnPatch<TRecord, TColumn> = TColumn extends '*'
+  ? TypeModelColumn<TRecord>
+  : TColumn;
 export type TypeModelColumnsPatch<TRecord, TColumn> = [TColumn] extends [string]
   ? TypeModelColumnPatch<TRecord, TColumn> | Array<TypeModelColumnPatch<TRecord, TColumn>>
   : TColumn;

package/src/types/onion/entity.ts

@@ -1,6 +1,6 @@
 import type { OmitNever } from 'vona';
 import type { ServiceOnion } from 'vona-module-a-onion';
-import type { TypeOpenapiMetadata } from 'vona-module-a-openapi';
+import type { ISchemaObjectExtensionField } from 'vona-module-a-openapi';
 import type { SchemaLike } from 'vona-module-a-openapiutils';
 
 import type { SymbolKeyFieldsMore } from '../entity.ts';
@@ -12,7 +12,7 @@ export interface IDecoratorEntityOptions<FieldsMore = never> {
   [SymbolKeyFieldsMore]?: FieldsMore;
   table?: keyof ITableRecord;
   independent?: boolean;
-  openapi?: TypeOpenapiMetadata;
+  openapi?: ISchemaObjectExtensionField;
   pipes?: SchemaLike | SchemaLike[];
 }
 

package/src/types/onion/model.ts

@@ -11,13 +11,29 @@ import type { ITableRecord } from './table.ts';
 export interface IModelRecord {}
 export interface IModelClassRecord {}
 
-export type TypeDynamicTableName = (ctx: VonaContext, where: any | undefined, defaultTable: keyof ITableRecord, modelInstance: any) => string;
+export type TypeDynamicTableName = (
+  ctx: VonaContext,
+  where: any | undefined,
+  defaultTable: keyof ITableRecord,
+  modelInstance: any,
+) => string;
 
-export type TypeDynamicClientName = (ctx: VonaContext, modelInstance: any) => keyof IDatabaseClientRecord;
+export type TypeDynamicClientName = (
+  ctx: VonaContext,
+  modelInstance: any,
+) => keyof IDatabaseClientRecord;
 
-export type TypeModelsClearedByFn = (ctx: VonaContext, modelTarget: any, modelSource: any) => Promise<void>;
+export type TypeModelsClearedByFn = (
+  ctx: VonaContext,
+  modelTarget: any,
+  modelSource: any,
+) => Promise<void>;
 
-export type TypeSoftDeletionPruneHandler = (ctx: VonaContext, modelInstance: any, options: ISoftDeletionPruneHandlerOptions) => Promise<void>;
+export type TypeSoftDeletionPruneHandler = (
+  ctx: VonaContext,
+  modelInstance: any,
+  options: ISoftDeletionPruneHandlerOptions,
+) => Promise<void>;
 
 export interface ISoftDeletionPruneHandlerOptions {
   expired: number;