@hyperjump/json-schema 1.9.9 → 1.10.1

package/README.md

@@ -201,6 +201,9 @@ Schema, such as `@hyperjump/json-schema/draft-2020-12`.
 * **unregisterSchema**: (uri: string) => void
 
     Remove a schema from the local schema registry.
+* **hasSchema**: (uri: string) => boolean
+
+    Check if a schema with the given URI is already registered.
 * _(deprecated)_ **addSchema**: (schema: object, retrievalUri?: string, defaultDialectId?: string) => void
 
     Load a schema manually rather than fetching it from the filesystem or over

package/lib/common.js

@@ -19,9 +19,10 @@ export const jsonTypeOf = (value) => {
       } else if (Object.getPrototypeOf(value) === Object.prototype) {
         return "object";
       }
-    default:
+    default: {
       const type = jsType === "object" ? Object.getPrototypeOf(value).constructor.name || "anonymous" : jsType;
       throw Error(`Not a JSON compatible type: ${type}`);
+    }
   }
 };
 

package/lib/experimental.d.ts

@@ -59,8 +59,8 @@ export const getKeywordName: (dialectId: string, keywordId: string) => string;
 export const getKeyword: <A>(id: string) => Keyword<A>;
 export const getKeywordByName: <A>(keywordName: string, dialectId: string) => Keyword<A>;
 export const getKeywordId: (keywordName: string, dialectId: string) => string;
-export const defineVocabulary: (id: string, keywords: { [keyword: string]: string }) => void;
-export const loadDialect: (dialectId: string, dialect: { [vocabularyId: string]: boolean }, allowUnknownKeywords?: boolean) => void;
+export const defineVocabulary: (id: string, keywords: Record<string, string>) => void;
+export const loadDialect: (dialectId: string, dialect: Record<string, boolean>, allowUnknownKeywords?: boolean) => void;
 export const unloadDialect: (dialectId: string) => void;
 export const hasDialect: (dialectId: string) => boolean;
 

package/lib/index.d.ts

@@ -2,12 +2,13 @@ import type { Json } from "@hyperjump/json-pointer";
 
 
 export type SchemaFragment = string | number | boolean | null | SchemaObject | SchemaFragment[];
-export type SchemaObject = {
+export type SchemaObject = { // eslint-disable-line @typescript-eslint/consistent-indexed-object-style
   [keyword: string]: SchemaFragment;
 };
 
 export const registerSchema: (schema: SchemaObject | boolean, retrievalUri?: string, contextDialectId?: string) => void;
 export const unregisterSchema: (retrievalUri: string) => void;
+export const hasSchema: (uri: string) => boolean;
 
 /**
  * @deprecated since 1.7.0. Use registerSchema instead.

package/lib/index.js

@@ -130,7 +130,7 @@ addKeyword(vocabulary);
 addKeyword(writeOnly);
 
 export { addSchema, unregisterSchema, validate, FLAG } from "./core.js";
-export { registerSchema } from "./schema.js";
+export { registerSchema, hasSchema } from "./schema.js";
 export {
   getMetaSchemaOutputFormat,
   setMetaSchemaOutputFormat,

package/lib/instance.js

@@ -34,9 +34,10 @@ export const fromJs = (value, uri = "", pointer = "", parent = undefined) => {
       } else if (value instanceof Reference) {
         return fromJs(value.toJSON(), uri, pointer, parent);
       }
-    default:
+    default: {
       const type = jsType === "object" ? Object.getPrototypeOf(value).constructor.name || "anonymous" : jsType;
       throw Error(`Not a JSON compatible type: ${type}`);
+    }
   }
 };
 
@@ -77,14 +78,16 @@ export const has = (key, node) => key in node.value;
 
 export const step = (key, node) => {
   switch (node.type) {
-    case "object":
+    case "object": {
       const property = node.children.find((propertyNode) => {
         return value(propertyNode.children[0]) === key;
       });
       return property?.children[1];
-    case "array":
+    }
+    case "array": {
       const index = parseInt(key, 10);
       return node.children[index];
+    }
     default:
       return;
   }

package/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];
+  }
 };

package/lib/schema.js

@@ -14,7 +14,7 @@ export const schemaPlugin = {
 
     return buildSchemaDocument(await response.json(), response.url, contextDialectId);
   },
-  fileMatcher: (path) => /(\.|\/)schema\.json$/.test(path)
+  fileMatcher: async (path) => /(\.|\/)schema\.json$/.test(path)
 };
 
 const schemaRegistry = {};
@@ -59,6 +59,8 @@ export const unregisterSchema = (uri) => {
   delete schemaRegistry[normalizedUri];
 };
 
+export const hasSchema = (uri) => uri in schemaRegistry;
+
 export const buildSchemaDocument = (schema, id, dialectId, embedded = {}) => {
   // Dialect / JSON Schema Version
   if (typeof schema.$schema === "string") {
@@ -91,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];
   }
 

package/openapi-3-0/index.d.ts

@@ -69,7 +69,7 @@ type OpenApi = {
 };
 
 type Reference = {
-  $ref: "string"
+  $ref: "string";
 };
 
 type Info = {

package/openapi-3-1/index.d.ts

@@ -86,11 +86,11 @@ type Xml = {
 };
 
 export type OpenApi = {
-  openapi: string
+  openapi: string;
   info: Info;
   jsonSchemaDialect?: string;
   servers?: Server[];
-  security?: SecurityRequirement[]
+  security?: SecurityRequirement[];
   tags?: Tag[];
   externalDocs?: ExternalDocumentation;
   paths?: Record<string, PathItem>;
@@ -227,7 +227,7 @@ type Callbacks = Record<string, PathItem | Reference>;
 type Example = {
   summary?: string;
   description?: string;
-  value?: Json,
+  value?: Json;
   externalValue?: string;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.9.9",
+  "version": "1.10.1",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -50,19 +50,16 @@
     "url": "https://github.com/sponsors/jdesrosiers"
   },
   "devDependencies": {
+    "@stylistic/eslint-plugin": "*",
     "@types/content-type": "*",
     "@types/node": "*",
     "@types/uuid": "*",
-    "@typescript-eslint/eslint-plugin": "*",
-    "@typescript-eslint/parser": "*",
     "@vitest/coverage-v8": "*",
-    "eslint": "*",
-    "eslint-import-resolver-exports": "*",
-    "eslint-import-resolver-node": "*",
     "eslint-import-resolver-typescript": "*",
     "eslint-plugin-import": "*",
     "json-schema-test-suite": "github:json-schema-org/JSON-Schema-Test-Suite",
     "typescript": "*",
+    "typescript-eslint": "*",
     "undici": "*",
     "vitest": "*",
     "yaml": "*"