chore: improve validator context (#2439)

* chore: improve validator context * chore: improve typings
alibaba · Nov 16, 2021 · f3f2989 · f3f2989
1 parent 8e4a6a9
commit f3f2989
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/packages/core/src/shared/internals.ts b/packages/core/src/shared/internals.ts
@@ -278,7 +278,7 @@ export const validateToFeedbacks = async (
   const results = await validate(field.value, field.validator, {
     triggerType,
     validateFirst: field.props.validateFirst || field.form.props.validateFirst,
-    context: field,
+    context: { field, form: field.form },
   })
 
   batch(() => {

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -1,4 +1,8 @@
-import { Validator, ValidatorTriggerType } from '@formily/validator'
+import {
+  IValidatorRules,
+  Validator,
+  ValidatorTriggerType,
+} from '@formily/validator'
 import { FormPath } from '@formily/shared'
 import {
   Form,
@@ -293,7 +297,13 @@ export type FieldPatternTypes =
   | 'readPretty'
   | ({} & string)
 
-export type FieldValidator = Validator
+export type FieldValidatorContext = IValidatorRules & {
+  field?: Field
+  form?: Form
+  value?: any
+}
+
+export type FieldValidator = Validator<FieldValidatorContext>
 
 export type FieldDataSource = {
   label?: any

diff --git a/packages/validator/src/parser.ts b/packages/validator/src/parser.ts
@@ -51,8 +51,8 @@ export const parseIValidatorRules = (
   const getContext = (context: any, value: any) => {
     return {
       ...rules,
+      ...context,
       value,
-      context,
     }
   }
   const createValidate =
@@ -70,7 +70,7 @@ export const parseIValidatorRules = (
                 type: 'error',
                 message,
               },
-              { ...scope, ...context_ }
+              Object.assign(context_, scope)
             )?.message
           }
         )