chore: refactor types

Author: glennmichael123

src/lib/isAfter.ts

@@ -1,4 +1,4 @@
-import type { IsAfterOptions } from './types'
+import type { IsAfterOptions } from '../types/date'
 import toDate from './toDate'
 
 /**

src/types.ts

@@ -285,6 +285,8 @@ export interface StringValidatorType extends Validator<string>, LengthValidator<
   custom: (fn: (value: string) => boolean, message: string) => StringValidator
 }
 
+export interface TextValidatorType extends StringValidatorType {}
+
 export interface NumberValidatorType extends Validator<number>, LengthValidator<NumberValidator> {
   integer: (options?: IsIntOptions) => NumberValidator
   float: (options?: IsFloatOptions) => NumberValidator
@@ -295,6 +297,8 @@ export interface NumberValidatorType extends Validator<number>, LengthValidator<
   custom: (fn: (value: number) => boolean, message: string) => NumberValidator
 }
 
+export interface BigintValidatorType extends NumberValidatorType {}
+
 export interface ArrayValidatorType<T> extends Validator<T[]>, LengthValidator<ArrayValidator<T>> {
   each: (validator: Validator<T>) => ArrayValidator<T>
   unique: () => ArrayValidator<T>
@@ -347,7 +351,9 @@ export interface PasswordValidatorType extends Validator<string>, LengthValidato
 
 export interface ValidationInstance {
   string: () => StringValidatorType
+  text: () => TextValidatorType
   number: () => NumberValidatorType
+  bigint: () => BigintValidatorType
   array: <T>() => ArrayValidatorType<T>
   boolean: () => BooleanValidatorType
   enum: <T extends string | number>(values: readonly T[]) => EnumValidatorType<T>
@@ -366,4 +372,4 @@ export type ValidationType = {
 
 export type Infer<T> = T extends Validator<infer U> ? U : never
 
-export type ValidationNames = 'base' | 'string' | 'number' | 'array' | 'boolean' | 'enum' | 'date' | 'datetime' | 'object' | 'custom' | 'timestamp' | 'unix' | 'password'
+export type ValidationNames = 'base' | 'string' | 'number' | 'array' | 'boolean' | 'enum' | 'date' | 'datetime' | 'object' | 'custom' | 'timestamp' | 'unix' | 'password' | 'text' | 'bigint'

src/types/array.ts

@@ -0,0 +1,7 @@
+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>
+}

src/types/base.ts

@@ -0,0 +1,61 @@
+// Define unique symbols for schema properties
+export const SCHEMA_NAME: unique symbol = Symbol('schema_name')
+export const INPUT_TYPE: unique symbol = Symbol('input_type')
+export const OUTPUT_TYPE: unique symbol = Symbol('output_type')
+export const COMPUTED_TYPE: unique symbol = Symbol('computed_type')
+export const PARSE: unique symbol = Symbol('parse')
+
+export interface ValidationError {
+  message: string
+}
+
+export interface ValidationErrorMap {
+  [field: string]: ValidationError[]
+}
+
+export type ValidationErrors = ValidationError[] | ValidationErrorMap
+
+export interface ValidationResult {
+  valid: boolean
+  errors: ValidationErrors
+}
+
+export interface ValidationRule<T> {
+  name: string
+  test: (value: T) => boolean
+  message: string
+  params?: Record<string, any>
+}
+
+export interface Validator<T> {
+  name: ValidationNames
+  isRequired: boolean
+  getRules: () => ValidationRule<T>[]
+  test: (value: T) => boolean
+  validate: (value: T) => ValidationResult
+  required: () => this
+  optional: () => this
+}
+
+// Internal interface for implementation details
+export interface ValidatorInternal<T> extends Validator<T> {
+  isPartOfShape: boolean
+  rules: ValidationRule<T>[]
+}
+
+export interface ValidationConfig {
+  verbose: boolean
+  strictMode?: boolean
+  cacheResults?: boolean
+  errorMessages?: Record<string, string>
+}
+
+export interface LengthValidator<T> {
+  min: (length: number) => T
+  max: (length: number) => T
+  length: (length: number) => T
+}
+
+export type ValidationNames = 'base' | 'string' | 'number' | 'array' | 'boolean' | 'enum' | 'date' | 'datetime' | 'object' | 'custom' | 'timestamp' | 'unix' | 'password' | 'text' | 'bigint'
+
+export type Infer<T> = T extends Validator<infer U> ? U : never

src/types/boolean.ts

@@ -0,0 +1,12 @@
+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
+}

src/types/custom.ts

@@ -0,0 +1,5 @@
+import type { Validator } from './base'
+
+export interface CustomValidatorType<T> extends Validator<T> {
+  // Custom validator is simple, just implements the base Validator interface
+}

src/types/date.ts

@@ -0,0 +1,29 @@
+import type { Validator } from './base'
+
+export interface DateOptions {
+  format: string
+  delimiters: string[]
+  strictMode: boolean
+}
+
+export interface DateObj {
+  y: string
+  m: string
+  d: string
+}
+
+export interface IsBeforeOptions {
+  comparisonDate?: string | number | Date
+}
+
+export interface IsAfterOptions {
+  comparisonDate?: string | number | Date
+}
+
+export interface DateValidatorType extends Validator<Date> {
+  // Base date validator is simple, just implements the base Validator interface
+}
+
+export interface DatetimeValidatorType extends Validator<Date> {
+  // Datetime validator is simple, just implements the base Validator interface
+}

src/types/enum.ts

@@ -0,0 +1,7 @@
+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>
+}

src/types/index.ts

@@ -0,0 +1,50 @@
+import type { ArrayValidatorType } from './array'
+import type { BooleanValidatorType } from './boolean'
+import type { CustomValidatorType } from './custom'
+import type { DatetimeValidatorType, DateValidatorType } from './date'
+import type { EnumValidatorType } from './enum'
+import type { BigintValidatorType, NumberValidatorType } from './number'
+import type { ObjectValidatorType } from './object'
+import type { PasswordValidatorType } from './password'
+// Re-export ValidationInstance type
+import type { StringValidatorType, TextValidatorType } from './string'
+import type { TimestampValidatorType, UnixValidatorType } from './timestamp'
+
+export * from './array'
+
+// Base types
+export * from './base'
+export * from './boolean'
+export * from './custom'
+export * from './date'
+export * from './enum'
+export * from './number'
+export * from './object'
+// Options types
+export * from './options'
+export * from './password'
+// Validator types
+export * from './string'
+
+export * from './timestamp'
+
+export interface ValidationInstance {
+  string: () => StringValidatorType
+  text: () => TextValidatorType
+  number: () => NumberValidatorType
+  bigint: () => BigintValidatorType
+  array: <T>() => ArrayValidatorType<T>
+  boolean: () => BooleanValidatorType
+  enum: <T extends string | number>(values: readonly T[]) => EnumValidatorType<T>
+  date: () => DateValidatorType
+  datetime: () => DatetimeValidatorType
+  object: <T extends Record<string, any>>() => ObjectValidatorType<T>
+  custom: <T>(validationFn: (value: T) => boolean, message: string) => CustomValidatorType<T>
+  timestamp: () => TimestampValidatorType
+  unix: () => UnixValidatorType
+  password: () => PasswordValidatorType
+}
+
+export type ValidationType = {
+  [K in keyof ValidationInstance]: ReturnType<ValidationInstance[K]>
+}[keyof ValidationInstance]

src/types/number.ts

@@ -0,0 +1,42 @@
+import type isDecimal from '../lib/isDecimal'
+import type { NumberValidator } from '../validators/numbers'
+import type { LengthValidator, Validator } from './base'
+
+export interface IsFloatOptions {
+  locale?: string
+  min?: number
+  max?: number
+  lt?: number
+  gt?: number
+}
+
+export interface IsIntOptions {
+  allow_leading_zeroes?: boolean
+  min?: number
+  max?: number
+  lt?: number
+  gt?: number
+}
+
+export interface DecimalOptions {
+  force_decimal: boolean
+  decimal_digits: string
+  locale: string
+}
+
+export interface NumericOptions {
+  no_symbols?: boolean
+  locale?: string
+}
+
+export interface NumberValidatorType extends Validator<number>, LengthValidator<NumberValidator> {
+  integer: (options?: IsIntOptions) => NumberValidator
+  float: (options?: IsFloatOptions) => NumberValidator
+  decimal: (options?: Parameters<typeof isDecimal>[1]) => NumberValidator
+  positive: () => NumberValidator
+  negative: () => NumberValidator
+  divisibleBy: (divisor: number) => NumberValidator
+  custom: (fn: (value: number) => boolean, message: string) => NumberValidator
+}
+
+export interface BigintValidatorType extends NumberValidatorType {}