diff --git a/src/types.ts b/src/types.ts index 93ef3c9..6ea616d 100644 --- a/src/types.ts +++ b/src/types.ts @@ -947,12 +947,12 @@ export interface Rules { * Value must be valid as per uuid format. Optionally you can * define a uuid version */ - uuid(options?: { version?: validatorJs.default.UUIDVersion }): Rule + uuid(options?: { version?: validatorJs.UUIDVersion }): Rule /** * Value must pass the mobile regex rule */ - mobile(options?: { strict?: boolean; locale?: validatorJs.default.MobilePhoneLocale[] }): Rule + mobile(options?: { strict?: boolean; locale?: validatorJs.MobilePhoneLocale[] }): Rule /** * Length of string or array must be below or same as the defined length diff --git a/src/validations/string/email.ts b/src/validations/string/email.ts index 676bba0..53205bd 100644 --- a/src/validations/string/email.ts +++ b/src/validations/string/email.ts @@ -19,8 +19,8 @@ const DEFAULT_MESSAGE = 'email validation failed' * Shape of compiled options. It is a merged copy of * sanitization and validation options */ -type CompiledOptions = validatorJs.default.IsEmailOptions & { - sanitize?: validatorJs.default.NormalizeEmailOptions +type CompiledOptions = validatorJs.IsEmailOptions & { + sanitize?: validatorJs.NormalizeEmailOptions } /** diff --git a/src/validations/string/mobile.ts b/src/validations/string/mobile.ts index 157d6b7..fc52c12 100644 --- a/src/validations/string/mobile.ts +++ b/src/validations/string/mobile.ts @@ -20,7 +20,7 @@ const DEFAULT_MESSAGE = 'mobile validation failed' */ export const mobile: SyncValidation<{ strict: boolean - locale?: validatorJs.default.MobilePhoneLocale[] + locale?: validatorJs.MobilePhoneLocale[] }> = { compile: wrapCompile(RULE_NAME, ['string'], ([options]) => { options = Object.assign({}, options) diff --git a/src/validations/string/normalize_email.ts b/src/validations/string/normalize_email.ts index 22b1944..3b5a9e7 100644 --- a/src/validations/string/normalize_email.ts +++ b/src/validations/string/normalize_email.ts @@ -18,7 +18,7 @@ const RULE_NAME = 'normalizeEmail' /** * Normalize email address */ -export const normalizeEmail: SyncValidation = { +export const normalizeEmail: SyncValidation = { compile: wrapCompile(RULE_NAME, ['string'], (args) => { const options = Object.assign({}, args[0]) as EmailNormalizationOptions @@ -26,10 +26,10 @@ export const normalizeEmail: SyncValidation { const validatorKey = string.snakeCase( key - ) as keyof validatorJs.default.NormalizeEmailOptions + ) as keyof validatorJs.NormalizeEmailOptions result[validatorKey] = options[key as keyof EmailNormalizationOptions] return result - }, {} as validatorJs.default.NormalizeEmailOptions), + }, {} as validatorJs.NormalizeEmailOptions), } }), validate(value, compiledOptions, { mutate }) { diff --git a/src/validations/string/url.ts b/src/validations/string/url.ts index 96c2dfe..6b22856 100644 --- a/src/validations/string/url.ts +++ b/src/validations/string/url.ts @@ -24,7 +24,7 @@ type CompiledOptions = { normalizeProtocol?: boolean stripWWW?: boolean } - validationOptions: validatorJs.default.IsURLOptions + validationOptions: validatorJs.IsURLOptions } /** diff --git a/src/validations/string/uuid.ts b/src/validations/string/uuid.ts index 9be307c..8e125bb 100644 --- a/src/validations/string/uuid.ts +++ b/src/validations/string/uuid.ts @@ -19,7 +19,7 @@ const RULE_NAME = 'uuid' * Validation signature for the "uuid" rule. Non-string values are * ignored. */ -export const uuid: SyncValidation<{ version?: validatorJs.default.UUIDVersion }> = { +export const uuid: SyncValidation<{ version?: validatorJs.UUIDVersion }> = { compile: wrapCompile(RULE_NAME, ['string'], ([options]) => { return { compiledOptions: { diff --git a/tests/validations/mobile.spec.ts b/tests/validations/mobile.spec.ts index 0bdbb71..59c7378 100644 --- a/tests/validations/mobile.spec.ts +++ b/tests/validations/mobile.spec.ts @@ -16,7 +16,7 @@ import { MessagesBag } from '../../src/messages_bag/index.js' import { ApiErrorReporter } from '../../src/error_reporter/index.js' import { mobile } from '../../src/validations/string/mobile.js' -function compile(options?: { strict?: boolean; locale?: validator.default.MobilePhoneLocale[] }) { +function compile(options?: { strict?: boolean; locale?: validator.MobilePhoneLocale[] }) { return mobile.compile('literal', 'string', rules.mobile(options).options, {}) } diff --git a/tests/validations/uuid.spec.ts b/tests/validations/uuid.spec.ts index 3e14ce3..931c22e 100644 --- a/tests/validations/uuid.spec.ts +++ b/tests/validations/uuid.spec.ts @@ -8,7 +8,7 @@ */ import { test } from '@japa/runner' -import { UUIDVersion } from 'class-validator' +import { UUIDVersion } from 'validator' import { rules } from '../../src/rules/index.js' import { validate } from '../fixtures/rules/index.js'