vona-module-a-orm 5.0.95 → 5.1.1

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

@@ -0,0 +1,8 @@
+export interface TypeDtoListAndCountResult<T> {
+    list: T[];
+    total: string;
+    pageCount: number;
+    pageSize: number;
+    pageNo: number;
+}
+//# sourceMappingURL=dtoListAndCount.d.ts.map

package/dist/types/dto/dtoListAndCount.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dtoListAndCount.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoListAndCount.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB,CAAC,CAAC;IAC1C,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB"}

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

@@ -6,19 +6,19 @@ import type { TypeModelColumnsStrict } from '../modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../onion/model.ts';
 import type { TypeModelOfModelLike, TypeSymbolKeyEntity, TypeUtilEntityOmit, TypeUtilEntityPartial, TypeUtilEntitySelector, TypeUtilGetColumnsFromRelationAndIncludeWrapper, TypeUtilGetModelOptions, TypeUtilGetParamsColumns, TypeUtilGetParamsInlcude, TypeUtilGetParamsWith, TypeUtilGetRelationEntity, TypeUtilGetRelationKey, TypeUtilGetRelationModel, TypeUtilGetRelationOptions, TypeUtilGetRelationOptionsAutoload, TypeUtilGetRelationType, TypeUtilPrepareColumns } from '../relations.ts';
 export type TypeDtoMutateType = 'create' | 'update' | 'mutate';
-export type IDtoMutateParams<ModelLike extends BeanModelMeta | (keyof IModelClassRecord)> = IBuildDtoMutateParams<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], TypeModelOfModelLike<ModelLike>>;
+export type IDtoMutateParams<ModelLike extends BeanModelMeta | keyof IModelClassRecord> = IBuildDtoMutateParams<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], TypeModelOfModelLike<ModelLike>>;
 export interface IBuildDtoMutateParams<TRecord, Model extends BeanModelMeta> extends IModelRelationIncludeWrapper<Model>, IBuildDtoMutateParamsBasic<TRecord> {
 }
 export interface IBuildDtoMutateParamsBasic<TRecord> {
     columns?: TypeModelColumnsStrict<TRecord>;
 }
-export type TypeDtoMutateResult<ModelLike extends BeanModelMeta | (keyof IModelClassRecord), TOptionsRelation, TMutateTypeTopLevel extends TypeDtoMutateType, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = TypeDtoMutateRelationResult<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], TypeModelOfModelLike<ModelLike>, TOptionsRelation, TMutateTypeTopLevel, TColumnsOmitDefault, TTopLevel>;
-export type TypeDtoMutateRelationResult<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TMutateTypeTopLevel extends TypeDtoMutateType, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined, TColumns = undefined, REFKEY = undefined> = TypeDtoMutateRelationResultEntity<TRecord, TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>, TMutateTypeTopLevel, TColumnsOmitDefault, TTopLevel, REFKEY> & (TModel extends BeanModelMeta ? (OmitNever<TypeDtoMutateRelationResultMergeInclude<TMutateTypeTopLevel, TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>>> & OmitNever<TypeDtoMutateModelRelationResultMergeWith<TMutateTypeTopLevel, TypeUtilGetParamsWith<TOptionsRelation>>>) : {});
+export type TypeDtoMutateResult<ModelLike extends BeanModelMeta | keyof IModelClassRecord, TOptionsRelation, TMutateTypeTopLevel extends TypeDtoMutateType, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = TypeDtoMutateRelationResult<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], TypeModelOfModelLike<ModelLike>, TOptionsRelation, TMutateTypeTopLevel, TColumnsOmitDefault, TTopLevel>;
+export type TypeDtoMutateRelationResult<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TMutateTypeTopLevel extends TypeDtoMutateType, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined, TColumns = undefined, REFKEY = undefined> = TypeDtoMutateRelationResultEntity<TRecord, TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>, TMutateTypeTopLevel, TColumnsOmitDefault, TTopLevel, REFKEY> & (TModel extends BeanModelMeta ? OmitNever<TypeDtoMutateRelationResultMergeInclude<TMutateTypeTopLevel, TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>>> & OmitNever<TypeDtoMutateModelRelationResultMergeWith<TMutateTypeTopLevel, TypeUtilGetParamsWith<TOptionsRelation>>> : {});
 type TypeDtoMutateRelationResultMergeInclude<TMutateTypeTopLevel extends TypeDtoMutateType, TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown> = {
-    [RelationName in (keyof TModelOptions['relations'])]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeDtoMutateRelationResultMergeIncludeWrapper<TMutateTypeTopLevel, TModelOptions['relations'][RelationName], TInclude[RelationName]> : TypeDtoMutateRelationResultMergeAutoload<TMutateTypeTopLevel, TModelOptions['relations'][RelationName]> : TypeDtoMutateRelationResultMergeAutoload<TMutateTypeTopLevel, TModelOptions['relations'][RelationName]>;
+    [RelationName in keyof TModelOptions['relations']]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeDtoMutateRelationResultMergeIncludeWrapper<TMutateTypeTopLevel, TModelOptions['relations'][RelationName], TInclude[RelationName]> : TypeDtoMutateRelationResultMergeAutoload<TMutateTypeTopLevel, TModelOptions['relations'][RelationName]> : TypeDtoMutateRelationResultMergeAutoload<TMutateTypeTopLevel, TModelOptions['relations'][RelationName]>;
 };
 type TypeDtoMutateModelRelationResultMergeWith<TMutateTypeTopLevel extends TypeDtoMutateType, TWith extends {} | undefined | unknown> = TWith extends {} ? {
-    [RelationName in (keyof TWith)]: TypeDtoMutateRelationResultMergeWithRelation<TMutateTypeTopLevel, TWith[RelationName]>;
+    [RelationName in keyof TWith]: TypeDtoMutateRelationResultMergeWithRelation<TMutateTypeTopLevel, TWith[RelationName]>;
 } : {};
 type TypeDtoMutateRelationResultMergeIncludeWrapper<TMutateTypeTopLevel extends TypeDtoMutateType, Relation, IncludeWrapper> = IncludeWrapper extends false ? never : IncludeWrapper extends true ? TypeUtilGetDtoMutateRelationEntityByType<TMutateTypeTopLevel, Relation, undefined> : IncludeWrapper extends {} ? TypeUtilGetDtoMutateRelationEntityByType<TMutateTypeTopLevel, Relation, IncludeWrapper> : never;
 type TypeDtoMutateRelationResultMergeAutoload<TMutateTypeTopLevel extends TypeDtoMutateType, Relation> = TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilGetDtoMutateRelationEntityByType<TMutateTypeTopLevel, Relation, undefined> : never;
