adapt-schemas 2.0.0 → 2.1.0

package/lib/Schema.js

@@ -302,10 +302,10 @@ class Schema extends EventEmitter {
     const errors = compiled.errors && compiled.errors
       .filter(e => e.keyword === 'required' ? !opts.ignoreRequired : true)
       .map(e => e.instancePath ? `${e.instancePath} ${e.message}` : e.message)
-      .reduce((s, e) => `${s}${e}, `, '')
+      .join(', ')
 
     if (errors?.length) {
-      throw new SchemaError('VALIDATION_FAILED', `Validation failed for schema: ${this.name}`, {
+      throw new SchemaError('VALIDATION_FAILED', `Validation failed for schema: ${this.name} with errors: ${errors}`, {
         schemaName: this.name,
         errors,
         data
@@ -379,22 +379,22 @@ class Schema extends EventEmitter {
    * @param {Function} predicate - `(schemaField) => boolean`
    * @param {Object} [schema] - Internal: schema properties to walk (defaults to built.properties)
    * @param {string} [parentPath=''] - Internal: the slash-delimited path accumulated so far
-   * @returns {Array<Object>} Array of `{ path, key, data, value }` matches
+   * @returns {Array<Object>} Array of `{ path, key, data, value, schemaField }` matches
    */
   walk (data, predicate, schema, parentPath = '') {
     schema = schema ?? this.built.properties
     const matches = []
-    for (const [key, val] of Object.entries(schema)) {
+    for (const [key, schemaField] of Object.entries(schema)) {
       if (data[key] === undefined) continue
       const currentPath = parentPath ? `${parentPath}/${key}` : key
-      if (val.properties) {
-        matches.push(...this.walk(data[key], predicate, val.properties, currentPath))
-      } else if (val?.items?.properties) {
+      if (schemaField.properties) {
+        matches.push(...this.walk(data[key], predicate, schemaField.properties, currentPath))
+      } else if (schemaField?.items?.properties) {
         data[key].forEach((item, i) => {
-          matches.push(...this.walk(item, predicate, val.items.properties, `${currentPath}/${i}`))
+          matches.push(...this.walk(item, predicate, schemaField.items.properties, `${currentPath}/${i}`))
         })
-      } else if (predicate(val)) {
-        matches.push({ path: currentPath, key, data, value: data[key] })
+      } else if (predicate(schemaField)) {
+        matches.push({ path: currentPath, key, data, value: data[key], schemaField })
       }
     }
     return matches

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/cgkineo/adapt-schemas"
   },
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Standalone JSON Schema library for the Adapt framework",
   "type": "module",
   "main": "index.js",