vona-module-a-orm 5.1.36 → 5.1.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js.map +1 -1
- package/dist/lib/bean.model/bean.model_crud_inner.d.ts +3 -3
- package/dist/lib/bean.model/bean.model_crud_inner.d.ts.map +1 -1
- package/dist/lib/bean.model/bean.model_crud_table.d.ts +3 -3
- package/dist/lib/bean.model/bean.model_crud_table.d.ts.map +1 -1
- package/dist/types/dto/dtoMutate.d.ts +12 -2
- package/dist/types/dto/dtoMutate.d.ts.map +1 -1
- package/dist/types/relationsGroup.d.ts +8 -6
- package/dist/types/relationsGroup.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/lib/bean.model/bean.model_crud_inner.ts +6 -2
- package/src/lib/bean.model/bean.model_crud_table.ts +4 -4
- package/src/types/dto/dtoMutate.ts +38 -9
- package/src/types/relationsGroup.ts +12 -10
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { Knex } from 'knex';
|
|
2
2
|
import type { TableIdentity } from 'table-identity';
|
|
3
|
-
import type { IModelCountParams, IModelGetOptionsGeneral, IModelIncrementParams, IModelMethodOptionsGeneral, IModelSelectGeneralParams, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
|
|
3
|
+
import type { IBuildModelCountParams, IBuildModelSelectParams, IModelCountParams, IModelGetOptionsGeneral, IModelIncrementParams, IModelMethodOptionsGeneral, IModelSelectGeneralParams, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
|
|
4
4
|
import { BeanModelView } from './bean.model_view.ts';
|
|
5
5
|
export declare class BeanModelCrudInner<TRecord extends {}> extends BeanModelView<TRecord> {
|
|
6
6
|
protected _mget(table?: keyof ITableRecord, ids?: TableIdentity[], options?: IModelGetOptionsGeneral<TRecord>): Promise<TRecord[]>;
|
|
7
7
|
protected _mget_original(table?: keyof ITableRecord, ids?: TableIdentity[], options?: IModelGetOptionsGeneral<TRecord>): Promise<(TRecord | undefined)[]>;
|
|
8
|
-
protected _select<T extends IModelSelectParams<TRecord>>(table?: keyof ITableRecord, params?: T, options?: IModelMethodOptionsGeneral, builder?: Knex.QueryBuilder<TRecord, TRecord[]>): Promise<TRecord[]>;
|
|
8
|
+
protected _select<T extends IModelSelectParams<TRecord> | IBuildModelSelectParams<TRecord, undefined, never>>(table?: keyof ITableRecord, params?: T, options?: IModelMethodOptionsGeneral, builder?: Knex.QueryBuilder<TRecord, TRecord[]>): Promise<TRecord[]>;
|
|
9
9
|
protected _select_buildParams<T extends IModelSelectGeneralParams<TRecord>>(table: keyof ITableRecord, params?: T, options?: IModelMethodOptionsGeneral): Knex.QueryBuilder<TRecord, TRecord[]>;
|
|
10
10
|
protected _get(table: keyof ITableRecord | undefined, where: TypeModelWhere<TRecord>, options?: IModelGetOptionsGeneral<TRecord>): Promise<TRecord | undefined>;
|
|
11
|
-
protected _count(table?: keyof ITableRecord, params?: IModelCountParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<string | undefined>;
|
|
11
|
+
protected _count(table?: keyof ITableRecord, params?: IModelCountParams<TRecord> | IBuildModelCountParams<TRecord, undefined, never>, options?: IModelMethodOptionsGeneral): Promise<string | undefined>;
|
|
12
12
|
protected _increment(table?: keyof ITableRecord, params?: IModelIncrementParams<TRecord>, options?: IModelMethodOptionsGeneral): Promise<number>;
|
|
13
13
|
protected _insertBulk(table?: keyof ITableRecord, data?: Partial<TRecord> | Partial<TRecord>[], options?: IModelMethodOptionsGeneral): Promise<TRecord | TRecord[]>;
|
|
14
14
|
protected _update(table: keyof ITableRecord | undefined, data: Partial<TRecord>, options?: IModelUpdateOptionsGeneral<TRecord>): Promise<Partial<TRecord>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;cAChE,KAAK,CACnB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,EAAE,CAAC;cAML,cAAc,CAC5B,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC;cA8BnB,OAAO,
|
|
1
|
+
{"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { TableIdentity } from 'table-identity';
|
|
2
|
-
import type {
|
|
2
|
+
import type { IBuildModelCountParams, IBuildModelSelectParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
|
|
3
3
|
import { BeanModelCrudInner } from './bean.model_crud_inner.ts';
|
|
4
4
|
export declare class BeanModelCrudTable<TRecord extends {}> extends BeanModelCrudInner<TRecord> {
|
|
5
5
|
mget(table: keyof ITableRecord, ids: TableIdentity[], options?: Omit<IModelGetOptionsGeneral<TRecord>, 'include' | 'with'>): Promise<TRecord[]>;
|
|
6
|
-
select(table: keyof ITableRecord, params?: Omit<
|
|
6
|
+
select(table: keyof ITableRecord, params?: Omit<IBuildModelSelectParams<TRecord, undefined, never>, 'include' | 'with'>, options?: IModelMethodOptionsGeneral): Promise<TRecord[]>;
|
|
7
7
|
get(table: keyof ITableRecord, where: TypeModelWhere<TRecord>, options?: Omit<IModelGetOptionsGeneral<TRecord>, 'include' | 'with'>): Promise<TRecord | undefined>;
|
|
8
|
-
count(table: keyof ITableRecord, params?:
|
|
8
|
+
count(table: keyof ITableRecord, params?: IBuildModelCountParams<TRecord, undefined, never>, options?: IModelMethodOptionsGeneral): Promise<string | undefined>;
|
|
9
9
|
insert(table: keyof ITableRecord, data?: Partial<TRecord>, options?: IModelMethodOptionsGeneral): Promise<TRecord>;
|
|
10
10
|
insertBulk(table: keyof ITableRecord, data: Partial<TRecord>[], options?: IModelMethodOptionsGeneral): Promise<TRecord[]>;
|
|
11
11
|
update(table: keyof ITableRecord, data: Partial<TRecord>, options?: IModelUpdateOptionsGeneral<TRecord>): Promise<Partial<TRecord>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_crud_table.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_crud_table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"bean.model_crud_table.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_crud_table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,0BAA0B,EAC1B,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IAC/E,IAAI,CACR,KAAK,EAAE,MAAM,YAAY,EACzB,GAAG,EAAE,aAAa,EAAE,EACpB,OAAO,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,GACnE,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,EACrF,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,GAAG,CACP,KAAK,EAAE,MAAM,YAAY,EACzB,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,GACnE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAIzB,KAAK,CACT,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,EAC1D,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIxB,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC;IAIb,UAAU,CACd,KAAK,EAAE,MAAM,YAAY,EACzB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EACxB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAItB,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;CAGjB"}
|
|
@@ -14,7 +14,9 @@ export interface IBuildDtoMutateParamsBasic<TRecord> {
|
|
|
14
14
|
dtoClass?: Constructable<unknown>;
|
|
15
15
|
}
|
|
16
16
|
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>;
|
|
17
|
-
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> =
|
|
17
|
+
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> = (TOptionsRelation extends {
|
|
18
|
+
dtoClass: Constructable<infer TDto>;
|
|
19
|
+
} ? TypeDtoMutateRelationResultDto<TDto, TMutateTypeTopLevel, TTopLevel, REFKEY> : 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>>> : {});
|
|
18
20
|
type TypeDtoMutateRelationResultMergeInclude<TMutateTypeTopLevel extends TypeDtoMutateType, TModelOptions extends IDecoratorModelOptions, TInclude extends {} | undefined | unknown> = {
|
|
19
21
|
[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]>;
|
|
20
22
|
};
|
|
@@ -24,11 +26,19 @@ type TypeDtoMutateModelRelationResultMergeWith<TMutateTypeTopLevel extends TypeD
|
|
|
24
26
|
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;
|
|
25
27
|
type TypeDtoMutateRelationResultMergeAutoload<TMutateTypeTopLevel extends TypeDtoMutateType, Relation> = TypeUtilGetRelationOptionsAutoload<Relation> extends true ? TypeUtilGetDtoMutateRelationEntityByType<TMutateTypeTopLevel, Relation, undefined> : never;
|
|
26
28
|
type TypeDtoMutateRelationResultMergeWithRelation<TMutateTypeTopLevel extends TypeDtoMutateType, WithRelation> = WithRelation extends false ? never : WithRelation extends true ? never : WithRelation extends {} ? TypeUtilGetDtoMutateRelationEntityByType<TMutateTypeTopLevel, WithRelation, TypeUtilGetRelationOptions<WithRelation>> : never;
|
|
27
|
-
type
|
|
29
|
+
type TypeUtilGetDtoMutateRelationParams<Relation, IncludeWrapper> = IncludeWrapper extends {
|
|
30
|
+
dtoClass: Constructable<unknown>;
|
|
31
|
+
} ? IncludeWrapper : TypeUtilGetRelationOptions<Relation> extends {
|
|
32
|
+
dtoClass: infer TDtoClass extends Constructable<unknown>;
|
|
33
|
+
} ? (IncludeWrapper extends {} ? IncludeWrapper : {}) & {
|
|
34
|
+
dtoClass: TDtoClass;
|
|
35
|
+
} : IncludeWrapper;
|
|
36
|
+
type TypeUtilGetDtoMutateRelationEntityByType<TMutateTypeTopLevel extends TypeDtoMutateType, Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetDtoMutateEntityByType<TMutateTypeTopLevel, TypeUtilGetRelationEntity<Relation>, TypeUtilGetRelationType<Relation>, TypeUtilGetRelationModel<Relation>, TypeUtilGetDtoMutateRelationParams<Relation, IncludeWrapper>, TypeUtilGetColumnsFromRelationAndIncludeWrapper<Relation, IncludeWrapper>, TypeUtilGetRelationKey<Relation>>;
|
|
28
37
|
type TypeUtilGetDtoMutateEntityByType<TMutateTypeTopLevel extends TypeDtoMutateType, TRecord, TYPE, TModel extends BeanModelMeta | undefined, IncludeWrapper extends {} | undefined | unknown, Columns, REFKEY = undefined> = TYPE extends 'belongsTo' ? never : TYPE extends 'belongsToMany' ? Array<{
|
|
29
38
|
id: TableIdentity;
|
|
30
39
|
deleted?: boolean;
|
|
31
40
|
}> | undefined : TYPE extends 'hasMany' ? Array<TypeDtoMutateRelationResult<TRecord, TModel, IncludeWrapper, TMutateTypeTopLevel, undefined, false, Columns, REFKEY>> | undefined : TypeDtoMutateRelationResult<TRecord, TModel, IncludeWrapper, TMutateTypeTopLevel, undefined, false, Columns, REFKEY> | undefined;
|
|
41
|
+
type TypeDtoMutateRelationResultDto<TDto, TMutateTypeTopLevel extends TypeDtoMutateType, TTopLevel extends boolean | undefined, REFKEY> = TTopLevel extends false ? Omit<TMutateTypeTopLevel extends 'create' ? Omit<TDto, 'id' | 'deleted'> : Partial<Pick<TDto, Extract<keyof TDto, 'id' | 'deleted'>>> & Omit<TDto, 'id' | 'deleted'>, Extract<keyof TDto, REFKEY>> : TDto;
|
|
32
42
|
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>;
|
|
33
43
|
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>;
|
|
34
44
|
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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtoMutate.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoMutate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,+CAA+C,EAC/C,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,0BAA0B,EAC1B,kCAAkC,EAClC,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE/D,MAAM,MAAM,gBAAgB,CAAC,SAAS,SAAS,aAAa,GAAG,MAAM,iBAAiB,IACpF,qBAAqB,CACnB,oBAAoB,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC,EACpD,oBAAoB,CAAC,SAAS,CAAC,CAChC,CAAC;AAEJ,MAAM,WAAW,qBAAqB,CAAC,OAAO,EAAE,KAAK,SAAS,aAAa,CACzE,SAAQ,4BAA4B,CAAC,KAAK,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC;CAAG;AAErF,MAAM,WAAW,0BAA0B,CAAC,OAAO;IACjD,OAAO,CAAC,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,MAAM,mBAAmB,CAC7B,SAAS,SAAS,aAAa,GAAG,MAAM,iBAAiB,EACzD,gBAAgB,EAChB,mBAAmB,SAAS,iBAAiB,EAC7C,mBAAmB,SAAS,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,SAAS,EACrE,SAAS,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,IAC/C,2BAA2B,CAC7B,oBAAoB,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC,EACpD,oBAAoB,CAAC,SAAS,CAAC,EAC/B,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,SAAS,CACV,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,OAAO,EACP,MAAM,SAAS,aAAa,GAAG,SAAS,EACxC,gBAAgB,EAChB,mBAAmB,SAAS,iBAAiB,EAC7C,mBAAmB,SAAS,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,SAAS,EACrE,SAAS,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EACjD,QAAQ,GAAG,SAAS,EACpB,MAAM,GAAG,SAAS,IAChB,iCAAiC,
|
|
1
|
+
{"version":3,"file":"dtoMutate.d.ts","sourceRoot":"","sources":["../../../src/types/dto/dtoMutate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
|
|
2
2
|
import type { TypeModelColumnsStrict } from './modelWhere.ts';
|
|
3
|
-
import type { TypeUtilGetParamsAggrs, TypeUtilGetParamsColumns, TypeUtilGetParamsGroups, TypeUtilGetRelationOptionsGroups } from './relations.ts';
|
|
3
|
+
import type { TypeUtilGetParamsAggrs, TypeUtilGetParamsColumns, TypeUtilGetParamsGroups, TypeUtilGetRelationOptionsGroups, TypeUtilEntitySelector, TypeUtilPrepareColumns } from './relations.ts';
|
|
4
4
|
import type { TypeModelAggrRelationResultAggr, TypeModelAggrRelationResultAggrs, TypeRecordAggrsValues, TypeRecordAggrsValuesToObject, TypeUtilAggrPrepareColumns } from './relationsAggr.ts';
|
|
5
5
|
export type TypeModelGroupRelationResult<TRecord, TOptions> = TypeModelGroupRelationResultGroups<TRecord, TypeUtilGetParamsAggrs<TOptions>, TypeUtilGetParamsGroups<TOptions>, TypeUtilGetParamsColumns<TOptions>>;
|
|
6
|
-
export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns> = Groups extends
|
|
6
|
+
export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns> = [Groups] extends [
|
|
7
|
+
string | string[]
|
|
8
|
+
] ? TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> & (Aggrs extends {} ? TypeRecordAggrsValuesToObject<TypeRecordAggrsValues<{
|
|
7
9
|
[K in keyof Aggrs]: K extends string ? TypeModelAggrRelationResultAggr<K, TypeUtilAggrPrepareColumns<Aggrs[K]>> : never;
|
|
8
10
|
}>> : {}) : {};
|
|
9
|
-
export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> = Columns extends
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> = [Columns] extends [
|
|
12
|
+
string | string[]
|
|
13
|
+
] ? TypeUtilEntitySelector<TRecord, TypeUtilPrepareColumns<Columns>> : [Groups] extends [string | string[]] ? {
|
|
12
14
|
[K in TypeUtilAggrPrepareColumns<Groups>]: K extends keyof TRecord ? TRecord[K] : never;
|
|
13
15
|
} : {};
|
|
14
16
|
export type TypeModelSelectGroupParamsColumnNames<TRecord, ColumnNames extends TypeModelColumnsStrict<TRecord> | undefined = TypeModelColumnsStrict<TRecord>, Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> | undefined = TypeModelSelectAggrParamsAggrs<TRecord>> = (ColumnNames extends TypeModelColumnsStrict<TRecord> ? TypeUtilAggrPrepareColumns<ColumnNames> : never) | (Aggrs extends TypeModelSelectAggrParamsAggrs<TRecord> ? keyof TypeModelAggrRelationResultAggrs<Aggrs> : never);
|
|
@@ -16,7 +18,7 @@ export type TypeModelSelectGroupParamsColumns<TRecord, ColumnNames extends TypeM
|
|
|
16
18
|
[K in TypeUtilAggrPrepareColumns<ColumnNames>]: K extends keyof TRecord ? TRecord[K] : never;
|
|
17
19
|
} : {}) & TypeModelAggrRelationResultAggrsToNumberType<TypeModelAggrRelationResultAggrs<Aggrs>>;
|
|
18
20
|
export type TypeModelAggrRelationResultAggrsToNumberType<Columns> = {
|
|
19
|
-
[K in keyof Columns]: string;
|
|
21
|
+
[K in keyof Columns]: number | string;
|
|
20
22
|
};
|
|
21
23
|
export type TypeUtilGetGroupsFromRelationAndIncludeWrapper<Relation, IncludeWrapper extends {} | undefined | unknown> = TypeUtilGetParamsGroups<IncludeWrapper> extends string | string[] ? TypeUtilGetParamsGroups<IncludeWrapper> : TypeUtilGetRelationOptionsGroups<Relation>;
|
|
22
24
|
//# sourceMappingURL=relationsGroup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationsGroup.d.ts","sourceRoot":"","sources":["../../src/types/relationsGroup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EACV,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,gCAAgC,
|
|
1
|
+
{"version":3,"file":"relationsGroup.d.ts","sourceRoot":"","sources":["../../src/types/relationsGroup.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -5,6 +5,8 @@ import { isNil } from '@cabloy/utils';
|
|
|
5
5
|
import { cast } from 'vona';
|
|
6
6
|
|
|
7
7
|
import type {
|
|
8
|
+
IBuildModelCountParams,
|
|
9
|
+
IBuildModelSelectParams,
|
|
8
10
|
IModelCountParams,
|
|
9
11
|
IModelGetOptionsGeneral,
|
|
10
12
|
IModelIncrementParams,
|
|
@@ -63,7 +65,9 @@ export class BeanModelCrudInner<TRecord extends {}> extends BeanModelView<TRecor
|
|
|
63
65
|
return result;
|
|
64
66
|
}
|
|
65
67
|
|
|
66
|
-
protected async _select<
|
|
68
|
+
protected async _select<
|
|
69
|
+
T extends IModelSelectParams<TRecord> | IBuildModelSelectParams<TRecord, undefined, never>,
|
|
70
|
+
>(
|
|
67
71
|
table?: keyof ITableRecord,
|
|
68
72
|
params?: T,
|
|
69
73
|
options?: IModelMethodOptionsGeneral,
|
|
@@ -141,7 +145,7 @@ export class BeanModelCrudInner<TRecord extends {}> extends BeanModelView<TRecor
|
|
|
141
145
|
|
|
142
146
|
protected async _count(
|
|
143
147
|
table?: keyof ITableRecord,
|
|
144
|
-
params?: IModelCountParams<TRecord>,
|
|
148
|
+
params?: IModelCountParams<TRecord> | IBuildModelCountParams<TRecord, undefined, never>,
|
|
145
149
|
options?: IModelMethodOptionsGeneral,
|
|
146
150
|
): Promise<string | undefined> {
|
|
147
151
|
// table
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { TableIdentity } from 'table-identity';
|
|
2
2
|
|
|
3
3
|
import type {
|
|
4
|
-
|
|
4
|
+
IBuildModelCountParams,
|
|
5
|
+
IBuildModelSelectParams,
|
|
5
6
|
IModelGetOptionsGeneral,
|
|
6
7
|
IModelMethodOptionsGeneral,
|
|
7
|
-
IModelSelectParams,
|
|
8
8
|
IModelUpdateOptionsGeneral,
|
|
9
9
|
ITableRecord,
|
|
10
10
|
TypeModelWhere,
|
|
@@ -23,7 +23,7 @@ export class BeanModelCrudTable<TRecord extends {}> extends BeanModelCrudInner<T
|
|
|
23
23
|
|
|
24
24
|
async select(
|
|
25
25
|
table: keyof ITableRecord,
|
|
26
|
-
params?: Omit<
|
|
26
|
+
params?: Omit<IBuildModelSelectParams<TRecord, undefined, never>, 'include' | 'with'>,
|
|
27
27
|
options?: IModelMethodOptionsGeneral,
|
|
28
28
|
): Promise<TRecord[]> {
|
|
29
29
|
return await this._select(table, params, options);
|
|
@@ -39,7 +39,7 @@ export class BeanModelCrudTable<TRecord extends {}> extends BeanModelCrudInner<T
|
|
|
39
39
|
|
|
40
40
|
async count(
|
|
41
41
|
table: keyof ITableRecord,
|
|
42
|
-
params?:
|
|
42
|
+
params?: IBuildModelCountParams<TRecord, undefined, never>,
|
|
43
43
|
options?: IModelMethodOptionsGeneral,
|
|
44
44
|
): Promise<string | undefined> {
|
|
45
45
|
return await this._count(table, params, options);
|
|
@@ -65,14 +65,16 @@ export type TypeDtoMutateRelationResult<
|
|
|
65
65
|
TTopLevel extends boolean | undefined = undefined,
|
|
66
66
|
TColumns = undefined,
|
|
67
67
|
REFKEY = undefined,
|
|
68
|
-
> =
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
68
|
+
> = (TOptionsRelation extends { dtoClass: Constructable<infer TDto> }
|
|
69
|
+
? TypeDtoMutateRelationResultDto<TDto, TMutateTypeTopLevel, TTopLevel, REFKEY>
|
|
70
|
+
: TypeDtoMutateRelationResultEntity<
|
|
71
|
+
TRecord,
|
|
72
|
+
TColumns extends string | string[] ? TColumns : TypeUtilGetParamsColumns<TOptionsRelation>,
|
|
73
|
+
TMutateTypeTopLevel,
|
|
74
|
+
TColumnsOmitDefault,
|
|
75
|
+
TTopLevel,
|
|
76
|
+
REFKEY
|
|
77
|
+
>) &
|
|
76
78
|
(TModel extends BeanModelMeta
|
|
77
79
|
? OmitNever<
|
|
78
80
|
TypeDtoMutateRelationResultMergeInclude<
|
|
@@ -158,6 +160,17 @@ type TypeDtoMutateRelationResultMergeWithRelation<
|
|
|
158
160
|
>
|
|
159
161
|
: never;
|
|
160
162
|
|
|
163
|
+
// Relation options supply the default dtoClass; an include wrapper may override it.
|
|
164
|
+
type TypeUtilGetDtoMutateRelationParams<Relation, IncludeWrapper> = IncludeWrapper extends {
|
|
165
|
+
dtoClass: Constructable<unknown>;
|
|
166
|
+
}
|
|
167
|
+
? IncludeWrapper
|
|
168
|
+
: TypeUtilGetRelationOptions<Relation> extends {
|
|
169
|
+
dtoClass: infer TDtoClass extends Constructable<unknown>;
|
|
170
|
+
}
|
|
171
|
+
? (IncludeWrapper extends {} ? IncludeWrapper : {}) & { dtoClass: TDtoClass }
|
|
172
|
+
: IncludeWrapper;
|
|
173
|
+
|
|
161
174
|
type TypeUtilGetDtoMutateRelationEntityByType<
|
|
162
175
|
TMutateTypeTopLevel extends TypeDtoMutateType,
|
|
163
176
|
Relation,
|
|
@@ -167,7 +180,7 @@ type TypeUtilGetDtoMutateRelationEntityByType<
|
|
|
167
180
|
TypeUtilGetRelationEntity<Relation>,
|
|
168
181
|
TypeUtilGetRelationType<Relation>,
|
|
169
182
|
TypeUtilGetRelationModel<Relation>,
|
|
170
|
-
IncludeWrapper
|
|
183
|
+
TypeUtilGetDtoMutateRelationParams<Relation, IncludeWrapper>,
|
|
171
184
|
TypeUtilGetColumnsFromRelationAndIncludeWrapper<Relation, IncludeWrapper>,
|
|
172
185
|
TypeUtilGetRelationKey<Relation>
|
|
173
186
|
>;
|
|
@@ -211,6 +224,22 @@ type TypeUtilGetDtoMutateEntityByType<
|
|
|
211
224
|
>
|
|
212
225
|
| undefined;
|
|
213
226
|
|
|
227
|
+
// dtoClass supplies its own fields, so neither columns nor default entity omissions apply.
|
|
228
|
+
// Nested mutations still remove the parent key and patch identity/deletion fields that exist.
|
|
229
|
+
type TypeDtoMutateRelationResultDto<
|
|
230
|
+
TDto,
|
|
231
|
+
TMutateTypeTopLevel extends TypeDtoMutateType,
|
|
232
|
+
TTopLevel extends boolean | undefined,
|
|
233
|
+
REFKEY,
|
|
234
|
+
> = TTopLevel extends false
|
|
235
|
+
? Omit<
|
|
236
|
+
TMutateTypeTopLevel extends 'create'
|
|
237
|
+
? Omit<TDto, 'id' | 'deleted'>
|
|
238
|
+
: Partial<Pick<TDto, Extract<keyof TDto, 'id' | 'deleted'>>> & Omit<TDto, 'id' | 'deleted'>,
|
|
239
|
+
Extract<keyof TDto, REFKEY>
|
|
240
|
+
>
|
|
241
|
+
: TDto;
|
|
242
|
+
|
|
214
243
|
type TypeDtoMutateRelationResultEntity<
|
|
215
244
|
TRecord,
|
|
216
245
|
Columns = undefined,
|
|
@@ -5,6 +5,8 @@ import type {
|
|
|
5
5
|
TypeUtilGetParamsColumns,
|
|
6
6
|
TypeUtilGetParamsGroups,
|
|
7
7
|
TypeUtilGetRelationOptionsGroups,
|
|
8
|
+
TypeUtilEntitySelector,
|
|
9
|
+
TypeUtilPrepareColumns,
|
|
8
10
|
} from './relations.ts';
|
|
9
11
|
import type {
|
|
10
12
|
TypeModelAggrRelationResultAggr,
|
|
@@ -21,9 +23,9 @@ export type TypeModelGroupRelationResult<TRecord, TOptions> = TypeModelGroupRela
|
|
|
21
23
|
TypeUtilGetParamsColumns<TOptions>
|
|
22
24
|
>;
|
|
23
25
|
|
|
24
|
-
export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns> = Groups extends
|
|
25
|
-
| string
|
|
26
|
-
|
|
26
|
+
export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns> = [Groups] extends [
|
|
27
|
+
string | string[],
|
|
28
|
+
]
|
|
27
29
|
? TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> &
|
|
28
30
|
(Aggrs extends {}
|
|
29
31
|
? TypeRecordAggrsValuesToObject<
|
|
@@ -36,11 +38,11 @@ export type TypeModelGroupRelationResultGroups<TRecord, Aggrs, Groups, Columns>
|
|
|
36
38
|
: {})
|
|
37
39
|
: {}; // not use undefined
|
|
38
40
|
|
|
39
|
-
export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> = Columns extends
|
|
40
|
-
| string
|
|
41
|
-
|
|
42
|
-
?
|
|
43
|
-
: Groups extends string | string[]
|
|
41
|
+
export type TypeModelGroupRelationResultGroupsObject<TRecord, Groups, Columns> = [Columns] extends [
|
|
42
|
+
string | string[],
|
|
43
|
+
]
|
|
44
|
+
? TypeUtilEntitySelector<TRecord, TypeUtilPrepareColumns<Columns>>
|
|
45
|
+
: [Groups] extends [string | string[]]
|
|
44
46
|
? { [K in TypeUtilAggrPrepareColumns<Groups>]: K extends keyof TRecord ? TRecord[K] : never }
|
|
45
47
|
: {};
|
|
46
48
|
|
|
@@ -68,8 +70,8 @@ export type TypeModelSelectGroupParamsColumns<
|
|
|
68
70
|
TypeModelAggrRelationResultAggrsToNumberType<TypeModelAggrRelationResultAggrs<Aggrs>>;
|
|
69
71
|
|
|
70
72
|
export type TypeModelAggrRelationResultAggrsToNumberType<Columns> = {
|
|
71
|
-
[K in keyof Columns]: string;
|
|
72
|
-
};
|
|
73
|
+
[K in keyof Columns]: number | string;
|
|
74
|
+
};
|
|
73
75
|
|
|
74
76
|
export type TypeUtilGetGroupsFromRelationAndIncludeWrapper<
|
|
75
77
|
Relation,
|