From 49febc010d05e104f03cd2e4cf28c90b7d94401e Mon Sep 17 00:00:00 2001 From: TonyYang Date: Mon, 24 Oct 2016 21:57:04 +0800 Subject: [PATCH] [validator] Correct import submodule (#11975) * Add submodule definition * Test import submodule * Update validator-tests.ts --- validator/validator-tests.ts | 120 +++++++------- validator/validator.d.ts | 301 ++++++++++++++++++++++++++++++++++- 2 files changed, 359 insertions(+), 62 deletions(-) diff --git a/validator/validator-tests.ts b/validator/validator-tests.ts index a0ee4a4cbf..abe3e41a2d 100644 --- a/validator/validator-tests.ts +++ b/validator/validator-tests.ts @@ -8,67 +8,65 @@ import * as validator from 'validator'; * IMPORT TESTS * * * ************************************************/ -import { - blacklist as blacklistFunc, - contains as containsFunc, - equals as equalsFunc, - escape as escapeFunc, - isAfter as isAfterFunc, - isAlpha as isAlphaFunc, - isAlphanumeric as isAlphanumericFunc, - isAscii as isAsciiFunc, - isBase64 as isBase64Func, - isBefore as isBeforeFunc, - isBoolean as isBooleanFunc, - isByteLength as isByteLengthFunc, - isCreditCard as isCreditCardFunc, - isCurrency as isCurrencyFunc, - isDataURI as isDataURIFunc, - isDate as isDateFunc, - isDecimal as isDecimalFunc, - isDivisibleBy as isDivisibleByFunc, - isEmail as isEmailFunc, - isFQDN as isFQDNFunc, - isFloat as isFloatFunc, - isFullWidth as isFullWidthFunc, - isHalfWidth as isHalfWidthFunc, - isHexColor as isHexColorFunc, - isHexadecimal as isHexadecimalFunc, - isIP as isIPFunc, - isISBN as isISBNFunc, - isISIN as isISINFunc, - isISO8601 as isISO8601Func, - isIn as isInFunc, - isInt as isIntFunc, - isJSON as isJSONFunc, - isLength as isLengthFunc, - isLowercase as isLowercaseFunc, - isMACAddress as isMACAddressFunc, - isMD5 as isMD5Func, - isMobilePhone as isMobilePhoneFunc, - isMongoId as isMongoIdFunc, - isMultibyte as isMultibyteFunc, - isNull as isNullFunc, - isNumeric as isNumericFunc, - isSurrogatePair as isSurrogatePairFunc, - isURL as isURLFunc, - isUUID as isUUIDFunc, - isUppercase as isUppercaseFunc, - isVariableWidth as isVariableWidthFunc, - isWhitelisted as isWhitelistedFunc, - ltrim as ltrimFunc, - matches as matchesFunc, - normalizeEmail as normalizeEmailFunc, - rtrim as rtrimFunc, - stripLow as stripLowFunc, - toBoolean as toBooleanFunc, - toDate as toDateFunc, - toFloat as toFloatFunc, - toInt as toIntFunc, - trim as trimFunc, - unescape as unescapeFunc, - whitelist as whitelistFunc, -} from 'validator' +import blacklistFunc = require('validator/lib/blacklist'); +import containsFunc = require('validator/lib/contains'); +import equalsFunc = require('validator/lib/equals'); +import escapeFunc = require('validator/lib/escape'); +import isAfterFunc = require('validator/lib/isAfter'); +import isAlphaFunc = require('validator/lib/isAlpha'); +import isAlphanumericFunc = require('validator/lib/isAlphanumeric'); +import isAsciiFunc = require('validator/lib/isAscii'); +import isBase64Func = require('validator/lib/isBase64'); +import isBeforeFunc = require('validator/lib/isBefore'); +import isBooleanFunc = require('validator/lib/isBoolean'); +import isByteLengthFunc = require('validator/lib/isByteLength'); +import isCreditCardFunc = require('validator/lib/isCreditCard'); +import isCurrencyFunc = require('validator/lib/isCurrency'); +import isDataURIFunc = require('validator/lib/isDataURI'); +import isDateFunc = require('validator/lib/isDate'); +import isDecimalFunc = require('validator/lib/isDecimal'); +import isDivisibleByFunc = require('validator/lib/isDivisibleBy'); +import isEmailFunc = require('validator/lib/isEmail'); +import isFQDNFunc = require('validator/lib/isFQDN'); +import isFloatFunc = require('validator/lib/isFloat'); +import isFullWidthFunc = require('validator/lib/isFullWidth'); +import isHalfWidthFunc = require('validator/lib/isHalfWidth'); +import isHexColorFunc = require('validator/lib/isHexColor'); +import isHexadecimalFunc = require('validator/lib/isHexadecimal'); +import isIPFunc = require('validator/lib/isIP'); +import isISBNFunc = require('validator/lib/isISBN'); +import isISINFunc = require('validator/lib/isISIN'); +import isISO8601Func = require('validator/lib/isISO8601'); +import isInFunc = require('validator/lib/isIn'); +import isIntFunc = require('validator/lib/isInt'); +import isJSONFunc = require('validator/lib/isJSON'); +import isLengthFunc = require('validator/lib/isLength'); +import isLowercaseFunc = require('validator/lib/isLowercase'); +import isMACAddressFunc = require('validator/lib/isMACAddress'); +import isMD5Func = require('validator/lib/isMD5'); +import isMobilePhoneFunc = require('validator/lib/isMobilePhone'); +import isMongoIdFunc = require('validator/lib/isMongoId'); +import isMultibyteFunc = require('validator/lib/isMultibyte'); +import isNullFunc = require('validator/lib/isNull'); +import isNumericFunc = require('validator/lib/isNumeric'); +import isSurrogatePairFunc = require('validator/lib/isSurrogatePair'); +import isURLFunc = require('validator/lib/isURL'); +import isUUIDFunc = require('validator/lib/isUUID'); +import isUppercaseFunc = require('validator/lib/isUppercase'); +import isVariableWidthFunc = require('validator/lib/isVariableWidth'); +import isWhitelistedFunc = require('validator/lib/isWhitelisted'); +import ltrimFunc = require('validator/lib/ltrim'); +import matchesFunc = require('validator/lib/matches'); +import normalizeEmailFunc = require('validator/lib/normalizeEmail'); +import rtrimFunc = require('validator/lib/rtrim'); +import stripLowFunc = require('validator/lib/stripLow'); +import toBooleanFunc = require('validator/lib/toBoolean'); +import toDateFunc = require('validator/lib/toDate'); +import toFloatFunc = require('validator/lib/toFloat'); +import toIntFunc = require('validator/lib/toInt'); +import trimFunc = require('validator/lib/trim'); +import unescapeFunc = require('validator/lib/unescape'); +import whitelistFunc = require('validator/lib/whitelist'); namespace import_tests { let _blacklist = validator.blacklist; diff --git a/validator/validator.d.ts b/validator/validator.d.ts index 02e8eba732..4cf18650f0 100644 --- a/validator/validator.d.ts +++ b/validator/validator.d.ts @@ -303,11 +303,310 @@ declare namespace ValidatorJS { } } +/** + * MODULES + */ +declare var validator: ValidatorJS.ValidatorStatic; + declare module "validator" { - const validator: ValidatorJS.ValidatorStatic; export = validator; } +declare module "validator/lib/blacklist" { + const blacklist: typeof validator.blacklist; + export = blacklist; +} + +declare module "validator/lib/contains" { + const contains: typeof validator.contains; + export = contains; +} + +declare module "validator/lib/equals" { + const equals: typeof validator.equals; + export = equals; +} + +declare module "validator/lib/escape" { + const escape: typeof validator.escape; + export = escape; +} + +declare module "validator/lib/isAfter" { + const isAfter: typeof validator.isAfter; + export = isAfter; +} + +declare module "validator/lib/isAlpha" { + const isAlpha: typeof validator.isAlpha; + export = isAlpha; +} + +declare module "validator/lib/isAlphanumeric" { + const isAlphanumeric: typeof validator.isAlphanumeric; + export = isAlphanumeric; +} + +declare module "validator/lib/isAscii" { + const isAscii: typeof validator.isAscii; + export = isAscii; +} + +declare module "validator/lib/isBase64" { + const isBase64: typeof validator.isBase64; + export = isBase64; +} + +declare module "validator/lib/isBefore" { + const isBefore: typeof validator.isBefore; + export = isBefore; +} + +declare module "validator/lib/isBoolean" { + const isBoolean: typeof validator.isBoolean; + export = isBoolean; +} + +declare module "validator/lib/isByteLength" { + const isByteLength: typeof validator.isByteLength; + export = isByteLength; +} + +declare module "validator/lib/isCreditCard" { + const isCreditCard: typeof validator.isCreditCard; + export = isCreditCard; +} + +declare module "validator/lib/isCurrency" { + const isCurrency: typeof validator.isCurrency; + export = isCurrency; +} + +declare module "validator/lib/isDataURI" { + const isDataURI: typeof validator.isDataURI; + export = isDataURI; +} + +declare module "validator/lib/isDate" { + const isDate: typeof validator.isDate; + export = isDate; +} + +declare module "validator/lib/isDecimal" { + const isDecimal: typeof validator.isDecimal; + export = isDecimal; +} + +declare module "validator/lib/isDivisibleBy" { + const isDivisibleBy: typeof validator.isDivisibleBy; + export = isDivisibleBy; +} + +declare module "validator/lib/isEmail" { + const isEmail: typeof validator.isEmail; + export = isEmail; +} + +declare module "validator/lib/isFQDN" { + const isFQDN: typeof validator.isFQDN; + export = isFQDN; +} + +declare module "validator/lib/isFloat" { + const isFloat: typeof validator.isFloat; + export = isFloat; +} + +declare module "validator/lib/isFullWidth" { + const isFullWidth: typeof validator.isFullWidth; + export = isFullWidth; +} + +declare module "validator/lib/isHalfWidth" { + const isHalfWidth: typeof validator.isHalfWidth; + export = isHalfWidth; +} + +declare module "validator/lib/isHexColor" { + const isHexColor: typeof validator.isHexColor; + export = isHexColor; +} + +declare module "validator/lib/isHexadecimal" { + const isHexadecimal: typeof validator.isHexadecimal; + export = isHexadecimal; +} + +declare module "validator/lib/isIP" { + const isIP: typeof validator.isIP; + export = isIP; +} + +declare module "validator/lib/isISBN" { + const isISBN: typeof validator.isISBN; + export = isISBN; +} + +declare module "validator/lib/isISIN" { + const isISIN: typeof validator.isISIN; + export = isISIN; +} + +declare module "validator/lib/isISO8601" { + const isISO8601: typeof validator.isISO8601; + export = isISO8601; +} + +declare module "validator/lib/isIn" { + const isIn: typeof validator.isIn; + export = isIn; +} + +declare module "validator/lib/isInt" { + const isInt: typeof validator.isInt; + export = isInt; +} + +declare module "validator/lib/isJSON" { + const isJSON: typeof validator.isJSON; + export = isJSON; +} + +declare module "validator/lib/isLength" { + const isLength: typeof validator.isLength; + export = isLength; +} + +declare module "validator/lib/isLowercase" { + const isLowercase: typeof validator.isLowercase; + export = isLowercase; +} + +declare module "validator/lib/isMACAddress" { + const isMACAddress: typeof validator.isMACAddress; + export = isMACAddress; +} + +declare module "validator/lib/isMD5" { + const isMD5: typeof validator.isMD5; + export = isMD5; +} + +declare module "validator/lib/isMobilePhone" { + const isMobilePhone: typeof validator.isMobilePhone; + export = isMobilePhone; +} + +declare module "validator/lib/isMongoId" { + const isMongoId: typeof validator.isMongoId; + export = isMongoId; +} + +declare module "validator/lib/isMultibyte" { + const isMultibyte: typeof validator.isMultibyte; + export = isMultibyte; +} + +declare module "validator/lib/isNull" { + const isNull: typeof validator.isNull; + export = isNull; +} + +declare module "validator/lib/isNumeric" { + const isNumeric: typeof validator.isNumeric; + export = isNumeric; +} + +declare module "validator/lib/isSurrogatePair" { + const isSurrogatePair: typeof validator.isSurrogatePair; + export = isSurrogatePair; +} + +declare module "validator/lib/isURL" { + const isURL: typeof validator.isURL; + export = isURL; +} + +declare module "validator/lib/isUUID" { + const isUUID: typeof validator.isUUID; + export = isUUID; +} + +declare module "validator/lib/isUppercase" { + const isUppercase: typeof validator.isUppercase; + export = isUppercase; +} + +declare module "validator/lib/isVariableWidth" { + const isVariableWidth: typeof validator.isVariableWidth; + export = isVariableWidth; +} + +declare module "validator/lib/isWhitelisted" { + const isWhitelisted: typeof validator.isWhitelisted; + export = isWhitelisted; +} + +declare module "validator/lib/ltrim" { + const ltrim: typeof validator.ltrim; + export = ltrim; +} + +declare module "validator/lib/matches" { + const matches: typeof validator.matches; + export = matches; +} + +declare module "validator/lib/normalizeEmail" { + const normalizeEmail: typeof validator.normalizeEmail; + export = normalizeEmail; +} + +declare module "validator/lib/rtrim" { + const rtrim: typeof validator.rtrim; + export = rtrim; +} + +declare module "validator/lib/stripLow" { + const stripLow: typeof validator.stripLow; + export = stripLow; +} + +declare module "validator/lib/toBoolean" { + const toBoolean: typeof validator.toBoolean; + export = toBoolean; +} + +declare module "validator/lib/toDate" { + const toDate: typeof validator.toDate; + export = toDate; +} + +declare module "validator/lib/toFloat" { + const toFloat: typeof validator.toFloat; + export = toFloat; +} + +declare module "validator/lib/toInt" { + const toInt: typeof validator.toInt; + export = toInt; +} + +declare module "validator/lib/trim" { + const trim: typeof validator.trim; + export = trim; +} + +declare module "validator/lib/unescape" { + const unescape: typeof validator.unescape; + export = unescape; +} + +declare module "validator/lib/whitelist" { + const whitelist: typeof validator.whitelist; + export = whitelist; +} + // deprecated interfaces for backward compatibility, please use ValidatorJS.* instead the ones interface IValidatorStatic extends ValidatorJS.ValidatorStatic { } interface IURLoptions extends ValidatorJS.IsURLOptions { }