@@ -31,11 +31,10 @@ type TypeUtilGetDtoMutateEntityByType<TMutateTypeTopLevel extends TypeDtoMutateT
 type TypeDtoMutateRelationResultEntity<TRecord, Columns = undefined, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined, REFKEY = undefined> = TypeDtoMutateRelationResultPatch<TypeDtoMutateRelationResultEntityInner<TRecord, Columns, TMutateTypeTopLevel, TColumnsOmitDefault, TTopLevel>, TMutateTypeTopLevel, TTopLevel, REFKEY>;
 type TypeDtoMutateRelationResultPatch<TRecordResult, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TTopLevel extends boolean | undefined = undefined, REFKEY = undefined> = TTopLevel extends false ? TypeUtilEntityOmit<TypeDtoMutateRelationResultPatch2<TRecordResult, TMutateTypeTopLevel, TTopLevel>, REFKEY> : TypeDtoMutateRelationResultPatch2<TRecordResult, TMutateTypeTopLevel, TTopLevel>;
 type TypeDtoMutateRelationResultPatch2<TRecordResult, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = TTopLevel extends false ? TMutateTypeTopLevel extends 'update' | 'mutate' ? TypeUtilEntityPartial<TRecordResult, 'id' | 'deleted'> : TRecordResult : TRecordResult;
-type TypeDtoMutateRelationResultEntityInner<TRecord, Columns = undefined, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = [
-    Columns
-] extends [string | string[]] ? TypeDtoMutateRelationResultEntityFromColumns<TRecord, Columns, TMutateTypeTopLevel, TTopLevel> : TypeDtoMutateRelationResultEntityFromColumnsOmitDefault<TRecord, TMutateTypeTopLevel, TColumnsOmitDefault>;
+type TypeDtoMutateRelationResultEntityInner<TRecord, Columns = undefined, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TColumnsOmitDefault extends string | string[] | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = [Columns] extends [string | string[]] ? TypeDtoMutateRelationResultEntityFromColumns<TRecord, Columns, TMutateTypeTopLevel, TTopLevel> : TypeDtoMutateRelationResultEntityFromColumnsOmitDefault<TRecord, TMutateTypeTopLevel, TColumnsOmitDefault>;
 type TypeDtoMutateRelationResultEntityFromColumns<TRecord, Columns = undefined, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = TypeUtilEntitySelector<TRecord, TypeUtilPrepareColumns<TypeDtoMutateRelationResultPrepareColumns<TypeUtilPrepareColumns<Columns>, TMutateTypeTopLevel, TTopLevel>>>;
 type TypeDtoMutateRelationResultEntityFromColumnsOmitDefault<TRecord, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TColumnsOmitDefault extends string | string[] | undefined = undefined> = TypeUtilEntityOmit<TRecord, TypeUtilPrepareColumns<TypeDtoMutateRelationResultPrepareColumnsOmitDefault<TMutateTypeTopLevel, TColumnsOmitDefault>>>;
-type TypeDtoMutateRelationResultPrepareColumns<TColumns = undefined, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = TTopLevel extends true ? TColumns : TMutateTypeTopLevel extends 'create' ? TypeOmitStringUnion<TColumns, 'deleted' | 'id'> : (TColumns | 'deleted' | 'id');
+type TypeDtoMutateRelationResultPrepareColumns<TColumns = undefined, TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TTopLevel extends boolean | undefined = undefined> = TTopLevel extends true ? TColumns : TMutateTypeTopLevel extends 'create' ? TypeOmitStringUnion<TColumns, 'deleted' | 'id'> : TColumns | 'deleted' | 'id';
 type TypeDtoMutateRelationResultPrepareColumnsOmitDefault<TMutateTypeTopLevel extends TypeDtoMutateType | undefined = undefined, TColumnsOmitDefault extends string | string[] | undefined = undefined> = TColumnsOmitDefault extends string | string[] ? TColumnsOmitDefault : TMutateTypeTopLevel extends 'create' ? ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'] : ['iid', 'createdAt', 'updatedAt'];
 export {};
+//# sourceMappingURL=dtoMutate.d.ts.map

package/dist/types/dto/dtoMutate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dtoMutate.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoMutate.ts"],"names":[],"mappings":"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"}

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

@@ -3,3 +3,4 @@ export declare class DtoQueryBase {
     where?: object;
     orders?: string | string[][];
 }
+//# sourceMappingURL=dtoQueryBase.d.ts.map

package/dist/types/dto/dtoQueryBase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dtoQueryBase.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoQueryBase.ts"],"names":[],"mappings":"AAQA,qBAAa,YAAY;IAEvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAGnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,CAAC;CAC9B"}

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

