Adding ajv-formats package Vincit#2142, Vincit#2146, Vincit#2147, Vin…

…cit#2170
TigerC10 · Feb 6, 2022 · 728500f · 728500f
1 parent 6ab6dd8
commit 728500f
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/lib/model/AjvValidator.js b/lib/model/AjvValidator.js
@@ -12,6 +12,14 @@ const getAjv = once(() => {
   }
 });
 
+const getAjvFormats = once(() => {
+  try {
+    return require('ajv-formats');
+  } catch (err) {
+    throw new Error('Optional ajv-formats dependency not installed. Please run `npm install ajv-formats --save`');
+  }
+});
+
 class AjvValidator extends Validator {
   static init(self, conf) {
     super.init(self, conf);
@@ -21,6 +29,7 @@ class AjvValidator extends Validator {
     });
 
     const Ajv = getAjv();
+    const addFormats = getAjvFormats();
 
     // Create a normal Ajv instance.
     self.ajv = new Ajv(
@@ -32,6 +41,8 @@ class AjvValidator extends Validator {
       )
     );
 
+    addFormats(self.ajv);
+
     // Create an instance that doesn't set default values. We need this one
     // to validate `patch` objects (objects that have a subset of properties).
     self.ajvNoDefaults = new Ajv(

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,7 +53,8 @@
   ],
   "types": "./typings/objection/index.d.ts",
   "dependencies": {
-    "ajv": "^8.6.2",
+    "ajv": "^8.10.0",
+    "ajv-formats": "^2.1.1",
     "db-errors": "^0.2.3"
   },
   "peerDependencies": {