From b01a6389056ee63cb6977dfcd261aecaef652594 Mon Sep 17 00:00:00 2001 From: Joshua DeVinney Date: Thu, 22 Sep 2016 20:11:45 -0500 Subject: [PATCH 1/2] validator's normalizeEmail can return a boolean --- validator/index.d.ts | 2 +- validator/validator-tests.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/validator/index.d.ts b/validator/index.d.ts index 1ec4711828..3da12b5896 100644 --- a/validator/index.d.ts +++ b/validator/index.d.ts @@ -175,7 +175,7 @@ declare namespace ValidatorJS { ltrim(input: any, chars?: string): string; // canonicalize an email address. - normalizeEmail(email: string, options?: NormalizeEmailOptions): string; + normalizeEmail(email: string, options?: NormalizeEmailOptions): string | boolean; // trim characters from the right-side of the input. rtrim(input: any, chars?: string): string; diff --git a/validator/validator-tests.ts b/validator/validator-tests.ts index fca8c87f7e..c491728edf 100644 --- a/validator/validator-tests.ts +++ b/validator/validator-tests.ts @@ -147,8 +147,9 @@ let any: any; result = validator.ltrim('sample', ' '); let normalizeEmailOptions: ValidatorJS.NormalizeEmailOptions; - result = validator.normalizeEmail('sample'); - result = validator.normalizeEmail('sample', normalizeEmailOptions); + let normalizeResult: string | boolean; + normalizeResult = validator.normalizeEmail('sample'); + normalizeResult = validator.normalizeEmail('sample', normalizeEmailOptions); result = validator.rtrim('sample'); result = validator.rtrim('sample', ' '); From bcd0866f023368974e22c3b6a281e431a99141d0 Mon Sep 17 00:00:00 2001 From: Joshua DeVinney Date: Fri, 23 Sep 2016 08:13:24 -0500 Subject: [PATCH 2/2] Switching validator's normalizeEmail function to use literal false instead of boolean --- validator/index.d.ts | 2 +- validator/validator-tests.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/validator/index.d.ts b/validator/index.d.ts index 3da12b5896..efc95ea313 100644 --- a/validator/index.d.ts +++ b/validator/index.d.ts @@ -175,7 +175,7 @@ declare namespace ValidatorJS { ltrim(input: any, chars?: string): string; // canonicalize an email address. - normalizeEmail(email: string, options?: NormalizeEmailOptions): string | boolean; + normalizeEmail(email: string, options?: NormalizeEmailOptions): string | false; // trim characters from the right-side of the input. rtrim(input: any, chars?: string): string; diff --git a/validator/validator-tests.ts b/validator/validator-tests.ts index c491728edf..8702a89d14 100644 --- a/validator/validator-tests.ts +++ b/validator/validator-tests.ts @@ -147,7 +147,7 @@ let any: any; result = validator.ltrim('sample', ' '); let normalizeEmailOptions: ValidatorJS.NormalizeEmailOptions; - let normalizeResult: string | boolean; + let normalizeResult: string | false; normalizeResult = validator.normalizeEmail('sample'); normalizeResult = validator.normalizeEmail('sample', normalizeEmailOptions);