handler more case of anyOf

Author: arpitkuriyal

src/error-handlers/anyOf.js

@@ -165,10 +165,6 @@ const anyOfErrorHandler = async (normalizedErrors, instance, localization) => {
         continue;
       }
 
-      // TODO: Handle alternatives with const
-      // TODO: Handle alternatives with enum
-      // TODO: Handle null alternatives
-      // TODO: Handle boolean alternatives
       // TODO: Handle string alternatives
       // TODO: Handle array alternatives
       // TODO: Handle alternatives without a type

src/keyword-error-message.test.js

@@ -856,7 +856,7 @@ describe("Error messages", async () => {
       {
         schemaLocation: "https://example.com/main#/anyOf",
         instanceLocation: "#",
-        message: localization.getTypeErrorMessage(["string", "number"], "boolean")
+        message: localization.getEnumErrorMessage({ allowedTypes: ["string", "number"] }, false)
       }
     ]);
   });

src/localization.js

@@ -239,12 +239,23 @@ export class Localization {
    * @returns {string}
    */
   getEnumErrorMessage(constraints, currentValue) {
-    if (constraints.allowedValues) {
+    /** @type {"suggestion" | "types" | "values" | "both"} */
+    let variant = "suggestion";
+
+    /** @type string */
+    let allowedValues = "";
+
+    /** @type string */
+    let expectedTypes = "";
+
+    const instanceValue = JSON.stringify(currentValue);
+
+    if (constraints.allowedValues && constraints.allowedValues.length > 0 && constraints.allowedTypes?.length === 0) {
       const bestMatch = constraints.allowedValues
         .map((value) => {
           const r = {
             value: JSON.stringify(value),
-            weight: leven(JSON.stringify(value), JSON.stringify(currentValue))
+            weight: leven(JSON.stringify(value), instanceValue)
           };
           return r;
         })
@@ -254,19 +265,27 @@ export class Localization {
         return this._formatMessage("enum-error", {
           variant: "suggestion",
           suggestion: bestMatch.value,
-          instanceValue: JSON.stringify(currentValue)
-        });
-      } else {
-        return this._formatMessage("enum-error", {
-          variant: "fallback",
-          allowedValues: new Intl.ListFormat(this.locale, { type: "disjunction" })
-            .format(constraints.allowedValues.map((value) => JSON.stringify(value))),
-          instanceValue: JSON.stringify(currentValue)
+          instanceValue
         });
       }
+
+      variant = "values";
+      allowedValues = new Intl.ListFormat(this.locale, { type: "disjunction" })
+        .format(constraints.allowedValues.map((value) => JSON.stringify(value)));
     }
 
-    return "";
+    if (constraints.allowedTypes && constraints.allowedTypes.length > 0) {
+      variant = variant === "values" ? "both" : "types";
+      expectedTypes = new Intl.ListFormat(this.locale, { type: "disjunction" })
+        .format(constraints.allowedTypes.map((value) => JSON.stringify(value)));
+    }
+
+    return this._formatMessage("enum-error", {
+      variant,
+      allowedValues,
+      expectedTypes,
+      instanceValue
+    });
   }
 
   /** @type () => string */

src/translations/en-US.ftl

@@ -1,9 +1,11 @@
 # Non-type specific messages
 type-error = The instance should be of type {$expected} but found {$actual}.
 const-error = The instance should be equal to {$expectedValue}.
-enum-error = { $variant ->
-	[suggestion] Unexpected value {$instanceValue}. Did you mean {$suggestion}?
-	*[fallback] Unexpected value {$instanceValue}. Expected one of: {$allowedValues}.
+enum-error = Unexpected value {$instanceValue}. { $variant ->
+  [types] Expected a {$expectedTypes}.
+  [values] Expected one of: ${allowedValues}.
+  [both] Expected a type of {$expectedTypes}, or one of: ${allowedValues}.
+	[suggestion] Did you mean {$suggestion}?
 }
 
 # String messages