Skip to content

Commit 8aef1fc

Browse files
committed
Allow predefined validators to have a different error msg
1 parent 1f05f95 commit 8aef1fc

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

‎lib/Validators.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ var validators = {};
99
* a maximum number. One of this constraints
1010
* can be omitted.
1111
**/
12-
validators.rangeNumber = function (min, max) {
12+
validators.rangeNumber = function (min, max, msg) {
1313
return function (n, next) {
1414
if (min === undefined && n <= max) return next();
1515
if (max === undefined && n >= min) return next();
1616
if (n >= min && n <= max) return next();
17-
return next('out-of-range-number');
17+
return next(msg || 'out-of-range-number');
1818
};
1919
};
2020

@@ -23,35 +23,35 @@ validators.rangeNumber = function (min, max) {
2323
* and a maximum number. One of this constraints
2424
* can be omitted.
2525
**/
26-
validators.rangeLength = function (min, max) {
26+
validators.rangeLength = function (min, max, msg) {
2727
return function (v, next) {
2828
if (v === undefined) return next('undefined');
2929
if (min === undefined && v.length <= max) return next();
3030
if (max === undefined && v.length >= min) return next();
3131
if (v.length >= min && v.length <= max) return next();
32-
return next('out-of-range-length');
32+
return next(msg || 'out-of-range-length');
3333
};
3434
};
3535

3636
/**
3737
* Check if a value (number or string) is
3838
* in a list of values.
3939
**/
40-
validators.insideList = function (list) {
40+
validators.insideList = function (list, msg) {
4141
return function (v, next) {
4242
if (list.indexOf(v) >= 0) return next();
43-
return next('outside-list');
43+
return next(msg || 'outside-list');
4444
};
4545
};
4646

4747
/**
4848
* Check if a value (number or string) is
4949
* not in a list of values.
5050
**/
51-
validators.outsideList = function (list) {
51+
validators.outsideList = function (list, msg) {
5252
return function (v, next) {
5353
if (list.indexOf(v) == -1) return next();
54-
return next('inside-list');
54+
return next(msg || 'inside-list');
5555
};
5656
};
5757

@@ -60,11 +60,11 @@ validators.outsideList = function (list) {
6060
* of another property (useful for password
6161
* checking).
6262
**/
63-
validators.equalToProperty = function (name) {
63+
validators.equalToProperty = function (name, msg) {
6464
return function (v, next, data) {
6565
// could also do: v == this[name]
6666
if (v == data[name]) return next();
67-
return next('not-equal-to-property');
67+
return next(msg || 'not-equal-to-property');
6868
};
6969
};
7070

@@ -75,7 +75,7 @@ validators.equalToProperty = function (name) {
7575
* form it can be.
7676
**/
7777
validators.notEmptyString = function () {
78-
return validators.rangeLength(1);
78+
return validators.rangeLength(1, undefined, 'empty-string');
7979
};
8080

8181
/**

0 commit comments

Comments
 (0)