deps: use merge-json-schema package

Author: ivan-tymoshenko

lib/merge-schemas.js

@@ -1,42 +1,9 @@
 'use strict'
 
-const mergeAllOf = require('json-schema-merge-allof')
-
-const failOnConflictResolver = mergeAllOf.options.resolvers.type
-const pickFirstResolver = mergeAllOf.options.resolvers.title
-
-const resolvers = {
-  format: failOnConflictResolver,
-  nullable: failOnConflictResolver,
-  defaultResolver: pickFirstResolver
-}
+const { mergeSchemas: _mergeSchemas } = require('merge-json-schemas')
 
 function mergeSchemas (schemas) {
-  let mergedSchema = null
-  try {
-    mergedSchema = mergeAllOf({ allOf: schemas }, { resolvers })
-  } catch (error) {
-    const failedPath = /^Could not resolve values for path:"(.*)"\./.exec(error.message)
-    /* istanbul ignore else */
-    if (failedPath) {
-      throw new Error(`Failed to merge schemas on "${failedPath[1]}".`)
-    } else {
-      throw new Error(`Failed to merge schemas: ${error.message}`)
-    }
-  }
-
-  // This is needed because fjs treats `additionalProperties` as false by default
-  // which is not true for JSON Schema.
-  if (mergedSchema.additionalProperties === undefined) {
-    for (const schema of schemas) {
-      if (schema.additionalProperties === true) {
-        mergedSchema.additionalProperties = true
-        break
-      }
-    }
-  }
-
-  return mergedSchema
+  return _mergeSchemas(schemas, { onConflict: 'skip' })
 }
 
 module.exports = mergeSchemas

package.json

@@ -54,7 +54,7 @@
     "fast-uri": "^2.1.0",
     "rfdc": "^1.2.0",
     "json-schema-ref-resolver": "^1.0.1",
-    "json-schema-merge-allof": "^0.8.1"
+    "merge-json-schemas": "fastify/merge-json-schemas#add-merge-json-schemas-function"
   },
   "standard": {
     "ignore": [

test/allof.test.js

@@ -606,51 +606,39 @@ test('allOf: multiple nested $ref properties', (t) => {
 })
 
 test('allOf: throw Error if types mismatch ', (t) => {
-  t.plan(1)
+  t.plan(3)
 
   const schema = {
     allOf: [
       { type: 'string' },
       { type: 'number' }
     ]
   }
-  t.throws(() => build(schema), new Error('Failed to merge schemas on "type".'))
+  try {
+    build(schema)
+  } catch (error) {
+    t.ok(error instanceof Error)
+    t.equal(error.message, 'Failed to merge "type" keyword schemas.')
+    t.same(error.schemas, [['string'], ['number']])
+  }
 })
 
 test('allOf: throw Error if format mismatch ', (t) => {
-  t.plan(1)
+  t.plan(3)
 
   const schema = {
     allOf: [
       { format: 'date' },
       { format: 'time' }
     ]
   }
-  t.throws(() => build(schema), new Error('Failed to merge schemas on "format".'))
-})
-
-test('allOf: throw Error if nullable mismatch /1', (t) => {
-  t.plan(1)
-
-  const schema = {
-    allOf: [
-      { nullable: true },
-      { nullable: false }
-    ]
-  }
-  t.throws(() => build(schema), new Error('Failed to merge schemas on "nullable".'))
-})
-
-test('allOf: throw Error if nullable mismatch /2', (t) => {
-  t.plan(1)
-
-  const schema = {
-    allOf: [
-      { nullable: false },
-      { nullable: true }
-    ]
+  try {
+    build(schema)
+  } catch (error) {
+    t.ok(error instanceof Error)
+    t.equal(error.message, 'Failed to merge "format" keyword schemas.')
+    t.same(error.schemas, ['date', 'time'])
   }
-  t.throws(() => build(schema), new Error('Failed to merge schemas on "nullable".'))
 })
 
 test('recursive nested allOfs', (t) => {