structure-verifier 0.0.13 → 0.0.14
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.
|
@@ -7,94 +7,111 @@ const verifier_1 = require("../verifier");
|
|
|
7
7
|
const dMessages = {
|
|
8
8
|
min: {
|
|
9
9
|
es: (values) => `debe ser mayor o igual a ${values.min}`,
|
|
10
|
-
en: (values) => `must be greater or equal to ${values.min}
|
|
10
|
+
en: (values) => `must be greater or equal to ${values.min}`,
|
|
11
11
|
},
|
|
12
12
|
max: {
|
|
13
13
|
es: (values) => `debe ser menor o igual a ${values.max}`,
|
|
14
|
-
en: (values) => `must be less or equal to ${values.max}
|
|
14
|
+
en: (values) => `must be less or equal to ${values.max}`,
|
|
15
15
|
},
|
|
16
16
|
in: {
|
|
17
17
|
es: (values) => `debe ser uno de los siguientes valores ${values.in.join(", ")}`,
|
|
18
|
-
en: (values) => `must be one of the following values ${values.in.join(", ")}
|
|
18
|
+
en: (values) => `must be one of the following values ${values.in.join(", ")}`,
|
|
19
19
|
},
|
|
20
20
|
notIn: {
|
|
21
21
|
es: (values) => `no debe ser uno de los siguientes valores ${values.notIn.join(", ")}`,
|
|
22
|
-
en: (values) => `must not be one of the following values ${values.notIn.join(", ")}
|
|
22
|
+
en: (values) => `must not be one of the following values ${values.notIn.join(", ")}`,
|
|
23
23
|
},
|
|
24
24
|
maxDecimalPlaces: {
|
|
25
25
|
es: (values) => `debe tener como máximo ${values.maxDecimalPlaces} decimales`,
|
|
26
|
-
en: (values) => `must have at most ${values.maxDecimalPlaces} decimal places
|
|
26
|
+
en: (values) => `must have at most ${values.maxDecimalPlaces} decimal places`,
|
|
27
27
|
},
|
|
28
28
|
minDecimalPlaces: {
|
|
29
29
|
es: (values) => `debe tener como mínimo ${values.minDecimalPlaces} decimales`,
|
|
30
|
-
en: (values) => `must have at least ${values.minDecimalPlaces} decimal places
|
|
30
|
+
en: (values) => `must have at least ${values.minDecimalPlaces} decimal places`,
|
|
31
31
|
},
|
|
32
32
|
badTypeMessage: {
|
|
33
33
|
es: () => `debe ser un número`,
|
|
34
|
-
en: () => `must be a number
|
|
35
|
-
}
|
|
34
|
+
en: () => `must be a number`,
|
|
35
|
+
},
|
|
36
36
|
};
|
|
37
37
|
function vNumber(data, badTypeMessage, conds) {
|
|
38
|
-
if (data ===
|
|
39
|
-
throw new v_error_1.VerificationError([
|
|
38
|
+
if (data === "" || isNaN(data)) {
|
|
39
|
+
throw new v_error_1.VerificationError([
|
|
40
|
+
{
|
|
40
41
|
key: "",
|
|
41
|
-
message: (0, message_1.getMessage)((conds === null || conds === void 0 ? void 0 : conds.badTypeMessage) != undefined
|
|
42
|
-
|
|
42
|
+
message: (0, message_1.getMessage)((conds === null || conds === void 0 ? void 0 : conds.badTypeMessage) != undefined
|
|
43
|
+
? conds === null || conds === void 0 ? void 0 : conds.badTypeMessage
|
|
44
|
+
: undefined, undefined, badTypeMessage),
|
|
45
|
+
},
|
|
46
|
+
]);
|
|
43
47
|
}
|
|
44
48
|
if ((conds === null || conds === void 0 ? void 0 : conds.min) !== undefined) {
|
|
45
49
|
if (data < (conds === null || conds === void 0 ? void 0 : conds.min)) {
|
|
46
|
-
throw new v_error_1.VerificationError([
|
|
50
|
+
throw new v_error_1.VerificationError([
|
|
51
|
+
{
|
|
47
52
|
key: "",
|
|
48
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.min, { min: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.min) }, dMessages.min)
|
|
49
|
-
}
|
|
53
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.min, { min: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.min) }, dMessages.min),
|
|
54
|
+
},
|
|
55
|
+
]);
|
|
50
56
|
}
|
|
51
57
|
}
|
|
52
58
|
if ((conds === null || conds === void 0 ? void 0 : conds.max) !== undefined) {
|
|
53
59
|
if (data > (conds === null || conds === void 0 ? void 0 : conds.max)) {
|
|
54
|
-
throw new v_error_1.VerificationError([
|
|
60
|
+
throw new v_error_1.VerificationError([
|
|
61
|
+
{
|
|
55
62
|
key: "",
|
|
56
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.max, { max: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.max) }, dMessages.max)
|
|
57
|
-
}
|
|
63
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.max, { max: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.max) }, dMessages.max),
|
|
64
|
+
},
|
|
65
|
+
]);
|
|
58
66
|
}
|
|
59
67
|
}
|
|
60
68
|
if ((conds === null || conds === void 0 ? void 0 : conds.in) !== undefined) {
|
|
61
69
|
if (!(0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.in).includes(data)) {
|
|
62
|
-
throw new v_error_1.VerificationError([
|
|
70
|
+
throw new v_error_1.VerificationError([
|
|
71
|
+
{
|
|
63
72
|
key: "",
|
|
64
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.in, { in: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.in) }, dMessages.in)
|
|
65
|
-
}
|
|
73
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.in, { in: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.in) }, dMessages.in),
|
|
74
|
+
},
|
|
75
|
+
]);
|
|
66
76
|
}
|
|
67
77
|
}
|
|
68
78
|
if ((conds === null || conds === void 0 ? void 0 : conds.notIn) !== undefined) {
|
|
69
79
|
if ((0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.notIn).includes(data)) {
|
|
70
|
-
throw new v_error_1.VerificationError([
|
|
80
|
+
throw new v_error_1.VerificationError([
|
|
81
|
+
{
|
|
71
82
|
key: "",
|
|
72
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.notIn, { notIn: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.notIn) }, dMessages.notIn)
|
|
73
|
-
}
|
|
83
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.notIn, { notIn: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.notIn) }, dMessages.notIn),
|
|
84
|
+
},
|
|
85
|
+
]);
|
|
74
86
|
}
|
|
75
87
|
}
|
|
76
|
-
const decimalPart = data.toString().split(".")[1] ||
|
|
88
|
+
const decimalPart = data.toString().split(".")[1] || "";
|
|
77
89
|
if ((conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces) !== undefined) {
|
|
78
90
|
if (decimalPart.length > (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces)) {
|
|
79
|
-
throw new v_error_1.VerificationError([
|
|
91
|
+
throw new v_error_1.VerificationError([
|
|
92
|
+
{
|
|
80
93
|
key: "",
|
|
81
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces, { maxDecimalPlaces: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces) }, dMessages.maxDecimalPlaces)
|
|
82
|
-
}
|
|
94
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces, { maxDecimalPlaces: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces) }, dMessages.maxDecimalPlaces),
|
|
95
|
+
},
|
|
96
|
+
]);
|
|
83
97
|
}
|
|
84
98
|
}
|
|
85
99
|
if ((conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces) !== undefined) {
|
|
86
100
|
if (decimalPart.length < (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces)) {
|
|
87
|
-
throw new v_error_1.VerificationError([
|
|
101
|
+
throw new v_error_1.VerificationError([
|
|
102
|
+
{
|
|
88
103
|
key: "",
|
|
89
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces, { minDecimalPlaces: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces) }, dMessages.minDecimalPlaces)
|
|
90
|
-
}
|
|
104
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces, { minDecimalPlaces: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces) }, dMessages.minDecimalPlaces),
|
|
105
|
+
},
|
|
106
|
+
]);
|
|
91
107
|
}
|
|
92
108
|
}
|
|
93
109
|
return Number(data);
|
|
94
110
|
}
|
|
95
111
|
class VNumberNotNull extends verifier_1.Verifier {
|
|
96
112
|
check(data) {
|
|
97
|
-
|
|
113
|
+
var _a;
|
|
114
|
+
return vNumber(this.isRequired(data, true, (_a = this.cond) === null || _a === void 0 ? void 0 : _a.defaultValue), this.badTypeMessage, this.cond);
|
|
98
115
|
}
|
|
99
116
|
constructor(cond) {
|
|
100
117
|
super(cond);
|
|
@@ -105,7 +122,8 @@ class VNumberNotNull extends verifier_1.Verifier {
|
|
|
105
122
|
exports.VNumberNotNull = VNumberNotNull;
|
|
106
123
|
class VNumber extends verifier_1.Verifier {
|
|
107
124
|
check(data) {
|
|
108
|
-
|
|
125
|
+
var _a;
|
|
126
|
+
let val = this.isRequired(data, undefined, (_a = this.cond) === null || _a === void 0 ? void 0 : _a.defaultValue);
|
|
109
127
|
if (val === null || val === undefined) {
|
|
110
128
|
return null;
|
|
111
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v_number.js","sourceRoot":"","sources":["../../../../src/src/verifiers/number/v_number.ts"],"names":[],"mappings":";;;AAAA,iDAAwD;
|
|
1
|
+
{"version":3,"file":"v_number.js","sourceRoot":"","sources":["../../../../src/src/verifiers/number/v_number.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,5 @@ export declare abstract class Verifier<T> {
|
|
|
5
5
|
constructor(cond?: VVCIsRequired | undefined);
|
|
6
6
|
abstract check(data: any): T;
|
|
7
7
|
protected badTypeMessage: IMessageLanguage<void>;
|
|
8
|
-
protected isRequired(data: any, isRequired?: boolean): T;
|
|
8
|
+
protected isRequired(data: any, isRequired?: boolean, defaultValue?: T): T;
|
|
9
9
|
}
|
|
@@ -8,13 +8,16 @@ class Verifier {
|
|
|
8
8
|
constructor(cond) {
|
|
9
9
|
this.cond = cond;
|
|
10
10
|
}
|
|
11
|
-
isRequired(data, isRequired) {
|
|
11
|
+
isRequired(data, isRequired, defaultValue) {
|
|
12
12
|
var _a, _b;
|
|
13
13
|
let mReq = {
|
|
14
14
|
es: () => "es requerido y",
|
|
15
|
-
en: () => "is required and"
|
|
15
|
+
en: () => "is required and",
|
|
16
16
|
};
|
|
17
|
-
if (
|
|
17
|
+
if (data === undefined || (data === null && defaultValue !== undefined)) {
|
|
18
|
+
data = defaultValue;
|
|
19
|
+
}
|
|
20
|
+
if (typeof data === "string" && ((_a = this.cond) === null || _a === void 0 ? void 0 : _a.emptyAsNull) === true) {
|
|
18
21
|
if (data.length === 0) {
|
|
19
22
|
data = null;
|
|
20
23
|
}
|
|
@@ -23,7 +26,7 @@ class Verifier {
|
|
|
23
26
|
if (((_b = this.cond) === null || _b === void 0 ? void 0 : _b.isRequired) !== undefined) {
|
|
24
27
|
reqVal = this.cond.isRequired;
|
|
25
28
|
if (isRequired !== undefined) {
|
|
26
|
-
if (typeof reqVal ===
|
|
29
|
+
if (typeof reqVal === "boolean") {
|
|
27
30
|
reqVal = isRequired;
|
|
28
31
|
}
|
|
29
32
|
else {
|
|
@@ -37,11 +40,13 @@ class Verifier {
|
|
|
37
40
|
}
|
|
38
41
|
}
|
|
39
42
|
if (isRequired && (data === null || data === undefined)) {
|
|
40
|
-
throw new v_error_1.VerificationError([
|
|
43
|
+
throw new v_error_1.VerificationError([
|
|
44
|
+
{
|
|
41
45
|
key: "",
|
|
42
46
|
message: `${(0, message_1.getMessage)(reqVal, undefined, mReq)} ${this.badTypeMessage[verifierConfig_1.VerifierConfig.lang]()}`,
|
|
43
|
-
isEmpty: true
|
|
44
|
-
}
|
|
47
|
+
isEmpty: true,
|
|
48
|
+
},
|
|
49
|
+
]);
|
|
45
50
|
}
|
|
46
51
|
return data;
|
|
47
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../src/src/verifiers/verifier.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAC1D,8CAAqD;AAErD,
|
|
1
|
+
{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../src/src/verifiers/verifier.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAC1D,8CAAqD;AAErD,kDAI8B;AAE9B,MAAsB,QAAQ;IAC5B,YAAsB,IAAoB;QAApB,SAAI,GAAJ,IAAI,CAAgB;IAAG,CAAC;IAGpC,UAAU,CAAC,IAAS,EAAE,UAAoB,EAAE,YAAgB;;QACpE,IAAI,IAAI,GAA2B;YACjC,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB;YAC1B,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB;SAC5B,CAAC;QACF,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,CAAC,EAAE,CAAC;YACxE,IAAI,GAAG,YAAY,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,MAAK,IAAI,EAAE,CAAC;YAChE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,IAAI,MAAM,GAA+B,KAAK,CAAC;QAC/C,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,UAAU,MAAK,SAAS,EAAE,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;oBAChC,MAAM,GAAG,UAAU,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,GAAG,UAAU,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,GAAG,UAAU,CAAC;YACtB,CAAC;QACH,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,2BAAiB,CAAC;gBAC1B;oBACE,GAAG,EAAE,EAAE;oBACP,OAAO,EAAE,GAAG,IAAA,oBAAU,EAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,+BAAc,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC/F,OAAO,EAAE,IAAI;iBACd;aACF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAS,CAAC;IACnB,CAAC;CACF;AA3CD,4BA2CC"}
|