@@ -3,3 +3,4 @@ export declare class DtoQueryPageBase extends DtoQueryBase {
     pageNo: number;
     pageSize: number;
 }
+//# sourceMappingURL=dtoQueryPageBase.d.ts.map

package/dist/types/dto/dtoQueryPageBase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dtoQueryPageBase.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoQueryPageBase.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOjD,qBAAa,gBAAiB,SAAQ,YAAY;IAEhD,MAAM,EAAE,MAAM,CAAC;IAGf,QAAQ,EAAE,MAAM,CAAC;CAClB"}

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

@@ -1,10 +1,11 @@
 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;
     pageSize: number;
     pageNo: number;
 }
+//# sourceMappingURL=dtoSelectAndCount.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dtoSelectAndCount.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoSelectAndCount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,2BAA2B,CAAC,SAAS,SAAS,aAAa,GAAG,MAAM,iBAAiB,EAAE,gBAAgB;IACtH,IAAI,EAAE,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,EAAE,CAAC;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB"}

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

@@ -1,7 +1,9 @@
 export * from './dtoAggregate.ts';
 export * from './dtoGet.ts';
 export * from './dtoGroup.ts';
+export * from './dtoListAndCount.ts';
 export * from './dtoMutate.ts';
 export * from './dtoQueryBase.ts';
 export * from './dtoQueryPageBase.ts';
 export * from './dtoSelectAndCount.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/dto/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/dto/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC"}

package/dist/types/entity.d.ts

@@ -16,3 +16,4 @@ export declare const SymbolKeyFieldsMore: unique symbol;
 export type TypeSymbolKeyFieldsMore = typeof SymbolKeyFieldsMore;
 export type TypeEntityStudentMetaSimple<T> = Omit<T, '$table' | '$comment' | '$default'>;
 export type TypeEntityStudentMetaSimpleColumns<T> = PickString<keyof TypeEntityStudentMetaSimple<T>>;
+//# sourceMappingURL=entity.d.ts.map

package/dist/types/entity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/types/entity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEvC,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,QAAQ,CAAC;KAClD,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG;CACtB,CAAC,GAAG;IACH,MAAM,EAAE,CAAC,CAAC;IACV,QAAQ,EAAE,QAAQ,CAAC;SAAG,GAAG,IAAI,MAAM,CAAC,GAAG,MAAM;KAAE,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,QAAQ,EAAE,QAAQ,CAAC;SAAG,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG;KAAE,CAAC,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAAwB,CAAC;AACzD,MAAM,MAAM,uBAAuB,GAAG,OAAO,mBAAmB,CAAC;AAEjE,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,UAAU,CAAC,CAAC;AACzF,MAAM,MAAM,kCAAkC,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/dist/types/entityBase.d.ts

@@ -3,3 +3,4 @@ import { EntityBaseInner } from './entityBaseInner.ts';
 export declare class EntityBase extends EntityBaseInner {
     id: TableIdentity;
 }
+//# sourceMappingURL=entityBase.d.ts.map

package/dist/types/entityBase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entityBase.d.ts","sourceRoot":"","sources":["../../src/types/entityBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,qBAAa,UAAW,SAAQ,eAAe;IAE7C,EAAE,EAAE,aAAa,CAAC;CACnB"}

package/dist/types/entityBaseEmpty.d.ts

@@ -1,2 +1,3 @@
 export declare class EntityBaseEmpty {
 }
+//# sourceMappingURL=entityBaseEmpty.d.ts.map

package/dist/types/entityBaseEmpty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entityBaseEmpty.d.ts","sourceRoot":"","sources":["../../src/types/entityBaseEmpty.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAe;CAAG"}

package/dist/types/entityBaseInner.d.ts

@@ -5,3 +5,4 @@ export declare class EntityBaseInner extends EntityBaseEmpty {
     deleted: boolean;
     iid: number;
 }
+//# sourceMappingURL=entityBaseInner.d.ts.map

package/dist/types/entityBaseInner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entityBaseInner.d.ts","sourceRoot":"","sources":["../../src/types/entityBaseInner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,qBAAa,eAAgB,SAAQ,eAAe;IAElD,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAGhB,OAAO,EAAE,OAAO,CAAC;IAGjB,GAAG,EAAE,MAAM,CAAC;CACb"}

package/dist/types/entityBaseSimple.d.ts

@@ -2,3 +2,4 @@ import { EntityBaseInner } from './entityBaseInner.ts';
 export declare class EntityBaseSimple extends EntityBaseInner {
     id: number;
 }
+//# sourceMappingURL=entityBaseSimple.d.ts.map

package/dist/types/entityBaseSimple.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entityBaseSimple.d.ts","sourceRoot":"","sources":["../../src/types/entityBaseSimple.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,qBAAa,gBAAiB,SAAQ,eAAe;IAEnD,EAAE,EAAE,MAAM,CAAC;CACZ"}

package/dist/types/extra.d.ts

@@ -9,3 +9,4 @@ declare module 'vona-module-a-orm' {
     }
 }
 export {};
+//# sourceMappingURL=extra.d.ts.map

package/dist/types/extra.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extra.d.ts","sourceRoot":"","sources":["../../src/types/extra.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,mBAAmB,CAAC;IACjC,UAAiB,SAAS;KAGzB;IAED,UAAiB,qBAAqB;KAGrC;IAED,UAAiB,cAAc;KAG9B;IAED,UAAiB,mBAAmB;KAGnC;CACF"}

package/dist/types/index.d.ts

@@ -15,6 +15,7 @@ export * from './modelAggr.ts';
 export * from './modelCount.ts';
 export * from './modelGeneral.ts';
 export * from './modelGroup.ts';
