Suppress excessive unevaluated errors

Author: jdesrosiers

lib/keywords/unevaluatedItems.js

@@ -19,10 +19,12 @@ const interpret = ([schemaUrl, unevaluatedItems], instance, context) => {
     return true;
   }
   const evaluatedItemsPlugin = new EvaluatedItemsPlugin(schemaUrl);
-  Validation.interpret(schemaUrl, instance, {
+  if (!Validation.interpret(schemaUrl, instance, {
     ...context,
     plugins: [...context.ast.plugins, evaluatedItemsPlugin]
-  });
+  })) {
+    return true;
+  }
   const evaluatedItems = evaluatedItemsPlugin.evaluatedItems;
 
   let isValid = true;

lib/keywords/unevaluatedProperties.js

@@ -19,10 +19,12 @@ const interpret = ([schemaUrl, unevaluatedProperties], instance, context) => {
     return true;
   }
   const evaluatedPropertiesPlugin = new EvaluatedPropertiesPlugin(schemaUrl);
-  Validation.interpret(schemaUrl, instance, {
+  if (!Validation.interpret(schemaUrl, instance, {
     ...context,
     plugins: [...context.ast.plugins, evaluatedPropertiesPlugin]
-  });
+  })) {
+    return true;
+  }
   const evaluatedProperties = evaluatedPropertiesPlugin.evaluatedProperties;
 
   let isValid = true;

lib/output-basic.spec.ts

@@ -645,6 +645,28 @@ describe("Basic Output Format", () => {
       });
     });
 
+    test("invalid - doesn't apply if the schema fails", async () => {
+      registerSchema({
+        properties: {
+          foo: true,
+          bar: false
+        },
+        unevaluatedProperties: false
+      }, schemaUri, dialectUri);
+      const output = await validate(schemaUri, { foo: 42, bar: true, baz: null }, BASIC);
+
+      expect(output).to.eql({
+        valid: false,
+        errors: [
+          {
+            keyword: "https://json-schema.org/evaluation/validate",
+            absoluteKeywordLocation: `${schemaUri}#/properties/bar`,
+            instanceLocation: "#/bar"
+          }
+        ]
+      });
+    });
+
     test("invalid - schema", async () => {
       registerSchema({
         unevaluatedProperties: { type: "string" }
@@ -705,6 +727,25 @@ describe("Basic Output Format", () => {
       });
     });
 
+    test("invalid - doesn't apply if the schema fails", async () => {
+      registerSchema({
+        prefixItems: [true, false],
+        unevaluatedItems: false
+      }, schemaUri, dialectUri);
+      const output = await validate(schemaUri, [42, true, null], BASIC);
+
+      expect(output).to.eql({
+        valid: false,
+        errors: [
+          {
+            keyword: "https://json-schema.org/evaluation/validate",
+            absoluteKeywordLocation: `${schemaUri}#/prefixItems/1`,
+            instanceLocation: "#/1"
+          }
+        ]
+      });
+    });
+
     test("valid", async () => {
       registerSchema({ unevaluatedItems: false }, schemaUri, dialectUri);
       const output = await validate(schemaUri, [], BASIC);

lib/output-detailed.spec.ts

@@ -788,6 +788,35 @@ describe("Detailed Output Format", () => {
       });
     });
 
+    test("invalid - doesn't apply if the schema fails", async () => {
+      registerSchema({
+        properties: {
+          foo: true,
+          bar: false
+        },
+        unevaluatedProperties: false
+      }, schemaUri, dialectUri);
+      const output = await validate(schemaUri, { foo: 42, bar: true, baz: null }, DETAILED);
+
+      expect(output).to.eql({
+        valid: false,
+        errors: [
+          {
+            keyword: "https://json-schema.org/keyword/properties",
+            absoluteKeywordLocation: `${schemaUri}#/properties`,
+            instanceLocation: "#",
+            errors: [
+              {
+                keyword: "https://json-schema.org/evaluation/validate",
+                absoluteKeywordLocation: `${schemaUri}#/properties/bar`,
+                instanceLocation: "#/bar"
+              }
+            ]
+          }
+        ]
+      });
+    });
+
     test("valid", async () => {
       registerSchema({ unevaluatedProperties: false }, schemaUri, dialectUri);
       const output = await validate(schemaUri, {}, DETAILED);
@@ -844,6 +873,32 @@ describe("Detailed Output Format", () => {
       });
     });
 
+    test("invalid - doesn't apply if the schema fails", async () => {
+      registerSchema({
+        prefixItems: [true, false],
+        unevaluatedItems: false
+      }, schemaUri, dialectUri);
+      const output = await validate(schemaUri, [42, true, null], DETAILED);
+
+      expect(output).to.eql({
+        valid: false,
+        errors: [
+          {
+            keyword: "https://json-schema.org/keyword/prefixItems",
+            absoluteKeywordLocation: `${schemaUri}#/prefixItems`,
+            instanceLocation: "#",
+            errors: [
+              {
+                keyword: "https://json-schema.org/evaluation/validate",
+                absoluteKeywordLocation: `${schemaUri}#/prefixItems/1`,
+                instanceLocation: "#/1"
+              }
+            ]
+          }
+        ]
+      });
+    });
+
     test("valid", async () => {
       registerSchema({ unevaluatedItems: false }, schemaUri, dialectUri);
       const output = await validate(schemaUri, [], DETAILED);