Allow array min/max/length overrides. Fixes #1127.

hapijs · Aug 8, 2018 · 674a59e · 674a59e
1 parent 96d02a3
commit 674a59e
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/lib/types/any/index.js b/lib/types/any/index.js
@@ -218,6 +218,14 @@ module.exports = internals.Any = class {
         return obj;
     }
 
+    _testUnique(name, arg, func, options) {
+
+        const obj = this.clone();
+        obj._tests = obj._tests.filter((test) => test.name !== name);
+        obj._tests.push({ func, name, arg, options });
+        return obj;
+    }
+
     options(options) {
 
         Hoek.assert(!options.context, 'Cannot override context');

diff --git a/lib/types/array/index.js b/lib/types/array/index.js
@@ -399,7 +399,7 @@ internals.Array = class extends Any {
 
         Hoek.assert((Number.isSafeInteger(limit) && limit >= 0) || isRef, 'limit must be a positive integer or reference');
 
-        return this._test('min', limit, function (value, state, options) {
+        return this._testUnique('min', limit, function (value, state, options) {
 
             let compareTo;
             if (isRef) {
@@ -427,7 +427,7 @@ internals.Array = class extends Any {
 
         Hoek.assert((Number.isSafeInteger(limit) && limit >= 0) || isRef, 'limit must be a positive integer or reference');
 
-        return this._test('max', limit, function (value, state, options) {
+        return this._testUnique('max', limit, function (value, state, options) {
 
             let compareTo;
             if (isRef) {
@@ -455,7 +455,7 @@ internals.Array = class extends Any {
 
         Hoek.assert((Number.isSafeInteger(limit) && limit >= 0) || isRef, 'limit must be a positive integer or reference');
 
-        return this._test('length', limit, function (value, state, options) {
+        return this._testUnique('length', limit, function (value, state, options) {
 
             let compareTo;
             if (isRef) {

diff --git a/test/types/array.js b/test/types/array.js
@@ -356,6 +356,15 @@ describe('array', () => {
             ]);
         });
 
+        it('overrides rule when called multiple times', () => {
+
+            const schema = Joi.array().min(2).min(1);
+            Helper.validate(schema, [
+                [[1, 2], true],
+                [[1], true]
+            ]);
+        });
+
         it('throws when limit is not a number', () => {
 
             expect(() => {
@@ -481,6 +490,15 @@ describe('array', () => {
             ]);
         });
 
+        it('overrides rule when called multiple times', () => {
+
+            const schema = Joi.array().max(1).max(2);
+            Helper.validate(schema, [
+                [[1, 2], true],
+                [[1], true]
+            ]);
+        });
+
         it('throws when limit is not a number', () => {
 
             expect(() => {
@@ -607,6 +625,23 @@ describe('array', () => {
             ]);
         });
 
+        it('overrides rule when called multiple times', () => {
+
+            const schema = Joi.array().length(2).length(1);
+            Helper.validate(schema, [
+                [[1], true],
+                [[1, 2], false, null, {
+                    message: '"value" must contain 1 items',
+                    details: [{
+                        message: '"value" must contain 1 items',
+                        path: [],
+                        type: 'array.length',
+                        context: { limit: 1, value: [1, 2], label: 'value', key: undefined }
+                    }]
+                }]
+            ]);
+        });
+
         it('throws when limit is not a number', () => {
 
             expect(() => {