+export * from './modelIncrement.ts';
 export * from './modelWhere.ts';
 export * from './onion/index.ts';
 export * from './relations.ts';
@@ -27,3 +28,4 @@ export * from './relationsGroup.ts';
 export * from './relationsMutate.ts';
 export * from './relationsTables.ts';
 export * from './transaction.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}

package/dist/types/logger.d.ts

@@ -5,3 +5,4 @@ declare module 'vona' {
     }
 }
 export {};
+//# sourceMappingURL=logger.d.ts.map

package/dist/types/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/types/logger.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,kBAAkB;QACjC,QAAQ,EAAE,KAAK,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC;KACd;CACF"}

package/dist/types/model.d.ts

@@ -22,7 +22,7 @@ export type IModelSelectParamsOrder<ColumnNames> = [ColumnNames, IModelSelectPar
 export interface IBuildModelSelectParams<TRecord, Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> extends IModelRelationIncludeWrapper<Model>, IBuildModelSelectParamsBasic<TRecord, TypeModelColumn<TRecord>, TableNames, ColumnNames, Columns> {
 }
 export interface IBuildModelSelectParamsBasic<TRecord, COLUMNS extends TypeModelColumn<TRecord> = TypeModelColumn<TRecord>, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
     columns?: TypeModelColumnsPatch<TRecord, COLUMNS>;
     where?: TypeModelWhere<TRecord, Columns>;
     joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
@@ -33,7 +33,7 @@ export interface IBuildModelSelectParamsBasic<TRecord, COLUMNS extends TypeModel
 export type IQueryParams<Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IModelSelectParams<TypeModelOfModelLike<Model>[TypeSymbolKeyEntity], Model, ModelJoins>;
 export type IModelSelectParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelSelectParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
 export interface IBuildModelCountParams<TRecord, _Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
     column?: TypeModelColumn<TRecord>;
     where?: TypeModelWhere<TRecord, Columns>;
     joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
@@ -78,3 +78,4 @@ export interface IModelMutateRelationIncludeWrapper<Model extends BeanModelMeta
     include?: TypeModelMutateParamsInclude<Model>;
     with?: Record<string, unknown>;
 }
+//# sourceMappingURL=model.d.ts.map

package/dist/types/model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"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"}

package/dist/types/modelAggr.d.ts

@@ -19,9 +19,10 @@ export type TypeEntityTableColumnsForAggrs<Entity> = OmitNever<Omit<{
 export interface IBuildModelSelectAggrParams<TRecord, Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> extends IBuildModelSelectAggrParamsBasic<TRecord, Model, TableNames, ColumnNames, Columns> {
 }
 export interface IBuildModelSelectAggrParamsBasic<TRecord, _Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
     aggrs: TypeModelSelectAggrParamsAggrs<TRecord>;
     where?: TypeModelWhere<TRecord, Columns>;
     joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
 }
 export type IModelSelectAggrParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelSelectAggrParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
+//# sourceMappingURL=modelAggr.d.ts.map

package/dist/types/modelAggr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelAggr.d.ts","sourceRoot":"","sources":["../../src/types/modelAggr.ts"],"names":[],"mappings":"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"}

package/dist/types/modelCount.d.ts

@@ -7,9 +7,10 @@ import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 export interface IBuildModelSelectCountParams<TRecord, Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> extends IBuildModelSelectCountParamsBasic<TRecord, Model, TableNames, ColumnNames, Columns> {
 }
 export interface IBuildModelSelectCountParamsBasic<TRecord, _Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
     column?: TypeModelColumn<TRecord>;
     where?: TypeModelWhere<TRecord, Columns>;
     joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
 }
 export type IModelSelectCountParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelSelectCountParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
+//# sourceMappingURL=modelCount.d.ts.map

package/dist/types/modelCount.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelCount.d.ts","sourceRoot":"","sources":["../../src/types/modelCount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,mCAAmC,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAClH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE1E,MAAM,WAAW,4BAA4B,CAC3C,OAAO,EACP,KAAK,SAAS,aAAa,GAAG,SAAS,GAAG,SAAS,EACnD,UAAU,GAAG,SAAS,EACtB,WAAW,GAAG,MAAM,OAAO,EAC3B,OAAO,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAC1C,SAAQ,iCAAiC,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;CAAG;AAEhG,MAAM,WAAW,iCAAiC,CAChD,OAAO,EACP,MAAM,SAAS,aAAa,GAAG,SAAS,GAAG,SAAS,EACpD,UAAU,GAAG,SAAS,EACtB,WAAW,GAAG,MAAM,OAAO,EAC3B,OAAO,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS;IAE1C,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;IACvD,MAAM,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC;CACpE;AAED,MAAM,MAAM,uBAAuB,CACjC,OAAO,EAEP,KAAK,SAAS,aAAa,GAAG,aAAa,EAC3C,UAAU,SAAS,0BAA0B,GAAG,SAAS,GAAG,SAAS,IACnE,4BAA4B,CAC9B,OAAO,EACP,KAAK,EACL,6BAA6B,CAAC,UAAU,EAAE,KAAK,CAAC,EAChD,mCAAmC,CAAC,UAAU,EAAE,KAAK,CAAC,EACtD,+BAA+B,CAAC,UAAU,EAAE,KAAK,CAAC,CACnD,CAAC"}

package/dist/types/modelGeneral.d.ts

