Support schema self-identification and throw on unsupported keywords

Author: jdesrosiers

src/index.js

@@ -24,9 +24,14 @@ import { Output } from "./output.js";
 
 /** @type (schema: Json, instance: Json) => Output */
 export const validate = (schema, instance) => {
-  registerSchema(schema, "");
-  const schemaNode = /** @type NonNullable<JsonNode> */ (schemaRegistry.get(""));
+  // Determine schema identifier
+  const uri = typeof schema === "object" && schema !== null && !Array.isArray(schema)
+    && typeof schema.$id === "string" ? schema.$id : "";
+  registerSchema(schema, uri);
 
+  const schemaNode = /** @type NonNullable<JsonNode> */ (schemaRegistry.get(uri));
+
+  // Verify the dialect is supported
   if (schemaNode.jsonType === "object" && jsonObjectHas("$schema", schemaNode)) {
     const $schema = jsonPointerStep("$schema", schemaNode);
     if ($schema.jsonType === "string" && $schema.value !== "https://json-schema.org/draft/2020-12/schema") {
@@ -36,7 +41,7 @@ export const validate = (schema, instance) => {
 
   const output = validateSchema(schemaNode, toJsonNode(instance));
 
-  schemaRegistry.delete("");
+  schemaRegistry.delete(uri);
 
   return output;
 };
@@ -625,3 +630,31 @@ keywordHandlers.set("uniqueItems", (uniqueItemsNode, instanceNode) => {
   const isValid = new Set(normalizedItems).size === normalizedItems.length;
   return new Output(isValid, uniqueItemsNode, instanceNode);
 });
+
+keywordHandlers.set("$id", (idNode, instanceNode, schemaNode) => {
+  if (!idNode.location.endsWith("#/$id")) {
+    throw Error(`Embedded schemas are not supported. Found at ${schemaNode.location}`);
+  }
+
+  return new Output(true, idNode, instanceNode);
+});
+
+keywordHandlers.set("$anchor", (anchorNode) => {
+  throw Error(`The '$anchor' keyword is not supported. Found at ${anchorNode.location}`);
+});
+
+keywordHandlers.set("$dynamicAnchor", (dynamicAnchorNode) => {
+  throw Error(`The '$dynamicAnchor' keyword is not supported. Found at ${dynamicAnchorNode.location}`);
+});
+
+keywordHandlers.set("$dynamicRef", (dynamicRefNode) => {
+  throw Error(`The '$dynamicRef' keyword is not supported. Found at ${dynamicRefNode.location}`);
+});
+
+keywordHandlers.set("unevaluatedProperties", (unevaluatedPropertiesNode) => {
+  throw Error(`The 'unevaluatedProperties' keyword is not supported. Found at ${unevaluatedPropertiesNode.location}`);
+});
+
+keywordHandlers.set("unevaluatedItems", (unevaluatedItemsNode) => {
+  throw Error(`The 'unevaluatedItems' keyword is not supported. Found at ${unevaluatedItemsNode.location}`);
+});

src/json-schema-test-suite.test.js

@@ -30,6 +30,7 @@ const skip = new Set([
   "|defs.json",
   "|dynamicRef.json",
   "|not.json|collect annotations inside a 'not', even if collection is disabled",
+  "|ref.json|remote ref, containing refs itself",
   "|ref.json|Recursive references between schemas",
   "|ref.json|ref creates new scope when adjacent to keywords",
   "|ref.json|refs with relative uris and defs",
@@ -38,7 +39,6 @@ const skip = new Set([
   "|ref.json|order of evaluation: $id and $ref",
   "|ref.json|order of evaluation: $id and $anchor and $ref",
   "|ref.json|simple URN base URI with $ref via the URN",
-  "|ref.json|URN base URI with URN and JSON pointer ref",
   "|ref.json|URN base URI with URN and anchor ref",
   "|ref.json|URN ref with nested pointer ref",
   "|ref.json|ref to if",
@@ -49,10 +49,7 @@ const skip = new Set([
   "|refRemote.json|base URI change",
   "|refRemote.json|base URI change - change folder",
   "|refRemote.json|base URI change - change folder in subschema",
-  "|refRemote.json|root ref in remote ref",
-  "|refRemote.json|remote ref with ref to defs",
   "|refRemote.json|Location-independent identifier in remote ref",
-  "|refRemote.json|retrieved nested refs resolve relative to their URI not $id",
   "|refRemote.json|remote HTTP ref with nested absolute ref",
   "|refRemote.json|$ref to $ref finds detached $anchor",
   "|unevaluatedItems.json",