structure-verifier 0.0.16 → 0.0.17
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/README.md +335 -161
- package/dist/index.d.ts +8 -16
- package/dist/index.js.map +1 -1
- package/dist/src/error/v_error.js +4 -3
- package/dist/src/error/v_error.js.map +1 -1
- package/dist/src/verifiers/any/v_any.js +0 -1
- package/dist/src/verifiers/any/v_any.js.map +1 -1
- package/dist/src/verifiers/array/v_array.d.ts +21 -3
- package/dist/src/verifiers/array/v_array.js +24 -5
- package/dist/src/verifiers/array/v_array.js.map +1 -1
- package/dist/src/verifiers/boolean/v_boolean.d.ts +4 -0
- package/dist/src/verifiers/boolean/v_boolean.js +15 -5
- package/dist/src/verifiers/boolean/v_boolean.js.map +1 -1
- package/dist/src/verifiers/date/v_date.d.ts +26 -0
- package/dist/src/verifiers/date/v_date.js +28 -1
- package/dist/src/verifiers/date/v_date.js.map +1 -1
- package/dist/src/verifiers/helpers/conditionMessage.d.ts +3 -0
- package/dist/src/verifiers/helpers/conditionMessage.js +19 -0
- package/dist/src/verifiers/helpers/conditionMessage.js.map +1 -0
- package/dist/src/verifiers/number/v_number.d.ts +38 -0
- package/dist/src/verifiers/number/v_number.js +40 -1
- package/dist/src/verifiers/number/v_number.js.map +1 -1
- package/dist/src/verifiers/object/v_object.d.ts +7 -0
- package/dist/src/verifiers/object/v_object.js +21 -0
- package/dist/src/verifiers/object/v_object.js.map +1 -1
- package/dist/src/verifiers/string/v_string.d.ts +58 -0
- package/dist/src/verifiers/string/v_string.js +109 -11
- package/dist/src/verifiers/string/v_string.js.map +1 -1
- package/dist/src/verifiers/uuid/v_uuid.d.ts +8 -0
- package/dist/src/verifiers/uuid/v_uuid.js +35 -4
- package/dist/src/verifiers/uuid/v_uuid.js.map +1 -1
- package/dist/src/verifiers/verifier.d.ts +1 -0
- package/dist/src/verifiers/verifier.js +8 -0
- package/dist/src/verifiers/verifier.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,19 +1,11 @@
|
|
|
1
|
-
import { VAny } from "./src/verifiers/any/v_any";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import { VNumber, VNumberNotNull } from "./src/verifiers/number/v_number";
|
|
10
|
-
import { VNumberConditions } from "./src/verifiers/number/v_number";
|
|
11
|
-
import { VObject, VObjectNotNull } from "./src/verifiers/object/v_object";
|
|
12
|
-
import { VObjectConditions, VObjectConditionsNotNull } from "./src/verifiers/object/v_object";
|
|
13
|
-
import { VString, VStringNotNull } from "./src/verifiers/string/v_string";
|
|
14
|
-
import { VStringConditions } from "./src/verifiers/string/v_string";
|
|
15
|
-
import { VUUID, VUUIDNotNull } from "./src/verifiers/uuid/v_uuid";
|
|
16
|
-
import { VUUIDConditions } from "./src/verifiers/uuid/v_uuid";
|
|
1
|
+
import { VAny, type VAnyConditions } from "./src/verifiers/any/v_any";
|
|
2
|
+
import { VArray, VArrayNotNull, type VArrayConditions } from "./src/verifiers/array/v_array";
|
|
3
|
+
import { VBoolean, VBooleanNotNull, type VBooleanConditions } from "./src/verifiers/boolean/v_boolean";
|
|
4
|
+
import { VDate, VDateNotNull, type VDateConditions } from "./src/verifiers/date/v_date";
|
|
5
|
+
import { VNumber, VNumberNotNull, type VNumberConditions } from "./src/verifiers/number/v_number";
|
|
6
|
+
import { VObject, VObjectNotNull, type VObjectConditions, type VObjectConditionsNotNull } from "./src/verifiers/object/v_object";
|
|
7
|
+
import { VString, VStringNotNull, type VStringConditions } from "./src/verifiers/string/v_string";
|
|
8
|
+
import { VUUID, VUUIDNotNull, type VUUIDConditions } from "./src/verifiers/uuid/v_uuid";
|
|
17
9
|
import { Verifier } from "./src/verifiers/verifier";
|
|
18
10
|
export { VerificationError } from "./src/error/v_error";
|
|
19
11
|
export { InferFactoryType, InferType } from "./src/verifiers/type";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VerificationError = void 0;
|
|
4
4
|
function normalizeMessage(message) {
|
|
5
|
-
return Object.
|
|
5
|
+
return Object.assign(Object.assign({}, message), { key: typeof message.key === "string" ? message.key.trim() : message.key, message: message.message.trim() });
|
|
6
6
|
}
|
|
7
7
|
function formatMessage(message) {
|
|
8
8
|
const key = typeof message.key === "string" ? message.key.trim() : "";
|
|
@@ -12,9 +12,10 @@ function formatMessage(message) {
|
|
|
12
12
|
class VerificationError extends Error {
|
|
13
13
|
constructor(messages) {
|
|
14
14
|
const normalizedMessages = messages.map(normalizeMessage);
|
|
15
|
-
|
|
15
|
+
const formattedMessages = normalizedMessages.map(formatMessage);
|
|
16
|
+
super(formattedMessages.join(";"));
|
|
16
17
|
this.name = "VerificationError";
|
|
17
|
-
this._errors = Object.freeze(
|
|
18
|
+
this._errors = Object.freeze(formattedMessages);
|
|
18
19
|
this._errorsObj = Object.freeze(normalizedMessages);
|
|
19
20
|
}
|
|
20
21
|
get errors() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v_error.js","sourceRoot":"","sources":["../../../src/src/error/v_error.ts"],"names":[],"mappings":";;;AAEA,SAAS,gBAAgB,CAAC,OAAoB;IAC5C,
|
|
1
|
+
{"version":3,"file":"v_error.js","sourceRoot":"","sources":["../../../src/src/error/v_error.ts"],"names":[],"mappings":";;;AAEA,SAAS,gBAAgB,CAAC,OAAoB;IAC5C,uCACK,OAAO,KACV,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EACvE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAC/B;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAoB;IACzC,MAAM,GAAG,GAAG,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAEpC,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAClD,CAAC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAI1C,YAAY,QAAgC;QAC1C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAEhE,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,mBAAM,OAAO,EAAG,CAAC,CAAC;IAC5D,CAAC;CACF;AArBD,8CAqBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v_any.js","sourceRoot":"","sources":["../../../../src/src/verifiers/any/v_any.ts"],"names":[],"mappings":";;;AAOA,0CAAuC;AASvC,MAAM,SAAS,GAAwB;IACrC,cAAc,EAAE;QACd,EAAE,EAAE,GAAG,EAAE,CAAC,kBAAkB;QAC5B,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB;KAC5B;CACF,CAAC;AAEF,MAAa,IAAK,SAAQ,mBAAoB;IAC5C,KAAK,CAAC,IAAS;;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,YAAY,CAAC,CAAC;QACxE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,YAAsB,IAAqB;QACzC,KAAK,CAAC,IAAI,CAAC,CAAC;QADQ,SAAI,GAAJ,IAAI,CAAiB;QAEzC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"v_any.js","sourceRoot":"","sources":["../../../../src/src/verifiers/any/v_any.ts"],"names":[],"mappings":";;;AAOA,0CAAuC;AASvC,MAAM,SAAS,GAAwB;IACrC,cAAc,EAAE;QACd,EAAE,EAAE,GAAG,EAAE,CAAC,kBAAkB;QAC5B,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB;KAC5B;CACF,CAAC;AAEF,MAAa,IAAK,SAAQ,mBAAoB;IAC5C,KAAK,CAAC,IAAS;;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,YAAY,CAAC,CAAC;QACxE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,YAAsB,IAAqB;QACzC,KAAK,CAAC,IAAI,CAAC,CAAC;QADQ,SAAI,GAAJ,IAAI,CAAiB;QAEzC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;IACjD,CAAC;CACF;AAZD,oBAYC"}
|
|
@@ -1,18 +1,36 @@
|
|
|
1
|
-
import { VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
|
|
1
|
+
import { MessageType, VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
|
|
2
|
+
import { ConditionMessageInput } from "../helpers/conditionMessage";
|
|
2
3
|
import { Verifier } from "../verifier";
|
|
3
4
|
export interface VArrayConditions<T extends Verifier<any>> extends VBadTypeMessage, VDefaultValue<ReturnType<T["check"]>[]>, VVCIsRequired {
|
|
4
|
-
minLength?: number
|
|
5
|
-
|
|
5
|
+
minLength?: MessageType<number, {
|
|
6
|
+
minLength: number;
|
|
7
|
+
}>;
|
|
8
|
+
maxLength?: MessageType<number, {
|
|
9
|
+
maxLength: number;
|
|
10
|
+
}>;
|
|
6
11
|
}
|
|
7
12
|
export declare class VArray<T extends Verifier<any>> extends Verifier<ReturnType<T["check"]>[] | null> {
|
|
8
13
|
protected verifier: T;
|
|
9
14
|
protected cond: VArrayConditions<T>;
|
|
10
15
|
check(data: any): ReturnType<T["check"]>[] | null;
|
|
16
|
+
minLength(n: number, message?: ConditionMessageInput<number, {
|
|
17
|
+
minLength: number;
|
|
18
|
+
}>): VArray<T>;
|
|
19
|
+
maxLength(n: number, message?: ConditionMessageInput<number, {
|
|
20
|
+
maxLength: number;
|
|
21
|
+
}>): VArray<T>;
|
|
11
22
|
constructor(verifier: T, cond?: VArrayConditions<T>);
|
|
23
|
+
required(): VArrayNotNull<T>;
|
|
12
24
|
}
|
|
13
25
|
export declare class VArrayNotNull<T extends Verifier<any>> extends Verifier<ReturnType<T["check"]>[]> {
|
|
14
26
|
protected verifier: T;
|
|
15
27
|
protected cond: VArrayConditions<T>;
|
|
16
28
|
check(data: any): ReturnType<T["check"]>[];
|
|
29
|
+
minLength(n: number, message?: ConditionMessageInput<number, {
|
|
30
|
+
minLength: number;
|
|
31
|
+
}>): VArrayNotNull<T>;
|
|
32
|
+
maxLength(n: number, message?: ConditionMessageInput<number, {
|
|
33
|
+
maxLength: number;
|
|
34
|
+
}>): VArrayNotNull<T>;
|
|
17
35
|
constructor(verifier: T, cond?: VArrayConditions<T>);
|
|
18
36
|
}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.VArrayNotNull = exports.VArray = void 0;
|
|
4
4
|
const v_error_1 = require("../../error/v_error");
|
|
5
5
|
const message_1 = require("../../languages/message");
|
|
6
|
+
const conditionMessage_1 = require("../helpers/conditionMessage");
|
|
6
7
|
const v_any_1 = require("../any/v_any");
|
|
7
8
|
const v_object_1 = require("../object/v_object");
|
|
8
9
|
const verifier_1 = require("../verifier");
|
|
@@ -40,24 +41,27 @@ function vArray(data, badTypeMessage, verifier, conds) {
|
|
|
40
41
|
},
|
|
41
42
|
]);
|
|
42
43
|
}
|
|
43
|
-
|
|
44
|
+
const minLength = conds.minLength !== undefined ? (0, message_1.getValue)(conds.minLength) : undefined;
|
|
45
|
+
if (minLength !== undefined && data.length < minLength) {
|
|
44
46
|
throw new v_error_1.VerificationError([
|
|
45
47
|
{
|
|
46
48
|
key: "",
|
|
47
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.minLength, { minLength
|
|
49
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.minLength, { minLength }, dMessages.minLength),
|
|
48
50
|
},
|
|
49
51
|
]);
|
|
50
52
|
}
|
|
51
|
-
|
|
53
|
+
const maxLength = conds.maxLength !== undefined ? (0, message_1.getValue)(conds.maxLength) : undefined;
|
|
54
|
+
if (maxLength !== undefined && data.length > maxLength) {
|
|
52
55
|
throw new v_error_1.VerificationError([
|
|
53
56
|
{
|
|
54
57
|
key: "",
|
|
55
|
-
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.maxLength, { maxLength
|
|
58
|
+
message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.maxLength, { maxLength }, dMessages.maxLength),
|
|
56
59
|
},
|
|
57
60
|
]);
|
|
58
61
|
}
|
|
59
62
|
const errors = [];
|
|
60
63
|
const value = [];
|
|
64
|
+
const nestedVerifier = isNestedVerifier(verifier);
|
|
61
65
|
for (let i = 0; i < data.length; i++) {
|
|
62
66
|
try {
|
|
63
67
|
value.push(verifier.check(data[i]));
|
|
@@ -65,7 +69,7 @@ function vArray(data, badTypeMessage, verifier, conds) {
|
|
|
65
69
|
catch (error) {
|
|
66
70
|
if (error instanceof v_error_1.VerificationError) {
|
|
67
71
|
errors.push(...error.errorsObj.map((itemError) => {
|
|
68
|
-
if (
|
|
72
|
+
if (nestedVerifier) {
|
|
69
73
|
return Object.assign(Object.assign({}, itemError), { key: prefixArrayErrorKey(i, itemError.key) });
|
|
70
74
|
}
|
|
71
75
|
return Object.assign(Object.assign({}, itemError), { key: `[${i}]` });
|
|
@@ -86,12 +90,21 @@ class VArray extends verifier_1.Verifier {
|
|
|
86
90
|
}
|
|
87
91
|
return vArray(validatedData, this.badTypeMessage, this.verifier, this.cond);
|
|
88
92
|
}
|
|
93
|
+
minLength(n, message) {
|
|
94
|
+
return new VArray(this.verifier, Object.assign(Object.assign({}, this.cond), { minLength: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
95
|
+
}
|
|
96
|
+
maxLength(n, message) {
|
|
97
|
+
return new VArray(this.verifier, Object.assign(Object.assign({}, this.cond), { maxLength: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
98
|
+
}
|
|
89
99
|
constructor(verifier, cond = {}) {
|
|
90
100
|
super(cond);
|
|
91
101
|
this.verifier = verifier;
|
|
92
102
|
this.cond = cond;
|
|
93
103
|
this.badTypeMessage = dMessages.badTypeMessage;
|
|
94
104
|
}
|
|
105
|
+
required() {
|
|
106
|
+
return new VArrayNotNull(this.verifier, this.cond);
|
|
107
|
+
}
|
|
95
108
|
}
|
|
96
109
|
exports.VArray = VArray;
|
|
97
110
|
class VArrayNotNull extends verifier_1.Verifier {
|
|
@@ -99,6 +112,12 @@ class VArrayNotNull extends verifier_1.Verifier {
|
|
|
99
112
|
const validatedData = this.isRequired(data, true);
|
|
100
113
|
return vArray(validatedData, this.badTypeMessage, this.verifier, this.cond);
|
|
101
114
|
}
|
|
115
|
+
minLength(n, message) {
|
|
116
|
+
return new VArrayNotNull(this.verifier, Object.assign(Object.assign({}, this.cond), { minLength: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
117
|
+
}
|
|
118
|
+
maxLength(n, message) {
|
|
119
|
+
return new VArrayNotNull(this.verifier, Object.assign(Object.assign({}, this.cond), { maxLength: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
120
|
+
}
|
|
102
121
|
constructor(verifier, cond = {}) {
|
|
103
122
|
super(cond);
|
|
104
123
|
this.verifier = verifier;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v_array.js","sourceRoot":"","sources":["../../../../src/src/verifiers/array/v_array.ts"],"names":[],"mappings":";;;AAAA,iDAAwD;
|
|
1
|
+
{"version":3,"file":"v_array.js","sourceRoot":"","sources":["../../../../src/src/verifiers/array/v_array.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MessageType, VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
|
|
2
|
+
import { ConditionMessageInput } from "../helpers/conditionMessage";
|
|
2
3
|
import { Verifier } from "../verifier";
|
|
3
4
|
export interface VBooleanConditions extends VBadTypeMessage, VDefaultValue<boolean>, VVCIsRequired {
|
|
4
5
|
strictMode?: MessageType<boolean, void>;
|
|
@@ -6,10 +7,13 @@ export interface VBooleanConditions extends VBadTypeMessage, VDefaultValue<boole
|
|
|
6
7
|
export declare class VBooleanNotNull extends Verifier<boolean> {
|
|
7
8
|
protected cond?: VBooleanConditions | undefined;
|
|
8
9
|
check(data: any): boolean;
|
|
10
|
+
strictMode(enabled?: boolean, message?: ConditionMessageInput<boolean, void>): VBooleanNotNull;
|
|
9
11
|
constructor(cond?: VBooleanConditions | undefined);
|
|
10
12
|
}
|
|
11
13
|
export declare class VBoolean extends Verifier<boolean | null> {
|
|
12
14
|
protected cond?: VBooleanConditions | undefined;
|
|
13
15
|
check(data: any): boolean | null;
|
|
16
|
+
strictMode(enabled?: boolean, message?: ConditionMessageInput<boolean, void>): VBoolean;
|
|
14
17
|
constructor(cond?: VBooleanConditions | undefined);
|
|
18
|
+
required(): VBooleanNotNull;
|
|
15
19
|
}
|
|
@@ -3,22 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.VBoolean = exports.VBooleanNotNull = void 0;
|
|
4
4
|
const v_error_1 = require("../../error/v_error");
|
|
5
5
|
const message_1 = require("../../languages/message");
|
|
6
|
+
const conditionMessage_1 = require("../helpers/conditionMessage");
|
|
6
7
|
const verifier_1 = require("../verifier");
|
|
7
8
|
const TRUE_VALUES = [true, 1, "1"];
|
|
8
9
|
const FALSE_VALUES = [false, 0, "0"];
|
|
9
10
|
const BOOLEAN_STRINGS = ["true", "false"];
|
|
10
|
-
function throwBooleanError(
|
|
11
|
+
function throwBooleanError(condition, badTypeMessage) {
|
|
11
12
|
throw new v_error_1.VerificationError([
|
|
12
13
|
{
|
|
13
14
|
key: "",
|
|
14
|
-
message: (0, message_1.getMessage)(
|
|
15
|
+
message: (0, message_1.getMessage)(condition, undefined, badTypeMessage),
|
|
15
16
|
},
|
|
16
17
|
]);
|
|
17
18
|
}
|
|
18
19
|
function vBoolean(data, badTypeMessage, conds) {
|
|
20
|
+
var _a;
|
|
19
21
|
if ((0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.strictMode) === true) {
|
|
20
22
|
if (typeof data !== "boolean") {
|
|
21
|
-
throwBooleanError(conds, badTypeMessage);
|
|
23
|
+
throwBooleanError((_a = conds === null || conds === void 0 ? void 0 : conds.strictMode) !== null && _a !== void 0 ? _a : conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, badTypeMessage);
|
|
22
24
|
}
|
|
23
25
|
return data;
|
|
24
26
|
}
|
|
@@ -34,13 +36,16 @@ function vBoolean(data, badTypeMessage, conds) {
|
|
|
34
36
|
return normalized === "true";
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
|
-
throwBooleanError(conds, badTypeMessage);
|
|
39
|
+
throwBooleanError(conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, badTypeMessage);
|
|
38
40
|
}
|
|
39
41
|
class VBooleanNotNull extends verifier_1.Verifier {
|
|
40
42
|
check(data) {
|
|
41
43
|
var _a;
|
|
42
44
|
return vBoolean(this.isRequired(data, true, (_a = this.cond) === null || _a === void 0 ? void 0 : _a.defaultValue), this.badTypeMessage, this.cond);
|
|
43
45
|
}
|
|
46
|
+
strictMode(enabled = true, message) {
|
|
47
|
+
return new VBooleanNotNull(Object.assign(Object.assign({}, this.cond), { strictMode: (0, conditionMessage_1.conditionWithValue)(enabled, message) }));
|
|
48
|
+
}
|
|
44
49
|
constructor(cond) {
|
|
45
50
|
super(cond);
|
|
46
51
|
this.cond = cond;
|
|
@@ -60,15 +65,20 @@ class VBoolean extends verifier_1.Verifier {
|
|
|
60
65
|
}
|
|
61
66
|
return vBoolean(val, this.badTypeMessage, this.cond);
|
|
62
67
|
}
|
|
68
|
+
strictMode(enabled = true, message) {
|
|
69
|
+
return new VBoolean(Object.assign(Object.assign({}, this.cond), { strictMode: (0, conditionMessage_1.conditionWithValue)(enabled, message) }));
|
|
70
|
+
}
|
|
63
71
|
constructor(cond) {
|
|
64
72
|
super(cond);
|
|
65
73
|
this.cond = cond;
|
|
66
|
-
this.cond = cond;
|
|
67
74
|
this.badTypeMessage = {
|
|
68
75
|
es: () => `debe ser un booleano`,
|
|
69
76
|
en: () => `must be a boolean`,
|
|
70
77
|
};
|
|
71
78
|
}
|
|
79
|
+
required() {
|
|
80
|
+
return new VBooleanNotNull(this.cond);
|
|
81
|
+
}
|
|
72
82
|
}
|
|
73
83
|
exports.VBoolean = VBoolean;
|
|
74
84
|
//# sourceMappingURL=v_boolean.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v_boolean.js","sourceRoot":"","sources":["../../../../src/src/verifiers/boolean/v_boolean.ts"],"names":[],"mappings":";;;AAAA,iDAAwD;AAOxD,qDAIiC;AACjC,0CAAuC;AAOvC,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAU,CAAC;AAC5C,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAU,CAAC;AAC9C,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,CAAU,CAAC;AAEnD,SAAS,iBAAiB,CACxB,
|
|
1
|
+
{"version":3,"file":"v_boolean.js","sourceRoot":"","sources":["../../../../src/src/verifiers/boolean/v_boolean.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IInfo, MessageType, VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
|
|
2
|
+
import { ConditionMessageInput } from "../helpers/conditionMessage";
|
|
2
3
|
import { Verifier } from "../verifier";
|
|
3
4
|
import { datetime } from "../../utils/datetime";
|
|
4
5
|
export interface VDateConditions extends VBadTypeMessage, VDefaultValue<datetime.Dayjs>, VVCIsRequired, IInfo<number | string | Date | datetime.Dayjs> {
|
|
@@ -21,10 +22,35 @@ export interface VDateConditions extends VBadTypeMessage, VDefaultValue<datetime
|
|
|
21
22
|
export declare class VDateNotNull extends Verifier<datetime.Dayjs> {
|
|
22
23
|
protected cond?: VDateConditions | undefined;
|
|
23
24
|
check(data: any): datetime.Dayjs;
|
|
25
|
+
format(fmt: string, message?: ConditionMessageInput<string, {
|
|
26
|
+
format: string;
|
|
27
|
+
}>): VDateNotNull;
|
|
28
|
+
timeZone(tz: string, message?: ConditionMessageInput<string, {
|
|
29
|
+
timeZone: string;
|
|
30
|
+
}>): VDateNotNull;
|
|
31
|
+
maxDate(date: datetime.Dayjs, message?: ConditionMessageInput<datetime.Dayjs, {
|
|
32
|
+
maxDate: datetime.Dayjs;
|
|
33
|
+
}>): VDateNotNull;
|
|
34
|
+
minDate(date: datetime.Dayjs, message?: ConditionMessageInput<datetime.Dayjs, {
|
|
35
|
+
minDate: datetime.Dayjs;
|
|
36
|
+
}>): VDateNotNull;
|
|
24
37
|
constructor(cond?: VDateConditions | undefined);
|
|
25
38
|
}
|
|
26
39
|
export declare class VDate extends Verifier<datetime.Dayjs | null> {
|
|
27
40
|
protected cond?: VDateConditions | undefined;
|
|
28
41
|
check(data: any): datetime.Dayjs | null;
|
|
42
|
+
format(fmt: string, message?: ConditionMessageInput<string, {
|
|
43
|
+
format: string;
|
|
44
|
+
}>): VDate;
|
|
45
|
+
timeZone(tz: string, message?: ConditionMessageInput<string, {
|
|
46
|
+
timeZone: string;
|
|
47
|
+
}>): VDate;
|
|
48
|
+
maxDate(date: datetime.Dayjs, message?: ConditionMessageInput<datetime.Dayjs, {
|
|
49
|
+
maxDate: datetime.Dayjs;
|
|
50
|
+
}>): VDate;
|
|
51
|
+
minDate(date: datetime.Dayjs, message?: ConditionMessageInput<datetime.Dayjs, {
|
|
52
|
+
minDate: datetime.Dayjs;
|
|
53
|
+
}>): VDate;
|
|
29
54
|
constructor(cond?: VDateConditions | undefined);
|
|
55
|
+
required(): VDateNotNull;
|
|
30
56
|
}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.VDate = exports.VDateNotNull = void 0;
|
|
4
4
|
const message_1 = require("../../languages/message");
|
|
5
5
|
const v_error_1 = require("../../error/v_error");
|
|
6
|
+
const conditionMessage_1 = require("../helpers/conditionMessage");
|
|
6
7
|
const verifier_1 = require("../verifier");
|
|
7
8
|
const datetime_1 = require("../../utils/datetime");
|
|
8
9
|
const dMessages = {
|
|
@@ -107,6 +108,18 @@ class VDateNotNull extends verifier_1.Verifier {
|
|
|
107
108
|
var _a;
|
|
108
109
|
return vDate(this.isRequired(data, true, (_a = this.cond) === null || _a === void 0 ? void 0 : _a.defaultValue), this.badTypeMessage, this.cond);
|
|
109
110
|
}
|
|
111
|
+
format(fmt, message) {
|
|
112
|
+
return new VDateNotNull(Object.assign(Object.assign({}, this.cond), { format: (0, conditionMessage_1.conditionWithValue)(fmt, message) }));
|
|
113
|
+
}
|
|
114
|
+
timeZone(tz, message) {
|
|
115
|
+
return new VDateNotNull(Object.assign(Object.assign({}, this.cond), { timeZone: (0, conditionMessage_1.conditionWithValue)(tz, message) }));
|
|
116
|
+
}
|
|
117
|
+
maxDate(date, message) {
|
|
118
|
+
return new VDateNotNull(Object.assign(Object.assign({}, this.cond), { maxDate: (0, conditionMessage_1.conditionWithValue)(date, message) }));
|
|
119
|
+
}
|
|
120
|
+
minDate(date, message) {
|
|
121
|
+
return new VDateNotNull(Object.assign(Object.assign({}, this.cond), { minDate: (0, conditionMessage_1.conditionWithValue)(date, message) }));
|
|
122
|
+
}
|
|
110
123
|
constructor(cond) {
|
|
111
124
|
super(cond);
|
|
112
125
|
this.cond = cond;
|
|
@@ -123,12 +136,26 @@ class VDate extends verifier_1.Verifier {
|
|
|
123
136
|
}
|
|
124
137
|
return vDate(val, this.badTypeMessage, this.cond);
|
|
125
138
|
}
|
|
139
|
+
format(fmt, message) {
|
|
140
|
+
return new VDate(Object.assign(Object.assign({}, this.cond), { format: (0, conditionMessage_1.conditionWithValue)(fmt, message) }));
|
|
141
|
+
}
|
|
142
|
+
timeZone(tz, message) {
|
|
143
|
+
return new VDate(Object.assign(Object.assign({}, this.cond), { timeZone: (0, conditionMessage_1.conditionWithValue)(tz, message) }));
|
|
144
|
+
}
|
|
145
|
+
maxDate(date, message) {
|
|
146
|
+
return new VDate(Object.assign(Object.assign({}, this.cond), { maxDate: (0, conditionMessage_1.conditionWithValue)(date, message) }));
|
|
147
|
+
}
|
|
148
|
+
minDate(date, message) {
|
|
149
|
+
return new VDate(Object.assign(Object.assign({}, this.cond), { minDate: (0, conditionMessage_1.conditionWithValue)(date, message) }));
|
|
150
|
+
}
|
|
126
151
|
constructor(cond) {
|
|
127
152
|
super(cond);
|
|
128
153
|
this.cond = cond;
|
|
129
|
-
this.cond = cond;
|
|
130
154
|
this.badTypeMessage = dMessages.badTypeMessage;
|
|
131
155
|
}
|
|
156
|
+
required() {
|
|
157
|
+
return new VDateNotNull(this.cond);
|
|
158
|
+
}
|
|
132
159
|
}
|
|
133
160
|
exports.VDate = VDate;
|
|
134
161
|
//# sourceMappingURL=v_date.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v_date.js","sourceRoot":"","sources":["../../../../src/src/verifiers/date/v_date.ts"],"names":[],"mappings":";;;AAOA,qDAIiC;AACjC,iDAAwD;AACxD,0CAAuC;AACvC,mDAAgD;AAuBhD,MAAM,SAAS,GAAyB;IACtC,MAAM,EAAE;QACN,EAAE,EAAE,CAAC,MAA0B,EAAE,EAAE,CACjC,yBAAyB,MAAM,CAAC,MAAM,EAAE;QAC1C,EAAE,EAAE,CAAC,MAA0B,EAAE,EAAE,CAAC,wBAAwB,MAAM,CAAC,MAAM,EAAE;KAC5E;IACD,QAAQ,EAAE;QACR,EAAE,EAAE,CAAC,MAA4B,EAAE,EAAE,CACnC,8BAA8B,MAAM,CAAC,QAAQ,EAAE;QACjD,EAAE,EAAE,CAAC,MAA4B,EAAE,EAAE,CACnC,2BAA2B,MAAM,CAAC,QAAQ,EAAE;KAC/C;IACD,OAAO,EAAE;QACP,EAAE,EAAE,CAAC,MAAmC,EAAE,EAAE,CAC1C,4BAA4B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;QACvD,EAAE,EAAE,CAAC,MAAmC,EAAE,EAAE,CAC1C,4BAA4B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;KACxD;IACD,OAAO,EAAE;QACP,EAAE,EAAE,CAAC,MAAmC,EAAE,EAAE,CAC1C,4BAA4B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;QACvD,EAAE,EAAE,CAAC,MAAmC,EAAE,EAAE,CAC1C,+BAA+B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;KAC3D;IACD,cAAc,EAAE;QACd,EAAE,EAAE,GAAG,EAAE,CAAC,oBAAoB;QAC9B,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB;KAC3B;CACF,CAAC;AAEF,SAAS,cAAc,CACrB,SAAmD,EACnD,MAAW,EACX,eAAsC;IAEtC,MAAM,IAAI,2BAAiB,CAAC;QAC1B;YACE,GAAG,EAAE,EAAE;YACP,OAAO,EAAE,IAAA,oBAAU,EAAC,SAAS,EAAE,MAAM,EAAE,eAAe,CAAC;SACxD;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAS;IACrC,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;QACxB,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,YAAY,IAAI;QACpB,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CACvB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAU;IAC9B,MAAM,mBAAmB,GAAG,+BAA+B,CAAC;IAC5D,MAAM,sBAAsB,GAC1B,yGAAyG,CAAC;IAC5G,OAAO,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACxC,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAoB,EAAE,QAAgB;IAClE,OAAO,mBAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAS,EACT,MAAc,EACd,QAAgB,EAChB,KAAuB;IAEvB,IAAI,IAAI,GAAG,IAAA,mBAAQ,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACpB,cAAc,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,IAAI,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAS,EAAE,QAAgB;IACzD,IAAI,IAAI,GAAG,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;IAE1B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACpD,IAAI,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CACrB,IAAS,EACT,QAAgB,EAChB,cAAsC,EACtC,KAAuB;IAEvB,MAAM,MAAM,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAC,CAAC,CAAC,IAAA,kBAAQ,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,MAAM,IAAI,GAAG,MAAM;QACjB,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC;QACpD,CAAC,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACpB,cAAc,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAoB,EAAE,KAAuB;IACtE,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,IAAA,kBAAQ,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,IAAA,kBAAQ,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CACZ,IAAS,EACT,cAAsC,EACtC,KAAuB;IAEvB,MAAM,QAAQ,GAAG,IAAA,kBAAQ,EAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,IAAI,KAAK,CAAC;IAEpD,IAAI,IAAI,KAAK,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,cAAc,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACnE,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAE/B,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAa,YAAa,SAAQ,mBAAwB;IACxD,KAAK,CAAC,IAAS;;QACb,OAAO,KAAK,CACV,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,YAAY,CAAC,EACpD,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;IACD,YAAsB,IAAsB;QAC1C,KAAK,CAAC,IAAI,CAAC,CAAC;QADQ,SAAI,GAAJ,IAAI,CAAkB;QAE1C,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;IACjD,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"v_date.js","sourceRoot":"","sources":["../../../../src/src/verifiers/date/v_date.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.conditionWithValue = conditionWithValue;
|
|
4
|
+
function conditionWithValue(value, message) {
|
|
5
|
+
if (message === undefined) {
|
|
6
|
+
return value;
|
|
7
|
+
}
|
|
8
|
+
if (typeof message === "string") {
|
|
9
|
+
return { val: value, message: () => message };
|
|
10
|
+
}
|
|
11
|
+
if (typeof message === "function") {
|
|
12
|
+
return { val: value, message: message };
|
|
13
|
+
}
|
|
14
|
+
if (message !== null && typeof message === "object" && "message" in message) {
|
|
15
|
+
return { val: value, message: message.message };
|
|
16
|
+
}
|
|
17
|
+
return value;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=conditionMessage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conditionMessage.js","sourceRoot":"","sources":["../../../../src/src/verifiers/helpers/conditionMessage.ts"],"names":[],"mappings":";;AAOA,gDAqBC;AArBD,SAAgB,kBAAkB,CAChC,KAAQ,EACR,OAAqC;IAErC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAgC,EAAE,CAAC;IACnE,CAAC;IAED,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;QAC5E,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IInfo, MessageType, VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
|
|
2
|
+
import { ConditionMessageInput } from "../helpers/conditionMessage";
|
|
2
3
|
import { Verifier } from "../verifier";
|
|
3
4
|
export interface VNumberConditions extends VBadTypeMessage, VDefaultValue<number>, VVCIsRequired, IInfo<number> {
|
|
4
5
|
min?: MessageType<number, {
|
|
@@ -23,10 +24,47 @@ export interface VNumberConditions extends VBadTypeMessage, VDefaultValue<number
|
|
|
23
24
|
export declare class VNumberNotNull extends Verifier<number> {
|
|
24
25
|
protected cond?: VNumberConditions | undefined;
|
|
25
26
|
check(data: any): number;
|
|
27
|
+
min(n: number, message?: ConditionMessageInput<number, {
|
|
28
|
+
min: number;
|
|
29
|
+
}>): VNumberNotNull;
|
|
30
|
+
max(n: number, message?: ConditionMessageInput<number, {
|
|
31
|
+
max: number;
|
|
32
|
+
}>): VNumberNotNull;
|
|
33
|
+
in(values: number[], message?: ConditionMessageInput<number[], {
|
|
34
|
+
in: number[];
|
|
35
|
+
}>): VNumberNotNull;
|
|
36
|
+
notIn(values: number[], message?: ConditionMessageInput<number[], {
|
|
37
|
+
notIn: number[];
|
|
38
|
+
}>): VNumberNotNull;
|
|
39
|
+
maxDecimalPlaces(n: number, message?: ConditionMessageInput<number, {
|
|
40
|
+
maxDecimalPlaces: number;
|
|
41
|
+
}>): VNumberNotNull;
|
|
42
|
+
minDecimalPlaces(n: number, message?: ConditionMessageInput<number, {
|
|
43
|
+
minDecimalPlaces: number;
|
|
44
|
+
}>): VNumberNotNull;
|
|
26
45
|
constructor(cond?: VNumberConditions | undefined);
|
|
27
46
|
}
|
|
28
47
|
export declare class VNumber extends Verifier<number | null> {
|
|
29
48
|
protected cond?: VNumberConditions | undefined;
|
|
30
49
|
check(data: any): number | null;
|
|
50
|
+
min(n: number, message?: ConditionMessageInput<number, {
|
|
51
|
+
min: number;
|
|
52
|
+
}>): VNumber;
|
|
53
|
+
max(n: number, message?: ConditionMessageInput<number, {
|
|
54
|
+
max: number;
|
|
55
|
+
}>): VNumber;
|
|
56
|
+
in(values: number[], message?: ConditionMessageInput<number[], {
|
|
57
|
+
in: number[];
|
|
58
|
+
}>): VNumber;
|
|
59
|
+
notIn(values: number[], message?: ConditionMessageInput<number[], {
|
|
60
|
+
notIn: number[];
|
|
61
|
+
}>): VNumber;
|
|
62
|
+
maxDecimalPlaces(n: number, message?: ConditionMessageInput<number, {
|
|
63
|
+
maxDecimalPlaces: number;
|
|
64
|
+
}>): VNumber;
|
|
65
|
+
minDecimalPlaces(n: number, message?: ConditionMessageInput<number, {
|
|
66
|
+
minDecimalPlaces: number;
|
|
67
|
+
}>): VNumber;
|
|
31
68
|
constructor(cond?: VNumberConditions | undefined);
|
|
69
|
+
required(): VNumberNotNull;
|
|
32
70
|
}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.VNumber = exports.VNumberNotNull = void 0;
|
|
4
4
|
const v_error_1 = require("../../error/v_error");
|
|
5
5
|
const message_1 = require("../../languages/message");
|
|
6
|
+
const conditionMessage_1 = require("../helpers/conditionMessage");
|
|
6
7
|
const verifier_1 = require("../verifier");
|
|
7
8
|
const dMessages = {
|
|
8
9
|
min: {
|
|
@@ -91,6 +92,24 @@ class VNumberNotNull extends verifier_1.Verifier {
|
|
|
91
92
|
var _a;
|
|
92
93
|
return vNumber(this.isRequired(data, true, (_a = this.cond) === null || _a === void 0 ? void 0 : _a.defaultValue), this.badTypeMessage, this.cond);
|
|
93
94
|
}
|
|
95
|
+
min(n, message) {
|
|
96
|
+
return new VNumberNotNull(Object.assign(Object.assign({}, this.cond), { min: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
97
|
+
}
|
|
98
|
+
max(n, message) {
|
|
99
|
+
return new VNumberNotNull(Object.assign(Object.assign({}, this.cond), { max: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
100
|
+
}
|
|
101
|
+
in(values, message) {
|
|
102
|
+
return new VNumberNotNull(Object.assign(Object.assign({}, this.cond), { in: (0, conditionMessage_1.conditionWithValue)(values, message) }));
|
|
103
|
+
}
|
|
104
|
+
notIn(values, message) {
|
|
105
|
+
return new VNumberNotNull(Object.assign(Object.assign({}, this.cond), { notIn: (0, conditionMessage_1.conditionWithValue)(values, message) }));
|
|
106
|
+
}
|
|
107
|
+
maxDecimalPlaces(n, message) {
|
|
108
|
+
return new VNumberNotNull(Object.assign(Object.assign({}, this.cond), { maxDecimalPlaces: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
109
|
+
}
|
|
110
|
+
minDecimalPlaces(n, message) {
|
|
111
|
+
return new VNumberNotNull(Object.assign(Object.assign({}, this.cond), { minDecimalPlaces: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
112
|
+
}
|
|
94
113
|
constructor(cond) {
|
|
95
114
|
super(cond);
|
|
96
115
|
this.cond = cond;
|
|
@@ -107,12 +126,32 @@ class VNumber extends verifier_1.Verifier {
|
|
|
107
126
|
}
|
|
108
127
|
return vNumber(val, this.badTypeMessage, this.cond);
|
|
109
128
|
}
|
|
129
|
+
min(n, message) {
|
|
130
|
+
return new VNumber(Object.assign(Object.assign({}, this.cond), { min: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
131
|
+
}
|
|
132
|
+
max(n, message) {
|
|
133
|
+
return new VNumber(Object.assign(Object.assign({}, this.cond), { max: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
134
|
+
}
|
|
135
|
+
in(values, message) {
|
|
136
|
+
return new VNumber(Object.assign(Object.assign({}, this.cond), { in: (0, conditionMessage_1.conditionWithValue)(values, message) }));
|
|
137
|
+
}
|
|
138
|
+
notIn(values, message) {
|
|
139
|
+
return new VNumber(Object.assign(Object.assign({}, this.cond), { notIn: (0, conditionMessage_1.conditionWithValue)(values, message) }));
|
|
140
|
+
}
|
|
141
|
+
maxDecimalPlaces(n, message) {
|
|
142
|
+
return new VNumber(Object.assign(Object.assign({}, this.cond), { maxDecimalPlaces: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
143
|
+
}
|
|
144
|
+
minDecimalPlaces(n, message) {
|
|
145
|
+
return new VNumber(Object.assign(Object.assign({}, this.cond), { minDecimalPlaces: (0, conditionMessage_1.conditionWithValue)(n, message) }));
|
|
146
|
+
}
|
|
110
147
|
constructor(cond) {
|
|
111
148
|
super(cond);
|
|
112
149
|
this.cond = cond;
|
|
113
|
-
this.cond = cond;
|
|
114
150
|
this.badTypeMessage = dMessages.badTypeMessage;
|
|
115
151
|
}
|
|
152
|
+
required() {
|
|
153
|
+
return new VNumberNotNull(this.cond);
|
|
154
|
+
}
|
|
116
155
|
}
|
|
117
156
|
exports.VNumber = VNumber;
|
|
118
157
|
//# sourceMappingURL=v_number.js.map
|