@bedrockio/yada 1.0.9 → 1.0.11

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/dist/cjs/object.js

@@ -57,7 +57,10 @@ class ObjectSchema extends _TypeSchema.default {
             return;
           }
           try {
-            const result = await schema.validate(val, options);
+            const result = await schema.validate(val, {
+              ...options,
+              key
+            });
             if (result !== undefined) {
               return {
                 ...obj,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "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/src/object.js

@@ -47,7 +47,10 @@ class ObjectSchema extends TypeSchema {
           }
 
           try {
-            const result = await schema.validate(val, options);
+            const result = await schema.validate(val, {
+              ...options,
+              key,
+            });
             if (result !== undefined) {
               return {
                 ...obj,

package/test/all.test.js

@@ -1640,7 +1640,7 @@ describe('other', () => {
   it('should have access to root object', async () => {
     const schema = yd.object({
       a: yd.array(yd.number()),
-      b: yd.number().custom((arr, { root }) => {
+      b: yd.number().custom((num, { root }) => {
         if (!root.a.includes(root.b)) {
           throw new Error('"a" must include "b"');
         }
@@ -1650,6 +1650,15 @@ describe('other', () => {
     await assertFail(schema, { a: [1, 2, 3], b: 4 }, ['"a" must include "b"']);
   });
 
+  it('should have access to current key', async () => {
+    const schema = yd.object({
+      a: yd.number().custom((num, { key }) => {
+        return key;
+      }),
+    });
+    expect(await schema.validate({ a: 12 })).toEqual({ a: 'a' });
+  });
+
   it('should correctly validate chained formats', async () => {
     let schema;
 
@@ -1802,6 +1811,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', () => {