From bbcb50a4e160d9f72ce8aa2d0cf21b40062a78ea Mon Sep 17 00:00:00 2001 From: Alexander James Phillips Date: Thu, 18 May 2017 10:49:57 +0100 Subject: [PATCH] Update hapi route validate to allow joi Schema SchemaMap or array of those --- types/hapi/index.d.ts | 6 ++++-- types/hapi/test/route/validate.ts | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts index 644237f817..26b54b0ace 100644 --- a/types/hapi/index.d.ts +++ b/types/hapi/index.d.ts @@ -35,9 +35,11 @@ import domain = require("domain"); import * as Boom from 'boom'; import { ValidationOptions as JoiValidationOptions, - // TODO check JoiValidationObject is correct for "a Joi validation object" - SchemaMap as JoiValidationObject, + SchemaMap as JoiSchemaMap, + Schema as JoiSchema, } from 'joi'; +// TODO check JoiValidationObject is correct for "a Joi validation object" +type JoiValidationObject = JoiSchema | JoiSchemaMap | (JoiSchema | JoiSchemaMap)[]; import * as Catbox from 'catbox'; import {MimosOptions} from 'mimos'; diff --git a/types/hapi/test/route/validate.ts b/types/hapi/test/route/validate.ts index 47abc77a96..f160641016 100644 --- a/types/hapi/test/route/validate.ts +++ b/types/hapi/test/route/validate.ts @@ -9,10 +9,11 @@ const validate: Hapi.RouteValidationConfigurationObject = { params: { id: Joi.string(), }, + payload: Joi.object().required(), query: { providerId: Joi.string(), }, -} +}; const config: Hapi.RouteAdditionalConfigurationOptions = { validate,