vona-module-a-orm 5.1.37 → 5.1.39
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.
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationsColumns.d.ts","sourceRoot":"","sources":["../../src/types/relationsColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EACV,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,uBAAuB,EACvB,yBAAyB,EACzB,uBAAuB,EACvB,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,0BAA0B,CAAC,UAAU,SAAS;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,IACtF,UAAU,SAAS;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACjC,MAAM;
|
|
1
|
+
{"version":3,"file":"relationsColumns.d.ts","sourceRoot":"","sources":["../../src/types/relationsColumns.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -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,
|
|
@@ -16,11 +16,13 @@ import type {
|
|
|
16
16
|
export type TypeEntityTableColumnNames<EntityMeta extends { $table: string } | undefined> =
|
|
17
17
|
EntityMeta extends { $table: string }
|
|
18
18
|
? keyof {
|
|
19
|
-
[
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
[
|
|
20
|
+
K in keyof EntityMeta as K extends '$table' | '$comment' | '$default'
|
|
21
|
+
? never
|
|
22
|
+
: K extends string
|
|
23
|
+
? `${EntityMeta['$table']}.${K}`
|
|
24
|
+
: never
|
|
25
|
+
]: EntityMeta[K];
|
|
24
26
|
}
|
|
25
27
|
: never;
|
|
26
28
|
export type TypeEntityTableColumnNamesShort<Entity> = keyof Entity;
|