Only add AJV formats if they weren't added already

Caused by #2453 Closes #2481
Vincit · Jul 22, 2023 · 7a4084e · 7a4084e
1 parent c0e7b5c
commit 7a4084e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/lib/model/AjvValidator.js b/lib/model/AjvValidator.js
@@ -36,8 +36,11 @@ class AjvValidator extends Validator {
     self.cache = new Map();
 
     const setupAjv = (ajv) => {
-      addFormats(ajv);
       conf.onCreateAjv(ajv);
+      // Only add AJV formats if they weren't added in user-space already
+      if (!ajv.formats['date-time']) {
+        addFormats(ajv);
+      }
     };
 
     setupAjv(self.ajv);

diff --git a/tests/unit/model/AjvValidator.js b/tests/unit/model/AjvValidator.js
@@ -1,3 +1,4 @@
+const addFormats = require('ajv-formats');
 const { AjvValidator, Model } = require('../../../');
 const expect = require('expect.js');
 
@@ -61,6 +62,16 @@ describe('AjvValidator', () => {
       ],
     };
 
+    const schema3 = {
+      type: 'object',
+      properties: {
+        date: {
+          type: 'string',
+          format: 'date-time',
+        },
+      },
+    };
+
     it('should remove required fields from definitions', () => {
       const validator = new AjvValidator({ onCreateAjv: () => {} });
       const validators = validator.getValidator(modelClass('test', schema), schema, true);
@@ -81,6 +92,23 @@ describe('AjvValidator', () => {
       expect(validators.schema.required).to.eql(['foo']);
     });
 
+    it('should add ajv formats by default', () => {
+      expect(() => {
+        const validator = new AjvValidator({ onCreateAjv: () => {} });
+        validator.getValidator(modelClass('test', schema3), schema3, true);
+      }).to.not.throwException();
+    });
+
+    it('should not throw errors when adding formats in onCreateAjv hook', () => {
+      expect(() => {
+        new AjvValidator({
+          onCreateAjv: (ajv) => {
+            addFormats(ajv);
+          },
+        });
+      }).to.not.throwException();
+    });
+
     it('should handle empty definitions', () => {
       const emptyDefinitionsSchema = {
         type: 'object',