add label support for nested objects

hapijs · Aug 5, 2018 · e01a087 · e01a087
1 parent d642ece
commit e01a087
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/lib/types/object/index.js b/lib/types/object/index.js
@@ -767,8 +767,8 @@ internals.keysToLabels = function (schema, keys) {
 
     const findLabel = function (key) {
 
-        const matchingChild = children.find((child) => child.key === key);
-        return matchingChild ? matchingChild.schema._getLabel(key) : key;
+        const matchingChild = schema._currentJoi.reach(schema, key);
+        return matchingChild ? matchingChild._getLabel(key) : key;
     };
 
     if (Array.isArray(keys)) {

diff --git a/test/types/object.js b/test/types/object.js
@@ -681,6 +681,29 @@ describe('object', () => {
         ]);
     });
 
+    it('should apply labels with nested objects', () => {
+
+        const schema = Joi.object({
+            a: Joi.number().label('first'),
+            b: Joi.object({ c: Joi.string().label('second'), d: Joi.number() })
+        }).with('a', ['b.c']);
+        const error = schema.validate({ a: 1 , b: { d: 2 } }).error;
+        expect(error).to.be.an.error('"first" missing required peer "second"');
+        expect(error.details).to.equal([{
+            message: '"first" missing required peer "second"',
+            path: ['a'],
+            type: 'object.with',
+            context: {
+                main: 'a',
+                mainWithLabel: 'first',
+                peer: 'b.c',
+                peerWithLabel: 'second',
+                label: 'a',
+                key: 'a'
+            }
+        }]);
+    });
+
     describe('keys()', () => {
 
         it('allows any key', async () => {