@@ -9,15 +9,16 @@ import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 export interface IBuildModelSelectGeneralParams<TRecord, Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> extends IModelRelationIncludeWrapper<Model>, IBuildModelSelectGeneralParamsBasic<TRecord, TypeModelColumn<TRecord>, TableNames, ColumnNames, Columns> {
 }
 export interface IBuildModelSelectGeneralParamsBasic<TRecord, TColumn extends TypeModelColumn<TRecord> | undefined = TypeModelColumn<TRecord>, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined, Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined = undefined, Groups extends TypeModelColumnsStrict<TRecord> | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
-    columns?: Groups extends TypeModelColumnsStrict<TRecord> ? (TColumn extends string ? (TColumn | Array<TColumn>) : TColumn) : TypeModelColumnsPatch<TRecord, TColumn>;
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
+    columns?: Groups extends TypeModelColumnsStrict<TRecord> ? TColumn extends string ? TColumn | Array<TColumn> : TColumn : TypeModelColumnsPatch<TRecord, TColumn>;
     aggrs?: Aggrs;
     groups?: Groups;
     having?: TypeModelWhere<TRecord, TypeModelSelectGroupParamsColumns<TRecord, Groups, Aggrs>>;
     where?: TypeModelWhere<TRecord, Columns>;
     joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
-    orders?: Groups extends TypeModelColumnsStrict<TRecord> ? IModelSelectParamsOrder<TypeModelSelectGroupParamsColumnNames<TRecord, Groups, Aggrs>>[] : (Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> ? never : IModelSelectParamsOrder<ColumnNames>[]);
+    orders?: Groups extends TypeModelColumnsStrict<TRecord> ? IModelSelectParamsOrder<TypeModelSelectGroupParamsColumnNames<TRecord, Groups, Aggrs>>[] : Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> ? never : IModelSelectParamsOrder<ColumnNames>[];
     limit?: number;
     offset?: number;
 }
 export type IModelSelectGeneralParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelSelectGeneralParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
+//# sourceMappingURL=modelGeneral.d.ts.map

package/dist/types/modelGeneral.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelGeneral.d.ts","sourceRoot":"","sources":["../../src/types/modelGeneral.ts"],"names":[],"mappings":"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"}

package/dist/types/modelGroup.d.ts

@@ -9,7 +9,7 @@ import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 export interface IBuildModelSelectGroupParams<TRecord, Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> extends IBuildModelSelectGroupParamsBasic<TRecord, Model, TableNames, ColumnNames, Columns> {
 }
 export interface IBuildModelSelectGroupParamsBasic<TRecord, _Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
     aggrs?: TypeModelSelectAggrParamsAggrs<TRecord>;
     groups: TypeModelColumnsStrict<TRecord>;
     columns?: TypeModelColumnsStrict<TRecord>;
@@ -21,3 +21,4 @@ export interface IBuildModelSelectGroupParamsBasic<TRecord, _Model extends BeanM
     offset?: number;
 }
 export type IModelSelectGroupParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelSelectGroupParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
+//# sourceMappingURL=modelGroup.d.ts.map

package/dist/types/modelGroup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelGroup.d.ts","sourceRoot":"","sources":["../../src/types/modelGroup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,mCAAmC,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAClH,OAAO,KAAK,EAAE,qCAAqC,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACpH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE1E,MAAM,WAAW,4BAA4B,CAC3C,OAAO,EACP,KAAK,SAAS,aAAa,GAAG,SAAS,GAAG,SAAS,EACnD,UAAU,GAAG,SAAS,EACtB,WAAW,GAAG,MAAM,OAAO,EAC3B,OAAO,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAC1C,SAAQ,iCAAiC,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;CAAG;AAEhG,MAAM,WAAW,iCAAiC,CAChD,OAAO,EACP,MAAM,SAAS,aAAa,GAAG,SAAS,GAAG,SAAS,EACpD,UAAU,GAAG,SAAS,EACtB,WAAW,GAAG,MAAM,OAAO,EAC3B,OAAO,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS;IAE1C,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;IACvD,KAAK,CAAC,EAAE,8BAA8B,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC1C,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC;IACnE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,iCAAiC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,MAAM,CAAC,EAAE,uBAAuB,CAAC,qCAAqC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;IACnF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,uBAAuB,CACjC,OAAO,EAEP,KAAK,SAAS,aAAa,GAAG,aAAa,EAC3C,UAAU,SAAS,0BAA0B,GAAG,SAAS,GAAG,SAAS,IACnE,4BAA4B,CAC9B,OAAO,EACP,KAAK,EACL,6BAA6B,CAAC,UAAU,EAAE,KAAK,CAAC,EAChD,mCAAmC,CAAC,UAAU,EAAE,KAAK,CAAC,EACtD,+BAA+B,CAAC,UAAU,EAAE,KAAK,CAAC,CACnD,CAAC"}

package/dist/types/modelIncrement.d.ts

