deps: use json-schema-ref-resolver

index.js

@@ -5,11 +5,11 @@
 const merge = require('@fastify/deepmerge')()
 const clone = require('rfdc')({ proto: true })
 const { randomUUID } = require('node:crypto')
+const { RefResolver } = require('json-schema-ref-resolver')
 
 const validate = require('./lib/schema-validator')
 const Serializer = require('./lib/serializer')
 const Validator = require('./lib/validator')
-const RefResolver = require('./lib/ref-resolver')
 const Location = require('./lib/location')
 
 let largeArraySize = 2e4
@@ -53,8 +53,7 @@ function resolveRef (context, location, ref) {
   const jsonPointer = ref.slice(hashIndex) || '#'
 
   const schema = context.refResolver.getSchema(schemaId, jsonPointer)
-
-  if (schema === undefined) {
+  if (schema === null) {
     throw new Error(`Cannot find reference "${ref}"`)
   }
 
@@ -66,6 +65,13 @@ function resolveRef (context, location, ref) {
   return newLocation
 }
 
+function getSchemaId (schema, rootSchemaId) {
+  if (schema.$id && schema.$id.charAt(0) !== '#') {
+    return schema.$id
+  }
+  return rootSchemaId
+}
+
 function build (schema, options) {
   isValidSchema(schema)
 
@@ -82,12 +88,19 @@ function build (schema, options) {
     validatorSchemasIds: new Set()
   }
 
-  context.refResolver.addSchema(schema, context.rootSchemaId)
+  const schemaId = getSchemaId(schema, context.rootSchemaId)
+  if (!context.refResolver.hasSchema(schemaId)) {
+    context.refResolver.addSchema(schema, context.rootSchemaId)
+  }
 
   if (options.schema) {
-    for (const key of Object.keys(options.schema)) {
-      isValidSchema(options.schema[key], key)
-      context.refResolver.addSchema(options.schema[key], key)
+    for (const key in options.schema) {
+      const schema = options.schema[key]
+      const schemaId = getSchemaId(schema, key)
+      if (!context.refResolver.hasSchema(schemaId)) {
+        isValidSchema(schema, key)
+        context.refResolver.addSchema(schema, key)
+      }
     }
   }
 

package.json

@@ -52,7 +52,8 @@
     "ajv-formats": "^2.1.1",
     "fast-deep-equal": "^3.1.3",
     "fast-uri": "^2.1.0",
-    "rfdc": "^1.2.0"
+    "rfdc": "^1.2.0",
+    "json-schema-ref-resolver": "^1.0.1"
   },
   "standard": {
     "ignore": [

test/ref.test.js

@@ -1377,7 +1377,10 @@ test('Bad key', t => {
       })
       t.fail('Should throw')
     } catch (err) {
-      t.equal(err.message, 'Cannot find reference "extrenal#/definitions/projectId"')
+      t.equal(
+        err.message,
+        'Cannot resolve ref "extrenal#/definitions/projectId". Schema with id "extrenal" is not found.'
+      )
     }
   })
 
@@ -2076,7 +2079,11 @@ test('should throw an Error if two non-identical schemas with same id are provid
     ]
   }
 
-  t.throws(() => build(schema), new Error('There is already another schema with id inner_schema'))
+  try {
+    build(schema)
+  } catch (err) {
+    t.equal(err.message, 'There is already another schema with id "inner_schema".')
+  }
 })
 
 test('ref internal - throw if schema has definition twice with different shape', (t) => {
@@ -2115,5 +2122,9 @@ test('ref internal - throw if schema has definition twice with different shape',
     }
   }
 
-  t.throws(() => build(schema), Error('There is already another schema with id test##uri'))
+  try {
+    build(schema)
+  } catch (err) {
+    t.equal(err.message, 'There is already another anchor "#uri" in a schema "test".')
+  }
 })