From 4f1d8ddc52f3f2f20e45232b7606aef4c164f745 Mon Sep 17 00:00:00 2001
From: Young Rok Kim <rok0810@gmail.com>
Date: Mon, 21 Aug 2017 01:30:17 +0900
Subject: [PATCH] joi: correct argument of Joi.object()

---
 types/joi/index.d.ts   |  2 +-
 types/joi/joi-tests.ts | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index c37e1602d5..d46025b27c 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -917,7 +917,7 @@ export function number(): NumberSchema;
 /**
  * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
  */
-export function object(schema?: SchemaLike): ObjectSchema;
+export function object(schema?: SchemaMap): ObjectSchema;
 
 /**
  * Generates a schema object that matches a string data type. Note that empty strings are not allowed by default and must be enabled with allow('').
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index 45882d2180..4543ccc4d4 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -25,6 +25,7 @@ var funcArr: Function[] = [];
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 var schema: Joi.Schema = null;
+var schemaLike: Joi.SchemaLike = null;
 
 var anySchema: Joi.AnySchema<Joi.Schema> = null;
 var numSchema: Joi.NumberSchema = null;
@@ -117,6 +118,7 @@ var whenOpts: Joi.WhenOptions = null;
 whenOpts = { is: x };
 whenOpts = { is: schema, then: schema };
 whenOpts = { is: schema, otherwise: schema };
+whenOpts = { is: schemaLike, then: schemaLike, otherwise: schemaLike };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
@@ -195,7 +197,8 @@ schemaMap = {
         { b1: strSchema },
         { b2: anySchema }
     ],
-    c: arrSchema
+    c: arrSchema,
+    d: schemaLike
 };
 schemaMap = {
     a: 1,
@@ -283,9 +286,9 @@ arrSchema = arrSchema.sparse(bool);
 arrSchema = arrSchema.single();
 arrSchema = arrSchema.single(bool);
 arrSchema = arrSchema.ordered(anySchema);
-arrSchema = arrSchema.ordered(anySchema, numSchema, strSchema, arrSchema, boolSchema, binSchema, dateSchema, funcSchema, objSchema);
+arrSchema = arrSchema.ordered(anySchema, numSchema, strSchema, arrSchema, boolSchema, binSchema, dateSchema, funcSchema, objSchema, schemaLike);
 arrSchema = arrSchema.ordered(schemaMap);
-arrSchema = arrSchema.ordered([schemaMap, schemaMap]);
+arrSchema = arrSchema.ordered([schemaMap, schemaMap, schemaLike]);
 arrSchema = arrSchema.min(num);
 arrSchema = arrSchema.max(num);
 arrSchema = arrSchema.length(num);
@@ -295,11 +298,11 @@ arrSchema = arrSchema.unique('customer.id');
 
 
 arrSchema = arrSchema.items(numSchema);
-arrSchema = arrSchema.items(numSchema, strSchema);
-arrSchema = arrSchema.items([numSchema, strSchema]);
+arrSchema = arrSchema.items(numSchema, strSchema, schemaLike);
+arrSchema = arrSchema.items([numSchema, strSchema, schemaLike]);
 arrSchema = arrSchema.items(schemaMap);
-arrSchema = arrSchema.items(schemaMap, schemaMap);
-arrSchema = arrSchema.items([schemaMap, schemaMap]);
+arrSchema = arrSchema.items(schemaMap, schemaMap, schemaLike);
+arrSchema = arrSchema.items([schemaMap, schemaMap, schemaLike]);
 
 // - - - - - - - -
 
@@ -636,6 +639,7 @@ objSchema = objSchema.max(num);
 objSchema = objSchema.length(num);
 
 objSchema = objSchema.pattern(exp, schema);
+objSchema = objSchema.pattern(exp, schemaLike);
 
 objSchema = objSchema.and(str);
 objSchema = objSchema.and(str, str);
@@ -899,10 +903,12 @@ schema = Joi.compile(schemaMap);
 Joi.assert(obj, schema);
 Joi.assert(obj, schema, str);
 Joi.assert(obj, schema, err);
+Joi.assert(obj, schemaLike);
 
 Joi.attempt(obj, schema);
 Joi.attempt(obj, schema, str);
 Joi.attempt(obj, schema, err);
+Joi.attempt(obj, schemaLike);
 
 ref = Joi.ref(str, refOpts);
 ref = Joi.ref(str);
@@ -946,4 +952,3 @@ const Joi3 = Joi.extend({
         },
     ],
 });
-