Merge pull request #1219 from issacgerges/strict-numbers

Add option for strictNumbers. Resolves #1128.

Author: epoberezkin

README.md

@@ -1156,6 +1156,7 @@ Defaults:
   // strict mode options
   strictDefaults:   false,
   strictKeywords:   false,
+  strictNumbers:    false,
   // asynchronous validation options:
   transpile:        undefined, // requires ajv-async package
   // advanced options:
@@ -1250,7 +1251,9 @@ Defaults:
   - `false` (default) - unknown keywords are not reported
   - `true` - if an unknown keyword is present, throw an error
   - `"log"` - if an unknown keyword is present, log warning
-
+- _strictNumbers_: validate numbers strictly, failing validation for NaN and Infinity. Option values:
+  - `false` (default) - NaN or Infinity will pass validation for numeric types
+  - `true` - NaN or Infinity will not pass validation for numeric types
 
 ##### Asynchronous validation options
 

lib/ajv.d.ts

@@ -183,6 +183,7 @@ declare namespace ajv {
     coerceTypes?: boolean | 'array';
     strictDefaults?: boolean | 'log';
     strictKeywords?: boolean | 'log';
+    strictNumbers?: boolean;
     async?: boolean | string;
     transpile?: string | ((code: string) => string);
     meta?: boolean | object;

lib/compile/util.js

@@ -36,7 +36,7 @@ function copy(o, to) {
 }
 
 
-function checkDataType(dataType, data, negate) {
+function checkDataType(dataType, data, strictNumbers, negate) {
   var EQUAL = negate ? ' !== ' : ' === '
     , AND = negate ? ' || ' : ' && '
     , OK = negate ? '!' : ''
@@ -49,15 +49,18 @@ function checkDataType(dataType, data, negate) {
                           NOT + 'Array.isArray(' + data + '))';
     case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
                            NOT + '(' + data + ' % 1)' +
-                           AND + data + EQUAL + data + ')';
+                           AND + data + EQUAL + data +
+                           (strictNumbers ? (AND + OK + 'isFinite(' + data + ')') : '') + ')';
+    case 'number': return '(typeof ' + data + EQUAL + '"' + dataType + '"' +
+                          (strictNumbers ? (AND + OK + 'isFinite(' + data + ')') : '') + ')';
     default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
   }
 }
 
 
-function checkDataTypes(dataTypes, data) {
+function checkDataTypes(dataTypes, data, strictNumbers) {
   switch (dataTypes.length) {
-    case 1: return checkDataType(dataTypes[0], data, true);
+    case 1: return checkDataType(dataTypes[0], data, strictNumbers, true);
     default:
       var code = '';
       var types = toHash(dataTypes);
@@ -70,7 +73,7 @@ function checkDataTypes(dataTypes, data) {
       }
       if (types.number) delete types.integer;
       for (var t in types)
-        code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
+        code += (code ? ' && ' : '' ) + checkDataType(t, data, strictNumbers, true);
 
       return code;
   }

lib/dot/uniqueItems.jst

@@ -38,7 +38,7 @@
       for (;i--;) {
         var item = {{=$data}}[i];
         {{ var $method = 'checkDataType' + ($typeIsArray ? 's' : ''); }}
-        if ({{= it.util[$method]($itemType, 'item', true) }}) continue;
+        if ({{= it.util[$method]($itemType, 'item', it.opts.strictNumbers, true) }}) continue;
         {{? $typeIsArray}}
           if (typeof item == 'string') item = '"' + item;
         {{?}}

lib/dot/validate.jst

@@ -140,7 +140,7 @@
       , $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
   }}
 
-  if ({{= it.util[$method]($typeSchema, $data, true) }}) {
+  if ({{= it.util[$method]($typeSchema, $data, it.opts.strictNumbers, true) }}) {
 #}}
 
 {{? it.schema.$ref && $refKeywords }}
@@ -192,7 +192,7 @@
   {{~ it.RULES:$rulesGroup }}
     {{? $shouldUseGroup($rulesGroup) }}
       {{? $rulesGroup.type }}
-        if ({{= it.util.checkDataType($rulesGroup.type, $data) }}) {
+        if ({{= it.util.checkDataType($rulesGroup.type, $data, it.opts.strictNumbers) }}) {
       {{?}}
         {{? it.opts.useDefaults }}
           {{? $rulesGroup.type == 'object' && it.schema.properties }}

spec/options/strictNumbers.spec.js

@@ -0,0 +1,55 @@
+'use strict';
+
+var Ajv = require('../ajv');
+
+describe('structNumbers option', function() {
+  var ajv;
+  describe('strictNumbers default', testWithoutStrictNumbers(new Ajv()));
+  describe('strictNumbers = false', testWithoutStrictNumbers(new Ajv({strictNumbers: false})));
+  describe('strictNumbers = true', function() {
+    beforeEach(function () {
+      ajv = new Ajv({strictNumbers: true});
+    });
+
+    it('should fail validation for NaN/Infinity as type number', function() {
+      var validate = ajv.compile({type: 'number'});
+      validate("1.1").should.equal(false);
+      validate(1.1).should.equal(true);
+      validate(1).should.equal(true);
+      validate(NaN).should.equal(false);
+      validate(Infinity).should.equal(false);
+    });
+
+    it('should fail validation for NaN as type integer', function() {
+      var validate = ajv.compile({type: 'integer'});
+      validate("1.1").should.equal(false);
+      validate(1.1).should.equal(false);
+      validate(1).should.equal(true);
+      validate(NaN).should.equal(false);
+      validate(Infinity).should.equal(false);
+    });
+  });
+});
+
+
+function testWithoutStrictNumbers(_ajv) {
+  return function () {
+    it('should NOT fail validation for NaN/Infinity as type number', function() {
+      var validate = _ajv.compile({type: 'number'});
+      validate("1.1").should.equal(false);
+      validate(1.1).should.equal(true);
+      validate(1).should.equal(true);
+      validate(NaN).should.equal(true);
+      validate(Infinity).should.equal(true);
+    });
+
+    it('should NOT fail validation for NaN/Infinity as type integer', function() {
+      var validate = _ajv.compile({type: 'integer'});
+      validate("1.1").should.equal(false);
+      validate(1.1).should.equal(false);
+      validate(1).should.equal(true);
+      validate(NaN).should.equal(false);
+      validate(Infinity).should.equal(true);
+    });
+  };
+}