refactor: code

webpack · Jun 7, 2023 · 7c5a40e · 7c5a40e
1 parent 0ee1392
commit 7c5a40e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/ValidationError.js b/src/ValidationError.js
@@ -544,10 +544,16 @@ class ValidationError extends Error {
 
     if (schema.enum) {
       const enumValues = /** @type {Array<any>} */ (schema.enum)
-        .map((item) => JSON.stringify(item))
+        .map((item) => {
+          if (item === null && schema.undefinedAsNull) {
+            return `${JSON.stringify(item)} | undefined`;
+          }
+
+          return JSON.stringify(item);
+        })
         .join(" | ");
 
-      return `${enumValues}${schema.undefinedAsNull ? " | undefined" : ""}`;
+      return `${enumValues}`;
     }
 
     if (typeof schema.const !== "undefined") {

diff --git a/src/keywords/undefinedAsNull.js b/src/keywords/undefinedAsNull.js
@@ -19,6 +19,7 @@ function addUndefinedAsNullKeyword(ajv) {
         const idx = dataCxt.parentDataProperty;
 
         if (typeof dataCxt.parentData[idx] === "undefined") {
+          // eslint-disable-next-line no-param-reassign
           dataCxt.parentData[dataCxt.parentDataProperty] = null;
         }
       }

diff --git a/test/index.test.js b/test/index.test.js
@@ -3022,6 +3022,7 @@ describe("Validation", () => {
   createFailedTestCase(
     "array with enum and undefined #2",
     {
+      // eslint-disable-next-line no-undefined
       arrayStringAndEnum: ["foo", "bar", undefined, 1],
     },
     (msg) => expect(msg).toMatchSnapshot()
@@ -3030,6 +3031,7 @@ describe("Validation", () => {
   createFailedTestCase(
     "array with enum and undefined #3",
     {
+      // eslint-disable-next-line no-undefined
       arrayStringAndEnumAndNoUndefined: ["foo", "bar", undefined],
     },
     (msg) => expect(msg).toMatchSnapshot()