From 1bbfc55470ff1e98574644be57e40c925080c92a Mon Sep 17 00:00:00 2001 From: Andrei Kazakou Date: Thu, 21 Feb 2019 17:29:06 +0300 Subject: [PATCH] icebob/fastest-validator#64 issue fixes --- index.d.ts | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/index.d.ts b/index.d.ts index 4f273e7..9bb030a 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,6 +1,6 @@ /** type declaration for fastest-validator */ -declare interface ValidationRuleObject { +interface ValidationRuleObject { type: string; optional?: boolean; empty?: boolean; @@ -23,17 +23,17 @@ declare interface ValidationRuleObject { convert?: boolean; items?: string; props?: ValidationSchema; - check?: (value: any, schema: ValidationSchema) => boolean | ValidationResult; + check?: (value: any, schema: ValidationSchema) => true | ValidationResult; } -declare type ValidationRule = ValidationRuleObject | ValidationRuleObject[] | string; +type ValidationRule = ValidationRuleObject | ValidationRuleObject[] | string; -declare interface ValidationSchema { +interface ValidationSchema { [key: string]: ValidationRule; } -declare interface ValidationError { +interface ValidationError { type: string; field: string; message: string; @@ -41,21 +41,28 @@ declare interface ValidationError { actual?: any; } -declare type ValidationResult = ValidationError[]; -declare type ValidationObject = { [key: string]: any }; +type ValidationResult = ValidationError[]; +type ValidationObject = { [key: string]: any }; -declare class Validator { +class Validator { constructor(opts?: any); add(type: string, fn: any): void; makeError(type: string, expected: any, actual: any): ValidationResult; - compile(schema: ValidationSchema): (object: ValidationObject) => boolean | ValidationResult; + compile(schema: ValidationSchema | ValidationSchema[]): (object: ValidationObject) => boolean | ValidationResult; validate(obj: ValidationObject, schema: ValidationSchema): boolean | ValidationResult; } -declare module "fastest-validator" { - export = Validator; +export { + ValidationRuleObject, + ValidationRule, + ValidationSchema, + ValidationError, + ValidationResult, + ValidationObject, } + +export = Validator