@bedrockio/yada 1.0.9 → 1.0.10

package/dist/cjs/localization.js

@@ -33,7 +33,7 @@ function localize(template, values = {}) {
   }
   templates[template] = message;
   return message.replace(TOKEN_REG, (match, token) => {
-    return values[token];
+    return token in values ? values[token] : match;
   });
 }
 function getLocalizerTemplates() {

package/dist/cjs/messages.js

@@ -33,12 +33,12 @@ function getLabeledMessage(error, options) {
   } = options;
   const base = getBase(error.message);
   if (field) {
-    const msg = `{field} ${base}`;
+    const msg = `{field} ${downcase(base)}`;
     return (0, _localization.localize)(msg, {
       field: getFieldLabel(field, options)
     });
   } else if (index != null) {
-    const msg = `Element at index "{index}" ${base}`;
+    const msg = `Element at index "{index}" ${downcase(base)}`;
     return (0, _localization.localize)(msg, {
       index
     });
@@ -60,7 +60,7 @@ function getBase(str) {
   if (str === 'Value is required.') {
     return 'is required.';
   } else {
-    return downcase(str);
+    return str;
   }
 }
 function naturalize(str) {

package/package.json

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

package/src/localization.js

@@ -29,7 +29,7 @@ export function localize(template, values = {}) {
   templates[template] = message;
 
   return message.replace(TOKEN_REG, (match, token) => {
-    return values[token];
+    return token in values ? values[token] : match;
   });
 }
 

package/src/messages.js

@@ -26,12 +26,12 @@ function getLabeledMessage(error, options) {
   const { field, index } = options;
   const base = getBase(error.message);
   if (field) {
-    const msg = `{field} ${base}`;
+    const msg = `{field} ${downcase(base)}`;
     return localize(msg, {
       field: getFieldLabel(field, options),
     });
   } else if (index != null) {
-    const msg = `Element at index "{index}" ${base}`;
+    const msg = `Element at index "{index}" ${downcase(base)}`;
     return localize(msg, {
       index,
     });
@@ -53,7 +53,7 @@ function getBase(str) {
   if (str === 'Value is required.') {
     return 'is required.';
   } else {
-    return downcase(str);
+    return str;
   }
 }
 

package/test/all.test.js

@@ -1802,6 +1802,19 @@ describe('getFullMessage', () => {
       'Auth code is required. Pass code is required. My token is required.'
     );
   });
+
+  it('should not interpolate tokens that do not exist', async () => {
+    const schema = yd.custom(() => {
+      throw new Error('Must {not} be.');
+    });
+    try {
+      await schema.validate({
+        foo: 'bar',
+      });
+    } catch (error) {
+      expect(error.getFullMessage()).toBe('Must {not} be.');
+    }
+  });
 });
 
 describe('localization', () => {