Merge pull request #587 from hkwu/feature/isFloat

Add support for greater/less than for isFloat().

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 - New locales
   ([#585](https://github.com/chriso/validator.js/pull/585))
+- Added support for greater or less than in `isFloat()`
+  ([#544](https://github.com/chriso/validator.js/issues/544))
 
 #### 6.0.0
 

README.md

@@ -71,7 +71,7 @@ Passing anything other than a string is an error.
 - **isEmail(str [, options])** - check if the string is an email. `options` is an object which defaults to `{ allow_display_name: false, allow_utf8_local_part: true, require_tld: true }`. If `allow_display_name` is set to true, the validator will also match `Display Name <email-address>`. If `allow_utf8_local_part` is set to false, the validator will not allow any non-English UTF8 character in email address' local part. If `require_tld` is set to false, e-mail addresses without having TLD in their domain will also be matched.
 - **isEmpty(str)** - check if the string has a length of zero.
 - **isFQDN(str [, options])** - check if the string is a fully qualified domain name (e.g. domain.com). `options` is an object which defaults to `{ require_tld: true, allow_underscores: false, allow_trailing_dot: false }`.
-- **isFloat(str [, options])** - check if the string is a float. `options` is an object which can contain the keys `min` and/or `max` to validate the float is within boundaries (e.g. `{ min: 7.22, max: 9.55 }`).
+- **isFloat(str [, options])** - check if the string is a float. `options` is an object which can contain the keys `min`, `max`, `gt`, and/or `lt` to validate the float is within boundaries (e.g. `{ min: 7.22, max: 9.55 }`). `min` and `max` are equivalent to 'greater or equal' and 'less or equal', respectively while `gt` and `lt` are their strict counterparts.
 - **isFullWidth(str)** - check if the string contains any full-width chars.
 - **isHalfWidth(str)** - check if the string contains any half-width chars.
 - **isHexColor(str)** - check if the string is a hexadecimal color.

lib/isFloat.js

@@ -19,6 +19,6 @@ function isFloat(str, options) {
   if (str === '' || str === '.') {
     return false;
   }
-  return float.test(str) && (!options.hasOwnProperty('min') || str >= options.min) && (!options.hasOwnProperty('max') || str <= options.max);
+  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);
 }
 module.exports = exports['default'];

src/lib/isFloat.js

@@ -10,5 +10,7 @@ export default function isFloat(str, options) {
   }
   return float.test(str) &&
     (!options.hasOwnProperty('min') || str >= options.min) &&
-    (!options.hasOwnProperty('max') || str <= options.max);
+    (!options.hasOwnProperty('max') || str <= options.max) &&
+    (!options.hasOwnProperty('lt') || str < options.lt) &&
+    (!options.hasOwnProperty('gt') || str > options.gt);
 }

test/validators.js

@@ -1252,6 +1252,46 @@ describe('Validators', function () {
         '5',
       ],
     });
+    test({
+      validator: 'isFloat',
+      args: [{
+        gt: -5.5,
+        lt: 10,
+      }],
+      valid: [
+        '9.9',
+        '1.0',
+        '0',
+        '-1',
+        '7',
+        '-5.4',
+      ],
+      invalid: [
+        '10',
+        '-5.5',
+        'a',
+        '-20.3',
+        '20e3',
+        '10.00001',
+      ],
+    });
+    test({
+      validator: 'isFloat',
+      args: [{
+        min: -5.5,
+        max: 10,
+        gt: -5.5,
+        lt: 10,
+      }],
+      valid: [
+        '9.99999',
+        '-5.499999',
+      ],
+      invalid: [
+        '10',
+        '-5.5',
+      ],
+    });
   });
 
   it('should validate hexadecimal strings', function () {

validator.js

@@ -696,7 +696,7 @@
         if (str === '' || str === '.') {
           return false;
         }
-        return float.test(str) && (!options.hasOwnProperty('min') || str >= options.min) && (!options.hasOwnProperty('max') || str <= options.max);
+        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 decimal = /^[-+]?([0-9]+|\.[0-9]+|[0-9]+\.[0-9]+)$/;