diff --git a/CHANGELOG.md b/CHANGELOG.md index 607e85f..8936361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 9.0.23 +- Upgrade metadata + ## 9.0.22 - Upgrade metadata diff --git a/lib/src/metadata/generated/metadata_formats_by_iso_code.dart b/lib/src/metadata/generated/metadata_formats_by_iso_code.dart index 17d272f..a763372 100644 --- a/lib/src/metadata/generated/metadata_formats_by_iso_code.dart +++ b/lib/src/metadata/generated/metadata_formats_by_iso_code.dart @@ -705,14 +705,14 @@ const metadataFormatsByIsoCode = { PhoneMetadataFormat( pattern: r"(\d)(\d{7})", nationalPrefixFormattingRule: null, - leadingDigits: ["[235]|4[46]"], + leadingDigits: ["[23]|4[46]|50"], format: r"$1 $2", intlFormat: null, ), PhoneMetadataFormat( pattern: r"(\d{8})", nationalPrefixFormattingRule: null, - leadingDigits: ["[67]"], + leadingDigits: ["[5-7]"], format: r"$1", intlFormat: null, ), @@ -1794,7 +1794,7 @@ const metadataFormatsByIsoCode = { PhoneMetadataFormat( pattern: r"(\d{2})(\d{3})(\d{4})", nationalPrefixFormattingRule: r"$NP$FG", - leadingDigits: ["[1-579]"], + leadingDigits: ["[1-57-9]"], format: r"$1 $2 $3", intlFormat: null, ) @@ -2678,9 +2678,9 @@ const metadataFormatsByIsoCode = { pattern: r"(\d{3})(\d{3})(\d{4})", nationalPrefixFormattingRule: r"$NP$FG", leadingDigits: [ - "1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|4[47]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67|72)[14]", - "1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:2[14]|3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]", - "1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:(?:2[14]|5[15])[2-6]|3171|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|(?:74[47]|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]" + "1(?:2[0-249]|3[0-25]|4[145]|[68]|7[1257])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|5[12]|[78]1)|6(?:12|[2-4]1|5[17]|6[13]|80)|7(?:12|3[134]|61|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91)|(?:43|59|75)[15]|(?:1[59]|29|67)[14]", + "1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|674|7(?:(?:3[34]|5[15])[2-6]|61[346]|88[0-8])|8(?:70[2-6]|84[235-7]|91[3-7])|(?:1(?:29|60|8[06])|261|552|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|31)|8(?:16|2[014]|3[126]|6[136]|7[78]|83))[2-7]", + "1(?:2[0-24]|3[0-25]|4[145]|[59][14]|6[1-9]|7[1257]|8[1-57-9])|2(?:1[257]|3[013]|4[01]|5[0137]|6[058]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12(?:[2-6]|7[0-8])|74[2-7])|7(?:3171|5[15][2-6]|61[346]|88(?:[2-7]|82))|8(?:70[2-6]|84(?:[2356]|7[19])|91(?:[3-6]|7[19]))|73[134][2-6]|8(?:16|2[014]|3[126]|6[136]|7[78]|83)(?:[2-6]|7[19])|(?:1(?:29|60|8[06])|261|552|6(?:[2-4]1|5[17]|6[13]|7(?:1|4[0189])|80)|7(?:12|88[01]))[2-7]" ], format: r"$1 $2 $3", intlFormat: null, @@ -2689,9 +2689,9 @@ const metadataFormatsByIsoCode = { pattern: r"(\d{4})(\d{3})(\d{3})", nationalPrefixFormattingRule: r"$NP$FG", leadingDigits: [ - "1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|28|3[129]|4[1-35689]|5[29]|6[02-5]|70)|807", - "1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1(?:[013-8]|9[6-9])|28[6-8]|3(?:17|2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]", - "1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|8(?:28[235-7]|3))|73179|807(?:1|9[1-3])|(?:1552|6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689])\\d|8(?:[14-6]\\d|2[0-79]))|7(?:1(?:[013-8]\\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-57])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]))[2-7]" + "1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2[2457-9]|3[2-5]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[1-6])|7(?:1[013-9]|3[129]|5[29]|6[02-5]|70)|807", + "1(?:[2-479]|5[0235-9])|[2-5]|6(?:1[1358]|2(?:[2457]|84|95)|3(?:[2-4]|55)|4[235-7]|5[2-689]|6[24578]|7(?:[23569]|8[0-57-9])|8[1-6])|7(?:1(?:[013-8]|9[6-9])|3(?:17|2[0-49]|9[2-57])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4|5[0-367])|70[13-7])|807[19]", + "1(?:[2-479]|5(?:[0236-9]|5[013-9]))|[2-5]|6(?:2(?:84|95)|355|8(?:28[235-7]|3))|73179|807(?:1|9[1-3])|(?:1552|6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578])\\d|7(?:[23569]\\d|8[0-57-9])|8(?:[14-6]\\d|2[0-79]))|7(?:1(?:[013-8]\\d|9[6-9])|3(?:2[0-49]|9[2-57])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\\d|5[0-367])|70[13-7]))[2-7]" ], format: r"$1 $2 $3", intlFormat: null, @@ -5660,11 +5660,7 @@ const metadataFormatsByIsoCode = { PhoneMetadataFormat( pattern: r"(\d{3})(\d{3})(\d{2})(\d{2})", nationalPrefixFormattingRule: r"$NP$FG", - leadingDigits: [ - "5(?:[0-579]|61)", - "5(?:[0-579]|61[06])", - "5(?:[0-579]|61[06]1)" - ], + leadingDigits: ["5[0-79]"], format: r"$1 $2 $3 $4", intlFormat: null, ), @@ -6008,14 +6004,14 @@ const metadataFormatsByIsoCode = { PhoneMetadataFormat( pattern: r"(\d{4})(\d{4,6})", nationalPrefixFormattingRule: null, - leadingDigits: ["1"], + leadingDigits: ["1(?:2[02]|[89])"], format: r"$1 $2", intlFormat: null, ), PhoneMetadataFormat( pattern: r"(\d{2})(\d{3})(\d{2})(\d{2})", nationalPrefixFormattingRule: r"$NP$FG", - leadingDigits: ["6"], + leadingDigits: ["1[26]|6"], format: r"$1 $2 $3 $4", intlFormat: null, ), diff --git a/lib/src/metadata/generated/metadata_patterns_by_iso_code.dart b/lib/src/metadata/generated/metadata_patterns_by_iso_code.dart index 9fec537..09de8c0 100644 --- a/lib/src/metadata/generated/metadata_patterns_by_iso_code.dart +++ b/lib/src/metadata/generated/metadata_patterns_by_iso_code.dart @@ -82,7 +82,7 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: r"([2457]\d{6})$|1", nationalPrefixTransformRule: r"264$1", general: r"(?:264|[58]\d\d|900)\d{7}", - mobile: r"264(?:235|4(?:69|76)|5(?:3[6-9]|8[1-4])|7(?:29|72))\d{4}", + mobile: r"264(?:235|4(?:69|7[67])|5(?:3[6-9]|8[1-4])|7(?:29|72))\d{4}", fixedLine: r"264(?:292|4(?:6[12]|9[78]))\d{4}", voip: r"", tollFree: r"8(?:00|33|44|55|66|77|88)[2-9]\d{6}", @@ -455,8 +455,8 @@ const metadataPatternsByIsoCode = { IsoCode.BO: PhoneMetadataPatterns( nationalPrefixForParsing: r"0(1\d)?", nationalPrefixTransformRule: null, - general: r"8001\d{5}|(?:[2-467]\d|50)\d{6}", - mobile: r"[67]\d{7}", + general: r"(?:[2-7]\d\d|8001)\d{5}", + mobile: r"(?:57|[67]\d)\d{6}", fixedLine: r"(?:2(?:2\d\d|5(?:11|[258]\d|9[67])|6(?:12|2\d|9[34])|8(?:2[34]|39|62))|3(?:3\d\d|4(?:6\d|8[24])|8(?:25|42|5[257]|86|9[25])|9(?:[27]\d|3[2-4]|4[248]|5[24]|6[2-6]))|4(?:4\d\d|6(?:11|[24689]\d|72)))\d{4}", voip: r"50\d{6}", @@ -717,9 +717,9 @@ const metadataPatternsByIsoCode = { nationalPrefixTransformRule: null, general: r"12300\d{6}|6\d{9,10}|[2-9]\d{8}", mobile: - r"2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:(?:2\d|50)\d|3(?:[034679]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-389])|600)|646[59])|80[1-8]\d\d|9(?:(?:10[0-2]|7[1-9]\d)\d|3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}", + r"2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:(?:[24]\d|50)\d|3(?:[034679]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-389])|600)|646[59])|80[1-8]\d\d|9(?:(?:10[0-2]|7[1-9]\d)\d|3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}", fixedLine: - r"2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:(?:2\d|50)\d|3(?:[034679]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-389])|600)|646[59])|(?:600|80[1-9])\d\d|9(?:(?:10[0-2]|7[1-9]\d)\d|3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}", + r"2(?:1982[0-6]|3314[05-9])\d{3}|(?:2(?:1(?:160|962)|3(?:(?:[24]\d|50)\d|3(?:[034679]\d|1[0-35-9]|2[1-9]|5[0-24-9]|8[0-389])|600)|646[59])|(?:600|80[1-9])\d\d|9(?:(?:10[0-2]|7[1-9]\d)\d|3(?:[0-57-9]\d\d|6(?:0[02-9]|[1-9]\d))|6(?:[0-8]\d\d|9(?:[02-79]\d|1[05-9]))|9(?:[03-9]\d\d|1(?:[0235-9]\d|4[0-24-9])|2(?:[0-79]\d|8[0-46-9]))))\d{4}|(?:22|3[2-5]|[47][1-35]|5[1-3578]|6[13-57]|8[1-9]|9[2458])\d{7}", voip: r"44\d{7}", tollFree: r"(?:123|8)00\d{6}", premiumRate: r"", @@ -878,8 +878,7 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: null, nationalPrefixTransformRule: null, general: r"(?:[2-578]\d|60)\d{7}|9\d{8,11}", - mobile: - r"7(?:060\d|19(?:[0-5]\d|6[0-6]))\d{4}|(?:60[1-8]|7(?:0[2-5]|[2379]\d))\d{6}", + mobile: r"7060\d{5}|(?:60[1-8]|7(?:0[2-5]|19|[2379]\d))\d{6}", fixedLine: r"(?:2\d|3[1257-9]|4[16-9]|5[13-9])\d{7}", voip: r"9[17]0\d{6}", tollFree: r"800\d{6}", @@ -895,8 +894,7 @@ const metadataPatternsByIsoCode = { nationalPrefixTransformRule: null, general: r"[2579]\d{5,14}|49(?:[34]0|69|8\d)\d\d?|49(?:37|49|60|7[089]|9\d)\d{1,3}|49(?:2[024-9]|3[2-689]|7[1-7])\d{1,8}|(?:1|[368]\d|4[0-8])\d{3,13}|49(?:[015]\d|2[13]|31|[46][1-8])\d{1,9}", - mobile: - r"1(?:(?:5(?:[0-25-9]\d\d|3(?:10|33))|7[26-9]\d\d)\d{6}|6[023]\d{7,8})|17\d{8}", + mobile: r"1(?:6[023]|7\d)\d{7,8}|15(?:[0-25-9]\d\d|3(?:10|33))\d{6}", fixedLine: r"32\d{9,11}|49[1-6]\d{10}|322\d{6}|49[0-7]\d{3,9}|(?:[34]0|[68]9)\d{3,13}|(?:2(?:0[1-689]|[1-3569]\d|4[0-8]|7[1-7]|8[0-7])|3(?:[3569]\d|4[0-79]|7[1-7]|8[1-8])|4(?:1[02-9]|[2-48]\d|5[0-6]|6[0-8]|7[0-79])|5(?:0[2-8]|[124-6]\d|[38][0-8]|[79][0-7])|6(?:0[02-9]|[1-358]\d|[47][0-8]|6[1-9])|7(?:0[2-8]|1[1-9]|[27][0-7]|3\d|[4-6][0-8]|8[0-5]|9[013-7])|8(?:0[2-9]|1[0-79]|2\d|3[0-46-9]|4[0-6]|5[013-9]|6[1-8]|7[0-8]|8[0-24-6])|9(?:0[6-9]|[1-4]\d|[589][0-7]|6[0-8]|7[0-467]))\d{3,12}", voip: r"", @@ -979,8 +977,8 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: null, nationalPrefixTransformRule: null, general: r"(?:[1-4]|[5-79]\d|80)\d{7}", - mobile: r"(?:5(?:4[0-29]|5\d|6[0-3])|6(?:[569]\d|7[0-6])|7[7-9]\d)\d{6}", - fixedLine: r"9619\d{5}|(?:1\d|2[013-79]|3[0-8]|4[013-689])\d{6}", + mobile: r"5(?:4[0-29]|6[0-3])\d{6}|(?:55|6\d|7[7-9])\d{7}", + fixedLine: r"9619\d{5}|(?:[1-3]\d|4[013-689])\d{6}", voip: r"98[23]\d{6}", tollFree: r"800\d{6}", premiumRate: r"80[3-689]1\d{5}", @@ -1087,9 +1085,9 @@ const metadataPatternsByIsoCode = { IsoCode.ET: PhoneMetadataPatterns( nationalPrefixForParsing: null, nationalPrefixTransformRule: null, - general: r"(?:11|[2-579]\d)\d{7}", + general: r"(?:11|[2-57-9]\d)\d{7}", mobile: - r"700[1-9]\d{5}|(?:7(?:0[1-9]|1[0-8]|2[1-35-79]|3\d|77|86|99)|9\d\d)\d{6}", + r"700[1-9]\d{5}|(?:7(?:0[1-9]|1[0-8]|2[1-35-79]|3\d|77|86|99)|(?:8[01]|9\d)\d)\d{6}", fixedLine: r"(?:11(?:[124]\d\d|3(?:[0-79]\d|8[0-7])|5(?:[02-9]\d|1[0-57-9])|6(?:[02-79]\d|1[0-57-9]|8[0-8]))|2(?:2(?:11[1-9]|22[0-7]|33\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|(?:22|55)[0-6]|33[0134689]|44[04]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:119|22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:(?:11|22)[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\d)))\d{4}", voip: r"", @@ -1255,7 +1253,7 @@ const metadataPatternsByIsoCode = { nationalPrefixTransformRule: null, general: r"(?:[3-57]\d\d|800)\d{6}", mobile: - r"5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\d|22252[0-4])\d\d|5(?:0(?:0(?:1[09]|70)|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\d{3}|(?:5(?:0(?:0(?:0\d|1[12]|22|3[0-6]|44|5[05]|77|88|9[09])|(?:[14]\d|77)\d|22[02])|1(?:1(?:[03][01]|[124]\d|5[2-6]|7[0-6])|4\d\d)|[23]555|4(?:4\d\d|555)|5(?:[0157-9]\d\d|200|333|444)|6[89]\d\d|7(?:(?:[0147-9]\d|22)\d|5(?:00|[57]5))|8(?:0(?:[018]\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\d\d))|790\d\d)\d{4}", + r"5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\d|22252[0-4])\d\d|5(?:0(?:0(?:1[09]|70)|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\d{3}|(?:5(?:0(?:0(?:0\d|1[12]|22|3[0-6]|44|5[05]|77|88|9[09])|(?:[14]\d|77)\d|22[02])|1(?:1(?:[03][01]|[124]\d|5[2-6]|7[0-6])|4\d\d)|[23]555|4(?:4\d\d|555)|5(?:[0157-9]\d\d|200|333|4(?:44|55))|6[89]\d\d|7(?:(?:[0147-9]\d|22)\d|5(?:00|[57]5))|8(?:0(?:[018]\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\d\d))|790\d\d)\d{4}", fixedLine: r"(?:3(?:[256]\d|4[124-9]|7[0-4])|4(?:1\d|2[2-7]|3[1-79]|4[2-8]|7[239]|9[1-7]))\d{6}", voip: r"70[67]\d{6}", @@ -1349,9 +1347,9 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: null, nationalPrefixTransformRule: null, general: r"[2-9]\d{6}", - mobile: r"556\d{4}|(?:[23679]\d|4[015]|5[0-489]|8[67])\d{5}", + mobile: r"556\d{4}|(?:[23679]\d|4[015]|5[0-489]|8[4-7])\d{5}", fixedLine: - r"(?:4(?:[23]\d\d|4(?:1[024679]|[6-9]\d))|5(?:5(?:3\d|4[0-7])|6[67]\d|7(?:1[04]|2[035]|3[58]|48))|8[0-589]\d\d)\d{3}", + r"(?:4(?:[23]\d\d|4(?:1[024679]|[6-9]\d))|5(?:5(?:3\d|4[0-7])|6[67]\d|7(?:1[04]|2[035]|3[58]|48))|8[0-389]\d\d)\d{3}", voip: r"", tollFree: r"", premiumRate: r"", @@ -1642,7 +1640,7 @@ const metadataPatternsByIsoCode = { nationalPrefixTransformRule: null, general: r"(?:000800|[2-9]\d\d)\d{7}|1\d{7,12}", mobile: - r"(?:6(?:1279|828[01489])|7(?:887[02-9]|9(?:313|79[07-9]))|8(?:079[04-9]|(?:84|91)7[02-8]))\d{5}|(?:160[01]|6(?:12|[2-47]1|5[17]|6[13]|80)[0189]|7(?:1(?:2[0189]|9[0-5])|2(?:[14][017-9]|8[0-59])|3(?:2[5-8]|[34][017-9]|9[016-9])|4(?:1[015-9]|[29][89]|39|8[389])|5(?:[15][017-9]|2[04-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589])|70[0289]|88[089]|97[02-8])|8(?:0(?:6[67]|7[02-8])|70[017-9]|84[01489]|91[0-289]))\d{6}|(?:7(?:31|4[47])|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[0189]\d|7[02-8])\d{5}|(?:6(?:[09]\d|1[04679]|2[03689]|3[05-9]|4[0489]|50|6[069]|7[07]|8[7-9])|7(?:0\d|2[0235-79]|3[05-8]|40|5[0346-8]|6[6-9]|7[1-9]|8[0-79]|9[089])|8(?:0[01589]|1[0-57-9]|2[235-9]|3[03-57-9]|[45]\d|6[02457-9]|7[1-69]|8[0-25-9]|9[02-9])|9\d\d)\d{7}|(?:6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578])\d|7(?:[235689]\d|4[0189])|8(?:[14-6]\d|2[0-79]))|7(?:1(?:[013-8]\d|9[6-9])|28[6-8]|3(?:2[0-49]|9[2-5])|4(?:1[2-4]|[29][0-7]|3[0-8]|[56]\d|8[0-24-7])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]|881))[0189]\d{5}", + r"(?:6(?:1279|828[01489])|7(?:887[02-9]|9(?:313|79[07-9]))|8(?:079[04-9]|(?:84|91)7[02-8]))\d{5}|(?:160[01]|6(?:(?:12|[2-4]1|5[17]|6[13]|80)[0189]|7(?:1[0189]|86))|7(?:1(?:2[0189]|9[0-5])|3(?:2[5-8]|[34][017-9]|9[016-9])|5(?:[15][017-9]|2[04-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589])|70[0289]|88[089]|97[02-8])|8(?:0(?:6[67]|7[02-8])|70[017-9]|84[01489]|91[0-289]))\d{6}|(?:731|8(?:16|2[014]|3[126]|6[136]|7[78]|83))(?:[0189]\d|7[02-8])\d{5}|(?:6(?:(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578])\d|7(?:[23569]\d|4[0189]|8[0-57-9])|8(?:[14-6]\d|2[0-79]))|7(?:1(?:[013-8]\d|9[6-9])|3(?:2[0-49]|9[2-5])|5(?:2[1-3]|9[0-6])|6(?:0[5689]|2[5-9]|3[02-8]|4\d|5[0-367])|70[13-7]|881))[0189]\d{5}|(?:6(?:[09]\d|1[04679]|2[03689]|3[05-9]|4[0489]|50|6[069]|7[07]|8[7-9])|7(?:[024]\d|3[05-8]|5[0346-8]|6[6-9]|7[1-9]|8[0-79]|9[089])|8(?:0[01589]|1[0-57-9]|2[235-9]|3[03-57-9]|[45]\d|6[02457-9]|7[1-69]|8[0-25-9]|9[02-9])|9\d\d)\d{7}", fixedLine: r"(?:2717(?:[2-7]\d|95)|6828[235-7]\d)\d{4}|(?:170[24]|280[13468]|4(?:20[24]|72[2-8])|552[1-7])\d{6}|(?:271[0-689]|682[0-79]|782[0-6])[2-7]\d{5}|(?:2(?:[02][2-79]|90)|3(?:23|80)|683|79[1-7])\d{7}|(?:11|33|4[04]|80)[2-7]\d{7}|(?:342|674|788)(?:[0189][2-7]|[2-7]\d)\d{5}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[13]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[014-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\d{6}|(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[3-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1245]|4[5-8]|5[125689]|6[235-7]|7[157-9]|8[2-46-8])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[14-6])|7(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|8[013-7]|9[089])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\d[2-7]\d{5}", voip: r"", @@ -3128,8 +3126,7 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: null, nationalPrefixTransformRule: null, general: r"(?:(?:1\d|8)\d\d|7000)\d{7}|[3689]\d{7}", - mobile: - r"89(?:8[02-9]|9[0-6])\d{4}|(?:8(?:0[1-9]|[1-8]\d|9[0-7])|9[0-8]\d)\d{5}", + mobile: r"898[02-9]\d{4}|(?:8(?:0[1-9]|[1-8]\d|9[0-79])|9[0-8]\d)\d{5}", fixedLine: r"662[0-24-9]\d{4}|6(?:[0-578]\d|6[013-57-9]|9[0-35-9])\d{5}", voip: r"(?:3[12]\d|666)\d{5}", tollFree: r"(?:18|8)00\d{7}", @@ -3549,9 +3546,10 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: null, nationalPrefixTransformRule: null, general: r"4\d{6}|8\d{11,12}|(?:[2-58]\d\d|900)\d{7}", - mobile: r"561(?:011|61\d)\d{4}|5(?:[03-5]\d|1[06]|24|7[45]|9[46])\d{7}", + mobile: + r"561(?:011|61\d)\d{4}|5(?:[03-5]\d|1[06]|24|6[24]|7[245]|9[46])\d{7}", fixedLine: - r"(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\d{7}", + r"(?:2(?:1[26]|[28][2468]|[3-5][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\d{7}", voip: r"850\d{7}", tollFree: r"8(?:00\d{7}(?:\d{2,3})?|11\d{7})", premiumRate: r"(?:8[89]8|900)\d{7}", @@ -3644,7 +3642,7 @@ const metadataPatternsByIsoCode = { nationalPrefixForParsing: null, nationalPrefixTransformRule: null, general: r"800\d{6}|(?:[29]0|[347]\d)\d{7}", - mobile: r"72[48]0\d{5}|7(?:[014-8]\d|2[0167]|3[06]|9[0-3589])\d{6}", + mobile: r"72[48]0\d{5}|7(?:[014-8]\d|2[0167]|3[06]|9[0-589])\d{6}", fixedLine: r"20(?:(?:240|30[67])\d|6(?:00[0-2]|30[0-4]))\d{3}|(?:20(?:[017]\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\d{3})\d{5}", voip: r"", @@ -3795,7 +3793,7 @@ const metadataPatternsByIsoCode = { nationalPrefixTransformRule: null, general: r"[12]\d{9}|[135-9]\d{8}|[16]\d{7}|[16-8]\d{6}", mobile: - r"(?:5(?:2[238]|59)|89[6-9]|99[013-9])\d{6}|(?:3\d|5[1689]|7[06-9]|8[1-8]|9[0-8])\d{7}", + r"121[0-3]\d{5}|(?:160|(?:3\d|7[06-9])\d|5(?:[1689]\d|2[238]|59)|8(?:[1-8]\d|9[6-9])|9(?:[0-8]\d|9[013-9]))\d{6}", fixedLine: r"2(?:0[3-9]|1[0-689]|2[0-25-9]|[38][2-9]|4[2-8]|5[124-9]|6[0-39]|7[0-7]|9[0-4679])\d{7}", voip: r"672\d{6}", diff --git a/pubspec.yaml b/pubspec.yaml index f8bda58..31ae187 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: phone_numbers_parser description: Dart library for parsing phone numbers. Inspired by Google's libphonenumber and PhoneNumberKit for ios. -version: 9.0.22 +version: 9.0.23 homepage: https://github.com/cedvdb/phone_number_parser environment: diff --git a/resources/data_sources/PhoneNumberMetadata.xml b/resources/data_sources/PhoneNumberMetadata.xml index eda5005..0545b09 100644 --- a/resources/data_sources/PhoneNumberMetadata.xml +++ b/resources/data_sources/PhoneNumberMetadata.xml @@ -465,7 +465,7 @@ 235| 4(?: 69| - 76 + 7[67] )| 5(?: 3[6-9]| @@ -4387,13 +4387,14 @@ - [235]| - 4[46] + [23]| + 4[46]| + 50 $1 $2 - [67] + [5-7] $1 @@ -4403,11 +4404,10 @@ - 8001\d{5}| (?: - [2-467]\d| - 50 - )\d{6} + [2-7]\d\d| + 8001 + )\d{5} @@ -4472,7 +4472,12 @@ 71234567 - [67]\d{7} + + (?: + 57| + [67]\d + )\d{6} + @@ -6211,7 +6216,7 @@ )| 3(?: (?: - 2\d| + [24]\d| 50 )\d| 3(?: @@ -6289,7 +6294,7 @@ )| 3(?: (?: - 2\d| + [24]\d| 50 )\d| 3(?: @@ -8853,17 +8858,12 @@ 601123456 - 7(?: - 060\d| - 19(?: - [0-5]\d| - 6[0-6] - ) - )\d{4}| + 7060\d{5}| (?: 60[1-8]| 7(?: 0[2-5]| + 19| [2379]\d ) )\d{6} @@ -9322,19 +9322,16 @@ 15123456789 1(?: - (?: - 5(?: - [0-25-9]\d\d| - 3(?: - 10| - 33 - ) - )| - 7[26-9]\d\d - )\d{6}| - 6[023]\d{7,8} - )| - 17\d{8} + 6[023]| + 7\d + )\d{7,8}| + 15(?: + [0-25-9]\d\d| + 3(?: + 10| + 33 + ) + )\d{6} @@ -9872,9 +9869,7 @@ 9619\d{5}| (?: - 1\d| - 2[013-79]| - 3[0-8]| + [1-3]\d| 4[013-689] )\d{6} @@ -9887,18 +9882,15 @@ 551234567 + 5(?: + 4[0-29]| + 6[0-3] + )\d{6}| (?: - 5(?: - 4[0-29]| - 5\d| - 6[0-3] - )| - 6(?: - [569]\d| - 7[0-6] - )| - 7[7-9]\d - )\d{6} + 55| + 6\d| + 7[7-9] + )\d{7} @@ -10482,7 +10474,7 @@ - [1-579] + [1-57-9] $1 $2 $3 @@ -10490,7 +10482,7 @@ (?: 11| - [2-579]\d + [2-57-9]\d )\d{7} @@ -10613,7 +10605,10 @@ 86| 99 )| - 9\d\d + (?: + 8[01]| + 9\d + )\d )\d{6} @@ -12025,7 +12020,10 @@ [0157-9]\d\d| 200| 333| - 444 + 4(?: + 44| + 55 + ) )| 6[89]\d\d| 7(?: @@ -12532,7 +12530,7 @@ 48 ) )| - 8[0-589]\d\d + 8[0-389]\d\d )\d{3} @@ -12546,7 +12544,7 @@ [23679]\d| 4[015]| 5[0-489]| - 8[67] + 8[4-7] )\d{5} @@ -14808,7 +14806,6 @@ 7(?: 12| 3[134]| - 4[47]| 61| 88 )| @@ -14829,8 +14826,7 @@ (?: 1[59]| 29| - 67| - 72 + 67 )[14] @@ -14882,7 +14878,6 @@ 674| 7(?: (?: - 2[14]| 3[34]| 5[15] )[2-6]| @@ -14911,8 +14906,7 @@ )| 7(?: 12| - 31| - 4[47] + 31 )| 8(?: 16| @@ -14978,11 +14972,8 @@ 74[2-7] )| 7(?: - (?: - 2[14]| - 5[15] - )[2-6]| 3171| + 5[15][2-6]| 61[346]| 88(?: [2-7]| @@ -15001,16 +14992,13 @@ ) )| 73[134][2-6]| - (?: - 74[47]| - 8(?: - 16| - 2[014]| - 3[126]| - 6[136]| - 7[78]| - 83 - ) + 8(?: + 16| + 2[014]| + 3[126]| + 6[136]| + 7[78]| + 83 )(?: [2-6]| 7[19] @@ -15062,9 +15050,7 @@ )| 7(?: 1[013-9]| - 28| 3[129]| - 4[1-35689]| 5[29]| 6[02-5]| 70 @@ -15091,7 +15077,10 @@ 4[235-7]| 5[2-689]| 6[24578]| - 7[235689]| + 7(?: + [23569]| + 8[0-57-9] + )| 8[1-6] )| 7(?: @@ -15099,19 +15088,11 @@ [013-8]| 9[6-9] )| - 28[6-8]| 3(?: 17| 2[0-49]| 9[2-57] )| - 4(?: - 1[2-4]| - [29][0-7]| - 3[0-8]| - [56]| - 8[0-24-7] - )| 5(?: 2[1-3]| 9[0-6] @@ -15161,9 +15142,12 @@ 3[2-4]| 4[235-7]| 5[2-689]| - 6[24578]| - 7[235689] + 6[24578] )\d| + 7(?: + [23569]\d| + 8[0-57-9] + )| 8(?: [14-6]\d| 2[0-79] @@ -15174,18 +15158,10 @@ [013-8]\d| 9[6-9] )| - 28[6-8]| 3(?: 2[0-49]| 9[2-57] )| - 4(?: - 1[2-4]| - [29][0-7]| - 3[0-8]| - [56]\d| - 8[0-24-7] - )| 5(?: 2[1-3]| 9[0-6] @@ -15508,32 +15484,28 @@ (?: 160[01]| 6(?: - 12| - [2-47]1| - 5[17]| - 6[13]| - 80 - )[0189]| + (?: + 12| + [2-4]1| + 5[17]| + 6[13]| + 80 + )[0189]| + 7(?: + 1[0189]| + 86 + ) + )| 7(?: 1(?: 2[0189]| 9[0-5] )| - 2(?: - [14][017-9]| - 8[0-59] - )| 3(?: 2[5-8]| [34][017-9]| 9[016-9] )| - 4(?: - 1[015-9]| - [29][89]| - 39| - 8[389] - )| 5(?: [15][017-9]| 2[04-9]| @@ -15561,10 +15533,7 @@ ) )\d{6}| (?: - 7(?: - 31| - 4[47] - )| + 731| 8(?: 16| 2[014]| @@ -15577,42 +15546,6 @@ [0189]\d| 7[02-8] )\d{5}| - (?: - 6(?: - [09]\d| - 1[04679]| - 2[03689]| - 3[05-9]| - 4[0489]| - 50| - 6[069]| - 7[07]| - 8[7-9] - )| - 7(?: - 0\d| - 2[0235-79]| - 3[05-8]| - 40| - 5[0346-8]| - 6[6-9]| - 7[1-9]| - 8[0-79]| - 9[089] - )| - 8(?: - 0[01589]| - 1[0-57-9]| - 2[235-9]| - 3[03-57-9]| - [45]\d| - 6[02457-9]| - 7[1-69]| - 8[0-25-9]| - 9[02-9] - )| - 9\d\d - )\d{7}| (?: 6(?: (?: @@ -15624,8 +15557,9 @@ 6[24578] )\d| 7(?: - [235689]\d| - 4[0189] + [23569]\d| + 4[0189]| + 8[0-57-9] )| 8(?: [14-6]\d| @@ -15637,18 +15571,10 @@ [013-8]\d| 9[6-9] )| - 28[6-8]| 3(?: 2[0-49]| 9[2-5] )| - 4(?: - 1[2-4]| - [29][0-7]| - 3[0-8]| - [56]\d| - 8[0-24-7] - )| 5(?: 2[1-3]| 9[0-6] @@ -15663,7 +15589,41 @@ 70[13-7]| 881 ) - )[0189]\d{5} + )[0189]\d{5}| + (?: + 6(?: + [09]\d| + 1[04679]| + 2[03689]| + 3[05-9]| + 4[0489]| + 50| + 6[069]| + 7[07]| + 8[7-9] + )| + 7(?: + [024]\d| + 3[05-8]| + 5[0346-8]| + 6[6-9]| + 7[1-9]| + 8[0-79]| + 9[089] + )| + 8(?: + 0[01589]| + 1[0-57-9]| + 2[235-9]| + 3[03-57-9]| + [45]\d| + 6[02457-9]| + 7[1-69]| + 8[0-25-9]| + 9[02-9] + )| + 9\d\d + )\d{7} - - 5(?: - [0-579]| - 61 - ) - - - 5(?: - [0-579]| - 61[06] - ) - - - 5(?: - [0-579]| - 61[06]1 - ) - + 5[0-79] $1 $2 $3 $4 - 1 + + 1(?: + 2[02]| + [89] + ) + $1 $2 - 6 + + 1[26]| + 6 + $1 $2 $3 $4 912345678 + 121[0-3]\d{5}| (?: + 160| + (?: + 3\d| + 7[06-9] + )\d| 5(?: + [1689]\d| 2[238]| 59 )| - 89[6-9]| - 99[013-9] - )\d{6}| - (?: - 3\d| - 5[1689]| - 7[06-9]| - 8[1-8]| - 9[0-8] - )\d{7} + 8(?: + [1-8]\d| + 9[6-9] + )| + 9(?: + [0-8]\d| + 9[013-9] + ) + )\d{6}