vona-module-a-orm 5.0.96 → 5.1.2

package/dist/types/relationsColumns.d.ts

@@ -6,9 +6,9 @@ export type TypeEntityTableColumnNames<EntityMeta extends {
     $table: string;
 } | undefined> = EntityMeta extends {
     $table: string;
-} ? (keyof {
+} ? keyof {
     [K in keyof EntityMeta as K extends '$table' | '$comment' | '$default' ? never : K extends string ? `${EntityMeta['$table']}.${K}` : never]: EntityMeta[K];
-}) : never;
+} : never;
 export type TypeEntityTableColumnNamesShort<Entity> = keyof Entity;
 export type TypeEntityTableColumns<Entity extends {} | undefined, EntityMeta extends {
     $table: string;
@@ -41,5 +41,6 @@ export type TypeEntityTableColumnNamesOfModelJoins<TModelJoins extends TypeModel
 export type TypeEntityTableColumnsOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> = TypeEntityTableColumnsOfModelDirect<TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>>;
 export type TypeEntityTableColumnNamesOfModelSelf<TModel extends BeanModelMeta> = TypeEntityTableColumnNames<TModel[TypeSymbolKeyEntityMeta]> | TypeEntityTableColumnNamesShort<TModel[TypeSymbolKeyEntity]>;
 export type TypeEntityTableColumnsOfModelSelf<TModel extends BeanModelMeta> = TypeEntityTableColumnsOfModelDirect<TModel> & TypeEntityTableColumnsShort<TModel[TypeSymbolKeyEntity]>;
-export type TypeEntityTableColumnNamesOfGeneral<TModelJoins extends TypeModelsClassLikeGeneral | undefined, TModel extends BeanModelMeta | undefined> = TModel extends BeanModelMeta ? TModelJoins extends TypeModelsClassLikeGeneral ? (TypeEntityTableColumnNamesOfModelJoins<TModelJoins> | TypeEntityTableColumnNamesOfModelSelf<TModel>) : (TypeEntityTableColumnNamesOfModelClass<TModel> | TypeEntityTableColumnNamesOfModelSelf<TModel>) : undefined;
-export type TypeEntityTableColumnsOfGeneral<TModelJoins extends TypeModelsClassLikeGeneral | undefined, TModel extends BeanModelMeta | undefined> = TModel extends BeanModelMeta ? TModelJoins extends TypeModelsClassLikeGeneral ? (TypeEntityTableColumnsOfModelJoins<TModelJoins> & TypeEntityTableColumnsOfModelSelf<TModel>) : (TypeEntityTableColumnsOfModelClass<TModel> & TypeEntityTableColumnsOfModelSelf<TModel>) : undefined;
+export type TypeEntityTableColumnNamesOfGeneral<TModelJoins extends TypeModelsClassLikeGeneral | undefined, TModel extends BeanModelMeta | undefined> = TModel extends BeanModelMeta ? TModelJoins extends TypeModelsClassLikeGeneral ? TypeEntityTableColumnNamesOfModelJoins<TModelJoins> | TypeEntityTableColumnNamesOfModelSelf<TModel> : TypeEntityTableColumnNamesOfModelClass<TModel> | TypeEntityTableColumnNamesOfModelSelf<TModel> : undefined;
+export type TypeEntityTableColumnsOfGeneral<TModelJoins extends TypeModelsClassLikeGeneral | undefined, TModel extends BeanModelMeta | undefined> = TModel extends BeanModelMeta ? TModelJoins extends TypeModelsClassLikeGeneral ? TypeEntityTableColumnsOfModelJoins<TModelJoins> & TypeEntityTableColumnsOfModelSelf<TModel> : TypeEntityTableColumnsOfModelClass<TModel> & TypeEntityTableColumnsOfModelSelf<TModel> : undefined;
+//# sourceMappingURL=relationsColumns.d.ts.map

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

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

package/dist/types/relationsDef.d.ts

@@ -9,25 +9,25 @@ import type { TypeModelClassLike, TypeModelOfModelLike, TypeModelsClassLikeGener
 import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
 export type TypeModelRelationType = 'hasOne' | 'belongsTo' | 'hasMany' | 'belongsToMany';
-export interface IModelRelationHasOne<MODEL extends BeanModelMeta | (keyof IModelClassRecord), KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined = keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>> {
+export interface IModelRelationHasOne<MODEL extends BeanModelMeta | keyof IModelClassRecord, KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined = keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>> {
     type?: 'hasOne';
     model?: TypeModelClassLike<MODEL>;
     key?: KEY;
     options?: IModelRelationOptionsOne<TypeModelOfModelLike<MODEL>, AUTOLOAD, COLUMNS>;
 }
-export interface IModelRelationBelongsTo<MODELSelf extends BeanModelMeta | (keyof IModelClassRecord), MODEL extends BeanModelMeta | (keyof IModelClassRecord), AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>> {
+export interface IModelRelationBelongsTo<MODELSelf extends BeanModelMeta | keyof IModelClassRecord, MODEL extends BeanModelMeta | keyof IModelClassRecord, AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>> {
     type?: 'belongsTo';
     model?: TypeModelClassLike<MODEL>;
     key?: keyof TypeModelOfModelLike<MODELSelf>[TypeSymbolKeyEntity];
     options?: IModelRelationOptionsOne<TypeModelOfModelLike<MODEL>, AUTOLOAD, COLUMNS>;
 }
-export interface IModelRelationHasMany<MODEL extends BeanModelMeta | (keyof IModelClassRecord), KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined = keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined, Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined> {
+export interface IModelRelationHasMany<MODEL extends BeanModelMeta | keyof IModelClassRecord, KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity] | undefined = keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined, Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined> {
     type?: 'hasMany';
     model?: TypeModelClassLike<MODEL>;
     key?: KEY;
     options?: IModelRelationOptionsMany<TypeModelOfModelLike<MODEL>, AUTOLOAD, COLUMNS, ModelJoins, Aggrs, Groups>;
 }
-export interface IModelRelationBelongsToMany<MODELMiddle extends BeanModelMeta | (keyof IModelClassRecord), MODEL extends BeanModelMeta | (keyof IModelClassRecord), AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined, Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined> {
+export interface IModelRelationBelongsToMany<MODELMiddle extends BeanModelMeta | keyof IModelClassRecord, MODEL extends BeanModelMeta | keyof IModelClassRecord, AUTOLOAD extends boolean = false, COLUMNS extends TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = TypeModelColumn<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Aggrs extends TypeModelSelectAggrParamsAggrs<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined, Groups extends TypeModelColumnsStrict<TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity]> | undefined = undefined> {
     type?: 'belongsToMany';
     modelMiddle?: TypeModelClassLike<MODELMiddle>;
     model?: TypeModelClassLike<MODEL>;
@@ -57,3 +57,4 @@ export interface IModelRelationOptionsMetaWrapper {
 }
 export type TypeModelRelationOptionsMetaClient = '_auto_' | '_initial_' | '_inherit_' | keyof IDatabaseClientRecord | ServiceDb;
 export type IRelationItem = [string, any, any, any, boolean];
+//# sourceMappingURL=relationsDef.d.ts.map

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

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

package/dist/types/relationsDefDynamic.d.ts

@@ -8,25 +8,25 @@ import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGener
 import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
 import type { TypeModelSelectGroupParamsColumnNames } from './relationsGroup.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
-export interface IModelRelationHasOneDynamic<MODEL extends BeanModelMeta | (keyof IModelClassRecord), KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined> {
+export interface IModelRelationHasOneDynamic<MODEL extends BeanModelMeta | keyof IModelClassRecord, KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined> {
     type?: 'hasOne';
     model?: TypeModelClassLike<MODEL>;
     key?: KEY;
     options?: OPTIONS;
 }
-export interface IModelRelationBelongsToDynamic<MODELSelf extends BeanModelMeta | (keyof IModelClassRecord), MODEL extends BeanModelMeta | (keyof IModelClassRecord), OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined> {
+export interface IModelRelationBelongsToDynamic<MODELSelf extends BeanModelMeta | keyof IModelClassRecord, MODEL extends BeanModelMeta | keyof IModelClassRecord, OPTIONS extends IModelRelationOptionsOneDynamic<TypeModelOfModelLike<MODEL>> | undefined = undefined> {
     type?: 'belongsTo';
     model?: TypeModelClassLike<MODEL>;
     key?: keyof TypeModelOfModelLike<MODELSelf>[TypeSymbolKeyEntity];
     options?: OPTIONS;
 }
-export interface IModelRelationHasManyDynamic<MODEL extends BeanModelMeta | (keyof IModelClassRecord), KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], OPTIONS extends IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group> | undefined = undefined, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Group extends boolean | undefined = undefined> {
+export interface IModelRelationHasManyDynamic<MODEL extends BeanModelMeta | keyof IModelClassRecord, KEY extends keyof TypeModelOfModelLike<MODEL>[TypeSymbolKeyEntity], OPTIONS extends IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group> | undefined = undefined, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Group extends boolean | undefined = undefined> {
     type?: 'hasMany';
     model?: TypeModelClassLike<MODEL>;
     key?: KEY;
     options?: OPTIONS;
 }
-export interface IModelRelationBelongsToManyDynamic<MODELMiddle extends BeanModelMeta | (keyof IModelClassRecord), MODEL extends BeanModelMeta | (keyof IModelClassRecord), OPTIONS extends IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group> | undefined = undefined, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Group extends boolean | undefined = undefined> {
+export interface IModelRelationBelongsToManyDynamic<MODELMiddle extends BeanModelMeta | keyof IModelClassRecord, MODEL extends BeanModelMeta | keyof IModelClassRecord, OPTIONS extends IModelRelationOptionsManyDynamic<TypeModelOfModelLike<MODEL>, ModelJoins, Group> | undefined = undefined, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined, Group extends boolean | undefined = undefined> {
     type?: 'belongsToMany';
     modelMiddle?: TypeModelClassLike<MODELMiddle>;
     model?: TypeModelClassLike<MODEL>;
@@ -44,7 +44,7 @@ export interface IBuildModelRelationOptionsManyDynamic<TRecord, AUTOLOAD extends
     autoload?: AUTOLOAD;
 }
 export interface IBuildModelSelectGeneralParamsBasicDynamic<TRecord, COLUMNS extends TypeModelColumn<TRecord> = TypeModelColumn<TRecord>, TableNames = undefined, ColumnNames = keyof TRecord, Columns extends {} | undefined = undefined, Group extends boolean | undefined = undefined> {
-    distinct?: boolean | (keyof TRecord) | (keyof TRecord)[];
+    distinct?: boolean | keyof TRecord | (keyof TRecord)[];
     columns?: TypeModelColumnsPatch<TRecord, COLUMNS>;
     aggrs?: TypeModelSelectAggrParamsAggrs<TRecord>;
     groups?: TypeModelColumnsStrict<TRecord>;
@@ -54,3 +54,4 @@ export interface IBuildModelSelectGeneralParamsBasicDynamic<TRecord, COLUMNS ext
     limit?: number;
     offset?: number;
 }
+//# sourceMappingURL=relationsDefDynamic.d.ts.map

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

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

package/dist/types/relationsDefMutate.d.ts

@@ -7,3 +7,4 @@ export interface IModelRelationOptionsManyMutate<MODEL extends BeanModelMeta> ex
 }
 export interface IModelRelationOptionsBelongsToManyMutate<_MODEL extends BeanModelMeta> extends IModelRelationOptionsMetaWrapper {
 }
+//# sourceMappingURL=relationsDefMutate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"relationsDefMutate.d.ts","sourceRoot":"","sources":["../../src/types/relationsDefMutate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AAE1E,MAAM,WAAW,8BAA8B,CAAC,KAAK,SAAS,aAAa,CACzE,SAAQ,gCAAgC,EAAE,4BAA4B,CAAC,KAAK,CAAC;CAAG;AAElF,MAAM,WAAW,+BAA+B,CAAC,KAAK,SAAS,aAAa,CAC1E,SAAQ,gCAAgC,EAAE,4BAA4B,CAAC,KAAK,CAAC;CAAG;AAElF,MAAM,WAAW,wCAAwC,CAAC,MAAM,SAAS,aAAa,CAAE,SAAQ,gCAAgC;CAAG"}

package/dist/types/relationsGroup.d.ts

@@ -19,3 +19,4 @@ export type TypeModelAggrRelationResultAggrsToNumberType<Columns> = {
     [K in keyof Columns]: string;
 };
 export type TypeUtilGetGroupsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetParamsGroups<IncludeWrapper> extends string | string[] ? TypeUtilGetParamsGroups<IncludeWrapper> : TypeUtilGetRelationOptionsGroups<Relation>;
+//# sourceMappingURL=relationsGroup.d.ts.map

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

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

package/dist/types/relationsMutate.d.ts

@@ -13,7 +13,7 @@ export type TypeModelMutateParamsRelationOptions<Relation> = boolean | (IModelRe
     with?: Record<string, unknown>;
 });
 export type TypeModelMutateRelationResultMergeInclude<TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown, TForInsertResult extends boolean | undefined = undefined> = {
-    [RelationName in (keyof TModelOptions['relations'])]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeModelMutateRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], TForInsertResult> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult>;
+    [RelationName in keyof TModelOptions['relations']]: TInclude extends {} ? TInclude[RelationName] extends {} | boolean ? TypeModelMutateRelationResultMergeIncludeWrapper<TModelOptions['relations'][RelationName], TInclude[RelationName], TForInsertResult> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult> : TypeModelMutateRelationResultMergeAutoload<TModelOptions['relations'][RelationName], TForInsertResult>;
 };
 export type TypeModelMutateRelationResultMergeAutoload<Relation, TForInsertResult extends boolean | undefined = undefined> = TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined, TForInsertResult> : never;
 export type TypeModelMutateRelationResultMergeIncludeWrapper<Relation, IncludeWrapper, TForInsertResult extends boolean | undefined = undefined> = IncludeWrapper extends false ? never : IncludeWrapper extends true ? TypeUtilMutateGetRelationEntityByType<Relation, undefined, TForInsertResult> : IncludeWrapper extends {} ? TypeUtilMutateGetRelationEntityByType<Relation, IncludeWrapper, TForInsertResult> : never;
@@ -23,7 +23,8 @@ export type TypeUtilMutateGetEntityByType<TRecord, TYPE, TModel extends BeanMode
     deleted?: boolean;
 }> | undefined : TYPE extends 'hasMany' ? Array<TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper, TForInsertResult>> | undefined : TypeModelMutateRelationData<TRecord, TModel, IncludeWrapper, TForInsertResult> | undefined;
 export type TypeModelMutateRelationResultMergeWith<TWith extends {} | undefined | unknown, TForInsertResult extends boolean | undefined = undefined> = TWith extends {} ? {
-    [RelationName in (keyof TWith)]: TypeModelMutateRelationResultMergeWithRelation<TWith[RelationName], TForInsertResult>;
+    [RelationName in keyof TWith]: TypeModelMutateRelationResultMergeWithRelation<TWith[RelationName], TForInsertResult>;
 } : {};
 export type TypeModelMutateRelationResultMergeWithRelation<WithRelation, TForInsertResult extends boolean | undefined = undefined> = WithRelation extends false ? never : WithRelation extends true ? never : WithRelation extends {} ? TypeUtilMutateGetRelationEntityByType<WithRelation, TypeUtilGetRelationOptions<WithRelation>, TForInsertResult> : never;
-export type TypeModelMutateRelationData<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TForInsertResult extends boolean | undefined = undefined> = (TForInsertResult extends true ? TRecord : Partial<TRecord>) & (TModel extends BeanModelMeta ? (Partial<OmitNever<TypeModelMutateRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, TForInsertResult>>> & Partial<OmitNever<TypeModelMutateRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, TForInsertResult>>>) : {});
+export type TypeModelMutateRelationData<TRecord, TModel extends BeanModelMeta | undefined, TOptionsRelation, TForInsertResult extends boolean | undefined = undefined> = (TForInsertResult extends true ? TRecord : Partial<TRecord>) & (TModel extends BeanModelMeta ? Partial<OmitNever<TypeModelMutateRelationResultMergeInclude<TypeUtilGetModelOptions<TModel>, TypeUtilGetParamsInlcude<TOptionsRelation>, TForInsertResult>>> & Partial<OmitNever<TypeModelMutateRelationResultMergeWith<TypeUtilGetParamsWith<TOptionsRelation>, TForInsertResult>>> : {});
+//# sourceMappingURL=relationsMutate.d.ts.map

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

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

package/dist/types/relationsTables.d.ts

@@ -13,3 +13,4 @@ export type TypeEntityTableNamesOfModelOptions<TModelOptions extends IDecoratorM
 export type TypeEntityTableNamesOfModelJoins<TModelJoins extends TypeModelsClassLikeGeneral> = TypeEntityTableNames<TypeModelOfModelLike<TypeConfirmArray<TModelJoins>[number]>[TypeSymbolKeyEntityMeta]>;
 export type TypeEntityTableNamesOfModelClass<TModel extends BeanModelMeta> = TypeEntityTableNamesOfModelOptions<TypeUtilGetModelOptions<TModel>>;
 export type TypeEntityTableNamesOfGeneral<TModelJoins extends TypeModelsClassLikeGeneral | undefined, TModel extends BeanModelMeta | undefined> = TModel extends BeanModelMeta ? TModelJoins extends TypeModelsClassLikeGeneral ? TypeEntityTableNamesOfModelJoins<TModelJoins> : TypeEntityTableNamesOfModelClass<TModel> : undefined;
+//# sourceMappingURL=relationsTables.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"relationsTables.d.ts","sourceRoot":"","sources":["../../src/types/relationsTables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EACV,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,oBAAoB,CAAC,UAAU,SAAS;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,IAAI,UAAU,SAAS;IAAE,MAAM,EAAE,MAAM,SAAS,CAAA;CAAE,GAChI,SAAS,GACT,KAAK,CAAC;AAEV,MAAM,MAAM,kCAAkC,CAAC,aAAa,SAAS,sBAAsB,IAAI,aAAa,CAAC,WAAW,CAAC,SAAS,EAAE,GAChI,gBAAgB,CAAC;KACd,YAAY,IAAI,MAAM,aAAa,CAAC,WAAW,CAAC,GAAG,oBAAoB,CACtE,6BAA6B,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CACxE;CACF,CAAC,GACF,KAAK,CAAC;AAEV,MAAM,MAAM,gCAAgC,CAAC,WAAW,SAAS,0BAA0B,IAAI,oBAAoB,CACjH,oBAAoB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,CACrF,CAAC;AAEF,MAAM,MAAM,gCAAgC,CAAC,MAAM,SAAS,aAAa,IAAI,kCAAkC,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;AAEjJ,MAAM,MAAM,6BAA6B,CACvC,WAAW,SAAS,0BAA0B,GAAG,SAAS,EAC1D,MAAM,SAAS,aAAa,GAAG,SAAS,IACtC,MAAM,SAAS,aAAa,GAC5B,WAAW,SAAS,0BAA0B,GAC5C,gCAAgC,CAAC,WAAW,CAAC,GAC7C,gCAAgC,CAAC,MAAM,CAAC,GAC1C,SAAS,CAAC"}

package/dist/types/transaction.d.ts

@@ -16,3 +16,4 @@ export interface ITransactionOptions {
 export interface ITransactionConsistencyCommitOptions {
     ignoreIfNotInTransaction?: boolean;
 }
+//# sourceMappingURL=transaction.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/types/transaction.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B;;;;;;;CAOzC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,SAAS,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,cAAc,GAAG,UAAU,CAAC;AAEjJ,MAAM,MAAM,0BAA0B,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,cAAc,GAAG,eAAe,GAAG,OAAO,CAAC;AAG5H,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,0BAA0B,CAAC;CAC1C;AAED,MAAM,WAAW,oCAAoC;IACnD,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC"}

package/dist-cli/entity/metadata/generate.js

@@ -41,7 +41,7 @@ declare module 'vona-module-${moduleName}' {
 function __parseTableName(fileContent) {
     let matched = fileContent.match(/@Entity<.*?>\(\{[\s\S]*?table: ('[^']*')[\s\S]*?\}[\s\S]*?\)\s*export class/);
     if (!matched) {
-        matched = fileContent.match(/@Entity<.*?>\(([^)]*)\)/);
+        matched = fileContent.match(/@Entity<.*?>\(\s*('[^']*')/);
     }
     if (!matched)
         return false;

package/dist-cli/model/metadata/generate.js

@@ -39,6 +39,8 @@ export default async function (options) {
       mutate<T extends IModelMutateOptions<${entityName},${className}>>(data?: TypeModelMutateRelationData<${entityName},${className}, T>, options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T>>;
       mutateBulk<T extends IModelMutateOptions<${entityName},${className}>>(items: TypeModelMutateRelationData<${entityName},${className}, T>[], options?: T): Promise<TypeModelMutateRelationData<${entityName},${className}, T>[]>;
       count<T extends IModelSelectCountParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
+      increment<T extends IModelIncrementParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      decrement<T extends IModelIncrementParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
       aggregate<T extends IModelSelectAggrParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
       group<T extends IModelSelectGroupParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<${entityName}, T>[]>;
       ${magics.join('\n')}
@@ -55,7 +57,7 @@ export default async function (options) {
         return '';
     // combine
     const content = `/** ${sceneName}: begin */
-import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
+import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-${moduleName}' {
   ${contentRelations.join('\n')}
@@ -247,7 +249,7 @@ function __parseRelation_options(node) {
     }
     else {
         if (options?.columns.includes('*')) {
-            columns = '\'*\'';
+            columns = "'*'";
         }
         else {
             columns = __joinColumnsType(options?.columns, false);

package/dist-cli/model/metadata/magic.js

@@ -1,7 +1,7 @@
-import { readFileSync } from 'node:fs';
-import path from 'node:path';
 import { ensureArray } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
 // id/name/enabled/disabled/closed/active
 const __MagicFields = {
     id: {

package/package.json

@@ -1,7 +1,45 @@
 {
   "name": "vona-module-a-orm",
+  "version": "5.1.2",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
+  "description": "db",
+  "keywords": [
+    "Cabloy Module"
+  ],
+  "author": "zhennann",
+  "files": [
+    "assets",
+    "cli",
+    "dist",
+    "dist-cli",
+    "src"
+  ],
   "type": "module",
-  "version": "5.0.96",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "clean": "rimraf dist dist-cli tsconfig.build.tsbuildinfo tsconfig.cli.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json && tsc -p tsconfig.cli.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore && npm run clean"
+  },
+  "dependencies": {
+    "knex": "^3.1.0",
+    "table-identity": "^1.1.2"
+  },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.0.1"
+  },
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {
@@ -38,39 +76,5 @@
         "boilerplate": "databaseDialect/boilerplate"
       }
     }
-  },
-  "description": "db",
-  "author": "zhennann",
-  "keywords": [
-    "Cabloy Module"
-  ],
-  "exports": {
-    ".": {
-      "types": [
-        "./src/index.ts",
-        "./dist/index.d.ts"
-      ],
-      "default": "./dist/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "assets",
-    "cli",
-    "dist",
-    "dist-cli"
-  ],
-  "dependencies": {
-    "knex": "^3.1.0",
-    "table-identity": "^1.0.13"
-  },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.0.1"
-  },
-  "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
-  "scripts": {
-    "clean": "rimraf dist dist-cli tsconfig.build.tsbuildinfo tsconfig.cli.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json && tsc -p tsconfig.cli.json"
   }
-}
+}