@cloudflare/cabidela 0.0.17 → 0.0.19

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.0.19] - 2025-02-26
+
+### Added
+
+- Added support for applying defaults with anyOf/oneOf and tests
+
+### Changed
+
+- Minor code refactoring for better readability
+
+## [0.0.18] - 2025-02-20
+
+### Added
+
+- Constant values support https://json-schema.org/understanding-json-schema/reference/const
+- CHANGELOG.md file

package/README.md

@@ -4,16 +4,15 @@
   </a>
 </div>
 
-
 <p align="center">
-    <em>Small, fast, eval-less, [Cloudflare Workers](https://developers.cloudflare.com/workers/) compatible, dynamic JSON Schema validator.</em>
+    <em>Small, fast, eval-less, <a href="https://developers.cloudflare.com/workers/">Cloudflare Workers</a> compatible, dynamic JSON Schema validator.</em>
 </p>
 
 <hr />
 
-# What is
+## What is
 
-Cabidela is a small, fast, eval-less, [Cloudflare Workers](https://developers.cloudflare.com/workers/) compatible, dynamic JSON Schema validator. It implements a large subset of <https://json-schema.org/draft/2020-12/json-schema-validation> that should cover most use-cases. But not all. See limitations below.
+Cabidela is a small, fast, eval-less, Cloudflare Workers compatible, dynamic JSON Schema validator. It implements a large subset of <https://json-schema.org/draft/2020-12/json-schema-validation> that should cover most use-cases. But not all. See limitations below.
 
 ## How to use
 
@@ -136,6 +135,51 @@ console.log(payload);
 
 ```
 
+### oneOf defaults
+
+Using `applyDefaults` with `oneOf` will one apply the default value of the sub-schema that matches the condition. For
+example, using this schema:
+
+```javascript
+  {
+    type: "object",
+    oneOf: [
+      {
+        type: "object",
+        properties: {
+          sun: {
+            type: "number",
+            default: 9000,
+          },
+          moon: {
+            type: "number",
+            default: 9000,
+          },
+        },
+        required: ["sun"],
+      },
+      {
+        type: "object",
+        properties: {
+          sun: {
+            type: "number",
+            default: 9000,
+          },
+          moon: {
+            type: "number",
+            default: 9000,
+          },
+        },
+        required: ["moon"],
+      },
+    ],
+  };
+```
+
+- The payload `{ sun: 10}` will be modified to `{ sun: 10, moon: 9000 }`.
+- The payload `{ moon: 10}` will be modified to `{ sun: 9000, moon: 10 }`.
+- The payload `{ saturn: 10}` will throw an error because no condition is met.
+
 ## Custom errors
 
 If the new instance options has the  `errorMessages` flag set to true, you can use the property `errorMessage` in the schema to define custom error messages.
@@ -160,7 +204,7 @@ const payload = {
 
 cabidela.validate(payload);
 // throws "Error: prompt required"
-```
+````
 
 ## Tests
 
@@ -187,11 +231,11 @@ JSON Schema validators like Ajv tend to follow this pattern:
 2. Compile the schema.
 3. Validate one or more payloads against the (compiled) schema.
 
-All of these steps have a cost. Compiling the schema makes sense if you are going to validate multiple payloads in the same session. But in the case of a Workers applications we typically want to validate with the HTTP request, one payload at a time, and then we discard the validator.
+All of these steps have a cost. Compiling the schema makes sense if you are going to validate multiple payloads in the same session. But in the case of a Workers application we typically want to validate with the HTTP request, one payload at a time, and then we discard the validator.
 
 Cabidela skips the compilation step and validates the payload directly against the schema.
 
-In our benchmarks, Cabidela is significantly faster than Ajv on all operations if you don't reuse the validator. Even when we skip the instantiation and compilation steps from Ajv, Cabidela still performs on par or better than Ajv.
+In our benchmarks, Cabidela is significantly faster than Ajv on all operations if you don't reuse the validator. Even when we skip the instantiation and compilation steps from Ajv, Cabidela still performs relatively well.
 
 Here are some results:
 
@@ -236,10 +280,9 @@ We use Vitest's [bench](https://vitest.dev/api/#bench) feature to run the benchm
 npm run benchmark
 ```
 
-
 ## Current limitations
 
-Cabidela supports most of JSON Schema specification for most use-cases, we think. However it's not complete. **Currently** we do not support:
+Cabidela supports most of JSON Schema specification, and should be useful for many applications, but it's not complete. **Currently** we do not support:
 
 - Multiple (array of) types `{ "type": ["number", "string"] }`
 - Regular expressions
@@ -249,4 +292,3 @@ Cabidela supports most of JSON Schema specification for most use-cases, we think
 - `$ref`, `$defs` and `$id`
 
 yet.
-

package/dist/index.d.mts

@@ -9,8 +9,10 @@ type SchemaNavigation = {
     payload: any;
     evaluatedProperties: Set<string>;
     carryProperties?: boolean;
+    deferredApplyDefaults?: boolean;
     absorvErrors?: boolean;
     errors: Set<string>;
+    defaultsCallbacks: Array<any>;
 };
 declare class Cabidela {
     schema: any;

package/dist/index.d.ts

@@ -9,8 +9,10 @@ type SchemaNavigation = {
     payload: any;
     evaluatedProperties: Set<string>;
     carryProperties?: boolean;
+    deferredApplyDefaults?: boolean;
     absorvErrors?: boolean;
     errors: Set<string>;
+    defaultsCallbacks: Array<any>;
 };
 declare class Cabidela {
     schema: any;

package/dist/index.js

@@ -37,7 +37,7 @@ var pathToString = (path) => {
 var getMetaData = (value) => {
   let size = 0;
   let types = /* @__PURE__ */ new Set([]);
-  let properties = /* @__PURE__ */ new Set([]);
+  let properties = [];
   if (value === null) {
     types.add("null");
   } else if (typeof value == "string") {
@@ -61,7 +61,7 @@ var getMetaData = (value) => {
   } else if (typeof value == "object") {
     types.add("object");
     size = Object.keys(value).length;
-    properties = new Set(Object.keys(value));
+    properties = Object.keys(value);
   }
   return { types, size, properties };
 };
@@ -87,19 +87,14 @@ var Cabidela = class {
   }
   throw(message, needle) {
     const error = `${message}${this.options.fullErrors && needle.absorvErrors !== true && needle.errors.size > 0 ? `: ${Array.from(needle.errors).join(", ")}` : ``}`;
-    throw new Error(
-      this.options.errorMessages ? needle.schema.errorMessage ?? error : error
-    );
+    throw new Error(this.options.errorMessages ? needle.schema.errorMessage ?? error : error);
   }
   parseAdditionalProperties(needle, contextAdditionalProperties, contextEvaluatedProperties) {
     let matchCount = 0;
-    const { metadata, resolvedObject } = resolvePayload(
-      needle.path,
-      needle.payload
-    );
-    const unevaluatedProperties = metadata.properties.difference(
-      contextEvaluatedProperties
-    );
+    const { metadata, resolvedObject } = resolvePayload(needle.path, needle.payload);
+    const unevaluatedProperties = new Set(
+      metadata.properties.map((r) => pathToString([...needle.path, r]))
+    ).difference(contextEvaluatedProperties);
     if (contextAdditionalProperties === false) {
       if (unevaluatedProperties.size > 0) {
         this.throw(
@@ -114,14 +109,15 @@ var Cabidela = class {
     } else {
       for (let property of unevaluatedProperties) {
         if (this.parseSubSchema({
-          path: [property],
+          path: [property.split(".").slice(-1)[0]],
           schema: contextAdditionalProperties,
           payload: resolvedObject,
           evaluatedProperties: /* @__PURE__ */ new Set(),
-          errors: /* @__PURE__ */ new Set()
+          errors: /* @__PURE__ */ new Set(),
+          defaultsCallbacks: []
         })) {
           matchCount++;
-          needle.evaluatedProperties.add(property);
+          needle.evaluatedProperties.add(pathToString([property]));
         }
       }
     }
@@ -149,12 +145,13 @@ var Cabidela = class {
     let matchCount = 0;
     if (needle.schema.hasOwnProperty("properties")) {
       for (let property in needle.schema.properties) {
-        if (this.parseSubSchema({
+        const matches = this.parseSubSchema({
           ...needle,
           path: [...needle.path, property],
           schema: needle.schema.properties[property]
-        })) {
-          localEvaluatedProperties.add(property);
+        });
+        if (matches > 0) {
+          localEvaluatedProperties.add(pathToString([...needle.path, property]));
           matchCount++;
         }
       }
@@ -167,10 +164,7 @@ var Cabidela = class {
       );
     }
     if (needle.schema.hasOwnProperty("unevaluatedProperties")) {
-      needle.evaluatedProperties = /* @__PURE__ */ new Set([
-        ...needle.evaluatedProperties,
-        ...localEvaluatedProperties
-      ]);
+      needle.evaluatedProperties = /* @__PURE__ */ new Set([...needle.evaluatedProperties, ...localEvaluatedProperties]);
       matchCount += this.parseAdditionalProperties(
         needle,
         needle.schema.unevaluatedProperties,
@@ -178,32 +172,37 @@ var Cabidela = class {
       );
     }
     if (needle.schema.hasOwnProperty("required")) {
-      if (new Set(needle.schema.required).difference(
+      if (new Set(needle.schema.required.map((r) => pathToString([...needle.path, r]))).difference(
         needle.evaluatedProperties.union(localEvaluatedProperties)
       ).size > 0) {
-        this.throw(
-          `required properties at '${pathToString(needle.path)}' is '${needle.schema.required}'`,
-          needle
-        );
+        this.throw(`required properties at '${pathToString(needle.path)}' is '${needle.schema.required}'`, needle);
       }
     }
     return matchCount ? true : false;
   }
   parseList(list, needle, breakCondition) {
     let rounds = 0;
+    const defaultsCallbacks = [];
     for (let option in list) {
       try {
-        rounds += this.parseSubSchema({
+        const matches = this.parseSubSchema({
           ...needle,
           schema: { type: needle.schema.type, ...list[option] },
-          carryProperties: true,
-          absorvErrors: true
+          carryProperties: false,
+          absorvErrors: true,
+          deferredApplyDefaults: true
         });
+        rounds += matches;
         if (breakCondition && breakCondition(rounds)) break;
+        defaultsCallbacks.push(...needle.defaultsCallbacks);
+        needle.defaultsCallbacks = [];
       } catch (e) {
         needle.errors.add(e.message);
+        needle.defaultsCallbacks = [];
       }
     }
+    for (const callback of defaultsCallbacks) callback();
+    needle.defaultsCallbacks = [];
     return rounds;
   }
   // Parses a JSON Schema sub-schema object - reentrant
@@ -212,9 +211,10 @@ var Cabidela = class {
       this.throw(`No schema for path '${pathToString(needle.path)}'`, needle);
     }
     if (needle.schema.hasOwnProperty("oneOf")) {
-      if (this.parseList(needle.schema.oneOf, needle) !== 1) {
+      const rounds = this.parseList(needle.schema.oneOf, needle, (r) => r !== 1);
+      if (rounds !== 1) {
         if (needle.path.length == 0) {
-          this.throw(`oneOf at '${pathToString(needle.path)}' not met`, needle);
+          this.throw(`oneOf at '${pathToString(needle.path)}' not met, ${rounds} matches`, needle);
         }
         return 0;
       }
@@ -230,10 +230,7 @@ var Cabidela = class {
       return 1;
     }
     if (needle.schema.hasOwnProperty("allOf")) {
-      const conditions = needle.schema.allOf.reduce(
-        (r, c) => Object.assign(r, c),
-        {}
-      );
+      const conditions = needle.schema.allOf.reduce((r, c) => Object.assign(r, c), {});
       try {
         this.parseSubSchema({
           ...needle,
@@ -248,10 +245,7 @@ var Cabidela = class {
         return 0;
       }
     }
-    const { metadata, resolvedObject } = resolvePayload(
-      needle.path,
-      needle.payload
-    );
+    const { metadata, resolvedObject } = resolvePayload(needle.path, needle.payload);
     if (needle.schema.type === "array" && !metadata.types.has("binary") && !metadata.types.has("string")) {
       let matched = 0;
       for (let item in resolvedObject) {
@@ -265,6 +259,16 @@ var Cabidela = class {
     } else if (needle.schema.type === "object" || needle.schema.properties) {
       return this.parseObject(needle) ? 1 : 0;
     } else if (resolvedObject !== void 0) {
+      if (needle.schema.hasOwnProperty("const")) {
+        if (resolvedObject !== needle.schema.const) {
+          this.throw(
+            `const ${resolvedObject} doesn't match ${needle.schema.const} at '${pathToString(needle.path)}'`,
+            needle
+          );
+        } else {
+          if (needle.schema.type == void 0) return 1;
+        }
+      }
       if (needle.schema.hasOwnProperty("enum")) {
         if (Array.isArray(needle.schema.enum)) {
           if (!needle.schema.enum.includes(resolvedObject)) {
@@ -276,15 +280,12 @@ var Cabidela = class {
             if (needle.schema.type == void 0) return 1;
           }
         } else {
-          this.throw(
-            `enum should be an array at '${pathToString(needle.path)}'`,
-            needle
-          );
+          this.throw(`enum should be an array at '${pathToString(needle.path)}'`, needle);
         }
       }
       if (needle.schema.hasOwnProperty("type") && !metadata.types.has(needle.schema.type)) {
         this.throw(
-          `Type mismatch of '${pathToString(needle.path)}', '${needle.schema.type}' not in ${JSON.stringify(Array.from(metadata.types))}`,
+          `Type mismatch of '${pathToString(needle.path)}', '${needle.schema.type}' not in ${Array.from(metadata.types).map((e) => `'${e}'`).join(",")}`,
           needle
         );
       }
@@ -292,10 +293,7 @@ var Cabidela = class {
         switch (needle.schema.type) {
           case "string":
             if (needle.schema.hasOwnProperty("maxLength") && metadata.size > needle.schema.maxLength) {
-              this.throw(
-                `Length of '${pathToString(needle.path)}' must be <= ${needle.schema.maxLength}`,
-                needle
-              );
+              this.throw(`Length of '${pathToString(needle.path)}' must be <= ${needle.schema.maxLength}`, needle);
             }
             if (needle.schema.hasOwnProperty("minLength") && metadata.size < needle.schema.minLength) {
               this.throw(
@@ -307,60 +305,53 @@ var Cabidela = class {
           case "number":
           case "integer":
             if (needle.schema.hasOwnProperty("minimum") && resolvedObject < needle.schema.minimum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be >= ${needle.schema.minimum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be >= ${needle.schema.minimum}`, needle);
             }
             if (needle.schema.hasOwnProperty("exclusiveMinimum") && resolvedObject <= needle.schema.exclusiveMinimum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be > ${needle.schema.exclusiveMinimum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be > ${needle.schema.exclusiveMinimum}`, needle);
             }
             if (needle.schema.hasOwnProperty("maximum") && resolvedObject > needle.schema.maximum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be <= ${needle.schema.maximum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be <= ${needle.schema.maximum}`, needle);
             }
             if (needle.schema.hasOwnProperty("exclusiveMaximum") && resolvedObject >= needle.schema.exclusiveMaximum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be < ${needle.schema.exclusiveMaximum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be < ${needle.schema.exclusiveMaximum}`, needle);
             }
             if (needle.schema.hasOwnProperty("multipleOf") && resolvedObject % needle.schema.multipleOf !== 0) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be multiple of ${needle.schema.multipleOf}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be multiple of ${needle.schema.multipleOf}`, needle);
             }
             break;
         }
       }
       if (needle.carryProperties) {
-        needle.evaluatedProperties.add(needle.path[needle.path.length - 1]);
+        needle.evaluatedProperties.add(pathToString(needle.path));
       }
       return 1;
     }
     if (this.options.applyDefaults === true && needle.schema.hasOwnProperty("default")) {
-      needle.path.reduce(function(prev, curr, index) {
-        if (prev[curr] === void 0) {
-          prev[curr] = {};
-        }
-        if (index == needle.path.length - 1) {
-          prev[curr] = needle.schema.default;
-          needle.evaluatedProperties.add(needle.path[needle.path.length - 1]);
-        }
-        return prev ? prev[curr] : void 0;
-      }, needle.payload);
+      const applyDefaults = () => {
+        needle.path.reduce(function(prev, curr, index) {
+          if (prev[curr] === void 0) {
+            prev[curr] = {};
+          }
+          if (index == needle.path.length - 1) {
+            prev[curr] = needle.schema.default;
+            needle.evaluatedProperties.add(pathToString(needle.path));
+          }
+          return prev ? prev[curr] : void 0;
+        }, needle.payload);
+      };
+      if (needle.deferredApplyDefaults === true) {
+        needle.defaultsCallbacks.push(applyDefaults);
+      } else {
+        applyDefaults();
+      }
     }
     return 0;
   }
   validate(payload) {
     const needle = {
       errors: /* @__PURE__ */ new Set(),
+      defaultsCallbacks: [],
       evaluatedProperties: /* @__PURE__ */ new Set(),
       path: [],
       schema: this.schema,

package/dist/index.mjs

@@ -11,7 +11,7 @@ var pathToString = (path) => {
 var getMetaData = (value) => {
   let size = 0;
   let types = /* @__PURE__ */ new Set([]);
-  let properties = /* @__PURE__ */ new Set([]);
+  let properties = [];
   if (value === null) {
     types.add("null");
   } else if (typeof value == "string") {
@@ -35,7 +35,7 @@ var getMetaData = (value) => {
   } else if (typeof value == "object") {
     types.add("object");
     size = Object.keys(value).length;
-    properties = new Set(Object.keys(value));
+    properties = Object.keys(value);
   }
   return { types, size, properties };
 };
@@ -61,19 +61,14 @@ var Cabidela = class {
   }
   throw(message, needle) {
     const error = `${message}${this.options.fullErrors && needle.absorvErrors !== true && needle.errors.size > 0 ? `: ${Array.from(needle.errors).join(", ")}` : ``}`;
-    throw new Error(
-      this.options.errorMessages ? needle.schema.errorMessage ?? error : error
-    );
+    throw new Error(this.options.errorMessages ? needle.schema.errorMessage ?? error : error);
   }
   parseAdditionalProperties(needle, contextAdditionalProperties, contextEvaluatedProperties) {
     let matchCount = 0;
-    const { metadata, resolvedObject } = resolvePayload(
-      needle.path,
-      needle.payload
-    );
-    const unevaluatedProperties = metadata.properties.difference(
-      contextEvaluatedProperties
-    );
+    const { metadata, resolvedObject } = resolvePayload(needle.path, needle.payload);
+    const unevaluatedProperties = new Set(
+      metadata.properties.map((r) => pathToString([...needle.path, r]))
+    ).difference(contextEvaluatedProperties);
     if (contextAdditionalProperties === false) {
       if (unevaluatedProperties.size > 0) {
         this.throw(
@@ -88,14 +83,15 @@ var Cabidela = class {
     } else {
       for (let property of unevaluatedProperties) {
         if (this.parseSubSchema({
-          path: [property],
+          path: [property.split(".").slice(-1)[0]],
           schema: contextAdditionalProperties,
           payload: resolvedObject,
           evaluatedProperties: /* @__PURE__ */ new Set(),
-          errors: /* @__PURE__ */ new Set()
+          errors: /* @__PURE__ */ new Set(),
+          defaultsCallbacks: []
         })) {
           matchCount++;
-          needle.evaluatedProperties.add(property);
+          needle.evaluatedProperties.add(pathToString([property]));
         }
       }
     }
@@ -123,12 +119,13 @@ var Cabidela = class {
     let matchCount = 0;
     if (needle.schema.hasOwnProperty("properties")) {
       for (let property in needle.schema.properties) {
-        if (this.parseSubSchema({
+        const matches = this.parseSubSchema({
           ...needle,
           path: [...needle.path, property],
           schema: needle.schema.properties[property]
-        })) {
-          localEvaluatedProperties.add(property);
+        });
+        if (matches > 0) {
+          localEvaluatedProperties.add(pathToString([...needle.path, property]));
           matchCount++;
         }
       }
@@ -141,10 +138,7 @@ var Cabidela = class {
       );
     }
     if (needle.schema.hasOwnProperty("unevaluatedProperties")) {
-      needle.evaluatedProperties = /* @__PURE__ */ new Set([
-        ...needle.evaluatedProperties,
-        ...localEvaluatedProperties
-      ]);
+      needle.evaluatedProperties = /* @__PURE__ */ new Set([...needle.evaluatedProperties, ...localEvaluatedProperties]);
       matchCount += this.parseAdditionalProperties(
         needle,
         needle.schema.unevaluatedProperties,
@@ -152,32 +146,37 @@ var Cabidela = class {
       );
     }
     if (needle.schema.hasOwnProperty("required")) {
-      if (new Set(needle.schema.required).difference(
+      if (new Set(needle.schema.required.map((r) => pathToString([...needle.path, r]))).difference(
         needle.evaluatedProperties.union(localEvaluatedProperties)
       ).size > 0) {
-        this.throw(
-          `required properties at '${pathToString(needle.path)}' is '${needle.schema.required}'`,
-          needle
-        );
+        this.throw(`required properties at '${pathToString(needle.path)}' is '${needle.schema.required}'`, needle);
       }
     }
     return matchCount ? true : false;
   }
   parseList(list, needle, breakCondition) {
     let rounds = 0;
+    const defaultsCallbacks = [];
     for (let option in list) {
       try {
-        rounds += this.parseSubSchema({
+        const matches = this.parseSubSchema({
           ...needle,
           schema: { type: needle.schema.type, ...list[option] },
-          carryProperties: true,
-          absorvErrors: true
+          carryProperties: false,
+          absorvErrors: true,
+          deferredApplyDefaults: true
         });
+        rounds += matches;
         if (breakCondition && breakCondition(rounds)) break;
+        defaultsCallbacks.push(...needle.defaultsCallbacks);
+        needle.defaultsCallbacks = [];
       } catch (e) {
         needle.errors.add(e.message);
+        needle.defaultsCallbacks = [];
       }
     }
+    for (const callback of defaultsCallbacks) callback();
+    needle.defaultsCallbacks = [];
     return rounds;
   }
   // Parses a JSON Schema sub-schema object - reentrant
@@ -186,9 +185,10 @@ var Cabidela = class {
       this.throw(`No schema for path '${pathToString(needle.path)}'`, needle);
     }
     if (needle.schema.hasOwnProperty("oneOf")) {
-      if (this.parseList(needle.schema.oneOf, needle) !== 1) {
+      const rounds = this.parseList(needle.schema.oneOf, needle, (r) => r !== 1);
+      if (rounds !== 1) {
         if (needle.path.length == 0) {
-          this.throw(`oneOf at '${pathToString(needle.path)}' not met`, needle);
+          this.throw(`oneOf at '${pathToString(needle.path)}' not met, ${rounds} matches`, needle);
         }
         return 0;
       }
@@ -204,10 +204,7 @@ var Cabidela = class {
       return 1;
     }
     if (needle.schema.hasOwnProperty("allOf")) {
-      const conditions = needle.schema.allOf.reduce(
-        (r, c) => Object.assign(r, c),
-        {}
-      );
+      const conditions = needle.schema.allOf.reduce((r, c) => Object.assign(r, c), {});
       try {
         this.parseSubSchema({
           ...needle,
@@ -222,10 +219,7 @@ var Cabidela = class {
         return 0;
       }
     }
-    const { metadata, resolvedObject } = resolvePayload(
-      needle.path,
-      needle.payload
-    );
+    const { metadata, resolvedObject } = resolvePayload(needle.path, needle.payload);
     if (needle.schema.type === "array" && !metadata.types.has("binary") && !metadata.types.has("string")) {
       let matched = 0;
       for (let item in resolvedObject) {
@@ -239,6 +233,16 @@ var Cabidela = class {
     } else if (needle.schema.type === "object" || needle.schema.properties) {
       return this.parseObject(needle) ? 1 : 0;
     } else if (resolvedObject !== void 0) {
+      if (needle.schema.hasOwnProperty("const")) {
+        if (resolvedObject !== needle.schema.const) {
+          this.throw(
+            `const ${resolvedObject} doesn't match ${needle.schema.const} at '${pathToString(needle.path)}'`,
+            needle
+          );
+        } else {
+          if (needle.schema.type == void 0) return 1;
+        }
+      }
       if (needle.schema.hasOwnProperty("enum")) {
         if (Array.isArray(needle.schema.enum)) {
           if (!needle.schema.enum.includes(resolvedObject)) {
@@ -250,15 +254,12 @@ var Cabidela = class {
             if (needle.schema.type == void 0) return 1;
           }
         } else {
-          this.throw(
-            `enum should be an array at '${pathToString(needle.path)}'`,
-            needle
-          );
+          this.throw(`enum should be an array at '${pathToString(needle.path)}'`, needle);
         }
       }
       if (needle.schema.hasOwnProperty("type") && !metadata.types.has(needle.schema.type)) {
         this.throw(
-          `Type mismatch of '${pathToString(needle.path)}', '${needle.schema.type}' not in ${JSON.stringify(Array.from(metadata.types))}`,
+          `Type mismatch of '${pathToString(needle.path)}', '${needle.schema.type}' not in ${Array.from(metadata.types).map((e) => `'${e}'`).join(",")}`,
           needle
         );
       }
@@ -266,10 +267,7 @@ var Cabidela = class {
         switch (needle.schema.type) {
           case "string":
             if (needle.schema.hasOwnProperty("maxLength") && metadata.size > needle.schema.maxLength) {
-              this.throw(
-                `Length of '${pathToString(needle.path)}' must be <= ${needle.schema.maxLength}`,
-                needle
-              );
+              this.throw(`Length of '${pathToString(needle.path)}' must be <= ${needle.schema.maxLength}`, needle);
             }
             if (needle.schema.hasOwnProperty("minLength") && metadata.size < needle.schema.minLength) {
               this.throw(
@@ -281,60 +279,53 @@ var Cabidela = class {
           case "number":
           case "integer":
             if (needle.schema.hasOwnProperty("minimum") && resolvedObject < needle.schema.minimum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be >= ${needle.schema.minimum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be >= ${needle.schema.minimum}`, needle);
             }
             if (needle.schema.hasOwnProperty("exclusiveMinimum") && resolvedObject <= needle.schema.exclusiveMinimum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be > ${needle.schema.exclusiveMinimum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be > ${needle.schema.exclusiveMinimum}`, needle);
             }
             if (needle.schema.hasOwnProperty("maximum") && resolvedObject > needle.schema.maximum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be <= ${needle.schema.maximum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be <= ${needle.schema.maximum}`, needle);
             }
             if (needle.schema.hasOwnProperty("exclusiveMaximum") && resolvedObject >= needle.schema.exclusiveMaximum) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be < ${needle.schema.exclusiveMaximum}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be < ${needle.schema.exclusiveMaximum}`, needle);
             }
             if (needle.schema.hasOwnProperty("multipleOf") && resolvedObject % needle.schema.multipleOf !== 0) {
-              this.throw(
-                `'${pathToString(needle.path)}' must be multiple of ${needle.schema.multipleOf}`,
-                needle
-              );
+              this.throw(`'${pathToString(needle.path)}' must be multiple of ${needle.schema.multipleOf}`, needle);
             }
             break;
         }
       }
       if (needle.carryProperties) {
-        needle.evaluatedProperties.add(needle.path[needle.path.length - 1]);
+        needle.evaluatedProperties.add(pathToString(needle.path));
       }
       return 1;
     }
     if (this.options.applyDefaults === true && needle.schema.hasOwnProperty("default")) {
-      needle.path.reduce(function(prev, curr, index) {
-        if (prev[curr] === void 0) {
-          prev[curr] = {};
-        }
-        if (index == needle.path.length - 1) {
-          prev[curr] = needle.schema.default;
-          needle.evaluatedProperties.add(needle.path[needle.path.length - 1]);
-        }
-        return prev ? prev[curr] : void 0;
-      }, needle.payload);
+      const applyDefaults = () => {
+        needle.path.reduce(function(prev, curr, index) {
+          if (prev[curr] === void 0) {
+            prev[curr] = {};
+          }
+          if (index == needle.path.length - 1) {
+            prev[curr] = needle.schema.default;
+            needle.evaluatedProperties.add(pathToString(needle.path));
+          }
+          return prev ? prev[curr] : void 0;
+        }, needle.payload);
+      };
+      if (needle.deferredApplyDefaults === true) {
+        needle.defaultsCallbacks.push(applyDefaults);
+      } else {
+        applyDefaults();
+      }
     }
     return 0;
   }
   validate(payload) {
     const needle = {
       errors: /* @__PURE__ */ new Set(),
+      defaultsCallbacks: [],
       evaluatedProperties: /* @__PURE__ */ new Set(),
       path: [],
       schema: this.schema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/cabidela",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "Cabidela is a small, fast, eval-less, Cloudflare Workers compatible, dynamic JSON Schema validator",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -24,7 +24,8 @@
   "files": [
     "dist",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "CHANGELOG.md"
   ],
   "repository": {
     "type": "git",