co.validation 2.2.0 → 2.2.2

package/lib/__tests__/component.valueValidation.js

@@ -354,6 +354,45 @@ describe('createValidation', () => {
       errors: ['Must be a number']
     });
   });
+  it('supports minValue', () => {
+    expect((0, _.createValidation)({
+      type: 'minValue',
+      min: 1
+    })(0)).toEqual({
+      data: undefined,
+      errors: ['Must be at least 1']
+    });
+    expect((0, _.createValidation)({
+      type: 'minValue',
+      min: 1
+    })(-1)).toEqual({
+      data: undefined,
+      errors: ['Must be at least 1']
+    });
+    expect((0, _.createValidation)({
+      type: 'minValue',
+      min: 3,
+      getMessage: () => 'MinValue'
+    })(123)).toEqual({
+      data: 123,
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'minValue',
+      min: 233,
+      getMessage: () => 'MinValue'
+    })(123)).toEqual({
+      data: undefined,
+      errors: ['MinValue']
+    });
+    expect((0, _.createValidation)({
+      type: 'minValue',
+      min: 333
+    })(22)).toEqual({
+      data: undefined,
+      errors: ['Must be at least 333']
+    });
+  });
   it('supports string', () => {
     expect((0, _.createValidation)({
       type: 'string',
@@ -482,6 +521,12 @@ describe('createValidation', () => {
       data: undefined,
       errors: ['Invalid email format']
     });
+    expect((0, _.createValidation)({
+      type: 'email'
+    })('email.@mail.com')).toEqual({
+      data: undefined,
+      errors: ['Invalid email format']
+    });
   });
   it('supports alphanumeric', () => {
     expect((0, _.createValidation)({

package/lib/validators.js

@@ -84,10 +84,10 @@ exports.number = number;
 const minValue = ({
   min,
   getMessage
-}) => value => value && value < min ? {
+}) => value => !isNaN(value) && Number(value) < min ? {
   errors: (0, _messageProcessor.default)(getMessage, `##minValue`, string => string.replace(/{min}/g, min), min)
 } : {
-  data: value
+  data: Number(value)
 };
 
 exports.minValue = minValue;
@@ -95,17 +95,18 @@ exports.minValue = minValue;
 const maxValue = ({
   max,
   getMessage
-}) => value => value && value > max ? {
+}) => value => !isNaN(value) && Number(value) > max ? {
   errors: (0, _messageProcessor.default)(getMessage, `##maxValue`, string => string.replace(/{max}/g, max), max)
 } : {
-  data: value
+  data: Number(value)
 };
 
 exports.maxValue = maxValue;
+const emailRegex = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
 
 const email = ({
   getMessage
-}) => value => value && !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value) ? {
+}) => value => value && !emailRegex.test(value) ? {
   errors: (0, _messageProcessor.default)(getMessage, '##email')
 } : {
   data: value

package/package.json

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