co.validation 2.3.2 → 2.4.1

package/lib/__tests__/component.arrayValidation.js

@@ -51,6 +51,26 @@ describe('createValidation', () => {
       errors: ['test']
     });
   });
+  it('check that array has some item', () => {
+    expect((0, _.createValidation)({
+      type: 'requiredArrayWithItem'
+    })(undefined)).toEqual({
+      data: undefined,
+      errors: ['Must be an array']
+    });
+    expect((0, _.createValidation)({
+      type: 'requiredArrayWithItem'
+    })([1])).toEqual({
+      data: [1],
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'requiredArrayWithItem'
+    })([])).toEqual({
+      data: undefined,
+      errors: ['Required']
+    });
+  });
   it('single invalid item creates error', () => {
     const validatedObject = [{
       login: ''

package/lib/__tests__/component.valueValidation.js

@@ -265,7 +265,7 @@ describe('createValidation', () => {
       max: 3
     })('1234')).toEqual({
       data: undefined,
-      errors: ['Must be 3 characters or less']
+      errors: ['Maximum number of characters - 3']
     });
     expect((0, _.createValidation)({
       type: 'maxLength',
@@ -306,7 +306,7 @@ describe('createValidation', () => {
       max: 3
     })('❤️123')).toEqual({
       data: undefined,
-      errors: ['Must be 3 characters or less']
+      errors: ['Maximum number of characters - 3']
     });
   });
   it('supports minLength', () => {
@@ -339,7 +339,7 @@ describe('createValidation', () => {
       min: 3
     })('12')).toEqual({
       data: undefined,
-      errors: ['Must be at least 3 characters']
+      errors: ['Minimum number of characters - 3']
     });
   });
   it('supports minLength with emoji', () => {
@@ -356,7 +356,7 @@ describe('createValidation', () => {
       min: 3
     })('❤️1')).toEqual({
       data: undefined,
-      errors: ['Must be at least 3 characters']
+      errors: ['Minimum number of characters - 3']
     });
     expect((0, _.createValidation)({
       type: 'minLength',
@@ -667,7 +667,7 @@ describe('createValidation', () => {
         getMessage: () => 'Email'
       }]
     })('123')).toEqual({
-      data: '123',
+      data: 123,
       errors: undefined
     });
     expect((0, _.createValidation)({

package/lib/__tests__/integration.registrationForm.js

@@ -45,6 +45,15 @@ const registrationFormValidation = (0, _.createValidation)({
         type: 'number'
       }]
     },
+    numberOfDiplomas: {
+      type: 'oneOf',
+      validators: [{
+        type: 'equals',
+        to: undefined
+      }, {
+        type: 'number'
+      }]
+    },
     hobbies: {
       type: 'array',
       itemRule: {
@@ -102,6 +111,30 @@ const ukErrors = {
   '##custom': 'Помилка'
 };
 describe('registrationFormValidation in language=' + encodeURI, () => {
+  it('success of full validation', () => {
+    const validatedObject = {
+      firstName: 'John',
+      lastName: 'Doe',
+      email: 'john.doe@example.com',
+      age: 25,
+      numberOfDiplomas: '2',
+      hobbies: [{
+        title: 'Gardening',
+        description: 'I love spending time in my garden, growing flowers and vegetables.',
+        toys: ['Shovel', 'Watering can']
+      }, {
+        title: 'Cooking',
+        description: 'Cooking is my passion. I enjoy experimenting with new recipes.',
+        toys: ['Cookware', 'Cutting board']
+      }]
+    };
+    ;
+    const validationResult = registrationFormValidation(validatedObject);
+    expect(validationResult.errors).toEqual(undefined);
+    expect(validationResult.data).toEqual({ ...validatedObject,
+      numberOfDiplomas: 2
+    });
+  });
   ['en', 'uk', 'en'].map(lang => {
     it('single invalid item creates error without array in lang' + lang, () => {
       if (lang === 'en') {

package/lib/__tests__/integration.valueValidation.js

@@ -143,7 +143,7 @@ describe('createValueValidation', () => {
     expect((0, _.createValueValidation)({
       type: 'maxLength',
       max: 3
-    })('1234')).toEqual(['Must be 3 characters or less']);
+    })('1234')).toEqual(['Maximum number of characters - 3']);
     expect((0, _.createValueValidation)({
       type: 'maxLength',
       max: 3,
@@ -179,7 +179,7 @@ describe('createValueValidation', () => {
     expect((0, _.createValueValidation)({
       type: 'minLength',
       min: 3
-    })('12')).toEqual(['Must be at least 3 characters']);
+    })('12')).toEqual(['Minimum number of characters - 3']);
   });
   it('supports number', () => {
     expect((0, _.createValueValidation)({

package/lib/createValidation.js

@@ -20,6 +20,9 @@ const createValidation = rule => {
     case 'required':
       return (0, _validators.required)(rule);
 
+    case 'requiredArrayWithItem':
+      return (0, _validators.requiredArrayWithItem)(rule);
+
     case 'custom':
       return (0, _validators.custom)(rule);
 

package/lib/messageProcessor.js

@@ -8,12 +8,12 @@ const defaultDefaultMessages = {
   '##object': 'Must be an object',
   '##array': 'Must be an array',
   '##required': 'Required',
-  '##equals': `Must be equal to {to}`,
-  '##maxLength': `Must be {max} characters or less`,
-  '##minLength': `Must be at least {min} characters`,
+  '##equals': 'Must be equal to {to}',
+  '##maxLength': 'Maximum number of characters - {max}',
+  '##minLength': 'Minimum number of characters - {min}',
   '##number': 'Must be a number',
-  '##minValue': `Must be at least {min}`,
-  '##maxValue': `Must be not more than {max}`,
+  '##minValue': 'Must be at least {min}',
+  '##maxValue': 'Must be not more than {max}',
   '##email': 'Invalid email format',
   '##alphanumeric': 'Only alphanumeric characters',
   '##string': 'Must be a string',

package/lib/operators.js

@@ -11,20 +11,21 @@ const oneOf = (...validators) => {
   }
 
   return (value, allValues) => {
-    const validationErrors = validators.reduce((validationErrors, validator) => {
-      if (validationErrors === undefined) {
-        return undefined;
-      }
+    const validationErrors = [];
 
-      const currentResult = validator(value, allValues);
+    for (const validator of validators) {
+      let currentResult = validator(value, allValues);
 
       if (currentResult.errors) {
-        if (Array.isArray(currentResult.errors)) return [...validationErrors, ...currentResult.errors];
-        return [...validationErrors, currentResult.errors];
+        if (Array.isArray(currentResult.errors)) {
+          validationErrors.push(...currentResult.errors);
+        } else {
+          validationErrors.push(currentResult.errors);
+        }
       } else {
-        return undefined;
+        return currentResult;
       }
-    }, []);
+    }
 
     if (validationErrors && validationErrors.length > 0) {
       return {

package/lib/validators.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.regex = exports.equalsToField = exports.boolean = exports.string = exports.alphanumeric = exports.email = exports.maxValue = exports.minValue = exports.number = exports.minLength = exports.maxLength = exports.equals = exports.required = exports.custom = void 0;
+exports.regex = exports.equalsToField = exports.boolean = exports.string = exports.alphanumeric = exports.email = exports.maxValue = exports.minValue = exports.number = exports.minLength = exports.maxLength = exports.equals = exports.requiredArrayWithItem = exports.required = exports.custom = void 0;
 
 var _messageProcessor = _interopRequireDefault(require("./messageProcessor"));
 
@@ -36,6 +36,24 @@ const required = ({
 
 exports.required = required;
 
+const requiredArrayWithItem = ({
+  getMessage
+}) => value => {
+  if (Array.isArray(value)) {
+    return value.length > 0 ? {
+      data: value
+    } : {
+      errors: (0, _messageProcessor.default)(getMessage, '##required')
+    };
+  }
+
+  return {
+    errors: (0, _messageProcessor.default)(getMessage, `##array`)
+  };
+};
+
+exports.requiredArrayWithItem = requiredArrayWithItem;
+
 const equals = ({
   to,
   getMessage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "co.validation",
-  "version": "2.3.2",
+  "version": "2.4.1",
   "description": "JSON based fluent validation for browser, node.js, redux-form and anything javascript compatible.",
   "main": "lib/index.js",
   "scripts": {