de-duplicate AJV initialisation

Author: autopulated

index.js

@@ -5,9 +5,6 @@
 const merge = require('@fastify/deepmerge')()
 const clone = require('rfdc')({ proto: true })
 const { RefResolver } = require('json-schema-ref-resolver')
-const Ajv = require('ajv')
-const fastUri = require('fast-uri')
-const ajvFormats = require('ajv-formats')
 
 const validate = require('./lib/schema-validator')
 const Serializer = require('./lib/serializer')
@@ -185,22 +182,8 @@ function build (schema, options) {
   // we cannot use the validator's AJV instance to actually validate the
   // whole schema. Instead, create a new AJV instance with the same options,
   // add all the referenced schemas, and then validate:
-  const ajv = new Ajv({
-    strictSchema: false,
-    validateSchema: false,
-    allowUnionTypes: true,
-    uriResolver: fastUri,
-    ...options.ajv
-  })
-  ajvFormats(ajv)
-  ajv.addKeyword({
-    keyword: 'fjs_type',
-    type: 'object',
-    errors: false,
-    validate: (type, date) => {
-      return date instanceof Date
-    }
-  })
+  const ajv = Validator.createAJVInstanceWithOptions(options.ajv)
+
   if (options.schema) {
     for (const key in options.schema) {
       const schema = options.schema[key]

lib/validator.js

@@ -7,25 +7,7 @@ const clone = require('rfdc')({ proto: true })
 
 class Validator {
   constructor (ajvOptions) {
-    this.ajv = new Ajv({
-      strictSchema: false,
-      validateSchema: false,
-      allowUnionTypes: true,
-      uriResolver: fastUri,
-      ...ajvOptions
-    })
-
-    ajvFormats(this.ajv)
-
-    this.ajv.addKeyword({
-      keyword: 'fjs_type',
-      type: 'object',
-      errors: false,
-      validate: (type, date) => {
-        return date instanceof Date
-      }
-    })
-
+    this.ajv = Validator.createAJVInstanceWithOptions(ajvOptions)
     this._ajvSchemas = {}
     this._ajvOptions = ajvOptions || {}
   }
@@ -82,6 +64,29 @@ class Validator {
     }
   }
 
+  static createAJVInstanceWithOptions (ajvOptions) {
+    const ajv = new Ajv({
+      strictSchema: false,
+      validateSchema: false,
+      allowUnionTypes: true,
+      uriResolver: fastUri,
+      ...ajvOptions
+    })
+
+    ajvFormats(ajv)
+
+    ajv.addKeyword({
+      keyword: 'fjs_type',
+      type: 'object',
+      errors: false,
+      validate: (type, date) => {
+        return date instanceof Date
+      }
+    })
+
+    return ajv
+  }
+
   static restoreFromState (state) {
     const validator = new Validator(state.ajvOptions)
     for (const [id, ajvSchema] of Object.entries(state.ajvSchemas)) {