@bedrockio/yada 1.2.3 → 1.2.4

package/dist/cjs/messages.js

@@ -44,9 +44,6 @@ function getInnerPath(error, options) {
   }
 }
 function getLabeledMessage(error, options) {
-  const {
-    type
-  } = error;
   const {
     path = []
   } = options;
@@ -54,8 +51,10 @@ function getLabeledMessage(error, options) {
   let template;
   if (base.includes('{field}')) {
     template = base;
-  } else if (canAutoAddField(type, path)) {
+  } else if (canAutoAddField(path, base)) {
     template = `{field} ${downcase(base)}`;
+  } else {
+    template = error.message;
   }
   if (template) {
     return (0, _localization.localize)(template, {
@@ -65,13 +64,14 @@ function getLabeledMessage(error, options) {
     return (0, _localization.localize)(base);
   }
 }
-const DISALLOWED_TYPES = ['field', 'element', 'array', 'custom'];
+const GENERIC_MESSAGE_REG = /^Must|is required\.?$/;
 
-// Error types that have custom messages should not add the field
-// names automatically. Instead the custom messages can include
-// the {field} token to allow it to be interpolated if required.
-function canAutoAddField(type, path) {
-  return type && path.length && !DISALLOWED_TYPES.includes(type);
+// Only "generic" error messages should automatically add the field.
+// A custom error message may be "Please verify you are human" which
+// is intended to be understood in context and does not benefit from
+// the inclusion of the field name.
+function canAutoAddField(path, base) {
+  return path.length && GENERIC_MESSAGE_REG.test(base);
 }
 function getFieldLabel(options) {
   const {

package/package.json

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

package/src/messages.js

@@ -40,15 +40,16 @@ function getInnerPath(error, options) {
 }
 
 function getLabeledMessage(error, options) {
-  const { type } = error;
   const { path = [] } = options;
   const base = getBase(error.message);
 
   let template;
   if (base.includes('{field}')) {
     template = base;
-  } else if (canAutoAddField(type, path)) {
+  } else if (canAutoAddField(path, base)) {
     template = `{field} ${downcase(base)}`;
+  } else {
+    template = error.message;
   }
 
   if (template) {
@@ -60,13 +61,14 @@ function getLabeledMessage(error, options) {
   }
 }
 
-const DISALLOWED_TYPES = ['field', 'element', 'array', 'custom'];
+const GENERIC_MESSAGE_REG = /^Must|is required\.?$/;
 
-// Error types that have custom messages should not add the field
-// names automatically. Instead the custom messages can include
-// the {field} token to allow it to be interpolated if required.
-function canAutoAddField(type, path) {
-  return type && path.length && !DISALLOWED_TYPES.includes(type);
+// Only "generic" error messages should automatically add the field.
+// A custom error message may be "Please verify you are human" which
+// is intended to be understood in context and does not benefit from
+// the inclusion of the field name.
+function canAutoAddField(path, base) {
+  return path.length && GENERIC_MESSAGE_REG.test(base);
 }
 
 function getFieldLabel(options) {