@cloudflare/cabidela 0.0.18 → 0.1.1

package/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2025-02-26
+
+### Added
+
+- Added support for $id, $ref and $defs - https://json-schema.org/understanding-json-schema/structuring
+- Added support for not - https://json-schema.org/understanding-json-schema/reference/combining#not
+
+## [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,7 +4,6 @@
   </a>
 </div>
 
-
 <p align="center">
     <em>Small, fast, eval-less, <a href="https://developers.cloudflare.com/workers/">Cloudflare Workers</a> compatible, dynamic JSON Schema validator.</em>
 </p>
@@ -136,9 +135,123 @@ 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.
+
+### $id, $ref, $defs
+
+The keywords [$id](https://json-schema.org/understanding-json-schema/structuring#id), [$ref](https://json-schema.org/understanding-json-schema/structuring#dollarref) and [$defs](https://json-schema.org/understanding-json-schema/structuring#defs) can be used to build and maintain complex schemas where the reusable parts are defined in separate schemas.
+
+The following is the main schema and a `customer` sub-schema that defines the `contacts` and `address` properties.
+
+```js
+import { Cabidela } from "@cloudflare/cabidela";
+
+const schema = {
+  $id: "http://example.com/schemas/main",
+  type: "object",
+  properties: {
+    name: { type: "string" },
+    contacts: { $ref: "customer#/contacts" },
+    address: { $ref: "customer#/address" },
+    balance: { $ref: "$defs#/balance" },
+  },
+  required: ["name", "contacts", "address"],
+  "$defs": {
+    "balance": {
+      type: "object",
+      prope      properties: {
+        currency: { type: "string" },
+        amount: { type: "number" },
+      },
+    }
+  }
+};
+
+const contactSchema = {
+  $id: "http://example.com/schemas/customer",
+  contacts: {
+    type: "object",
+    properties: {
+      email: { type: "string" },
+      phone: { type: "string" },
+    },
+    required: ["email", "phone"],
+  },
+  address: {
+    type: "object",
+    properties: {
+      street: { type: "string" },
+      city: { type: "string" },
+      zip: { type: "string" },
+      country: { type: "string" },
+    },
+    required: ["street", "city", "zip", "country"],
+  },
+};
+
+const cabidela = new Cabidela(schema, { subSchemas: [contactSchema] });
+
+cabidela.validate({
+  name: "John",
+  contacts: {
+    email: "john@example.com",
+    phone: "+123456789",
+  },
+  address: {
+    street: "123 Main St",
+    city: "San Francisco",
+    zip: "94105",
+    country: "USA",
+  },
+});
+```
+
 ## 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.
+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.
 
 ```js
 const schema = {
@@ -218,7 +331,7 @@ Here are some results:
     59.75x faster than Ajv
 
   Cabidela - benchmarks/80-big-ops.bench.js > allOf, two properties
-    1701.95x faster than Ajv
+   1701.95x faster than Ajv
 
   Cabidela - benchmarks/80-big-ops.bench.js > allOf, two objects
     1307.04x faster than Ajv
@@ -236,17 +349,12 @@ 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, 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
 - Pattern properties
-- `not`
 - `dependentRequired`, `dependentSchemas`, `If-Then-Else`
-- `$ref`, `$defs` and `$id`
 
 yet.
-

package/dist/index.d.mts

@@ -2,6 +2,7 @@ type CabidelaOptions = {
     applyDefaults?: boolean;
     errorMessages?: boolean;
     fullErrors?: boolean;
+    subSchemas?: Array<any>;
 };
 type SchemaNavigation = {
     path: Array<string>;
@@ -9,14 +10,19 @@ type SchemaNavigation = {
     payload: any;
     evaluatedProperties: Set<string>;
     carryProperties?: boolean;
+    deferredApplyDefaults?: boolean;
     absorvErrors?: boolean;
     errors: Set<string>;
+    defaultsCallbacks: Array<any>;
 };
 declare class Cabidela {
-    schema: any;
-    options: CabidelaOptions;
+    private schema;
+    private options;
+    private definitions;
     constructor(schema: any, options?: CabidelaOptions);
     setSchema(schema: any): void;
+    addSchema(subSchema: any, combine?: boolean): void;
+    getSchema(): any;
     setOptions(options: CabidelaOptions): void;
     throw(message: string, needle: SchemaNavigation): void;
     parseAdditionalProperties(needle: SchemaNavigation, contextAdditionalProperties: any, contextEvaluatedProperties: Set<string>): number;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ type CabidelaOptions = {
     applyDefaults?: boolean;
     errorMessages?: boolean;
     fullErrors?: boolean;
+    subSchemas?: Array<any>;
 };
 type SchemaNavigation = {
     path: Array<string>;
@@ -9,14 +10,19 @@ type SchemaNavigation = {
     payload: any;
     evaluatedProperties: Set<string>;
     carryProperties?: boolean;
+    deferredApplyDefaults?: boolean;
     absorvErrors?: boolean;
     errors: Set<string>;
+    defaultsCallbacks: Array<any>;
 };
 declare class Cabidela {
-    schema: any;
-    options: CabidelaOptions;
+    private schema;
+    private options;
+    private definitions;
     constructor(schema: any, options?: CabidelaOptions);
     setSchema(schema: any): void;
+    addSchema(subSchema: any, combine?: boolean): void;
+    getSchema(): any;
     setOptions(options: CabidelaOptions): void;
     throw(message: string, needle: SchemaNavigation): void;
     parseAdditionalProperties(needle: SchemaNavigation, contextAdditionalProperties: any, contextEvaluatedProperties: Set<string>): number;

package/dist/index.js

@@ -25,6 +25,32 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/helpers.ts
+var parse$ref = (ref) => {
+  const parts = ref.split("#");
+  const $id = parts[0];
+  const $path = parts[1].split("/").filter((part) => part !== "");
+  return { $id, $path };
+};
+var traverseSchema = (definitions, obj, cb = () => {
+}) => {
+  Object.keys(obj).forEach((key) => {
+    if (obj[key] !== null && typeof obj[key] === "object") {
+      traverseSchema(definitions, obj[key], (value) => {
+        obj[key] = value;
+      });
+    } else {
+      if (key === "$ref") {
+        const { $id, $path } = parse$ref(obj[key]);
+        const { resolvedObject } = resolvePayload($path, definitions[$id]);
+        if (resolvedObject) {
+          cb(resolvedObject);
+        } else {
+          throw new Error(`Could not resolve '${obj[key]}' $ref`);
+        }
+      }
+    }
+  });
+};
 var resolvePayload = (path, obj) => {
   let resolvedObject = path.reduce(function(prev, curr) {
     return prev ? prev[curr] : void 0;
@@ -32,12 +58,12 @@ var resolvePayload = (path, obj) => {
   return { metadata: getMetaData(resolvedObject), resolvedObject };
 };
 var pathToString = (path) => {
-  return path.length == 0 ? `.` : path.map((item) => typeof item === "number" ? `[${item}]` : `.${item}`).join("");
+  return path.length == 0 ? `/` : path.map((item) => `/${item}`).join("");
 };
 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 +87,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 };
 };
@@ -70,20 +96,50 @@ var getMetaData = (value) => {
 var Cabidela = class {
   schema;
   options;
+  definitions = {};
   constructor(schema, options) {
     this.schema = schema;
     this.options = {
       fullErrors: true,
+      subSchemas: [],
       applyDefaults: false,
       errorMessages: false,
       ...options || {}
     };
+    if (this.schema.hasOwnProperty("$defs")) {
+      this.definitions["$defs"] = this.schema["$defs"];
+      delete this.schema["$defs"];
+    }
+    if (this.options.subSchemas.length > 0) {
+      for (const subSchema of this.options.subSchemas) {
+        this.addSchema(subSchema, false);
+      }
+      traverseSchema(this.definitions, this.schema);
+    }
   }
   setSchema(schema) {
     this.schema = schema;
   }
+  addSchema(subSchema, combine = true) {
+    if (subSchema.hasOwnProperty("$id")) {
+      const url = URL.parse(subSchema["$id"]);
+      if (url) {
+        this.definitions[url.pathname.split("/").slice(-1)[0]] = subSchema;
+      } else {
+        throw new Error(
+          "subSchemas need a valid retrieval URI $id https://json-schema.org/understanding-json-schema/structuring#retrieval-uri"
+        );
+      }
+    } else {
+      throw new Error("subSchemas need $id https://json-schema.org/understanding-json-schema/structuring#id");
+    }
+    if (combine == true) traverseSchema(this.definitions, this.schema);
+  }
+  getSchema() {
+    return this.schema;
+  }
   setOptions(options) {
-    this.options = options;
+    this.options = { ...this.options, ...options };
   }
   throw(message, needle) {
     const error = `${message}${this.options.fullErrors && needle.absorvErrors !== true && needle.errors.size > 0 ? `: ${Array.from(needle.errors).join(", ")}` : ``}`;
@@ -92,7 +148,9 @@ var Cabidela = class {
   parseAdditionalProperties(needle, contextAdditionalProperties, contextEvaluatedProperties) {
     let matchCount = 0;
     const { metadata, resolvedObject } = resolvePayload(needle.path, needle.payload);
-    const unevaluatedProperties = metadata.properties.difference(contextEvaluatedProperties);
+    const unevaluatedProperties = new Set(
+      metadata.properties.map((r) => pathToString([...needle.path, r]))
+    ).difference(contextEvaluatedProperties);
     if (contextAdditionalProperties === false) {
       if (unevaluatedProperties.size > 0) {
         this.throw(
@@ -107,14 +165,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]));
         }
       }
     }
@@ -142,12 +201,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++;
         }
       }
@@ -168,27 +228,37 @@ var Cabidela = class {
       );
     }
     if (needle.schema.hasOwnProperty("required")) {
-      if (new Set(needle.schema.required).difference(needle.evaluatedProperties.union(localEvaluatedProperties)).size > 0) {
-        this.throw(`required properties at '${pathToString(needle.path)}' is '${needle.schema.required}'`, needle);
+      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)}' are '${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
@@ -196,10 +266,25 @@ var Cabidela = class {
     if (needle.schema == void 0) {
       this.throw(`No schema for path '${pathToString(needle.path)}'`, needle);
     }
+    if (needle.schema.hasOwnProperty("not")) {
+      let pass = false;
+      try {
+        this.parseSubSchema({
+          ...needle,
+          schema: needle.schema.not
+        });
+      } catch (e) {
+        pass = true;
+      }
+      if (pass == false) {
+        this.throw(`not at '${pathToString(needle.path)}' not met`, 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;
       }
@@ -270,7 +355,7 @@ var Cabidela = class {
       }
       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
         );
       }
@@ -307,28 +392,44 @@ var Cabidela = class {
             break;
         }
       }
+      if (needle.schema.hasOwnProperty("pattern")) {
+        let passes = false;
+        try {
+          if (new RegExp(needle.schema.pattern).test(resolvedObject)) passes = true;
+        } catch (e) {
+        }
+        if (!passes) this.throw(`'${pathToString(needle.path)}' failed test ${needle.schema.pattern} patttern`, needle);
+      }
       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

@@ -1,4 +1,30 @@
 // src/helpers.ts
+var parse$ref = (ref) => {
+  const parts = ref.split("#");
+  const $id = parts[0];
+  const $path = parts[1].split("/").filter((part) => part !== "");
+  return { $id, $path };
+};
+var traverseSchema = (definitions, obj, cb = () => {
+}) => {
+  Object.keys(obj).forEach((key) => {
+    if (obj[key] !== null && typeof obj[key] === "object") {
+      traverseSchema(definitions, obj[key], (value) => {
+        obj[key] = value;
+      });
+    } else {
+      if (key === "$ref") {
+        const { $id, $path } = parse$ref(obj[key]);
+        const { resolvedObject } = resolvePayload($path, definitions[$id]);
+        if (resolvedObject) {
+          cb(resolvedObject);
+        } else {
+          throw new Error(`Could not resolve '${obj[key]}' $ref`);
+        }
+      }
+    }
+  });
+};
 var resolvePayload = (path, obj) => {
   let resolvedObject = path.reduce(function(prev, curr) {
     return prev ? prev[curr] : void 0;
@@ -6,12 +32,12 @@ var resolvePayload = (path, obj) => {
   return { metadata: getMetaData(resolvedObject), resolvedObject };
 };
 var pathToString = (path) => {
-  return path.length == 0 ? `.` : path.map((item) => typeof item === "number" ? `[${item}]` : `.${item}`).join("");
+  return path.length == 0 ? `/` : path.map((item) => `/${item}`).join("");
 };
 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 +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 };
 };
@@ -44,20 +70,50 @@ var getMetaData = (value) => {
 var Cabidela = class {
   schema;
   options;
+  definitions = {};
   constructor(schema, options) {
     this.schema = schema;
     this.options = {
       fullErrors: true,
+      subSchemas: [],
       applyDefaults: false,
       errorMessages: false,
       ...options || {}
     };
+    if (this.schema.hasOwnProperty("$defs")) {
+      this.definitions["$defs"] = this.schema["$defs"];
+      delete this.schema["$defs"];
+    }
+    if (this.options.subSchemas.length > 0) {
+      for (const subSchema of this.options.subSchemas) {
+        this.addSchema(subSchema, false);
+      }
+      traverseSchema(this.definitions, this.schema);
+    }
   }
   setSchema(schema) {
     this.schema = schema;
   }
+  addSchema(subSchema, combine = true) {
+    if (subSchema.hasOwnProperty("$id")) {
+      const url = URL.parse(subSchema["$id"]);
+      if (url) {
+        this.definitions[url.pathname.split("/").slice(-1)[0]] = subSchema;
+      } else {
+        throw new Error(
+          "subSchemas need a valid retrieval URI $id https://json-schema.org/understanding-json-schema/structuring#retrieval-uri"
+        );
+      }
+    } else {
+      throw new Error("subSchemas need $id https://json-schema.org/understanding-json-schema/structuring#id");
+    }
+    if (combine == true) traverseSchema(this.definitions, this.schema);
+  }
+  getSchema() {
+    return this.schema;
+  }
   setOptions(options) {
-    this.options = options;
+    this.options = { ...this.options, ...options };
   }
   throw(message, needle) {
     const error = `${message}${this.options.fullErrors && needle.absorvErrors !== true && needle.errors.size > 0 ? `: ${Array.from(needle.errors).join(", ")}` : ``}`;
@@ -66,7 +122,9 @@ var Cabidela = class {
   parseAdditionalProperties(needle, contextAdditionalProperties, contextEvaluatedProperties) {
     let matchCount = 0;
     const { metadata, resolvedObject } = resolvePayload(needle.path, needle.payload);
-    const unevaluatedProperties = metadata.properties.difference(contextEvaluatedProperties);
+    const unevaluatedProperties = new Set(
+      metadata.properties.map((r) => pathToString([...needle.path, r]))
+    ).difference(contextEvaluatedProperties);
     if (contextAdditionalProperties === false) {
       if (unevaluatedProperties.size > 0) {
         this.throw(
@@ -81,14 +139,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]));
         }
       }
     }
@@ -116,12 +175,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++;
         }
       }
@@ -142,27 +202,37 @@ var Cabidela = class {
       );
     }
     if (needle.schema.hasOwnProperty("required")) {
-      if (new Set(needle.schema.required).difference(needle.evaluatedProperties.union(localEvaluatedProperties)).size > 0) {
-        this.throw(`required properties at '${pathToString(needle.path)}' is '${needle.schema.required}'`, needle);
+      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)}' are '${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
@@ -170,10 +240,25 @@ var Cabidela = class {
     if (needle.schema == void 0) {
       this.throw(`No schema for path '${pathToString(needle.path)}'`, needle);
     }
+    if (needle.schema.hasOwnProperty("not")) {
+      let pass = false;
+      try {
+        this.parseSubSchema({
+          ...needle,
+          schema: needle.schema.not
+        });
+      } catch (e) {
+        pass = true;
+      }
+      if (pass == false) {
+        this.throw(`not at '${pathToString(needle.path)}' not met`, 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;
       }
@@ -244,7 +329,7 @@ var Cabidela = class {
       }
       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
         );
       }
@@ -281,28 +366,44 @@ var Cabidela = class {
             break;
         }
       }
+      if (needle.schema.hasOwnProperty("pattern")) {
+        let passes = false;
+        try {
+          if (new RegExp(needle.schema.pattern).test(resolvedObject)) passes = true;
+        } catch (e) {
+        }
+        if (!passes) this.throw(`'${pathToString(needle.path)}' failed test ${needle.schema.pattern} patttern`, needle);
+      }
       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.18",
+  "version": "0.1.1",
   "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",