@flowgram.ai/form 0.2.31 → 0.2.32

package/dist/esm/index.js

@@ -1364,14 +1364,15 @@ var FormModel = class {
     this.setValueIn(name, void 0);
   }
   async validateIn(name) {
-    if (!this._options.validate) {
+    const validateOptions = this.getValidateOptions();
+    if (!validateOptions) {
       return;
     }
-    const validateKeys = Object.keys(this._options.validate).filter(
+    const validateKeys = Object.keys(validateOptions).filter(
       (pattern) => Glob.isMatch(pattern, name)
     );
     const validatePromises = validateKeys.map(async (validateKey) => {
-      const validate = this._options.validate[validateKey];
+      const validate = validateOptions[validateKey];
       return validate({
         value: this.getValueIn(name),
         formValues: this.values,
@@ -1381,18 +1382,27 @@ var FormModel = class {
     });
     return Promise.all(validatePromises);
   }
+  getValidateOptions() {
+    const validate = this._options.validate;
+    if (typeof validate === "function") {
+      return validate(this.values, this.context);
+    }
+    return validate;
+  }
   async validate() {
-    if (!this._options.validate) {
+    const validateOptions = this.getValidateOptions();
+    if (!validateOptions) {
       return [];
     }
-    const feedbacksArrPromises = Object.keys(this._options.validate).map(async (nameRule) => {
-      const validate = this._options.validate[nameRule];
-      const paths = Glob.findMatchPathsWithEmptyValue(this.values, nameRule);
+    const feedbacksArrPromises = Object.keys(validateOptions).map(async (nameRule) => {
+      const validate = validateOptions[nameRule];
+      const values = this.values;
+      const paths = Glob.findMatchPathsWithEmptyValue(values, nameRule);
       return Promise.all(
         paths.map(async (path) => {
           const result = await validate({
-            value: get4(this.values, path),
-            formValues: this.values,
+            value: get4(values, path),
+            formValues: values,
             context: this.context,
             name: path
           });