Merge pull request #49 from arpitkuriyal/string-range-handler

String range handler and contains errorHandler

Author: arpitkuriyal

src/error-handlers/contains.js

@@ -1,7 +1,11 @@
 import * as Instance from "@hyperjump/json-schema/instance/experimental";
+import { getSchema } from "@hyperjump/json-schema/experimental";
+import * as Schema from "@hyperjump/browser";
+import * as JsonPointer from "@hyperjump/json-pointer";
 import { getErrors } from "../error-handling.js";
 
 /**
+ * @import { ContainsConstraints } from "../localization.js"
  * @import { ErrorHandler, ErrorObject, NormalizedOutput } from "../index.d.ts"
  */
 
@@ -11,8 +15,26 @@ const contains = async (normalizedErrors, instance, localization) => {
   const errors = [];
   if (normalizedErrors["https://json-schema.org/keyword/contains"]) {
     for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/contains"]) {
+      const position = schemaLocation.lastIndexOf("/");
+      const parentLocation = schemaLocation.slice(0, position);
+
+      /** @type ContainsConstraints */
+      const containsConstraints = {};
+      const minContainsLocation = JsonPointer.append("minContains", parentLocation);
+      const minContainsNode = await getSchema(minContainsLocation);
+      /** @type number */
+      containsConstraints.minContains = Schema.value(minContainsNode) ?? 1;
+
+      const maxContainsLocation = JsonPointer.append("maxContains", parentLocation);
+      const maxContainsNode = await getSchema(maxContainsLocation);
+      /** @type number */
+      const maxContains = Schema.value(maxContainsNode);
+      if (maxContains !== undefined) {
+        containsConstraints.maxContains = maxContains;
+      }
+
       errors.push({
-        message: localization.getContainsErrorMessage(),
+        message: localization.getContainsErrorMessage(containsConstraints),
         instanceLocation: Instance.uri(instance),
         schemaLocation: schemaLocation
       });

src/error-handlers/maxLength.js

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

src/error-handlers/minLength.js

@@ -55,15 +55,14 @@ 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";
 import uniqueItemsErrorHandler from "./error-handlers/uniqueItems.js";
-import maxLengthErrorHandler from "./error-handlers/maxLength.js";
+import stringErrorHandler from "./error-handlers/string-handler.js";
+import patternErrorHandler from "./error-handlers/pattern.js";
 
 /**
  * @import { betterJsonSchemaErrors } from "./index.d.ts"
@@ -127,15 +126,14 @@ addErrorHandler(maxItemsErrorHandler);
 addErrorHandler(minItemsErrorHandler);
 addErrorHandler(maxPropertiesErrorHandler);
 addErrorHandler(minPropertiesErrorHandler);
-addErrorHandler(minLengthErrorHandler);
-addErrorHandler(maxLengthErrorHandler);
 addErrorHandler(multipleOfErrorHandler);
 addErrorHandler(notErrorHandler);
 addErrorHandler(numberRangeHandler);
-addErrorHandler(patternErrorHandler);
 addErrorHandler(requiredErrorHandler);
 addErrorHandler(typeErrorHandler);
 addErrorHandler(uniqueItemsErrorHandler);
+addErrorHandler(stringErrorHandler);
+addErrorHandler(patternErrorHandler);
 
 export { setNormalizationHandler } from "./normalized-output.js";
 export { addErrorHandler } from "./error-handling.js";