co.validation 2.5.1 → 2.6.1

package/lib/__tests__/component.valueValidation.js

@@ -382,19 +382,47 @@ describe('createValidation', () => {
   });
   it('supports number', () => {
     expect((0, _.createValidation)({
-      type: 'number',
-      getMessage: () => 'Number'
+      type: 'number'
     })('1234')).toEqual({
       data: 1234,
       errors: undefined
     });
     expect((0, _.createValidation)({
-      type: 'number',
-      getMessage: () => 'Number'
+      type: 'number'
+    })('1234,5')).toEqual({
+      data: 1234.5,
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'number'
+    })('1234.5')).toEqual({
+      data: 1234.5,
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'number'
     })(123)).toEqual({
       data: 123,
       errors: undefined
     });
+    expect((0, _.createValidation)({
+      type: 'number'
+    })(null)).toEqual({
+      data: null,
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'number'
+    })(undefined)).toEqual({
+      data: undefined,
+      errors: undefined
+    });
+    expect((0, _.createValidation)({
+      type: 'number'
+    })('')).toEqual({
+      data: undefined,
+      errors: ['Must be a number']
+    });
     expect((0, _.createValidation)({
       type: 'number',
       getMessage: () => 'Number'

package/lib/validators.js

@@ -100,12 +100,24 @@ const minLength = ({
 
 exports.minLength = minLength;
 
+const normalizeNumber = value => {
+  if (typeof value === 'number') {
+    return value;
+  }
+
+  if (value === '' || value === null || value === undefined) {
+    return NaN;
+  }
+
+  return Number(value?.replace(',', '.'));
+};
+
 const number = ({
   getMessage
-}) => value => value && isNaN(Number(value)) ? {
+}) => value => value !== null && value !== undefined && isNaN(normalizeNumber(value)) ? {
   errors: (0, _messageProcessor.default)(getMessage, '##number')
 } : {
-  data: value === null || value === undefined ? value : Number(value)
+  data: value === null || value === undefined ? value : normalizeNumber(value)
 };
 
 exports.number = number;

package/package.json

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