feat: support formats with $data for numbers, #291

ajv-validator · Feb 10, 2017 · 901343c · 901343c
1 parent c21cbee
commit 901343c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/lib/dot/format.jst b/lib/dot/format.jst
@@ -21,7 +21,8 @@
         && self._opts.unknownFormats.indexOf({{=$schemaValue}}) == -1
       {{?}}) ||
    {{?}}
-   ({{=$format}} && !(typeof {{=$format}} == 'function'
+   ({{=$format}} && {{=$formatType}} == '{{=$ruleType}}'
+                 && !(typeof {{=$format}} == 'function'
                      ? {{? it.async}}
                         (async{{=$lvl}} ? {{=it.yieldAwait}} {{=$format}}({{=$data}}) : {{=$format}}({{=$data}}))
                        {{??}}
@@ -49,15 +50,17 @@
 }}
 
 {{? $isData }}
-  {{? $ruleType != 'string' }}
-    {{# def.skipFormat }}
-  {{?}}
-  {{ var $format = 'format' + $lvl; }}
+  {{
+    var $format = 'format' + $lvl
+      , $isObject = 'isObject' + $lvl
+      , $formatType = 'formatType' + $lvl;
+  }}
   var {{=$format}} = formats[{{=$schemaValue}}];
-  var isObject{{=$lvl}} = typeof {{=$format}} == 'object'
-                          && !({{=$format}} instanceof RegExp)
-                          && {{=$format}}.validate;
-  if (isObject{{=$lvl}}) {
+  var {{=$isObject}} = typeof {{=$format}} == 'object'
+                        && !({{=$format}} instanceof RegExp)
+                        && {{=$format}}.validate;
+  var {{=$formatType}} = {{=$isObject}} && {{=$format}}.type || 'string';
+  if ({{=$isObject}}) {
     {{? it.async}}
       var async{{=$lvl}} = {{=$format}}.async;
     {{?}}

diff --git a/spec/options.spec.js b/spec/options.spec.js
@@ -866,7 +866,7 @@ describe('Ajv Options', function () {
             }
           });
 
-          validate({foo: 1, bar: 'unknown'}) .should.equal(true);
+          validate({foo: 1, bar: 'unknown'}) .should.equal(false);
           validate({foo: '2016-10-16', bar: 'date'}) .should.equal(true);
           validate({foo: '20161016', bar: 'date'}) .should.equal(false);
           validate({foo: '20161016'}) .should.equal(true);
@@ -932,7 +932,7 @@ describe('Ajv Options', function () {
           });
 
           validate({foo: 1, bar: 'allowed'}) .should.equal(true);
-          validate({foo: 1, bar: 'unknown'}) .should.equal(true);
+          validate({foo: 1, bar: 'unknown'}) .should.equal(false);
           validate({foo: '2016-10-16', bar: 'date'}) .should.equal(true);
           validate({foo: '20161016', bar: 'date'}) .should.equal(false);
           validate({foo: '20161016'}) .should.equal(true);