@ikas/storefront 4.0.0-alpha.5 → 4.0.0-alpha.50

package/src/models/ui/validator/rules/index.ts

@@ -183,6 +183,16 @@ export class EmailRule<T> extends ValidationRule<T> {
   }
 }
 
+/**
+ * 1) start with plus(+) or digit
+ * 2) any digit or one char white space
+ * 3) end with digit
+ *
+ * For example:
+ * ✅ Valid +90535 555 5555
+ * ✅ valid 905355555555
+ * 🚫 Unvalid +90535 5  55 5555
+ */
 export class PhoneRule<T> extends ValidationRule<T> {
   get errorMessage() {
     if (!this.message) return "";
@@ -193,10 +203,8 @@ export class PhoneRule<T> extends ValidationRule<T> {
   async run(): Promise<boolean> {
     if (!this.value) return true;
 
-    const result = this.value.match(/\d/g);
-    return (
-      (!!result && result.length <= 11) || !!/^\+(\d{12})$/gm.test(this.value)
-    );
+    const result = this.value.match(/^[\+\d](\d+\s)*\d+$/g);
+    return !!result;
   }
 }
 
@@ -246,15 +254,8 @@ export class IdentityNumberRule<T> extends ValidationRule<T> {
       TCSum = 0;
 
     const incorrect = [
-      11111111110,
-      22222222220,
-      33333333330,
-      44444444440,
-      55555555550,
-      66666666660,
-      7777777770,
-      88888888880,
-      99999999990,
+      11111111110, 22222222220, 33333333330, 44444444440, 55555555550,
+      66666666660, 7777777770, 88888888880, 99999999990,
     ];
 
     if (tcknString.length !== 11) return false;