fix: types

glennmichael123 · glennmichael123 · commit 02c2d51d2378 · 2025-07-01T23:44:06.000+08:00
diff --git a/src/types/array.ts b/src/types/array.ts
@@ -1,7 +1,6 @@
-import type { ArrayValidator } from '../validators/arrays'
 import type { LengthValidator, Validator } from './base'
 
-export interface ArrayValidatorType<T> extends Validator<T[]>, LengthValidator<ArrayValidator<T>> {
-  each: (validator: Validator<T>) => ArrayValidator<T>
-  unique: () => ArrayValidator<T>
+export interface ArrayValidatorType<T> extends Validator<T[]>, LengthValidator<ArrayValidatorType<T>> {
+  each: (validator: Validator<T>) => ArrayValidatorType<T>
+  unique: () => ArrayValidatorType<T>
 }
diff --git a/src/types/binary.ts b/src/types/binary.ts
@@ -1,6 +1,5 @@
-import type { BinaryValidator } from '../validators/binary'
 import type { LengthValidator, Validator } from './base'
 
-export interface BinaryValidatorType extends Validator<string>, LengthValidator<BinaryValidator> {
-  custom: (fn: (value: string) => boolean, message: string) => BinaryValidator
+export interface BinaryValidatorType extends Validator<string>, LengthValidator<BinaryValidatorType> {
+  custom: (fn: (value: string) => boolean, message: string) => BinaryValidatorType
 }
diff --git a/src/types/blob.ts b/src/types/blob.ts
@@ -1,6 +1,5 @@
-import type { BlobValidator } from '../validators/blob'
 import type { LengthValidator, Validator } from './base'
 
-export interface BlobValidatorType extends Validator<string>, LengthValidator<BlobValidator> {
-  custom: (fn: (value: string) => boolean, message: string) => BlobValidator
+export interface BlobValidatorType extends Validator<string>, LengthValidator<BlobValidatorType> {
+  custom: (fn: (value: string) => boolean, message: string) => BlobValidatorType
 }
diff --git a/src/types/boolean.ts b/src/types/boolean.ts
@@ -1,12 +1,11 @@
-import type { BooleanValidator } from '../validators/booleans'
 import type { Validator } from './base'
 
 export interface IsBooleanOptions {
   loose?: boolean
 }
 
 export interface BooleanValidatorType extends Validator<boolean> {
-  isTrue: () => BooleanValidator
-  isFalse: () => BooleanValidator
-  custom: (fn: (value: boolean) => boolean, message: string) => BooleanValidator
+  isTrue: () => BooleanValidatorType
+  isFalse: () => BooleanValidatorType
+  custom: (fn: (value: boolean) => boolean, message: string) => BooleanValidatorType
 }
diff --git a/src/types/decimal.ts b/src/types/decimal.ts
@@ -1,9 +1,8 @@
-import type { DecimalValidator } from '../validators/decimal'
 import type { LengthValidator, Validator } from './base'
 
-export interface DecimalValidatorType extends Validator<number>, LengthValidator<DecimalValidator> {
-  positive: () => DecimalValidator
-  negative: () => DecimalValidator
-  divisibleBy: (divisor: number) => DecimalValidator
-  custom: (fn: (value: number | null | undefined) => boolean, message: string) => DecimalValidator
+export interface DecimalValidatorType extends Validator<number>, LengthValidator<DecimalValidatorType> {
+  positive: () => DecimalValidatorType
+  negative: () => DecimalValidatorType
+  divisibleBy: (divisor: number) => DecimalValidatorType
+  custom: (fn: (value: number | null | undefined) => boolean, message: string) => DecimalValidatorType
 }
diff --git a/src/types/double.ts b/src/types/double.ts
@@ -1,9 +1,8 @@
-import type { DoubleValidator } from '../validators/double'
 import type { LengthValidator, Validator } from './base'
 
-export interface DoubleValidatorType extends Validator<number>, LengthValidator<DoubleValidator> {
-  positive: () => DoubleValidator
-  negative: () => DoubleValidator
-  divisibleBy: (divisor: number) => DoubleValidator
-  custom: (fn: (value: number | null | undefined) => boolean, message: string) => DoubleValidator
+export interface DoubleValidatorType extends Validator<number>, LengthValidator<DoubleValidatorType> {
+  positive: () => DoubleValidatorType
+  negative: () => DoubleValidatorType
+  divisibleBy: (divisor: number) => DoubleValidatorType
+  custom: (fn: (value: number | null | undefined) => boolean, message: string) => DoubleValidatorType
 }
diff --git a/src/types/enum.ts b/src/types/enum.ts
@@ -1,7 +1,6 @@
-import type { EnumValidator } from '../validators/enums'
 import type { Validator } from './base'
 
 export interface EnumValidatorType<T extends string | number> extends Validator<T> {
   getAllowedValues: () => readonly T[]
-  custom: (fn: (value: T) => boolean, message: string) => EnumValidator<T>
+  custom: (fn: (value: T) => boolean, message: string) => EnumValidatorType<T>
 }
diff --git a/src/types/float.ts b/src/types/float.ts
@@ -1,4 +1,3 @@
-import type { FloatValidator } from '../validators/float'
 import type { LengthValidator, Validator } from './base'
 
 export interface FloatOptions {
@@ -9,9 +8,9 @@ export interface FloatOptions {
   gt?: number
 }
 
-export interface FloatValidatorType extends Validator<number>, LengthValidator<FloatValidator> {
-  positive: () => FloatValidator
-  negative: () => FloatValidator
-  divisibleBy: (divisor: number) => FloatValidator
-  custom: (fn: (value: number | null | undefined) => boolean, message: string) => FloatValidator
+export interface FloatValidatorType extends Validator<number>, LengthValidator<FloatValidatorType> {
+  positive: () => FloatValidatorType
+  negative: () => FloatValidatorType
+  divisibleBy: (divisor: number) => FloatValidatorType
+  custom: (fn: (value: number | null | undefined) => boolean, message: string) => FloatValidatorType
 }
diff --git a/src/types/number.ts b/src/types/number.ts
@@ -1,4 +1,3 @@
-import type { NumberValidator } from '../validators/numbers'
 import type { LengthValidator, Validator } from './base'
 
 export interface IsIntOptions {
@@ -14,17 +13,16 @@ export interface NumericOptions {
   locale?: string
 }
 
-export interface NumberValidatorType extends Validator<number>, LengthValidator<NumberValidator> {
-  integer: (options?: IsIntOptions) => NumberValidator
-  positive: () => NumberValidator
-  negative: () => NumberValidator
-  divisibleBy: (divisor: number) => NumberValidator
-  custom: (fn: (value: number | null | undefined) => boolean, message: string) => NumberValidator
+export interface NumberValidatorType extends Validator<number>, LengthValidator<NumberValidatorType> {
+  integer: (options?: IsIntOptions) => NumberValidatorType
+  positive: () => NumberValidatorType
+  negative: () => NumberValidatorType
+  divisibleBy: (divisor: number) => NumberValidatorType
+  custom: (fn: (value: number | null | undefined) => boolean, message: string) => NumberValidatorType
 }
 
 export interface BigintValidatorType extends Validator<bigint> {
   min: (min: bigint) => BigintValidatorType
-  max: (max: bigint) => BigintValidatorType
   positive: () => BigintValidatorType
   negative: () => BigintValidatorType
   divisibleBy: (divisor: bigint) => BigintValidatorType
diff --git a/src/types/object.ts b/src/types/object.ts
@@ -1,7 +1,6 @@
-import type { ObjectValidator } from '../validators/objects'
 import type { Validator } from './base'
 
 export interface ObjectValidatorType<T extends Record<string, any>> extends Validator<T> {
-  shape: (schema: Record<string, Validator<any>>) => ObjectValidator<T>
-  strict: (strict?: boolean) => ObjectValidator<T>
+  shape: (schema: Record<string, Validator<any>>) => ObjectValidatorType<T>
+  strict: (strict?: boolean) => ObjectValidatorType<T>
 }
diff --git a/src/types/password.ts b/src/types/password.ts
@@ -1,4 +1,3 @@
-import type { PasswordValidator } from '../validators/password'
 import type { LengthValidator, Validator } from './base'
 
 export interface PasswordAnalysis {
@@ -10,11 +9,11 @@ export interface PasswordAnalysis {
   symbolCount: number
 }
 
-export interface PasswordValidatorType extends Validator<string>, LengthValidator<PasswordValidator> {
-  matches: (confirmPassword: string) => PasswordValidator
-  hasUppercase: () => PasswordValidator
-  hasLowercase: () => PasswordValidator
-  hasNumbers: () => PasswordValidator
-  hasSpecialCharacters: () => PasswordValidator
-  alphanumeric: () => PasswordValidator
+export interface PasswordValidatorType extends Validator<string>, LengthValidator<PasswordValidatorType> {
+  matches: (confirmPassword: string) => PasswordValidatorType
+  hasUppercase: () => PasswordValidatorType
+  hasLowercase: () => PasswordValidatorType
+  hasNumbers: () => PasswordValidatorType
+  hasSpecialCharacters: () => PasswordValidatorType
+  alphanumeric: () => PasswordValidatorType
 }
diff --git a/src/types/smallint.ts b/src/types/smallint.ts
@@ -1,9 +1,8 @@
-import type { SmallintValidator } from '../validators/smallint'
 import type { LengthValidator, Validator } from './base'
 
-export interface SmallintValidatorType extends Validator<number>, LengthValidator<SmallintValidator> {
-  positive: () => SmallintValidator
-  negative: () => SmallintValidator
-  divisibleBy: (divisor: number) => SmallintValidator
-  custom: (fn: (value: number | null | undefined) => boolean, message: string) => SmallintValidator
+export interface SmallintValidatorType extends Validator<number>, LengthValidator<SmallintValidatorType> {
+  positive: () => SmallintValidatorType
+  negative: () => SmallintValidatorType
+  divisibleBy: (divisor: number) => SmallintValidatorType
+  custom: (fn: (value: number | null | undefined) => boolean, message: string) => SmallintValidatorType
 }
diff --git a/src/types/string.ts b/src/types/string.ts
@@ -1,7 +1,6 @@
 import type { alphanumeric } from '../lib/isAlphanumeric'
 import type isEmail from '../lib/isEmail'
 import type isURL from '../lib/isURL'
-import type { StringValidator } from '../validators/strings'
 import type { LengthValidator, Validator } from './base'
 
 export interface ContainsOptions {
@@ -73,15 +72,15 @@ export interface NormalizeEmailOptions {
   yandex_convert_yandexru?: boolean | string
 }
 
-export interface StringValidatorType extends Validator<string>, LengthValidator<StringValidator> {
-  email: (options?: Parameters<typeof isEmail>[1]) => StringValidator
-  url: (options?: Parameters<typeof isURL>[1]) => StringValidator
-  matches: (pattern: RegExp) => StringValidator
-  equals: (param: string) => StringValidator
-  alphanumeric: () => StringValidator
-  alpha: () => StringValidator
-  numeric: () => StringValidator
-  custom: (fn: (value: string | null | undefined) => boolean, message: string) => StringValidator
+export interface StringValidatorType extends Validator<string>, LengthValidator<StringValidatorType> {
+  email: (options?: Parameters<typeof isEmail>[1]) => StringValidatorType
+  url: (options?: Parameters<typeof isURL>[1]) => StringValidatorType
+  matches: (pattern: RegExp) => StringValidatorType
+  equals: (param: string) => StringValidatorType
+  alphanumeric: () => StringValidatorType
+  alpha: () => StringValidatorType
+  numeric: () => StringValidatorType
+  custom: (fn: (value: string | null | undefined) => boolean, message: string) => StringValidatorType
 }
 
 export interface TextValidatorType extends StringValidatorType {}
diff --git a/src/types/time.ts b/src/types/time.ts
@@ -1,9 +1,8 @@
-import type { TimeValidator } from '../validators/time'
 import type { Validator } from './base'
 
 export interface TimeValidatorType extends Validator<string> {
-  min: (min: string) => TimeValidator
-  max: (max: string) => TimeValidator
-  length: (length: number) => TimeValidator
-  custom: (fn: (value: string | null | undefined) => boolean, message: string) => TimeValidator
+  min: (min: string) => TimeValidatorType
+  max: (max: string) => TimeValidatorType
+  length: (length: number) => TimeValidatorType
+  custom: (fn: (value: string | null | undefined) => boolean, message: string) => TimeValidatorType
 }
diff --git a/src/validation.ts b/src/validation.ts
@@ -50,3 +50,5 @@ export const v: ValidationInstance = {
   blob,
   binary,
 }
+
+export const schema: ValidationInstance = v

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-import type { BinaryValidator } from '../validators/binary'`
`2`	`1`	`import type { LengthValidator, Validator } from './base'`
`3`	`2`
`4`		`-export interface BinaryValidatorType extends Validator<string>, LengthValidator<BinaryValidator> {`
`5`		`- custom: (fn: (value: string) => boolean, message: string) => BinaryValidator`
	`3`	`+export interface BinaryValidatorType extends Validator<string>, LengthValidator<BinaryValidatorType> {`
	`4`	`+ custom: (fn: (value: string) => boolean, message: string) => BinaryValidatorType`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-import type { BlobValidator } from '../validators/blob'`
`2`	`1`	`import type { LengthValidator, Validator } from './base'`
`3`	`2`
`4`		`-export interface BlobValidatorType extends Validator<string>, LengthValidator<BlobValidator> {`
`5`		`- custom: (fn: (value: string) => boolean, message: string) => BlobValidator`
	`3`	`+export interface BlobValidatorType extends Validator<string>, LengthValidator<BlobValidatorType> {`
	`4`	`+ custom: (fn: (value: string) => boolean, message: string) => BlobValidatorType`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-import type { BooleanValidator } from '../validators/booleans'`
`2`	`1`	`import type { Validator } from './base'`
`3`	`2`
`4`	`3`	`export interface IsBooleanOptions {`
`5`	`4`	`loose?: boolean`
`6`	`5`	`}`
`7`	`6`
`8`	`7`	`export interface BooleanValidatorType extends Validator<boolean> {`
`9`		`- isTrue: () => BooleanValidator`
`10`		`- isFalse: () => BooleanValidator`
`11`		`- custom: (fn: (value: boolean) => boolean, message: string) => BooleanValidator`
	`8`	`+ isTrue: () => BooleanValidatorType`
	`9`	`+ isFalse: () => BooleanValidatorType`
	`10`	`+ custom: (fn: (value: boolean) => boolean, message: string) => BooleanValidatorType`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-import type { EnumValidator } from '../validators/enums'`
`2`	`1`	`import type { Validator } from './base'`
`3`	`2`
`4`	`3`	`export interface EnumValidatorType<T extends string \| number> extends Validator<T> {`
`5`	`4`	`getAllowedValues: () => readonly T[]`
`6`		`- custom: (fn: (value: T) => boolean, message: string) => EnumValidator<T>`
	`5`	`+ custom: (fn: (value: T) => boolean, message: string) => EnumValidatorType<T>`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-import type { ObjectValidator } from '../validators/objects'`
`2`	`1`	`import type { Validator } from './base'`
`3`	`2`
`4`	`3`	`export interface ObjectValidatorType<T extends Record<string, any>> extends Validator<T> {`
`5`		`- shape: (schema: Record<string, Validator<any>>) => ObjectValidator<T>`
`6`		`- strict: (strict?: boolean) => ObjectValidator<T>`
	`4`	`+ shape: (schema: Record<string, Validator<any>>) => ObjectValidatorType<T>`
	`5`	`+ strict: (strict?: boolean) => ObjectValidatorType<T>`
`7`	`6`	`}`