Merge pull request #12 from oesukam/ft-array-validation-164489344

#164489344 Add array's validation

README.md

@@ -2,8 +2,6 @@
 
 ---
 
----
-
 [![Build Status](https://travis-ci.org/oesukam/cheke.svg?branch=master)](https://travis-ci.org/oesukam/cheke)
 [![Coverage Status](https://coveralls.io/repos/github/oesukam/cheke/badge.svg?branch=master)](https://coveralls.io/github/oesukam/cheke?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/f0f25d4e5bc5182f32a5/maintainability)](https://codeclimate.com/github/oesukam/cheke/maintainability)

__tests__/hasErrors.test.js

@@ -24,6 +24,14 @@ describe('hasErrors', () => {
       expect(res.age.message).toBe('The age must be a number.');
     }));
 
+  test('should return The age must be a number', () =>
+    hasErrors({
+      data: { age: '21' },
+      reqRules: { page: 'number' },
+    }).then(res => {
+      expect(res.age.message).toBe('age is not allowed.');
+    }));
+
   test('should return The age must be a number', () =>
     hasErrors({
       data: { age: 21 },

__tests__/messages/notAllowedMessage.test.js

@@ -0,0 +1,7 @@
+const notAllowed = require('../../src/messages/notAllowedMessage');
+
+describe('not-an-array-message', () => {
+  test('should return `users is not allowed.`', () => {
+    expect(notAllowed('users')).toBe('users is not allowed.');
+  });
+});

__tests__/messages/notArrayMessage.test.js

@@ -0,0 +1,7 @@
+const notArray = require('../../src/messages/notArrayMessage');
+
+describe('not-an-array-message', () => {
+  test('should return `users must be an array.`', () => {
+    expect(notArray('users')).toBe('users must be an array.');
+  });
+});

__tests__/validators/array.test.js

@@ -0,0 +1,28 @@
+const array = require('../../src/validators/array');
+
+describe('integer-validator', () => {
+  test('should return `undefined must be an array.`', () => {
+    expect(array()).toBe('undefined must be an array.');
+  });
+
+  test('should return `users must be an array.`', () => {
+    expect(array({
+        value: 'not an array',
+        label: 'users',
+      }),).toBe('users must be an array.');
+  });
+
+  test('should return `users must be an array.`', () => {
+    expect(array({
+        value: {},
+        label: 'users',
+      }),).toBe('users must be an array.');
+  });
+
+  test('should return false', () => {
+    expect(array({
+        value: [],
+        label: 'users',
+      }),).toBe(false);
+  });
+});

__tests__/validators/number.test.js

@@ -19,6 +19,22 @@ describe('number-validator', () => {
       }),).toBe('The age must be a number.');
   });
 
+  test('should return false', () => {
+    expect(number({
+        value: '21p',
+        label: 'age',
+        path: 'query',
+      }),).toBe('The age must be a number.');
+  });
+
+  test('should return false', () => {
+    expect(number({
+        value: '21',
+        label: 'age',
+        path: 'params',
+      }),).toBe(false);
+  });
+
   test('should return false', () => {
     expect(number({
         value: 21,

lib/messages/notAllowedMessage.js

@@ -0,0 +1 @@
+module.exports=a=>`${a} is not allowed.`;

lib/messages/notArrayMessage.js

@@ -0,0 +1 @@
+module.exports=a=>`${a} must be an array.`;

src/hasErrors.js

@@ -1,12 +1,24 @@
 const validators = require('./validators');
+const notAllowedMessage = require('./messages/notAllowedMessage');
 
 const valids = Object.keys(validators);
 
 const hasErrors = ({ data = {}, reqRules, path } = {}) =>
   new Promise((resolve, reject) => {
     if (!reqRules) resolve(false);
-    Object.keys(reqRules).forEach(key => {
-      if (!reqRules[key]) reject(Error(`${key}'s rule can not be empty`));
+    const dataRules = { ...data, ...reqRules };
+    Object.keys(dataRules).forEach(key => {
+      if (reqRules[key] === undefined) {
+        resolve({
+          [key]: {
+            path,
+            message: notAllowedMessage(key),
+          },
+        });
+      }
+      if (!reqRules[key] && reqRules[key] !== undefined) {
+        reject(Error(`${key}'s rule can not be empty`));
+      }
       const rules = reqRules[key].split('|').map(rule => rule.trim());
       Object.keys(rules).forEach(k => {
         const [rule, valid] = rules[k].split(':');
@@ -20,7 +32,6 @@ const hasErrors = ({ data = {}, reqRules, path } = {}) =>
               message: validators.required({
                 value: data[key],
                 label: key,
-                valid,
               }),
             },
           });

src/messages/notAllowedMessage.js

@@ -0,0 +1 @@
+module.exports = label => `${label} is not allowed.`;

src/messages/notArrayMessage.js

@@ -0,0 +1 @@
+module.exports = label => `${label} must be an array.`;

src/validators/array.js

@@ -0,0 +1,6 @@
+const notArrayMessage = require('../messages/notArrayMessage');
+
+module.exports = ({ value, label } = {}) => {
+  if (value instanceof Array) return false;
+  return notArrayMessage(label);
+};

src/validators/number.js

@@ -1,4 +1,8 @@
 const numberMessage = require('../messages/notNumberMessage');
 
-module.exports = ({ value, label } = {}) =>
-  typeof value === 'number' ? false : numberMessage(label);
+module.exports = ({ value, label, path } = {}) => {
+  if (path === 'query' || path === 'params') {
+    return !Number.isNaN(Number(value)) ? false : numberMessage(label);
+  }
+  return typeof value === 'number' ? false : numberMessage(label);
+};