joi 17.13.2 → 17.13.4

package/lib/types/alternatives.js

@@ -328,10 +328,13 @@ internals.errors = function (failures, { error, state }) {
         const [type, code] = report.code.split('.');
         if (code !== 'base') {
             complex.push({ type: schema.type, report });
-            continue;
         }
-
-        valids.add(type);
+        else if (report.code === 'object.base') {
+            valids.add(report.local.type);
+        }
+        else {
+            valids.add(type);
+        }
     }
 
     // All errors are base types or valids

package/lib/types/link.js

@@ -29,13 +29,25 @@ module.exports = Any.extend({
         return schema.ref(ref);
     },
 
-    validate(value, { schema, state, prefs }) {
+    validate(value, { schema, state, prefs, error }) {
 
         Assert(schema.$_terms.link, 'Uninitialized link schema');
 
         const linked = internals.generate(schema, value, state, prefs);
         const ref = schema.$_terms.link[0].ref;
-        return linked.$_validate(value, state.nest(linked, `link:${ref.display}:${linked.type}`), prefs);
+
+        try {
+            return linked.$_validate(value, state.nest(linked, `link:${ref.display}:${linked.type}`), prefs);
+        }
+        catch (err) {
+            /* $lab:coverage:off$ */
+            if (!(err instanceof RangeError)) {
+                throw err;
+            }
+            /* $lab:coverage:on$ */
+
+            return { value, errors: error('link.depth') };
+        }
     },
 
     generate(schema, value, state, prefs) {
@@ -88,6 +100,10 @@ module.exports = Any.extend({
         }
     },
 
+    messages: {
+        'link.depth': '{{#label}} exceeds maximum recursion depth supported by the runtime'
+    },
+
     manifest: {
 
         build(obj, desc) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "joi",
     "description": "Object schema validation",
-    "version": "17.13.2",
+    "version": "17.13.4",
     "repository": "git://github.com/hapijs/joi",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",