@hyperjump/json-schema 1.6.6 → 1.6.7

package/bundle/index.js

@@ -223,8 +223,8 @@ const loadKeywordSupport = () => {
 
   const dependencies = getKeyword("https://json-schema.org/keyword/draft-04/dependencies");
   if (dependencies) {
-    dependencies.collectExternalIds = (dependentSchemas, externalIds, ast, dynamicAnchors) => {
-      Object.values(dependentSchemas).forEach(([, dependency]) => {
+    dependencies.collectExternalIds = (dependencies, externalIds, ast, dynamicAnchors) => {
+      Object.values(dependencies).forEach(([, dependency]) => {
         if (typeof dependency === "string") {
           Validation.collectExternalIds(dependency, externalIds, ast, dynamicAnchors);
         }
@@ -265,4 +265,52 @@ const loadKeywordSupport = () => {
       Validation.collectExternalIds(contains, externalIds, ast, dynamicAnchors);
     };
   }
+
+  // Experimental
+
+  const propertyDependencies = getKeyword("https://json-schema.org/keyword/propertyDependencies");
+  if (propertyDependencies) {
+    propertyDependencies.collectExternalIds = (propertyDependencies, externalIds, ast, dynamicAnchors) => {
+      for (const key in propertyDependencies) {
+        for (const value in propertyDependencies[key]) {
+          Validation.collectExternalIds(propertyDependencies[key][value], externalIds, ast, dynamicAnchors);
+        }
+      }
+    };
+  }
+
+  const conditional = getKeyword("https://json-schema.org/keyword/conditional");
+  if (conditional) {
+    conditional.collectExternalIds = (conditional, externalIds, ast, dynamicAnchors) => {
+      for (const schema of conditional) {
+        Validation.collectExternalIds(schema, externalIds, ast, dynamicAnchors);
+      }
+    };
+  }
+
+  const itemPattern = getKeyword("https://json-schema.org/keyword/itemPattern");
+  if (itemPattern) {
+    itemPattern.collectExternalIds = (nfa, externalIds, ast, dynamicAnchors) => {
+      for (const itemSchema of collectNfaSchemas(nfa.start)) {
+        Validation.collectExternalIds(itemSchema, externalIds, ast, dynamicAnchors);
+      }
+    };
+  }
+
+  const collectNfaSchemas = function* (node, visited = new Set()) {
+    if (visited.has(node)) {
+      return;
+    }
+
+    visited.add(node);
+
+    for (const schema in node.transition) {
+      yield schema;
+      yield* collectNfaSchemas(node.transition[schema], visited);
+    }
+
+    for (const epsilon of node.epsilonTransitions) {
+      yield* collectNfaSchemas(epsilon, visited);
+    }
+  };
 };

package/lib/keywords.js

@@ -15,9 +15,22 @@ export const defineVocabulary = (id, keywords) => {
 
 const _dialects = {};
 const _allowUnknownKeywords = {};
-export const getKeywordId = (dialectId, keyword) => _dialects[dialectId]?.[keyword]
-  || (_allowUnknownKeywords[dialectId] || keyword[0] === "@") && `https://json-schema.org/keyword/unknown#${keyword}`;
+
+export const getKeywordId = (dialectId, keyword) => {
+  if (!hasDialect(dialectId)) {
+    throw Error(`Encountered unknown dialect '${dialectId}'`);
+  }
+
+  return _dialects[dialectId]?.[keyword]
+    || (_allowUnknownKeywords[dialectId] || keyword.startsWith("x-"))
+    && `https://json-schema.org/keyword/unknown#${keyword}`;
+};
+
 export const getKeywordName = (dialectId, keywordId) => {
+  if (!hasDialect(dialectId)) {
+    throw Error(`Encountered unknown dialect '${dialectId}'`);
+  }
+
   for (const keyword in _dialects[dialectId]) {
     if (_dialects[dialectId][keyword] === keywordId) {
       return keyword;

package/lib/schema.js

@@ -22,14 +22,10 @@ export const add = (schema, retrievalUri = undefined, contextDialectId = undefin
   const dialectId = toAbsoluteIri(schema.$schema || contextDialectId);
   delete schema.$schema;
 
-  if (!hasDialect(dialectId)) {
-    throw Error(`Encountered unknown dialect '${dialectId}'`);
-  }
-
   // Identifiers
   const idToken = getKeywordName(dialectId, "https://json-schema.org/keyword/id")
     || getKeywordName(dialectId, "https://json-schema.org/keyword/draft-04/id");
-  if (retrievalUri === undefined && !(idToken in schema)) {
+  if (!retrievalUri && typeof schema?.[idToken] !== "string") {
     throw Error(`Unable to determine an identifier for the schema. Use the '${idToken}' keyword or pass a retrievalUri when loading the schema.`);
   }
   const internalUrl = resolveUri(schema[idToken] || retrievalUri, retrievalUri);
@@ -77,9 +73,6 @@ const processSchema = (subject, id, dialectId, pointer, anchors, dynamicAnchors)
   if (jsonTypeOf(subject, "object")) {
     // Embedded Schema
     const embeddedDialectId = typeof subject.$schema === "string" ? toAbsoluteIri(subject.$schema) : dialectId;
-    if (!hasDialect(embeddedDialectId)) {
-      throw Error(`Encountered unknown dialect '${embeddedDialectId}'`);
-    }
 
     const idToken = getKeywordName(embeddedDialectId, "https://json-schema.org/keyword/id");
     if (typeof subject[idToken] === "string") {

package/openapi-3-0/index.js

@@ -1,5 +1,5 @@
 import { addKeyword, defineVocabulary, loadDialect } from "../lib/keywords.js";
-import { addSchema } from "../lib/core.js";
+import { addSchema } from "../lib/index.js";
 import "../lib/openapi.js";
 
 import dialectSchema from "./dialect.js";

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

@@ -244,7 +244,7 @@ type Header = {
   description?: string;
   required?: boolean;
   deprecated?: boolean;
-  schema?: OpenApi31;
+  schema?: OasSchema31;
   style?: "simple";
   explode?: boolean;
   content?: Content;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -27,7 +27,7 @@
   "scripts": {
     "clean": "xargs -a .gitignore rm -rf",
     "lint": "eslint lib stable draft-* openapi-* bundle annotations",
-    "test": "mocha 'lib/**/*.spec.ts' 'stable/**/*.spec.ts' 'draft-*/**/*.spec.ts' 'openapi-*/**/*.spec.ts' 'bundle/**/*.spec.ts' 'annotations/**/*.spec.ts'"
+    "test": "vitest --watch=false"
   },
   "repository": "github:hyperjump-io/json-schema",
   "keywords": [
@@ -51,20 +51,18 @@
     "url": "https://github.com/sponsors/jdesrosiers"
   },
   "devDependencies": {
-    "@types/chai": "*",
-    "@types/mocha": "*",
     "@types/node": "*",
     "@typescript-eslint/eslint-plugin": "*",
     "@typescript-eslint/parser": "*",
-    "chai": "*",
+    "@vitest/coverage-v8": "^1.0.4",
     "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",
-    "mocha": "*",
-    "ts-node": "*",
     "typescript": "*",
+    "vitest": "*",
     "yaml": "*"
   },
   "dependencies": {

package/annotations/tests/applicators.json

@@ -1,375 +0,0 @@
-[
-  {
-    "title": "`properties`, `patternProperties`, and `additionalProperties`",
-    "schema": {
-      "properties": {
-        "foo": { "title": "Foo" }
-      },
-      "patternProperties": {
-        "^a": { "title": "Bar" }
-      },
-      "additionalProperties": { "title": "Baz" }
-    },
-    "subjects": [
-      {
-        "instance": {},
-        "assertions": [
-          {
-            "location": "#/foo",
-            "keyword": "title",
-            "expected": []
-          },
-          {
-            "location": "#/apple",
-            "keyword": "title",
-            "expected": []
-          },
-          {
-            "location": "#/bar",
-            "keyword": "title",
-            "expected": []
-          }
-        ]
-      },
-      {
-        "instance": {
-          "foo": {},
-          "apple": {},
-          "baz": {}
-        },
-        "assertions": [
-          {
-            "location": "#/foo",
-            "keyword": "title",
-            "expected": ["Foo"]
-          },
-          {
-            "location": "#/apple",
-            "keyword": "title",
-            "expected": ["Bar"]
-          },
-          {
-            "location": "#/baz",
-            "keyword": "title",
-            "expected": ["Baz"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`propertyNames`",
-    "schema": {
-      "propertyNames": {
-        "const": "foo",
-        "title": "Foo"
-      }
-    },
-    "subjects": [
-      {
-        "instance": { "foo": 42 },
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "propertyNames",
-            "expected": []
-          },
-          {
-            "location": "#/foo",
-            "keyword": "title",
-            "expected": []
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`prefixItems` and `items`",
-    "schema": {
-      "prefixItems": [{ "title": "Foo" }],
-      "items": { "title": "Bar" }
-    },
-    "subjects": [
-      {
-        "instance": ["foo", "bar"],
-        "assertions": [
-          {
-            "location": "#/0",
-            "keyword": "title",
-            "expected": ["Foo"]
-          },
-          {
-            "location": "#/1",
-            "keyword": "title",
-            "expected": ["Bar"]
-          },
-          {
-            "location": "#/2",
-            "keyword": "title",
-            "expected": []
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`contains`",
-    "schema": {
-      "contains": {
-        "type": "number",
-        "title": "Foo"
-      }
-    },
-    "subjects": [
-      {
-        "instance": ["foo", 42, true],
-        "assertions": [
-          {
-            "location": "#/0",
-            "keyword": "title",
-            "expected": []
-          },
-          {
-            "location": "#/1",
-            "keyword": "title",
-            "expected": ["Foo"]
-          },
-          {
-            "location": "#/2",
-            "keyword": "title",
-            "expected": []
-          },
-          {
-            "location": "#/3",
-            "keyword": "title",
-            "expected": []
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`allOf`",
-    "schema": {
-      "allOf": [
-        { "title": "Foo" },
-        { "title": "Bar" }
-      ]
-    },
-    "subjects": [
-      {
-        "instance": "foo",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "allOf",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Bar", "Foo"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`anyOf`",
-    "schema": {
-      "anyOf": [
-        {
-          "type": "integer",
-          "title": "Foo"
-        },
-        {
-          "type": "number",
-          "title": "Bar"
-        }
-      ]
-    },
-    "subjects": [
-      {
-        "instance": 42,
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "anyOf",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Bar", "Foo"]
-          }
-        ]
-      },
-      {
-        "instance": 4.2,
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Bar"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`oneOf`",
-    "schema": {
-      "oneOf": [
-        {
-          "type": "string",
-          "title": "Foo"
-        },
-        {
-          "type": "number",
-          "title": "Bar"
-        }
-      ]
-    },
-    "subjects": [
-      {
-        "instance": "foo",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "oneOf",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Foo"]
-          }
-        ]
-      },
-      {
-        "instance": 42,
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Bar"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`not`",
-    "schema": {
-      "title": "Foo",
-      "not": {
-        "not": { "title": "Bar" }
-      }
-    },
-    "subjects": [
-      {
-        "instance": {},
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "not",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Foo"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`dependentSchemas`",
-    "schema": {
-      "dependentSchemas": {
-        "foo": { "title": "Foo" }
-      }
-    },
-    "subjects": [
-      {
-        "instance": { "foo": 42 },
-        "assertions": [
-          {
-            "keyword": "dependentSchemas",
-            "location": "#",
-            "expected": []
-          },
-          {
-            "keyword": "title",
-            "location": "#",
-            "expected": ["Foo"]
-          }
-        ]
-      },
-      {
-        "instance": { "foo": 42 },
-        "assertions": [
-          {
-            "keyword": "title",
-            "location": "#/foo",
-            "expected": []
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`if`, `then`, and `else`",
-    "schema": {
-      "if": {
-        "title": "If",
-        "type": "string"
-      },
-      "then": { "title": "Then" },
-      "else": { "title": "Else" }
-    },
-    "subjects": [
-      {
-        "instance": "foo",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "if",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "then",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Then", "If"]
-          }
-        ]
-      },
-      {
-        "instance": 42,
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "if",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "else",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Else", "If"]
-          }
-        ]
-      }
-    ]
-  }
-]

package/annotations/tests/content.json

@@ -1,57 +0,0 @@
-[
-  {
-    "title": "`contentMediaType` is an annotation",
-    "schema": {
-      "contentMediaType": "application/json"
-    },
-    "subjects": [
-      {
-        "instance": "{ \"foo\": \"bar\" }",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "contentMediaType",
-            "expected": ["application/json"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`contentEncoding` is an annotation",
-    "schema": {
-      "contentEncoding": "base64"
-    },
-    "subjects": [
-      {
-        "instance": "SGVsbG8gZnJvbSBKU09OIFNjaGVtYQ==",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "contentEncoding",
-            "expected": ["base64"]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "`contentSchema` is an annotation",
-    "schema": {
-      "$id": "https://annotations.json-schema.org/test/contentSchema-is-an-annotation",
-      "contentSchema": { "type": "number" }
-    },
-    "subjects": [
-      {
-        "instance": "42",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "contentSchema",
-            "expected": ["https://annotations.json-schema.org/test/contentSchema-is-an-annotation#/contentSchema"]
-          }
-        ]
-      }
-    ]
-  }
-]

package/annotations/tests/core.json

@@ -1,33 +0,0 @@
-[
-  {
-    "title": "`$ref` and `$defs`",
-    "schema": {
-      "$ref": "#/$defs/foo",
-      "$defs": {
-        "foo": { "title": "Foo" }
-      }
-    },
-    "subjects": [
-      {
-        "instance": "foo",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "$ref",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "$defs",
-            "expected": []
-          },
-          {
-            "location": "#",
-            "keyword": "title",
-            "expected": ["Foo"]
-          }
-        ]
-      }
-    ]
-  }
-]

package/annotations/tests/format.json

@@ -1,20 +0,0 @@
-[
-  {
-    "title": "`format` is an annotation",
-    "schema": {
-      "format": "email"
-    },
-    "subjects": [
-      {
-        "instance": "foo@bar.com",
-        "assertions": [
-          {
-            "location": "#",
-            "keyword": "format",
-            "expected": ["email"]
-          }
-        ]
-      }
-    ]
-  }
-]