co.validation 1.0.0-RC.4 → 1.0.0-RC.7

package/lib/__tests__/component.arrayValidation.js

@@ -71,6 +71,20 @@ describe('createValidation', () => {
     }]);
     expect(validationResult.data).toEqual([]);
   });
+  it('list of numbers stays list of numbers', () => {
+    const validatedObject = [0, 1, 2];
+    const validationResult = (0, _.createValidation)({
+      type: 'array',
+      itemRule: {
+        type: 'all',
+        validators: [{
+          type: 'number'
+        }]
+      }
+    })(validatedObject);
+    expect(validationResult.errors).toEqual(undefined);
+    expect(validationResult.data).toEqual(validatedObject);
+  });
   it('single valid item stays in data', () => {
     const validatedObject = [{
       login: 'hey'

package/lib/__tests__/component.valueValidation.js

@@ -563,8 +563,8 @@ describe('createValidation', () => {
     expect((0, _.createValidation)({
       type: 'all',
       validators: [{
-        type: 'number',
-        getMessage: () => 'Number'
+        type: 'email',
+        getMessage: () => 'Email'
       }, {
         type: 'maxLength',
         max: 1,
@@ -572,7 +572,7 @@ describe('createValidation', () => {
       }]
     })('xz')).toEqual({
       data: undefined,
-      errors: ['Number', 'MaxLength']
+      errors: ['Email', 'MaxLength']
     });
     expect((0, _.createValidation)({
       type: 'all',
@@ -580,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,
@@ -600,7 +600,7 @@ describe('createValidation', () => {
       }]
     })('x')).toEqual({
       data: undefined,
-      errors: ['Number']
+      errors: ['Email']
     });
     expect((0, _.createValidation)({
       type: 'all',
@@ -608,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

@@ -114,7 +114,7 @@ const createArrayValidation = rule => {
         resultErrors.push(null);
       }
 
-      if (validationResult.data) {
+      if (validationResult.data !== null && validationResult.data !== undefined) {
         resultData.push(validationResult.data);
       }
     });

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: Number(value)
+  data: value === null || value === undefined ? value : Number(value)
 };
 
 exports.number = number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "co.validation",
-  "version": "1.0.0-RC.4",
+  "version": "1.0.0-RC.7",
   "description": "JSON based fluent validation for browser, node.js, redux-form and anything javascript compatible.",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "keywords": [
     "validation"
   ],
-  "author": "collaboracia",
+  "author": "Collaboracia OÜ",
   "license": "ISC",
   "devDependencies": {
     "@babel/cli": "^7.4.4",