@flowgram.ai/form 0.1.17 → 0.1.21

package/dist/index.d.ts

@@ -247,7 +247,7 @@ declare class FormModel<TValues = any> implements Disposable {
     setValueIn<TValue>(name: FieldName, value: TValue): void;
     setInitValueIn<TValue = any>(name: FieldName, value: TValue): void;
     clearValueIn(name: FieldName): void;
-    validateIn(name: FieldName): Promise<string | FormErrorOptions | FormWarningOptions | undefined>;
+    validateIn(name: FieldName): Promise<(string | FormErrorOptions | FormWarningOptions | undefined)[] | undefined>;
     validate(): Promise<FormValidateReturn>;
     alignStateWithFieldMap(): void;
     dispose(): void;
@@ -620,7 +620,7 @@ declare function useCurrentField<TFieldValue = FieldValue, TField extends Field$
  */
 declare function useCurrentFieldState(): FieldState;
 
-type CreateFormOptions = FormOptions & {
+type CreateFormOptions<T = any> = FormOptions<T> & {
     /**
      * 为 true 时，createForm 不会对form 初始化， 用户需要手动调用 control.init()
      * 该配置主要为了解决，用户需要去监听一些form 的初始化事件，那么他需要再配置完监听后再初始化。
@@ -628,7 +628,7 @@ type CreateFormOptions = FormOptions & {
      **/
     disableAutoInit?: boolean;
 };
-declare function createForm<TValues>(options?: CreateFormOptions): CreateFormReturn<TValues>;
+declare function createForm<TValues>(options?: CreateFormOptions<TValues>): CreateFormReturn<TValues>;
 
 declare namespace Glob {
     const DIVIDER = ".";
@@ -691,4 +691,4 @@ declare function toFieldArray<TValue>(model: FieldArrayModel<TValue>): FieldArra
 declare function toForm<TValue>(model: FormModel): Form$1<TValue>;
 declare function toFormState(modelState: FormModelState): FormState;
 
-export { type Errors, Field, FieldArray, FieldArrayModel, type FieldArrayProps, type FieldArrayRenderProps, type FieldError, FieldModel, type FieldName, type FieldProps, type FieldRenderProps, type FieldState, type FieldValue, type FieldWarning, Form, type FormControl, FormModel, type FormProps, type FormRenderProps, type FormState, type FormValidateReturn, Glob, type Field$1 as IField, type FieldArray$1 as IFieldArray, type Form$1 as IForm, Path, type Validate, ValidateTrigger, type Warnings, createForm, toField, toFieldArray, toFieldState, toForm, toFormState, useCurrentField, useCurrentFieldState, useField, useFieldValidate, useForm, useFormErrors, useFormState, useFormWarnings, useWatch };
+export { type CreateFormOptions, type Errors, Field, FieldArray, FieldArrayModel, type FieldArrayProps, type FieldArrayRenderProps, type FieldError, FieldModel, type FieldName, type FieldProps, type FieldRenderProps, type FieldState, type FieldValue, type FieldWarning, Form, type FormControl, FormModel, type FormProps, type FormRenderProps, type FormState, type FormValidateReturn, Glob, type Field$1 as IField, type FieldArray$1 as IFieldArray, type Form$1 as IForm, Path, type Validate, ValidateTrigger, type Warnings, createForm, toField, toFieldArray, toFieldState, toForm, toFormState, useCurrentField, useCurrentFieldState, useField, useFieldValidate, useForm, useFormErrors, useFormState, useFormWarnings, useWatch };

package/dist/index.js

@@ -253,18 +253,15 @@ var Glob;
   }
   Glob2.findMatchPaths = findMatchPaths;
   function findMatchPathsWithEmptyValue(obj, pattern) {
+    if (!pattern.includes("*")) {
+      return [pattern];
+    }
     return findMatchPaths(obj, pattern, true);
   }
   Glob2.findMatchPathsWithEmptyValue = findMatchPathsWithEmptyValue;
 })(Glob || (Glob = {}));
 
 // src/types/validate.ts
-function isFieldWarning(f) {
-  if (f.level === "warning" /* Warning */) {
-    return true;
-  }
-  return false;
-}
 var ValidateTrigger = /* @__PURE__ */ ((ValidateTrigger2) => {
   ValidateTrigger2["onChange"] = "onChange";
   ValidateTrigger2["onBlur"] = "onBlur";
@@ -983,21 +980,19 @@ var FieldModel = class {
     this.form.onValidateEmitter.fire(this.form.state);
   }
   async _runAsyncValidate() {
-    const errors = [];
-    const warnings = [];
-    const result = await this.form.validateIn(this.name);
-    if (!result) {
+    let errors = [];
+    let warnings = [];
+    const results = await this.form.validateIn(this.name);
+    if (!results?.length) {
       return {};
     } else {
-      const feedback = toFeedback(result, this.name);
-      if (!feedback) {
+      const feedbacks = results.map((result) => toFeedback(result, this.name)).filter(Boolean);
+      if (!feedbacks?.length) {
         return {};
       }
-      if (isFieldWarning(feedback)) {
-        warnings.push(feedback);
-      } else {
-        errors.push(feedback);
-      }
+      const groupedFeedbacks = (0, import_lodash7.groupBy)(feedbacks, "level");
+      warnings = warnings.concat(groupedFeedbacks["warning" /* Warning */]);
+      errors = errors.concat(groupedFeedbacks["error" /* Error */]);
     }
     return { errors, warnings };
   }
@@ -1416,10 +1411,10 @@ var FormModel = class {
     if (!this._options.validate) {
       return;
     }
-    const validateKey = Object.keys(this._options.validate).find(
+    const validateKeys = Object.keys(this._options.validate).filter(
       (pattern) => Glob.isMatch(pattern, name)
     );
-    if (validateKey) {
+    const validatePromises = validateKeys.map(async (validateKey) => {
       const validate = this._options.validate[validateKey];
       return validate({
         value: this.getValueIn(name),
@@ -1427,7 +1422,8 @@ var FormModel = class {
         context: this.context,
         name
       });
-    }
+    });
+    return Promise.all(validatePromises);
   }
   async validate() {
     if (!this._options.validate) {