@@ -0,0 +1,19 @@
+import type { OmitNever } from 'vona';
+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 { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
+export type TypeModelIncrementParamsColumns<Entity> = OmitNever<Omit<{
+    [K in keyof Entity as Entity[K] extends number | undefined ? K : never]?: number;
+}, 'id' | 'iid'>>;
+export interface IBuildModelIncrementParams<TRecord, Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> extends IBuildModelIncrementParamsBasic<TRecord, Model, TableNames, ColumnNames, Columns> {
+}
+export interface IBuildModelIncrementParamsBasic<TRecord, _Model extends BeanModelMeta | undefined = undefined, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined> {
+    columns: TypeModelIncrementParamsColumns<TRecord>;
+    where: TypeModelWhere<TRecord, Columns>;
+    joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
+}
+export type IModelIncrementParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelIncrementParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
+//# sourceMappingURL=modelIncrement.d.ts.map

package/dist/types/modelIncrement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelIncrement.d.ts","sourceRoot":"","sources":["../../src/types/modelIncrement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,mCAAmC,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAClH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE1E,MAAM,MAAM,+BAA+B,CAAC,MAAM,IAAI,SAAS,CAC7D,IAAI,CACF;KACG,CAAC,IAAI,MAAM,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,MAAM;CACjF,EACD,IAAI,GAAG,KAAK,CACb,CACF,CAAC;AAEF,MAAM,WAAW,0BAA0B,CACzC,OAAO,EACP,KAAK,SAAS,aAAa,GAAG,SAAS,GAAG,SAAS,EACnD,UAAU,GAAG,SAAS,EACtB,WAAW,GAAG,MAAM,OAAO,EAC3B,OAAO,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAC1C,SAAQ,+BAA+B,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;CAAG;AAE9F,MAAM,WAAW,+BAA+B,CAC9C,OAAO,EACP,MAAM,SAAS,aAAa,GAAG,SAAS,GAAG,SAAS,EACpD,UAAU,GAAG,SAAS,EACtB,WAAW,GAAG,MAAM,OAAO,EAC3B,OAAO,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS;IAE1C,OAAO,EAAE,+BAA+B,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,EAAE,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC;CACpE;AAED,MAAM,MAAM,qBAAqB,CAC/B,OAAO,EAEP,KAAK,SAAS,aAAa,GAAG,aAAa,EAC3C,UAAU,SAAS,0BAA0B,GAAG,SAAS,GAAG,SAAS,IACnE,0BAA0B,CAC5B,OAAO,EACP,KAAK,EACL,6BAA6B,CAAC,UAAU,EAAE,KAAK,CAAC,EAChD,mCAAmC,CAAC,UAAU,EAAE,KAAK,CAAC,EACtD,+BAA+B,CAAC,UAAU,EAAE,KAAK,CAAC,CACnD,CAAC"}

package/dist/types/modelWhere.d.ts

@@ -86,5 +86,6 @@ 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 TypeModelColumnsPatch<TRecord, TColumn> = [TColumn] extends [string] ? (TypeModelColumnPatch<TRecord, TColumn> | Array<TypeModelColumnPatch<TRecord, TColumn>>) : TColumn;
+export type TypeModelColumnsPatch<TRecord, TColumn> = [TColumn] extends [string] ? TypeModelColumnPatch<TRecord, TColumn> | Array<TypeModelColumnPatch<TRecord, TColumn>> : TColumn;
 export type TypeModelColumnsStrict<TRecord> = keyof TRecord | Array<keyof TRecord>;
+//# sourceMappingURL=modelWhere.d.ts.map

package/dist/types/modelWhere.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelWhere.d.ts","sourceRoot":"","sources":["../../src/types/modelWhere.ts"],"names":[],"mappings":"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"}

package/dist/types/onion/databaseDialect.d.ts

@@ -17,3 +17,4 @@ declare module 'vona' {
         databaseDialect: never;
     }
 }
+//# sourceMappingURL=databaseDialect.d.ts.map

package/dist/types/onion/databaseDialect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"databaseDialect.d.ts","sourceRoot":"","sources":["../../../src/types/onion/databaseDialect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,WAAW,sBAAsB;CAAG;AAE1C,MAAM,WAAW,gCAAgC;CAAG;AAEpD,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAiB,SAAS;QACxB,eAAe,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAC;KACvD;CACF;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,YAAY;QAC3B,eAAe,EAAE,SAAS,CAAC,sBAAsB,CAAC,CAAC;KACpD;IAED,UAAiB,gBAAgB;QAC/B,eAAe,EAAE,KAAK,CAAC;KACxB;CACF"}

package/dist/types/onion/entity.d.ts

@@ -26,3 +26,4 @@ declare module 'vona' {
         entity: never;
     }
 }
+//# sourceMappingURL=entity.d.ts.map

package/dist/types/onion/entity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/types/onion/entity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,aAAa;CAAG;AAEjC,MAAM,WAAW,uBAAuB,CAAC,UAAU,GAAG,KAAK;IACzD,CAAC,mBAAmB,CAAC,CAAC,EAAE,UAAU,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,KAAK,CAAC,EAAE,UAAU,GAAG,UAAU,EAAE,CAAC;CACnC;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAiB,SAAS;QACxB,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;KACrC;CACF;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,YAAY;QAC3B,MAAM,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;KAClC;IAED,UAAiB,gBAAgB;QAC/B,MAAM,EAAE,KAAK,CAAC;KACf;CACF"}

package/dist/types/onion/index.d.ts

@@ -2,3 +2,4 @@ export * from './databaseDialect.ts';
 export * from './entity.ts';
 export * from './model.ts';
 export * from './table.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/onion/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/onion/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dist/types/onion/model.d.ts

@@ -54,3 +54,4 @@ declare module 'vona' {
         model: never;
     }
 }
+//# sourceMappingURL=model.d.ts.map

package/dist/types/onion/model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/types/onion/model.ts"],"names":[],"mappings":"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"}

package/dist/types/onion/table.d.ts

@@ -1,2 +1,3 @@
 export interface ITableRecord {
 }
+//# sourceMappingURL=table.d.ts.map

package/dist/types/onion/table.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/types/onion/table.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;CAAG"}

package/dist/types/relations.d.ts

@@ -10,8 +10,8 @@ export declare const SymbolKeyModelOptions: unique symbol;
 export type TypeSymbolKeyEntity = typeof SymbolKeyEntity;
 export type TypeSymbolKeyEntityMeta = typeof SymbolKeyEntityMeta;
 export type TypeSymbolKeyModelOptions = typeof SymbolKeyModelOptions;
