Skip to content

Commit cccf1a5

Browse files
Add AnyOf assert
1 parent 16fbc80 commit cccf1a5

6 files changed

Lines changed: 226 additions & 1 deletion

File tree

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ The following set of extra asserts are provided by this package:
2929
| Assert | Peer Dependency |
3030
| :------------------------------------------------------------------------------ | :--------------------------------------------------- |
3131
| [AbaRoutingNumber](#abaroutingnumber) | [`abavalidator`][abavalidator-url] |
32+
| [AnyOf](#anyof) | |
3233
| [BankIdentifierCode](#bankidentifiercode-bic) (_BIC_) | |
3334
| [BigNumber](#bignumber) | [`bignumber.js`][bignumber-url] |
3435
| [BigNumberEqualTo](#bignumberequalto) | [`bignumber.js`][bignumber-url] |
@@ -75,6 +76,14 @@ The following set of extra asserts are provided by this package:
7576

7677
Tests if the value is a valid [ABA Routing Number](http://www.accuity.com/PageFiles/255/ROUTING_NUMBER_POLICY.pdf).
7778

79+
### AnyOf
80+
81+
Tests if the value matches at least one of the provided constraint sets. Throws a violation if the value matches none of the constraint sets.
82+
83+
#### Arguments
84+
85+
- `...constraintSets` (required) - two or more constraint sets to test the value against. Each constraint set can be either a plain object mapping field names to arrays of asserts, or an assert instance.
86+
7887
### BankIdentifierCode (_BIC_)
7988

8089
Tests if the value is a valid Bank Identifier Code (_BIC_) as defined in the [ISO-9362](http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=60390) standard.

src/asserts/any-of-assert.js

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
'use strict';
2+
3+
/**
4+
* Module dependencies.
5+
*/
6+
7+
const { Constraint, Validator, Violation } = require('validator.js');
8+
9+
/**
10+
* Export `AnyOfAssert`.
11+
*/
12+
13+
module.exports = function anyOfAssert(...constraintSets) {
14+
if (constraintSets.length < 2) {
15+
throw new Error('AnyOf constraint requires at least two constraint sets');
16+
}
17+
18+
/**
19+
* Class name.
20+
*/
21+
22+
this.__class__ = 'AnyOf';
23+
24+
/**
25+
* Validator instance.
26+
*/
27+
28+
this.validator = new Validator();
29+
30+
/**
31+
* Validation algorithm.
32+
*/
33+
34+
this.validate = value => {
35+
const violations = [];
36+
37+
for (const constraintSet of constraintSets) {
38+
try {
39+
const result =
40+
typeof constraintSet.validate === 'function'
41+
? constraintSet.validate(value)
42+
: this.validator.validate(value, new Constraint(constraintSet, { deepRequired: true }));
43+
44+
if (result === true) {
45+
return true;
46+
}
47+
48+
violations.push(result);
49+
} catch (violation) {
50+
violations.push(violation);
51+
}
52+
}
53+
54+
throw new Violation(this, value, violations);
55+
};
56+
57+
return this;
58+
};

src/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
const AbaRoutingNumber = require('./asserts/aba-routing-number-assert.js');
8+
const AnyOf = require('./asserts/any-of-assert.js');
89
const BankIdentifierCode = require('./asserts/bank-identifier-code-assert.js');
910
const BigNumber = require('./asserts/big-number-assert.js');
1011
const BigNumberEqualTo = require('./asserts/big-number-equal-to-assert.js');
@@ -53,6 +54,7 @@ const Uuid = require('./asserts/uuid-assert.js');
5354

5455
module.exports = {
5556
AbaRoutingNumber,
57+
AnyOf,
5658
BankIdentifierCode,
5759
BigNumber,
5860
BigNumberEqualTo,

src/types/index.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ export interface ValidatorJSAsserts {
2727
*/
2828
abaRoutingNumber(): AssertInstance;
2929

30+
/** Value matches one or more of the provided constraint sets. */
31+
anyOf(...constraintSets: Record<string, AssertInstance[]>[]): AssertInstance;
32+
3033
/** Valid BIC (Bank Identifier Code) used for international wire transfers. */
3134
bankIdentifierCode(): AssertInstance;
3235

test/asserts/any-of-assert.test.js

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
'use strict';
2+
3+
/**
4+
* Module dependencies.
5+
*/
6+
7+
const { Assert: BaseAssert, Violation } = require('validator.js');
8+
const { describe, it } = require('node:test');
9+
const AnyOfAssert = require('../../src/asserts/any-of-assert.js');
10+
11+
/**
12+
* Extend `Assert` with `AnyOfAssert`.
13+
*/
14+
15+
const Assert = BaseAssert.extend({
16+
AnyOf: AnyOfAssert
17+
});
18+
19+
/**
20+
* Test `AnyOfAssert`.
21+
*/
22+
23+
describe('AnyOfAssert', () => {
24+
it('should throw an error if no constraint sets are provided', ({ assert }) => {
25+
try {
26+
Assert.anyOf();
27+
28+
assert.fail();
29+
} catch (e) {
30+
assert.equal(e.message, 'AnyOf constraint requires at least two constraint sets');
31+
}
32+
});
33+
34+
it('should throw an error if only one constraint set is provided', ({ assert }) => {
35+
try {
36+
Assert.anyOf({ bar: [Assert.equalTo('foo')] });
37+
38+
assert.fail();
39+
} catch (e) {
40+
assert.equal(e.message, 'AnyOf constraint requires at least two constraint sets');
41+
}
42+
});
43+
44+
it('should throw an error if value does not match any constraint set', ({ assert }) => {
45+
try {
46+
Assert.anyOf({ bar: [Assert.equalTo('foo')] }, { bar: [Assert.equalTo('baz')] }).validate({ bar: 'biz' });
47+
48+
assert.fail();
49+
} catch (e) {
50+
assert.ok(e instanceof Violation);
51+
assert.equal(e.show().assert, 'AnyOf');
52+
}
53+
});
54+
55+
it('should include all violations in the error when no constraint set matches', ({ assert }) => {
56+
try {
57+
Assert.anyOf({ bar: [Assert.equalTo('biz')] }, { bar: [Assert.equalTo('baz')] }).validate({ bar: 'qux' });
58+
59+
assert.fail();
60+
} catch (e) {
61+
const { violation } = e.show();
62+
63+
assert.equal(violation.length, 2);
64+
assert.ok(violation[0].bar[0] instanceof Violation);
65+
assert.equal(violation[0].bar[0].show().assert, 'EqualTo');
66+
assert.equal(violation[0].bar[0].show().violation.value, 'biz');
67+
assert.ok(violation[1].bar[0] instanceof Violation);
68+
assert.equal(violation[1].bar[0].show().assert, 'EqualTo');
69+
assert.equal(violation[1].bar[0].show().violation.value, 'baz');
70+
}
71+
});
72+
73+
it('should validate required fields using `deepRequired`', ({ assert }) => {
74+
try {
75+
Assert.anyOf(
76+
{ bar: [Assert.required(), Assert.notBlank()] },
77+
{ baz: [Assert.required(), Assert.notBlank()] }
78+
).validate({});
79+
80+
assert.fail();
81+
} catch (e) {
82+
assert.ok(e instanceof Violation);
83+
assert.equal(e.show().assert, 'AnyOf');
84+
}
85+
});
86+
87+
it('should throw an error if a constraint set with an extra assert does not match', ({ assert }) => {
88+
try {
89+
Assert.anyOf(
90+
{
91+
bar: [Assert.equalTo('biz')],
92+
baz: [Assert.anyOf({ qux: [Assert.equalTo('corge')] }, { qux: [Assert.equalTo('grault')] })]
93+
},
94+
{ bar: [Assert.equalTo('baz')] }
95+
).validate({ bar: 'biz', baz: { qux: 'wrong' } });
96+
97+
assert.fail();
98+
} catch (e) {
99+
assert.ok(e instanceof Violation);
100+
assert.equal(e.show().assert, 'AnyOf');
101+
}
102+
});
103+
104+
it('should throw an error if value does not match any assert instance constraint set', ({ assert }) => {
105+
try {
106+
Assert.anyOf(Assert.ofLength({ max: 1 }), Assert.ofLength({ min: 5 })).validate('foo');
107+
108+
assert.fail();
109+
} catch (e) {
110+
assert.ok(e instanceof Violation);
111+
assert.equal(e.show().assert, 'AnyOf');
112+
}
113+
});
114+
115+
it('should pass if value matches more than one constraint set', () => {
116+
Assert.anyOf({ bar: [Assert.equalTo('biz')] }, { bar: [Assert.equalTo('biz')] }).validate({ bar: 'biz' });
117+
});
118+
119+
it('should pass if value matches more than one constraint set with different constraints', () => {
120+
Assert.anyOf({ bar: [Assert.notBlank()] }, { bar: [Assert.equalTo('biz')] }).validate({ bar: 'biz' });
121+
});
122+
123+
it('should pass if value matches the first constraint set', () => {
124+
Assert.anyOf({ bar: [Assert.equalTo('biz')] }, { bar: [Assert.equalTo('baz')] }).validate({ bar: 'biz' });
125+
});
126+
127+
it('should pass if value matches the second constraint set', () => {
128+
Assert.anyOf({ bar: [Assert.equalTo('biz')] }, { bar: [Assert.equalTo('baz')] }).validate({ bar: 'baz' });
129+
});
130+
131+
it('should support more than two constraint sets', () => {
132+
Assert.anyOf(
133+
{ bar: [Assert.equalTo('biz')] },
134+
{ bar: [Assert.equalTo('baz')] },
135+
{ bar: [Assert.equalTo('qux')] }
136+
).validate({ bar: 'qux' });
137+
});
138+
139+
it('should pass if a constraint set contains an extra assert', () => {
140+
Assert.anyOf(
141+
{
142+
bar: [Assert.equalTo('biz')],
143+
baz: [Assert.anyOf({ qux: [Assert.equalTo('corge')] }, { qux: [Assert.equalTo('grault')] })]
144+
},
145+
{ bar: [Assert.equalTo('baz')] }
146+
).validate({ bar: 'biz', baz: { qux: 'corge' } });
147+
});
148+
149+
it('should pass if value matches when using assert instances as constraint sets', () => {
150+
Assert.anyOf(Assert.ofLength({ max: 2 }), Assert.ofLength({ min: 3 })).validate('foo');
151+
});
152+
});

test/index.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ describe('validator.js-asserts', () => {
1515
it('should export all asserts', ({ assert }) => {
1616
const assertNames = Object.keys(asserts);
1717

18-
assert.equal(assertNames.length, 42);
18+
assert.equal(assertNames.length, 43);
1919
assert.deepEqual(assertNames, [
2020
'AbaRoutingNumber',
21+
'AnyOf',
2122
'BankIdentifierCode',
2223
'BigNumber',
2324
'BigNumberEqualTo',

0 commit comments

Comments
 (0)