Remove individual and draft-04 min/max handlers

Author: Padmashree06

src/error-handlers/draft-04/maximum.js

@@ -64,19 +64,14 @@ const runTests = (dialectUri, dialect) => {
       unregisterSchema(schemaUri);
     });
 
-    for (const entry of await readdir(
-      `${import.meta.dirname}/test-suite/tests`,
-      { withFileTypes: true }
-    )) {
+    for (const entry of await readdir(`${import.meta.dirname}/test-suite/tests`, { withFileTypes: true })) {
       if (!entry.isFile() || !entry.name.endsWith(".json")) {
         continue;
       }
 
       const file = `${entry.parentPath}/${entry.name}`;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const suite = /** @type TestSuite */ (
-        JSON.parse(await readFile(file, "utf8"))
-      );
+      const suite = /** @type TestSuite */ (JSON.parse(await readFile(file, "utf8")));
 
       for (const testCase of suite.tests) {
         if (!isCompatible(testCase.compatibility, dialect)) {
@@ -104,9 +99,7 @@ const buildErrors = (errors, schemaUri) => {
       message: getMessage(error.messageId, error.messageParams),
       instanceLocation: error.instanceLocation,
       schemaLocations: error.schemaLocations.map((schemaLocation) => {
-        return schemaLocation.startsWith("#")
-          ? schemaUri + schemaLocation
-          : schemaLocation;
+        return schemaLocation.startsWith("#") ? schemaUri + schemaLocation : schemaLocation;
       })
     };
 
@@ -162,10 +155,7 @@ const isCompatible = (compatibility, versionUnderTest) => {
 
 /** @type (messageId: string, messageParams: MessageParams) => string */
 const getMessage = await (async function () {
-  const ftl = await readFile(
-    `${import.meta.dirname}/translations/en-US.ftl`,
-    "utf-8"
-  );
+  const ftl = await readFile(`${import.meta.dirname}/translations/en-US.ftl`, "utf-8");
   const resource = new FluentResource(ftl);
   const bundle = new FluentBundle("en-US");
   bundle.addResource(resource);
@@ -174,37 +164,24 @@ const getMessage = await (async function () {
   const conjunction = new Intl.ListFormat("en-US", { type: "conjunction" });
 
   return (messageId, messageParams) => {
-    messageParams = messageParams ?? {};
     for (const paramId in messageParams) {
       if (typeof messageParams[paramId] === "object") {
         if ("or" in messageParams[paramId]) {
-          messageParams[paramId] = disjunction.format(
-            messageParams[paramId].or
-          );
+          messageParams[paramId] = disjunction.format(messageParams[paramId].or);
         } else {
           messageParams[paramId] = conjunction.format(messageParams[paramId].and);
         }
       }
     }
+
     const message = bundle.getMessage(messageId);
     if (!message?.value) {
       throw Error(`Message '${messageId}' not found.`);
     }
-    if ("maximum" in messageParams && !("exclusiveMaximum" in messageParams)) {
-      messageParams.exclusiveMaximum = messageParams.maximum;
-    }
-    if ("exclusiveMaximum" in messageParams && !("maximum" in messageParams)) {
-      messageParams.maximum = messageParams.exclusiveMaximum;
-    }
-    if ("minimum" in messageParams && !("exclusiveMinimum" in messageParams)) {
-      messageParams.exclusiveMinimum = messageParams.minimum;
-    }
-    if ("exclusiveMinimum" in messageParams && !("minimum" in messageParams)) {
-      messageParams.minimum = messageParams.exclusiveMinimum;
-    }
+
     return bundle.formatPattern(message.value, messageParams);
   };
-})();
+}());
 
 runTests("https://json-schema.org/draft/2020-12/schema", 2020);
 runTests("https://json-schema.org/draft/2019-09/schema", 2019);

src/error-handlers/draft-04/minimum.js

@@ -17,22 +17,14 @@ import dependentSchemasNormalizationHandler from "./normalization-handlers/depen
 import dynamicRefNormalizationHandler from "./normalization-handlers/dynamicRef.js";
 import elseNormalizationHandler from "./normalization-handlers/else.js";
 import enumNormalizationHandler from "./normalization-handlers/enum.js";
-// import exclusiveMaximumDraft04NormalizationHandler from "./normalization-handlers/draft-04/exclusiveMaximum.js";
-// import exclusiveMaximumNormalizationHandler from "./normalization-handlers/exclusiveMaximum.js";
-// import exclusiveMinimumDraft04NormalizationHandler from "./normalization-handlers/draft-04/exclusiveMinimum.js";
-// import exclusiveMinimumNormalizationHandler from "./normalization-handlers/exclusiveMinimum.js";
 import formatNormalizationHandler from "./normalization-handlers/format.js";
 import ifNormalizationHandler from "./normalization-handlers/if.js";
 import itemsDraft04NormalizationHandler from "./normalization-handlers/draft-04/items.js";
 import itemsNormalizationHandler from "./normalization-handlers/items.js";
-// import maximumDraft04NormalizationHandler from "./normalization-handlers/draft-04/maximum.js";
-// import maximumNormalizationHandler from "./normalization-handlers/maximum.js";
 import maxContainsNormalizationHandler from "./normalization-handlers/maxContains.js";
 import maxItemsNormalizationHandler from "./normalization-handlers/maxItems.js";
 import maxLengthNormalizationHandler from "./normalization-handlers/maxLength.js";
 import maxPropertiesNormalizationHandler from "./normalization-handlers/maxProperties.js";
-// import minimumDraft04NormalizationHandler from "./normalization-handlers/draft-04/minimum.js";
-// import minimumNormalizationHandler from "./normalization-handlers/minimum.js";
 import minContainsNormalizationHandler from "./normalization-handlers/minContains.js";
 import minItemsNormalizationHandler from "./normalization-handlers/minItems.js";
 import minLengthNormalizationHandler from "./normalization-handlers/minLength.js";
@@ -60,20 +52,12 @@ import booleanSchemaErrorHandler from "./error-handlers/boolean-schema.js";
 import constEnumErrorHandler from "./error-handlers/constEnum.js";
 import containsErrorHandler from "./error-handlers/contains.js";
 import dependenciesErrorHandler from "./error-handlers/draft-04/dependencies.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 combinedMaximumErrorHandler from "./error-handlers/combinedMaximum.js";
 import combinedMinimumErrorHandler from "./error-handlers/combinedMinimum.js";
-// import maximumDraft04ErrorHandler from "./error-handlers/draft-04/maximum.js";
-// import maximumErrorHandler from "./error-handlers/maximum.js";
 import maxItemsErrorHandler from "./error-handlers/maxItems.js";
 import maxLengthErrorHandler from "./error-handlers/maxLength.js";
 import maxPropertiesErrorHandler from "./error-handlers/maxProperties.js";
-// import minimumDraft04ErrorHandler from "./error-handlers/draft-04/minimum.js";
-// import minimumErrorHandler from "./error-handlers/minimum.js";
 import minItemsErrorHandler from "./error-handlers/minItems.js";
 import minLengthErrorHandler from "./error-handlers/minLength.js";
 import minPropertiesErrorHandler from "./error-handlers/minProperties.js";
@@ -118,18 +102,10 @@ setNormalizationHandler("https://json-schema.org/keyword/draft-04/format", forma
 setNormalizationHandler("https://json-schema.org/keyword/if", ifNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/draft-04/items", itemsDraft04NormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/items", itemsNormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/draft-04/exclusiveMaximum", exclusiveMaximumDraft04NormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/exclusiveMaximum", exclusiveMaximumNormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/draft-04/exclusiveMinimum", exclusiveMinimumDraft04NormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/exclusiveMinimum", exclusiveMinimumNormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/draft-04/maximum", maximumDraft04NormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/maximum", maximumNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/maxContains", maxContainsNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/maxItems", maxItemsNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/maxLength", maxLengthNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/maxProperties", maxPropertiesNormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/draft-04/minimum", minimumDraft04NormalizationHandler);
-// setNormalizationHandler("https://json-schema.org/keyword/minimum", minimumNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/minContains", minContainsNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/minItems", minItemsNormalizationHandler);
 setNormalizationHandler("https://json-schema.org/keyword/minLength", minLengthNormalizationHandler);
@@ -156,20 +132,12 @@ addErrorHandler(booleanSchemaErrorHandler);
 addErrorHandler(constEnumErrorHandler);
 addErrorHandler(containsErrorHandler);
 addErrorHandler(dependenciesErrorHandler);
-addErrorHandler(dependentRequiredErrorHandler);
-addErrorHandler(enumErrorHandler);
-// addErrorHandler(exclusiveMaximumErrorHandler);
-// addErrorHandler(exclusiveMinimumErrorHandler);
 addErrorHandler(formatErrorHandler);
 addErrorHandler(combinedMaximumErrorHandler);
 addErrorHandler(combinedMinimumErrorHandler);
-// addErrorHandler(maximumDraft04ErrorHandler);
-// addErrorHandler(maximumErrorHandler);
 addErrorHandler(maxItemsErrorHandler);
 addErrorHandler(maxLengthErrorHandler);
 addErrorHandler(maxPropertiesErrorHandler);
-// addErrorHandler(minimumDraft04ErrorHandler);
-// addErrorHandler(minimumErrorHandler);
 addErrorHandler(minItemsErrorHandler);
 addErrorHandler(minLengthErrorHandler);
 addErrorHandler(minPropertiesErrorHandler);