From 3b053f74be3c2dd53311d651027e45fe4ea44389 Mon Sep 17 00:00:00 2001 From: Daniel Bruhn Date: Mon, 30 Jun 2025 10:01:45 -0400 Subject: [PATCH] chore: add metadata and update RU meta test for libphonenumber v9.0.8 --- server/metadata/metadata.json | 28 ++++----- test/test-loadMeta.js | 108 +++++++++++++++++++++++----------- 2 files changed, 88 insertions(+), 48 deletions(-) diff --git a/server/metadata/metadata.json b/server/metadata/metadata.json index 67ec4c5..6b41622 100644 --- a/server/metadata/metadata.json +++ b/server/metadata/metadata.json @@ -4884,7 +4884,7 @@ [ null, null, - "[025-7]\\d{7}", + "(?:[025-7]\\d|44)\\d{6}", null, null, null, @@ -4907,7 +4907,7 @@ [ null, null, - "(?:0[1-7]|5[0-8]|[67]\\d)\\d{6}", + "(?:0[1-7]|44|5[0-8]|[67]\\d)\\d{6}", null, null, null, @@ -4999,7 +4999,7 @@ "(\\d{2})(\\d{2})(\\d{2})(\\d{2})", "$1 $2 $3 $4", [ - "[025-7]" + "[024-7]" ] ] ], @@ -13075,7 +13075,7 @@ [ null, null, - "1(?:(?:5(?:[0-25-9]\\d\\d|310)|7[26]\\d\\d)\\d{6}|6[023]\\d{7,8})|17\\d{8}", + "15310\\d{6}|1(?:5[0-25-9]\\d|7[013-5])\\d{7}|1(?:6[023]|7[26-9])\\d{7,8}", null, null, null, @@ -15205,7 +15205,7 @@ [ null, null, - "(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-7]))\\d{6}", + "(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-8]|5[0-3]|8[0-7]))\\d{6}", null, null, null, @@ -20950,7 +20950,7 @@ [ null, null, - "(?:510|6\\d\\d|7(?:[0-5]\\d|6[01]))\\d{4}", + "(?:510|6\\d\\d|7(?:[0-5]\\d|6[019]|70))\\d{4}", null, null, null, @@ -21143,7 +21143,7 @@ [ null, null, - "(?:4(?:44[0-35-9]|6(?:1[0-79]|4[0-57-9]|6[0-4])|7(?:[26][0-5]|4[0-48]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|(?:66|78)[0-5])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[015])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}", + "(?:4(?:44[0-35-9]|6(?:4[0-57-9]|6[0-4])|7(?:30|4[0-48]|6[0-5]))|5(?:35[4-8]|73[0-6]|95[0-8])|6(?:26[013-8]|(?:66|78)[0-5])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[0-357-9]|7[0-25])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}", null, null, null, @@ -21849,7 +21849,7 @@ [ null, null, - "(?:[2-489]\\d|55)\\d{6}", + "[2-589]\\d{7}", null, null, null, @@ -21872,7 +21872,7 @@ [ null, null, - "(?:[34]\\d|55)\\d{6}", + "(?:[34]\\d|5[56])\\d{6}", null, null, null, @@ -28633,7 +28633,7 @@ ] ], null, - "33|7", + "33622|7", [ null, null, @@ -31110,7 +31110,7 @@ [ null, null, - "(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-7]))\\d{6}", + "(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-8]|5[0-3]|8[0-7]))\\d{6}", null, null, null, @@ -42981,7 +42981,7 @@ [ null, null, - "(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15]|6[1-35-79]|7[1-37-9]))\\d{7}", + "336(?:[013-9]\\d|2[013-9])\\d{5}|(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15-7]|6[0-35-79]|7[1-37-9]))\\d{7}", null, null, null, @@ -43225,7 +43225,7 @@ ] ], 1, - "3[04-689]|[489]", + null, [ null, null, @@ -52071,7 +52071,7 @@ [ null, null, - "72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-8]|9[0189])\\d{6}", + "72[48]0\\d{5}|7(?:[014-8]\\d|2[067]|36|9[0189])\\d{6}", null, null, null, diff --git a/test/test-loadMeta.js b/test/test-loadMeta.js index b423d2d..8a02394 100644 --- a/test/test-loadMeta.js +++ b/test/test-loadMeta.js @@ -41,7 +41,7 @@ describe('Generic metadata loading tests', function () { [ null, null, - '(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15]|6[1-35-79]|7[1-37-9]))\\d{7}', + '336(?:[013-9]\\d|2[013-9])\\d{5}|(?:3(?:0[12]|4[1-35-79]|5[1-3]|65|8[1-58]|9[0145])|4(?:01|1[1356]|2[13467]|7[1-5]|8[1-7]|9[1-689])|8(?:1[1-8]|2[01]|3[13-6]|4[0-8]|5[15-7]|6[0-35-79]|7[1-37-9]))\\d{7}', null, null, null, @@ -52,11 +52,16 @@ describe('Generic metadata loading tests', function () { [7] ], [ - null, null, - '9\\d{9}', null, - null, null, - '9123456789', null, - null, [10] + null, + null, + '9\\d{9}', + null, + null, + null, + '9123456789', + null, + null, + [10] ], [ null, @@ -80,22 +85,39 @@ describe('Generic metadata loading tests', function () { [10] ], [ - null, null, null, - null, null, null, - null, null, null, + null, + null, + null, + null, + null, + null, + null, + null, + null, [-1] ], [ - null, null, - '808\\d{7}', null, - null, null, - '8081234567', null, - null, [10] + null, + null, + '808\\d{7}', + null, + null, + null, + '8081234567', + null, + null, + [10] ], [ - null, null, null, - null, null, null, - null, null, null, + null, + null, + null, + null, + null, + null, + null, + null, + null, [-1] ], 'RU', @@ -109,7 +131,12 @@ describe('Generic metadata loading tests', function () { '8~10', null, [ - [null, '(\\d{3})(\\d{2})(\\d{2})', '$1-$2-$3', ['[0-79]']], + [ + null, + '(\\d{3})(\\d{2})(\\d{2})', + '$1-$2-$3', + ['[0-79]'] + ], [ null, '(\\d{4})(\\d{2})(\\d{2})(\\d{2})', @@ -216,33 +243,46 @@ describe('Generic metadata loading tests', function () { ] ], [ - null, null, null, - null, null, null, - null, null, null, + null, + null, + null, + null, + null, + null, + null, + null, + null, [-1] ], 1, - '3[04-689]|[489]', + null, [ - null, null, null, - null, null, null, - null, null, null, + null, + null, + null, + null, + null, + null, + null, + null, + null, [-1] ], [ - null, null, null, - null, null, null, - null, null, null, + null, + null, + null, + null, + null, + null, + null, + null, + null, [-1] ], null, null, - [ - null, null, null, - null, null, null, - null, null, null, - [-1] - ] + [null, null, null, null, null, null, null, null, null, [-1]] ] } });