fix(validation): use withAsync for async rule (#500)

globalbrain · Mar 13, 2024 · c309efe · c309efe
1 parent 5971393
commit c309efe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/lib/validation/Rule.ts b/lib/validation/Rule.ts
@@ -5,6 +5,7 @@ import { _required } from './validators'
 
 export interface RuleOptions {
   optional?: boolean
+  async?: boolean
   message(params: MessageProps): string
   validation(value: unknown): boolean | Promise<boolean>
 }
@@ -18,14 +19,14 @@ export function createRule(
 ): ValidationRuleWithParams {
   const lang = useLang()
 
+  function validation(value: unknown) {
+    return options.optional && !_required(value)
+      ? true
+      : options.validation(value)
+  }
+
   return helpers.withMessage(
-    (params) => {
-      return options.message({ ...params, lang })
-    },
-    (value) => {
-      return options.optional && !_required(value)
-        ? true
-        : options.validation(value)
-    }
+    (params) => options.message({ ...params, lang }),
+    options.async ? helpers.withAsync(validation) : validation
   )
 }
diff --git a/lib/validation/rules/requiredIf.ts b/lib/validation/rules/requiredIf.ts
@@ -11,6 +11,7 @@ export function requiredIf(
   msg?: string
 ) {
   return createRule({
+    async: true,
     message: ({ lang }) => msg ?? message[lang],
     validation: (value) => baseRequiredIf(value, condition)
   })