Make explicitly loaded dialects persistent

Author: jdesrosiers

lib/keywords.js

@@ -36,6 +36,7 @@ export const defineVocabulary = (id, keywords) => {
 
 const _dialects = {};
 const _allowUnknownKeywords = {};
+const _persistentDialects = {};
 
 export const getKeywordId = (keyword, dialectId) => getDialect(dialectId)?.[keyword]
   || (_allowUnknownKeywords[dialectId] || keyword.startsWith("x-"))
@@ -60,8 +61,9 @@ const getDialect = (dialectId) => {
 
 export const hasDialect = (dialectId) => dialectId in _dialects;
 
-export const loadDialect = (dialectId, dialect, allowUnknownKeywords = false) => {
+export const loadDialect = (dialectId, dialect, allowUnknownKeywords = false, isPersistent = true) => {
   _allowUnknownKeywords[dialectId] = allowUnknownKeywords;
+  _persistentDialects[dialectId] = _persistentDialects[dialectId] || isPersistent;
 
   _dialects[dialectId] = {};
   Object.entries(dialect)
@@ -77,12 +79,16 @@ export const loadDialect = (dialectId, dialect, allowUnknownKeywords = false) =>
           });
       } else if (!allowUnknownKeywords || isRequired) {
         delete _dialects[dialectId];
+        delete _allowUnknownKeywords[dialectId];
+        delete _persistentDialects[dialectId];
         throw Error(`Unrecognized vocabulary: ${vocabularyId}. You can define this vocabulary with the 'defineVocabulary' function.`);
       }
     });
 };
 
 export const unloadDialect = (dialectId) => {
-  delete _allowUnknownKeywords[dialectId];
-  delete _dialects[dialectId];
+  if (!_persistentDialects[dialectId]) {
+    delete _allowUnknownKeywords[dialectId];
+    delete _dialects[dialectId];
+  }
 };

lib/schema.js

@@ -93,7 +93,7 @@ export const buildSchemaDocument = (schema, id, dialectId, embedded = {}) => {
     const allowUnknownKeywords = schema[vocabularyToken]["https://json-schema.org/draft/2019-09/vocab/core"]
       || schema[vocabularyToken]["https://json-schema.org/draft/2020-12/vocab/core"];
 
-    loadDialect(id, schema[vocabularyToken], allowUnknownKeywords);
+    loadDialect(id, schema[vocabularyToken], allowUnknownKeywords, false);
     delete schema[vocabularyToken];
   }