Merge branch 'main' into test/success-explanation-cases

Author: RitoG09

package-lock.json

@@ -17,16 +17,33 @@ const anyOfErrorHandler = async (normalizedErrors, instance, localization) => {
     }
 
     const alternatives = [];
+    const instanceLocation = Instance.uri(instance);
+
     for (const alternative of anyOf) {
-      alternatives.push(await getErrors(alternative, instance, localization));
+      const typeErrors = alternative[instanceLocation]["https://json-schema.org/keyword/type"];
+      const match = !typeErrors || Object.values(typeErrors).every((isValid) => isValid);
+
+      if (match) {
+        alternatives.push(await getErrors(alternative, instance, localization));
+      }
     }
 
-    errors.push({
-      message: localization.getAnyOfErrorMessage(),
-      alternatives: alternatives,
-      instanceLocation: Instance.uri(instance),
-      schemaLocations: [schemaLocation]
-    });
+    if (alternatives.length === 0) {
+      for (const alternative of anyOf) {
+        alternatives.push(await getErrors(alternative, instance, localization));
+      }
+    }
+
+    if (alternatives.length === 1) {
+      errors.push(...alternatives[0]);
+    } else {
+      errors.push({
+        message: localization.getAnyOfErrorMessage(),
+        alternatives: alternatives,
+        instanceLocation: Instance.uri(instance),
+        schemaLocations: [schemaLocation]
+      });
+    }
   }
 
   return errors;

src/error-handlers/anyOf.js

@@ -1,6 +1,3 @@
-import { getSchema } from "@hyperjump/json-schema/experimental";
-import * as Schema from "@hyperjump/browser";
-import * as Instance from "@hyperjump/json-schema/instance/experimental";
 import { getErrors } from "../../json-schema-errors.js";
 
 /**
@@ -22,25 +19,6 @@ const dependenciesErrorHandler = async (normalizedErrors, instance, localization
       const dependentSchemaErrors = await getErrors(dependentSchemaOutput, instance, localization);
       errors.push(...dependentSchemaErrors);
     }
-
-    const dependencies = await getSchema(schemaLocation);
-    for await (const [propertyName, dependency] of Schema.entries(dependencies)) {
-      if (!Instance.has(propertyName, instance)) {
-        continue;
-      }
-
-      if (Schema.typeOf(dependency) !== "array") {
-        continue;
-      }
-
-      const dependentRequired = /** @type {string[]} */ (Schema.value(dependency));
-      const missing = dependentRequired.filter((required) => !Instance.has(required, instance));
-      errors.push({
-        message: localization.getRequiredErrorMessage(missing),
-        instanceLocation: Instance.uri(instance),
-        schemaLocations: [schemaLocation]
-      });
-    }
   }
 
   return errors;