@bedrockio/yada 1.0.34 → 1.0.35

package/dist/cjs/array.js

@@ -47,11 +47,7 @@ class ArraySchema extends _Schema.default {
             options = (0, _utils.omit)(options, 'message');
             result.push(await schema.validate(el, options));
           } catch (error) {
-            if (error.details?.length === 1) {
-              errors.push(new _errors.ElementError(error.details[0].message, i));
-            } else {
-              errors.push(new _errors.ElementError('Element failed validation.', i, error.details));
-            }
+            errors.push(new _errors.ElementError('Element failed validation.', i, error.original, error.details));
           }
         }
         if (errors.length) {

package/dist/cjs/errors.js

@@ -24,11 +24,34 @@ class ValidationError extends Error {
     this.type = type;
   }
   toJSON() {
-    return {
-      type: this.type,
-      message: this.message,
-      details: this.details
-    };
+    if (this.canRollup()) {
+      const [first] = this.details;
+      return {
+        type: this.type,
+        message: first.message
+      };
+    } else {
+      return {
+        type: this.type,
+        message: this.message,
+        details: this.details.map(error => {
+          return error.toJSON();
+        })
+      };
+    }
+  }
+  canRollup() {
+    const {
+      details
+    } = this;
+    if (this.isFieldType() && details.length === 1) {
+      return !details[0].isFieldType?.();
+    } else {
+      return false;
+    }
+  }
+  isFieldType() {
+    return this.type === 'field' || this.type === 'element';
   }
   getFullMessage(options) {
     return (0, _messages.getFullMessage)(this, {
@@ -47,22 +70,23 @@ class FieldError extends ValidationError {
   }
   toJSON() {
     return {
-      field: this.field,
-      ...super.toJSON()
+      ...super.toJSON(),
+      field: this.field
     };
   }
 }
 exports.FieldError = FieldError;
 class ElementError extends ValidationError {
-  constructor(message, index, details) {
+  constructor(message, index, original, details) {
     super(message, details, 'element');
     this.index = index;
+    this.original = original;
     this.details = details;
   }
   toJSON() {
     return {
-      index: this.index,
-      ...super.toJSON()
+      ...super.toJSON(),
+      index: this.index
     };
   }
 }

package/dist/cjs/messages.js

@@ -14,9 +14,8 @@ function getFullMessage(error, options) {
     return error.details.map(error => {
       if ((0, _errors.isSchemaError)(error)) {
         return getFullMessage(error, {
-          field: error.field,
-          index: error.index,
-          ...options
+          ...options,
+          path: getInnerPath(error, options)
         });
       } else {
         return error.message;
@@ -26,34 +25,44 @@ function getFullMessage(error, options) {
     return getLabeledMessage(error, options);
   }
 }
+function getInnerPath(error, options) {
+  const {
+    type
+  } = error;
+  const {
+    path = []
+  } = options;
+  if (type === 'field') {
+    return [...path, error.field];
+  } else if (type === 'element') {
+    return [...path, error.index];
+  } else {
+    return path;
+  }
+}
 function getLabeledMessage(error, options) {
   const {
-    field,
-    index
+    path = []
   } = options;
   const base = getBase(error.message);
-  if (field) {
+  if (path.length) {
     const msg = `{field} ${downcase(base)}`;
     return (0, _localization.localize)(msg, {
-      field: getFieldLabel(field, options)
-    });
-  } else if (index != null) {
-    const msg = `Element at index "{index}" ${downcase(base)}`;
-    return (0, _localization.localize)(msg, {
-      index
+      field: getFieldLabel(options)
     });
   } else {
     return (0, _localization.localize)(base);
   }
 }
-function getFieldLabel(field, options) {
+function getFieldLabel(options) {
   const {
+    path = [],
     natural
   } = options;
   if (natural) {
-    return naturalize(field);
+    return naturalize(path[path.length - 1]);
   } else {
-    return `"${field}"`;
+    return `"${path.join('.')}"`;
   }
 }
 function getBase(str) {

package/dist/cjs/object.js

@@ -90,15 +90,7 @@ class ObjectSchema extends _TypeSchema.default {
               };
             }
           } catch (error) {
-            if (error.details?.length === 1) {
-              const {
-                message,
-                original
-              } = error.details[0];
-              throw new _errors.FieldError(message, key, original);
-            } else {
-              throw new _errors.FieldError('Field failed validation.', key, error.original, error.details);
-            }
+            throw new _errors.FieldError('Field failed validation.', key, error.original, error.details);
           }
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "Validation library inspired by Joi.",
   "scripts": {
     "test": "jest",

package/src/array.js

@@ -38,13 +38,14 @@ class ArraySchema extends Schema {
             options = omit(options, 'message');
             result.push(await schema.validate(el, options));
           } catch (error) {
-            if (error.details?.length === 1) {
-              errors.push(new ElementError(error.details[0].message, i));
-            } else {
-              errors.push(
-                new ElementError('Element failed validation.', i, error.details)
-              );
-            }
+            errors.push(
+              new ElementError(
+                'Element failed validation.',
+                i,
+                error.original,
+                error.details
+              )
+            );
           }
         }
         if (errors.length) {

package/src/errors.js

@@ -20,11 +20,34 @@ export class ValidationError extends Error {
   }
 
   toJSON() {
-    return {
-      type: this.type,
-      message: this.message,
-      details: this.details,
-    };
+    if (this.canRollup()) {
+      const [first] = this.details;
+      return {
+        type: this.type,
+        message: first.message,
+      };
+    } else {
+      return {
+        type: this.type,
+        message: this.message,
+        details: this.details.map((error) => {
+          return error.toJSON();
+        }),
+      };
+    }
+  }
+
+  canRollup() {
+    const { details } = this;
+    if (this.isFieldType() && details.length === 1) {
+      return !details[0].isFieldType?.();
+    } else {
+      return false;
+    }
+  }
+
+  isFieldType() {
+    return this.type === 'field' || this.type === 'element';
   }
 
   getFullMessage(options) {
@@ -45,23 +68,24 @@ export class FieldError extends ValidationError {
 
   toJSON() {
     return {
-      field: this.field,
       ...super.toJSON(),
+      field: this.field,
     };
   }
 }
 
 export class ElementError extends ValidationError {
-  constructor(message, index, details) {
+  constructor(message, index, original, details) {
     super(message, details, 'element');
     this.index = index;
+    this.original = original;
     this.details = details;
   }
 
   toJSON() {
     return {
-      index: this.index,
       ...super.toJSON(),
+      index: this.index,
     };
   }
 }

package/src/messages.js

@@ -8,9 +8,8 @@ export function getFullMessage(error, options) {
       .map((error) => {
         if (isSchemaError(error)) {
           return getFullMessage(error, {
-            field: error.field,
-            index: error.index,
             ...options,
+            path: getInnerPath(error, options),
           });
         } else {
           return error.message;
@@ -22,30 +21,37 @@ export function getFullMessage(error, options) {
   }
 }
 
+function getInnerPath(error, options) {
+  const { type } = error;
+  const { path = [] } = options;
+  if (type === 'field') {
+    return [...path, error.field];
+  } else if (type === 'element') {
+    return [...path, error.index];
+  } else {
+    return path;
+  }
+}
+
 function getLabeledMessage(error, options) {
-  const { field, index } = options;
+  const { path = [] } = options;
   const base = getBase(error.message);
-  if (field) {
+  if (path.length) {
     const msg = `{field} ${downcase(base)}`;
     return localize(msg, {
-      field: getFieldLabel(field, options),
-    });
-  } else if (index != null) {
-    const msg = `Element at index "{index}" ${downcase(base)}`;
-    return localize(msg, {
-      index,
+      field: getFieldLabel(options),
     });
   } else {
     return localize(base);
   }
 }
 
-function getFieldLabel(field, options) {
-  const { natural } = options;
+function getFieldLabel(options) {
+  const { path = [], natural } = options;
   if (natural) {
-    return naturalize(field);
+    return naturalize(path[path.length - 1]);
   } else {
-    return `"${field}"`;
+    return `"${path.join('.')}"`;
   }
 }
 

package/src/object.js

@@ -76,17 +76,12 @@ class ObjectSchema extends TypeSchema {
               };
             }
           } catch (error) {
-            if (error.details?.length === 1) {
-              const { message, original } = error.details[0];
-              throw new FieldError(message, key, original);
-            } else {
-              throw new FieldError(
-                'Field failed validation.',
-                key,
-                error.original,
-                error.details
-              );
-            }
+            throw new FieldError(
+              'Field failed validation.',
+              key,
+              error.original,
+              error.details
+            );
           }
         }
       });

package/types/array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../src/array.js"],"names":[],"mappings":"AA2IA;;;;;;;GAOG;AACH,8CALc,MAAM,iBAUnB;;AApJD;IACE,0BAGC;IAED;;OAEG;IACH,cA2CC;IAED,iCAUC;IAED,8BAUC;IAED,8BAaC;IAED,sBAaC;CA2BF"}
+{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../src/array.js"],"names":[],"mappings":"AA4IA;;;;;;;GAOG;AACH,8CALc,MAAM,iBAUnB;;AArJD;IACE,0BAGC;IAED;;OAEG;IACH,cA4CC;IAED,iCAUC;IAED,8BAUC;IAED,8BAaC;IAED,sBAaC;CA2BF"}

package/types/errors.d.ts

@@ -9,10 +9,16 @@ export class ValidationError extends Error {
     details: any[];
     type: string;
     toJSON(): {
+        type: string;
+        message: any;
+        details?: undefined;
+    } | {
         type: string;
         message: string;
         details: any[];
     };
+    canRollup(): boolean;
+    isFieldType(): boolean;
     getFullMessage(options: any): any;
 }
 export class FieldError extends ValidationError {
@@ -21,21 +27,32 @@ export class FieldError extends ValidationError {
     original: any;
     details: any;
     toJSON(): {
+        field: any;
+        type: string;
+        message: any;
+        details?: undefined;
+    } | {
+        field: any;
         type: string;
         message: string;
         details: any[];
-        field: any;
     };
 }
 export class ElementError extends ValidationError {
-    constructor(message: any, index: any, details: any);
+    constructor(message: any, index: any, original: any, details: any);
     index: any;
+    original: any;
     details: any;
     toJSON(): {
+        index: any;
+        type: string;
+        message: any;
+        details?: undefined;
+    } | {
+        index: any;
         type: string;
         message: string;
         details: any[];
-        index: any;
     };
 }
 export class AssertionError extends Error {

package/types/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.js"],"names":[],"mappings":"AA0FA,iDAMC;AA7FD;IACE,uCAGC;IADC,YAAoB;IAGtB,gBAEC;CACF;AAED;IACE,0DAIC;IAFC,eAAsB;IACtB,aAAgB;IAGlB;;;;MAMC;IAED,kCAKC;CACF;AAED;IACE,mEAKC;IAHC,WAAkB;IAClB,cAAwB;IACxB,aAAsB;IAGxB;;;;;MAKC;CACF;AAED;IACE,oDAIC;IAFC,WAAkB;IAClB,aAAsB;IAGxB;;;;;MAKC;CACF;AAED;IACE,oDAIC;IAFC,UAAgB;IAChB,cAAwB;IAG1B;;;MAKC;CACF;AAED;IACE,wCAGC;IADC,aAAsB;CAEzB"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.js"],"names":[],"mappings":"AAkHA,iDAMC;AArHD;IACE,uCAGC;IADC,YAAoB;IAGtB,gBAEC;CACF;AAED;IACE,0DAIC;IAFC,eAAsB;IACtB,aAAgB;IAGlB;;;;;;;;MAgBC;IAED,qBAOC;IAED,uBAEC;IAED,kCAKC;CACF;AAED;IACE,mEAKC;IAHC,WAAkB;IAClB,cAAwB;IACxB,aAAsB;IAGxB;;;;;;;;;;MAKC;CACF;AAED;IACE,mEAKC;IAHC,WAAkB;IAClB,cAAwB;IACxB,aAAsB;IAGxB;;;;;;;;;;MAKC;CACF;AAED;IACE,oDAIC;IAFC,UAAgB;IAChB,cAAwB;IAG1B;;;MAKC;CACF;AAED;IACE,wCAGC;IADC,aAAsB;CAEzB"}

package/types/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.js"],"names":[],"mappings":"AAGA,8DAmBC"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.js"],"names":[],"mappings":"AAGA,8DAkBC"}

package/types/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AA2MA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAMnB;;;;AA7MD;;GAEG;AAEH;IAUE;;OAEG;IACH,cAqEC;IAED;;OAEG;IACH,kBAEC;IAED;;OAEG;IAEH,YAHW,SAAS,GAAC,MAAM,gBAkC1B;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;CAcF"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AAsMA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAMnB;;;;AAxMD;;GAEG;AAEH;IAUE;;OAEG;IACH,cAgEC;IAED;;OAEG;IACH,kBAEC;IAED;;OAEG;IAEH,YAHW,SAAS,GAAC,MAAM,gBAkC1B;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;CAcF"}