@steroidsjs/nest 1.2.9 → 1.2.12
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/package.json +1 -1
- package/src/infrastructure/decorators/Transform.d.ts +5 -2
- package/src/infrastructure/decorators/Transform.js.map +1 -1
- package/src/infrastructure/decorators/fields/DateTimeField.d.ts +6 -0
- package/src/infrastructure/decorators/fields/DateTimeField.js +11 -6
- package/src/infrastructure/decorators/fields/DateTimeField.js.map +1 -1
- package/src/infrastructure/decorators/fields/RelationField.d.ts +8 -3
- package/src/infrastructure/decorators/fields/RelationField.js +21 -14
- package/src/infrastructure/decorators/fields/RelationField.js.map +1 -1
- package/src/infrastructure/decorators/fields/RelationIdField.d.ts +4 -7
- package/src/infrastructure/decorators/fields/RelationIdField.js +6 -17
- package/src/infrastructure/decorators/fields/RelationIdField.js.map +1 -1
- package/src/usecases/helpers/DataMapper.js +9 -1
- package/src/usecases/helpers/DataMapper.js.map +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/package.json
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { IAllFieldOptions } from './fields';
|
|
2
2
|
export declare const STEROIDS_META_TRANSFORM_PREFIX = "steroids_meta_transform_";
|
|
3
|
-
export
|
|
3
|
+
export interface ITransformCallbackEvent {
|
|
4
4
|
value: any;
|
|
5
5
|
item: any;
|
|
6
6
|
key: string;
|
|
7
7
|
options: IAllFieldOptions;
|
|
8
|
-
|
|
8
|
+
transformType: ITransformType;
|
|
9
|
+
object: any;
|
|
10
|
+
}
|
|
11
|
+
export declare type ITransformCallback = (event: ITransformCallbackEvent) => any;
|
|
9
12
|
export declare type ITransformType = 'default' | 'computable' | 'from_db' | 'to_db' | string;
|
|
10
13
|
export declare const TRANSFORM_TYPE_DEFAULT = "default";
|
|
11
14
|
export declare const TRANSFORM_TYPE_COMPUTABLE = "computable";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transform.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/Transform.ts"],"names":[],"mappings":";;;AAEa,QAAA,8BAA8B,GAAG,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"Transform.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/Transform.ts"],"names":[],"mappings":";;;AAEa,QAAA,8BAA8B,GAAG,0BAA0B,CAAC;AAc5D,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,yBAAyB,GAAG,YAAY,CAAC;AACzC,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAErC,MAAM,qBAAqB,GAAG,CACjC,MAAW,EACX,YAAoB,EACpB,aAA6B,EACT,EAAE;IACtB,OAAO,OAAO,CAAC,WAAW,CAAC,sCAA8B,GAAG,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,CAAA;AAC1G,CAAC,CAAA;AANY,QAAA,qBAAqB,yBAMjC;AAEM,MAAM,SAAS,GAAG,CACrB,QAA4B,EAC5B,gBAAgC,8BAAsB,EACxD,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;IAC1B,MAAM,SAAS,GAAG,IAAA,6BAAqB,EAAC,MAAM,EAAE,YAAY,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC;IACnF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,OAAO,CAAC,cAAc,CAAC,sCAA8B,GAAG,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAC5G,CAAC,CAAC;AAPW,QAAA,SAAS,aAOpB"}
|
|
@@ -3,4 +3,10 @@ export declare const normalizeDateTime: (value: any) => string;
|
|
|
3
3
|
export interface IDateTimeFieldColumnOptions extends IBaseFieldOptions {
|
|
4
4
|
precision?: number;
|
|
5
5
|
}
|
|
6
|
+
export declare const dateTimeTransformFromDb: ({ value }: {
|
|
7
|
+
value: any;
|
|
8
|
+
}) => string;
|
|
9
|
+
export declare const dateTimeTransformToDb: ({ value }: {
|
|
10
|
+
value: any;
|
|
11
|
+
}) => string;
|
|
6
12
|
export declare function DateTimeField(options?: IDateTimeFieldColumnOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DateTimeField = exports.normalizeDateTime = void 0;
|
|
3
|
+
exports.DateTimeField = exports.dateTimeTransformToDb = exports.dateTimeTransformFromDb = exports.normalizeDateTime = void 0;
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
6
|
const typeorm_1 = require("typeorm");
|
|
@@ -8,6 +8,7 @@ const class_validator_1 = require("class-validator");
|
|
|
8
8
|
const class_transformer_1 = require("class-transformer");
|
|
9
9
|
const BaseField_1 = require("./BaseField");
|
|
10
10
|
const date_fns_1 = require("date-fns");
|
|
11
|
+
const Transform_1 = require("../Transform");
|
|
11
12
|
const normalizeDateTime = value => {
|
|
12
13
|
if (!value) {
|
|
13
14
|
return null;
|
|
@@ -18,6 +19,14 @@ const normalizeDateTime = value => {
|
|
|
18
19
|
return (0, date_fns_1.formatISO9075)(value);
|
|
19
20
|
};
|
|
20
21
|
exports.normalizeDateTime = normalizeDateTime;
|
|
22
|
+
const dateTimeTransformFromDb = ({ value }) => {
|
|
23
|
+
return (0, exports.normalizeDateTime)(value);
|
|
24
|
+
};
|
|
25
|
+
exports.dateTimeTransformFromDb = dateTimeTransformFromDb;
|
|
26
|
+
const dateTimeTransformToDb = ({ value }) => {
|
|
27
|
+
return (0, exports.normalizeDateTime)(value);
|
|
28
|
+
};
|
|
29
|
+
exports.dateTimeTransformToDb = dateTimeTransformToDb;
|
|
21
30
|
function DateTimeField(options = {}) {
|
|
22
31
|
return (0, common_1.applyDecorators)((0, BaseField_1.BaseField)(options, {
|
|
23
32
|
decoratorName: 'DateTimeField',
|
|
@@ -28,13 +37,9 @@ function DateTimeField(options = {}) {
|
|
|
28
37
|
precision: (0, lodash_1.has)(options, 'precision') ? options.precision : 0,
|
|
29
38
|
default: options.defaultValue,
|
|
30
39
|
nullable: options.nullable,
|
|
31
|
-
transformer: {
|
|
32
|
-
from: exports.normalizeDateTime,
|
|
33
|
-
to: exports.normalizeDateTime,
|
|
34
|
-
},
|
|
35
40
|
}), (0, class_validator_1.IsDate)({
|
|
36
41
|
message: 'Некорректный формат даты',
|
|
37
|
-
}), (0, class_transformer_1.Type)(() => Date));
|
|
42
|
+
}), (0, class_transformer_1.Type)(() => Date), (0, Transform_1.Transform)(exports.dateTimeTransformFromDb, Transform_1.TRANSFORM_TYPE_FROM_DB), (0, Transform_1.Transform)(exports.dateTimeTransformToDb, Transform_1.TRANSFORM_TYPE_TO_DB));
|
|
38
43
|
}
|
|
39
44
|
exports.DateTimeField = DateTimeField;
|
|
40
45
|
//# sourceMappingURL=DateTimeField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTimeField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/DateTimeField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,mCAAmC;AACnC,qCAA+B;AAC/B,qDAAuC;AACvC,yDAAuC;AACvC,2CAAyD;AACzD,uCAAiD;
|
|
1
|
+
{"version":3,"file":"DateTimeField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/DateTimeField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,mCAAmC;AACnC,qCAA+B;AAC/B,qDAAuC;AACvC,yDAAuC;AACvC,2CAAyD;AACzD,uCAAiD;AACjD,4CAAqF;AAE9E,MAAM,iBAAiB,GAAG,KAAK,CAAC,EAAE;IACrC,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,IAAI,CAAC;KACf;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,KAAK,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC;KAC3B;IAED,OAAO,IAAA,wBAAa,EAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B;AAMK,MAAM,uBAAuB,GAAG,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE;IAC/C,OAAO,IAAA,yBAAiB,EAAC,KAAK,CAAC,CAAC;AACpC,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC;AAEM,MAAM,qBAAqB,GAAG,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE;IAC7C,OAAO,IAAA,yBAAiB,EAAC,KAAK,CAAC,CAAC;AACpC,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAED,SAAgB,aAAa,CAAC,UAAuC,EAAE;IACnE,OAAO,IAAA,wBAAe,EAClB,IAAA,qBAAS,EAAC,OAAO,EAAE;QACf,aAAa,EAAE,eAAe;QAC9B,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,QAAQ;KACnB,CAAC,EACF,IAAA,gBAAM,EAAC;QACH,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,IAAA,YAAI,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC7D,OAAO,EAAE,OAAO,CAAC,YAAY;QAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC7B,CAAC,EACF,IAAA,wBAAM,EAAC;QACH,OAAO,EAAE,0BAA0B;KACtC,CAAC,EACF,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAChB,IAAA,qBAAS,EAAC,+BAAuB,EAAE,kCAAsB,CAAC,EAC1D,IAAA,qBAAS,EAAC,6BAAqB,EAAE,gCAAoB,CAAC,CACzD,CAAC;AACN,CAAC;AApBD,sCAoBC"}
|
|
@@ -20,18 +20,23 @@ export interface IRelationFieldOneToManyOptions extends IBaseFieldOptions {
|
|
|
20
20
|
inverseSide: string | ((object: any) => any);
|
|
21
21
|
}
|
|
22
22
|
export declare type IRelationFieldOptions = IRelationFieldOneToOneOptions | IRelationFieldManyToManyOptions | IRelationFieldManyToOneOptions | IRelationFieldOneToManyOptions;
|
|
23
|
-
export declare const relationTransformFromDb: ({ value, options }: {
|
|
23
|
+
export declare const relationTransformFromDb: ({ value, object, key, options, transformType }: {
|
|
24
24
|
value: any;
|
|
25
|
+
object: any;
|
|
26
|
+
key: any;
|
|
25
27
|
options: any;
|
|
28
|
+
transformType: any;
|
|
26
29
|
}) => any;
|
|
27
|
-
export declare const relationTransformToDb: ({ value, item, key, options }: {
|
|
30
|
+
export declare const relationTransformToDb: ({ value, item, key, options, transformType }: {
|
|
28
31
|
value: any;
|
|
29
32
|
item: any;
|
|
30
33
|
key: any;
|
|
31
34
|
options: any;
|
|
35
|
+
transformType: any;
|
|
32
36
|
}) => any;
|
|
33
|
-
export declare const relationTransform: ({ value, options }: {
|
|
37
|
+
export declare const relationTransform: ({ value, options, transformType }: {
|
|
34
38
|
value: any;
|
|
35
39
|
options: any;
|
|
40
|
+
transformType: any;
|
|
36
41
|
}) => any;
|
|
37
42
|
export declare function RelationField(options: IRelationFieldOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
|
|
@@ -9,6 +9,7 @@ const BaseField_1 = require("./BaseField");
|
|
|
9
9
|
const TableFromModel_1 = require("../TableFromModel");
|
|
10
10
|
const Transform_1 = require("../Transform");
|
|
11
11
|
const DataMapper_1 = require("../../../usecases/helpers/DataMapper");
|
|
12
|
+
const PROPERTY_TMP_ID_ENTITY = '__tmpIdEntity';
|
|
12
13
|
const getRelationDecorator = (relation) => {
|
|
13
14
|
switch (relation) {
|
|
14
15
|
case 'OneToOne':
|
|
@@ -32,45 +33,51 @@ const getOwningDecorator = (options) => {
|
|
|
32
33
|
}
|
|
33
34
|
return null;
|
|
34
35
|
};
|
|
35
|
-
const transformInstances = (TargetClass, value, isArray
|
|
36
|
+
const transformInstances = (TargetClass, value, isArray, transformType) => {
|
|
36
37
|
if (isArray && Array.isArray(value)) {
|
|
37
|
-
return value.map(item => transformInstances(TargetClass, item));
|
|
38
|
+
return value.map(item => transformInstances(TargetClass, item, false, transformType));
|
|
38
39
|
}
|
|
39
|
-
if (typeof value === 'object' && !(value instanceof TargetClass)) {
|
|
40
|
-
return DataMapper_1.DataMapper.create(TargetClass, value);
|
|
40
|
+
if (value && typeof value === 'object' && !(value instanceof TargetClass)) {
|
|
41
|
+
return DataMapper_1.DataMapper.create(TargetClass, value, transformType);
|
|
41
42
|
}
|
|
42
43
|
return value;
|
|
43
44
|
};
|
|
44
|
-
const transformIds = (TableClass, value, isArray
|
|
45
|
+
const transformIds = (TableClass, value, isArray, transformType) => {
|
|
45
46
|
if (isArray && Array.isArray(value)) {
|
|
46
|
-
return value.map(item => transformIds(TableClass, item));
|
|
47
|
+
return value.map(item => transformIds(TableClass, item, false, transformType));
|
|
47
48
|
}
|
|
48
49
|
if (typeof value === 'number') {
|
|
49
50
|
const primaryKey = (0, BaseField_1.getMetaPrimaryKey)(TableClass);
|
|
50
|
-
return DataMapper_1.DataMapper.create(TableClass, { [primaryKey]: value });
|
|
51
|
+
return DataMapper_1.DataMapper.create(TableClass, { [primaryKey]: value }, transformType);
|
|
51
52
|
}
|
|
52
53
|
return value;
|
|
53
54
|
};
|
|
54
|
-
const relationTransformFromDb = ({ value, options }) => {
|
|
55
|
+
const relationTransformFromDb = ({ value, object, key, options, transformType }) => {
|
|
55
56
|
const ModelClass = options.relationClass();
|
|
56
|
-
|
|
57
|
+
if (value === null || value === void 0 ? void 0 : value[PROPERTY_TMP_ID_ENTITY]) {
|
|
58
|
+
delete object[key];
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
return transformInstances(ModelClass, value, options.isArray, transformType);
|
|
57
62
|
};
|
|
58
63
|
exports.relationTransformFromDb = relationTransformFromDb;
|
|
59
|
-
const relationTransformToDb = ({ value, item, key, options }) => {
|
|
64
|
+
const relationTransformToDb = ({ value, item, key, options, transformType }) => {
|
|
60
65
|
const TableClass = (0, TableFromModel_1.getTableFromModel)(options.relationClass());
|
|
61
66
|
const relationIdName = (0, BaseField_1.getMetaFields)(item.constructor).find(name => {
|
|
62
67
|
const relationOptions = (0, BaseField_1.getFieldOptions)(item.constructor, name);
|
|
63
68
|
return relationOptions.appType === 'relationId' && relationOptions.relationName === key;
|
|
64
69
|
});
|
|
65
70
|
if (relationIdName && item[relationIdName]) {
|
|
66
|
-
|
|
71
|
+
const result = transformIds(TableClass, item[relationIdName], options.isArray, transformType);
|
|
72
|
+
result[PROPERTY_TMP_ID_ENTITY] = true;
|
|
73
|
+
return result;
|
|
67
74
|
}
|
|
68
|
-
return transformInstances(TableClass, value, options.isArray);
|
|
75
|
+
return transformInstances(TableClass, value, options.isArray, transformType);
|
|
69
76
|
};
|
|
70
77
|
exports.relationTransformToDb = relationTransformToDb;
|
|
71
|
-
const relationTransform = ({ value, options }) => {
|
|
78
|
+
const relationTransform = ({ value, options, transformType }) => {
|
|
72
79
|
const DtoClass = options.relationClass();
|
|
73
|
-
return transformInstances(DtoClass, value, options.isArray);
|
|
80
|
+
return transformInstances(DtoClass, value, options.isArray, transformType);
|
|
74
81
|
};
|
|
75
82
|
exports.relationTransform = relationTransform;
|
|
76
83
|
function RelationField(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/RelationField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,qCAA0F;AAC1F,qDAA+C;AAC/C,yDAAuC;AACvC,2CAA4G;AAC5G,sDAAoD;AACpD,4CAAqF;AACrF,qEAAgE;AA6BhE,MAAM,oBAAoB,GAAG,CAAC,QAAQ,EAAO,EAAE;IAC3C,QAAQ,QAAQ,EAAE;QACd,KAAK,UAAU;YACX,OAAO,kBAAQ,CAAC;QACpB,KAAK,YAAY;YACb,OAAO,oBAAU,CAAC;QACtB,KAAK,WAAW;YACZ,OAAO,mBAAS,CAAC;QACrB,KAAK,WAAW;YACZ,OAAO,mBAAS,CAAC;QACrB;YACI,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,QAAQ,CAAC,CAAC;KAC3D;AACL,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,OAAwE,EAAE,EAAE;IACpG,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE;QACvD,OAAO,mBAAS,CAAC;KACpB;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE;QACrD,OAAO,oBAAU,CAAC;KACrB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"RelationField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/RelationField.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,19 +2,16 @@ import { IBaseFieldOptions } from './BaseField';
|
|
|
2
2
|
export interface IRelationIdFieldOptions extends IBaseFieldOptions {
|
|
3
3
|
relationName?: string;
|
|
4
4
|
}
|
|
5
|
-
export declare const relationTransformFromDb: ({ value, item,
|
|
5
|
+
export declare const relationTransformFromDb: ({ value, item, options, transformType }: {
|
|
6
6
|
value: any;
|
|
7
7
|
item: any;
|
|
8
|
-
key: any;
|
|
9
8
|
options: any;
|
|
9
|
+
transformType: any;
|
|
10
10
|
}) => any;
|
|
11
|
-
export declare const relationTransformToDb: ({ value
|
|
11
|
+
export declare const relationTransformToDb: ({ value }: {
|
|
12
12
|
value: any;
|
|
13
|
-
item: any;
|
|
14
|
-
options: any;
|
|
15
13
|
}) => any;
|
|
16
|
-
export declare const relationTransform: ({ value
|
|
14
|
+
export declare const relationTransform: ({ value }: {
|
|
17
15
|
value: any;
|
|
18
|
-
options: any;
|
|
19
16
|
}) => any;
|
|
20
17
|
export declare function RelationIdField(options?: IRelationIdFieldOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
|
|
@@ -5,10 +5,9 @@ const common_1 = require("@nestjs/common");
|
|
|
5
5
|
const BaseField_1 = require("./BaseField");
|
|
6
6
|
const TableFromModel_1 = require("../TableFromModel");
|
|
7
7
|
const Transform_1 = require("../Transform");
|
|
8
|
-
const
|
|
9
|
-
const relationTransformFromDbInternal = (TableClass, value, isArray = false) => {
|
|
8
|
+
const relationTransformFromDbInternal = (TableClass, value, isArray, transformType) => {
|
|
10
9
|
if (isArray && Array.isArray(value)) {
|
|
11
|
-
return value.map(item => relationTransformFromDbInternal(TableClass, item));
|
|
10
|
+
return value.map(item => relationTransformFromDbInternal(TableClass, item, false, transformType));
|
|
12
11
|
}
|
|
13
12
|
if (value && typeof value === 'object') {
|
|
14
13
|
const primaryKey = (0, BaseField_1.getMetaPrimaryKey)(TableClass);
|
|
@@ -16,31 +15,21 @@ const relationTransformFromDbInternal = (TableClass, value, isArray = false) =>
|
|
|
16
15
|
}
|
|
17
16
|
return value;
|
|
18
17
|
};
|
|
19
|
-
const relationTransformFromDb = ({ value, item,
|
|
18
|
+
const relationTransformFromDb = ({ value, item, options, transformType }) => {
|
|
20
19
|
if (value) {
|
|
21
20
|
return value;
|
|
22
21
|
}
|
|
23
22
|
const relationOptions = (0, BaseField_1.getFieldOptions)(item.constructor, options.relationName);
|
|
24
23
|
const TableClass = (0, TableFromModel_1.getTableFromModel)(relationOptions.relationClass());
|
|
25
24
|
const relationValue = item[options.relationName];
|
|
26
|
-
return relationTransformFromDbInternal(TableClass, relationValue, relationOptions.isArray);
|
|
25
|
+
return relationTransformFromDbInternal(TableClass, relationValue, relationOptions.isArray, transformType);
|
|
27
26
|
};
|
|
28
27
|
exports.relationTransformFromDb = relationTransformFromDb;
|
|
29
|
-
const
|
|
30
|
-
if (isArray && Array.isArray(value)) {
|
|
31
|
-
return value.map(item => relationTransformToDbInternal(TableClass, item));
|
|
32
|
-
}
|
|
33
|
-
if (typeof value === 'number') {
|
|
34
|
-
const primaryKey = (0, BaseField_1.getMetaPrimaryKey)(TableClass);
|
|
35
|
-
return DataMapper_1.DataMapper.create(TableClass, { [primaryKey]: value });
|
|
36
|
-
}
|
|
37
|
-
return value;
|
|
38
|
-
};
|
|
39
|
-
const relationTransformToDb = ({ value, item, options }) => {
|
|
28
|
+
const relationTransformToDb = ({ value }) => {
|
|
40
29
|
return value;
|
|
41
30
|
};
|
|
42
31
|
exports.relationTransformToDb = relationTransformToDb;
|
|
43
|
-
const relationTransform = ({ value
|
|
32
|
+
const relationTransform = ({ value }) => {
|
|
44
33
|
return value;
|
|
45
34
|
};
|
|
46
35
|
exports.relationTransform = relationTransform;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationIdField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/RelationIdField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,2CAA6F;AAC7F,sDAAoD;AACpD,4CAAqF;
|
|
1
|
+
{"version":3,"file":"RelationIdField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/RelationIdField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,2CAA6F;AAC7F,sDAAoD;AACpD,4CAAqF;AAOrF,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;IAClF,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,+BAA+B,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;KACrG;IACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,MAAM,UAAU,GAAG,IAAA,6BAAiB,EAAC,UAAU,CAAC,CAAC;QACjD,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC;KAC5B;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AACM,MAAM,uBAAuB,GAAG,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAC,EAAE,EAAE;IAC7E,IAAI,KAAK,EAAE;QACP,OAAO,KAAK,CAAC;KAChB;IAED,MAAM,eAAe,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAChF,MAAM,UAAU,GAAG,IAAA,kCAAiB,EAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAEjD,OAAO,+BAA+B,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAC9G,CAAC,CAAA;AAVY,QAAA,uBAAuB,2BAUnC;AAEM,MAAM,qBAAqB,GAAG,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE;IAE7C,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AAHY,QAAA,qBAAqB,yBAGjC;AAEM,MAAM,iBAAiB,GAAG,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE;IACzC,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED,SAAgB,eAAe,CAAC,UAAmC,EAAE;IACjE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACpB,OAAO,CAAC,SAAS,GAAG,yBAAiB,CAAC;KACzC;IAED,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,IAAA,qBAAS,EAAC,OAAO,EAAE;YACf,aAAa,EAAE,iBAAiB;YAChC,OAAO,EAAE,YAAY;YACrB,MAAM,EAAE,QAAQ;SACnB,CAAC;QACF,IAAA,qBAAS,EAAC,+BAAuB,EAAE,kCAAsB,CAAC;QAC1D,IAAA,qBAAS,EAAC,6BAAqB,EAAE,gCAAoB,CAAC;KACzD,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AAhBD,0CAgBC"}
|
|
@@ -7,6 +7,9 @@ const constants_1 = require("@nestjs/swagger/dist/constants");
|
|
|
7
7
|
const Transform_1 = require("../../infrastructure/decorators/Transform");
|
|
8
8
|
class DataMapper {
|
|
9
9
|
static create(MetaClass, values, transformType = Transform_1.TRANSFORM_TYPE_DEFAULT) {
|
|
10
|
+
if (values === null) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
10
13
|
const result = new MetaClass();
|
|
11
14
|
if (result['updateFromModel'] && typeof result['updateFromModel'] === 'function' && values) {
|
|
12
15
|
result['updateFromModel'](values);
|
|
@@ -31,12 +34,17 @@ class DataMapper {
|
|
|
31
34
|
if ((0, lodash_1.has)(values, sourceName) || type !== Transform_1.TRANSFORM_TYPE_DEFAULT) {
|
|
32
35
|
const callbacks = (0, Transform_1.getTransformCallbacks)(MetaClass.prototype, name, type);
|
|
33
36
|
for (let callback of callbacks) {
|
|
34
|
-
|
|
37
|
+
const value = callback({
|
|
35
38
|
value: object[name],
|
|
36
39
|
item: values,
|
|
37
40
|
key: name,
|
|
41
|
+
transformType: type,
|
|
38
42
|
options,
|
|
43
|
+
object,
|
|
39
44
|
});
|
|
45
|
+
if (typeof value !== 'undefined') {
|
|
46
|
+
object[name] = value;
|
|
47
|
+
}
|
|
40
48
|
}
|
|
41
49
|
}
|
|
42
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataMapper.js","sourceRoot":"","sources":["../../../../src/usecases/helpers/DataMapper.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,gFAA6G;AAE7G,8DAA0D;AAC1D,yEAKmD;AAEnD,MAAa,UAAU;IAEnB,MAAM,CAAC,MAAM,CAAI,SAAS,EAAE,MAAkB,EAAE,gBAAgC,kCAAsB;
|
|
1
|
+
{"version":3,"file":"DataMapper.js","sourceRoot":"","sources":["../../../../src/usecases/helpers/DataMapper.ts"],"names":[],"mappings":"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"}
|