test: fix

webpack · Jun 7, 2023 · 1a88581 · 1a88581
1 parent d0bebec
commit 1a88581
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 15 deletions.
diff --git a/declarations/keywords/absolutePath.d.ts b/declarations/keywords/absolutePath.d.ts
@@ -2,9 +2,7 @@ export default addAbsolutePathKeyword;
 export type Ajv = import("ajv").default;
 export type SchemaValidateFunction = import("ajv").SchemaValidateFunction;
 export type AnySchemaObject = import("ajv").AnySchemaObject;
-/** @typedef {import("ajv").default} Ajv */
-/** @typedef {import("ajv").SchemaValidateFunction} SchemaValidateFunction */
-/** @typedef {import("ajv").AnySchemaObject} AnySchemaObject */
+export type SchemaUtilErrorObject = import("../validate").SchemaUtilErrorObject;
 /**
  *
  * @param {Ajv} ajv

diff --git a/declarations/validate.d.ts b/declarations/validate.d.ts
@@ -8,6 +8,7 @@ export type Extend = {
   formatExclusiveMinimum?: string | undefined;
   formatExclusiveMaximum?: string | undefined;
   link?: string | undefined;
+  allowUndefined?: boolean | undefined;
 };
 export type Schema = (JSONSchema4 | JSONSchema6 | JSONSchema7) & Extend;
 export type SchemaUtilErrorObject = ErrorObject & {
@@ -33,6 +34,7 @@ export type ValidationErrorConfiguration = {
  * @property {string=} formatExclusiveMinimum
  * @property {string=} formatExclusiveMaximum
  * @property {string=} link
+ * @property {boolean=} allowUndefined
  */
 /** @typedef {(JSONSchema4 | JSONSchema6 | JSONSchema7) & Extend} Schema */
 /** @typedef {ErrorObject & { children?: Array<ErrorObject>}} SchemaUtilErrorObject */

diff --git a/src/keywords/allowUndefined.js b/src/keywords/allowUndefined.js
@@ -15,12 +15,7 @@ function addAllowUndefinedKeyword(ajv) {
     modifying: true,
     /** @type {SchemaValidateFunction} */
     validate(kwVal, data, metadata, dataCxt) {
-      if (
-        kwVal &&
-        dataCxt &&
-        dataCxt.parentData &&
-        typeof dataCxt.parentDataProperty === "number"
-      ) {
+      if (kwVal && dataCxt) {
         const idx = dataCxt.parentDataProperty;
 
         if (typeof dataCxt.parentData[idx] === "undefined") {

diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
diff --git a/test/fixtures/schema.json b/test/fixtures/schema.json
@@ -3811,6 +3811,22 @@
           }
         ]
       }
+    },
+    "arrayStringAndEnumAndNoUndefined": {
+      "description": "References to other configurations to depend on.",
+      "type": "array",
+      "items": {
+        "anyOf": [
+          {
+            "allowUndefined": false,
+            "enum": [ 0, false, "", null ]
+          },
+          {
+            "type": "string",
+            "minLength": 1
+          }
+        ]
+      }
     }
   }
 }
diff --git a/test/index.test.js b/test/index.test.js
@@ -3026,4 +3026,12 @@ describe("Validation", () => {
     },
     (msg) => expect(msg).toMatchSnapshot()
   );
+
+  createFailedTestCase(
+    "array with enum and undefined #3",
+    {
+      arrayStringAndEnumAndNoUndefined: ["foo", "bar", undefined],
+    },
+    (msg) => expect(msg).toMatchSnapshot()
+  );
 });