co.validation 1.0.0-RC.1 → 1.0.0-RC.5

package/lib/__tests__/component.objectValidation.js

@@ -184,6 +184,238 @@ describe('createObjectValidation', () => {
       }
     });
   });
+  it('supports property validation for valid object and only custom prop validation and omits extra properties', () => {
+    const validatedObject = {
+      login: 'login',
+      password: 'password',
+      5: true,
+      123: true,
+      '2020-03-05': {
+        hz: 1
+      },
+      '2020-03-a2': 'skip'
+    };
+    const validationResult = (0, _.createValidation)({
+      type: 'object',
+      customPropRules: [{
+        nameRule: {
+          type: 'number'
+        },
+        valueRule: {
+          type: 'boolean'
+        }
+      }, {
+        nameRule: {
+          type: 'regex',
+          regex: /([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))/
+        },
+        valueRule: {
+          type: 'object'
+        }
+      }]
+    })(validatedObject);
+    expect(validationResult.errors).toEqual(undefined);
+    expect(validationResult.data).toEqual({
+      5: true,
+      123: true,
+      '2020-03-05': {
+        hz: 1
+      }
+    });
+  });
+  it('is beatiful', () => {
+    const validatedObject = {
+      weekly: {
+        mon: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        tue: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        wed: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        thu: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        fri: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        sat: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '17:00'
+          }]
+        },
+        sun: {
+          intervals: []
+        }
+      }
+    };
+    const daySchedule = {
+      type: 'all',
+      validators: [{
+        type: 'required'
+      }, {
+        type: 'object',
+        rules: {
+          intervals: {
+            type: 'all',
+            validators: [{
+              type: 'required'
+            }, {
+              type: 'array',
+              itemRule: {
+                type: 'all',
+                validators: [{
+                  type: 'required'
+                }, {
+                  type: 'object',
+                  rules: {
+                    from: {
+                      type: 'all',
+                      validators: [{
+                        type: 'required'
+                      }, {
+                        type: 'regex',
+                        regex: /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/
+                      }]
+                    },
+                    to: {
+                      type: 'all',
+                      validators: [{
+                        type: 'required'
+                      }, {
+                        type: 'regex',
+                        regex: /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/
+                      }]
+                    }
+                  }
+                }]
+              }
+            }]
+          }
+        }
+      }]
+    };
+    const validationResult = (0, _.createValidation)({
+      type: 'object',
+      rules: {
+        weekly: {
+          type: 'all',
+          validators: [{
+            type: 'required'
+          }, {
+            type: 'object',
+            rules: {
+              mon: daySchedule,
+              tue: daySchedule,
+              wed: daySchedule,
+              thu: daySchedule,
+              fri: daySchedule,
+              sat: daySchedule,
+              sun: daySchedule
+            }
+          }]
+        }
+      }
+    })(validatedObject);
+    expect(validationResult.errors).toEqual(undefined);
+    expect(validationResult.data).toEqual({
+      weekly: {
+        mon: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        tue: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        wed: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        thu: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        fri: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '21:00'
+          }]
+        },
+        sat: {
+          intervals: [{
+            from: '09:00',
+            to: '12:00'
+          }, {
+            from: '13:00',
+            to: '17:00'
+          }]
+        },
+        sun: {
+          intervals: []
+        }
+      }
+    });
+  });
   it('supports property validation for invalidvalid object and custom prop validation and omits extra properties', () => {
     const validatedObject = {
       login: 'login',

package/lib/__tests__/component.valueValidation.js

@@ -291,7 +291,7 @@ describe('createValidation', () => {
       type: 'number',
       getMessage: () => 'Number'
     })('1234')).toEqual({
-      data: '1234',
+      data: 1234,
       errors: undefined
     });
     expect((0, _.createValidation)({
@@ -345,6 +345,13 @@ describe('createValidation', () => {
     });
   });
   it('supports boolean', () => {
+    expect((0, _.createValidation)({
+      type: 'boolean',
+      getMessage: () => 'Boolean'
+    })(undefined)).toEqual({
+      data: undefined,
+      errors: undefined
+    });
     expect((0, _.createValidation)({
       type: 'boolean',
       getMessage: () => 'Boolean'
@@ -556,8 +563,8 @@ describe('createValidation', () => {
     expect((0, _.createValidation)({
       type: 'all',
       validators: [{
-        type: 'number',
-        getMessage: () => 'Number'
+        type: 'email',
+        getMessage: () => 'Email'
       }, {
         type: 'maxLength',
         max: 1,
@@ -565,7 +572,7 @@ describe('createValidation', () => {
       }]
     })('xz')).toEqual({
       data: undefined,
-      errors: ['Number', 'MaxLength']
+      errors: ['Email', 'MaxLength']
     });
     expect((0, _.createValidation)({
       type: 'all',
@@ -573,19 +580,19 @@ describe('createValidation', () => {
         type: 'number',
         getMessage: () => 'Number'
       }, {
-        type: 'maxLength',
-        max: 1,
-        getMessage: () => 'MaxLength'
+        type: 'maxValue',
+        max: 11,
+        getMessage: () => 'MaxValue'
       }]
     })('12')).toEqual({
       data: undefined,
-      errors: ['MaxLength']
+      errors: ['MaxValue']
     });
     expect((0, _.createValidation)({
       type: 'all',
       validators: [{
-        type: 'number',
-        getMessage: () => 'Number'
+        type: 'email',
+        getMessage: () => 'Email'
       }, {
         type: 'maxLength',
         max: 1,
@@ -593,7 +600,7 @@ describe('createValidation', () => {
       }]
     })('x')).toEqual({
       data: undefined,
-      errors: ['Number']
+      errors: ['Email']
     });
     expect((0, _.createValidation)({
       type: 'all',
@@ -601,12 +608,12 @@ describe('createValidation', () => {
         type: 'number',
         getMessage: () => 'Number'
       }, {
-        type: 'maxLength',
+        type: 'maxValue',
         max: 1,
-        getMessage: () => 'MaxLength'
+        getMessage: () => 'MaxValue'
       }]
     })('1')).toEqual({
-      data: '1',
+      data: 1,
       errors: undefined
     });
   });

package/lib/__tests__/integration.registrationForm.js

@@ -37,6 +37,14 @@ const registrationFormValidation = (0, _.createValidation)({
         type: 'email'
       }]
     },
+    age: {
+      type: 'all',
+      validators: [{
+        type: 'required'
+      }, {
+        type: 'number'
+      }]
+    },
     hobbies: {
       type: 'array',
       itemRule: {
@@ -82,7 +90,8 @@ describe('registrationFormValidation', () => {
     expect(validationResult.errors).toEqual({
       firstName: ['Required'],
       lastName: ['Required'],
-      email: ['Required']
+      email: ['Required'],
+      age: ['Required']
     });
     expect(validationResult.data).toEqual(undefined);
   });
@@ -94,7 +103,8 @@ describe('registrationFormValidation', () => {
     expect(validationResult.errors).toEqual({
       firstName: ['Required'],
       lastName: ['Required'],
-      email: ['Required']
+      email: ['Required'],
+      age: ['Required']
     });
     expect(validationResult.data).toEqual(validatedObject);
   });
@@ -125,6 +135,7 @@ describe('registrationFormValidation', () => {
       firstName: 'firstName',
       lastName: 'lastName',
       email: 'test@mail.com',
+      age: '12',
       hobbies: [1, {
         title: 'title'
       }, {
@@ -166,6 +177,7 @@ describe('registrationFormValidation', () => {
       firstName: 'firstName',
       lastName: 'lastName',
       email: 'test@mail.com',
+      age: 12,
       hobbies: [{
         title: 'title'
       }, {

package/lib/createValidation.js

@@ -190,7 +190,7 @@ const createObjectValidation = rule => {
     }
 
     return {
-      data: fieldValidations ? Object.getOwnPropertyNames(resultData).length > 0 ? resultData : undefined : object,
+      data: fieldValidations || customFieldValidations ? Object.getOwnPropertyNames(resultData).length > 0 ? resultData : undefined : object,
       errors: Object.getOwnPropertyNames(resultErrors).length > 0 ? resultErrors : undefined
     };
   };

package/lib/operators.js

@@ -57,6 +57,8 @@ const all = (...validators) => {
         } else {
           validationErrors.push(currentResult.errors);
         }
+      } else {
+        value = currentResult.data;
       }
 
       return validationErrors;

package/lib/validators.js

@@ -59,7 +59,7 @@ const number = ({
 }) => value => value && isNaN(Number(value)) ? {
   errors: (0, _messageProcessor.default)(getMessage, 'Must be a number')
 } : {
-  data: value
+  data: Number(value)
 };
 
 exports.number = number;
@@ -118,7 +118,7 @@ exports.string = string;
 
 const boolean = ({
   getMessage
-}) => value => typeof value === 'boolean' || typeof value === 'string' && {
+}) => value => value === undefined || value === null || typeof value === 'boolean' || typeof value === 'string' && {
   'true': true,
   'false': true
 }[value.toLowerCase()] ? {

package/package.json

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