adapt-schemas 3.1.0 → 3.1.1

package/lib/Schemas.js

@@ -110,6 +110,12 @@ class Schemas extends EventEmitter {
    * Empties the schema registry (with the exception of the base schema)
    */
   resetSchemaRegistry () {
+    // Remove previously registered schemas from AJV instances
+    for (const name of Object.keys(this.schemas)) {
+      for (const v of [this.validator, this.validatorWithDefaults]) {
+        if (v.getSchema(name)) v.removeSchema(name)
+      }
+    }
     this.schemas = {
       base: this.createSchema(path.resolve(__dirname, BASE_SCHEMA_PATH), { enableCache: true })
     }
@@ -224,6 +230,16 @@ class Schemas extends EventEmitter {
     }
 
     this.schemas[schema.name] = schema
+
+    // AJV's sync compile() can only resolve $refs against schemas in its internal store to allow `$ref: "schemaName`"
+    // Note we only add simple schemas (no $merge/$patch)
+    if (!schema.raw.$merge && !schema.raw.$patch) {
+      for (const v of [this.validator, this.validatorWithDefaults]) {
+        if (v.getSchema(schema.name)) v.removeSchema(schema.name)
+        v.addSchema(schema.raw, schema.name)
+      }
+    }
+
     this.schemaExtensions?.[schema.name]?.forEach(s => schema.addExtension(s))
 
     if (schema.raw.$patch) {
@@ -242,6 +258,10 @@ class Schemas extends EventEmitter {
     if (this.schemas[name]) {
       delete this.schemas[name]
     }
+    // Remove from AJV instances
+    for (const v of [this.validator, this.validatorWithDefaults]) {
+      if (v.getSchema(name)) v.removeSchema(name)
+    }
     // Remove schema from any extensions lists
     Object.entries(this.schemaExtensions).forEach(([base, extensions]) => {
       this.schemaExtensions[base] = extensions.filter(s => s !== name)

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/cgkineo/adapt-schemas"
   },
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Standalone JSON Schema library for the Adapt framework",
   "type": "module",
   "main": "index.js",