Fix float filters when using comma decimals, fixes #808

validatorjs · May 3, 2018 · 2b70821 · 2b70821
1 parent 4a1a5eb
commit 2b70821
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 7 deletions.
diff --git a/lib/isFloat.js b/lib/isFloat.js
@@ -20,6 +20,7 @@ function isFloat(str, options) {
   if (str === '' || str === '.' || str === '-' || str === '+') {
     return false;
   }
-  return float.test(str) && (!options.hasOwnProperty('min') || str >= options.min) && (!options.hasOwnProperty('max') || str <= options.max) && (!options.hasOwnProperty('lt') || str < options.lt) && (!options.hasOwnProperty('gt') || str > options.gt);
+  var value = parseFloat(str.replace(',', '.'));
+  return float.test(str) && (!options.hasOwnProperty('min') || value >= options.min) && (!options.hasOwnProperty('max') || value <= options.max) && (!options.hasOwnProperty('lt') || value < options.lt) && (!options.hasOwnProperty('gt') || value > options.gt);
 }
 module.exports = exports['default'];
diff --git a/src/lib/isFloat.js b/src/lib/isFloat.js
@@ -8,9 +8,10 @@ export default function isFloat(str, options) {
   if (str === '' || str === '.' || str === '-' || str === '+') {
     return false;
   }
+  const value = parseFloat(str.replace(',', '.'));
   return float.test(str) &&
-    (!options.hasOwnProperty('min') || str >= options.min) &&
-    (!options.hasOwnProperty('max') || str <= options.max) &&
-    (!options.hasOwnProperty('lt') || str < options.lt) &&
-    (!options.hasOwnProperty('gt') || str > options.gt);
+    (!options.hasOwnProperty('min') || value >= options.min) &&
+    (!options.hasOwnProperty('max') || value <= options.max) &&
+    (!options.hasOwnProperty('lt') || value < options.lt) &&
+    (!options.hasOwnProperty('gt') || value > options.gt);
 }
diff --git a/test/validators.js b/test/validators.js
@@ -2118,6 +2118,38 @@ describe('Validators', function () {
         '-5.5',
       ],
     });
+    test({
+      validator: 'isFloat',
+      args: [{
+        locale: 'de-DE',
+        min: 3.1,
+      }],
+      valid: [
+        '123',
+        '123,',
+        '123,123',
+        '3,1',
+        '3,100001',
+      ],
+      invalid: [
+        '3,09',
+        '-,123',
+        '+,123',
+        '01,123',
+        '-0,22250738585072011e-307',
+        '-123,123',
+        '-0,123',
+        '+0,123',
+        '0,123',
+        ',0',
+        '123.123',
+        '123٫123',
+        '  ',
+        '',
+        '.',
+        'foo',
+      ],
+    });
   });
 
   it('should validate hexadecimal strings', function () {

diff --git a/validator.js b/validator.js
@@ -651,7 +651,8 @@ function isFloat(str, options) {
   if (str === '' || str === '.' || str === '-' || str === '+') {
     return false;
   }
-  return float.test(str) && (!options.hasOwnProperty('min') || str >= options.min) && (!options.hasOwnProperty('max') || str <= options.max) && (!options.hasOwnProperty('lt') || str < options.lt) && (!options.hasOwnProperty('gt') || str > options.gt);
+  var value = parseFloat(str.replace(',', '.'));
+  return float.test(str) && (!options.hasOwnProperty('min') || value >= options.min) && (!options.hasOwnProperty('max') || value <= options.max) && (!options.hasOwnProperty('lt') || value < options.lt) && (!options.hasOwnProperty('gt') || value > options.gt);
 }
 
 function decimalRegExp(options) {

diff --git a/validator.min.js b/validator.min.js