From 12a9c27bbd922a9c3985292c4f89b560d25e6de5 Mon Sep 17 00:00:00 2001
From: ArtyomVancyan <ArtyomVancyan@users.noreply.github.com>
Date: Sun, 25 May 2025 00:46:53 +0000
Subject: [PATCH] Update the validation patterns

---
 resources/metadata.xml        | 107 ++++++++++++++++------------------
 src/metadata/countries.json   |   2 +-
 src/metadata/validations.json |   6 +-
 3 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/resources/metadata.xml b/resources/metadata.xml
index d9fa91e..520aeb0 100644
--- a/resources/metadata.xml
+++ b/resources/metadata.xml
@@ -4080,10 +4080,10 @@
         <possibleLengths national="8"/>
         <exampleNumber>79561234</exampleNumber>
         <nationalNumberPattern>
-          64[0-2]\d{5}|
           (?:
             29|
-            [67][125-9]
+            6[124-9]|
+            7[125-9]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -5419,7 +5419,7 @@
               04|
               [23]6|
               [48]9|
-              50|
+              5[07]|
               63
             )|
             3(?:
@@ -5480,7 +5480,7 @@
               04|
               [23]6|
               [48]9|
-              50|
+              5[07]|
               63
             )|
             3(?:
@@ -8172,7 +8172,7 @@
         <numberFormat pattern="(\d{3})(\d{7})" carrierCodeFormattingRule="$NP$CC $FG">
           <leadingDigits>
             3[0-357]|
-            91
+            9[14]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -8209,8 +8209,8 @@
           (?:
             46|
             60(?:
-              [124-7][2-9]|
-              8[1-9]
+              [18][1-9]|
+              [24-7][2-9]
             )
           )\d{6}
         </nationalNumberPattern>
@@ -8228,21 +8228,26 @@
           )\d{4}|
           (?:
             3(?:
-              24[1-9]|
+              (?:
+                0[0-5]|
+                1\d|
+                5[01]|
+                70
+              )\d|
+              2(?:
+                [0-3]\d|
+                4[1-9]
+              )|
               3(?:
                 00|
                 3[0-24-9]
               )
             )|
-            9101
-          )\d{6}|
-          3(?:
-            0[0-5]|
-            1\d|
-            2[0-3]|
-            5[01]|
-            70
-          )\d{7}
+            9(?:
+              101|
+              408
+            )
+          )\d{6}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -13362,7 +13367,7 @@
               )|
               7(?:
                 [26][0-5]|
-                4[0-28]
+                4[0-48]
               )
             )|
             5(?:
@@ -13371,8 +13376,10 @@
             )|
             6(?:
               26[013-8]|
-              66[0-3]|
-              78[0-5]
+              (?:
+                66|
+                78
+              )[0-5]
             )|
             70(?:
               7[1-8]|
@@ -15925,18 +15932,16 @@
         <nationalNumberPattern>
           9(?:
             (?:
-              0(?:
-                [0-35]\d|
-                4[4-6]
-              )|
-              (?:
-                [13]\d|
-                2[0-3]
-              )\d
-            )\d|
+              0[0-5]|
+              [13]\d|
+              2[0-3]
+            )\d\d|
             9(?:
               [0-46]\d\d|
-              5[15]0|
+              5(?:
+                10|
+                5\d
+              )|
               8(?:
                 [12]\d|
                 88
@@ -19367,7 +19372,7 @@
             2(?:
               01|
               1[27]|
-              2[02]|
+              2[024]|
               3\d|
               6[02-578]|
               96
@@ -19390,7 +19395,7 @@
             6(?:
               (?:
                 4[5-9]|
-                5[0-469]
+                5[0-46-9]
               )\d|
               6(?:
                 [024-6]\d|
@@ -19551,9 +19556,8 @@
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            [245]\d|
+            [2457]\d|
             33|
-            77|
             88
           )\d{7}|
           (?:
@@ -19579,10 +19583,11 @@
                 33
               )0|
               555|
-              (?:
-                77|
-                88
-              )\d
+              7(?:
+                6[01]|
+                7\d
+              )|
+              88\d
             )\d|
             4(?:
               240|
@@ -22469,7 +22474,7 @@
         <possibleLengths national="8,9" localOnly="6,7"/>
         <exampleNumber>323856789</exampleNumber>
         <nationalNumberPattern>
-          4270\d{4}|
+          427[01]\d{4}|
           (?:
             3(?:
               2[0-36-9]|
@@ -26275,10 +26280,6 @@
           <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>81</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
           <leadingDigits>8</leadingDigits>
           <format>$1 $2 $3</format>
@@ -26286,11 +26287,11 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          92\d{7}|
           (?:
-            [15]|
-            8\d
-          )\d{8}
+            [15]\d|
+            800|
+            92
+          )\d{7}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -26335,14 +26336,6 @@
         <exampleNumber>920012345</exampleNumber>
         <nationalNumberPattern>920\d{6}</nationalNumberPattern>
       </sharedCost>
-      <!-- Including "Nomadic" numbers from the Telecom Company "Go". "Go" says these are fixed-line
-           that can be moved with no further setup. As these are mobile in nature and UAN is the
-           closest match, adding it here. -->
-      <uan>
-        <possibleLengths national="10"/>
-        <exampleNumber>8110123456</exampleNumber>
-        <nationalNumberPattern>811\d{7}</nationalNumberPattern>
-      </uan>
     </territory>
 
     <!-- Solomon Islands (SB) -->
@@ -29806,7 +29799,7 @@
             )|
             5056(?:
               [0-35-9]\d|
-              4[0-468]
+              4[0-68]
             )
           )\d{4}|
           (?:
@@ -29916,7 +29909,7 @@
             )|
             5056(?:
               [0-35-9]\d|
-              4[0-468]
+              4[0-68]
             )
           )\d{4}|
           (?:
diff --git a/src/metadata/countries.json b/src/metadata/countries.json
index 2025852..746c882 100644
--- a/src/metadata/countries.json
+++ b/src/metadata/countries.json
@@ -1893,7 +1893,7 @@
     "sa",
     "Saudi Arabia",
     "966",
-    "+966 (.) ... ... ..."
+    "+966 (.) ... ... .."
   ],
   [
     "sn",
diff --git a/src/metadata/validations.json b/src/metadata/validations.json
index d7b2251..2da8177 100644
--- a/src/metadata/validations.json
+++ b/src/metadata/validations.json
@@ -477,7 +477,7 @@
   ],
   "lr": [
     "^\\d{7,9}$",
-    "^(?:[245]\\d|33|77|88)\\d{7}|(?:2\\d|[4-6])\\d{6}$"
+    "^(?:[2457]\\d|33|88)\\d{7}|(?:2\\d|[4-6])\\d{6}$"
   ],
   "ls": [
     "^\\d{8}$",
@@ -716,8 +716,8 @@
     "^(?:06|[27]\\d\\d|[89]00)\\d{6}$"
   ],
   "sa": [
-    "^\\d{9,10}$",
-    "^92\\d{7}|(?:[15]|8\\d)\\d{8}$"
+    "^\\d{9}$",
+    "^(?:[15]\\d|800|92)\\d{7}$"
   ],
   "sb": [
     "^\\d{5,7}$",