@hyperjump/json-schema 1.14.0 → 1.14.1

package/annotations/test-utils.d.ts

@@ -0,0 +1 @@
+export const isCompatible: (compatibility: string | undefined, versionUnderTest: number) => boolean;

package/annotations/test-utils.js

@@ -0,0 +1,38 @@
+export const isCompatible = (compatibility, versionUnderTest) => {
+  if (compatibility === undefined) {
+    return true;
+  }
+
+  const constraints = compatibility.split(",");
+  for (const constraint of constraints) {
+    const matches = /(?<operator><=|>=|=)?(?<version>\d+)/.exec(constraint);
+    if (!matches) {
+      throw Error(`Invalid compatibility string: ${compatibility}`);
+    }
+
+    const operator = matches[1] ?? ">=";
+    const version = parseInt(matches[2], 10);
+
+    switch (operator) {
+      case ">=":
+        if (versionUnderTest < version) {
+          return false;
+        }
+        break;
+      case "<=":
+        if (versionUnderTest > version) {
+          return false;
+        }
+        break;
+      case "=":
+        if (versionUnderTest !== version) {
+          return false;
+        }
+        break;
+      default:
+        throw Error(`Unsupported contraint operator: ${operator}`);
+    }
+  }
+
+  return true;
+};

package/draft-04/dependencies.js

@@ -16,21 +16,21 @@ const compile = (schema, ast) => pipe(
 );
 
 const interpret = (dependencies, instance, context) => {
-  const value = Instance.value(instance);
+  if (Instance.typeOf(instance) !== "object") {
+    return true;
+  }
 
-  return Instance.typeOf(instance) !== "object" || dependencies.every(([propertyName, dependency]) => {
-    if (!(propertyName in value)) {
+  return dependencies.every(([propertyName, dependency]) => {
+    if (!Instance.has(propertyName, instance)) {
       return true;
     }
 
     if (Array.isArray(dependency)) {
-      return dependency.every((key) => key in value);
+      return dependency.every((key) => Instance.has(key, instance));
     } else {
       return Validation.interpret(dependency, instance, context);
     }
   });
 };
 
-const simpleApplicator = true;
-
-export default { id, compile, interpret, simpleApplicator };
+export default { id, compile, interpret };

package/lib/keywords/contentSchema.js

@@ -1,4 +1,3 @@
-import { canonicalUri } from "../schema.js";
 import * as Browser from "@hyperjump/browser";
 import * as Instance from "../instance.js";
 import { getKeywordName } from "../keywords.js";
@@ -9,13 +8,17 @@ const id = "https://json-schema.org/keyword/contentSchema";
 const compile = async (contentSchema, _ast, parentSchema) => {
   const contentMediaTypeKeyword = getKeywordName(contentSchema.document.dialectId, "https://json-schema.org/keyword/contentMediaType");
   const contentMediaType = await Browser.step(contentMediaTypeKeyword, parentSchema);
-  return Browser.value(contentMediaType) && canonicalUri(contentSchema);
+  if (Browser.value(contentMediaType) === undefined) {
+    return;
+  }
+
+  return Browser.value(contentSchema);
 };
 
 const interpret = () => true;
 
 const annotation = (contentSchema, instance) => {
-  if (Instance.typeOf(instance) !== "string") {
+  if (!contentSchema || Instance.typeOf(instance) !== "string") {
     return;
   }
 

package/package.json

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