@hyperjump/json-schema 1.4.2 → 1.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,12 +14,12 @@ const compile = async (schema, ast, parentSchema) => {
14
14
  return [numberOfItems, await Validation.compile(schema, ast)];
15
15
  };
16
16
 
17
- const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAnchors) => {
17
+ const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAnchors, quiet) => {
18
18
  if (!Instance.typeOf(instance, "array")) {
19
19
  return true;
20
20
  }
21
21
 
22
- return Instance.every((item, ndx) => ndx < numberOfItems || Validation.interpret(additionalItems, item, ast, dynamicAnchors), instance);
22
+ return Instance.every((item, ndx) => ndx < numberOfItems || Validation.interpret(additionalItems, item, ast, dynamicAnchors), instance, quiet);
23
23
  };
24
24
 
25
25
  const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
@@ -14,7 +14,7 @@ const compile = (schema, ast) => Pact.pipeline([
14
14
  Pact.all
15
15
  ], schema);
16
16
 
17
- const interpret = (dependencies, instance, ast, dynamicAnchors) => {
17
+ const interpret = (dependencies, instance, ast, dynamicAnchors, quiet) => {
18
18
  const value = Instance.value(instance);
19
19
 
20
20
  return !Instance.typeOf(instance, "object") || dependencies.every(([propertyName, dependency]) => {
@@ -25,7 +25,7 @@ const interpret = (dependencies, instance, ast, dynamicAnchors) => {
25
25
  if (Array.isArray(dependency)) {
26
26
  return dependency.every((key) => key in value);
27
27
  } else {
28
- return Validation.interpret(dependency, instance, ast, dynamicAnchors);
28
+ return Validation.interpret(dependency, instance, ast, dynamicAnchors, quiet);
29
29
  }
30
30
  });
31
31
  };
package/draft-04/items.js CHANGED
@@ -14,15 +14,15 @@ const compile = async (schema, ast) => {
14
14
  }
15
15
  };
16
16
 
17
- const interpret = (items, instance, ast, dynamicAnchors) => {
17
+ const interpret = (items, instance, ast, dynamicAnchors, quiet) => {
18
18
  if (!Instance.typeOf(instance, "array")) {
19
19
  return true;
20
20
  }
21
21
 
22
22
  if (typeof items === "string") {
23
- return Instance.every((itemValue) => Validation.interpret(items, itemValue, ast, dynamicAnchors), instance);
23
+ return Instance.every((itemValue) => Validation.interpret(items, itemValue, ast, dynamicAnchors), instance, quiet);
24
24
  } else {
25
- return Instance.every((item, ndx) => !(ndx in items) || Validation.interpret(items[ndx], item, ast, dynamicAnchors), instance);
25
+ return Instance.every((item, ndx) => !(ndx in items) || Validation.interpret(items[ndx], item, ast, dynamicAnchors), instance, quiet);
26
26
  }
27
27
  };
28
28
 
@@ -6,8 +6,8 @@ const id = "https://json-schema.org/keyword/draft-06/contains";
6
6
 
7
7
  const compile = (schema, ast) => Validation.compile(schema, ast);
8
8
 
9
- const interpret = (contains, instance, ast, dynamicAnchors) => {
10
- return !Instance.typeOf(instance, "array") || Instance.some((item) => Validation.interpret(contains, item, ast, dynamicAnchors), instance);
9
+ const interpret = (contains, instance, ast, dynamicAnchors, quiet) => {
10
+ return !Instance.typeOf(instance, "array") || Instance.some((item) => Validation.interpret(contains, item, ast, dynamicAnchors), instance, quiet);
11
11
  };
12
12
 
13
13
  export default { id, compile, interpret };
@@ -20,13 +20,13 @@ const compile = async (schema, ast, parentSchema) => {
20
20
  return { contains, minContains, maxContains };
21
21
  };
22
22
 
23
- const interpret = ({ contains, minContains, maxContains }, instance, ast, dynamicAnchors) => {
23
+ const interpret = ({ contains, minContains, maxContains }, instance, ast, dynamicAnchors, quiet) => {
24
24
  if (!Instance.typeOf(instance, "array")) {
25
25
  return true;
26
26
  }
27
27
 
28
28
  const matches = Instance.reduce((matches, item) => {
29
- return Validation.interpret(contains, item, ast, dynamicAnchors) ? matches + 1 : matches;
29
+ return Validation.interpret(contains, item, ast, dynamicAnchors, quiet) ? matches + 1 : matches;
30
30
  }, 0, instance);
31
31
  return matches >= minContains && matches <= maxContains;
32
32
  };
@@ -5,12 +5,12 @@ const id = "https://json-schema.org/keyword/draft-2019-09/recursiveRef";
5
5
 
6
6
  const compile = (schema) => schema.id;
7
7
 
8
- const interpret = (id, instance, ast, dynamicAnchors) => {
8
+ const interpret = (id, instance, ast, dynamicAnchors, quiet) => {
9
9
  if ("" in ast.metaData[id].dynamicAnchors) {
10
10
  dynamicAnchors = { ...ast.metaData[id].dynamicAnchors, ...dynamicAnchors };
11
- return Validation.interpret(dynamicAnchors[""], instance, ast, dynamicAnchors);
11
+ return Validation.interpret(dynamicAnchors[""], instance, ast, dynamicAnchors, quiet);
12
12
  } else {
13
- return Validation.interpret(`${id}#`, instance, ast, dynamicAnchors);
13
+ return Validation.interpret(`${id}#`, instance, ast, dynamicAnchors, quiet);
14
14
  }
15
15
  };
16
16
 
@@ -12,12 +12,12 @@ const compile = async (dynamicRef, ast) => {
12
12
  return [referencedSchema.id, fragment, Schema.uri(referencedSchema)];
13
13
  };
14
14
 
15
- const interpret = ([id, fragment, ref], instance, ast, dynamicAnchors) => {
15
+ const interpret = ([id, fragment, ref], instance, ast, dynamicAnchors, quiet) => {
16
16
  if (fragment in ast.metaData[id].dynamicAnchors) {
17
17
  dynamicAnchors = { ...ast.metaData[id].dynamicAnchors, ...dynamicAnchors };
18
- return Validation.interpret(dynamicAnchors[fragment], instance, ast, dynamicAnchors);
18
+ return Validation.interpret(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
19
19
  } else {
20
- return Validation.interpret(ref, instance, ast, dynamicAnchors);
20
+ return Validation.interpret(ref, instance, ast, dynamicAnchors, quiet);
21
21
  }
22
22
  };
23
23
 
package/lib/schema.js CHANGED
@@ -77,6 +77,10 @@ const processSchema = (subject, id, dialectId, pointer, anchors, dynamicAnchors)
77
77
  if (jsonTypeOf(subject, "object")) {
78
78
  // Embedded Schema
79
79
  const embeddedDialectId = typeof subject.$schema === "string" ? toAbsoluteIri(subject.$schema) : dialectId;
80
+ if (!hasDialect(embeddedDialectId)) {
81
+ throw Error(`Encountered unknown dialect '${embeddedDialectId}'`);
82
+ }
83
+
80
84
  const idToken = getKeywordName(embeddedDialectId, "https://json-schema.org/keyword/id");
81
85
  if (typeof subject[idToken] === "string") {
82
86
  subject[idToken] = resolveUri(subject[idToken], id);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hyperjump/json-schema",
3
- "version": "1.4.2",
3
+ "version": "1.4.4",
4
4
  "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
5
5
  "type": "module",
6
6
  "main": "./stable/index.js",