@hyperjump/json-schema 1.13.0 → 1.14.1

package/lib/keywords.js

@@ -35,17 +35,19 @@ export const defineVocabulary = (id, keywords) => {
 };
 
 const _dialects = {};
-const _allowUnknownKeywords = {};
-const _persistentDialects = {};
 
-export const getKeywordId = (keyword, dialectId) => getDialect(dialectId)?.[keyword]
-  || (_allowUnknownKeywords[dialectId] || keyword.startsWith("x-"))
-  && `https://json-schema.org/keyword/unknown#${keyword}`;
+export const getKeywordId = (keyword, dialectId) => {
+  const dialect = getDialect(dialectId);
+  return dialect.keywords[keyword]
+    ?? ((dialect.allowUnknownKeywords || keyword.startsWith("x-"))
+      ? `https://json-schema.org/keyword/unknown#${keyword}`
+      : undefined);
+};
 
 export const getKeywordName = (dialectId, keywordId) => {
   const dialect = getDialect(dialectId);
-  for (const keyword in dialect) {
-    if (dialect[keyword] === keywordId) {
+  for (const keyword in dialect.keywords) {
+    if (dialect.keywords[keyword] === keywordId) {
       return keyword;
     }
   }
@@ -62,33 +64,31 @@ const getDialect = (dialectId) => {
 export const hasDialect = (dialectId) => dialectId in _dialects;
 
 export const loadDialect = (dialectId, dialect, allowUnknownKeywords = false, isPersistent = true) => {
-  _allowUnknownKeywords[dialectId] = allowUnknownKeywords;
-  _persistentDialects[dialectId] = _persistentDialects[dialectId] || isPersistent;
-
-  _dialects[dialectId] = {};
-  Object.entries(dialect)
-    .forEach(([vocabularyId, isRequired]) => {
-      if (vocabularyId in _vocabularies) {
-        Object.entries(_vocabularies[vocabularyId])
-          .forEach(([keyword, keywordId]) => {
-            if (!(keywordId in _keywords) && !isRequired) {
-              // Allow keyword to be ignored
-              keywordId = `https://json-schema.org/keyword/unknown#${keyword}`;
-            }
-            _dialects[dialectId][keyword] = keywordId;
-          });
-      } 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.`);
+  _dialects[dialectId] = {
+    keywords: {},
+    allowUnknownKeywords: allowUnknownKeywords,
+    persistentDialects: _dialects[dialectId]?.persistentDialects || isPersistent
+  };
+
+  for (const vocabularyId in dialect) {
+    if (vocabularyId in _vocabularies) {
+      for (const keyword in _vocabularies[vocabularyId]) {
+        let keywordId = _vocabularies[vocabularyId][keyword];
+        if (!(keywordId in _keywords) && !dialect[vocabularyId]) {
+          // Allow keyword to be ignored
+          keywordId = `https://json-schema.org/keyword/unknown#${keyword}`;
+        }
+        _dialects[dialectId].keywords[keyword] = keywordId;
       }
-    });
+    } else if (!allowUnknownKeywords || dialect[vocabularyId]) {
+      delete _dialects[dialectId];
+      throw Error(`Unrecognized vocabulary: ${vocabularyId}. You can define this vocabulary with the 'defineVocabulary' function.`);
+    }
+  }
 };
 
 export const unloadDialect = (dialectId) => {
-  if (!_persistentDialects[dialectId]) {
-    delete _allowUnknownKeywords[dialectId];
+  if (!_dialects[dialectId]?.persistentDialects) {
     delete _dialects[dialectId];
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.13.0",
+  "version": "1.14.1",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",