fix: fix email validation

dzangolab · Mar 21, 2023 · f733876 · f733876
1 parent 47efa2d
commit f733876
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/packages/vue-form/src/schemas/Email.ts b/packages/vue-form/src/schemas/Email.ts
@@ -12,8 +12,22 @@ const schema = (
     .string({
       required_error: errorMessages.required,
     })
-    .refine((value) => validator.isEmail(value, options || {}), {
-      message: errorMessages.invalid,
+    .superRefine((value, context) => {
+      if (value.length === 0) {
+        context.addIssue({
+          code: "invalid_string",
+          message: errorMessages.required,
+          validation: "email",
+        });
+      }
+
+      if (!validator.isEmail(value, options || {})) {
+        context.addIssue({
+          code: "invalid_string",
+          message: errorMessages.invalid,
+          validation: "email",
+        });
+      }
     });
 };