-export type TypeModelOfModelLike<ModelLike extends (() => Constructable<BeanModelMeta>) | Constructable<BeanModelMeta> | (() => BeanModelMeta) | BeanModelMeta | (keyof IModelClassRecord)> = ModelLike extends (keyof IModelClassRecord) ? IModelClassRecord[ModelLike] : ModelLike extends () => Constructable<infer MODEL> ? MODEL : ModelLike extends Constructable<infer MODEL> ? MODEL : ModelLike extends () => infer MODEL ? MODEL : ModelLike;
-export type TypeModelClassLike<MODEL extends BeanModelMeta | (keyof IModelClassRecord)> = MODEL extends BeanModelMeta ? ((() => Constructable<MODEL>) | Constructable<MODEL>) : MODEL;
+export type TypeModelOfModelLike<ModelLike extends (() => Constructable<BeanModelMeta>) | Constructable<BeanModelMeta> | (() => BeanModelMeta) | BeanModelMeta | keyof IModelClassRecord> = ModelLike extends keyof IModelClassRecord ? IModelClassRecord[ModelLike] : ModelLike extends () => Constructable<infer MODEL> ? MODEL : ModelLike extends Constructable<infer MODEL> ? MODEL : ModelLike extends () => infer MODEL ? MODEL : ModelLike;
+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>) | Constructable<MODEL> | (() => BeanModelMeta) | BeanModelMeta | keyof IModelClassRecord;
 export type TypeModelsClassLikeGeneral<MODEL extends BeanModelMeta = BeanModelMeta> = TypeModelClassLikeGeneral<MODEL> | Array<TypeModelClassLikeGeneral<MODEL>>;
 export type TypeModelParamsInclude<MODEL extends BeanModelMeta | undefined> = TypeModelParamsIncludeByModelOptions<TypeUtilGetModelOptions<MODEL>>;
