@steroidsjs/nest 1.4.33 → 1.4.36
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/fields/DateField.d.ts +1 -1
- package/src/infrastructure/decorators/fields/DateField.js +6 -5
- package/src/infrastructure/decorators/fields/DateField.js.map +1 -1
- package/src/usecases/helpers/ValidationHelper.d.ts +1 -1
- package/src/usecases/helpers/ValidationHelper.js +17 -8
- package/src/usecases/helpers/ValidationHelper.js.map +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ValidationArguments } from 'class-validator';
|
|
2
2
|
import { IBaseFieldOptions } from './BaseField';
|
|
3
|
-
export declare const normalizeDate: (
|
|
3
|
+
export declare const normalizeDate: (rawValue: any) => any;
|
|
4
4
|
export declare const normalizeFunctionDate: (value: any, args?: ValidationArguments) => any;
|
|
5
5
|
export interface IDateFieldOptions extends IBaseFieldOptions {
|
|
6
6
|
minDate?: string | Date | Function;
|
|
@@ -9,18 +9,19 @@ const BaseField_1 = require("./BaseField");
|
|
|
9
9
|
const Transform_1 = require("../Transform");
|
|
10
10
|
const MinDate_1 = require("../validators/MinDate");
|
|
11
11
|
const MaxDate_1 = require("../validators/MaxDate");
|
|
12
|
-
const normalizeDate = (
|
|
13
|
-
if (!
|
|
14
|
-
return
|
|
12
|
+
const normalizeDate = (rawValue) => {
|
|
13
|
+
if (!rawValue) {
|
|
14
|
+
return rawValue;
|
|
15
15
|
}
|
|
16
|
+
let value = rawValue;
|
|
16
17
|
if (typeof value === 'string') {
|
|
17
|
-
value = (0, date_fns_1.parseISO)(
|
|
18
|
+
value = (0, date_fns_1.parseISO)(rawValue);
|
|
18
19
|
}
|
|
19
20
|
try {
|
|
20
21
|
return (0, date_fns_1.formatISO9075)(value, { representation: 'date' });
|
|
21
22
|
}
|
|
22
23
|
catch (e) {
|
|
23
|
-
throw new Error('Wrong date: ' +
|
|
24
|
+
throw new Error('Wrong date: ' + rawValue);
|
|
24
25
|
}
|
|
25
26
|
};
|
|
26
27
|
exports.normalizeDate = normalizeDate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/DateField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,qCAA+B;AAC/B,qDAA2E;AAC3E,uCAAiD;AACjD,2CAAyD;AACzD,4CAAqF;AACrF,mDAA8C;AAC9C,mDAA8C;AAEvC,MAAM,aAAa,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"DateField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/DateField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,qCAA+B;AAC/B,qDAA2E;AAC3E,uCAAiD;AACjD,2CAAyD;AACzD,4CAAqF;AACrF,mDAA8C;AAC9C,mDAA8C;AAEvC,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,EAAE;IACtC,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,QAAQ,CAAC;KACnB;IAED,IAAI,KAAK,GAAG,QAAQ,CAAC;IACrB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,KAAK,GAAG,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAC;KAC9B;IAED,IAAI;QACA,OAAO,IAAA,wBAAa,EAAC,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;KAC3D;IAAC,OAAO,CAAC,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,cAAc,GAAG,QAAQ,CAAC,CAAC;KAC9C;AACL,CAAC,CAAC;AAfW,QAAA,aAAa,iBAexB;AAEK,MAAM,qBAAqB,GAAG,CAAC,KAAK,EAAE,IAA0B,EAAE,EAAE;IACvE,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;QAC7B,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,OAAO,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAOF,SAAgB,SAAS,CAAC,UAA6B,EAAE;IACrD,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,IAAA,qBAAS,EAAC,OAAO,EAAE;YACf,aAAa,EAAE,WAAW;YAC1B,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,QAAQ;SACnB,CAAC;QACF,IAAA,gBAAM,EAAC;YACH,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC;QACF,IAAA,qBAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,kCAAsB,CAAC;QACpE,IAAA,qBAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,gCAAoB,CAAC;QAClE,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,EAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;QACxD,OAAO,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,OAAO,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,8CAA8C,IAAA,6BAAqB,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG;SACnH,CAAC;QACF,OAAO,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,OAAO,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,8CAA8C,IAAA,6BAAqB,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG;SACnH,CAAC;QACF,IAAA,2BAAS,EAAC;YACN,OAAO,EAAE,0BAA0B;SACtC,CAAC;KACL,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AA7BD,8BA6BC"}
|
|
@@ -4,5 +4,5 @@ export declare function validateOrReject(dto: any, validatorOptions?: ValidatorO
|
|
|
4
4
|
export declare class ValidationHelper {
|
|
5
5
|
static validate(dto: any, params?: IValidatorParams, allValidators?: IValidator[]): Promise<void>;
|
|
6
6
|
protected static validateSingle(dto: any): Promise<void>;
|
|
7
|
-
protected static validateByInstances(dto: any, params?: IValidatorParams, validatorsInstances?: IValidator[]): Promise<
|
|
7
|
+
protected static validateByInstances(dto: any, params?: IValidatorParams, validatorsInstances?: IValidator[]): Promise<{}>;
|
|
8
8
|
}
|
|
@@ -19,8 +19,12 @@ async function validateOrReject(dto, validatorOptions) {
|
|
|
19
19
|
exports.validateOrReject = validateOrReject;
|
|
20
20
|
class ValidationHelper {
|
|
21
21
|
static async validate(dto, params = null, allValidators = null) {
|
|
22
|
+
var _a;
|
|
22
23
|
await ValidationHelper.validateSingle(dto);
|
|
23
|
-
await ValidationHelper.validateByInstances(dto, params, allValidators);
|
|
24
|
+
const errors = await ValidationHelper.validateByInstances(dto, params, allValidators);
|
|
25
|
+
if (errors && ((_a = Object.keys(errors)) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
26
|
+
throw new exceptions_1.ValidationException(errors);
|
|
27
|
+
}
|
|
24
28
|
}
|
|
25
29
|
static async validateSingle(dto) {
|
|
26
30
|
const errors = await (0, class_validator_1.validate)(dto, defaultValidatorOptions);
|
|
@@ -38,14 +42,21 @@ class ValidationHelper {
|
|
|
38
42
|
for (const key of keys) {
|
|
39
43
|
const value = dto[key];
|
|
40
44
|
const nextParams = Object.assign(Object.assign({}, params), { name: key, prevModel: ((_a = params === null || params === void 0 ? void 0 : params.prevModel) === null || _a === void 0 ? void 0 : _a[key]) || null, nextModel: ((_b = params === null || params === void 0 ? void 0 : params.nextModel) === null || _b === void 0 ? void 0 : _b[key]) || null });
|
|
45
|
+
let error = null;
|
|
41
46
|
try {
|
|
42
47
|
if (Array.isArray(value)) {
|
|
43
|
-
for (const
|
|
44
|
-
await ValidationHelper.validateByInstances(
|
|
48
|
+
for (const valueItemIndex in value) {
|
|
49
|
+
error = await ValidationHelper.validateByInstances(value[valueItemIndex], nextParams, validatorsInstances);
|
|
50
|
+
if (error) {
|
|
51
|
+
errors[key] = Object.assign(Object.assign({}, ((errors === null || errors === void 0 ? void 0 : errors[key]) || {})), { [valueItemIndex]: error });
|
|
52
|
+
}
|
|
45
53
|
}
|
|
46
54
|
}
|
|
47
55
|
else if (value && (0, lodash_1.isObject)(value)) {
|
|
48
|
-
await ValidationHelper.validateByInstances(value, nextParams, validatorsInstances);
|
|
56
|
+
error = await ValidationHelper.validateByInstances(value, nextParams, validatorsInstances);
|
|
57
|
+
if (error) {
|
|
58
|
+
errors[key] = error;
|
|
59
|
+
}
|
|
49
60
|
}
|
|
50
61
|
else {
|
|
51
62
|
const validatorsClasses = (0, Validator_1.getFieldValidators)(dto.constructor, key);
|
|
@@ -63,14 +74,12 @@ class ValidationHelper {
|
|
|
63
74
|
if (e instanceof FieldValidatorException_1.FieldValidatorException) {
|
|
64
75
|
errors[((_c = e.params) === null || _c === void 0 ? void 0 : _c.name) || key] = e.message;
|
|
65
76
|
}
|
|
66
|
-
else {
|
|
67
|
-
throw e;
|
|
68
|
-
}
|
|
69
77
|
}
|
|
70
78
|
}
|
|
71
79
|
if (Object.keys(errors).length > 0) {
|
|
72
|
-
|
|
80
|
+
return errors;
|
|
73
81
|
}
|
|
82
|
+
return null;
|
|
74
83
|
}
|
|
75
84
|
}
|
|
76
85
|
exports.ValidationHelper = ValidationHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationHelper.js","sourceRoot":"","sources":["../../../../src/usecases/helpers/ValidationHelper.ts"],"names":[],"mappings":";;;AAAA,mCAA6C;AAC7C,qDAA2D;AAC3D,8CAAkD;AAElD,mFAA8E;AAC9E,gFAA4F;AAC5F,uDAA2D;AAE3D,MAAM,uBAAuB,GAAqB;IAC9C,SAAS,EAAE,KAAK;CACnB,CAAC;AAKK,KAAK,UAAU,gBAAgB,CAAC,GAAQ,EAAE,gBAAmC;IAChF,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EACzB,GAAG,kCACC,uBAAuB,GAAK,gBAAgB,EACnD,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,EAAE;QACf,MAAM,IAAI,gCAAmB,CAAC,MAAM,CAAC,CAAC;KACzC;AACL,CAAC;AARD,4CAQC;AAWD,MAAa,gBAAgB;IACzB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAQ,EAAE,SAA2B,IAAI,EAAE,gBAA8B,IAAI
|
|
1
|
+
{"version":3,"file":"ValidationHelper.js","sourceRoot":"","sources":["../../../../src/usecases/helpers/ValidationHelper.ts"],"names":[],"mappings":"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"}
|