feat: metaSchema and dependencies for formatExclusiveMaximum/Minimum, c…

…lose #63
ajv-validator · Feb 9, 2019 · f261c0c · f261c0c
1 parent bdcf858
commit f261c0c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/keywords/_formatLimit.js b/keywords/_formatLimit.js
@@ -9,6 +9,21 @@ var COMPARE_FORMATS = {
   'date-time': compareDateTime
 };
 
+var $dataMetaSchema = {
+  type: 'object',
+  required: [ '$data' ],
+  properties: {
+    $data: {
+      type: 'string',
+      anyOf: [
+        { format: 'relative-json-pointer' },
+        { format: 'json-pointer' }
+      ]
+    }
+  },
+  additionalProperties: false
+};
+
 module.exports = function (minMax) {
   var keyword = 'format' + minMax;
   return function defFunc(ajv) {
@@ -20,27 +35,22 @@ module.exports = function (minMax) {
       dependencies: ['format'],
       metaSchema: {
         anyOf: [
-          { type: 'string' },
-          {
-            type: 'object',
-            required: [ '$data' ],
-            properties: {
-              $data: {
-                type: 'string',
-                anyOf: [
-                  { format: 'relative-json-pointer' },
-                  { format: 'json-pointer' }
-                ]
-              }
-            },
-            additionalProperties: false
-          }
+          {type: 'string'},
+          $dataMetaSchema
         ]
       }
     };
 
     ajv.addKeyword(keyword, defFunc.definition);
-    ajv.addKeyword('formatExclusive' + minMax);
+    ajv.addKeyword('formatExclusive' + minMax, {
+      dependencies: ['format' + minMax],
+      metaSchema: {
+        anyOf: [
+          {type: 'boolean'},
+          $dataMetaSchema
+        ]
+      }
+    });
     extendFormats(ajv);
     return ajv;
   };

diff --git a/spec/formatLimit.spec.js b/spec/formatLimit.spec.js
@@ -33,6 +33,22 @@ describe('keywords "formatMinimum" and "formatMaximum"', function() {
     });
   });
 
+  ajvs.forEach(function (ajv, i) {
+    it('formatExclusiveMaximum should throw if not boolean #' + i, function() {
+      should.throw(function() {
+        ajv.compile({ formatMaximum: '2015-08-01', formatExclusiveMaximum: 1 });
+      });
+    });
+  });
+
+  ajvs.forEach(function (ajv, i) {
+    it('formatExclusiveMaximum should throw when "formatMaximum" is absent #' + i, function() {
+      should.throw(function() {
+        ajv.compile({ formatExclusiveMaximum: true });
+      });
+    });
+  });
+
   function getAjv(format) {
     return new Ajv({ allErrors: true, format: format });
   }