Remove IsURLOptions

santutu · Nov 4, 2018 · 8faf2fc · 8faf2fc
1 parent 972ca4b
commit 8faf2fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/src/decorator/decorators.ts b/src/decorator/decorators.ts
@@ -1,5 +1,5 @@
 import {ValidationTypes} from "../validation/ValidationTypes";
-import {IsEmailOptions, IsURLOptions, IsNumberOptions} from "../validation/ValidationTypeOptions";
+import {IsEmailOptions, IsNumberOptions} from "../validation/ValidationTypeOptions";
 import {ValidationOptions} from "./ValidationOptions";
 import {ValidationMetadata} from "../metadata/ValidationMetadata";
 import {ValidationMetadataArgs} from "../metadata/ValidationMetadataArgs";
@@ -927,7 +927,7 @@ export function IsSurrogatePair(validationOptions?: ValidationOptions) {
 /**
  * Checks if the string is an url.
  */
-export function IsUrl(options?: IsURLOptions, validationOptions?: ValidationOptions) {
+export function IsUrl(options?: ValidatorJS.IsURLOptions, validationOptions?: ValidationOptions) {
     return function (object: Object, propertyName: string) {
         const args: ValidationMetadataArgs = {
             type: ValidationTypes.IS_URL,

diff --git a/src/validation/ValidationTypeOptions.ts b/src/validation/ValidationTypeOptions.ts
@@ -6,21 +6,6 @@ export interface IsNumberOptions {
     allowInfinity?: boolean;
 }
 
-/**
- * Options to be passed to IsURL decorator.
- */
-export interface IsURLOptions {
-    protocols?: string[];
-    require_tld?: boolean;
-    require_protocol?: boolean;
-    require_valid_protocol?: boolean;
-    allow_underscores?: boolean;
-    host_whitelist?: false | (string | RegExp)[];
-    host_blacklist?: false | (string | RegExp)[];
-    allow_trailing_dot?: boolean;
-    allow_protocol_relative_urls?: boolean;
-}
-
 /**
  * Options to be passed to isEmail decorator.
  */

diff --git a/src/validation/Validator.ts b/src/validation/Validator.ts
@@ -1,7 +1,7 @@
 import {ValidationMetadata} from "../metadata/ValidationMetadata";
 import {ValidationTypes} from "./ValidationTypes";
 import {ValidationError} from "./ValidationError";
-import {IsEmailOptions, IsURLOptions, IsNumberOptions} from "./ValidationTypeOptions";
+import {IsEmailOptions, IsNumberOptions} from "./ValidationTypeOptions";
 import {ValidatorOptions} from "./ValidatorOptions";
 import {ValidationExecutor} from "./ValidationExecutor";
 import {ValidationOptions} from "../decorator/ValidationOptions";
@@ -696,7 +696,7 @@ export class Validator {
      * Checks if the string is an url.
      * If given value is not a string, then it returns false.
      */
-    isURL(value: string, options?: IsURLOptions): boolean {
+    isURL(value: string, options?: ValidatorJS.IsURLOptions): boolean {
         return typeof value === "string" && this.validatorJs.isURL(value, options);
     }