co.validation 2.6.2 → 2.7.1

package/lib/__tests__/component.valueValidation.js

@@ -427,8 +427,7 @@ describe('createValidation', () => {
     expect((0, _.createValidation)({
       type: 'number'
     })('')).toEqual({
-      data: undefined,
-      errors: ['Must be a number']
+      data: undefined
     });
     expect((0, _.createValidation)({
       type: 'number',
@@ -445,6 +444,12 @@ describe('createValidation', () => {
     });
   });
   it('supports minValue', () => {
+    expect((0, _.createValidation)({
+      type: 'minValue',
+      min: 1
+    })('')).toEqual({
+      data: undefined
+    });
     expect((0, _.createValidation)({
       type: 'minValue',
       min: 1
@@ -483,6 +488,51 @@ describe('createValidation', () => {
       errors: ['Must be at least 333']
     });
   });
+  it('supports maxValue', () => {
+    expect((0, _.createValidation)({
+      type: 'maxValue',
+      max: 10
+    })('')).toEqual({
+      data: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'maxValue',
+      max: 10
+    })(11)).toEqual({
+      data: undefined,
+      errors: ['Must be not more than 10']
+    });
+    expect((0, _.createValidation)({
+      type: 'maxValue',
+      max: 10
+    })(15)).toEqual({
+      data: undefined,
+      errors: ['Must be not more than 10']
+    });
+    expect((0, _.createValidation)({
+      type: 'maxValue',
+      max: 50,
+      getMessage: () => 'MaxValue'
+    })(25)).toEqual({
+      data: 25,
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'maxValue',
+      max: 5,
+      getMessage: () => 'MaxValue'
+    })(10)).toEqual({
+      data: undefined,
+      errors: ['MaxValue']
+    });
+    expect((0, _.createValidation)({
+      type: 'maxValue',
+      max: 100
+    })(200)).toEqual({
+      data: undefined,
+      errors: ['Must be not more than 100']
+    });
+  });
   it('supports string', () => {
     expect((0, _.createValidation)({
       type: 'string',

package/lib/validators.js

@@ -105,16 +105,14 @@ const normalizeNumber = value => {
     return value;
   }
 
-  if (value === '' || value === null || value === undefined) {
-    return NaN;
-  }
-
   return Number(value?.replace(',', '.'));
 };
 
 const number = ({
   getMessage
-}) => value => value !== null && value !== undefined && isNaN(normalizeNumber(value)) ? {
+}) => value => value === '' ? {
+  data: undefined
+} : value !== null && value !== undefined && isNaN(normalizeNumber(value)) ? {
   errors: (0, _messageProcessor.default)(getMessage, '##number')
 } : {
   data: value === null || value === undefined ? value : normalizeNumber(value)
@@ -125,7 +123,9 @@ exports.number = number;
 const minValue = ({
   min,
   getMessage
-}) => value => !isNaN(value) && Number(value) < min ? {
+}) => value => value === '' ? {
+  data: undefined
+} : !isNaN(value) && Number(value) < min ? {
   errors: (0, _messageProcessor.default)(getMessage, `##minValue`, string => string.replace(/{min}/g, min), min)
 } : {
   data: Number(value)
@@ -136,7 +136,9 @@ exports.minValue = minValue;
 const maxValue = ({
   max,
   getMessage
-}) => value => !isNaN(value) && Number(value) > max ? {
+}) => value => value === '' ? {
+  data: undefined
+} : !isNaN(value) && Number(value) > max ? {
   errors: (0, _messageProcessor.default)(getMessage, `##maxValue`, string => string.replace(/{max}/g, max), max)
 } : {
   data: Number(value)

package/package.json

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