feat(@yourssu/utils): change isEmail to return boolean value

yourssu · Sep 3, 2024 · d63976a · d63976a
1 parent e6323b8
commit d63976a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/.changeset/good-boats-fetch.md b/.changeset/good-boats-fetch.md
@@ -0,0 +1,5 @@
+---
+'@yourssu/utils': minor
+---
+
+change isEmail to return boolean value
diff --git a/packages/utils/src/isEmail.ts b/packages/utils/src/isEmail.ts
@@ -1,19 +1,13 @@
-export const isEmail = (email: string, domain?: string) => {
-  const regFull =
-    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-  if (regFull.test(String(email).toLowerCase())) {
-    return email;
+export const isEmail = (email: string, domain?: string): boolean => {
+  if (!domain) {
+    const regFull =
+      /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+    return regFull.test(String(email).toLowerCase());
   }
 
-  const regHalf = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))$/;
+  const regHalf = /^(([^<>()[\]\\.,;:\s@"]+(\[^<>()[\]\\.,;:\s@"]+)*)|(".+"))$/;
   const refDomain =
     /^@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-
-  if (domain) {
-    if (regHalf.test(String(email).toLowerCase()) && refDomain.test(String(domain).toLowerCase())) {
-      return email + domain;
-    }
-  }
-
-  throw new Error('given value is not valid');
+  return regHalf.test(String(email).toLowerCase()) && refDomain.test(String(domain).toLowerCase());
 };