@@ -29,9 +29,9 @@ 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);
+    model?: (() => infer MODEL extends BeanModelMeta) | (infer MODEL extends BeanModelMeta);
 } ? MODEL : Relation extends {
     model?: () => Constructable<infer MODEL extends BeanModelMeta>;
 } ? MODEL : Relation extends {
@@ -74,7 +74,7 @@ export type TypeUtilGetModelEntity<Model extends BeanModelMeta | undefined> = Mo
 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, IncludeWrapper extends {} | undefined | unknown, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TypeUtilGetEntityByType<TypeUtilGetRelationEntity<Relation>, TypeUtilGetRelationType<Relation>, TypeUtilGetRelationModel<Relation>, IncludeWrapper, TypeUtilGetColumnsFromRelationAndIncludeWrapper<Relation, IncludeWrapper>, TypeUtilGetAggrsFromRelationAndIncludeWrapper<Relation, IncludeWrapper>, TypeUtilGetGroupsFromRelationAndIncludeWrapper<Relation, IncludeWrapper>, Depth>;
-export type TypeUtilGetEntityByType<TRecord, TYPE, TModel extends BeanModelMeta | undefined, IncludeWrapper extends {} | undefined | unknown, Columns, Aggrs, Groups, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TYPE extends 'hasMany' | 'belongsToMany' ? Groups extends string | string[] ? Array<TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, Aggrs, Groups>> : (Aggrs extends {} ? TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, Aggrs> | undefined : Array<TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns>>) : ([Depth] extends [never] ? undefined : (TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, undefined, undefined, TypeDepthPrev[Depth]> | undefined));
+export type TypeUtilGetEntityByType<TRecord, TYPE, TModel extends BeanModelMeta | undefined, IncludeWrapper extends {} | undefined | unknown, Columns, Aggrs, Groups, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TYPE extends 'hasMany' | 'belongsToMany' ? Groups extends string | string[] ? Array<TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, Aggrs, Groups>> : Aggrs extends {} ? TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, Aggrs> | undefined : Array<TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns>> : [Depth] extends [never] ? undefined : TypeModelRelationResult<TRecord, TModel, IncludeWrapper, Columns, undefined, undefined, TypeDepthPrev[Depth]> | undefined;
 export type TypeUtilGetParamsAggrs<TParams> = TParams extends {
     aggrs?: infer Aggrs;
 } ? Aggrs : undefined;
@@ -93,9 +93,7 @@ export type TypeUtilGetParamsColumns<TParams> = TParams extends {
 export type TypeUtilPrepareColumns<TColumns> = TColumns extends '*' | ['*'] ? undefined : TColumns extends string[] ? TColumns[number] : 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 TypeUtilEntityPartial<TRecord, TColumns> = [
-    TColumns
-] extends [keyof TRecord] ? Partial<Pick<TRecord, TColumns>> & 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> = TypeUtilGetParamsColumns<IncludeWrapper> extends string | string[] ? TypeUtilGetParamsColumns<IncludeWrapper> : TypeUtilGetRelationOptionsColumns<Relation>;
 export interface TypeModelSelectAndCount<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Aggrs = undefined, Groups = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> {
     list: TypeModelRelationResult<TRecord, TModel, TOptionsRelation, TColumns, Aggrs, Groups, Depth>[];
@@ -105,13 +103,14 @@ export interface TypeModelSelectAndCount<TRecord, TModel extends BeanModelMeta |
     pageNo: number;
 }
 export type TypeModelRelationResult<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Aggrs = undefined, Groups = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = Groups extends string | string[] ? TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, TColumns> : Aggrs extends {} ? TypeModelAggrRelationResultAggrs<Aggrs> : TypeModelRelationResult_Normal<TRecord, TModel, TOptionsRelation, TColumns, Depth>;
-export type TypeModelRelationResult_Normal<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TypeUtilEntitySelector<TRecord, TypeUtilPrepareColumns<TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>>> & (TModel extends BeanModelMeta ? (OmitNever<TypeModelRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, Depth>> & OmitNever<TypeModelRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, Depth>>) : {});
+export type TypeModelRelationResult_Normal<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TColumns = undefined, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TypeUtilEntitySelector<TRecord, TypeUtilPrepareColumns<TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>>> & (TModel extends BeanModelMeta ? OmitNever<TypeModelRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, Depth>> & OmitNever<TypeModelRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, Depth>> : {});
 export type TypeModelRelationResultMergeInclude<TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = {
-    [RelationName in (keyof TModelOptions['relations'])]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeModelRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], Depth> : TypeModelRelationResultMergeAutoload<TModelOptions['relations'][RelationName], Depth> : TypeModelRelationResultMergeAutoload<TModelOptions['relations'][RelationName], Depth>;
+    [RelationName in keyof TModelOptions['relations']]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeModelRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], Depth> : TypeModelRelationResultMergeAutoload<TModelOptions['relations'][RelationName], Depth> : TypeModelRelationResultMergeAutoload<TModelOptions['relations'][RelationName], Depth>;
 };
 export type TypeModelRelationResultMergeWith<TWith extends {} | undefined | unknown, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = TWith extends {} ? {
-    [RelationName in (keyof TWith)]: TypeModelRelationResultMergeWithRelation<TWith[RelationName], Depth>;
+    [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 TypeModelRelationResultMergeIncludeWrapper<Relation, IncludeWrapper, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = IncludeWrapper extends false ? never : IncludeWrapper extends true ? TypeUtilGetRelationEntityByType<Relation, undefined, Depth> : IncludeWrapper extends {} ? TypeUtilGetRelationEntityByType<Relation, IncludeWrapper, Depth> : never;
 export type TypeModelRelationResultMergeWithRelation<WithRelation, Depth extends TypeDepthPrev[number] = TypeDepthPrevMax> = WithRelation extends false ? never : WithRelation extends true ? never : WithRelation extends {} ? TypeUtilGetRelationEntityByType<WithRelation, TypeUtilGetRelationOptions<WithRelation>, Depth> : never;
+//# sourceMappingURL=relations.d.ts.map

package/dist/types/relations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../src/types/relations.ts"],"names":[],"mappings":"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"}

package/dist/types/relationsAggr.d.ts

@@ -11,5 +11,6 @@ export type TypeRecordAggrsValuesToObject<AggrValues extends string> = {
 };
 export type TypeUtilGetAggrsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetRelationOptionsAggrs<Relation> extends {} ? TypeUtilGetParamsAggrs<IncludeWrapper> extends {} ? TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<TypeUtilGetRelationOptionsAggrs<Relation>, TypeUtilGetParamsAggrs<IncludeWrapper>> : TypeUtilGetRelationOptionsAggrs<Relation> : undefined;
 export type TypeUtilGetAggrsFromRelationAndIncludeWrapper_Mixed<RelationAggrs extends {}, IncludeWrapperAggrs extends {}> = {
-    [K in keyof RelationAggrs]: K extends string ? K extends keyof IncludeWrapperAggrs ? IncludeWrapperAggrs[K] : RelationAggrs[K] : undefined;
+    [K in keyof RelationAggrs]: K extends string ? (K extends keyof IncludeWrapperAggrs ? IncludeWrapperAggrs[K] : RelationAggrs[K]) : undefined;
 };
+//# sourceMappingURL=relationsAggr.d.ts.map

package/dist/types/relationsAggr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relationsAggr.d.ts","sourceRoot":"","sources":["../../src/types/relationsAggr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAE9F,MAAM,MAAM,2BAA2B,CAAC,QAAQ,IAC9C,sBAAsB,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,gCAAgC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;AAExH,MAAM,MAAM,gCAAgC,CAAC,KAAK,IAAI,KAAK,SAAS,EAAE,GAClE,6BAA6B,CAC3B,qBAAqB,CAAC;KACnB,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,GAAG,+BAA+B,CAAC,CAAC,EAAE,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CACxH,CAAC,CACH,GACD,EAAE,CAAC;AAEP,MAAM,MAAM,+BAA+B,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,IAAI,OAAO,SAAS,MAAM,GAC3I,GAAG,IAAI,IAAI,OAAO,SAAS,GAAG,GAAG,KAAK,GAAG,OAAO,EAAE,GAClD,KAAK,CAAC;AAEV,MAAM,MAAM,0BAA0B,CAAC,QAAQ,IAAI,QAAQ,SAAS,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,SAAS,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;AACjJ,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;AAChG,MAAM,MAAM,6BAA6B,CAAC,UAAU,SAAS,MAAM,IAAI;KAAG,CAAC,IAAI,UAAU,GAAG,MAAM,GAAG,SAAS;CAAE,CAAC;AAEjH,MAAM,MAAM,6CAA6C,CAAC,QAAQ,EAAE,cAAc,SAAS,EAAE,GAAG,SAAS,GAAG,OAAO,IACjH,+BAA+B,CAAC,QAAQ,CAAC,SAAS,EAAE,GAChD,sBAAsB,CAAC,cAAc,CAAC,SAAS,EAAE,GAC/C,mDAAmD,CAAC,+BAA+B,CAAC,QAAQ,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC,GACtI,+BAA+B,CAAC,QAAQ,CAAC,GAC3C,SAAS,CAAC;AAEhB,MAAM,MAAM,mDAAmD,CAAC,aAAa,SAAS,EAAE,EAAE,mBAAmB,SAAS,EAAE,IAAI;KACzH,CAAC,IAAI,MAAM,aAAa,GAAG,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,SAAS,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAC7I,CAAC"}