From 573ae2eb6e4224186f32891c253f435313f8047a Mon Sep 17 00:00:00 2001
From: "@rahmatillo.djulmatov" <rahmatillo.djulmatov@ssd.uz>
Date: Thu, 9 Mar 2023 14:52:42 +0500
Subject: [PATCH] second arg of validator function typed

---
 src/types.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/types.ts b/src/types.ts
index 3d810b0..0a453b6 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -9,9 +9,9 @@ export type ValidationResult = {
   errorText?: string
 }
 
-export type Validator<Value, Form = any, Source = any> = (
+export type Validator<Value, Form, Source> = (
   value: Value,
-  form?: Form,
+  form: Form,
   source?: Source,
 ) => boolean | ValidationResult
 
@@ -21,7 +21,7 @@ export type ValidationError<Value = any> = {
   errorText?: string
 }
 
-export type Rule<Value, Form = any, Source = any> = {
+export type Rule<Value, Form, Source = any> = {
   name: string
   errorText?: string
   source?: Store<Source>
@@ -66,9 +66,9 @@ export type RuleResolver<
   Form = any
 > = (value: Value, form: Form) => Rule<Value, Form, void>[]
 
-export type FieldConfig<Value> = {
+export type FieldConfig<Value, FormValues> = {
   init: Value | InitFieldValue<Value>
-  rules?: Rule<Value>[] | RuleResolver<Value, any>
+  rules?: Rule<Value, FormValues, any>[] | RuleResolver<Value, FormValues>
   filter?: Store<boolean> | FilterFunc<Value>
   validateOn?: ValidationEvent[]
   units?: {
@@ -91,7 +91,7 @@ export type AnyFields = {
 }
 
 export type AnyFieldsConfigs = {
-  [key: string]: FieldConfig<any>
+  [key: string]: FieldConfig<any, any>
 }
 
 export type AnyFormValues = {
@@ -105,7 +105,7 @@ export type FormValues<Fields extends AnyFields> = {
 }
 
 export type FormFieldConfigs<Values extends AnyFormValues> = {
-  [K in keyof Values]: FieldConfig<Values[K]>
+  [K in keyof Values]: FieldConfig<Values[K], Values>
 }
 
 export type FormFields<Values extends AnyFormValues> = {