Merge pull request #48 from hyperjump-io/number-range-handler

Combine the number range error handlers

Author: arpitkuriyal

src/error-handlers/exclusiveMaximum.js

@@ -0,0 +1,81 @@
+import { getSchema } from "@hyperjump/json-schema/experimental";
+import * as Schema from "@hyperjump/browser";
+import * as Instance from "@hyperjump/json-schema/instance/experimental";
+
+/**
+ * @import { NumberConstraints } from "../localization.js"
+ * @import { ErrorHandler } from "../index.d.ts"
+ */
+
+/** @type ErrorHandler */
+const numberRangeHandler = async (normalizedErrors, instance, localization) => {
+  /** @type NumberConstraints */
+  const constraints = {};
+
+  /** @type string[] */
+  const failedSchemaLocations = [];
+
+  for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/minimum"]) {
+    if (!normalizedErrors["https://json-schema.org/keyword/minimum"][schemaLocation]) {
+      failedSchemaLocations.push(schemaLocation);
+    }
+
+    const keyword = await getSchema(schemaLocation);
+    /** @type number */
+    const minimum = Schema.value(keyword);
+    constraints.minimum = Math.max(constraints.minimum ?? Number.MIN_VALUE, minimum);
+  }
+
+  for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/exclusiveMinimum"]) {
+    if (!normalizedErrors["https://json-schema.org/keyword/exclusiveMinimum"][schemaLocation]) {
+      failedSchemaLocations.push(schemaLocation);
+    }
+
+    const keyword = await getSchema(schemaLocation);
+    /** @type number */
+    const minimum = Schema.value(keyword);
+    constraints.minimum = Math.max(constraints.minimum ?? Number.MIN_VALUE, minimum);
+    if (constraints.minimum === minimum) {
+      constraints.exclusiveMinimum = true;
+    }
+  }
+
+  for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/maximum"]) {
+    if (!normalizedErrors["https://json-schema.org/keyword/maximum"][schemaLocation]) {
+      failedSchemaLocations.push(schemaLocation);
+    }
+
+    const keyword = await getSchema(schemaLocation);
+    /** @type number */
+    const maximum = Schema.value(keyword);
+    constraints.maximum = Math.min(constraints.maximum ?? Number.MAX_VALUE, maximum);
+  }
+
+  for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/exclusiveMaximum"]) {
+    if (!normalizedErrors["https://json-schema.org/keyword/exclusiveMaximum"][schemaLocation]) {
+      failedSchemaLocations.push(schemaLocation);
+    }
+
+    const keyword = await getSchema(schemaLocation);
+    /** @type number */
+    const maximum = Schema.value(keyword);
+    constraints.maximum = Math.min(constraints.maximum ?? Number.MAX_VALUE, maximum);
+    if (constraints.maximum === maximum) {
+      constraints.exclusiveMaximum = true;
+    }
+  }
+
+  if (failedSchemaLocations.length > 0) {
+    return [
+      {
+        message: localization.getNumberErrorMessage(constraints),
+        instanceLocation: Instance.uri(instance),
+        schemaLocation: failedSchemaLocations.length > 1 ? failedSchemaLocations : failedSchemaLocations[0]
+      }
+    ];
+  }
+
+  return [];
+};
+
+export default numberRangeHandler;

src/error-handlers/exclusiveMinimum.js

@@ -50,18 +50,15 @@ import constErrorHandler from "./error-handlers/const.js";
 import containsErrorHandler from "./error-handlers/contains.js";
 import dependentRequiredErrorHandler from "./error-handlers/dependentRequired.js";
 import enumErrorHandler from "./error-handlers/enum.js";
-import exclusiveMaximumErrorHandler from "./error-handlers/exclusiveMaximum.js";
-import exclusiveMinimumErrorHandler from "./error-handlers/exclusiveMinimum.js";
 import formatErrorHandler from "./error-handlers/format.js";
-import maximumErrorHandler from "./error-handlers/maximum.js";
-import minimumErrorHandler from "./error-handlers/minimum.js";
 import maxItemsErrorHandler from "./error-handlers/maxItems.js";
 import minItemsErrorHandler from "./error-handlers/minItems.js";
 import maxPropertiesErrorHandler from "./error-handlers/maxProperties.js";
 import minPropertiesErrorHandler from "./error-handlers/minProperties.js";
 import minLengthErrorHandler from "./error-handlers/minLength.js";
 import multipleOfErrorHandler from "./error-handlers/multipleOf.js";
 import notErrorHandler from "./error-handlers/not.js";
+import numberRangeHandler from "./error-handlers/number-range-handler.js";
 import patternErrorHandler from "./error-handlers/pattern.js";
 import requiredErrorHandler from "./error-handlers/required.js";
 import typeErrorHandler from "./error-handlers/type.js";
@@ -125,11 +122,7 @@ addErrorHandler(constErrorHandler);
 addErrorHandler(containsErrorHandler);
 addErrorHandler(dependentRequiredErrorHandler);
 addErrorHandler(enumErrorHandler);
-addErrorHandler(exclusiveMaximumErrorHandler);
-addErrorHandler(exclusiveMinimumErrorHandler);
 addErrorHandler(formatErrorHandler);
-addErrorHandler(maximumErrorHandler);
-addErrorHandler(minimumErrorHandler);
 addErrorHandler(maxItemsErrorHandler);
 addErrorHandler(minItemsErrorHandler);
 addErrorHandler(maxPropertiesErrorHandler);
@@ -138,6 +131,7 @@ addErrorHandler(minLengthErrorHandler);
 addErrorHandler(maxLengthErrorHandler);
 addErrorHandler(multipleOfErrorHandler);
 addErrorHandler(notErrorHandler);
+addErrorHandler(numberRangeHandler);
 addErrorHandler(patternErrorHandler);
 addErrorHandler(requiredErrorHandler);
 addErrorHandler(typeErrorHandler);