types: support strict alternatives

hapijs · Sep 22, 2022 · 78ed862 · 78ed862
1 parent 7c9ca86
commit 78ed862
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -740,8 +740,13 @@ declare namespace Joi {
 
     type NullableType<T> = undefined | null | T
 
+    type IsUnion<T, U extends T = T> =
+      T extends unknown ? [U] extends [T] ? false : true : false;
+
     type ObjectPropertiesSchema<T = any> =
-        T extends NullableType<string>
+        true extends IsUnion<Exclude<T, undefined | null>>
+        ? Joi.AlternativesSchema
+        : T extends NullableType<string>
         ? Joi.StringSchema
         : T extends NullableType<number>
         ? Joi.NumberSchema

diff --git a/test/index.ts b/test/index.ts
@@ -1284,6 +1284,16 @@ const commentSchemaObject2 = Joi.object<Comment2, true>({
     }
 })
 
+interface CommentWithAlternatives {
+    text: string;
+    user: string | User;
+}
+
+const commentWithAlternativesSchemaObject = Joi.object<CommentWithAlternatives, true>({
+    text: Joi.string().required(),
+    user: Joi.alternatives(Joi.string(), userSchemaObject),
+});
+
 expect.error(userSchema2.keys({ height: Joi.number() }));
 
 expect.error(Joi.string('x'));