feat: update to support validator 13.9.0 (#1212)

declarations/validator.d.ts

@@ -5,7 +5,10 @@ declare module 'validator' {
  options?: import('../src/options').ContainsOptions,
  ): boolean;
  export function equals(str: string, comparison: string): boolean;
- export function isAfter(str: string, date?: string): boolean;
+ export function isAfter(
+ str: string,
+ dateOrOptions?: string | import('../src/options').IsAfterOptions,
+ ): boolean;
  export function isAlpha(
  str: string,
  locale?: import('../src/options').AlphaLocale,
@@ -17,7 +20,10 @@ declare module 'validator' {
  options?: import('../src/options').IsAlphanumericOptions,
  ): boolean;
  export function isAscii(str: string): boolean;
- export function isBase32(str: string): boolean;
+ export function isBase32(
+ str: string,
+ options?: import('../src/options').IsBase32Options,
+ ): boolean;
  export function isBase58(str: string): boolean;
  export function isBase64(
  str: string,
@@ -66,7 +72,10 @@ declare module 'validator' {
  export function isIMEI(str: string, options?: import('../src/options').IsIMEIOptions): boolean;
  export function isIP(str: string, version?: import('../src/options').IPVersion): boolean;
  export function isIPRange(str: string, version?: import('../src/options').IPVersion): boolean;
- export function isISBN(str: string, version?: number): boolean;
+ export function isISBN(
+ str: string,
+ versionOrOptions?: number | import('../src/options').IsISBNOptions,
+ ): boolean;
  export function isISSN(str: string, options?: import('../src/options').IsISSNOptions): boolean;
  export function isISIN(str: string): boolean;
  export function isISO8601(
@@ -78,6 +87,7 @@ declare module 'validator' {
  export function isISO4217(str: string): boolean;
  export function isISRC(str: string): boolean;
  export function isIn(str: string, values: readonly any[]): boolean;
+ export function isISO6391(str: string): boolean;
  export function isInt(str: string, options?: import('../src/options').IsIntOptions): boolean;
  export function isJSON(str: string, options?: import('../src/options').IsJSONOptions): boolean;
  export function isJWT(str: string): boolean;
@@ -92,6 +102,7 @@ declare module 'validator' {
  ): boolean;
  export function isLocale(str: string): boolean;
  export function isLowercase(str: string): boolean;
+ export function isLuhnNumber(str: string): boolean;
  export function isMagnetURI(str: string): boolean;
  export function isMACAddress(
  str: string,
@@ -132,6 +143,7 @@ declare module 'validator' {
  ): boolean;
  export function isSurrogatePair(str: string): boolean;
  export function isTaxID(str: string, locale: import('../src/options').TaxIDLocale): boolean;
+ export function isTime(str: string, options?: import('../src/options').IsTimeOptions): boolean;
  export function isURL(str: string, options?: import('../src/options').IsURLOptions): boolean;
  export function isUUID(str: string, version?: import('../src/options').UUIDVersion): boolean;
  export function isUppercase(str: string): boolean;

package.json

@@ -7,7 +7,7 @@
  "Gustavo Henke <[email protected]>",
  "Federico Ciardi <[email protected]>"
  ],
- "version": "6.14.3",
+ "version": "6.15.0",
  "homepage": "https://express-validator.github.io",
  "license": "MIT",
  "repository": {
@@ -44,7 +44,7 @@
  },
  "dependencies": {
  "lodash": "^4.17.21",
- "validator": "^13.7.0"
+ "validator": "^13.9.0"
  },
  "devDependencies": {
  "@docusaurus/core": "^2.2.0",

src/chain/sanitizers-impl.spec.ts

@@ -17,7 +17,7 @@ beforeEach(() => {
  sanitizers = new SanitizersImpl(builder, chain);
 });
 
-it('has methods for all standard validators', () => {
+it('has methods for all standard sanitizers', () => {
  // Cast is here to workaround the lack of index signature
  const validatorModule = validator as any;
 

src/chain/validators-impl.ts

@@ -86,8 +86,8 @@ export class ValidatorsImpl<Chain> implements Validators<Chain> {
  equals(comparison: string) {
  return this.addStandardValidation(validator.equals, comparison);
  }
- isAfter(date?: string) {
- return this.addStandardValidation(validator.isAfter, date);
+ isAfter(dateOrOptions?: string | Options.IsAfterOptions) {
+ return this.addStandardValidation(validator.isAfter, dateOrOptions);
  }
  isAlpha(locale?: Options.AlphaLocale, options?: Options.IsAlphaOptions) {
  // TODO(v7): remove string[] support
@@ -100,8 +100,8 @@ export class ValidatorsImpl<Chain> implements Validators<Chain> {
  isAscii() {
  return this.addStandardValidation(validator.isAscii);
  }
- isBase32() {
- return this.addStandardValidation(validator.isBase32);
+ isBase32(options?: Options.IsBase32Options) {
+ return this.addStandardValidation(validator.isBase32, options);
  }
  isBase58() {
  return this.addStandardValidation(validator.isBase58);
@@ -203,15 +203,18 @@ export class ValidatorsImpl<Chain> implements Validators<Chain> {
  isIPRange(version?: Options.IPVersion) {
  return this.addStandardValidation(validator.isIPRange, version);
  }
- isISBN(version?: number) {
- return this.addStandardValidation(validator.isISBN, version);
+ isISBN(versionOrOptions?: number | Options.IsISBNOptions) {
+ return this.addStandardValidation(validator.isISBN, versionOrOptions);
  }
  isISSN(options?: Options.IsISSNOptions) {
  return this.addStandardValidation(validator.isISSN, options);
  }
  isISIN() {
  return this.addStandardValidation(validator.isISIN);
  }
+ isISO6391() {
+ return this.addStandardValidation(validator.isISO6391);
+ }
  isISO8601(options?: Options.IsISO8601Options) {
  return this.addStandardValidation(validator.isISO8601, options);
  }
@@ -254,6 +257,9 @@ export class ValidatorsImpl<Chain> implements Validators<Chain> {
  isLowercase() {
  return this.addStandardValidation(validator.isLowercase);
  }
+ isLuhnNumber() {
+ return this.addStandardValidation(validator.isLuhnNumber);
+ }
  isMagnetURI() {
  return this.addStandardValidation(validator.isMagnetURI);
  }
@@ -314,6 +320,9 @@ export class ValidatorsImpl<Chain> implements Validators<Chain> {
  isTaxID(locale: Options.TaxIDLocale) {
  return this.addStandardValidation(validator.isTaxID, locale);
  }
+ isTime(options?: Options.IsTimeOptions) {
+ return this.addStandardValidation(validator.isTime, options);
+ }
  isURL(options?: Options.IsURLOptions) {
  return this.addStandardValidation(validator.isURL, options);
  }

src/chain/validators.ts

@@ -80,22 +80,22 @@ export interface Validators<Return> {
  // validator's validators
  contains(elem: any, options?: Options.ContainsOptions): Return;
  equals(comparison: string): Return;
- isAfter(date?: string): Return;
+ isAfter(dateOrOptions?: string | Options.IsAfterOptions): Return;
  isAlpha(locale?: Options.AlphaLocale, options?: Options.IsAlphaOptions): Return;
  isAlphanumeric(
  locale?: Options.AlphanumericLocale,
  options?: Options.IsAlphanumericOptions,
  ): Return;
  isAscii(): Return;
- isBase32(): Return;
+ isBase32(options?: Options.IsBase32Options): Return;
  isBase58(): Return;
  isBase64(options?: Options.IsBase64Options): Return;
  isBefore(date?: string): Return;
  isBIC(): Return;
  isBoolean(options?: Options.IsBooleanOptions): Return;
  isBtcAddress(): Return;
  isByteLength(options: Options.MinMaxExtendedOptions): Return;
- isCreditCard(): Return;
+ isCreditCard(options?: Options.IsCreditCard): Return;
  isCurrency(options?: Options.IsCurrencyOptions): Return;
  isDataURI(): Return;
  isDate(options?: Options.IsDateOptions): Return;
@@ -118,9 +118,10 @@ export interface Validators<Return> {
  isIMEI(options?: Options.IsIMEIOptions): Return;
  isIP(version?: Options.IPVersion): Return;
  isIPRange(version?: Options.IPVersion): Return;
- isISBN(version?: number): Return;
+ isISBN(versionOrOptions?: number | Options.IsISBNOptions): Return;
  isISSN(options?: Options.IsISSNOptions): Return;
  isISIN(): Return;
+ isISO6391(): Return;
  isISO8601(options?: Options.IsISO8601Options): Return;
  isISO31661Alpha2(): Return;
  isISO31661Alpha3(): Return;
@@ -135,6 +136,7 @@ export interface Validators<Return> {
  isLicensePlate(locale: Options.IsLicensePlateLocale): Return;
  isLocale(): Return;
  isLowercase(): Return;
+ isLuhnNumber(): Return;
  isMagnetURI(): Return;
  isMACAddress(options?: Options.IsMACAddressOptions): Return;
  isMD5(): Return;
@@ -157,6 +159,7 @@ export interface Validators<Return> {
  isStrongPassword(options?: Options.IsStrongPasswordOptions): Return;
  isSurrogatePair(): Return;
  isTaxID(locale: Options.TaxIDLocale): Return;
+ isTime(options: Options.IsTimeOptions): Return;
  isURL(options?: Options.IsURLOptions): Return;
  isUUID(version?: Options.UUIDVersion): Return;
  isUppercase(): Return;