diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 7b55aba..505c1e5 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -50,6 +50,15 @@ jobs: npm run test:coverage working-directory: transformers/js-dvhcvn + - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 + - name: transformers/dart-dvhcvn + run: | + set -e + dart pub get + dart pub global activate coverage + dart pub global run coverage:test_with_coverage + working-directory: transformers/dart-dvhcvn + - uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/data/date.txt b/data/date.txt index a41d976..10cd22b 100644 --- a/data/date.txt +++ b/data/date.txt @@ -1 +1 @@ -10/04/2023 +01/11/2024 diff --git a/data/dvhcvn.json b/data/dvhcvn.json index 677f80a..66a419e 100644 --- a/data/dvhcvn.json +++ b/data/dvhcvn.json @@ -6323,11 +6323,6 @@ "name": "Xã Tân Thanh", "type": "Xã" }, - { - "level3_id": "02593", - "name": "Xã Vân Sơn", - "type": "Xã" - }, { "level3_id": "02596", "name": "Xã Văn Phú", @@ -6350,7 +6345,7 @@ }, { "level3_id": "02608", - "name": "Xã Hồng Lạc", + "name": "Xã Hồng Sơn", "type": "Xã" }, { @@ -6795,11 +6790,6 @@ "name": "Xã Bản Liền", "type": "Xã" }, - { - "level3_id": "02872", - "name": "Xã Tà Chải", - "type": "Xã" - }, { "level3_id": "02875", "name": "Xã Na Hối", @@ -13519,11 +13509,6 @@ "name": "Phường Hùng Thắng", "type": "Phường" }, - { - "level3_id": "06682", - "name": "Phường Yết Kiêu", - "type": "Phường" - }, { "level3_id": "06685", "name": "Phường Trần Hưng Đạo", @@ -13651,11 +13636,6 @@ "name": "Phường Ninh Dương", "type": "Phường" }, - { - "level3_id": "06718", - "name": "Phường Hoà Lạc", - "type": "Phường" - }, { "level3_id": "06721", "name": "Phường Trà Cổ", @@ -13795,12 +13775,7 @@ }, { "level3_id": "06799", - "name": "Xã Cộng Hòa", - "type": "Xã" - }, - { - "level3_id": "06802", - "name": "Xã Cẩm Hải", + "name": "Xã Hải Hòa", "type": "Xã" }, { @@ -14117,18 +14092,13 @@ }, { "level3_id": "06985", - "name": "Xã Lương Mông", + "name": "Xã Lương Minh", "type": "Xã" }, { "level3_id": "06988", "name": "Xã Đồn Đạc", "type": "Xã" - }, - { - "level3_id": "06991", - "name": "Xã Minh Cầm", - "type": "Xã" } ] }, @@ -14201,19 +14171,14 @@ }, { "level2_id": "205", - "name": "Thị xã Đông Triều", - "type": "Thị xã", + "name": "Thành phố Đông Triều", + "type": "Thành phố", "level3s": [ { "level3_id": "07069", "name": "Phường Mạo Khê", "type": "Phường" }, - { - "level3_id": "07072", - "name": "Phường Đông Triều", - "type": "Phường" - }, { "level3_id": "07075", "name": "Xã An Sinh", @@ -14226,23 +14191,18 @@ }, { "level3_id": "07081", - "name": "Xã Bình Khê", - "type": "Xã" + "name": "Phường Bình Khê", + "type": "Phường" }, { "level3_id": "07084", "name": "Xã Việt Dân", "type": "Xã" }, - { - "level3_id": "07087", - "name": "Xã Tân Việt", - "type": "Xã" - }, { "level3_id": "07090", - "name": "Xã Bình Dương", - "type": "Xã" + "name": "Phường Bình Dương", + "type": "Phường" }, { "level3_id": "07093", @@ -14261,8 +14221,8 @@ }, { "level3_id": "07102", - "name": "Xã Thủy An", - "type": "Xã" + "name": "Phường Thủy An", + "type": "Phường" }, { "level3_id": "07105", @@ -14306,8 +14266,8 @@ }, { "level3_id": "07129", - "name": "Xã Yên Đức", - "type": "Xã" + "name": "Phường Yên Đức", + "type": "Phường" } ] }, @@ -15335,8 +15295,8 @@ }, { "level2_id": "222", - "name": "Huyện Việt Yên", - "type": "Huyện", + "name": "Thị Xã Việt Yên", + "type": "Thị xã", "level3s": [ { "level3_id": "07759", @@ -15365,13 +15325,13 @@ }, { "level3_id": "07774", - "name": "Xã Tự Lạn", - "type": "Xã" + "name": "Phường Tự Lạn", + "type": "Phường" }, { "level3_id": "07777", - "name": "Thị trấn Bích Động", - "type": "Thị trấn" + "name": "Phường Bích Động", + "type": "Phường" }, { "level3_id": "07780", @@ -15380,8 +15340,8 @@ }, { "level3_id": "07783", - "name": "Xã Hồng Thái", - "type": "Xã" + "name": "Phường Hồng Thái", + "type": "Phường" }, { "level3_id": "07786", @@ -15390,28 +15350,28 @@ }, { "level3_id": "07789", - "name": "Xã Tăng Tiến", - "type": "Xã" + "name": "Phường Tăng Tiến", + "type": "Phường" }, { "level3_id": "07792", - "name": "Xã Quảng Minh", - "type": "Xã" + "name": "Phường Quảng Minh", + "type": "Phường" }, { "level3_id": "07795", - "name": "Thị trấn Nếnh", - "type": "Thị trấn" + "name": "Phường Nếnh", + "type": "Phường" }, { "level3_id": "07798", - "name": "Xã Ninh Sơn", - "type": "Xã" + "name": "Phường Ninh Sơn", + "type": "Phường" }, { "level3_id": "07801", - "name": "Xã Vân Trung", - "type": "Xã" + "name": "Phường Vân Trung", + "type": "Phường" }, { "level3_id": "07804", @@ -15420,8 +15380,8 @@ }, { "level3_id": "07807", - "name": "Xã Quang Châu", - "type": "Xã" + "name": "Phường Quang Châu", + "type": "Phường" } ] }, @@ -21816,11 +21776,6 @@ "name": "Xã Quỳnh Hưng", "type": "Xã" }, - { - "level3_id": "12556", - "name": "Xã Quỳnh Bảo", - "type": "Xã" - }, { "level3_id": "12559", "name": "Xã An Mỹ", @@ -21836,11 +21791,6 @@ "name": "Xã An Vinh", "type": "Xã" }, - { - "level3_id": "12568", - "name": "Xã Quỳnh Xá", - "type": "Xã" - }, { "level3_id": "12571", "name": "Xã An Dục", @@ -21853,7 +21803,7 @@ }, { "level3_id": "12577", - "name": "Xã Quỳnh Trang", + "name": "Xã Trang Bảo Xá", "type": "Xã" }, { @@ -21880,7 +21830,7 @@ }, { "level3_id": "12589", - "name": "Xã Điệp Nông", + "name": "Xã Quang Trung", "type": "Xã" }, { @@ -21893,11 +21843,6 @@ "name": "Xã Cộng Hòa", "type": "Xã" }, - { - "level3_id": "12598", - "name": "Xã Dân Chủ", - "type": "Xã" - }, { "level3_id": "12601", "name": "Xã Canh Tân", @@ -21908,11 +21853,6 @@ "name": "Xã Hòa Tiến", "type": "Xã" }, - { - "level3_id": "12607", - "name": "Xã Hùng Dũng", - "type": "Xã" - }, { "level3_id": "12610", "name": "Xã Tân Tiến", @@ -22060,24 +22000,14 @@ "name": "Thị trấn Đông Hưng", "type": "Thị trấn" }, - { - "level3_id": "12691", - "name": "Xã Đô Lương", - "type": "Xã" - }, { "level3_id": "12694", "name": "Xã Đông Phương", "type": "Xã" }, - { - "level3_id": "12697", - "name": "Xã Liên Giang", - "type": "Xã" - }, { "level3_id": "12700", - "name": "Xã An Châu", + "name": "Xã Liên An Đô", "type": "Xã" }, { @@ -22120,24 +22050,14 @@ "name": "Xã Đông Xá", "type": "Xã" }, - { - "level3_id": "12727", - "name": "Xã Chương Dương", - "type": "Xã" - }, { "level3_id": "12730", "name": "Xã Nguyên Xá", "type": "Xã" }, - { - "level3_id": "12733", - "name": "Xã Phong Châu", - "type": "Xã" - }, { "level3_id": "12736", - "name": "Xã Hợp Tiến", + "name": "Xã Phong Dương Tiến", "type": "Xã" }, { @@ -22192,7 +22112,7 @@ }, { "level3_id": "12775", - "name": "Xã Đông Động", + "name": "Xã Xuân Quang Động", "type": "Xã" }, { @@ -22215,16 +22135,6 @@ "name": "Xã Đông Quan", "type": "Xã" }, - { - "level3_id": "12796", - "name": "Xã Đông Quang", - "type": "Xã" - }, - { - "level3_id": "12799", - "name": "Xã Đông Xuân", - "type": "Xã" - }, { "level3_id": "12802", "name": "Xã Đông Á", @@ -22454,11 +22364,6 @@ "name": "Xã Đông Long", "type": "Xã" }, - { - "level3_id": "12982", - "name": "Xã Đông Quí", - "type": "Xã" - }, { "level3_id": "12985", "name": "Xã Vũ Lăng", @@ -22481,7 +22386,7 @@ }, { "level3_id": "12997", - "name": "Xã Đông Trung", + "name": "Xã Đông Quang", "type": "Xã" }, { @@ -22494,11 +22399,6 @@ "name": "Xã Đông Minh", "type": "Xã" }, - { - "level3_id": "13009", - "name": "Xã Đông Phong", - "type": "Xã" - }, { "level3_id": "13012", "name": "Xã An Ninh", @@ -22526,12 +22426,7 @@ }, { "level3_id": "13030", - "name": "Xã Tây Phong", - "type": "Xã" - }, - { - "level3_id": "13033", - "name": "Xã Tây Tiến", + "name": "Xã Ái Quốc", "type": "Xã" }, { @@ -22544,11 +22439,6 @@ "name": "Xã Vân Trường", "type": "Xã" }, - { - "level3_id": "13042", - "name": "Xã Nam Thắng", - "type": "Xã" - }, { "level3_id": "13045", "name": "Xã Nam Chính", @@ -22571,7 +22461,7 @@ }, { "level3_id": "13057", - "name": "Xã Nam Thanh", + "name": "Xã Nam Tiến", "type": "Xã" }, { @@ -22656,19 +22546,9 @@ "name": "Xã Thanh Tân", "type": "Xã" }, - { - "level3_id": "13117", - "name": "Xã Thượng Hiền", - "type": "Xã" - }, { "level3_id": "13120", - "name": "Xã Nam Cao", - "type": "Xã" - }, - { - "level3_id": "13123", - "name": "Xã Đình Phùng", + "name": "Xã Thống Nhất", "type": "Xã" }, { @@ -22711,11 +22591,6 @@ "name": "Xã Vũ Trung", "type": "Xã" }, - { - "level3_id": "13153", - "name": "Xã Vũ Thắng", - "type": "Xã" - }, { "level3_id": "13156", "name": "Xã Vũ Công", @@ -22723,7 +22598,7 @@ }, { "level3_id": "13159", - "name": "Xã Vũ Hòa", + "name": "Xã Hồng Vũ", "type": "Xã" }, { @@ -22741,11 +22616,6 @@ "name": "Xã Minh Quang", "type": "Xã" }, - { - "level3_id": "13174", - "name": "Xã Vũ Bình", - "type": "Xã" - }, { "level3_id": "13177", "name": "Xã Minh Tân", @@ -23536,61 +23406,16 @@ "name": "Thành phố Nam Định", "type": "Thành phố", "level3s": [ - { - "level3_id": "13633", - "name": "Phường Hạ Long", - "type": "Phường" - }, { "level3_id": "13636", - "name": "Phường Trần Tế Xương", - "type": "Phường" - }, - { - "level3_id": "13639", - "name": "Phường Vị Hoàng", - "type": "Phường" - }, - { - "level3_id": "13642", "name": "Phường Vị Xuyên", "type": "Phường" }, - { - "level3_id": "13645", - "name": "Phường Quang Trung", - "type": "Phường" - }, - { - "level3_id": "13648", - "name": "Phường Cửa Bắc", - "type": "Phường" - }, - { - "level3_id": "13651", - "name": "Phường Nguyễn Du", - "type": "Phường" - }, - { - "level3_id": "13654", - "name": "Phường Bà Triệu", - "type": "Phường" - }, { "level3_id": "13657", "name": "Phường Trường Thi", "type": "Phường" }, - { - "level3_id": "13660", - "name": "Phường Phan Đình Phùng", - "type": "Phường" - }, - { - "level3_id": "13663", - "name": "Phường Ngô Quyền", - "type": "Phường" - }, { "level3_id": "13666", "name": "Phường Trần Hưng Đạo", @@ -23598,27 +23423,17 @@ }, { "level3_id": "13669", - "name": "Phường Trần Đăng Ninh", - "type": "Phường" - }, - { - "level3_id": "13672", - "name": "Phường Năng Tĩnh", - "type": "Phường" - }, - { - "level3_id": "13675", - "name": "Phường Văn Miếu", + "name": "Phường Cửa Bắc", "type": "Phường" }, { "level3_id": "13678", - "name": "Phường Trần Quang Khải", + "name": "Phường Năng Tĩnh", "type": "Phường" }, { "level3_id": "13681", - "name": "Phường Thống Nhất", + "name": "Phường Quang Trung", "type": "Phường" }, { @@ -23643,46 +23458,29 @@ }, { "level3_id": "13696", - "name": "Xã Nam Phong", - "type": "Xã" + "name": "Phường Nam Phong", + "type": "Phường" }, { "level3_id": "13699", "name": "Phường Mỹ Xá", "type": "Phường" }, - { - "level3_id": "13702", - "name": "Xã Lộc An", - "type": "Xã" - }, { "level3_id": "13705", - "name": "Xã Nam Vân", - "type": "Xã" - } - ] - }, - { - "level2_id": "358", - "name": "Huyện Mỹ Lộc", - "type": "Huyện", - "level3s": [ + "name": "Phường Nam Vân", + "type": "Phường" + }, { "level3_id": "13708", - "name": "Thị trấn Mỹ Lộc", - "type": "Thị trấn" + "name": "Phường Hưng Lộc", + "type": "Phường" }, { "level3_id": "13711", "name": "Xã Mỹ Hà", "type": "Xã" }, - { - "level3_id": "13714", - "name": "Xã Mỹ Tiến", - "type": "Xã" - }, { "level3_id": "13717", "name": "Xã Mỹ Thắng", @@ -23703,11 +23501,6 @@ "name": "Xã Mỹ Phúc", "type": "Xã" }, - { - "level3_id": "13729", - "name": "Xã Mỹ Hưng", - "type": "Xã" - }, { "level3_id": "13732", "name": "Xã Mỹ Thuận", @@ -23715,12 +23508,7 @@ }, { "level3_id": "13735", - "name": "Xã Mỹ Thịnh", - "type": "Xã" - }, - { - "level3_id": "13738", - "name": "Xã Mỹ Thành", + "name": "Xã Mỹ Lộc", "type": "Xã" } ] @@ -23735,11 +23523,6 @@ "name": "Thị trấn Gôi", "type": "Thị trấn" }, - { - "level3_id": "13744", - "name": "Xã Minh Thuận", - "type": "Xã" - }, { "level3_id": "13747", "name": "Xã Hiển Khánh", @@ -23747,7 +23530,7 @@ }, { "level3_id": "13750", - "name": "Xã Tân Khánh", + "name": "Xã Minh Tân", "type": "Xã" }, { @@ -23760,11 +23543,6 @@ "name": "Xã Đại An", "type": "Xã" }, - { - "level3_id": "13759", - "name": "Xã Tân Thành", - "type": "Xã" - }, { "level3_id": "13762", "name": "Xã Cộng Hòa", @@ -23780,16 +23558,6 @@ "name": "Xã Quang Trung", "type": "Xã" }, - { - "level3_id": "13771", - "name": "Xã Minh Tân", - "type": "Xã" - }, - { - "level3_id": "13774", - "name": "Xã Liên Bảo", - "type": "Xã" - }, { "level3_id": "13777", "name": "Xã Thành Lợi", @@ -23832,24 +23600,14 @@ "name": "Thị trấn Lâm", "type": "Thị trấn" }, - { - "level3_id": "13798", - "name": "Xã Yên Trung", - "type": "Xã" - }, { "level3_id": "13801", - "name": "Xã Yên Thành", - "type": "Xã" - }, - { - "level3_id": "13804", - "name": "Xã Yên Tân", + "name": "Xã Trung Nghĩa", "type": "Xã" }, { "level3_id": "13807", - "name": "Xã Yên Lợi", + "name": "Xã Tân Minh", "type": "Xã" }, { @@ -23857,19 +23615,9 @@ "name": "Xã Yên Thọ", "type": "Xã" }, - { - "level3_id": "13813", - "name": "Xã Yên Nghĩa", - "type": "Xã" - }, - { - "level3_id": "13816", - "name": "Xã Yên Minh", - "type": "Xã" - }, { "level3_id": "13819", - "name": "Xã Yên Phương", + "name": "Xã Phú Hưng", "type": "Xã" }, { @@ -23882,11 +23630,6 @@ "name": "Xã Yên Bình", "type": "Xã" }, - { - "level3_id": "13828", - "name": "Xã Yên Phú", - "type": "Xã" - }, { "level3_id": "13831", "name": "Xã Yên Mỹ", @@ -23897,11 +23640,6 @@ "name": "Xã Yên Dương", "type": "Xã" }, - { - "level3_id": "13840", - "name": "Xã Yên Hưng", - "type": "Xã" - }, { "level3_id": "13843", "name": "Xã Yên Khánh", @@ -23922,16 +23660,6 @@ "name": "Xã Yên Lương", "type": "Xã" }, - { - "level3_id": "13855", - "name": "Xã Yên Hồng", - "type": "Xã" - }, - { - "level3_id": "13858", - "name": "Xã Yên Quang", - "type": "Xã" - }, { "level3_id": "13861", "name": "Xã Yên Tiến", @@ -23959,7 +23687,7 @@ }, { "level3_id": "13876", - "name": "Xã Yên Bằng", + "name": "Xã Hồng Quang", "type": "Xã" }, { @@ -23999,19 +23727,9 @@ "name": "Thị trấn Rạng Đông", "type": "Thị trấn" }, - { - "level3_id": "13897", - "name": "Xã Nghĩa Đồng", - "type": "Xã" - }, { "level3_id": "13900", - "name": "Xã Nghĩa Thịnh", - "type": "Xã" - }, - { - "level3_id": "13903", - "name": "Xã Nghĩa Minh", + "name": "Xã Đồng Thịnh", "type": "Xã" }, { @@ -24060,20 +23778,10 @@ "type": "Xã" }, { - "level3_id": "13933", - "name": "Xã Nghĩa Bình", - "type": "Xã" - }, - { - "level3_id": "13936", + "level3_id": "13939", "name": "Thị trấn Quỹ Nhất", "type": "Thị trấn" }, - { - "level3_id": "13939", - "name": "Xã Nghĩa Tân", - "type": "Xã" - }, { "level3_id": "13942", "name": "Xã Nghĩa Hùng", @@ -24121,14 +23829,9 @@ "name": "Thị trấn Nam Giang", "type": "Thị trấn" }, - { - "level3_id": "13969", - "name": "Xã Nam Mỹ", - "type": "Xã" - }, { "level3_id": "13972", - "name": "Xã Điền Xá", + "name": "Xã Nam Điền", "type": "Xã" }, { @@ -24141,11 +23844,6 @@ "name": "Xã Nam Thắng", "type": "Xã" }, - { - "level3_id": "13981", - "name": "Xã Nam Toàn", - "type": "Xã" - }, { "level3_id": "13984", "name": "Xã Hồng Quang", @@ -24362,12 +24060,7 @@ }, { "level3_id": "14104", - "name": "Xã Xuân Phong", - "type": "Xã" - }, - { - "level3_id": "14107", - "name": "Xã Xuân Đài", + "name": "Xã Xuân Giang", "type": "Xã" }, { @@ -24375,24 +24068,14 @@ "name": "Xã Xuân Tân", "type": "Xã" }, - { - "level3_id": "14113", - "name": "Xã Xuân Thủy", - "type": "Xã" - }, { "level3_id": "14116", "name": "Xã Xuân Ngọc", "type": "Xã" }, - { - "level3_id": "14119", - "name": "Xã Xuân Bắc", - "type": "Xã" - }, { "level3_id": "14122", - "name": "Xã Xuân Phương", + "name": "Xã Trà Lũ", "type": "Xã" }, { @@ -24405,26 +24088,11 @@ "name": "Xã Xuân Phú", "type": "Xã" }, - { - "level3_id": "14131", - "name": "Xã Xuân Trung", - "type": "Xã" - }, { "level3_id": "14134", "name": "Xã Xuân Vinh", "type": "Xã" }, - { - "level3_id": "14137", - "name": "Xã Xuân Kiên", - "type": "Xã" - }, - { - "level3_id": "14140", - "name": "Xã Xuân Tiến", - "type": "Xã" - }, { "level3_id": "14143", "name": "Xã Xuân Ninh", @@ -24432,7 +24100,7 @@ }, { "level3_id": "14146", - "name": "Xã Xuân Hòa", + "name": "Xã Xuân Phúc", "type": "Xã" } ] @@ -24442,11 +24110,6 @@ "name": "Huyện Giao Thủy", "type": "Huyện", "level3s": [ - { - "level3_id": "14149", - "name": "Thị trấn Ngô Đồng", - "type": "Thị trấn" - }, { "level3_id": "14152", "name": "Thị trấn Quất Lâm", @@ -24474,19 +24137,14 @@ }, { "level3_id": "14167", - "name": "Xã Hoành Sơn", - "type": "Xã" + "name": "Thị trấn Giao Thủy", + "type": "Thị trấn" }, { "level3_id": "14170", "name": "Xã Bình Hòa", "type": "Xã" }, - { - "level3_id": "14173", - "name": "Xã Giao Tiến", - "type": "Xã" - }, { "level3_id": "14176", "name": "Xã Giao Hà", @@ -24584,11 +24242,6 @@ "name": "Xã Hải Trung", "type": "Xã" }, - { - "level3_id": "14230", - "name": "Xã Hải Vân", - "type": "Xã" - }, { "level3_id": "14233", "name": "Xã Hải Minh", @@ -24599,29 +24252,9 @@ "name": "Xã Hải Anh", "type": "Xã" }, - { - "level3_id": "14239", - "name": "Xã Hải Hưng", - "type": "Xã" - }, - { - "level3_id": "14242", - "name": "Xã Hải Bắc", - "type": "Xã" - }, - { - "level3_id": "14245", - "name": "Xã Hải Phúc", - "type": "Xã" - }, { "level3_id": "14248", - "name": "Xã Hải Thanh", - "type": "Xã" - }, - { - "level3_id": "14251", - "name": "Xã Hải Hà", + "name": "Xã Hải Hưng", "type": "Xã" }, { @@ -24629,11 +24262,6 @@ "name": "Xã Hải Long", "type": "Xã" }, - { - "level3_id": "14257", - "name": "Xã Hải Phương", - "type": "Xã" - }, { "level3_id": "14260", "name": "Xã Hải Đường", @@ -24679,11 +24307,6 @@ "name": "Xã Hải Tây", "type": "Xã" }, - { - "level3_id": "14290", - "name": "Xã Hải Lý", - "type": "Xã" - }, { "level3_id": "14293", "name": "Xã Hải Phú", @@ -24694,21 +24317,11 @@ "name": "Xã Hải Giang", "type": "Xã" }, - { - "level3_id": "14299", - "name": "Xã Hải Cường", - "type": "Xã" - }, { "level3_id": "14302", "name": "Xã Hải Ninh", "type": "Xã" }, - { - "level3_id": "14305", - "name": "Xã Hải Chính", - "type": "Xã" - }, { "level3_id": "14308", "name": "Xã Hải Xuân", @@ -24719,11 +24332,6 @@ "name": "Xã Hải Châu", "type": "Xã" }, - { - "level3_id": "14314", - "name": "Xã Hải Triều", - "type": "Xã" - }, { "level3_id": "14317", "name": "Xã Hải Hòa", @@ -27270,11 +26878,6 @@ "name": "Xã Thiệu Công", "type": "Xã" }, - { - "level3_id": "15790", - "name": "Xã Thiệu Phú", - "type": "Xã" - }, { "level3_id": "15793", "name": "Xã Thiệu Long", @@ -27332,8 +26935,8 @@ }, { "level3_id": "15829", - "name": "Xã Minh Tâm", - "type": "Xã" + "name": "Thị trấn Hậu Hiền", + "type": "Thị trấn" }, { "level3_id": "15832", @@ -37964,11 +37567,6 @@ "name": "Phường 1", "type": "Phường" }, - { - "level3_id": "22018", - "name": "Phường 8", - "type": "Phường" - }, { "level3_id": "22021", "name": "Phường 2", @@ -37979,11 +37577,6 @@ "name": "Phường 9", "type": "Phường" }, - { - "level3_id": "22027", - "name": "Phường 3", - "type": "Phường" - }, { "level3_id": "22030", "name": "Phường 4", @@ -37999,11 +37592,6 @@ "name": "Phường 7", "type": "Phường" }, - { - "level3_id": "22039", - "name": "Phường 6", - "type": "Phường" - }, { "level3_id": "22040", "name": "Phường Phú Thạnh", @@ -38024,11 +37612,6 @@ "name": "Xã Bình Kiến", "type": "Xã" }, - { - "level3_id": "22048", - "name": "Xã Bình Ngọc", - "type": "Xã" - }, { "level3_id": "22162", "name": "Xã An Phú", @@ -38604,16 +38187,6 @@ "name": "Phường Vĩnh Thọ", "type": "Phường" }, - { - "level3_id": "22342", - "name": "Phường Xương Huân", - "type": "Phường" - }, - { - "level3_id": "22345", - "name": "Phường Vạn Thắng", - "type": "Phường" - }, { "level3_id": "22348", "name": "Phường Vạn Thạnh", @@ -38624,21 +38197,11 @@ "name": "Phường Phương Sài", "type": "Phường" }, - { - "level3_id": "22354", - "name": "Phường Phương Sơn", - "type": "Phường" - }, { "level3_id": "22357", "name": "Phường Phước Hải", "type": "Phường" }, - { - "level3_id": "22360", - "name": "Phường Phước Tân", - "type": "Phường" - }, { "level3_id": "22363", "name": "Phường Lộc Thọ", @@ -38646,12 +38209,7 @@ }, { "level3_id": "22366", - "name": "Phường Phước Tiến", - "type": "Phường" - }, - { - "level3_id": "22369", - "name": "Phường Tân Lập", + "name": "Phường Tân Tiến", "type": "Phường" }, { @@ -39037,11 +38595,6 @@ "name": "Xã Ninh Bình", "type": "Xã" }, - { - "level3_id": "22579", - "name": "Xã Ninh Phước", - "type": "Xã" - }, { "level3_id": "22582", "name": "Xã Ninh Phú", @@ -39084,7 +38637,7 @@ }, { "level3_id": "22606", - "name": "Xã Ninh Vân", + "name": "Xã Ninh Phước", "type": "Xã" } ] @@ -39188,7 +38741,7 @@ }, { "level3_id": "22660", - "name": "Xã Diên Xuân", + "name": "Xã Xuân Đồng", "type": "Xã" }, { @@ -39196,11 +38749,6 @@ "name": "Xã Diên Sơn", "type": "Xã" }, - { - "level3_id": "22666", - "name": "Xã Diên Đồng", - "type": "Xã" - }, { "level3_id": "22669", "name": "Xã Diên Phú", @@ -39359,24 +38907,9 @@ "name": "Phường Bảo An", "type": "Phường" }, - { - "level3_id": "22747", - "name": "Phường Phủ Hà", - "type": "Phường" - }, { "level3_id": "22750", - "name": "Phường Thanh Sơn", - "type": "Phường" - }, - { - "level3_id": "22753", - "name": "Phường Mỹ Hương", - "type": "Phường" - }, - { - "level3_id": "22756", - "name": "Phường Tấn Tài", + "name": "Phường Phủ Hà", "type": "Phường" }, { @@ -41084,11 +40617,6 @@ "name": "Xã Biển Hồ", "type": "Xã" }, - { - "level3_id": "23593", - "name": "Xã Tân Sơn", - "type": "Xã" - }, { "level3_id": "23596", "name": "Xã Trà Đa", @@ -41295,14 +40823,9 @@ "name": "Xã Kông Lơng Khơng", "type": "Xã" }, - { - "level3_id": "23671", - "name": "Xã Kông Pla", - "type": "Xã" - }, { "level3_id": "23674", - "name": "Xã Đăk HLơ", + "name": "Xã Kông Bơ La", "type": "Xã" } ] @@ -42250,11 +41773,6 @@ "name": "Phường Tân An", "type": "Phường" }, - { - "level3_id": "24127", - "name": "Phường Thống Nhất", - "type": "Phường" - }, { "level3_id": "24130", "name": "Phường Thành Nhất", @@ -42262,7 +41780,7 @@ }, { "level3_id": "24133", - "name": "Phường Thắng Lợi", + "name": "Phường Thành Công", "type": "Phường" }, { @@ -42270,11 +41788,6 @@ "name": "Phường Tân Lợi", "type": "Phường" }, - { - "level3_id": "24139", - "name": "Phường Thành Công", - "type": "Phường" - }, { "level3_id": "24142", "name": "Phường Tân Thành", @@ -42372,11 +41885,6 @@ "name": "Phường Đoàn Kết", "type": "Phường" }, - { - "level3_id": "24325", - "name": "Xã Ea Blang", - "type": "Xã" - }, { "level3_id": "24328", "name": "Xã Ea Drông", @@ -42960,11 +42468,6 @@ "name": "Xã Hòa Thành", "type": "Xã" }, - { - "level3_id": "24460", - "name": "Xã Hòa Tân", - "type": "Xã" - }, { "level3_id": "24463", "name": "Xã Hòa Phong", @@ -45848,8 +45351,8 @@ }, { "level2_id": "721", - "name": "Thị xã Bến Cát", - "type": "Thị xã", + "name": "Thành phố Bến Cát", + "type": "Thành phố", "level3s": [ { "level3_id": "25813", @@ -45863,13 +45366,13 @@ }, { "level3_id": "25840", - "name": "Xã An Điền", - "type": "Xã" + "name": "Phường An Điền", + "type": "Phường" }, { "level3_id": "25843", - "name": "Xã An Tây", - "type": "Xã" + "name": "Phường An Tây", + "type": "Phường" }, { "level3_id": "25846", @@ -46227,7 +45730,7 @@ }, { "level3_id": "26014", - "name": "Phường Tân Tiến", + "name": "Phường Tân Mai", "type": "Phường" }, { @@ -46245,39 +45748,14 @@ "name": "Phường Quang Vinh", "type": "Phường" }, - { - "level3_id": "26026", - "name": "Phường Tân Mai", - "type": "Phường" - }, { "level3_id": "26029", "name": "Phường Thống Nhất", "type": "Phường" }, - { - "level3_id": "26032", - "name": "Phường Trung Dũng", - "type": "Phường" - }, - { - "level3_id": "26035", - "name": "Phường Tam Hòa", - "type": "Phường" - }, - { - "level3_id": "26038", - "name": "Phường Hòa Bình", - "type": "Phường" - }, { "level3_id": "26041", - "name": "Phường Quyết Thắng", - "type": "Phường" - }, - { - "level3_id": "26044", - "name": "Phường Thanh Bình", + "name": "Phường Trung Dũng", "type": "Phường" }, { @@ -46347,16 +45825,6 @@ "name": "Thành phố Long Khánh", "type": "Thành phố", "level3s": [ - { - "level3_id": "26071", - "name": "Phường Xuân Trung", - "type": "Phường" - }, - { - "level3_id": "26074", - "name": "Phường Xuân Thanh", - "type": "Phường" - }, { "level3_id": "26077", "name": "Phường Xuân Bình", @@ -46449,11 +45917,6 @@ "name": "Xã Phú An", "type": "Xã" }, - { - "level3_id": "26128", - "name": "Xã Núi Tượng", - "type": "Xã" - }, { "level3_id": "26131", "name": "Xã Tà Lài", @@ -46464,11 +45927,6 @@ "name": "Xã Phú Lập", "type": "Xã" }, - { - "level3_id": "26137", - "name": "Xã Phú Sơn", - "type": "Xã" - }, { "level3_id": "26140", "name": "Xã Phú Thịnh", @@ -46481,7 +45939,7 @@ }, { "level3_id": "26146", - "name": "Xã Phú Trung", + "name": "Xã Phú Sơn", "type": "Xã" }, { @@ -46571,20 +46029,10 @@ "name": "Xã Tân Bình", "type": "Xã" }, - { - "level3_id": "26197", - "name": "Xã Bình Hòa", - "type": "Xã" - }, { "level3_id": "26200", "name": "Xã Mã Đà", "type": "Xã" - }, - { - "level3_id": "26203", - "name": "Xã Hiếu Liêm", - "type": "Xã" } ] }, @@ -50379,16 +49827,6 @@ "name": "Phường 4", "type": "Phường" }, - { - "level3_id": "28255", - "name": "Phường 7", - "type": "Phường" - }, - { - "level3_id": "28258", - "name": "Phường 3", - "type": "Phường" - }, { "level3_id": "28261", "name": "Phường 1", @@ -50399,11 +49837,6 @@ "name": "Phường 2", "type": "Phường" }, - { - "level3_id": "28267", - "name": "Phường 8", - "type": "Phường" - }, { "level3_id": "28270", "name": "Phường 6", @@ -50458,14 +49891,9 @@ }, { "level2_id": "816", - "name": "Thị xã Gò Công", - "type": "Thị xã", + "name": "Thành phố Gò Công", + "type": "Thành phố", "level3s": [ - { - "level3_id": "28294", - "name": "Phường 3", - "type": "Phường" - }, { "level3_id": "28297", "name": "Phường 2", @@ -50473,11 +49901,6 @@ }, { "level3_id": "28300", - "name": "Phường 4", - "type": "Phường" - }, - { - "level3_id": "28303", "name": "Phường 1", "type": "Phường" }, @@ -50488,23 +49911,23 @@ }, { "level3_id": "28309", - "name": "Xã Long Hưng", - "type": "Xã" + "name": "Phường Long Hưng", + "type": "Phường" }, { "level3_id": "28312", - "name": "Xã Long Thuận", - "type": "Xã" + "name": "Phường Long Thuận", + "type": "Phường" }, { "level3_id": "28315", - "name": "Xã Long Chánh", - "type": "Xã" + "name": "Phường Long Chánh", + "type": "Phường" }, { "level3_id": "28318", - "name": "Xã Long Hòa", - "type": "Xã" + "name": "Phường Long Hòa", + "type": "Phường" }, { "level3_id": "28708", @@ -50921,11 +50344,6 @@ "name": "Xã Tân Lý Đông", "type": "Xã" }, - { - "level3_id": "28531", - "name": "Xã Tân Lý Tây", - "type": "Xã" - }, { "level3_id": "28534", "name": "Xã Thân Cửu Nghĩa", @@ -50946,11 +50364,6 @@ "name": "Xã Nhị Bình", "type": "Xã" }, - { - "level3_id": "28546", - "name": "Xã Dưỡng Điềm", - "type": "Xã" - }, { "level3_id": "28549", "name": "Xã Đông Hòa", @@ -50961,11 +50374,6 @@ "name": "Xã Long Định", "type": "Xã" }, - { - "level3_id": "28555", - "name": "Xã Hữu Đạo", - "type": "Xã" - }, { "level3_id": "28558", "name": "Xã Long An", @@ -52778,14 +52186,9 @@ "name": "Phường 5", "type": "Phường" }, - { - "level3_id": "29548", - "name": "Phường 1", - "type": "Phường" - }, { "level3_id": "29551", - "name": "Phường 2", + "name": "Phường 1", "type": "Phường" }, { @@ -52830,11 +52233,6 @@ "name": "Huyện Long Hồ", "type": "Huyện", "level3s": [ - { - "level3_id": "29575", - "name": "Thị trấn Long Hồ", - "type": "Thị trấn" - }, { "level3_id": "29578", "name": "Xã Đồng Phú", @@ -52877,8 +52275,8 @@ }, { "level3_id": "29602", - "name": "Xã Phú Đức", - "type": "Xã" + "name": "Thị trấn Long Hồ", + "type": "Thị trấn" }, { "level3_id": "29605", @@ -53151,11 +52549,6 @@ "name": "Xã Mỹ Thạnh Trung", "type": "Xã" }, - { - "level3_id": "29758", - "name": "Xã Tường Lộc", - "type": "Xã" - }, { "level3_id": "29761", "name": "Xã Loan Mỹ", @@ -53280,11 +52673,6 @@ "name": "Xã Phú Thành", "type": "Xã" }, - { - "level3_id": "29854", - "name": "Xã Thiện Mỹ", - "type": "Xã" - }, { "level3_id": "29857", "name": "Xã Lục Sỹ Thành", @@ -53302,11 +52690,6 @@ "name": "Huyện Bình Tân", "type": "Huyện", "level3s": [ - { - "level3_id": "29773", - "name": "Xã Tân Hưng", - "type": "Xã" - }, { "level3_id": "29776", "name": "Xã Tân Thành", @@ -55883,26 +55266,11 @@ "name": "Phường Thới Bình", "type": "Phường" }, - { - "level3_id": "31126", - "name": "Phường An Nghiệp", - "type": "Phường" - }, - { - "level3_id": "31129", - "name": "Phường An Cư", - "type": "Phường" - }, { "level3_id": "31135", "name": "Phường Tân An", "type": "Phường" }, - { - "level3_id": "31141", - "name": "Phường An Phú", - "type": "Phường" - }, { "level3_id": "31144", "name": "Phường Xuân Khánh", @@ -56816,11 +56184,6 @@ "name": "Phường 2", "type": "Phường" }, - { - "level3_id": "31513", - "name": "Phường 1", - "type": "Phường" - }, { "level3_id": "31516", "name": "Phường 4", @@ -56833,7 +56196,7 @@ }, { "level3_id": "31522", - "name": "Phường 9", + "name": "Phường 1", "type": "Phường" }, { @@ -58362,12 +57725,12 @@ ] } ], - "data_date": "10\/04\/2023", - "generate_date": 1681135390, + "data_date": "01\/11\/2024", + "generate_date": 1730405019, "stats": { - "elapsed_time": 21.396399974822998, + "elapsed_time": 14.663947105407715, "level1_count": 63, - "level2_count": 705, - "level3_count": 10598 + "level2_count": 704, + "level3_count": 10472 } } \ No newline at end of file diff --git a/data/sorted.json b/data/sorted.json index ab4a5af..7862f59 100644 --- a/data/sorted.json +++ b/data/sorted.json @@ -535,24 +535,24 @@ ] ], [ - "222", "Việt Yên", "Huyện", "Viet Yen", + "222", "Việt Yên", "Thị Xã", "Viet Yen", [ - ["07777", "Bích Động", "Thị trấn", "Bich Dong"], - ["07783", "Hồng Thái", "Xã", "Hong Thai"], + ["07777", "Bích Động", "Phường", "Bich Dong"], + ["07783", "Hồng Thái", "Phường", "Hong Thai"], ["07771", "Hương Mai", "Xã", "Huong Mai"], ["07768", "Minh Đức", "Xã", "Minh Duc"], - ["07795", "Nếnh", "Thị trấn", "Nenh"], + ["07795", "Nếnh", "Phường", "Nenh"], ["07765", "Nghĩa Trung", "Xã", "Nghia Trung"], - ["07798", "Ninh Sơn", "Xã", "Ninh Son"], - ["07807", "Quang Châu", "Xã", "Quang Chau"], - ["07792", "Quảng Minh", "Xã", "Quang Minh"], - ["07789", "Tăng Tiến", "Xã", "Tang Tien"], + ["07798", "Ninh Sơn", "Phường", "Ninh Son"], + ["07807", "Quang Châu", "Phường", "Quang Chau"], + ["07792", "Quảng Minh", "Phường", "Quang Minh"], + ["07789", "Tăng Tiến", "Phường", "Tang Tien"], ["07759", "Thượng Lan", "Xã", "Thuong Lan"], ["07786", "Tiên Sơn", "Xã", "Tien Son"], ["07780", "Trung Sơn", "Xã", "Trung Son"], - ["07774", "Tự Lạn", "Xã", "Tu Lan"], + ["07774", "Tự Lạn", "Phường", "Tu Lan"], ["07804", "Vân Hà", "Xã", "Van Ha"], - ["07801", "Vân Trung", "Xã", "Van Trung"], + ["07801", "Vân Trung", "Phường", "Van Trung"], ["07762", "Việt Tiến", "Xã", "Viet Tien"] ] ], @@ -1490,10 +1490,10 @@ ] ], [ - "721", "Bến Cát", "Thị xã", "Ben Cat", + "721", "Bến Cát", "Thành phố", "Ben Cat", [ - ["25840", "An Điền", "Xã", "An Dien"], - ["25843", "An Tây", "Xã", "An Tay"], + ["25840", "An Điền", "Phường", "An Dien"], + ["25843", "An Tây", "Phường", "An Tay"], ["25837", "Chánh Phú Hòa", "Phường", "Chanh Phu Hoa"], ["25849", "Hòa Lợi", "Phường", "Hoa Loi"], ["25813", "Mỹ Phước", "Phường", "My Phuoc"], @@ -2148,11 +2148,8 @@ "916", "Ninh Kiều", "Quận", "Ninh Kieu", [ ["31150", "An Bình", "Phường", "An Binh"], - ["31129", "An Cư", "Phường", "An Cu"], ["31120", "An Hòa", "Phường", "An Hoa"], ["31149", "An Khánh", "Phường", "An Khanh"], - ["31126", "An Nghiệp", "Phường", "An Nghiep"], - ["31141", "An Phú", "Phường", "An Phu"], ["31117", "Cái Khế", "Phường", "Cai Khe"], ["31147", "Hưng Lợi", "Phường", "Hung Loi"], ["31135", "Tân An", "Phường", "Tan An"], @@ -2575,7 +2572,6 @@ ["24340", "Cư Bao", "Xã", "Cu Bao"], ["24318", "Đạt Hiếu", "Phường", "Dat Hieu"], ["24322", "Đoàn Kết", "Phường", "Doan Ket"], - ["24325", "Ea Blang", "Xã", "Ea Blang"], ["24328", "Ea Drông", "Xã", "Ea Drong"], ["24334", "Ea Siên", "Xã", "Ea Sien"], ["24311", "Thiện An", "Phường", "Thien An"], @@ -2601,10 +2597,8 @@ ["24136", "Tân Lợi", "Phường", "Tan Loi"], ["24142", "Tân Thành", "Phường", "Tan Thanh"], ["24145", "Tân Tiến", "Phường", "Tan Tien"], - ["24133", "Thắng Lợi", "Phường", "Thang Loi"], - ["24139", "Thành Công", "Phường", "Thanh Cong"], + ["24133", "Thành Công", "Phường", "Thanh Cong"], ["24130", "Thành Nhất", "Phường", "Thanh Nhat"], - ["24127", "Thống Nhất", "Phường", "Thong Nhat"], ["24148", "Tự An", "Phường", "Tu An"] ] ], @@ -2720,7 +2714,6 @@ ["24466", "Hòa Lễ", "Xã", "Hoa Le"], ["24463", "Hòa Phong", "Xã", "Hoa Phong"], ["24481", "Hòa Sơn", "Xã", "Hoa Son"], - ["24460", "Hòa Tân", "Xã", "Hoa Tan"], ["24457", "Hòa Thành", "Xã", "Hoa Thanh"], ["24475", "Khuê Ngọc Điền", "Xã", "Khue Ngoc Dien"], ["24448", "Krông Kmar", "Thị trấn", "Krong Kmar"], @@ -3128,28 +3121,23 @@ ["26065", "Hiệp Hòa", "Phường", "Hiep Hoa"], ["26002", "Hố Nai", "Phường", "Ho Nai"], ["26068", "Hóa An", "Phường", "Hoa An"], - ["26038", "Hòa Bình", "Phường", "Hoa Binh"], ["26020", "Long Bình", "Phường", "Long Binh"], ["26056", "Long Bình Tân", "Phường", "Long Binh Tan"], ["26380", "Long Hưng", "Xã", "Long Hung"], ["26377", "Phước Tân", "Phường", "Phuoc Tan"], ["26023", "Quang Vinh", "Phường", "Quang Vinh"], - ["26041", "Quyết Thắng", "Phường", "Quyet Thang"], ["26017", "Tam Hiệp", "Phường", "Tam Hiep"], - ["26035", "Tam Hòa", "Phường", "Tam Hoa"], ["26374", "Tam Phước", "Phường", "Tam Phuoc"], ["25999", "Tân Biên", "Phường", "Tan Bien"], ["26062", "Tân Hạnh", "Phường", "Tan Hanh"], ["26008", "Tân Hiệp", "Phường", "Tan Hiep"], ["26005", "Tân Hòa", "Phường", "Tan Hoa"], - ["26026", "Tân Mai", "Phường", "Tan Mai"], + ["26014", "Tân Mai", "Phường", "Tan Mai"], ["25996", "Tân Phong", "Phường", "Tan Phong"], - ["26014", "Tân Tiến", "Phường", "Tan Tien"], ["26059", "Tân Vạn", "Phường", "Tan Van"], - ["26044", "Thanh Bình", "Phường", "Thanh Binh"], ["26029", "Thống Nhất", "Phường", "Thong Nhat"], ["25993", "Trảng Dài", "Phường", "Trang Dai"], - ["26032", "Trung Dũng", "Phường", "Trung Dung"] + ["26041", "Trung Dũng", "Phường", "Trung Dung"] ] ], [ @@ -3204,9 +3192,7 @@ ["26077", "Xuân Bình", "Phường", "Xuan Binh"], ["26083", "Xuân Hoà", "Phường", "Xuan Hoa"], ["26101", "Xuân Lập", "Phường", "Xuan Lap"], - ["26110", "Xuân Tân", "Phường", "Xuan Tan"], - ["26074", "Xuân Thanh", "Phường", "Xuan Thanh"], - ["26071", "Xuân Trung", "Phường", "Xuan Trung"] + ["26110", "Xuân Tân", "Phường", "Xuan Tan"] ] ], [ @@ -3250,17 +3236,15 @@ [ ["26119", "Dak Lua", "Xã", "Dak Lua"], ["26122", "Nam Cát Tiên", "Xã", "Nam Cat Tien"], - ["26128", "Núi Tượng", "Xã", "Nui Tuong"], ["26125", "Phú An", "Xã", "Phu An"], ["26158", "Phú Bình", "Xã", "Phu Binh"], ["26167", "Phú Điền", "Xã", "Phu Dien"], ["26155", "Phú Lâm", "Xã", "Phu Lam"], ["26134", "Phú Lập", "Xã", "Phu Lap"], ["26152", "Phú Lộc", "Xã", "Phu Loc"], - ["26137", "Phú Sơn", "Xã", "Phu Son"], + ["26146", "Phú Sơn", "Xã", "Phu Son"], ["26161", "Phú Thanh", "Xã", "Phu Thanh"], ["26140", "Phú Thịnh", "Xã", "Phu Thinh"], - ["26146", "Phú Trung", "Xã", "Phu Trung"], ["26149", "Phú Xuân", "Xã", "Phu Xuan"], ["26131", "Tà Lài", "Xã", "Ta Lai"], ["26116", "Tân Phú", "Thị trấn", "Tan Phu"], @@ -3308,9 +3292,7 @@ [ "735", "Vĩnh Cửu", "Huyện", "Vinh Cuu", [ - ["26197", "Bình Hòa", "Xã", "Binh Hoa"], ["26185", "Bình Lợi", "Xã", "Binh Loi"], - ["26203", "Hiếu Liêm", "Xã", "Hieu Liem"], ["26200", "Mã Đà", "Xã", "Ma Da"], ["26173", "Phú Lý", "Xã", "Phu Ly"], ["26179", "Tân An", "Xã", "Tan An"], @@ -3747,15 +3729,14 @@ [ "625", "KBang", "Huyện", "KBang", [ - ["23674", "Đăk HLơ", "Xã", "Dak HLo"], ["23644", "Đăk Roong", "Xã", "Dak Roong"], ["23660", "Đak SMar", "Xã", "Dak SMar"], ["23659", "Đông", "Xã", "Dong"], ["23638", "KBang", "Thị trấn", "KBang"], ["23650", "KRong", "Xã", "KRong"], ["23641", "Kon Pne", "Xã", "Kon Pne"], + ["23674", "Kông Bơ La", "Xã", "Kong Bo La"], ["23668", "Kông Lơng Khơng", "Xã", "Kong Long Khong"], - ["23671", "Kông Pla", "Xã", "Kong Pla"], ["23656", "Lơ Ku", "Xã", "Lo Ku"], ["23662", "Nghĩa An", "Xã", "Nghia An"], ["23653", "Sơ Pai", "Xã", "So Pai"], @@ -3850,7 +3831,6 @@ ["23608", "Ia Kênh", "Xã", "Ia Kenh"], ["23563", "Ia Kring", "Phường", "Ia Kring"], ["23570", "Phù Đổng", "Phường", "Phu Dong"], - ["23593", "Tân Sơn", "Xã", "Tan Son"], ["23575", "Tây Sơn", "Phường", "Tay Son"], ["23582", "Thắng Lợi", "Phường", "Thang Loi"], ["23578", "Thống Nhất", "Phường", "Thong Nhat"], @@ -6892,7 +6872,6 @@ ["22696", "Bình Lộc", "Xã", "Binh Loc"], ["22693", "Diên An", "Xã", "Dien An"], ["22657", "Diên Điền", "Xã", "Dien Dien"], - ["22666", "Diên Đồng", "Xã", "Dien Dong"], ["22684", "Diên Hòa", "Xã", "Dien Hoa"], ["22651", "Diên Khánh", "Thị trấn", "Dien Khanh"], ["22678", "Diên Lạc", "Xã", "Dien Lac"], @@ -6904,9 +6883,9 @@ ["22687", "Diên Thạnh", "Xã", "Dien Thanh"], ["22672", "Diên Thọ", "Xã", "Dien Tho"], ["22690", "Diên Toàn", "Xã", "Dien Toan"], - ["22660", "Diên Xuân", "Xã", "Dien Xuan"], ["22702", "Suối Hiệp", "Xã", "Suoi Hiep"], - ["22705", "Suối Tiên", "Xã", "Suoi Tien"] + ["22705", "Suối Tiên", "Xã", "Suoi Tien"], + ["22660", "Xuân Đồng", "Xã", "Xuan Dong"] ] ], [ @@ -6950,12 +6929,8 @@ ["22357", "Phước Hải", "Phường", "Phuoc Hai"], ["22372", "Phước Hòa", "Phường", "Phuoc Hoa"], ["22378", "Phước Long", "Phường", "Phuoc Long"], - ["22360", "Phước Tân", "Phường", "Phuoc Tan"], - ["22366", "Phước Tiến", "Phường", "Phuoc Tien"], ["22351", "Phương Sài", "Phường", "Phuong Sai"], - ["22354", "Phương Sơn", "Phường", "Phuong Son"], - ["22369", "Tân Lập", "Phường", "Tan Lap"], - ["22345", "Vạn Thắng", "Phường", "Van Thang"], + ["22366", "Tân Tiến", "Phường", "Tan Tien"], ["22348", "Vạn Thạnh", "Phường", "Van Thanh"], ["22330", "Vĩnh Hải", "Phường", "Vinh Hai"], ["22399", "Vĩnh Hiệp", "Xã", "Vinh Hiep"], @@ -6969,8 +6944,7 @@ ["22393", "Vĩnh Thạnh", "Xã", "Vinh Thanh"], ["22339", "Vĩnh Thọ", "Phường", "Vinh Tho"], ["22396", "Vĩnh Trung", "Xã", "Vinh Trung"], - ["22381", "Vĩnh Trường", "Phường", "Vinh Truong"], - ["22342", "Xương Huân", "Phường", "Xuong Huan"] + ["22381", "Vĩnh Trường", "Phường", "Vinh Truong"] ] ], [ @@ -6990,7 +6964,7 @@ ["22600", "Ninh Lộc", "Xã", "Ninh Loc"], ["22582", "Ninh Phú", "Xã", "Ninh Phu"], ["22573", "Ninh Phụng", "Xã", "Ninh Phung"], - ["22579", "Ninh Phước", "Xã", "Ninh Phuoc"], + ["22606", "Ninh Phước", "Xã", "Ninh Phuoc"], ["22588", "Ninh Quang", "Xã", "Ninh Quang"], ["22552", "Ninh Sim", "Xã", "Ninh Sim"], ["22531", "Ninh Sơn", "Xã", "Ninh Son"], @@ -7001,7 +6975,6 @@ ["22537", "Ninh Thượng", "Xã", "Ninh Thuong"], ["22567", "Ninh Thủy", "Phường", "Ninh Thuy"], ["22549", "Ninh Trung", "Xã", "Ninh Trung"], - ["22606", "Ninh Vân", "Xã", "Ninh Van"], ["22555", "Ninh Xuân", "Xã", "Ninh Xuan"] ] ], @@ -8053,7 +8026,6 @@ ["02887", "Nậm Khánh", "Xã", "Nam Khanh"], ["02893", "Nậm Lúc", "Xã", "Nam Luc"], ["02881", "Nậm Mòn", "Xã", "Nam Mon"], - ["02872", "Tà Chải", "Xã", "Ta Chai"], ["02854", "Tả Củ Tỷ", "Xã", "Ta Cu Ty"], ["02851", "Tả Van Chư", "Xã", "Ta Van Chu"], ["02857", "Thải Giàng Phố", "Xã", "Thai Giang Pho"] @@ -8523,12 +8495,10 @@ ["14164", "Giao Thanh", "Xã", "Giao Thanh"], ["14161", "Giao Thiện", "Xã", "Giao Thien"], ["14200", "Giao Thịnh", "Xã", "Giao Thinh"], - ["14173", "Giao Tiến", "Xã", "Giao Tien"], + ["14167", "Giao Thủy", "Thị trấn", "Giao Thuy"], ["14197", "Giao Xuân", "Xã", "Giao Xuan"], ["14194", "Giao Yến", "Xã", "Giao Yen"], - ["14167", "Hoành Sơn", "Xã", "Hoanh Son"], ["14158", "Hồng Thuận", "Xã", "Hong Thuan"], - ["14149", "Ngô Đồng", "Thị trấn", "Ngo Dong"], ["14152", "Quất Lâm", "Thị trấn", "Quat Lam"] ] ], @@ -8538,93 +8508,63 @@ ["14218", "Cồn", "Thị trấn", "Con"], ["14284", "Hải An", "Xã", "Hai An"], ["14236", "Hải Anh", "Xã", "Hai Anh"], - ["14242", "Hải Bắc", "Xã", "Hai Bac"], ["14311", "Hải Châu", "Xã", "Hai Chau"], - ["14305", "Hải Chính", "Xã", "Hai Chinh"], - ["14299", "Hải Cường", "Xã", "Hai Cuong"], ["14269", "Hải Đông", "Xã", "Hai Dong"], ["14260", "Hải Đường", "Xã", "Hai Duong"], ["14296", "Hải Giang", "Xã", "Hai Giang"], - ["14251", "Hải Hà", "Xã", "Hai Ha"], ["14317", "Hải Hòa", "Xã", "Hai Hoa"], - ["14239", "Hải Hưng", "Xã", "Hai Hung"], + ["14248", "Hải Hưng", "Xã", "Hai Hung"], ["14263", "Hải Lộc", "Xã", "Hai Loc"], ["14254", "Hải Long", "Xã", "Hai Long"], - ["14290", "Hải Lý", "Xã", "Hai Ly"], ["14233", "Hải Minh", "Xã", "Hai Minh"], ["14224", "Hải Nam", "Xã", "Hai Nam"], ["14302", "Hải Ninh", "Xã", "Hai Ninh"], ["14281", "Hải Phong", "Xã", "Hai Phong"], ["14293", "Hải Phú", "Xã", "Hai Phu"], - ["14245", "Hải Phúc", "Xã", "Hai Phuc"], - ["14257", "Hải Phương", "Xã", "Hai Phuong"], ["14266", "Hải Quang", "Xã", "Hai Quang"], ["14272", "Hải Sơn", "Xã", "Hai Son"], ["14275", "Hải Tân", "Xã", "Hai Tan"], ["14287", "Hải Tây", "Xã", "Hai Tay"], - ["14248", "Hải Thanh", "Xã", "Hai Thanh"], - ["14314", "Hải Triều", "Xã", "Hai Trieu"], ["14227", "Hải Trung", "Xã", "Hai Trung"], - ["14230", "Hải Vân", "Xã", "Hai Van"], ["14308", "Hải Xuân", "Xã", "Hai Xuan"], ["14221", "Thịnh Long", "Thị trấn", "Thinh Long"], ["14215", "Yên Định", "Thị trấn", "Yen Dinh"] ] ], - [ - "358", "Mỹ Lộc", "Huyện", "My Loc", - [ - ["13711", "Mỹ Hà", "Xã", "My Ha"], - ["13729", "Mỹ Hưng", "Xã", "My Hung"], - ["13708", "Mỹ Lộc", "Thị trấn", "My Loc"], - ["13726", "Mỹ Phúc", "Xã", "My Phuc"], - ["13723", "Mỹ Tân", "Xã", "My Tan"], - ["13717", "Mỹ Thắng", "Xã", "My Thang"], - ["13738", "Mỹ Thành", "Xã", "My Thanh"], - ["13735", "Mỹ Thịnh", "Xã", "My Thinh"], - ["13732", "Mỹ Thuận", "Xã", "My Thuan"], - ["13714", "Mỹ Tiến", "Xã", "My Tien"], - ["13720", "Mỹ Trung", "Xã", "My Trung"] - ] - ], [ "356", "Nam Định", "Thành phố", "Nam Dinh", [ - ["13654", "Bà Triệu", "Phường", "Ba Trieu"], - ["13648", "Cửa Bắc", "Phường", "Cua Bac"], + ["13669", "Cửa Bắc", "Phường", "Cua Bac"], ["13690", "Cửa Nam", "Phường", "Cua Nam"], - ["13633", "Hạ Long", "Phường", "Ha Long"], - ["13702", "Lộc An", "Xã", "Loc An"], + ["13708", "Hưng Lộc", "Phường", "Hung Loc"], ["13684", "Lộc Hạ", "Phường", "Loc Ha"], ["13693", "Lộc Hòa", "Phường", "Loc Hoa"], ["13687", "Lộc Vượng", "Phường", "Loc Vuong"], + ["13711", "Mỹ Hà", "Xã", "My Ha"], + ["13735", "Mỹ Lộc", "Xã", "My Loc"], + ["13726", "Mỹ Phúc", "Xã", "My Phuc"], + ["13723", "Mỹ Tân", "Xã", "My Tan"], + ["13717", "Mỹ Thắng", "Xã", "My Thang"], + ["13732", "Mỹ Thuận", "Xã", "My Thuan"], + ["13720", "Mỹ Trung", "Xã", "My Trung"], ["13699", "Mỹ Xá", "Phường", "My Xa"], - ["13696", "Nam Phong", "Xã", "Nam Phong"], - ["13705", "Nam Vân", "Xã", "Nam Van"], - ["13672", "Năng Tĩnh", "Phường", "Nang Tinh"], - ["13663", "Ngô Quyền", "Phường", "Ngo Quyen"], - ["13651", "Nguyễn Du", "Phường", "Nguyen Du"], - ["13660", "Phan Đình Phùng", "Phường", "Phan Dinh Phung"], - ["13645", "Quang Trung", "Phường", "Quang Trung"], - ["13681", "Thống Nhất", "Phường", "Thong Nhat"], - ["13669", "Trần Đăng Ninh", "Phường", "Tran Dang Ninh"], + ["13696", "Nam Phong", "Phường", "Nam Phong"], + ["13705", "Nam Vân", "Phường", "Nam Van"], + ["13678", "Năng Tĩnh", "Phường", "Nang Tinh"], + ["13681", "Quang Trung", "Phường", "Quang Trung"], ["13666", "Trần Hưng Đạo", "Phường", "Tran Hung Dao"], - ["13678", "Trần Quang Khải", "Phường", "Tran Quang Khai"], - ["13636", "Trần Tế Xương", "Phường", "Tran Te Xuong"], ["13657", "Trường Thi", "Phường", "Truong Thi"], - ["13675", "Văn Miếu", "Phường", "Van Mieu"], - ["13639", "Vị Hoàng", "Phường", "Vi Hoang"], - ["13642", "Vị Xuyên", "Phường", "Vi Xuyen"] + ["13636", "Vị Xuyên", "Phường", "Vi Xuyen"] ] ], [ "362", "Nam Trực", "Huyện", "Nam Truc", [ ["14011", "Bình Minh", "Xã", "Binh Minh"], - ["13972", "Điền Xá", "Xã", "Dien Xa"], ["14014", "Đồng Sơn", "Xã", "Dong Son"], ["13984", "Hồng Quang", "Xã", "Hong Quang"], ["13990", "Nam Cường", "Xã", "Nam Cuong"], + ["13972", "Nam Điền", "Xã", "Nam Dien"], ["14002", "Nam Dương", "Xã", "Nam Duong"], ["13966", "Nam Giang", "Thị trấn", "Nam Giang"], ["14020", "Nam Hải", "Xã", "Nam Hai"], @@ -8632,12 +8572,10 @@ ["13993", "Nam Hồng", "Xã", "Nam Hong"], ["13996", "Nam Hùng", "Xã", "Nam Hung"], ["14008", "Nam Lợi", "Xã", "Nam Loi"], - ["13969", "Nam Mỹ", "Xã", "Nam My"], ["14023", "Nam Thái", "Xã", "Nam Thai"], ["13978", "Nam Thắng", "Xã", "Nam Thang"], ["14005", "Nam Thanh", "Xã", "Nam Thanh"], ["14017", "Nam Tiến", "Xã", "Nam Tien"], - ["13981", "Nam Toàn", "Xã", "Nam Toan"], ["13975", "Nghĩa An", "Xã", "Nghia An"], ["13987", "Tân Thịnh", "Xã", "Tan Thinh"] ] @@ -8645,29 +8583,25 @@ [ "361", "Nghĩa Hưng", "Huyện", "Nghia Hung", [ + ["13900", "Đồng Thịnh", "Xã", "Dong Thinh"], ["13909", "Hoàng Nam", "Xã", "Hoang Nam"], ["13891", "Liễu Đề", "Thị trấn", "Lieu De"], ["13963", "Nam Điền", "Xã", "Nam Dien"], - ["13933", "Nghĩa Bình", "Xã", "Nghia Binh"], ["13912", "Nghĩa Châu", "Xã", "Nghia Chau"], - ["13897", "Nghĩa Đồng", "Xã", "Nghia Dong"], ["13957", "Nghĩa Hải", "Xã", "Nghia Hai"], ["13924", "Nghĩa Hồng", "Xã", "Nghia Hong"], ["13942", "Nghĩa Hùng", "Xã", "Nghia Hung"], ["13921", "Nghĩa Lạc", "Xã", "Nghia Lac"], ["13945", "Nghĩa Lâm", "Xã", "Nghia Lam"], ["13954", "Nghĩa Lợi", "Xã", "Nghia Loi"], - ["13903", "Nghĩa Minh", "Xã", "Nghia Minh"], ["13927", "Nghĩa Phong", "Xã", "Nghia Phong"], ["13930", "Nghĩa Phú", "Xã", "Nghia Phu"], ["13918", "Nghĩa Sơn", "Xã", "Nghia Son"], - ["13939", "Nghĩa Tân", "Xã", "Nghia Tan"], ["13906", "Nghĩa Thái", "Xã", "Nghia Thai"], ["13948", "Nghĩa Thành", "Xã", "Nghia Thanh"], - ["13900", "Nghĩa Thịnh", "Xã", "Nghia Thinh"], ["13915", "Nghĩa Trung", "Xã", "Nghia Trung"], ["13951", "Phúc Thắng", "Xã", "Phuc Thang"], - ["13936", "Quỹ Nhất", "Thị trấn", "Quy Nhat"], + ["13939", "Quỹ Nhất", "Thị trấn", "Quy Nhat"], ["13894", "Rạng Đông", "Thị trấn", "Rang Dong"] ] ], @@ -8707,14 +8641,10 @@ ["13747", "Hiển Khánh", "Xã", "Hien Khanh"], ["13753", "Hợp Hưng", "Xã", "Hop Hung"], ["13780", "Kim Thái", "Xã", "Kim Thai"], - ["13774", "Liên Bảo", "Xã", "Lien Bao"], ["13783", "Liên Minh", "Xã", "Lien Minh"], - ["13771", "Minh Tân", "Xã", "Minh Tan"], - ["13744", "Minh Thuận", "Xã", "Minh Thuan"], + ["13750", "Minh Tân", "Xã", "Minh Tan"], ["13768", "Quang Trung", "Xã", "Quang Trung"], ["13789", "Tam Thanh", "Xã", "Tam Thanh"], - ["13750", "Tân Khánh", "Xã", "Tan Khanh"], - ["13759", "Tân Thành", "Xã", "Tan Thanh"], ["13777", "Thành Lợi", "Xã", "Thanh Loi"], ["13765", "Trung Thành", "Xã", "Trung Thanh"], ["13792", "Vĩnh Hào", "Xã", "Vinh Hao"] @@ -8724,23 +8654,17 @@ "364", "Xuân Trường", "Huyện", "Xuan Truong", [ ["14125", "Thọ Nghiệp", "Xã", "Tho Nghiep"], - ["14119", "Xuân Bắc", "Xã", "Xuan Bac"], + ["14122", "Trà Lũ", "Xã", "Tra Lu"], ["14092", "Xuân Châu", "Xã", "Xuan Chau"], - ["14107", "Xuân Đài", "Xã", "Xuan Dai"], - ["14146", "Xuân Hòa", "Xã", "Xuan Hoa"], + ["14104", "Xuân Giang", "Xã", "Xuan Giang"], ["14095", "Xuân Hồng", "Xã", "Xuan Hong"], - ["14137", "Xuân Kiên", "Xã", "Xuan Kien"], ["14116", "Xuân Ngọc", "Xã", "Xuan Ngoc"], ["14143", "Xuân Ninh", "Xã", "Xuan Ninh"], - ["14104", "Xuân Phong", "Xã", "Xuan Phong"], ["14128", "Xuân Phú", "Xã", "Xuan Phu"], - ["14122", "Xuân Phương", "Xã", "Xuan Phuong"], + ["14146", "Xuân Phúc", "Xã", "Xuan Phuc"], ["14110", "Xuân Tân", "Xã", "Xuan Tan"], ["14098", "Xuân Thành", "Xã", "Xuan Thanh"], ["14101", "Xuân Thượng", "Xã", "Xuan Thuong"], - ["14113", "Xuân Thủy", "Xã", "Xuan Thuy"], - ["14140", "Xuân Tiến", "Xã", "Xuan Tien"], - ["14131", "Xuân Trung", "Xã", "Xuan Trung"], ["14089", "Xuân Trường", "Thị trấn", "Xuan Truong"], ["14134", "Xuân Vinh", "Xã", "Xuan Vinh"] ] @@ -8748,37 +8672,29 @@ [ "360", "Ý Yên", "Huyện", "Y Yen", [ + ["13876", "Hồng Quang", "Xã", "Hong Quang"], ["13795", "Lâm", "Thị trấn", "Lam"], - ["13876", "Yên Bằng", "Xã", "Yen Bang"], + ["13819", "Phú Hưng", "Xã", "Phu Hung"], + ["13807", "Tân Minh", "Xã", "Tan Minh"], + ["13801", "Trung Nghĩa", "Xã", "Trung Nghia"], ["13825", "Yên Bình", "Xã", "Yen Binh"], ["13822", "Yên Chính", "Xã", "Yen Chinh"], ["13870", "Yên Cường", "Xã", "Yen Cuong"], ["13879", "Yên Đồng", "Xã", "Yen Dong"], ["13834", "Yên Dương", "Xã", "Yen Duong"], - ["13855", "Yên Hồng", "Xã", "Yen Hong"], - ["13840", "Yên Hưng", "Xã", "Yen Hung"], ["13882", "Yên Khang", "Xã", "Yen Khang"], ["13843", "Yên Khánh", "Xã", "Yen Khanh"], ["13873", "Yên Lộc", "Xã", "Yen Loc"], - ["13807", "Yên Lợi", "Xã", "Yen Loi"], ["13852", "Yên Lương", "Xã", "Yen Luong"], - ["13816", "Yên Minh", "Xã", "Yen Minh"], ["13831", "Yên Mỹ", "Xã", "Yen My"], - ["13813", "Yên Nghĩa", "Xã", "Yen Nghia"], ["13885", "Yên Nhân", "Xã", "Yen Nhan"], ["13849", "Yên Ninh", "Xã", "Yen Ninh"], ["13846", "Yên Phong", "Xã", "Yen Phong"], - ["13828", "Yên Phú", "Xã", "Yen Phu"], ["13867", "Yên Phúc", "Xã", "Yen Phuc"], - ["13819", "Yên Phương", "Xã", "Yen Phuong"], - ["13858", "Yên Quang", "Xã", "Yen Quang"], - ["13804", "Yên Tân", "Xã", "Yen Tan"], ["13864", "Yên Thắng", "Xã", "Yen Thang"], - ["13801", "Yên Thành", "Xã", "Yen Thanh"], ["13810", "Yên Thọ", "Xã", "Yen Tho"], ["13861", "Yên Tiến", "Xã", "Yen Tien"], - ["13888", "Yên Trị", "Xã", "Yen Tri"], - ["13798", "Yên Trung", "Xã", "Yen Trung"] + ["13888", "Yên Trị", "Xã", "Yen Tri"] ] ] ] @@ -9611,12 +9527,9 @@ ["22779", "Mỹ Bình", "Phường", "My Binh"], ["22771", "Mỹ Đông", "Phường", "My Dong"], ["22780", "Mỹ Hải", "Phường", "My Hai"], - ["22753", "Mỹ Hương", "Phường", "My Huong"], - ["22747", "Phủ Hà", "Phường", "Phu Ha"], + ["22750", "Phủ Hà", "Phường", "Phu Ha"], ["22741", "Phước Mỹ", "Phường", "Phuoc My"], - ["22756", "Tấn Tài", "Phường", "Tan Tai"], ["22774", "Thành Hải", "Xã", "Thanh Hai"], - ["22750", "Thanh Sơn", "Phường", "Thanh Son"], ["22777", "Văn Hải", "Phường", "Van Hai"] ] ], @@ -10083,16 +9996,12 @@ [ ["22015", "1", "Phường", "1"], ["22021", "2", "Phường", "2"], - ["22027", "3", "Phường", "3"], ["22030", "4", "Phường", "4"], ["22033", "5", "Phường", "5"], - ["22039", "6", "Phường", "6"], ["22036", "7", "Phường", "7"], - ["22018", "8", "Phường", "8"], ["22024", "9", "Phường", "9"], ["22162", "An Phú", "Xã", "An Phu"], ["22045", "Bình Kiến", "Xã", "Binh Kien"], - ["22048", "Bình Ngọc", "Xã", "Binh Ngoc"], ["22042", "Hòa Kiến", "Xã", "Hoa Kien"], ["22041", "Phú Đông", "Phường", "Phu Dong"], ["22240", "Phú Lâm", "Phường", "Phu Lam"], @@ -10884,8 +10793,7 @@ ["06970", "Ba Chẽ", "Thị trấn", "Ba Che"], ["06979", "Đạp Thanh", "Xã", "Dap Thanh"], ["06988", "Đồn Đạc", "Xã", "Don Dac"], - ["06985", "Lương Mông", "Xã", "Luong Mong"], - ["06991", "Minh Cầm", "Xã", "Minh Cam"], + ["06985", "Lương Minh", "Xã", "Luong Minh"], ["06982", "Nam Sơn", "Xã", "Nam Son"], ["06976", "Thanh Lâm", "Xã", "Thanh Lam"], ["06973", "Thanh Sơn", "Xã", "Thanh Son"] @@ -10908,7 +10816,6 @@ [ ["06796", "Cẩm Bình", "Phường", "Cam Binh"], ["06769", "Cẩm Đông", "Phường", "Cam Dong"], - ["06802", "Cẩm Hải", "Xã", "Cam Hai"], ["06772", "Cẩm Phú", "Phường", "Cam Phu"], ["06766", "Cẩm Sơn", "Phường", "Cam Son"], ["06775", "Cẩm Tây", "Phường", "Cam Tay"], @@ -10917,9 +10824,9 @@ ["06781", "Cẩm Thịnh", "Phường", "Cam Thinh"], ["06784", "Cẩm Thủy", "Phường", "Cam Thuy"], ["06793", "Cẩm Trung", "Phường", "Cam Trung"], - ["06799", "Cộng Hòa", "Xã", "Cong Hoa"], ["06763", "Cửa Ông", "Phường", "Cua Ong"], ["06805", "Dương Huy", "Xã", "Duong Huy"], + ["06799", "Hải Hòa", "Xã", "Hai Hoa"], ["06760", "Mông Dương", "Phường", "Mong Duong"], ["06778", "Quang Hanh", "Phường", "Quang Hanh"] ] @@ -10947,12 +10854,11 @@ ] ], [ - "205", "Đông Triều", "Thị xã", "Dong Trieu", + "205", "Đông Triều", "Thành phố", "Dong Trieu", [ ["07075", "An Sinh", "Xã", "An Sinh"], - ["07090", "Bình Dương", "Xã", "Binh Duong"], - ["07081", "Bình Khê", "Xã", "Binh Khe"], - ["07072", "Đông Triều", "Phường", "Dong Trieu"], + ["07090", "Bình Dương", "Phường", "Binh Duong"], + ["07081", "Bình Khê", "Phường", "Binh Khe"], ["07093", "Đức Chính", "Phường", "Duc Chinh"], ["07114", "Hoàng Quế", "Phường", "Hoang Que"], ["07120", "Hồng Phong", "Phường", "Hong Phong"], @@ -10962,13 +10868,12 @@ ["07123", "Kim Sơn", "Phường", "Kim Son"], ["07069", "Mạo Khê", "Phường", "Mao Khe"], ["07099", "Nguyễn Huệ", "Xã", "Nguyen Hue"], - ["07087", "Tân Việt", "Xã", "Tan Viet"], - ["07102", "Thủy An", "Xã", "Thuy An"], + ["07102", "Thủy An", "Phường", "Thuy An"], ["07096", "Tràng An", "Phường", "Trang An"], ["07078", "Tràng Lương", "Xã", "Trang Luong"], ["07084", "Việt Dân", "Xã", "Viet Dan"], ["07105", "Xuân Sơn", "Phường", "Xuan Son"], - ["07129", "Yên Đức", "Xã", "Yen Duc"], + ["07129", "Yên Đức", "Phường", "Yen Duc"], ["07117", "Yên Thọ", "Phường", "Yen Tho"] ] ], @@ -11006,8 +10911,7 @@ ["06685", "Trần Hưng Đạo", "Phường", "Tran Hung Dao"], ["06700", "Tuần Châu", "Phường", "Tuan Chau"], ["06703", "Việt Hưng", "Phường", "Viet Hung"], - ["07048", "Vũ Oai", "Xã", "Vu Oai"], - ["06682", "Yết Kiêu", "Phường", "Yet Kieu"] + ["07048", "Vũ Oai", "Xã", "Vu Oai"] ] ], [ @@ -11037,7 +10941,6 @@ ["06733", "Hải Tiến", "Xã", "Hai Tien"], ["06745", "Hải Xuân", "Xã", "Hai Xuan"], ["06736", "Hải Yên", "Phường", "Hai Yen"], - ["06718", "Hoà Lạc", "Phường", "Hoa Lac"], ["06709", "Ka Long", "Phường", "Ka Long"], ["06715", "Ninh Dương", "Phường", "Ninh Duong"], ["06739", "Quảng Nghĩa", "Xã", "Quang Nghia"], @@ -11410,7 +11313,7 @@ [ "941", "Sóc Trăng", "Thành phố", "Soc Trang", [ - ["31513", "1", "Phường", "1"], + ["31522", "1", "Phường", "1"], ["31510", "2", "Phường", "2"], ["31519", "3", "Phường", "3"], ["31516", "4", "Phường", "4"], @@ -11418,7 +11321,6 @@ ["31507", "6", "Phường", "6"], ["31501", "7", "Phường", "7"], ["31504", "8", "Phường", "8"], - ["31522", "9", "Phường", "9"], ["31525", "10", "Phường", "10"] ] ], @@ -11889,13 +11791,9 @@ [ "340", "Đông Hưng", "Huyện", "Dong Hung", [ - ["12700", "An Châu", "Xã", "An Chau"], - ["12727", "Chương Dương", "Xã", "Chuong Duong"], - ["12691", "Đô Lương", "Xã", "Do Luong"], ["12802", "Đông Á", "Xã", "Dong A"], ["12757", "Đông Các", "Xã", "Dong Cac"], ["12706", "Đông Cường", "Xã", "Dong Cuong"], - ["12775", "Đông Động", "Xã", "Dong Dong"], ["12811", "Đông Dương", "Xã", "Dong Duong"], ["12808", "Đông Hoàng", "Xã", "Dong Hoang"], ["12751", "Đông Hợp", "Xã", "Dong Hop"], @@ -11904,29 +11802,27 @@ ["12718", "Đông La", "Xã", "Dong La"], ["12694", "Đông Phương", "Xã", "Dong Phuong"], ["12793", "Đông Quan", "Xã", "Dong Quan"], - ["12796", "Đông Quang", "Xã", "Dong Quang"], ["12703", "Đông Sơn", "Xã", "Dong Son"], ["12769", "Đông Tân", "Xã", "Dong Tan"], ["12772", "Đông Vinh", "Xã", "Dong Vinh"], ["12724", "Đông Xá", "Xã", "Dong Xa"], - ["12799", "Đông Xuân", "Xã", "Dong Xuan"], ["12745", "Hà Giang", "Xã", "Ha Giang"], ["12778", "Hồng Bạch", "Xã", "Hong Bach"], ["12790", "Hồng Giang", "Xã", "Hong Giang"], ["12739", "Hồng Việt", "Xã", "Hong Viet"], - ["12736", "Hợp Tiến", "Xã", "Hop Tien"], - ["12697", "Liên Giang", "Xã", "Lien Giang"], + ["12700", "Liên An Đô", "Xã", "Lien An Do"], ["12763", "Liên Hoa", "Xã", "Lien Hoa"], ["12715", "Lô Giang", "Xã", "Lo Giang"], ["12712", "Mê Linh", "Xã", "Me Linh"], ["12823", "Minh Phú", "Xã", "Minh Phu"], ["12721", "Minh Tân", "Xã", "Minh Tan"], ["12730", "Nguyên Xá", "Xã", "Nguyen Xa"], - ["12733", "Phong Châu", "Xã", "Phong Chau"], + ["12736", "Phong Dương Tiến", "Xã", "Phong Duong Tien"], ["12760", "Phú Châu", "Xã", "Phu Chau"], ["12709", "Phú Lương", "Xã", "Phu Luong"], ["12754", "Thăng Long", "Xã", "Thang Long"], - ["12784", "Trọng Quan", "Xã", "Trong Quan"] + ["12784", "Trọng Quan", "Xã", "Trong Quan"], + ["12775", "Xuân Quang Động", "Xã", "Xuan Quang Dong"] ] ], [ @@ -11937,8 +11833,6 @@ ["12679", "Chí Hòa", "Xã", "Chi Hoa"], ["12656", "Chi Lăng", "Xã", "Chi Lang"], ["12595", "Cộng Hòa", "Xã", "Cong Hoa"], - ["12598", "Dân Chủ", "Xã", "Dan Chu"], - ["12589", "Điệp Nông", "Xã", "Diep Nong"], ["12616", "Đoan Hùng", "Xã", "Doan Hung"], ["12676", "Độc Lập", "Xã", "Doc Lap"], ["12631", "Đông Đô", "Xã", "Dong Do"], @@ -11948,7 +11842,6 @@ ["12661", "Hồng An", "Xã", "Hong An"], ["12667", "Hồng Lĩnh", "Xã", "Hong Linh"], ["12685", "Hồng Minh", "Xã", "Hong Minh"], - ["12607", "Hùng Dũng", "Xã", "Hung Dung"], ["12586", "Hưng Hà", "Thị trấn", "Hung Ha"], ["12613", "Hưng Nhân", "Thị trấn", "Hung Nhan"], ["12664", "Kim Chung", "Xã", "Kim Chung"], @@ -11957,6 +11850,7 @@ ["12658", "Minh Khai", "Xã", "Minh Khai"], ["12670", "Minh Tân", "Xã", "Minh Tan"], ["12634", "Phúc Khánh", "Xã", "Phuc Khanh"], + ["12589", "Quang Trung", "Xã", "Quang Trung"], ["12622", "Tân Hòa", "Xã", "Tan Hoa"], ["12592", "Tân Lễ", "Xã", "Tan Le"], ["12610", "Tân Tiến", "Xã", "Tan Tien"], @@ -11977,16 +11871,15 @@ ["13138", "Bình Minh", "Xã", "Binh Minh"], ["13096", "Bình Nguyên", "Xã", "Binh Nguyen"], ["13183", "Bình Thanh", "Xã", "Binh Thanh"], - ["13123", "Đình Phùng", "Xã", "Dinh Phung"], ["13135", "Hòa Bình", "Xã", "Hoa Binh"], ["13093", "Hồng Thái", "Xã", "Hong Thai"], ["13189", "Hồng Tiến", "Xã", "Hong Tien"], + ["13159", "Hồng Vũ", "Xã", "Hong Vu"], ["13075", "Kiến Xương", "Thị trấn", "Kien Xuong"], ["13102", "Lê Lợi", "Xã", "Le Loi"], ["13171", "Minh Quang", "Xã", "Minh Quang"], ["13177", "Minh Tân", "Xã", "Minh Tan"], ["13180", "Nam Bình", "Xã", "Nam Binh"], - ["13120", "Nam Cao", "Xã", "Nam Cao"], ["13144", "Quang Bình", "Xã", "Quang Binh"], ["13132", "Quang Lịch", "Xã", "Quang Lich"], ["13162", "Quang Minh", "Xã", "Quang Minh"], @@ -11994,16 +11887,13 @@ ["13081", "Quốc Tuấn", "Xã", "Quoc Tuan"], ["13090", "Tây Sơn", "Xã", "Tay Son"], ["13114", "Thanh Tân", "Xã", "Thanh Tan"], - ["13117", "Thượng Hiền", "Xã", "Thuong Hien"], + ["13120", "Thống Nhất", "Xã", "Thong Nhat"], ["13078", "Trà Giang", "Xã", "Tra Giang"], ["13129", "Vũ An", "Xã", "Vu An"], - ["13174", "Vũ Bình", "Xã", "Vu Binh"], ["13156", "Vũ Công", "Xã", "Vu Cong"], - ["13159", "Vũ Hòa", "Xã", "Vu Hoa"], ["13111", "Vũ Lễ", "Xã", "Vu Le"], ["13126", "Vũ Ninh", "Xã", "Vu Ninh"], ["13141", "Vũ Quí", "Xã", "Vu Qui"], - ["13153", "Vũ Thắng", "Xã", "Vu Thang"], ["13150", "Vũ Trung", "Xã", "Vu Trung"] ] ], @@ -12029,7 +11919,6 @@ ["12532", "Châu Sơn", "Xã", "Chau Son"], ["12574", "Đông Hải", "Xã", "Dong Hai"], ["12583", "Đồng Tiến", "Xã", "Dong Tien"], - ["12556", "Quỳnh Bảo", "Xã", "Quynh Bao"], ["12472", "Quỳnh Côi", "Thị trấn", "Quynh Coi"], ["12496", "Quỳnh Giao", "Xã", "Quynh Giao"], ["12520", "Quỳnh Hải", "Xã", "Quynh Hai"], @@ -12045,8 +11934,7 @@ ["12517", "Quỳnh Ngọc", "Xã", "Quynh Ngoc"], ["12562", "Quỳnh Nguyên", "Xã", "Quynh Nguyen"], ["12487", "Quỳnh Thọ", "Xã", "Quynh Tho"], - ["12577", "Quỳnh Trang", "Xã", "Quynh Trang"], - ["12568", "Quỳnh Xá", "Xã", "Quynh Xa"] + ["12577", "Trang Bảo Xá", "Xã", "Trang Bao Xa"] ] ], [ @@ -12117,6 +12005,7 @@ [ "342", "Tiền Hải", "Huyện", "Tien Hai", [ + ["13030", "Ái Quốc", "Xã", "Ai Quoc"], ["13012", "An Ninh", "Xã", "An Ninh"], ["13048", "Bắc Hải", "Xã", "Bac Hai"], ["13018", "Đông Cơ", "Xã", "Dong Co"], @@ -12124,10 +12013,8 @@ ["13024", "Đông Lâm", "Xã", "Dong Lam"], ["12979", "Đông Long", "Xã", "Dong Long"], ["13003", "Đông Minh", "Xã", "Dong Minh"], - ["13009", "Đông Phong", "Xã", "Dong Phong"], - ["12982", "Đông Quí", "Xã", "Dong Qui"], + ["12997", "Đông Quang", "Xã", "Dong Quang"], ["12976", "Đông Trà", "Xã", "Dong Tra"], - ["12997", "Đông Trung", "Xã", "Dong Trung"], ["12988", "Đông Xuyên", "Xã", "Dong Xuyen"], ["13045", "Nam Chính", "Xã", "Nam Chinh"], ["13036", "Nam Cường", "Xã", "Nam Cuong"], @@ -12136,16 +12023,13 @@ ["13063", "Nam Hồng", "Xã", "Nam Hong"], ["13066", "Nam Hưng", "Xã", "Nam Hung"], ["13072", "Nam Phú", "Xã", "Nam Phu"], - ["13042", "Nam Thắng", "Xã", "Nam Thang"], - ["13057", "Nam Thanh", "Xã", "Nam Thanh"], ["13051", "Nam Thịnh", "Xã", "Nam Thinh"], + ["13057", "Nam Tiến", "Xã", "Nam Tien"], ["13060", "Nam Trung", "Xã", "Nam Trung"], ["13027", "Phương Công", "Xã", "Phuong Cong"], ["13021", "Tây Giang", "Xã", "Tay Giang"], ["12991", "Tây Lương", "Xã", "Tay Luong"], ["12994", "Tây Ninh", "Xã", "Tay Ninh"], - ["13030", "Tây Phong", "Xã", "Tay Phong"], - ["13033", "Tây Tiến", "Xã", "Tay Tien"], ["12970", "Tiền Hải", "Thị trấn", "Tien Hai"], ["13039", "Vân Trường", "Xã", "Van Truong"], ["12985", "Vũ Lăng", "Xã", "Vu Lang"] @@ -12941,7 +12825,7 @@ [ "398", "Thiệu Hóa", "Huyện", "Thieu Hoa", [ - ["15829", "Minh Tâm", "Xã", "Minh Tam"], + ["15829", "Hậu Hiền", "Thị trấn", "Hau Hien"], ["15847", "Tân Châu", "Xã", "Tan Chau"], ["15820", "Thiệu Chính", "Xã", "Thieu Chinh"], ["15787", "Thiệu Công", "Xã", "Thieu Cong"], @@ -12955,7 +12839,6 @@ ["15835", "Thiệu Lý", "Xã", "Thieu Ly"], ["15775", "Thiệu Ngọc", "Xã", "Thieu Ngoc"], ["15802", "Thiệu Nguyên", "Xã", "Thieu Nguyen"], - ["15790", "Thiệu Phú", "Xã", "Thieu Phu"], ["15781", "Thiệu Phúc", "Xã", "Thieu Phuc"], ["15811", "Thiệu Quang", "Xã", "Thieu Quang"], ["15814", "Thiệu Thành", "Xã", "Thieu Thanh"], @@ -13388,8 +13271,6 @@ ["28564", "Bình Trưng", "Xã", "Binh Trung"], ["28540", "Điềm Hy", "Xã", "Diem Hy"], ["28549", "Đông Hòa", "Xã", "Dong Hoa"], - ["28546", "Dưỡng Điềm", "Xã", "Duong Diem"], - ["28555", "Hữu Đạo", "Xã", "Huu Dao"], ["28585", "Kim Sơn", "Xã", "Kim Son"], ["28558", "Long An", "Xã", "Long An"], ["28552", "Long Định", "Xã", "Long Dinh"], @@ -13402,7 +13283,6 @@ ["28522", "Tân Hội Đông", "Xã", "Tan Hoi Dong"], ["28525", "Tân Hương", "Xã", "Tan Huong"], ["28528", "Tân Lý Đông", "Xã", "Tan Ly Dong"], - ["28531", "Tân Lý Tây", "Xã", "Tan Ly Tay"], ["28534", "Thân Cửu Nghĩa", "Xã", "Than Cuu Nghia"], ["28570", "Thạnh Phú", "Xã", "Thanh Phu"], ["28576", "Vĩnh Kim", "Xã", "Vinh Kim"] @@ -13433,19 +13313,17 @@ ] ], [ - "816", "Gò Công", "Thị xã", "Go Cong", + "816", "Gò Công", "Thành phố", "Go Cong", [ - ["28303", "1", "Phường", "1"], + ["28300", "1", "Phường", "1"], ["28297", "2", "Phường", "2"], - ["28294", "3", "Phường", "3"], - ["28300", "4", "Phường", "4"], ["28306", "5", "Phường", "5"], ["28708", "Bình Đông", "Xã", "Binh Dong"], ["28717", "Bình Xuân", "Xã", "Binh Xuan"], - ["28315", "Long Chánh", "Xã", "Long Chanh"], - ["28318", "Long Hòa", "Xã", "Long Hoa"], - ["28309", "Long Hưng", "Xã", "Long Hung"], - ["28312", "Long Thuận", "Xã", "Long Thuan"], + ["28315", "Long Chánh", "Phường", "Long Chanh"], + ["28318", "Long Hòa", "Phường", "Long Hoa"], + ["28309", "Long Hưng", "Phường", "Long Hung"], + ["28312", "Long Thuận", "Phường", "Long Thuan"], ["28729", "Tân Trung", "Xã", "Tan Trung"] ] ], @@ -13490,12 +13368,9 @@ [ ["28261", "1", "Phường", "1"], ["28264", "2", "Phường", "2"], - ["28258", "3", "Phường", "3"], ["28252", "4", "Phường", "4"], ["28249", "5", "Phường", "5"], ["28270", "6", "Phường", "6"], - ["28255", "7", "Phường", "7"], - ["28267", "8", "Phường", "8"], ["28273", "9", "Phường", "9"], ["28276", "10", "Phường", "10"], ["28282", "Đạo Thạnh", "Xã", "Dao Thanh"], @@ -13791,7 +13666,7 @@ ["02587", "Đồng Quý", "Xã", "Dong Quy"], ["02572", "Đông Thọ", "Xã", "Dong Tho"], ["02623", "Hào Phú", "Xã", "Hao Phu"], - ["02608", "Hồng Lạc", "Xã", "Hong Lac"], + ["02608", "Hồng Sơn", "Xã", "Hong Son"], ["02578", "Hợp Hòa", "Xã", "Hop Hoa"], ["02566", "Hợp Thành", "Xã", "Hop Thanh"], ["02575", "Kháng Nhật", "Xã", "Khang Nhat"], @@ -13812,7 +13687,6 @@ ["02632", "Trường Sinh", "Xã", "Truong Sinh"], ["02560", "Tú Thịnh", "Xã", "Tu Thinh"], ["02596", "Văn Phú", "Xã", "Van Phu"], - ["02593", "Vân Sơn", "Xã", "Van Son"], ["02548", "Vĩnh Lợi", "Xã", "Vinh Loi"] ] ], @@ -13919,7 +13793,6 @@ ["29788", "Nguyễn Văn Thảnh", "Xã", "Nguyen Van Thanh"], ["29782", "Tân An Thạnh", "Xã", "Tan An Thanh"], ["29797", "Tân Bình", "Xã", "Tan Binh"], - ["29773", "Tân Hưng", "Xã", "Tan Hung"], ["29785", "Tân Lược", "Xã", "Tan Luoc"], ["29800", "Tân Quới", "Thị trấn", "Tan Quoi"], ["29776", "Tân Thành", "Xã", "Tan Thanh"], @@ -13937,9 +13810,8 @@ ["29617", "Hòa Phú", "Xã", "Hoa Phu"], ["29605", "Lộc Hòa", "Xã", "Loc Hoa"], ["29608", "Long An", "Xã", "Long An"], - ["29575", "Long Hồ", "Thị trấn", "Long Ho"], + ["29602", "Long Hồ", "Thị trấn", "Long Ho"], ["29599", "Long Phước", "Xã", "Long Phuoc"], - ["29602", "Phú Đức", "Xã", "Phu Duc"], ["29611", "Phú Quới", "Xã", "Phu Quoi"], ["29596", "Phước Hậu", "Xã", "Phuoc Hau"], ["29593", "Tân Hạnh", "Xã", "Tan Hanh"], @@ -13982,8 +13854,7 @@ ["29740", "Song Phú", "Xã", "Song Phu"], ["29719", "Tam Bình", "Thị trấn", "Tam Binh"], ["29722", "Tân Lộc", "Xã", "Tan Loc"], - ["29749", "Tân Phú", "Xã", "Tan Phu"], - ["29758", "Tường Lộc", "Xã", "Tuong Loc"] + ["29749", "Tân Phú", "Xã", "Tan Phu"] ] ], [ @@ -13995,7 +13866,6 @@ ["29827", "Nhơn Bình", "Xã", "Nhon Binh"], ["29851", "Phú Thành", "Xã", "Phu Thanh"], ["29839", "Tân Mỹ", "Xã", "Tan My"], - ["29854", "Thiện Mỹ", "Xã", "Thien My"], ["29833", "Thới Hòa", "Xã", "Thoi Hoa"], ["29848", "Thuận Thới", "Xã", "Thuan Thoi"], ["29860", "Tích Thiện", "Xã", "Tich Thien"], @@ -14008,8 +13878,7 @@ [ "855", "Vĩnh Long", "Thành phố", "Vinh Long", [ - ["29548", "1", "Phường", "1"], - ["29551", "2", "Phường", "2"], + ["29551", "1", "Phường", "1"], ["29557", "3", "Phường", "3"], ["29554", "4", "Phường", "4"], ["29545", "5", "Phường", "5"], diff --git a/demo/parser/package-lock.json b/demo/parser/package-lock.json index ae36412..88d6de5 100644 --- a/demo/parser/package-lock.json +++ b/demo/parser/package-lock.json @@ -23,7 +23,7 @@ "prettier": "^2.8.7", "rollup": "^3.29.1", "tslib": "^2.6.2", - "typescript": "^5.0.4", + "typescript": "^5.3.3", "vitest": "^0.34.4" } }, @@ -1307,12 +1307,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2217,9 +2217,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -3009,9 +3009,9 @@ } }, "node_modules/postcss": { - "version": "8.4.29", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", - "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -3597,16 +3597,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/ufo": { @@ -3655,9 +3655,9 @@ } }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/demo/parser/package.json b/demo/parser/package.json index 33a6bce..084423a 100644 --- a/demo/parser/package.json +++ b/demo/parser/package.json @@ -28,7 +28,7 @@ "prettier": "^2.8.7", "rollup": "^3.29.1", "tslib": "^2.6.2", - "typescript": "^5.0.4", + "typescript": "^5.3.3", "vitest": "^0.34.4" }, "dependencies": { diff --git a/demo/parser/src/parser.spec.ts b/demo/parser/src/parser.spec.ts index fb3d03d..6b50bc9 100644 --- a/demo/parser/src/parser.spec.ts +++ b/demo/parser/src/parser.spec.ts @@ -83,11 +83,7 @@ describe("Parser", () => { "Quận Tân Phú", "Thành phố Hồ Chí Minh", ], - "Mỹ Phước, tx. Bến Cát, Bình Dương, Việt Nam": [ - "Phường Mỹ Phước", - "Thị xã Bến Cát", - "Tỉnh Bình Dương", - ], + "Mỹ Phước, tx. Bến Cát, Bình Dương, Việt Nam": ["25813", "721", "74"], "ketsatketbac@yahoo.com.vn": [], "533/15 Nguyễn Tri Phương P8 Q10": [ "Phường 8", @@ -453,11 +449,7 @@ describe("Parser", () => { "133 tran hung dao quan5": ["Quận 5", "Thành phố Hồ Chí Minh"], "số 8 trần nhân tông , p thanh sơn , tp phan rang tháp chàm , ninh thuận": - [ - "Phường Thanh Sơn", - "Thành phố Phan Rang-Tháp Chàm", - "Tỉnh Ninh Thuận", - ], + ["22750", "582", "58"], "Số 44 KV1, P. Ba Láng, Q. Cái Răng, Tp. Cần Thơ": [ "Phường Ba Láng", "Quận Cái Răng", diff --git a/downloader/download.sh b/downloader/download.sh index c85a7c6..e2ff7f1 100755 --- a/downloader/download.sh +++ b/downloader/download.sh @@ -10,8 +10,8 @@ _gsoDatePath='data/date.txt' _gisPath='data/gis.json' _osmPath='downloader/osm' -# 721/NQ-UBTVQH15 -_date=10/04/2023 +# 1202/NQ-UBTVQH15 +_date=01/11/2024 if [ ! -f $_gsoPath ]; then echo "Generating $_gsoPath..." diff --git a/firebase/functions/.eslintrc.js b/firebase/functions/.eslintrc.js index 579a48b..789fd01 100644 --- a/firebase/functions/.eslintrc.js +++ b/firebase/functions/.eslintrc.js @@ -16,7 +16,6 @@ module.exports = { ], parser: "@typescript-eslint/parser", parserOptions: { - project: ["tsconfig.json", "tsconfig.dev.json"], sourceType: "module", }, ignorePatterns: [ @@ -28,5 +27,6 @@ module.exports = { quotes: ["error", "double"], "import/no-unresolved": 0, indent: ["error", 2], + "require-jsdoc": 0, }, }; diff --git a/firebase/functions/package-lock.json b/firebase/functions/package-lock.json index c5e0baf..37cc7eb 100644 --- a/firebase/functions/package-lock.json +++ b/firebase/functions/package-lock.json @@ -6,27 +6,27 @@ "": { "name": "functions", "dependencies": { - "firebase-admin": "^11.10.1", - "firebase-functions": "^4.4.1", + "firebase-admin": "^12.0.0", + "firebase-functions": "^4.9.0", "formdata-node": "^4.4.1", "node-fetch-commonjs": "^3.3.1", - "puppeteer": "^21.3.4" + "puppeteer": "^23.6.1", + "valibot": "^0.42.1" }, "devDependencies": { "@types/jsdom": "^21.1.3", - "@typescript-eslint/eslint-plugin": "^5.12.0", - "@typescript-eslint/parser": "^5.12.0", + "@typescript-eslint/eslint-plugin": "^8.12.2", + "@typescript-eslint/parser": "^8.12.2", "@vitest/coverage-v8": "^0.34.5", "eslint": "^8.9.0", "eslint-config-google": "^0.14.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-prettier": "^4.2.1", - "firebase-functions-test": "^3.1.0", - "firebase-tools": "^12.5.4", + "firebase-functions-test": "^3.2.0", "jsdom": "^22.1.0", "prettier": "^2.8.8", - "typescript": "^4.9.5", + "typescript": "^5.3.3", "vitest": "^0.34.5" }, "engines": { @@ -55,98 +55,22 @@ "node": ">=6.0.0" } }, - "node_modules/@apidevtools/json-schema-ref-parser": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.2.tgz", - "integrity": "sha512-r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg==", - "dev": true, - "dependencies": { - "@jsdevtools/ono": "^7.1.3", - "@types/json-schema": "^7.0.6", - "call-me-maybe": "^1.0.1", - "js-yaml": "^4.1.0" - } - }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", + "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", "dependencies": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.2", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/code-frame/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/code-frame/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/code-frame/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/compat-data": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", - "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz", + "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", "dev": true, "peer": true, "engines": { @@ -154,23 +78,23 @@ } }, "node_modules/@babel/core": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz", - "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz", + "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==", "dev": true, "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-module-transforms": "^7.22.20", - "@babel/helpers": "^7.22.15", - "@babel/parser": "^7.22.16", - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.22.20", - "@babel/types": "^7.22.19", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.24.2", + "@babel/generator": "^7.24.4", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.24.4", + "@babel/parser": "^7.24.4", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", @@ -184,13 +108,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true, - "peer": true - }, "node_modules/@babel/core/node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -215,15 +132,15 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz", - "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", + "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", "dev": true, "peer": true, "dependencies": { - "@babel/types": "^7.22.15", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", + "@babel/types": "^7.24.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" }, "engines": { @@ -231,15 +148,15 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", - "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, "peer": true, "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.15", - "browserslist": "^4.21.9", + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -285,14 +202,14 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "peer": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -312,22 +229,22 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", - "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "version": "7.24.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", + "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", "dev": true, "peer": true, "dependencies": { - "@babel/types": "^7.22.15" + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz", - "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, "peer": true, "dependencies": { @@ -345,9 +262,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "dev": true, "peer": true, "engines": { @@ -381,9 +298,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", + "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", "dev": true, "peer": true, "engines": { @@ -399,9 +316,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", - "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "dev": true, "peer": true, "engines": { @@ -409,28 +326,29 @@ } }, "node_modules/@babel/helpers": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz", - "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz", + "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==", "dev": true, "peer": true, "dependencies": { - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", + "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -501,10 +419,11 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.16", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz", - "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==", - "devOptional": true, + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", + "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==", + "dev": true, + "peer": true, "bin": { "parser": "bin/babel-parser.js" }, @@ -578,13 +497,13 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz", + "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==", "dev": true, "peer": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -688,13 +607,13 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", - "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz", + "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==", "dev": true, "peer": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -704,36 +623,36 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dev": true, "peer": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz", - "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", + "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", "dev": true, "peer": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", + "@babel/code-frame": "^7.24.1", + "@babel/generator": "^7.24.1", "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.16", - "@babel/types": "^7.22.19", - "debug": "^4.1.0", + "@babel/parser": "^7.24.1", + "@babel/types": "^7.24.0", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -751,14 +670,14 @@ } }, "node_modules/@babel/types": { - "version": "7.22.19", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz", - "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dev": true, "peer": true, "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.19", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -771,30 +690,26 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "node_modules/@esbuild/aix-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", + "cpu": [ + "ppc64" + ], "dev": true, + "optional": true, + "os": [ + "aix" + ], "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", - "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", - "dev": true, - "dependencies": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" + "node": ">=12" } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", "cpu": [ "arm" ], @@ -808,9 +723,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", "cpu": [ "arm64" ], @@ -824,9 +739,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", "cpu": [ "x64" ], @@ -840,9 +755,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", "cpu": [ "arm64" ], @@ -856,9 +771,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", "cpu": [ "x64" ], @@ -872,9 +787,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", "cpu": [ "arm64" ], @@ -888,9 +803,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", "cpu": [ "x64" ], @@ -904,9 +819,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", "cpu": [ "arm" ], @@ -920,9 +835,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", "cpu": [ "arm64" ], @@ -936,9 +851,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", "cpu": [ "ia32" ], @@ -952,9 +867,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", "cpu": [ "loong64" ], @@ -968,9 +883,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", "cpu": [ "mips64el" ], @@ -984,9 +899,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", "cpu": [ "ppc64" ], @@ -1000,9 +915,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", "cpu": [ "riscv64" ], @@ -1016,9 +931,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", "cpu": [ "s390x" ], @@ -1032,9 +947,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", "cpu": [ "x64" ], @@ -1048,9 +963,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", "cpu": [ "x64" ], @@ -1064,9 +979,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", "cpu": [ "x64" ], @@ -1080,9 +995,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", "cpu": [ "x64" ], @@ -1096,9 +1011,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", "cpu": [ "arm64" ], @@ -1112,9 +1027,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", "cpu": [ "ia32" ], @@ -1128,9 +1043,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", "cpu": [ "x64" ], @@ -1159,18 +1074,18 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz", - "integrity": "sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -1191,9 +1106,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1210,207 +1125,154 @@ "node": ">=14" } }, + "node_modules/@firebase/app-check-interop-types": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.1.tgz", + "integrity": "sha512-NILZbe6RH3X1pZmJnfOfY2gLIrlKmrkUMMrrK6VSXHcSE0eQv28xFEcw16D198i9JYZpy5Kwq394My62qCMaIw==" + }, "node_modules/@firebase/app-types": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.0.tgz", - "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.1.tgz", + "integrity": "sha512-nFGqTYsnDFn1oXf1tCwPAc+hQPxyvBT/QB7qDjwK+IDYThOn63nGhzdUTXxVD9Ca8gUY/e5PQMngeo0ZW/E3uQ==" }, "node_modules/@firebase/auth-interop-types": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz", - "integrity": "sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg==" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.2.tgz", + "integrity": "sha512-k3NA28Jfoo0+o391bFjoV9X5QLnUL1WbLhZZRbTQhZdmdGYJfX8ixtNNlHsYQ94bwG0QRbsmvkzDnzuhHrV11w==" }, "node_modules/@firebase/component": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz", - "integrity": "sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.6.tgz", + "integrity": "sha512-pp7sWqHmAAlA3os6ERgoM3k5Cxff510M9RLXZ9Mc8KFKMBc2ct3RkZTWUF7ixJNvMiK/iNgRLPDrLR2gtRJ9iQ==", "dependencies": { - "@firebase/util": "1.9.3", + "@firebase/util": "1.9.5", "tslib": "^2.1.0" } }, "node_modules/@firebase/database": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz", - "integrity": "sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==", - "dependencies": { - "@firebase/auth-interop-types": "0.2.1", - "@firebase/component": "0.6.4", - "@firebase/logger": "0.4.0", - "@firebase/util": "1.9.3", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.4.tgz", + "integrity": "sha512-k84cXh+dtpzvY6yOhfyr1B+I1vjvSMtmlqotE0lTNVylc8m5nmOohjzpTLEQDrBWvwACX/VP5fEyajAdmnOKqA==", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.1", + "@firebase/auth-interop-types": "0.2.2", + "@firebase/component": "0.6.6", + "@firebase/logger": "0.4.1", + "@firebase/util": "1.9.5", "faye-websocket": "0.11.4", "tslib": "^2.1.0" } }, "node_modules/@firebase/database-compat": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz", - "integrity": "sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==", - "dependencies": { - "@firebase/component": "0.6.4", - "@firebase/database": "0.14.4", - "@firebase/database-types": "0.10.4", - "@firebase/logger": "0.4.0", - "@firebase/util": "1.9.3", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.4.tgz", + "integrity": "sha512-GEEDAvsSMAkqy0BIFSVtFzoOIIcKHFfDM4aXHtWL/JCaNn4OOjH7td73jDfN3ALvpIN4hQki0FcxQ89XjqaTjQ==", + "dependencies": { + "@firebase/component": "0.6.6", + "@firebase/database": "1.0.4", + "@firebase/database-types": "1.0.2", + "@firebase/logger": "0.4.1", + "@firebase/util": "1.9.5", "tslib": "^2.1.0" } }, "node_modules/@firebase/database-types": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz", - "integrity": "sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.2.tgz", + "integrity": "sha512-JRigr5JNLEHqOkI99tAGHDZF47469/cJz1tRAgGs8Feh+3ZmQy/vVChSqwMp2DuVUGp9PlmGsNSlpINJ/hDuIA==", "dependencies": { - "@firebase/app-types": "0.9.0", - "@firebase/util": "1.9.3" + "@firebase/app-types": "0.9.1", + "@firebase/util": "1.9.5" } }, "node_modules/@firebase/logger": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.0.tgz", - "integrity": "sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.1.tgz", + "integrity": "sha512-tTIixB5UJbG9ZHSGZSZdX7THr3KWOLrejZ9B7jYsm6fpwgRNngKznQKA2wgYVyvBc1ta7dGFh9NtJ8n7qfiYIw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@firebase/util": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz", - "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==", + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.5.tgz", + "integrity": "sha512-PP4pAFISDxsf70l3pEy34Mf3GkkUcVQ3MdKp6aSVb7tcpfUQxnsdV7twDd8EkfB6zZylH6wpUAoangQDmCUMqw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@google-cloud/firestore": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-6.7.0.tgz", - "integrity": "sha512-bkH2jb5KkQSUa+NAvpip9HQ+rpYhi77IaqHovWuN07adVmvNXX08gPpvPWEzoXYa/wDjEVI7LiAtCWkJJEYTNg==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.6.0.tgz", + "integrity": "sha512-WUDbaLY8UnPxgwsyIaxj6uxCtSDAaUyvzWJykNH5rZ9i92/SZCsPNNMN0ajrVpAR81hPIL4amXTaMJ40y5L+Yg==", "optional": true, "dependencies": { "fast-deep-equal": "^3.1.1", "functional-red-black-tree": "^1.0.1", - "google-gax": "^3.5.7", - "protobufjs": "^7.0.0" + "google-gax": "^4.3.1", + "protobufjs": "^7.2.6" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/@google-cloud/paginator": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz", - "integrity": "sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.0.tgz", + "integrity": "sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w==", "optional": true, "dependencies": { "arrify": "^2.0.0", "extend": "^3.0.2" }, "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/precise-date": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-3.0.1.tgz", - "integrity": "sha512-crK2rgNFfvLoSgcKJY7ZBOLW91IimVNmPfi1CL+kMTf78pTJYd29XqEVedAeBu4DwCJc0EDIp1MpctLgoPq+Uw==", - "dev": true, - "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/@google-cloud/projectify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz", - "integrity": "sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==", - "devOptional": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz", + "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==", + "optional": true, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/@google-cloud/promisify": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz", - "integrity": "sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz", + "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==", "optional": true, "engines": { - "node": ">=12" - } - }, - "node_modules/@google-cloud/pubsub": { - "version": "3.7.5", - "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.7.5.tgz", - "integrity": "sha512-4Qrry4vIToth5mqduVslltWVsyb7DR8OhnkBA3F7XiE0jgQsiuUfwp/RB2F559aXnRbwcfmjvP4jSuEaGcjrCQ==", - "dev": true, - "dependencies": { - "@google-cloud/paginator": "^4.0.0", - "@google-cloud/precise-date": "^3.0.0", - "@google-cloud/projectify": "^3.0.0", - "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^1.6.0", - "@opentelemetry/semantic-conventions": "~1.3.0", - "@types/duplexify": "^3.6.0", - "@types/long": "^4.0.0", - "arrify": "^2.0.0", - "extend": "^3.0.2", - "google-auth-library": "^8.0.2", - "google-gax": "^3.6.1", - "heap-js": "^2.2.0", - "is-stream-ended": "^0.1.4", - "lodash.snakecase": "^4.1.1", - "p-defer": "^3.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@google-cloud/pubsub/node_modules/@google-cloud/paginator": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-4.0.1.tgz", - "integrity": "sha512-6G1ui6bWhNyHjmbYwavdN7mpVPRBtyDg/bfqBTAlwr413On2TnFNfDxc9UhTJctkgoCDgQXEKiRPLPR9USlkbQ==", - "dev": true, - "dependencies": { - "arrify": "^2.0.0", - "extend": "^3.0.2" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@google-cloud/pubsub/node_modules/@google-cloud/promisify": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz", - "integrity": "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA==", - "dev": true, - "engines": { - "node": ">=10" + "node": ">=14" } }, "node_modules/@google-cloud/storage": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.12.0.tgz", - "integrity": "sha512-78nNAY7iiZ4O/BouWMWTD/oSF2YtYgYB3GZirn0To6eBOugjXVoK+GXgUXOl+HlqbAOyHxAVXOlsj3snfbQ1dw==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.9.0.tgz", + "integrity": "sha512-PlFl7g3r91NmXtZHXsSEfTZES5ysD3SSBWmX4iBdQ2TFH7tN/Vn/IhnVELCHtgh1vc+uYPZ7XvRYaqtDCdghIA==", "optional": true, "dependencies": { - "@google-cloud/paginator": "^3.0.7", - "@google-cloud/projectify": "^3.0.0", - "@google-cloud/promisify": "^3.0.0", + "@google-cloud/paginator": "^5.0.0", + "@google-cloud/projectify": "^4.0.0", + "@google-cloud/promisify": "^4.0.0", "abort-controller": "^3.0.0", "async-retry": "^1.3.3", "compressible": "^2.0.12", - "duplexify": "^4.0.0", + "duplexify": "^4.1.3", "ent": "^2.2.0", - "extend": "^3.0.2", - "fast-xml-parser": "^4.2.2", - "gaxios": "^5.0.0", - "google-auth-library": "^8.0.1", + "fast-xml-parser": "^4.3.0", + "gaxios": "^6.0.2", + "google-auth-library": "^9.6.3", "mime": "^3.0.0", "mime-types": "^2.0.8", "p-limit": "^3.0.1", - "retry-request": "^5.0.0", - "teeny-request": "^8.0.0", + "retry-request": "^7.0.0", + "teeny-request": "^9.0.0", "uuid": "^8.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/@google-cloud/storage/node_modules/uuid": { @@ -1423,27 +1285,27 @@ } }, "node_modules/@grpc/grpc-js": { - "version": "1.8.21", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.21.tgz", - "integrity": "sha512-KeyQeZpxeEBSqFVTi3q2K7PiPXmgBfECc4updA1ejCLjYmoAlvvM3ZMp5ztTDUCUQmoY3CpDxvchjO1+rFkoHg==", - "devOptional": true, + "version": "1.10.9", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.9.tgz", + "integrity": "sha512-5tcgUctCG0qoNyfChZifz2tJqbRbXVO9J7X6duFcOjY3HUNCxg5D0ZCK7EP9vIcZ0zRpLU9bWkyCqVCLZ46IbQ==", + "optional": true, "dependencies": { - "@grpc/proto-loader": "^0.7.0", - "@types/node": ">=12.12.47" + "@grpc/proto-loader": "^0.7.13", + "@js-sdsl/ordered-map": "^4.4.2" }, "engines": { - "node": "^8.13.0 || >=10.10.0" + "node": ">=12.10.0" } }, "node_modules/@grpc/proto-loader": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz", - "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==", - "devOptional": true, + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "optional": true, "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", - "protobufjs": "^7.2.4", + "protobufjs": "^7.2.5", "yargs": "^17.7.2" }, "bin": { @@ -1454,13 +1316,14 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", "minimatch": "^3.0.5" }, "engines": { @@ -1481,114 +1344,12 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", "dev": true }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "optional": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "optional": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "optional": true - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "optional": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -1892,34 +1653,13 @@ } } }, - "node_modules/@jest/reporters/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "peer": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.27.8" + "@sinclair/typebox": "^0.27.8" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -1999,20 +1739,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/transform/node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "peer": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@jest/types": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", @@ -2032,14 +1758,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -2055,9 +1781,9 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, "engines": { "node": ">=6.0.0" @@ -2070,31 +1796,23 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@jsdevtools/ono": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz", - "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==", - "dev": true - }, - "node_modules/@jsdoc/salty": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz", - "integrity": "sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==", - "devOptional": true, - "dependencies": { - "lodash": "^4.17.21" - }, - "engines": { - "node": ">=v12.0.0" + "node_modules/@js-sdsl/ordered-map": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", + "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==", + "optional": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" } }, "node_modules/@nodelib/fs.scandir": { @@ -2132,88 +1850,6 @@ "node": ">= 8" } }, - "node_modules/@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "optional": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@opentelemetry/api": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz", - "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==", - "dev": true, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.3.1.tgz", - "integrity": "sha512-wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA==", - "dev": true, - "engines": { - "node": ">=8.12.0" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@pnpm/config.env-replace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", - "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", - "dev": true, - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", - "dev": true, - "dependencies": { - "graceful-fs": "4.2.10" - }, - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "node_modules/@pnpm/npm-conf": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz", - "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==", - "dev": true, - "dependencies": { - "@pnpm/config.env-replace": "^1.1.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -2269,41 +1905,233 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "node_modules/@puppeteer/browsers": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz", - "integrity": "sha512-nIb8SOBgDEMFY2iS2MdnUZOg2ikcYchRrBoF+wtdjieRFKR2uGRipHY/oFLo+2N6anDualyClPzGywTHRGrLfw==", - "dependencies": { - "debug": "4.3.4", - "extract-zip": "2.0.1", - "progress": "2.0.3", - "proxy-agent": "6.3.1", - "tar-fs": "3.0.4", - "unbzip2-stream": "1.4.3", - "yargs": "17.7.1" + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", + "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", + "dependencies": { + "debug": "^4.3.6", + "extract-zip": "^2.0.1", + "progress": "^2.0.3", + "proxy-agent": "^6.4.0", + "semver": "^7.6.3", + "tar-fs": "^3.0.6", + "unbzip2-stream": "^1.4.3", + "yargs": "^17.7.2" }, "bin": { "browsers": "lib/cjs/main-cli.js" }, "engines": { - "node": ">=16.3.0" + "node": ">=18" } }, - "node_modules/@puppeteer/browsers/node_modules/yargs": { - "version": "17.7.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", - "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", + "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", + "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", + "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", + "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", + "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", + "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", + "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", + "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", + "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", + "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", + "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", + "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", + "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", + "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", + "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", + "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] }, "node_modules/@sinclair/typebox": { "version": "0.27.8", @@ -2312,9 +2140,9 @@ "dev": true }, "node_modules/@sinonjs/commons": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, "peer": true, "dependencies": { @@ -2346,9 +2174,9 @@ "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" }, "node_modules/@types/babel__core": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", - "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", "dev": true, "peer": true, "dependencies": { @@ -2360,9 +2188,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.5.tgz", - "integrity": "sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==", + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", "dev": true, "peer": true, "dependencies": { @@ -2370,9 +2198,9 @@ } }, "node_modules/@types/babel__template": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.2.tgz", - "integrity": "sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", "dev": true, "peer": true, "dependencies": { @@ -2381,9 +2209,9 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.2.tgz", - "integrity": "sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz", + "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==", "dev": true, "peer": true, "dependencies": { @@ -2399,6 +2227,12 @@ "@types/node": "*" } }, + "node_modules/@types/caseless": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz", + "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==", + "optional": true + }, "node_modules/@types/chai": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", @@ -2430,14 +2264,11 @@ "@types/node": "*" } }, - "node_modules/@types/duplexify": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.2.tgz", - "integrity": "sha512-2/0R4riyD/OS6GNJLIhwRaj+8ZbxHUZl3I0a3PHwH7zhZEEAACUWjzaBrY1qVWckueZ5pouDRP0UxX6P8Hzfww==", - "dev": true, - "dependencies": { - "@types/node": "*" - } + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true }, "node_modules/@types/express": { "version": "4.17.3", @@ -2460,20 +2291,10 @@ "@types/send": "*" } }, - "node_modules/@types/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==", - "devOptional": true, - "dependencies": { - "@types/minimatch": "^5.1.2", - "@types/node": "*" - } - }, "node_modules/@types/graceful-fs": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.7.tgz", - "integrity": "sha512-MhzcwU8aUygZroVwL2jeYk6JisJrPl/oov/gsgGCue9mkgl9wjGbzReYQClxiUgFDnib9FuHqTndccKeZKxTRw==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", "dev": true, "peer": true, "dependencies": { @@ -2492,9 +2313,9 @@ "dev": true }, "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "dev": true, "peer": true, "dependencies": { @@ -2502,9 +2323,9 @@ } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, "peer": true, "dependencies": { @@ -2522,12 +2343,6 @@ "parse5": "^7.0.0" } }, - "node_modules/@types/json-schema": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", - "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", - "dev": true - }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", @@ -2542,12 +2357,6 @@ "@types/node": "*" } }, - "node_modules/@types/linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g==", - "devOptional": true - }, "node_modules/@types/lodash": { "version": "4.14.199", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz", @@ -2558,39 +2367,20 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==", - "devOptional": true - }, - "node_modules/@types/markdown-it": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz", - "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==", - "devOptional": true, - "dependencies": { - "@types/linkify-it": "*", - "@types/mdurl": "*" - } - }, - "node_modules/@types/mdurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz", - "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==", - "devOptional": true + "optional": true }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "devOptional": true - }, "node_modules/@types/node": { - "version": "20.6.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.5.tgz", - "integrity": "sha512-2qGq5LAOTh9izcc0+F+dToFigBWiK1phKPt7rNhOqJSr35y8rlIBjDwGtFSgAI6MGIhjwOVNSQZVdJsZJ2uR1w==" + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/qs": { "version": "6.9.8", @@ -2602,21 +2392,31 @@ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" }, - "node_modules/@types/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==", - "devOptional": true, + "node_modules/@types/request": { + "version": "2.48.12", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz", + "integrity": "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==", + "optional": true, "dependencies": { - "@types/glob": "*", - "@types/node": "*" + "@types/caseless": "*", + "@types/node": "*", + "@types/tough-cookie": "*", + "form-data": "^2.5.0" } }, - "node_modules/@types/semver": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz", - "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==", - "dev": true + "node_modules/@types/request/node_modules/form-data": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "optional": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } }, "node_modules/@types/send": { "version": "0.17.1", @@ -2638,9 +2438,9 @@ } }, "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "dev": true, "peer": true }, @@ -2648,18 +2448,12 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz", "integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==", - "dev": true - }, - "node_modules/@types/triple-beam": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz", - "integrity": "sha512-6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g==", - "dev": true + "devOptional": true }, "node_modules/@types/yargs": { - "version": "17.0.25", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.25.tgz", - "integrity": "sha512-gy7iPgwnzNvxgAEi2bXOHWCVOG6f7xsprVJH4MjlAWeBmJ7vh/Y1kwMtUrs64ztf24zVIRCpr3n/z6gm9QIkgg==", + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", "dev": true, "peer": true, "dependencies": { @@ -2667,48 +2461,47 @@ } }, "node_modules/@types/yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==", + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", "dev": true, "peer": true }, "node_modules/@types/yauzl": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz", - "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", "optional": true, "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz", + "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.12.2", + "@typescript-eslint/type-utils": "8.12.2", + "@typescript-eslint/utils": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2", "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -2717,25 +2510,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz", + "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "8.12.2", + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/typescript-estree": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -2744,16 +2538,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz", + "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -2761,26 +2555,23 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz", + "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "8.12.2", + "@typescript-eslint/utils": "8.12.2", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependencies": { - "eslint": "*" - }, "peerDependenciesMeta": { "typescript": { "optional": true @@ -2788,12 +2579,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz", + "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -2801,21 +2592,22 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz", + "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -2827,49 +2619,75 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz", + "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.12.2", + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/typescript-estree": "8.12.2" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^8.57.0 || ^9.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz", + "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "8.12.2", + "eslint-visitor-keys": "^3.4.3" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@vitest/coverage-v8": { "version": "0.34.5", "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.34.5.tgz", @@ -2996,18 +2814,11 @@ "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", "dev": true }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "optional": true - }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "devOptional": true, + "optional": true, "dependencies": { "event-target-shim": "^5.0.0" }, @@ -3031,7 +2842,7 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "devOptional": true, + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -3043,7 +2854,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "devOptional": true, + "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -3069,33 +2880,6 @@ "node": ">= 6.0.0" } }, - "node_modules/agentkeepalive": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", - "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", - "dev": true, - "optional": true, - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "optional": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -3112,59 +2896,12 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "dev": true, - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, - "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "dependencies": { - "string-width": "^4.1.0" - } - }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, + "peer": true, "dependencies": { "type-fest": "^0.21.3" }, @@ -3180,6 +2917,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -3209,17 +2947,12 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/ansicolors": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz", - "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==", - "dev": true - }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "peer": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -3228,138 +2961,6 @@ "node": ">= 8" } }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true, - "optional": true - }, - "node_modules/archiver": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", - "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", - "dev": true, - "dependencies": { - "archiver-utils": "^2.1.0", - "async": "^3.2.4", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.1.2", - "tar-stream": "^2.2.0", - "zip-stream": "^4.1.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/archiver-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "dev": true, - "dependencies": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archiver-utils/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/archiver-utils/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "node_modules/archiver-utils/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/archiver-utils/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "node_modules/archiver-utils/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/archiver/node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "dev": true, - "optional": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -3402,15 +3003,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/array.prototype.findlastindex": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", @@ -3491,35 +3083,11 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "devOptional": true, + "optional": true, "engines": { "node": ">=8" } }, - "node_modules/as-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz", - "integrity": "sha512-1Sd1LrodN0XYxYeZcN1J4xYZvmvTwD5tDWaPUGPIzH1mFsmzsPnVtd2exWhecMjtZk/wYWjNZJiD3b1SLCeJqg==", - "dev": true - }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dev": true, - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, "node_modules/assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -3540,18 +3108,6 @@ "node": ">=4" } }, - "node_modules/async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", - "dev": true - }, - "node_modules/async-lock": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.3.2.tgz", - "integrity": "sha512-phnXdS3RP7PPcmP6NWWzWMU0sLTeyvtZCxBPpZdkYE3seGLKSQZs9FrmVO/qwypq98FUtWWUEYxziLkdGk5nnA==", - "dev": true - }, "node_modules/async-retry": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz", @@ -3565,7 +3121,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "devOptional": true }, "node_modules/available-typed-arrays": { "version": "1.0.5", @@ -3579,25 +3135,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", - "dev": true - }, "node_modules/b4a": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz", - "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==" + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==" }, "node_modules/babel-jest": { "version": "29.7.0", @@ -3726,7 +3267,48 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "devOptional": true + "dev": true + }, + "node_modules/bare-events": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", + "optional": true + }, + "node_modules/bare-fs": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz", + "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==", + "optional": true, + "dependencies": { + "bare-events": "^2.0.0", + "bare-path": "^2.0.0", + "bare-stream": "^2.0.0" + } + }, + "node_modules/bare-os": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", + "optional": true + }, + "node_modules/bare-path": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", + "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", + "optional": true, + "dependencies": { + "bare-os": "^2.1.0" + } + }, + "node_modules/bare-stream": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.2.tgz", + "integrity": "sha512-EFZHSIBkDgSHIwj2l2QZfP4U5OcD4xFAOwhSb/vlr9PIqyGJGvB/nfClJbcnh3EY4jtPE4zsb5ztae96bVF79A==", + "optional": true, + "dependencies": { + "streamx": "^2.20.0" + } }, "node_modules/base64-js": { "version": "1.5.1", @@ -3747,97 +3329,38 @@ } ] }, - "node_modules/basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "dev": true, - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/basic-auth-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", - "integrity": "sha512-kiV+/DTgVro4aZifY/hwRwALBISViL5NP4aReaR2EVJEObpbUBHIkdJh/YpcoEiYt7nBodZ6U2ajZeZvSxUCCg==", - "dev": true - }, - "node_modules/basic-auth/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, "node_modules/basic-ftp": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz", - "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", "engines": { "node": ">=10.0.0" } }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "dev": true, - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, "node_modules/bignumber.js": { "version": "9.1.2", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz", "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==", - "devOptional": true, + "optional": true, "engines": { "node": "*" } }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "devOptional": true - }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", + "qs": "6.13.0", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -3859,66 +3382,32 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/boxen": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", - "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", - "dev": true, - "dependencies": { - "ansi-align": "^3.0.0", - "camelcase": "^6.2.0", - "chalk": "^4.1.0", - "cli-boxes": "^2.2.1", - "string-width": "^4.2.2", - "type-fest": "^0.20.2", - "widest-line": "^3.1.0", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "devOptional": true, + "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/browserslist": { - "version": "4.21.11", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", - "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dev": true, "funding": [ { @@ -3936,9 +3425,9 @@ ], "peer": true, "dependencies": { - "caniuse-lite": "^1.0.30001538", - "electron-to-chromium": "^1.4.526", - "node-releases": "^2.0.13", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, "bin": { @@ -4018,117 +3507,24 @@ "node": ">=8" } }, - "node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "optional": true, - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "optional": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "10.3.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.7.tgz", - "integrity": "sha512-wCMbE1m9Nx5yD9LYtgsVWq5VhHlk5WzJirw594qZR6AIvQYuHrdDtIktUVjQItalD53y7dqoedu9xP0u0WaxIQ==", - "dev": true, - "optional": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/cacache/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "optional": true, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "brace-expansion": "^2.0.1" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/call-me-maybe": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz", - "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==", - "dev": true - }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -4148,9 +3544,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001539", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz", - "integrity": "sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==", + "version": "1.0.30001610", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", + "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==", "dev": true, "funding": [ { @@ -4168,37 +3564,6 @@ ], "peer": true }, - "node_modules/cardinal": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", - "integrity": "sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==", - "dev": true, - "dependencies": { - "ansicolors": "~0.3.2", - "redeyed": "~2.1.0" - }, - "bin": { - "cdl": "bin/cdl.js" - } - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", - "dev": true - }, - "node_modules/catharsis": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz", - "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==", - "devOptional": true, - "dependencies": { - "lodash": "^4.17.15" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/chai": { "version": "4.3.8", "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz", @@ -4221,7 +3586,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "devOptional": true, + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -4243,12 +3608,6 @@ "node": ">=10" } }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, "node_modules/check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", @@ -4258,70 +3617,23 @@ "node": "*" } }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/chromium-bidi": { - "version": "0.4.28", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.28.tgz", - "integrity": "sha512-2HZ74QlAApJrEwcGlU/sUu0s4VS+FI3CJ09Toc9aE9VemMyhHZXeaROQgJKNRaYMUTUx6qIv1cLBs3F+vfgjSw==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.8.0.tgz", + "integrity": "sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug==", "dependencies": { "mitt": "3.0.1", - "urlpattern-polyfill": "9.0.0" + "urlpattern-polyfill": "10.0.0", + "zod": "3.23.8" }, "peerDependencies": { "devtools-protocol": "*" } }, "node_modules/ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, "funding": [ { @@ -4341,159 +3653,46 @@ "dev": true, "peer": true }, - "node_modules/cjson": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.3.3.tgz", - "integrity": "sha512-yKNcXi/Mvi5kb1uK0sahubYiyfUO2EUgOp4NcY9+8NX5Xmc+4yeNogZuLFkpLBBj7/QI9MjRUIuXrV9XOw5kVg==", - "dev": true, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dependencies": { - "json-parse-helpfulerror": "^1.0.3" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" }, "engines": { - "node": ">= 0.3.0" + "node": ">=12" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, - "optional": true, + "peer": true, "engines": { - "node": ">=6" + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" } }, - "node_modules/cli-boxes": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", - "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "peer": true }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dependencies": { - "restore-cursor": "^3.1.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/cli-spinners": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", - "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-table": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.11.tgz", - "integrity": "sha512-IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ==", - "dev": true, - "dependencies": { - "colors": "1.0.3" - }, - "engines": { - "node": ">= 0.2.0" - } - }, - "node_modules/cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0" - }, - "engines": { - "node": "10.* || >= 12.*" - }, - "optionalDependencies": { - "@colors/colors": "1.5.0" - } - }, - "node_modules/cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true, - "peer": true, - "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" - } - }, - "node_modules/collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true, - "peer": true - }, - "node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" + "node": ">=7.0.0" } }, "node_modules/color-name": { @@ -4501,71 +3700,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "node_modules/color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "dev": true, - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "optional": true, - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/color/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true - }, - "node_modules/colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "dev": true, - "dependencies": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, + "devOptional": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -4573,35 +3712,11 @@ "node": ">= 0.8" } }, - "node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/compress-commons": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", - "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", - "dev": true, - "dependencies": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "devOptional": true, + "optional": true, "dependencies": { "mime-db": ">= 1.43.0 < 2" }, @@ -4609,169 +3724,12 @@ "node": ">= 0.6" } }, - "node_modules/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, - "dependencies": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/compression/node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/compression/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/compression/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/compression/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "devOptional": true - }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dev": true, - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/config-chain/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "dependencies": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/connect": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", - "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "finalhandler": "1.1.2", - "parseurl": "~1.3.3", - "utils-merge": "1.0.1" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/connect/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/connect/node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/connect/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/connect/node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/connect/node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true, - "optional": true - }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -4799,9 +3757,9 @@ "peer": true }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -4811,12 +3769,6 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true - }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -4830,14 +3782,14 @@ } }, "node_modules/cosmiconfig": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", - "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "dependencies": { + "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", - "parse-json": "^5.2.0", - "path-type": "^4.0.0" + "parse-json": "^5.2.0" }, "engines": { "node": ">=14" @@ -4854,31 +3806,6 @@ } } }, - "node_modules/crc-32": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", - "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", - "dev": true, - "bin": { - "crc32": "bin/crc32.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/crc32-stream": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", - "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", - "dev": true, - "dependencies": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/create-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", @@ -4901,120 +3828,20 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/cross-env": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", - "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "dependencies": { - "cross-spawn": "^6.0.5" - }, - "bin": { - "cross-env": "dist/bin/cross-env.js", - "cross-env-shell": "dist/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/cross-env/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "engines": { - "node": ">=4.8" - } - }, - "node_modules/cross-env/node_modules/path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/cross-env/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/cross-env/node_modules/shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", - "dev": true, - "dependencies": { - "shebang-regex": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cross-env/node_modules/shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cross-env/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/cross-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", - "dependencies": { - "node-fetch": "^2.6.12" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" }, "engines": { "node": ">= 8" } }, - "node_modules/crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/cssstyle": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", @@ -5027,28 +3854,10 @@ "node": ">=14" } }, - "node_modules/csv-parse": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.0.tgz", - "integrity": "sha512-RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw==", - "dev": true - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/data-uri-to-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", - "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", "engines": { "node": ">= 14" } @@ -5102,11 +3911,11 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -5124,9 +3933,9 @@ "dev": true }, "node_modules/dedent": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", - "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", "dev": true, "peer": true, "peerDependencies": { @@ -5150,26 +3959,11 @@ "node": ">=6" } }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/deep-freeze": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz", - "integrity": "sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==", - "dev": true - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "devOptional": true + "dev": true }, "node_modules/deepmerge": { "version": "4.3.1", @@ -5181,30 +3975,20 @@ "node": ">=0.10.0" } }, - "node_modules/defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "dependencies": { - "clone": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/define-data-property": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", - "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", - "dev": true, + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-properties": { @@ -5237,50 +4021,15 @@ "node": ">= 14" } }, - "node_modules/degenerator/node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/degenerator/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, + "devOptional": true, "engines": { "node": ">=0.4.0" } }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true, - "optional": true - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -5309,9 +4058,9 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1179426", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1179426.tgz", - "integrity": "sha512-KKC7IGwdOr7u9kTGgjUvGTov/z1s2H7oHi3zKCdR9eSDyCPia5CBi4aRhtp7d8uR7l0GS5UTDw3TjKGu5CqINg==" + "version": "0.0.1354347", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1354347.tgz", + "integrity": "sha512-BlmkSqV0V84E2WnEnoPnwyix57rQxAM5SKJjf4TbYOCGLAWtz8CDH8RIaGOjPgPCXo2Mce3kxSY497OySidY3Q==" }, "node_modules/diff-sequences": { "version": "29.6.3", @@ -5322,18 +4071,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -5367,45 +4104,16 @@ "node": ">=12" } }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/duplexify": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", - "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==", - "devOptional": true, + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz", + "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==", + "optional": true, "dependencies": { "end-of-stream": "^1.4.1", "inherits": "^2.0.3", "readable-stream": "^3.1.1", - "stream-shift": "^1.0.0" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "optional": true - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", - "dev": true, - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "stream-shift": "^1.0.2" } }, "node_modules/ecdsa-sig-formatter": { @@ -5422,9 +4130,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.528", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz", - "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==", + "version": "1.4.738", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.738.tgz", + "integrity": "sha512-lwKft2CLFztD+vEIpesrOtCrko/TFnEJlHFdRhazU7Y/jx5qc4cqsocfVrBg4So4gGe9lvxnbLIoev47WMpg+A==", "dev": true, "peer": true }, @@ -5446,41 +4154,14 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "dev": true - }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -5495,32 +4176,14 @@ "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==", "optional": true }, - "node_modules/entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", - "devOptional": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "optional": true, "engines": { "node": ">=6" } }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "optional": true - }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -5582,6 +4245,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-set-tostringtag": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", @@ -5623,9 +4305,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", + "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", "dev": true, "hasInstallScript": true, "bin": { @@ -5635,28 +4317,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" + "@esbuild/aix-ppc64": "0.21.5", + "@esbuild/android-arm": "0.21.5", + "@esbuild/android-arm64": "0.21.5", + "@esbuild/android-x64": "0.21.5", + "@esbuild/darwin-arm64": "0.21.5", + "@esbuild/darwin-x64": "0.21.5", + "@esbuild/freebsd-arm64": "0.21.5", + "@esbuild/freebsd-x64": "0.21.5", + "@esbuild/linux-arm": "0.21.5", + "@esbuild/linux-arm64": "0.21.5", + "@esbuild/linux-ia32": "0.21.5", + "@esbuild/linux-loong64": "0.21.5", + "@esbuild/linux-mips64el": "0.21.5", + "@esbuild/linux-ppc64": "0.21.5", + "@esbuild/linux-riscv64": "0.21.5", + "@esbuild/linux-s390x": "0.21.5", + "@esbuild/linux-x64": "0.21.5", + "@esbuild/netbsd-x64": "0.21.5", + "@esbuild/openbsd-x64": "0.21.5", + "@esbuild/sunos-x64": "0.21.5", + "@esbuild/win32-arm64": "0.21.5", + "@esbuild/win32-ia32": "0.21.5", + "@esbuild/win32-x64": "0.21.5" } }, "node_modules/escalade": { @@ -5667,15 +4350,6 @@ "node": ">=6" } }, - "node_modules/escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -5694,91 +4368,40 @@ } }, "node_modules/escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", - "devOptional": true, + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", "dependencies": { "esprima": "^4.0.1", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" + "estraverse": "^5.2.0", + "esutils": "^2.0.2" }, "bin": { "escodegen": "bin/escodegen.js", "esgenerate": "bin/esgenerate.js" }, "engines": { - "node": ">=4.0" + "node": ">=6.0" }, "optionalDependencies": { "source-map": "~0.6.1" } }, - "node_modules/escodegen/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "devOptional": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "devOptional": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "devOptional": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "devOptional": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -5972,24 +4595,11 @@ } } }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "devOptional": true, + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -6013,20 +4623,11 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "devOptional": true, + "dev": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -6063,15 +4664,6 @@ "node": ">=0.10" } }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -6084,20 +4676,10 @@ "node": ">=4.0" } }, - "node_modules/esrecurse/node_modules/estraverse": { + "node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "devOptional": true, "engines": { "node": ">=4.0" } @@ -6122,17 +4704,11 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "devOptional": true, + "optional": true, "engines": { "node": ">=6" } }, - "node_modules/events-listener": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/events-listener/-/events-listener-1.1.0.tgz", - "integrity": "sha512-Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g==", - "dev": true - }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -6170,90 +4746,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/exegesis": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/exegesis/-/exegesis-4.1.1.tgz", - "integrity": "sha512-PvSqaMOw2absLBgsthtJyVOeCHN4lxQ1dM7ibXb6TfZZJaoXtGELoEAGJRFvdN16+u9kg8oy1okZXRk8VpimWA==", - "dev": true, - "dependencies": { - "@apidevtools/json-schema-ref-parser": "^9.0.3", - "ajv": "^8.3.0", - "ajv-formats": "^2.1.0", - "body-parser": "^1.18.3", - "content-type": "^1.0.4", - "deep-freeze": "0.0.1", - "events-listener": "^1.1.0", - "glob": "^7.1.3", - "json-ptr": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "lodash": "^4.17.11", - "openapi3-ts": "^3.1.1", - "promise-breaker": "^6.0.0", - "pump": "^3.0.0", - "qs": "^6.6.0", - "raw-body": "^2.3.3", - "semver": "^7.0.0" - }, - "engines": { - "node": ">=6.0.0", - "npm": ">5.0.0" - } - }, - "node_modules/exegesis-express": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/exegesis-express/-/exegesis-express-4.0.0.tgz", - "integrity": "sha512-V2hqwTtYRj0bj43K4MCtm0caD97YWkqOUHFMRCBW5L1x9IjyqOEc7Xa4oQjjiFbeFOSQzzwPV+BzXsQjSz08fw==", - "dev": true, - "dependencies": { - "exegesis": "^4.1.0" - }, - "engines": { - "node": ">=6.0.0", - "npm": ">5.0.0" - } - }, - "node_modules/exegesis/node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/exegesis/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/exegesis/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -6281,44 +4773,37 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true, - "optional": true - }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -6346,33 +4831,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "devOptional": true - }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } + "optional": true }, "node_modules/extract-zip": { "version": "2.0.1", @@ -6393,15 +4852,6 @@ "@types/yauzl": "^2.9.1" } }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -6420,9 +4870,9 @@ "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==" }, "node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -6457,41 +4907,20 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "devOptional": true - }, - "node_modules/fast-text-encoding": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz", - "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==", - "devOptional": true - }, - "node_modules/fast-url-parser": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", - "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", - "dev": true, - "dependencies": { - "punycode": "^1.3.2" - } - }, - "node_modules/fast-url-parser/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", "dev": true }, "node_modules/fast-xml-parser": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.1.tgz", - "integrity": "sha512-viVv3xb8D+SiS1W4cv4tva3bni08kAkx0gQnWrykMM8nXPc1FxqZPU00dCEVjkiCg4HoXd2jC4x29Nzg/l2DAA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", "funding": [ - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" - }, { "type": "github", "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" } ], "optional": true, @@ -6540,36 +4969,6 @@ "pend": "~1.2.0" } }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "dev": true - }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/figures/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -6582,19 +4981,10 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/filesize": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz", - "integrity": "sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==", - "dev": true, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -6604,12 +4994,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -6650,14 +5040,14 @@ } }, "node_modules/firebase-admin": { - "version": "11.10.1", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-11.10.1.tgz", - "integrity": "sha512-atv1E6GbuvcvWaD3eHwrjeP5dAVs+EaHEJhu9CThMzPY6In8QYDiUR6tq5SwGl4SdA/GcAU0nhwWc/FSJsAzfQ==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-12.0.0.tgz", + "integrity": "sha512-wBrrSSsKV++/+O8E7O/C7/wL0nbG/x4Xv4yatz/+sohaZ+LsnWtYUcrd3gZutO86hLpDex7xgyrkKbgulmtVyQ==", "dependencies": { "@fastify/busboy": "^1.2.1", - "@firebase/database-compat": "^0.3.4", - "@firebase/database-types": "^0.10.4", - "@types/node": ">=12.12.47", + "@firebase/database-compat": "^1.0.2", + "@firebase/database-types": "^1.0.0", + "@types/node": "^20.10.3", "jsonwebtoken": "^9.0.0", "jwks-rsa": "^3.0.1", "node-forge": "^1.3.1", @@ -6667,20 +5057,19 @@ "node": ">=14" }, "optionalDependencies": { - "@google-cloud/firestore": "^6.6.0", - "@google-cloud/storage": "^6.9.5" + "@google-cloud/firestore": "^7.1.0", + "@google-cloud/storage": "^7.7.0" } }, "node_modules/firebase-functions": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.4.1.tgz", - "integrity": "sha512-3no53Lg12ToNlPSgLZtAFLQAz6si7ilHvzO8NC3/2EybyUwegpj5YhHwNiCw839lmAWp3znjATJDTvADFiZMrg==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.9.0.tgz", + "integrity": "sha512-IqxOEsVAWGcRv9KRGzWQR5mOFuNsil3vsfkRPPiaV1U/ATC27/jbahh4z8I4rW8Xqa6cQE5xqnw0ueyMH7i7Ag==", "dependencies": { "@types/cors": "^2.8.5", "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "node-fetch": "^2.6.7", "protobufjs": "^7.2.2" }, "bin": { @@ -6690,13 +5079,13 @@ "node": ">=14.10.0" }, "peerDependencies": { - "firebase-admin": "^10.0.0 || ^11.0.0" + "firebase-admin": "^10.0.0 || ^11.0.0 || ^12.0.0" } }, "node_modules/firebase-functions-test": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-3.1.0.tgz", - "integrity": "sha512-yfm9ToguShxmRXb7TINN88zE2bM9gsBbs7vMWVKJAxGcl/n1f/U0sT5k2yho676QIcSqXVSjCONU8W4cUEL+Sw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-3.2.0.tgz", + "integrity": "sha512-UkOPIJH4I4qUGGSr4vaBcbAqn+YblVtMqRI2KQMW2nhMw5So91Iw1klu5Epk8vhEOhn1LPG5/tMaBI1MAtOt6Q==", "dev": true, "dependencies": { "@types/lodash": "^4.14.104", @@ -6707,445 +5096,100 @@ "node": ">=14.0.0" }, "peerDependencies": { - "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0", - "firebase-functions": ">=4.3.0", + "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0", + "firebase-functions": ">=4.9.0", "jest": ">=28.0.0" } }, - "node_modules/firebase-tools": { - "version": "12.5.4", - "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-12.5.4.tgz", - "integrity": "sha512-fLE+91tJp3PNZPyB6kN9zfn5rkQWhzPX3mlsAGKTMJUA5TLeZA1YlfBbgPr2DJUO47cHN/9b0BYUQjYcYsBPgw==", + "node_modules/flat-cache": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", + "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", "dev": true, "dependencies": { - "@google-cloud/pubsub": "^3.0.1", - "abort-controller": "^3.0.0", - "ajv": "^6.12.6", - "archiver": "^5.0.0", - "async-lock": "1.3.2", - "body-parser": "^1.19.0", - "chokidar": "^3.0.2", - "cjson": "^0.3.1", - "cli-table": "0.3.11", - "colorette": "^2.0.19", - "commander": "^4.0.1", - "configstore": "^5.0.1", - "cors": "^2.8.5", - "cross-env": "^5.1.3", - "cross-spawn": "^7.0.3", - "csv-parse": "^5.0.4", - "exegesis": "^4.1.0", - "exegesis-express": "^4.0.0", - "express": "^4.16.4", - "filesize": "^6.1.0", - "form-data": "^4.0.0", - "fs-extra": "^10.1.0", - "glob": "^7.1.2", - "google-auth-library": "^7.11.0", - "inquirer": "^8.2.0", - "js-yaml": "^3.13.1", - "jsonwebtoken": "^9.0.0", - "leven": "^3.1.0", - "libsodium-wrappers": "^0.7.10", - "lodash": "^4.17.21", - "marked": "^4.0.14", - "marked-terminal": "^5.1.1", - "mime": "^2.5.2", - "minimatch": "^3.0.4", - "morgan": "^1.10.0", - "node-fetch": "^2.6.7", - "open": "^6.3.0", - "ora": "^5.4.1", - "p-limit": "^3.0.1", - "portfinder": "^1.0.32", - "progress": "^2.0.3", - "proxy-agent": "^6.3.0", - "request": "^2.87.0", - "retry": "^0.13.1", - "rimraf": "^3.0.0", - "semver": "^7.5.2", - "stream-chain": "^2.2.4", - "stream-json": "^1.7.3", - "strip-ansi": "^6.0.1", - "superstatic": "^9.0.3", - "tar": "^6.1.11", - "tcp-port-used": "^1.0.2", - "tmp": "^0.2.1", - "triple-beam": "^1.3.0", - "universal-analytics": "^0.5.3", - "update-notifier-cjs": "^5.1.6", - "uuid": "^8.3.2", - "winston": "^3.0.0", - "winston-transport": "^4.4.0", - "ws": "^7.2.3" - }, - "bin": { - "firebase": "lib/bin/firebase.js" + "flatted": "^3.2.7", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" }, "engines": { - "node": ">=16.13.0 || >=18.0.0" + "node": ">=12.0.0" } }, - "node_modules/firebase-tools/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, "dependencies": { - "sprintf-js": "~1.0.2" + "is-callable": "^1.1.3" } }, - "node_modules/firebase-tools/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" }, "engines": { - "node": ">=12" + "node": ">= 6" } }, - "node_modules/firebase-tools/node_modules/gaxios": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz", - "integrity": "sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==", - "dev": true, + "node_modules/formdata-node": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz", + "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==", "dependencies": { - "abort-controller": "^3.0.0", - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.6.7" + "node-domexception": "1.0.0", + "web-streams-polyfill": "4.0.0-beta.3" }, "engines": { - "node": ">=10" + "node": ">= 12.20" } }, - "node_modules/firebase-tools/node_modules/gcp-metadata": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz", - "integrity": "sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==", - "dev": true, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dependencies": { - "gaxios": "^4.0.0", - "json-bigint": "^1.0.0" + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": ">=10" - } - }, - "node_modules/firebase-tools/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/firebase-tools/node_modules/google-auth-library": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz", - "integrity": "sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA==", - "dev": true, - "dependencies": { - "arrify": "^2.0.0", - "base64-js": "^1.3.0", - "ecdsa-sig-formatter": "^1.0.11", - "fast-text-encoding": "^1.0.0", - "gaxios": "^4.0.0", - "gcp-metadata": "^4.2.0", - "gtoken": "^5.0.4", - "jws": "^4.0.0", - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/firebase-tools/node_modules/google-p12-pem": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz", - "integrity": "sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==", - "dev": true, - "dependencies": { - "node-forge": "^1.3.1" - }, - "bin": { - "gp12-pem": "build/src/bin/gp12-pem.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/firebase-tools/node_modules/gtoken": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz", - "integrity": "sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==", - "dev": true, - "dependencies": { - "gaxios": "^4.0.0", - "google-p12-pem": "^3.1.3", - "jws": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/firebase-tools/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/firebase-tools/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/firebase-tools/node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/firebase-tools/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/firebase-tools/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/firebase-tools/node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/flat-cache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", - "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", - "dev": true, - "dependencies": { - "flatted": "^3.2.7", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "dev": true - }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "dev": true - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dev": true, - "optional": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/formdata-node": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz", - "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==", - "dependencies": { - "node-domexception": "1.0.0", - "web-streams-polyfill": "4.0.0-beta.3" - }, - "engines": { - "node": ">= 12.20" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=14.14" } }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "devOptional": true + "dev": true }, "node_modules/fsevents": { "version": "2.3.3", @@ -7162,9 +5206,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.6", @@ -7199,52 +5246,58 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "dev": true, + "node_modules/gaxios": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.4.0.tgz", + "integrity": "sha512-apAloYrY4dlBGlhauDAYSZveafb5U6+L9titing1wox6BvWM0TSXBp603zTrLpyLMGkrcFgohnUN150dFN/zOA==", "optional": true, "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "extend": "^3.0.2", + "https-proxy-agent": "^7.0.1", + "is-stream": "^2.0.0", + "node-fetch": "^2.6.9", + "uuid": "^9.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=14" } }, - "node_modules/gaxios": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", - "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", - "devOptional": true, + "node_modules/gaxios/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "optional": true, "dependencies": { - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.6.9" + "debug": "^4.3.4" }, "engines": { - "node": ">=12" + "node": ">= 14" + } + }, + "node_modules/gaxios/node_modules/https-proxy-agent": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", + "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "optional": true, + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" } }, "node_modules/gcp-metadata": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", - "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", - "devOptional": true, + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz", + "integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==", + "optional": true, "dependencies": { - "gaxios": "^5.0.0", + "gaxios": "^6.0.0", "json-bigint": "^1.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/gensync": { @@ -7275,14 +5328,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7329,42 +5386,34 @@ } }, "node_modules/get-uri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", - "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", "dependencies": { "basic-ftp": "^5.0.2", - "data-uri-to-buffer": "^5.0.1", + "data-uri-to-buffer": "^6.0.2", "debug": "^4.3.4", - "fs-extra": "^8.1.0" + "fs-extra": "^11.2.0" }, "engines": { "node": ">= 14" } }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - } - }, "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "devOptional": true, + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">=12" + "node": "*" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -7382,63 +5431,10 @@ "node": ">=10.13.0" } }, - "node_modules/glob-slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz", - "integrity": "sha512-ZwFh34WZhZX28ntCMAP1mwyAJkn8+Omagvt/GvA+JQM/qgT0+MR2NPF3vhvgdshfdvDyGZXs8fPXW84K32Wjuw==", - "dev": true - }, - "node_modules/glob-slasher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz", - "integrity": "sha512-5MUzqFiycIKLMD1B0dYOE4hGgLLUZUNGGYO4BExdwT32wUwW3DBOE7lMQars7vB1q43Fb3Tyt+HmgLKsJhDYdg==", - "dev": true, - "dependencies": { - "glob-slash": "^1.0.0", - "lodash.isobject": "^2.4.1", - "toxic": "^1.0.0" - } - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "devOptional": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "devOptional": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/globals": { - "version": "13.22.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", - "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -7465,120 +5461,50 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/google-auth-library": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.9.0.tgz", - "integrity": "sha512-f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg==", - "devOptional": true, + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.7.0.tgz", + "integrity": "sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==", + "optional": true, "dependencies": { - "arrify": "^2.0.0", "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", - "fast-text-encoding": "^1.0.0", - "gaxios": "^5.0.0", - "gcp-metadata": "^5.3.0", - "gtoken": "^6.1.0", - "jws": "^4.0.0", - "lru-cache": "^6.0.0" + "gaxios": "^6.1.1", + "gcp-metadata": "^6.1.0", + "gtoken": "^7.0.0", + "jws": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/google-gax": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-3.6.1.tgz", - "integrity": "sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==", - "devOptional": true, + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.3.2.tgz", + "integrity": "sha512-2mw7qgei2LPdtGrmd1zvxQviOcduTnsvAWYzCxhOWXK4IQKmQztHnDQwD0ApB690fBQJemFKSU7DnceAy3RLzw==", + "optional": true, "dependencies": { - "@grpc/grpc-js": "~1.8.0", + "@grpc/grpc-js": "~1.10.0", "@grpc/proto-loader": "^0.7.0", "@types/long": "^4.0.0", - "@types/rimraf": "^3.0.2", "abort-controller": "^3.0.0", "duplexify": "^4.0.0", - "fast-text-encoding": "^1.0.3", - "google-auth-library": "^8.0.2", - "is-stream-ended": "^0.1.4", + "google-auth-library": "^9.3.0", "node-fetch": "^2.6.1", "object-hash": "^3.0.0", - "proto3-json-serializer": "^1.0.0", - "protobufjs": "7.2.4", - "protobufjs-cli": "1.1.1", - "retry-request": "^5.0.0" - }, - "bin": { - "compileProtos": "build/tools/compileProtos.js", - "minifyProtoJson": "build/tools/minify.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/google-gax/node_modules/protobufjs": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", - "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", - "devOptional": true, - "hasInstallScript": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/node": ">=13.7.0", - "long": "^5.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/google-p12-pem": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz", - "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==", - "devOptional": true, - "dependencies": { - "node-forge": "^1.3.1" - }, - "bin": { - "gp12-pem": "build/src/bin/gp12-pem.js" + "proto3-json-serializer": "^2.0.0", + "protobufjs": "7.2.6", + "retry-request": "^7.0.0", + "uuid": "^9.0.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14" } }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -7598,46 +5524,23 @@ "dev": true }, "node_modules/gtoken": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz", - "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==", - "devOptional": true, + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz", + "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==", + "optional": true, "dependencies": { - "gaxios": "^5.0.1", - "google-p12-pem": "^4.0.0", + "gaxios": "^6.0.0", "jws": "^4.0.0" }, "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" + "node": ">=14.0.0" } }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -7658,18 +5561,17 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "devOptional": true, + "dev": true, "engines": { "node": ">=8" } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7712,29 +5614,15 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true, - "optional": true - }, - "node_modules/has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/heap-js": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/heap-js/-/heap-js-2.3.0.tgz", - "integrity": "sha512-E5303mzwQ+4j/n2J0rDvEPBN7GKjhis10oHiYOgjxsmxYgqG++hz9NyLLOXttzH8as/DyiBHYpUrJTZWYaMo8Q==", - "dev": true, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, "engines": { - "node": ">=10.0.0" + "node": ">= 0.4" } }, "node_modules/html-encoding-sniffer": { @@ -7755,13 +5643,6 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true, - "optional": true - }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -7783,9 +5664,9 @@ "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==" }, "node_modules/http-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -7795,9 +5676,9 @@ } }, "node_modules/http-proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dependencies": { "debug": "^4.3.4" }, @@ -7805,21 +5686,6 @@ "node": ">= 14" } }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, "node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -7843,16 +5709,6 @@ "node": ">=10.17.0" } }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "^2.0.0" - } - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -7884,9 +5740,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "engines": { "node": ">= 4" @@ -7907,15 +5763,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -7945,21 +5792,11 @@ "node": ">=0.8.19" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "devOptional": true, + "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -7970,66 +5807,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/inquirer": { - "version": "8.2.6", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", - "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^6.0.1" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/inquirer/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/install-artifact-from-github": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.3.3.tgz", - "integrity": "sha512-x79SL0d8WOi1ZjXSTUqqs0GPQZ92YArJAN9O46wgU9wdH2U9ecyyhB9YGDbPe2OLV4ptmt6AZYRQZ2GydQZosQ==", - "dev": true, - "optional": true, - "bin": { - "install-from-cache": "bin/install-from-cache.js", - "save-to-github-cache": "bin/save-to-github-cache.js" - } - }, "node_modules/internal-slot": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", @@ -8044,20 +5821,23 @@ "node": ">= 0.4" } }, - "node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" - }, - "node_modules/ip-regex": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", - "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", - "dev": true, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, "engines": { - "node": ">=8" + "node": ">= 12" } }, + "node_modules/ip-address/node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -8097,18 +5877,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/is-boolean-object": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", @@ -8137,24 +5905,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-ci/node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, "node_modules/is-core-module": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", @@ -8221,38 +5971,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "optional": true - }, "node_modules/is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -8265,18 +5983,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-npm": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", - "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -8301,15 +6007,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", @@ -8365,12 +6062,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-stream-ended": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", - "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", - "devOptional": true - }, "node_modules/is-string": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", @@ -8416,30 +6107,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-url": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", - "dev": true - }, "node_modules/is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -8452,35 +6119,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", - "dev": true - }, - "node_modules/is2": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz", - "integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "ip-regex": "^4.1.0", - "is-url": "^1.2.4" - }, - "engines": { - "node": ">=v0.10.0" - } - }, "node_modules/isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", @@ -8493,22 +6131,6 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "node_modules/isomorphic-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz", - "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==", - "dev": true, - "dependencies": { - "node-fetch": "^2.6.1", - "whatwg-fetch": "^3.4.1" - } - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "dev": true - }, "node_modules/istanbul-lib-coverage": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", @@ -8519,15 +6141,15 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz", - "integrity": "sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz", + "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==", "dev": true, "peer": true, "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", "istanbul-lib-coverage": "^3.2.0", "semver": "^7.5.4" }, @@ -8591,25 +6213,6 @@ "node": ">=8" } }, - "node_modules/jackspeak": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz", - "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==", - "dev": true, - "optional": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", @@ -8764,27 +6367,6 @@ } } }, - "node_modules/jest-config/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "peer": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/jest-diff": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", @@ -9081,27 +6663,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runtime/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "peer": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/jest-runtime/node_modules/strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", @@ -9245,27 +6806,10 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", - "dev": true - }, - "node_modules/join-path": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/join-path/-/join-path-1.1.1.tgz", - "integrity": "sha512-jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA==", - "dev": true, - "dependencies": { - "as-array": "^2.0.0", - "url-join": "0.0.1", - "valid-url": "^1" - } - }, "node_modules/jose": { - "version": "4.14.6", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.14.6.tgz", - "integrity": "sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ==", + "version": "4.15.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.5.tgz", + "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -9281,63 +6825,15 @@ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dependencies": { "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/js2xmlparser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz", - "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==", - "devOptional": true, - "dependencies": { - "xmlcreate": "^2.0.4" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", - "dev": true - }, - "node_modules/jsdoc": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz", - "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==", - "devOptional": true, - "dependencies": { - "@babel/parser": "^7.20.15", - "@jsdoc/salty": "^0.2.1", - "@types/markdown-it": "^12.2.3", - "bluebird": "^3.7.2", - "catharsis": "^0.9.0", - "escape-string-regexp": "^2.0.0", - "js2xmlparser": "^4.0.2", - "klaw": "^3.0.0", - "markdown-it": "^12.3.2", - "markdown-it-anchor": "^8.4.1", - "marked": "^4.0.10", - "mkdirp": "^1.0.4", - "requizzle": "^0.2.3", - "strip-json-comments": "^3.1.0", - "underscore": "~1.13.2" - }, - "bin": { - "jsdoc": "jsdoc.js" - }, - "engines": { - "node": ">=12.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsdoc/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "devOptional": true, - "engines": { - "node": ">=8" - } + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "node_modules/jsdom": { "version": "22.1.0", @@ -9470,7 +6966,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", - "devOptional": true, + "optional": true, "dependencies": { "bignumber.js": "^9.0.0" } @@ -9486,27 +6982,6 @@ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, - "node_modules/json-parse-helpfulerror": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", - "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", - "dev": true, - "dependencies": { - "jju": "^1.1.0" - } - }, - "node_modules/json-ptr": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/json-ptr/-/json-ptr-3.1.1.tgz", - "integrity": "sha512-SiSJQ805W1sDUCD1+/t1/1BIrveq2Fe9HJqENxZmMCILmrPI7WhS/pePpIOx85v6/H2z1Vy7AI08GV2TzfXocg==", - "dev": true - }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true - }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -9519,12 +6994,6 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true - }, "node_modules/json5": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", @@ -9544,9 +7013,12 @@ "dev": true }, "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -9591,26 +7063,11 @@ "safe-buffer": "^5.0.1" } }, - "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dev": true, - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/jwa": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "devOptional": true, + "optional": true, "dependencies": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.11", @@ -9648,7 +7105,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "devOptional": true, + "optional": true, "dependencies": { "jwa": "^2.0.0", "safe-buffer": "^5.0.1" @@ -9663,15 +7120,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/klaw": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", - "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", - "devOptional": true, - "dependencies": { - "graceful-fs": "^4.1.9" - } - }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -9682,65 +7130,12 @@ "node": ">=6" } }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "dev": true - }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.5" - }, - "engines": { - "node": ">= 0.6.3" - } - }, - "node_modules/lazystream/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "node_modules/lazystream/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/lazystream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "node_modules/lazystream/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -9758,21 +7153,6 @@ "node": ">= 0.8.0" } }, - "node_modules/libsodium": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.13.tgz", - "integrity": "sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw==", - "dev": true - }, - "node_modules/libsodium-wrappers": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz", - "integrity": "sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==", - "dev": true, - "dependencies": { - "libsodium": "^0.7.13" - } - }, "node_modules/limiter": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", @@ -9783,15 +7163,6 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, - "node_modules/linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", - "devOptional": true, - "dependencies": { - "uc.micro": "^1.0.1" - } - }, "node_modules/local-pkg": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz", @@ -9823,43 +7194,19 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "devOptional": true - }, - "node_modules/lodash._objecttypes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", - "integrity": "sha512-XpqGh1e7hhkOzftBfWE7zt+Yn9mVHFkDhicVttvKLsoCMLVVL+xTQjfjB4X4vtznauxv0QZ5ZAeqjvat0dh62Q==", "dev": true }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", - "devOptional": true + "optional": true }, "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", - "dev": true - }, - "node_modules/lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", - "dev": true - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", - "dev": true - }, "node_modules/lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -9880,15 +7227,6 @@ "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" }, - "node_modules/lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha512-sTebg2a1PoicYEZXD5PBdQcTlIJ6hUslrlWr7iV0O7n+i4596s2NQ9I5CaZ5FbXSfya/9WQsrYLANUJv9paYVA==", - "dev": true, - "dependencies": { - "lodash._objecttypes": "~2.4.1" - } - }, "node_modules/lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", @@ -9910,312 +7248,73 @@ "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" }, - "node_modules/lodash.snakecase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", - "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==", - "dev": true - }, - "node_modules/lodash.union": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", - "dev": true - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/logform": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz", - "integrity": "sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==", - "dev": true, - "dependencies": { - "@colors/colors": "1.5.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - } - }, "node_modules/long": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - }, - "node_modules/loupe": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", - "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.0" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/lru-memoizer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz", - "integrity": "sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==", - "dependencies": { - "lodash.clonedeep": "^4.5.0", - "lru-cache": "~4.0.0" - } - }, - "node_modules/lru-memoizer/node_modules/lru-cache": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", - "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==", - "dependencies": { - "pseudomap": "^1.0.1", - "yallist": "^2.0.0" - } - }, - "node_modules/lru-memoizer/node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" - }, - "node_modules/magic-string": { - "version": "0.30.3", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz", - "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "optional": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "optional": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/make-fetch-happen/node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "optional": true, - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "peer": true, - "dependencies": { - "tmpl": "1.0.5" - } + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, - "node_modules/markdown-it": { - "version": "12.3.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", - "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", - "devOptional": true, + "node_modules/loupe": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", + "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "dev": true, "dependencies": { - "argparse": "^2.0.1", - "entities": "~2.1.0", - "linkify-it": "^3.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - }, - "bin": { - "markdown-it": "bin/markdown-it.js" - } - }, - "node_modules/markdown-it-anchor": { - "version": "8.6.7", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", - "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", - "devOptional": true, - "peerDependencies": { - "@types/markdown-it": "*", - "markdown-it": "*" + "get-func-name": "^2.0.0" } }, - "node_modules/marked": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", - "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", - "devOptional": true, - "bin": { - "marked": "bin/marked.js" - }, + "node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "engines": { - "node": ">= 12" + "node": ">=12" } }, - "node_modules/marked-terminal": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-5.2.0.tgz", - "integrity": "sha512-Piv6yNwAQXGFjZSaiNljyNFw7jKDdGrw70FSbtxEyldLsyeuV5ZHm/1wW++kWbrOF1VPnUgYOhB2oLL0ZpnekA==", - "dev": true, + "node_modules/lru-memoizer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz", + "integrity": "sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==", "dependencies": { - "ansi-escapes": "^6.2.0", - "cardinal": "^2.1.1", - "chalk": "^5.2.0", - "cli-table3": "^0.6.3", - "node-emoji": "^1.11.0", - "supports-hyperlinks": "^2.3.0" - }, - "engines": { - "node": ">=14.13.1 || >=16.0.0" - }, - "peerDependencies": { - "marked": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0" + "lodash.clonedeep": "^4.5.0", + "lru-cache": "~4.0.0" } }, - "node_modules/marked-terminal/node_modules/ansi-escapes": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", - "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", - "dev": true, + "node_modules/lru-memoizer/node_modules/lru-cache": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==", "dependencies": { - "type-fest": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" } }, - "node_modules/marked-terminal/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "node_modules/lru-memoizer/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + }, + "node_modules/magic-string": { + "version": "0.30.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz", + "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==", "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "engines": { + "node": ">=12" } }, - "node_modules/marked-terminal/node_modules/type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peer": true, + "dependencies": { + "tmpl": "1.0.5" } }, - "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", - "devOptional": true - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -10225,9 +7324,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -10302,6 +7404,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -10309,289 +7412,50 @@ "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "devOptional": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "devOptional": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-collect/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-fetch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", - "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mitt": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", - "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "devOptional": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" - }, - "node_modules/mlly": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", - "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==", - "dev": true, - "dependencies": { - "acorn": "^8.10.0", - "pathe": "^1.1.1", - "pkg-types": "^1.0.3", - "ufo": "^1.3.0" - } - }, - "node_modules/morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "dev": true, - "dependencies": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/morgan/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/morgan/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/morgan/node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { - "ee-first": "1.1.1" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">= 0.8" + "node": "*" } }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, - "node_modules/nan": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", - "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", + "node_modules/mlly": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", + "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==", "dev": true, - "optional": true + "dependencies": { + "acorn": "^8.10.0", + "pathe": "^1.1.1", + "pkg-types": "^1.0.3", + "ufo": "^1.3.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -10612,12 +7476,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -10634,12 +7492,6 @@ "node": ">= 0.4.0" } }, - "node_modules/nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "node_modules/node-domexception": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", @@ -10658,19 +7510,11 @@ "node": ">=10.5.0" } }, - "node_modules/node-emoji": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", - "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", - "dev": true, - "dependencies": { - "lodash": "^4.17.21" - } - }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "optional": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -10718,53 +7562,6 @@ "node": ">= 6.13.0" } }, - "node_modules/node-gyp": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz", - "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==", - "dev": true, - "optional": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^11.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "optional": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -10773,33 +7570,18 @@ "peer": true }, "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true, "peer": true }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "optional": true, - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -10817,37 +7599,12 @@ "node": ">=8" } }, - "node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "dev": true, - "optional": true, - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/nwsapi": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", "dev": true }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -10860,15 +7617,18 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", - "devOptional": true, + "optional": true, "engines": { "node": ">= 6" } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10957,15 +7717,6 @@ "node": ">= 0.8" } }, - "node_modules/on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -10974,20 +7725,12 @@ "wrappy": "1" } }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "dev": true, - "dependencies": { - "fn.name": "1.x.x" - } - }, "node_modules/onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, + "peer": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -10998,27 +7741,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/open": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", - "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", - "dev": true, - "dependencies": { - "is-wsl": "^1.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/openapi3-ts": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.2.0.tgz", - "integrity": "sha512-/ykNWRV5Qs0Nwq7Pc0nJ78fgILvOT/60OxEmB3v7yQ8a8Bwcm43D4diaYazG/KBn6czA+52XYy931WFLMCUeSg==", - "dev": true, - "dependencies": { - "yaml": "^2.2.1" - } - }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -11036,47 +7758,6 @@ "node": ">= 0.8.0" } }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/p-defer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz", - "integrity": "sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -11107,22 +7788,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "optional": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -11134,27 +7799,27 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", - "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", "debug": "^4.3.4", "get-uri": "^6.0.1", "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.2" + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" }, "engines": { "node": ">= 14" } }, "node_modules/pac-proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dependencies": { "debug": "^4.3.4" }, @@ -11163,9 +7828,9 @@ } }, "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -11175,12 +7840,11 @@ } }, "node_modules/pac-resolver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz", - "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", "dependencies": { "degenerator": "^5.0.0", - "ip": "^1.1.8", "netmask": "^2.0.2" }, "engines": { @@ -11260,7 +7924,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "devOptional": true, + "dev": true, "engines": { "node": ">=0.10.0" } @@ -11280,45 +7944,10 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", - "dev": true, - "optional": true, - "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", - "dev": true, - "optional": true, - "engines": { - "node": "14 || >=16.14" - } - }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "engines": { - "node": ">=8" - } + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/pathe": { "version": "1.1.1", @@ -11340,17 +7969,10 @@ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "dev": true - }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -11454,54 +8076,10 @@ "pathe": "^1.1.0" } }, - "node_modules/portfinder": { - "version": "1.0.32", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz", - "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==", - "dev": true, - "dependencies": { - "async": "^2.6.4", - "debug": "^3.2.7", - "mkdirp": "^0.5.6" - }, - "engines": { - "node": ">= 0.12.0" - } - }, - "node_modules/portfinder/node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14" - } - }, - "node_modules/portfinder/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/portfinder/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "dev": true, "funding": [ { @@ -11518,9 +8096,9 @@ } ], "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "nanoid": "^3.3.7", + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -11588,48 +8166,12 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-breaker": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/promise-breaker/-/promise-breaker-6.0.0.tgz", - "integrity": "sha512-BthzO9yTPswGf7etOBiHCVuugs2N01/Q/94dIPls48z2zCmrnDptUUZzfIb+41xq0MnYZ/BzmOd6ikDR4ibNZA==", - "dev": true - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "optional": true, - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/promise-retry/node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "optional": true, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "engines": { - "node": ">= 4" + "node": ">=0.4.0" } }, "node_modules/prompts": { @@ -11646,28 +8188,22 @@ "node": ">= 6" } }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "dev": true - }, "node_modules/proto3-json-serializer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz", - "integrity": "sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==", - "devOptional": true, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.1.tgz", + "integrity": "sha512-8awBvjO+FwkMd6gNoGFZyqkHZXCFd54CIYTb6De7dPaufGJ2XNW+QUNqbMr8MaAocMdb+KpsD4rxEOaTBDCffA==", + "optional": true, "dependencies": { - "protobufjs": "^7.0.0" + "protobufjs": "^7.2.5" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/protobufjs": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", - "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", + "version": "7.2.6", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz", + "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -11687,43 +8223,6 @@ "node": ">=12.0.0" } }, - "node_modules/protobufjs-cli": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz", - "integrity": "sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==", - "devOptional": true, - "dependencies": { - "chalk": "^4.0.0", - "escodegen": "^1.13.0", - "espree": "^9.0.0", - "estraverse": "^5.1.0", - "glob": "^8.0.0", - "jsdoc": "^4.0.0", - "minimist": "^1.2.0", - "semver": "^7.1.2", - "tmp": "^0.2.1", - "uglify-js": "^3.7.7" - }, - "bin": { - "pbjs": "bin/pbjs", - "pbts": "bin/pbts" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "protobufjs": "^7.0.0" - } - }, - "node_modules/protobufjs-cli/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "devOptional": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -11737,14 +8236,14 @@ } }, "node_modules/proxy-agent": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz", - "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", "dependencies": { "agent-base": "^7.0.2", "debug": "^4.3.4", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", "lru-cache": "^7.14.1", "pac-proxy-agent": "^7.0.1", "proxy-from-env": "^1.1.0", @@ -11755,9 +8254,9 @@ } }, "node_modules/proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dependencies": { "debug": "^4.3.4" }, @@ -11766,9 +8265,9 @@ } }, "node_modules/proxy-agent/node_modules/https-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -11777,14 +8276,6 @@ "node": ">= 14" } }, - "node_modules/proxy-agent/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "engines": { - "node": ">=12" - } - }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -11802,9 +8293,9 @@ "dev": true }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -11819,52 +8310,46 @@ "node": ">=6" } }, - "node_modules/pupa": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", - "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", - "dev": true, - "dependencies": { - "escape-goat": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/puppeteer": { - "version": "21.3.4", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.3.4.tgz", - "integrity": "sha512-kE67k1KR6hQs3g0Yf/i3GYOhTU8zC2dtcpHhtcSC9bGoVxRgqDo/hwVkDqlNKxJsJHuVX+qviWC7F0FdSjcFTA==", + "version": "23.6.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.6.1.tgz", + "integrity": "sha512-8+ALGQgwXd3P/tGcuSsxTPGDaOQIjcDIm04I5hpWZv/PiN5q8bQNHRUyfYrifT+flnM9aTWCP7tLEzuB6SlIgA==", "hasInstallScript": true, "dependencies": { - "@puppeteer/browsers": "1.7.1", - "cosmiconfig": "8.3.6", - "puppeteer-core": "21.3.4" + "@puppeteer/browsers": "2.4.0", + "chromium-bidi": "0.8.0", + "cosmiconfig": "^9.0.0", + "devtools-protocol": "0.0.1354347", + "puppeteer-core": "23.6.1", + "typed-query-selector": "^2.12.0" + }, + "bin": { + "puppeteer": "lib/cjs/puppeteer/node/cli.js" }, "engines": { - "node": ">=16.3.0" + "node": ">=18" } }, "node_modules/puppeteer-core": { - "version": "21.3.4", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.3.4.tgz", - "integrity": "sha512-iaG7ScTXOm9hlsBTBGGtr5dAAsA8IiWTx8E0Ghr0b5Ntl42bdcPS8EXjcERKocDhua2YqdlnFGs/cBxHY+VNyA==", + "version": "23.6.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.6.1.tgz", + "integrity": "sha512-DoNLAzQfGklPauEn33N4h9cM9GubJSINEn+AUMwAXwW159Y9JLk5y34Jsbv4c7kG8P0puOYWV9leu2siMZ/QpQ==", "dependencies": { - "@puppeteer/browsers": "1.7.1", - "chromium-bidi": "0.4.28", - "cross-fetch": "4.0.0", - "debug": "4.3.4", - "devtools-protocol": "0.0.1179426", - "ws": "8.14.2" + "@puppeteer/browsers": "2.4.0", + "chromium-bidi": "0.8.0", + "debug": "^4.3.7", + "devtools-protocol": "0.0.1354347", + "typed-query-selector": "^2.12.0", + "ws": "^8.18.0" }, "engines": { - "node": ">=16.3.0" + "node": ">=18" } }, "node_modules/pure-rand": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz", - "integrity": "sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", "dev": true, "funding": [ { @@ -11879,11 +8364,11 @@ "peer": true }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -11932,9 +8417,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -11945,49 +8430,6 @@ "node": ">= 0.8" } }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/re2": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/re2/-/re2-1.20.3.tgz", - "integrity": "sha512-g5j4YjygwGEccP9SCuDI90uPlgALLEYLotfL0K+kqL3XKB4ht7Nm1JuXfOTG96c7JozpvCUxTz1T7oTNwwMI6w==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "dependencies": { - "install-artifact-from-github": "^1.3.3", - "nan": "^2.17.0", - "node-gyp": "^9.4.0" - } - }, "node_modules/react-is": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", @@ -11998,7 +8440,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "devOptional": true, + "optional": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -12008,57 +8450,6 @@ "node": ">= 6" } }, - "node_modules/readdir-glob": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", - "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", - "dev": true, - "dependencies": { - "minimatch": "^5.1.0" - } - }, - "node_modules/readdir-glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/readdir-glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/redeyed": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz", - "integrity": "sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==", - "dev": true, - "dependencies": { - "esprima": "~4.0.0" - } - }, "node_modules/regexp.prototype.flags": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", @@ -12076,95 +8467,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/registry-auth-token": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", - "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", - "dev": true, - "dependencies": { - "@pnpm/npm-conf": "^2.1.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", - "dev": true, - "dependencies": { - "rc": "^1.2.8" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request/node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/request/node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -12173,30 +8475,12 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, - "node_modules/requizzle": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz", - "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==", - "devOptional": true, - "dependencies": { - "lodash": "^4.17.21" - } - }, "node_modules/resolve": { "version": "1.22.6", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", @@ -12255,39 +8539,27 @@ "node": ">=10" } }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/retry": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", - "devOptional": true, + "optional": true, "engines": { "node": ">= 4" } }, "node_modules/retry-request": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz", - "integrity": "sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==", - "devOptional": true, + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz", + "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==", + "optional": true, "dependencies": { - "debug": "^4.1.1", - "extend": "^3.0.2" + "@types/request": "^2.48.8", + "extend": "^3.0.2", + "teeny-request": "^9.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/reusify": { @@ -12304,7 +8576,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "devOptional": true, + "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -12315,96 +8587,47 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "devOptional": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/rollup": { - "version": "3.29.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", - "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", + "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", "dev": true, + "dependencies": { + "@types/estree": "1.0.5" + }, "bin": { "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=14.18.0", + "node": ">=18.0.0", "npm": ">=8.0.0" }, "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.22.4", + "@rollup/rollup-android-arm64": "4.22.4", + "@rollup/rollup-darwin-arm64": "4.22.4", + "@rollup/rollup-darwin-x64": "4.22.4", + "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", + "@rollup/rollup-linux-arm-musleabihf": "4.22.4", + "@rollup/rollup-linux-arm64-gnu": "4.22.4", + "@rollup/rollup-linux-arm64-musl": "4.22.4", + "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", + "@rollup/rollup-linux-riscv64-gnu": "4.22.4", + "@rollup/rollup-linux-s390x-gnu": "4.22.4", + "@rollup/rollup-linux-x64-gnu": "4.22.4", + "@rollup/rollup-linux-x64-musl": "4.22.4", + "@rollup/rollup-win32-arm64-msvc": "4.22.4", + "@rollup/rollup-win32-ia32-msvc": "4.22.4", + "@rollup/rollup-win32-x64-msvc": "4.22.4", "fsevents": "~2.3.2" } }, - "node_modules/router": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/router/-/router-1.3.8.tgz", - "integrity": "sha512-461UFH44NtSfIlS83PUg2N7OZo86BC/kB3dY77gJdsODsBhhw7+2uE0tzTINxrY9CahCUVk1VhpWCA5i1yoIEg==", - "dev": true, - "dependencies": { - "array-flatten": "3.0.0", - "debug": "2.6.9", - "methods": "~1.1.2", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "setprototypeof": "1.2.0", - "utils-merge": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/router/node_modules/array-flatten": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz", - "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA==", - "dev": true - }, - "node_modules/router/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/router/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, "node_modules/rrweb-cssom": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", "dev": true }, - "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -12428,15 +8651,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/safe-array-concat": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", @@ -12485,16 +8699,7 @@ "is-regex": "^1.1.4" }, "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-stable-stringify": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", - "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", - "dev": true, - "engines": { - "node": ">=10" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/safer-buffer": { @@ -12515,12 +8720,9 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "bin": { "semver": "bin/semver.js" }, @@ -12528,31 +8730,10 @@ "node": ">=10" } }, - "node_modules/semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", - "dev": true, - "dependencies": { - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/semver-diff/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -12585,6 +8766,14 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -12596,31 +8785,35 @@ "node": ">=4" } }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true, - "optional": true + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } }, "node_modules/set-function-name": { "version": "2.0.1", @@ -12663,13 +8856,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12685,22 +8882,8 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", "dev": true, - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, - "node_modules/simple-swizzle/node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true + "peer": true }, "node_modules/sisteransi": { "version": "1.0.5", @@ -12714,6 +8897,7 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, + "peer": true, "engines": { "node": ">=8" } @@ -12728,35 +8912,35 @@ } }, "node_modules/socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "dependencies": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" }, "engines": { - "node": ">= 10.13.0", + "node": ">= 10.0.0", "npm": ">= 3.0.0" } }, "node_modules/socks-proxy-agent": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", - "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" }, "engines": { "node": ">= 14" } }, "node_modules/socks-proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dependencies": { "debug": "^4.3.4" }, @@ -12764,11 +8948,6 @@ "node": ">= 14" } }, - "node_modules/socks/node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -12779,9 +8958,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -12802,64 +8981,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "node_modules/sshpk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", - "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", - "dev": true, - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ssri": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", - "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", - "dev": true, - "optional": true, - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/ssri/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", "dev": true, - "engines": { - "node": "*" - } + "peer": true }, "node_modules/stack-utils": { "version": "2.0.6", @@ -12904,12 +9027,6 @@ "integrity": "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==", "dev": true }, - "node_modules/stream-chain": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.5.tgz", - "integrity": "sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA==", - "dev": true - }, "node_modules/stream-events": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", @@ -12919,35 +9036,30 @@ "stubs": "^3.0.0" } }, - "node_modules/stream-json": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.8.0.tgz", - "integrity": "sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw==", - "dev": true, - "dependencies": { - "stream-chain": "^2.2.5" - } - }, "node_modules/stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", - "devOptional": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz", + "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==", + "optional": true }, "node_modules/streamx": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz", - "integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==", + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", + "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", "dependencies": { - "fast-fifo": "^1.1.0", - "queue-tick": "^1.0.1" + "fast-fifo": "^1.3.2", + "queue-tick": "^1.0.1", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" } }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "devOptional": true, + "optional": true, "dependencies": { "safe-buffer": "~5.2.0" } @@ -12979,22 +9091,6 @@ "node": ">=8" } }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "optional": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/string.prototype.trim": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", @@ -13051,20 +9147,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -13088,7 +9170,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "devOptional": true, + "dev": true, "engines": { "node": ">=8" }, @@ -13120,109 +9202,13 @@ "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==", "optional": true }, - "node_modules/superstatic": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/superstatic/-/superstatic-9.0.3.tgz", - "integrity": "sha512-e/tmW0bsnQ/33ivK6y3CapJT0Ovy4pk/ohNPGhIAGU2oasoNLRQ1cv6enua09NU9w6Y0H/fBu07cjzuiWvLXxw==", - "dev": true, - "dependencies": { - "basic-auth-connect": "^1.0.0", - "commander": "^10.0.0", - "compression": "^1.7.0", - "connect": "^3.7.0", - "destroy": "^1.0.4", - "fast-url-parser": "^1.1.3", - "glob-slasher": "^1.0.1", - "is-url": "^1.2.2", - "join-path": "^1.1.1", - "lodash": "^4.17.19", - "mime-types": "^2.1.35", - "minimatch": "^6.1.6", - "morgan": "^1.8.2", - "on-finished": "^2.2.0", - "on-headers": "^1.0.0", - "path-to-regexp": "^1.8.0", - "router": "^1.3.1", - "update-notifier-cjs": "^5.1.6" - }, - "bin": { - "superstatic": "lib/bin/server.js" - }, - "engines": { - "node": "^14.18.0 || >=16.4.0" - }, - "optionalDependencies": { - "re2": "^1.17.7" - } - }, - "node_modules/superstatic/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/superstatic/node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "dev": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/superstatic/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true - }, - "node_modules/superstatic/node_modules/minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/superstatic/node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "devOptional": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" @@ -13246,108 +9232,43 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, - "node_modules/tar": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", - "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", - "dev": true, - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/tar-fs": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz", - "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", + "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", "dependencies": { - "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^3.1.5" + }, + "optionalDependencies": { + "bare-fs": "^2.1.1", + "bare-path": "^2.1.0" } }, "node_modules/tar-stream": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz", - "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", + "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", "dependencies": { "b4a": "^1.6.4", "fast-fifo": "^1.2.0", "streamx": "^2.15.0" } }, - "node_modules/tar/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tcp-port-used": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", - "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==", - "dev": true, - "dependencies": { - "debug": "4.3.1", - "is2": "^2.0.6" - } - }, - "node_modules/tcp-port-used/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/teeny-request": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.3.tgz", - "integrity": "sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz", + "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==", "optional": true, "dependencies": { "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.9", "stream-events": "^1.0.5", "uuid": "^9.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/teeny-request/node_modules/http-proxy-agent": { @@ -13378,36 +9299,15 @@ "node": ">=8" } }, - "node_modules/test-exclude/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } + "node_modules/text-decoder": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.1.tgz", + "integrity": "sha512-x9v3H/lTKIJKQQe7RPQkLfKAnc9lUTkWDypIQgTzPJAq+5/GCDHonmshfvlsNSj58yyshbIJJDLmU15qNERrXQ==" }, "node_modules/text-decoding": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz", - "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==" - }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "dev": true + "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==" }, "node_modules/text-table": { "version": "0.2.0", @@ -13444,18 +9344,6 @@ "node": ">=14.0.0" } }, - "node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "devOptional": true, - "dependencies": { - "rimraf": "^3.0.0" - }, - "engines": { - "node": ">=8.17.0" - } - }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -13493,40 +9381,22 @@ "node": ">=0.6" } }, - "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/toxic": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toxic/-/toxic-1.0.1.tgz", - "integrity": "sha512-WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg==", - "dev": true, - "dependencies": { - "lodash": "^4.17.10" - } - }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "optional": true }, - "node_modules/triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", + "node_modules/ts-api-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz", + "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==", "dev": true, "engines": { - "node": ">= 14.0.0" + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" } }, "node_modules/ts-deepmerge": { @@ -13552,45 +9422,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", - "dev": true - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -13701,52 +9532,30 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } + "node_modules/typed-query-selector": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz", + "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==" }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "devOptional": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, - "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", - "devOptional": true - }, "node_modules/ufo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", "integrity": "sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==", "dev": true }, - "node_modules/uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", - "devOptional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -13771,78 +9580,17 @@ "through": "^2.3.8" } }, - "node_modules/underscore": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", - "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", - "devOptional": true - }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "optional": true, - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "optional": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "dependencies": { - "crypto-random-string": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/universal-analytics": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.5.3.tgz", - "integrity": "sha512-HXSMyIcf2XTvwZ6ZZQLfxfViRm/yTGoRgDeTbojtq6rezeyKB0sTBcKH2fhddnteAHRcHiKgr/ACpbgjGOC6RQ==", - "dev": true, - "dependencies": { - "debug": "^4.3.1", - "uuid": "^8.0.0" - }, - "engines": { - "node": ">=12.18.2" - } - }, - "node_modules/universal-analytics/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "bin": { - "uuid": "dist/bin/uuid" - } + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "engines": { - "node": ">= 4.0.0" + "node": ">= 10.0.0" } }, "node_modules/unpipe": { @@ -13884,33 +9632,6 @@ "browserslist": ">= 4.21.0" } }, - "node_modules/update-notifier-cjs": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/update-notifier-cjs/-/update-notifier-cjs-5.1.6.tgz", - "integrity": "sha512-wgxdSBWv3x/YpMzsWz5G4p4ec7JWD0HCl8W6bmNB6E5Gwo+1ym5oN4hiXpLf0mPySVEJEIsYlkshnplkg2OP9A==", - "dev": true, - "dependencies": { - "boxen": "^5.0.0", - "chalk": "^4.1.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.4.0", - "is-npm": "^5.0.0", - "is-yarn-global": "^0.3.0", - "isomorphic-fetch": "^3.0.0", - "pupa": "^2.1.1", - "registry-auth-token": "^5.0.1", - "registry-url": "^5.1.0", - "semver": "^7.3.7", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=14" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -13920,12 +9641,6 @@ "punycode": "^2.1.0" } }, - "node_modules/url-join": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz", - "integrity": "sha512-H6dnQ/yPAAVzMQRvEvyz01hhfQL5qRWSEt7BX8t9DqnPw9BjMb64fjIRq76Uvf1hkHp+mTZvEVJ5guXOT0Xqaw==", - "dev": true - }, "node_modules/url-parse": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", @@ -13937,15 +9652,15 @@ } }, "node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==" }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "devOptional": true + "optional": true }, "node_modules/utils-merge": { "version": "1.0.1", @@ -13987,11 +9702,18 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, - "node_modules/valid-url": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz", - "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==", - "dev": true + "node_modules/valibot": { + "version": "0.42.1", + "resolved": "https://registry.npmjs.org/valibot/-/valibot-0.42.1.tgz", + "integrity": "sha512-3keXV29Ar5b//Hqi4MbSdV7lfVp6zuYLZuA9V1PvQUsXqogr+u5lvLPLk3A4f74VUXDnf/JfWMN6sB+koJ/FFw==", + "peerDependencies": { + "typescript": ">=5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } }, "node_modules/vary": { "version": "1.1.2", @@ -14001,47 +9723,34 @@ "node": ">= 0.8" } }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz", + "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==", "dev": true, "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.21.3", + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" }, "optionalDependencies": { - "fsevents": "~2.3.2" + "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": ">= 14", + "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", + "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" @@ -14059,6 +9768,9 @@ "sass": { "optional": true }, + "sass-embedded": { + "optional": true + }, "stylus": { "optional": true }, @@ -14192,15 +9904,6 @@ "makeerror": "1.0.12" } }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "dependencies": { - "defaults": "^1.0.3" - } - }, "node_modules/web-streams-polyfill": { "version": "4.0.0-beta.3", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz", @@ -14212,7 +9915,8 @@ "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "optional": true }, "node_modules/websocket-driver": { "version": "0.7.4", @@ -14259,12 +9963,6 @@ "node": ">=0.10.0" } }, - "node_modules/whatwg-fetch": { - "version": "3.6.19", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.19.tgz", - "integrity": "sha512-d67JP4dHSbm2TrpFj8AbO8DnL1JXL5J9u0Kq2xW6d0TFDbCA3Muhdt8orXC22utleTVj7Prqt82baN6RBvnEgw==", - "dev": true - }, "node_modules/whatwg-mimetype": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", @@ -14278,6 +9976,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "optional": true, "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -14349,73 +10048,6 @@ "node": ">=8" } }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "optional": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", - "dev": true, - "dependencies": { - "string-width": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/winston": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz", - "integrity": "sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g==", - "dev": true, - "dependencies": { - "@colors/colors": "1.5.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.4.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.5.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz", - "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==", - "dev": true, - "dependencies": { - "logform": "^2.3.2", - "readable-stream": "^3.6.0", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 6.4.0" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "devOptional": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -14432,46 +10064,29 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, + "peer": true, "dependencies": { "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, "node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "engines": { "node": ">=10.0.0" }, @@ -14488,15 +10103,6 @@ } } }, - "node_modules/xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/xml-name-validator": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", @@ -14512,12 +10118,6 @@ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, - "node_modules/xmlcreate": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz", - "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==", - "devOptional": true - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -14526,25 +10126,10 @@ "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yaml": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", - "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", - "dev": true, - "engines": { - "node": ">= 14" - } - }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "devOptional": true, "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -14587,59 +10172,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/zip-stream": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", - "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", - "dev": true, - "dependencies": { - "archiver-utils": "^3.0.4", - "compress-commons": "^4.1.2", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/zip-stream/node_modules/archiver-utils": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", - "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", - "dev": true, - "dependencies": { - "glob": "^7.2.3", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/zip-stream/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, + "node_modules/zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/colinhacks" } } } diff --git a/firebase/functions/package.json b/firebase/functions/package.json index 64cb15c..417052a 100644 --- a/firebase/functions/package.json +++ b/firebase/functions/package.json @@ -20,27 +20,27 @@ }, "main": "lib/index.js", "dependencies": { - "firebase-admin": "^11.10.1", - "firebase-functions": "^4.4.1", + "firebase-admin": "^12.0.0", + "firebase-functions": "^4.9.0", "formdata-node": "^4.4.1", "node-fetch-commonjs": "^3.3.1", - "puppeteer": "^21.3.4" + "puppeteer": "^23.6.1", + "valibot": "^0.42.1" }, "devDependencies": { "@types/jsdom": "^21.1.3", - "@typescript-eslint/eslint-plugin": "^5.12.0", - "@typescript-eslint/parser": "^5.12.0", + "@typescript-eslint/eslint-plugin": "^8.12.2", + "@typescript-eslint/parser": "^8.12.2", "@vitest/coverage-v8": "^0.34.5", "eslint": "^8.9.0", "eslint-config-google": "^0.14.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-prettier": "^4.2.1", - "firebase-functions-test": "^3.1.0", - "firebase-tools": "^12.5.4", + "firebase-functions-test": "^3.2.0", "jsdom": "^22.1.0", "prettier": "^2.8.8", - "typescript": "^4.9.5", + "typescript": "^5.3.3", "vitest": "^0.34.5" }, "private": true diff --git a/firebase/functions/src/cron.spec.ts b/firebase/functions/src/cron.spec.ts index 967db9e..0d0db15 100644 --- a/firebase/functions/src/cron.spec.ts +++ b/firebase/functions/src/cron.spec.ts @@ -1,26 +1,12 @@ import { getDateFromRepo } from "./helpers/github"; import { getDateFromSource } from "./helpers/puppeteer"; -import { send } from "./helpers/telegram"; +import { send as sendTelegram } from "./helpers/telegram"; import { compareDateValuesBetweenSourceAndRepo } from "./cron"; import { describe, expect, it, vi } from "vitest"; -const mocks = vi.hoisted(() => { - return { - getDateFromRepo: vi.fn() satisfies typeof getDateFromRepo, - getDateFromSource: vi.fn() satisfies typeof getDateFromSource, - sendTelegram: vi.fn() satisfies typeof send, - }; -}); - -vi.mock("./helpers/github", () => ({ - getDateFromRepo: mocks.getDateFromRepo, -})); -vi.mock("./helpers/puppeteer", () => ({ - getDateFromSource: mocks.getDateFromSource, -})); -vi.mock("./helpers/telegram", () => ({ - send: mocks.sendTelegram, -})); +vi.mock("./helpers/github"); +vi.mock("./helpers/puppeteer"); +vi.mock("./helpers/telegram"); const mockedConsoleLog = vi .spyOn(console, "log") @@ -28,41 +14,41 @@ const mockedConsoleLog = vi describe("compareDateValuesBetweenSourceAndRepo", () => { it("should send Telegram with errors", async () => { - mocks.getDateFromSource.mockRejectedValueOnce(new Error("source")); - mocks.getDateFromRepo.mockRejectedValueOnce(new Error("repo")); + vi.mocked(getDateFromSource).mockRejectedValueOnce(new Error("source")); + vi.mocked(getDateFromRepo).mockRejectedValueOnce(new Error("repo")); await compareDateValuesBetweenSourceAndRepo(); - expect(mocks.sendTelegram).toHaveBeenCalledWith( + expect(vi.mocked(sendTelegram)).toHaveBeenCalledWith( "❌❌❌\n[getDateFromSource] Error: source\n[getDateFromRepo] Error: repo", expect.anything() ); }); it("should send Telegram with a warning if the dates are different", async () => { - mocks.getDateFromSource.mockResolvedValueOnce({ + vi.mocked(getDateFromSource).mockResolvedValueOnce({ date: "2023-01-01", error: undefined, png: Buffer.from(""), }); - mocks.getDateFromRepo.mockResolvedValueOnce({ + vi.mocked(getDateFromRepo).mockResolvedValueOnce({ date: "2023-01-02", error: undefined, }); await compareDateValuesBetweenSourceAndRepo(); - expect(mocks.sendTelegram).toHaveBeenCalledWith( + expect(vi.mocked(sendTelegram)).toHaveBeenCalledWith( "2023-01-01 ❌ 2023-01-02", expect.anything() ); }); it("should log a message if the dates are the same", async () => { - mocks.getDateFromSource.mockResolvedValueOnce({ + vi.mocked(getDateFromSource).mockResolvedValueOnce({ date: "2023-01-01", error: undefined, png: Buffer.from(""), }); - mocks.getDateFromRepo.mockResolvedValueOnce({ + vi.mocked(getDateFromRepo).mockResolvedValueOnce({ date: "2023-01-01", error: undefined, }); diff --git a/firebase/functions/src/helpers/puppeteer.spec.ts b/firebase/functions/src/helpers/puppeteer.spec.ts index c15be25..ea3d96d 100644 --- a/firebase/functions/src/helpers/puppeteer.spec.ts +++ b/firebase/functions/src/helpers/puppeteer.spec.ts @@ -29,7 +29,7 @@ describe("getDateInBrowserContext", () => { }); it("should return undefined", () => { - const dom = new JSDOM(`

Foo

`); + const dom = new JSDOM("

Foo

"); vi.stubGlobal("document", dom.window.document); const date = getDateInBrowserContext(); diff --git a/firebase/functions/src/helpers/telegram.spec.ts b/firebase/functions/src/helpers/telegram.spec.ts index acff9ed..fdf95cb 100644 --- a/firebase/functions/src/helpers/telegram.spec.ts +++ b/firebase/functions/src/helpers/telegram.spec.ts @@ -2,33 +2,28 @@ import { describe, expect, it, vi } from "vitest"; import { send } from "./telegram"; import { config } from "firebase-functions/v1"; -const mocks = vi.hoisted(() => { - return { - config: vi.fn() satisfies typeof config, - }; +vi.mock("firebase-functions", async (importActual) => { + const actual = await importActual(); + return { ...actual, config: vi.fn() }; }); -vi.mock("firebase-functions", () => ({ - config: mocks.config, -})); - describe("telegram/send", () => { const token = process.env.TELEGRAM_TOKEN ?? ""; const testIfHasToken = token.length > 0 ? it : it.skip; testIfHasToken("should return true", async () => { - mocks.config.mockReturnValueOnce({ + vi.mocked(config).mockReturnValueOnce({ telegram: { token, chat_id: "552046506", // bot chat with @daohoangson }, }); - const actual = await send("Hello"); + const actual = await send(`[${new Date().toISOString()}] ${__filename}`); expect(actual).toBeTruthy(); }); it("should return false with invalid token", async () => { - mocks.config.mockReturnValueOnce({ + vi.mocked(config).mockReturnValueOnce({ telegram: { token: "foo", chat_id: "bar" }, }); @@ -37,7 +32,7 @@ describe("telegram/send", () => { }); it("should throw with bad config", async () => { - mocks.config.mockReturnValueOnce({}); + vi.mocked(config).mockReturnValueOnce({}); expect(send("Oops")).rejects.toThrow("Telegram config is incomplete!"); }); }); diff --git a/firebase/functions/src/helpers/telegram.ts b/firebase/functions/src/helpers/telegram.ts index e8d0fa6..8df9e73 100644 --- a/firebase/functions/src/helpers/telegram.ts +++ b/firebase/functions/src/helpers/telegram.ts @@ -1,6 +1,9 @@ import * as functions from "firebase-functions"; import { Blob, FormData } from "formdata-node"; import fetch from "node-fetch-commonjs"; +import { boolean, object, safeParse } from "valibot"; + +const ResponseSchema = object({ ok: boolean() }); export async function send(text: string, options: { png?: Buffer } = {}) { const config = functions.config() as { @@ -30,14 +33,15 @@ export async function send(text: string, options: { png?: Buffer } = {}) { const url = `https://api.telegram.org/bot${token}/${action}`; const response = await fetch(url, { body: data, method: "POST" }); - const json = (await response.json()) as any; - const ok = json?.ok; - if (typeof ok !== "boolean") { + const json = (await response.json()) as unknown; + const { output, success } = safeParse(ResponseSchema, json); + if (!success) { throw new Error( `Unexpected response from Telegram: ${JSON.stringify(json)})}` ); } + const ok = output.ok; if (!ok) { console.log({ text, json }); } diff --git a/firebase/functions/tsconfig.dev.json b/firebase/functions/tsconfig.dev.json deleted file mode 100644 index c0f990d..0000000 --- a/firebase/functions/tsconfig.dev.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "include": [".eslintrc.js"] -} diff --git a/firebase/functions/vitest.config.js b/firebase/functions/vitest.config.js index d822730..255b9a6 100644 --- a/firebase/functions/vitest.config.js +++ b/firebase/functions/vitest.config.js @@ -5,5 +5,6 @@ export default defineConfig({ coverage: { reporter: ["lcov", "text-summary"], }, + include: ["src/**/*.spec.ts"], }, }); diff --git a/history/data b/history/data index 5fb8635..c6f8449 160000 --- a/history/data +++ b/history/data @@ -1 +1 @@ -Subproject commit 5fb8635640dfb84946012f00d226fa7ad315547d +Subproject commit c6f844907542eba6abefa4a04270aa25e14c3632 diff --git a/history/download.sh b/history/download.sh index d27fe05..b776924 100755 --- a/history/download.sh +++ b/history/download.sh @@ -7,7 +7,8 @@ _scriptPath=./data/tmp.sh echo Generating an execution plan... npm install >./logs/npm-install.txt 2>./logs/npm-install.log -node ./planner.js >$_scriptPath +npx puppeteer browsers install chrome +node ./bin/plan.mjs >$_scriptPath echo Running $_scriptPath... bash $_scriptPath diff --git a/history/package-lock.json b/history/package-lock.json index ea7f48f..7c22b2b 100644 --- a/history/package-lock.json +++ b/history/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "history", "dependencies": { - "puppeteer": "^21.3.4" + "puppeteer": "^23.2.1" }, "devDependencies": { "@types/jsdom": "^21.1.3", @@ -33,33 +33,34 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dependencies": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -71,10 +72,26 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" ], @@ -88,9 +105,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" ], @@ -104,9 +121,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" ], @@ -120,9 +137,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -136,9 +153,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" ], @@ -152,9 +169,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" ], @@ -168,9 +185,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" ], @@ -184,9 +201,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" ], @@ -200,9 +217,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" ], @@ -216,9 +233,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" ], @@ -232,9 +249,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" ], @@ -248,9 +265,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" ], @@ -264,9 +281,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" ], @@ -280,9 +297,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" ], @@ -296,9 +313,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" ], @@ -312,9 +329,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" ], @@ -328,9 +345,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" ], @@ -344,9 +361,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" ], @@ -360,9 +377,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" ], @@ -376,9 +393,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" ], @@ -392,9 +409,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" ], @@ -408,9 +425,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" ], @@ -493,25 +510,260 @@ } }, "node_modules/@puppeteer/browsers": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz", - "integrity": "sha512-nIb8SOBgDEMFY2iS2MdnUZOg2ikcYchRrBoF+wtdjieRFKR2uGRipHY/oFLo+2N6anDualyClPzGywTHRGrLfw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz", + "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==", "dependencies": { - "debug": "4.3.4", - "extract-zip": "2.0.1", - "progress": "2.0.3", - "proxy-agent": "6.3.1", - "tar-fs": "3.0.4", - "unbzip2-stream": "1.4.3", - "yargs": "17.7.1" + "debug": "^4.3.6", + "extract-zip": "^2.0.1", + "progress": "^2.0.3", + "proxy-agent": "^6.4.0", + "semver": "^7.6.3", + "tar-fs": "^3.0.6", + "unbzip2-stream": "^1.4.3", + "yargs": "^17.7.2" }, "bin": { "browsers": "lib/cjs/main-cli.js" }, "engines": { - "node": ">=16.3.0" + "node": ">=18" } }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz", + "integrity": "sha512-ufb2CH2KfBWPJok95frEZZ82LtDl0A6QKTa8MoM+cWwDZvVGl5/jNb79pIhRvAalUu+7LD91VYR0nwRD799HkQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.3.tgz", + "integrity": "sha512-iAHpft/eQk9vkWIV5t22V77d90CRofgR2006UiCjHcHJFVI1E0oBkQIAbz+pLtthFw3hWEmVB4ilxGyBf48i2Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz", + "integrity": "sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.3.tgz", + "integrity": "sha512-KO0pN5x3+uZm1ZXeIfDqwcvnQ9UEGN8JX5ufhmgH5Lz4ujjZMAnxQygZAVGemFWn+ZZC0FQopruV4lqmGMshow==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.3.tgz", + "integrity": "sha512-CsC+ZdIiZCZbBI+aRlWpYJMSWvVssPuWqrDy/zi9YfnatKKSLFCe6fjna1grHuo/nVaHG+kiglpRhyBQYRTK4A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.3.tgz", + "integrity": "sha512-F0nqiLThcfKvRQhZEzMIXOQG4EeX61im61VYL1jo4eBxv4aZRmpin6crnBJQ/nWnCsjH5F6J3W6Stdm0mBNqBg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.3.tgz", + "integrity": "sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.3.tgz", + "integrity": "sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.3.tgz", + "integrity": "sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.3.tgz", + "integrity": "sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.3.tgz", + "integrity": "sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.3.tgz", + "integrity": "sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.3.tgz", + "integrity": "sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.3.tgz", + "integrity": "sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.3.tgz", + "integrity": "sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.3.tgz", + "integrity": "sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.3.tgz", + "integrity": "sha512-9SjYp1sPyxJsPWuhOCX6F4jUMXGbVVd5obVpoVEi8ClZqo52ViZewA6eFz85y8ezuOA+uJMP5A5zo6Oz4S5rVQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.3.tgz", + "integrity": "sha512-HGZgRFFYrMrP3TJlq58nR1xy8zHKId25vhmm5S9jETEfDf6xybPxsavFTJaufe2zgOGYJBskGlj49CwtEuFhWQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -547,6 +799,12 @@ "@types/chai": "*" } }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -577,9 +835,9 @@ "dev": true }, "node_modules/@types/yauzl": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz", - "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", "optional": true, "dependencies": { "@types/node": "*" @@ -706,9 +964,9 @@ } }, "node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dependencies": { "debug": "^4.3.4" }, @@ -767,9 +1025,9 @@ "dev": true }, "node_modules/b4a": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz", - "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==" + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", + "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -777,6 +1035,47 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "node_modules/bare-events": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", + "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "optional": true + }, + "node_modules/bare-fs": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.3.tgz", + "integrity": "sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==", + "optional": true, + "dependencies": { + "bare-events": "^2.0.0", + "bare-path": "^2.0.0", + "bare-stream": "^2.0.0" + } + }, + "node_modules/bare-os": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.2.tgz", + "integrity": "sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==", + "optional": true + }, + "node_modules/bare-path": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", + "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", + "optional": true, + "dependencies": { + "bare-os": "^2.1.0" + } + }, + "node_modules/bare-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.0.tgz", + "integrity": "sha512-+o9MG5bPRRBlkVSpfFlMag3n7wMaIZb4YZasU2+/96f+3HTQ4F9DKQeu3K/Sjz1W0umu6xvVq1ON0ipWdMlr3A==", + "optional": true, + "dependencies": { + "streamx": "^2.18.0" + } + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -797,9 +1096,9 @@ ] }, "node_modules/basic-ftp": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz", - "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", "engines": { "node": ">=10.0.0" } @@ -903,12 +1202,13 @@ } }, "node_modules/chromium-bidi": { - "version": "0.4.28", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.28.tgz", - "integrity": "sha512-2HZ74QlAApJrEwcGlU/sUu0s4VS+FI3CJ09Toc9aE9VemMyhHZXeaROQgJKNRaYMUTUx6qIv1cLBs3F+vfgjSw==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz", + "integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==", "dependencies": { "mitt": "3.0.1", - "urlpattern-polyfill": "9.0.0" + "urlpattern-polyfill": "10.0.0", + "zod": "3.23.8" }, "peerDependencies": { "devtools-protocol": "*" @@ -965,14 +1265,14 @@ "dev": true }, "node_modules/cosmiconfig": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", - "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "dependencies": { + "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", - "parse-json": "^5.2.0", - "path-type": "^4.0.0" + "parse-json": "^5.2.0" }, "engines": { "node": ">=14" @@ -989,14 +1289,6 @@ } } }, - "node_modules/cross-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", - "dependencies": { - "node-fetch": "^2.6.12" - } - }, "node_modules/cssstyle": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", @@ -1010,9 +1302,9 @@ } }, "node_modules/data-uri-to-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", - "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", "engines": { "node": ">= 14" } @@ -1066,9 +1358,9 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dependencies": { "ms": "2.1.2" }, @@ -1122,9 +1414,9 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1179426", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1179426.tgz", - "integrity": "sha512-KKC7IGwdOr7u9kTGgjUvGTov/z1s2H7oHi3zKCdR9eSDyCPia5CBi4aRhtp7d8uR7l0GS5UTDw3TjKGu5CqINg==" + "version": "0.0.1330662", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1330662.tgz", + "integrity": "sha512-pzh6YQ8zZfz3iKlCvgzVCu22NdpZ8hNmwU6WnQjNVquh0A9iVosPtNLWDwaWVGyrntQlltPFztTMK5Cg6lfCuw==" }, "node_modules/diff-sequences": { "version": "29.6.3", @@ -1181,6 +1473,14 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "engines": { + "node": ">=6" + } + }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -1190,9 +1490,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, "bin": { @@ -1202,34 +1502,35 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "engines": { "node": ">=6" } @@ -1337,16 +1638,16 @@ } }, "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dependencies": { "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" }, "engines": { - "node": ">=6 <7 || >=8" + "node": ">=14.14" } }, "node_modules/fs.realpath": { @@ -1401,14 +1702,14 @@ } }, "node_modules/get-uri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", - "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", "dependencies": { "basic-ftp": "^5.0.2", - "data-uri-to-buffer": "^5.0.1", + "data-uri-to-buffer": "^6.0.2", "debug": "^4.3.4", - "fs-extra": "^8.1.0" + "fs-extra": "^11.2.0" }, "engines": { "node": ">= 14" @@ -1466,9 +1767,9 @@ "dev": true }, "node_modules/http-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -1478,9 +1779,9 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -1551,10 +1852,17 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, - "node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } }, "node_modules/is-arrayish": { "version": "0.2.1", @@ -1662,6 +1970,11 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, "node_modules/jsdom": { "version": "22.1.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", @@ -1789,9 +2102,12 @@ "dev": true }, "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -1895,11 +2211,6 @@ "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" - }, "node_modules/mlly": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", @@ -1918,9 +2229,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -1943,25 +2254,6 @@ "node": ">= 0.4.0" } }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/nwsapi": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", @@ -1992,30 +2284,29 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", - "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", "debug": "^4.3.4", "get-uri": "^6.0.1", "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.2" + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" }, "engines": { "node": ">= 14" } }, "node_modules/pac-resolver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz", - "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", "dependencies": { "degenerator": "^5.0.0", - "ip": "^1.1.8", "netmask": "^2.0.2" }, "engines": { @@ -2071,14 +2362,6 @@ "node": ">=0.10.0" } }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "engines": { - "node": ">=8" - } - }, "node_modules/pathe": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", @@ -2102,8 +2385,7 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "node_modules/pkg-types": { "version": "1.0.3", @@ -2117,9 +2399,9 @@ } }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ { @@ -2136,9 +2418,9 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -2194,14 +2476,14 @@ } }, "node_modules/proxy-agent": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz", - "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", "dependencies": { "agent-base": "^7.0.2", "debug": "^4.3.4", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", "lru-cache": "^7.14.1", "pac-proxy-agent": "^7.0.1", "proxy-from-env": "^1.1.0", @@ -2241,33 +2523,39 @@ } }, "node_modules/puppeteer": { - "version": "21.3.4", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.3.4.tgz", - "integrity": "sha512-kE67k1KR6hQs3g0Yf/i3GYOhTU8zC2dtcpHhtcSC9bGoVxRgqDo/hwVkDqlNKxJsJHuVX+qviWC7F0FdSjcFTA==", + "version": "23.2.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.2.1.tgz", + "integrity": "sha512-IvJOBP2APjcIR2k0xKYYpAs/hAa39e6sn7y+qMlSWJDRraEc4JLfgCKlkXopzD5jrSc1iTANHWw7Rrj/w7bgpw==", "hasInstallScript": true, "dependencies": { - "@puppeteer/browsers": "1.7.1", - "cosmiconfig": "8.3.6", - "puppeteer-core": "21.3.4" + "@puppeteer/browsers": "2.3.1", + "chromium-bidi": "0.6.4", + "cosmiconfig": "^9.0.0", + "devtools-protocol": "0.0.1330662", + "puppeteer-core": "23.2.1", + "typed-query-selector": "^2.12.0" + }, + "bin": { + "puppeteer": "lib/cjs/puppeteer/node/cli.js" }, "engines": { - "node": ">=16.3.0" + "node": ">=18" } }, "node_modules/puppeteer-core": { - "version": "21.3.4", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.3.4.tgz", - "integrity": "sha512-iaG7ScTXOm9hlsBTBGGtr5dAAsA8IiWTx8E0Ghr0b5Ntl42bdcPS8EXjcERKocDhua2YqdlnFGs/cBxHY+VNyA==", + "version": "23.2.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.2.1.tgz", + "integrity": "sha512-AIFWfQ4Sq+En+OgqIUy8VJmD8yJHMDyt+qEmEVKW07zu5DKDNqysO7fzBZp0W85ShJTUlUf+RleKl4XLwFpUPA==", "dependencies": { - "@puppeteer/browsers": "1.7.1", - "chromium-bidi": "0.4.28", - "cross-fetch": "4.0.0", - "debug": "4.3.4", - "devtools-protocol": "0.0.1179426", - "ws": "8.14.2" + "@puppeteer/browsers": "2.3.1", + "chromium-bidi": "0.6.4", + "debug": "^4.3.6", + "devtools-protocol": "0.0.1330662", + "typed-query-selector": "^2.12.0", + "ws": "^8.18.0" }, "engines": { - "node": ">=16.3.0" + "node": ">=18" } }, "node_modules/querystringify": { @@ -2310,18 +2598,39 @@ } }, "node_modules/rollup": { - "version": "3.29.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", - "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.3.tgz", + "integrity": "sha512-HBW896xR5HGmoksbi3JBDtmVzWiPAYqp7wip50hjQ67JbDz61nyoMPdqu1DvVW9asYb2M65Z20ZHsyJCMqMyDg==", "dev": true, + "dependencies": { + "@types/estree": "1.0.6" + }, "bin": { "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=14.18.0", + "node": ">=18.0.0", "npm": ">=8.0.0" }, "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.24.3", + "@rollup/rollup-android-arm64": "4.24.3", + "@rollup/rollup-darwin-arm64": "4.24.3", + "@rollup/rollup-darwin-x64": "4.24.3", + "@rollup/rollup-freebsd-arm64": "4.24.3", + "@rollup/rollup-freebsd-x64": "4.24.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.3", + "@rollup/rollup-linux-arm-musleabihf": "4.24.3", + "@rollup/rollup-linux-arm64-gnu": "4.24.3", + "@rollup/rollup-linux-arm64-musl": "4.24.3", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.3", + "@rollup/rollup-linux-riscv64-gnu": "4.24.3", + "@rollup/rollup-linux-s390x-gnu": "4.24.3", + "@rollup/rollup-linux-x64-gnu": "4.24.3", + "@rollup/rollup-linux-x64-musl": "4.24.3", + "@rollup/rollup-win32-arm64-msvc": "4.24.3", + "@rollup/rollup-win32-ia32-msvc": "4.24.3", + "@rollup/rollup-win32-x64-msvc": "4.24.3", "fsevents": "~2.3.2" } }, @@ -2350,13 +2659,9 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "bin": { "semver": "bin/semver.js" }, @@ -2364,18 +2669,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/siginfo": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", @@ -2392,36 +2685,31 @@ } }, "node_modules/socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "dependencies": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" }, "engines": { - "node": ">= 10.13.0", + "node": ">= 10.0.0", "npm": ">= 3.0.0" } }, "node_modules/socks-proxy-agent": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", - "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" }, "engines": { "node": ">= 14" } }, - "node_modules/socks/node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -2432,14 +2720,19 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -2453,12 +2746,16 @@ "dev": true }, "node_modules/streamx": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz", - "integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.0.tgz", + "integrity": "sha512-ZGd1LhDeGFucr1CUCTBOS58ZhEendd0ttpGT3usTvosS4ntIwKN9LJFp+OeCSprsCPL14BXVRZlHGRY1V9PVzQ==", "dependencies": { - "fast-fifo": "^1.1.0", - "queue-tick": "^1.0.1" + "fast-fifo": "^1.3.2", + "queue-tick": "^1.0.1", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" } }, "node_modules/string-width": { @@ -2515,19 +2812,22 @@ "dev": true }, "node_modules/tar-fs": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz", - "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", + "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", "dependencies": { - "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^3.1.5" + }, + "optionalDependencies": { + "bare-fs": "^2.1.1", + "bare-path": "^2.1.0" } }, "node_modules/tar-stream": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz", - "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", + "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", "dependencies": { "b4a": "^1.6.4", "fast-fifo": "^1.2.0", @@ -2548,6 +2848,14 @@ "node": ">=8" } }, + "node_modules/text-decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz", + "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==", + "dependencies": { + "b4a": "^1.6.4" + } + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -2601,15 +2909,10 @@ "node": ">= 4.0.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "node_modules/type-detect": { "version": "4.0.8", @@ -2620,6 +2923,11 @@ "node": ">=4" } }, + "node_modules/typed-query-selector": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz", + "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==" + }, "node_modules/ufo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", @@ -2636,11 +2944,11 @@ } }, "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "engines": { - "node": ">= 4.0.0" + "node": ">= 10.0.0" } }, "node_modules/url-parse": { @@ -2654,9 +2962,9 @@ } }, "node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==" }, "node_modules/v8-to-istanbul": { "version": "9.1.0", @@ -2673,29 +2981,29 @@ } }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", + "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", "dev": true, "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.20.1", + "postcss": "^8.4.38", + "rollup": "^4.13.0" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" }, "optionalDependencies": { - "fsevents": "~2.3.2" + "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": ">= 14", + "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", @@ -2839,11 +3147,6 @@ "node": ">=14" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, "node_modules/whatwg-encoding": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", @@ -2865,15 +3168,6 @@ "node": ">=12" } }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/why-is-node-running": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", @@ -2942,9 +3236,9 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "engines": { "node": ">=10.0.0" }, @@ -2984,16 +3278,10 @@ "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/yargs": { - "version": "17.7.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", - "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -3035,6 +3323,14 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "node_modules/zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } } }, "dependencies": { @@ -3049,27 +3345,28 @@ } }, "@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "requires": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" } }, "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==" + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==" }, "@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "requires": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" } }, "@bcoe/v8-coverage": { @@ -3078,157 +3375,164 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "@esbuild/aix-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "dev": true, + "optional": true + }, "@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "dev": true, "optional": true }, @@ -3287,19 +3591,146 @@ } }, "@puppeteer/browsers": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz", - "integrity": "sha512-nIb8SOBgDEMFY2iS2MdnUZOg2ikcYchRrBoF+wtdjieRFKR2uGRipHY/oFLo+2N6anDualyClPzGywTHRGrLfw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz", + "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==", "requires": { - "debug": "4.3.4", - "extract-zip": "2.0.1", - "progress": "2.0.3", - "proxy-agent": "6.3.1", - "tar-fs": "3.0.4", - "unbzip2-stream": "1.4.3", - "yargs": "17.7.1" + "debug": "^4.3.6", + "extract-zip": "^2.0.1", + "progress": "^2.0.3", + "proxy-agent": "^6.4.0", + "semver": "^7.6.3", + "tar-fs": "^3.0.6", + "unbzip2-stream": "^1.4.3", + "yargs": "^17.7.2" } }, + "@rollup/rollup-android-arm-eabi": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz", + "integrity": "sha512-ufb2CH2KfBWPJok95frEZZ82LtDl0A6QKTa8MoM+cWwDZvVGl5/jNb79pIhRvAalUu+7LD91VYR0nwRD799HkQ==", + "dev": true, + "optional": true + }, + "@rollup/rollup-android-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.3.tgz", + "integrity": "sha512-iAHpft/eQk9vkWIV5t22V77d90CRofgR2006UiCjHcHJFVI1E0oBkQIAbz+pLtthFw3hWEmVB4ilxGyBf48i2Q==", + "dev": true, + "optional": true + }, + "@rollup/rollup-darwin-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz", + "integrity": "sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==", + "dev": true, + "optional": true + }, + "@rollup/rollup-darwin-x64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.3.tgz", + "integrity": "sha512-KO0pN5x3+uZm1ZXeIfDqwcvnQ9UEGN8JX5ufhmgH5Lz4ujjZMAnxQygZAVGemFWn+ZZC0FQopruV4lqmGMshow==", + "dev": true, + "optional": true + }, + "@rollup/rollup-freebsd-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.3.tgz", + "integrity": "sha512-CsC+ZdIiZCZbBI+aRlWpYJMSWvVssPuWqrDy/zi9YfnatKKSLFCe6fjna1grHuo/nVaHG+kiglpRhyBQYRTK4A==", + "dev": true, + "optional": true + }, + "@rollup/rollup-freebsd-x64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.3.tgz", + "integrity": "sha512-F0nqiLThcfKvRQhZEzMIXOQG4EeX61im61VYL1jo4eBxv4aZRmpin6crnBJQ/nWnCsjH5F6J3W6Stdm0mBNqBg==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.3.tgz", + "integrity": "sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-arm-musleabihf": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.3.tgz", + "integrity": "sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-arm64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.3.tgz", + "integrity": "sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-arm64-musl": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.3.tgz", + "integrity": "sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.3.tgz", + "integrity": "sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-riscv64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.3.tgz", + "integrity": "sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-s390x-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.3.tgz", + "integrity": "sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-x64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.3.tgz", + "integrity": "sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==", + "dev": true, + "optional": true + }, + "@rollup/rollup-linux-x64-musl": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.3.tgz", + "integrity": "sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==", + "dev": true, + "optional": true + }, + "@rollup/rollup-win32-arm64-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.3.tgz", + "integrity": "sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==", + "dev": true, + "optional": true + }, + "@rollup/rollup-win32-ia32-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.3.tgz", + "integrity": "sha512-9SjYp1sPyxJsPWuhOCX6F4jUMXGbVVd5obVpoVEi8ClZqo52ViZewA6eFz85y8ezuOA+uJMP5A5zo6Oz4S5rVQ==", + "dev": true, + "optional": true + }, + "@rollup/rollup-win32-x64-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.3.tgz", + "integrity": "sha512-HGZgRFFYrMrP3TJlq58nR1xy8zHKId25vhmm5S9jETEfDf6xybPxsavFTJaufe2zgOGYJBskGlj49CwtEuFhWQ==", + "dev": true, + "optional": true + }, "@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -3332,6 +3763,12 @@ "@types/chai": "*" } }, + "@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true + }, "@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -3362,9 +3799,9 @@ "dev": true }, "@types/yauzl": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz", - "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", "optional": true, "requires": { "@types/node": "*" @@ -3461,9 +3898,9 @@ "dev": true }, "agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "requires": { "debug": "^4.3.4" } @@ -3507,9 +3944,9 @@ "dev": true }, "b4a": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz", - "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==" + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", + "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==" }, "balanced-match": { "version": "1.0.2", @@ -3517,15 +3954,56 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "bare-events": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", + "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "optional": true + }, + "bare-fs": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.3.tgz", + "integrity": "sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==", + "optional": true, + "requires": { + "bare-events": "^2.0.0", + "bare-path": "^2.0.0", + "bare-stream": "^2.0.0" + } + }, + "bare-os": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.2.tgz", + "integrity": "sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==", + "optional": true + }, + "bare-path": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", + "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", + "optional": true, + "requires": { + "bare-os": "^2.1.0" + } + }, + "bare-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.0.tgz", + "integrity": "sha512-+o9MG5bPRRBlkVSpfFlMag3n7wMaIZb4YZasU2+/96f+3HTQ4F9DKQeu3K/Sjz1W0umu6xvVq1ON0ipWdMlr3A==", + "optional": true, + "requires": { + "streamx": "^2.18.0" + } + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "basic-ftp": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz", - "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==" + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==" }, "brace-expansion": { "version": "1.1.11", @@ -3594,12 +4072,13 @@ "dev": true }, "chromium-bidi": { - "version": "0.4.28", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.28.tgz", - "integrity": "sha512-2HZ74QlAApJrEwcGlU/sUu0s4VS+FI3CJ09Toc9aE9VemMyhHZXeaROQgJKNRaYMUTUx6qIv1cLBs3F+vfgjSw==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz", + "integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==", "requires": { "mitt": "3.0.1", - "urlpattern-polyfill": "9.0.0" + "urlpattern-polyfill": "10.0.0", + "zod": "3.23.8" } }, "cliui": { @@ -3647,22 +4126,14 @@ "dev": true }, "cosmiconfig": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", - "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "requires": { + "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", - "parse-json": "^5.2.0", - "path-type": "^4.0.0" - } - }, - "cross-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", - "requires": { - "node-fetch": "^2.6.12" + "parse-json": "^5.2.0" } }, "cssstyle": { @@ -3675,9 +4146,9 @@ } }, "data-uri-to-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", - "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==" + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==" }, "data-urls": { "version": "4.0.0", @@ -3718,9 +4189,9 @@ } }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "requires": { "ms": "2.1.2" } @@ -3757,9 +4228,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.1179426", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1179426.tgz", - "integrity": "sha512-KKC7IGwdOr7u9kTGgjUvGTov/z1s2H7oHi3zKCdR9eSDyCPia5CBi4aRhtp7d8uR7l0GS5UTDw3TjKGu5CqINg==" + "version": "0.0.1330662", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1330662.tgz", + "integrity": "sha512-pzh6YQ8zZfz3iKlCvgzVCu22NdpZ8hNmwU6WnQjNVquh0A9iVosPtNLWDwaWVGyrntQlltPFztTMK5Cg6lfCuw==" }, "diff-sequences": { "version": "29.6.3", @@ -3803,6 +4274,11 @@ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true }, + "env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" + }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -3812,39 +4288,40 @@ } }, "esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "requires": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==" }, "escape-string-regexp": { "version": "1.0.5", @@ -3913,13 +4390,13 @@ } }, "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "requires": { "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" } }, "fs.realpath": { @@ -3955,14 +4432,14 @@ } }, "get-uri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", - "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", "requires": { "basic-ftp": "^5.0.2", - "data-uri-to-buffer": "^5.0.1", + "data-uri-to-buffer": "^6.0.2", "debug": "^4.3.4", - "fs-extra": "^8.1.0" + "fs-extra": "^11.2.0" } }, "glob": { @@ -4005,18 +4482,18 @@ "dev": true }, "http-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "requires": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "https-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", - "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "requires": { "agent-base": "^7.0.2", "debug": "4" @@ -4061,10 +4538,14 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, - "ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" + "ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "requires": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + } }, "is-arrayish": { "version": "0.2.1", @@ -4150,6 +4631,11 @@ "argparse": "^2.0.1" } }, + "jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, "jsdom": { "version": "22.1.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", @@ -4250,11 +4736,12 @@ "dev": true }, "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" } }, "lines-and-columns": { @@ -4329,11 +4816,6 @@ "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" - }, "mlly": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", @@ -4352,9 +4834,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true }, "netmask": { @@ -4362,14 +4844,6 @@ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, "nwsapi": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", @@ -4394,27 +4868,26 @@ } }, "pac-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", - "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "requires": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", "debug": "^4.3.4", "get-uri": "^6.0.1", "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.2" + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" } }, "pac-resolver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz", - "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", "requires": { "degenerator": "^5.0.0", - "ip": "^1.1.8", "netmask": "^2.0.2" } }, @@ -4452,11 +4925,6 @@ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" - }, "pathe": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", @@ -4477,8 +4945,7 @@ "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "pkg-types": { "version": "1.0.3", @@ -4492,14 +4959,14 @@ } }, "postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "requires": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" } }, "prettier": { @@ -4533,14 +5000,14 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" }, "proxy-agent": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz", - "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", "requires": { "agent-base": "^7.0.2", "debug": "^4.3.4", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", "lru-cache": "^7.14.1", "pac-proxy-agent": "^7.0.1", "proxy-from-env": "^1.1.0", @@ -4574,26 +5041,29 @@ "dev": true }, "puppeteer": { - "version": "21.3.4", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.3.4.tgz", - "integrity": "sha512-kE67k1KR6hQs3g0Yf/i3GYOhTU8zC2dtcpHhtcSC9bGoVxRgqDo/hwVkDqlNKxJsJHuVX+qviWC7F0FdSjcFTA==", + "version": "23.2.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.2.1.tgz", + "integrity": "sha512-IvJOBP2APjcIR2k0xKYYpAs/hAa39e6sn7y+qMlSWJDRraEc4JLfgCKlkXopzD5jrSc1iTANHWw7Rrj/w7bgpw==", "requires": { - "@puppeteer/browsers": "1.7.1", - "cosmiconfig": "8.3.6", - "puppeteer-core": "21.3.4" + "@puppeteer/browsers": "2.3.1", + "chromium-bidi": "0.6.4", + "cosmiconfig": "^9.0.0", + "devtools-protocol": "0.0.1330662", + "puppeteer-core": "23.2.1", + "typed-query-selector": "^2.12.0" } }, "puppeteer-core": { - "version": "21.3.4", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.3.4.tgz", - "integrity": "sha512-iaG7ScTXOm9hlsBTBGGtr5dAAsA8IiWTx8E0Ghr0b5Ntl42bdcPS8EXjcERKocDhua2YqdlnFGs/cBxHY+VNyA==", + "version": "23.2.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.2.1.tgz", + "integrity": "sha512-AIFWfQ4Sq+En+OgqIUy8VJmD8yJHMDyt+qEmEVKW07zu5DKDNqysO7fzBZp0W85ShJTUlUf+RleKl4XLwFpUPA==", "requires": { - "@puppeteer/browsers": "1.7.1", - "chromium-bidi": "0.4.28", - "cross-fetch": "4.0.0", - "debug": "4.3.4", - "devtools-protocol": "0.0.1179426", - "ws": "8.14.2" + "@puppeteer/browsers": "2.3.1", + "chromium-bidi": "0.6.4", + "debug": "^4.3.6", + "devtools-protocol": "0.0.1330662", + "typed-query-selector": "^2.12.0", + "ws": "^8.18.0" } }, "querystringify": { @@ -4630,11 +5100,30 @@ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "rollup": { - "version": "3.29.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", - "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.3.tgz", + "integrity": "sha512-HBW896xR5HGmoksbi3JBDtmVzWiPAYqp7wip50hjQ67JbDz61nyoMPdqu1DvVW9asYb2M65Z20ZHsyJCMqMyDg==", "dev": true, "requires": { + "@rollup/rollup-android-arm-eabi": "4.24.3", + "@rollup/rollup-android-arm64": "4.24.3", + "@rollup/rollup-darwin-arm64": "4.24.3", + "@rollup/rollup-darwin-x64": "4.24.3", + "@rollup/rollup-freebsd-arm64": "4.24.3", + "@rollup/rollup-freebsd-x64": "4.24.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.3", + "@rollup/rollup-linux-arm-musleabihf": "4.24.3", + "@rollup/rollup-linux-arm64-gnu": "4.24.3", + "@rollup/rollup-linux-arm64-musl": "4.24.3", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.3", + "@rollup/rollup-linux-riscv64-gnu": "4.24.3", + "@rollup/rollup-linux-s390x-gnu": "4.24.3", + "@rollup/rollup-linux-x64-gnu": "4.24.3", + "@rollup/rollup-linux-x64-musl": "4.24.3", + "@rollup/rollup-win32-arm64-msvc": "4.24.3", + "@rollup/rollup-win32-ia32-msvc": "4.24.3", + "@rollup/rollup-win32-x64-msvc": "4.24.3", + "@types/estree": "1.0.6", "fsevents": "~2.3.2" } }, @@ -4660,24 +5149,9 @@ } }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" }, "siginfo": { "version": "2.0.0", @@ -4691,29 +5165,22 @@ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" }, "socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "requires": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" - }, - "dependencies": { - "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" - } } }, "socks-proxy-agent": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", - "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "requires": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" } }, "source-map": { @@ -4723,11 +5190,16 @@ "devOptional": true }, "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true }, + "sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, "stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -4741,12 +5213,14 @@ "dev": true }, "streamx": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz", - "integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.0.tgz", + "integrity": "sha512-ZGd1LhDeGFucr1CUCTBOS58ZhEendd0ttpGT3usTvosS4ntIwKN9LJFp+OeCSprsCPL14BXVRZlHGRY1V9PVzQ==", "requires": { - "fast-fifo": "^1.1.0", - "queue-tick": "^1.0.1" + "bare-events": "^2.2.0", + "fast-fifo": "^1.3.2", + "queue-tick": "^1.0.1", + "text-decoder": "^1.1.0" } }, "string-width": { @@ -4791,19 +5265,20 @@ "dev": true }, "tar-fs": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz", - "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", + "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", "requires": { - "mkdirp-classic": "^0.5.2", + "bare-fs": "^2.1.1", + "bare-path": "^2.1.0", "pump": "^3.0.0", "tar-stream": "^3.1.5" } }, "tar-stream": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz", - "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", + "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", "requires": { "b4a": "^1.6.4", "fast-fifo": "^1.2.0", @@ -4821,6 +5296,14 @@ "minimatch": "^3.0.4" } }, + "text-decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz", + "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==", + "requires": { + "b4a": "^1.6.4" + } + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -4864,15 +5347,10 @@ } } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "type-detect": { "version": "4.0.8", @@ -4880,6 +5358,11 @@ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, + "typed-query-selector": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz", + "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==" + }, "ufo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", @@ -4896,9 +5379,9 @@ } }, "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" }, "url-parse": { "version": "1.5.10", @@ -4911,9 +5394,9 @@ } }, "urlpattern-polyfill": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==" }, "v8-to-istanbul": { "version": "9.1.0", @@ -4927,15 +5410,15 @@ } }, "vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", + "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", "dev": true, "requires": { - "esbuild": "^0.18.10", - "fsevents": "~2.3.2", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.20.1", + "fsevents": "~2.3.3", + "postcss": "^8.4.38", + "rollup": "^4.13.0" } }, "vite-node": { @@ -4993,11 +5476,6 @@ "xml-name-validator": "^4.0.0" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, "whatwg-encoding": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", @@ -5013,15 +5491,6 @@ "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "why-is-node-running": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", @@ -5071,9 +5540,9 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "requires": {} }, "xml-name-validator": { @@ -5093,16 +5562,10 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "yargs": { - "version": "17.7.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", - "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "requires": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -5132,6 +5595,11 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", "dev": true + }, + "zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==" } } } diff --git a/history/package.json b/history/package.json index 10bf9be..5d8de67 100644 --- a/history/package.json +++ b/history/package.json @@ -11,7 +11,7 @@ "test:coverage": "vitest --coverage --no-watch" }, "dependencies": { - "puppeteer": "^21.3.4" + "puppeteer": "^23.2.1" }, "devDependencies": { "@types/jsdom": "^21.1.3", diff --git a/sonar-project.properties b/sonar-project.properties index 176739e..4e034e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,11 +1,14 @@ sonar.projectKey=daohoangson_dvhcvn sonar.organization=daohoangson -sonar.exclusions=transformers/js-dvhcvn/src/data.ts, \ +sonar.exclusions=transformers/dart-dvhcvn/lib/src/data.dart, \ + transformers/js-dvhcvn/src/data.ts, \ **/*.json, \ **/*.spec.ts sonar.test.inclusions=**/*.spec.ts +sonar.dart.lcov.reportPaths=transformers/dart-dvhcvn/coverage/lcov.info + sonar.javascript.lcov.reportPaths=demo/parser/coverage/lcov.info, \ firebase/functions/coverage/lcov.info, \ history/coverage/lcov.info, \ diff --git a/transformers/dart-dvhcvn.sh b/transformers/dart-dvhcvn.sh index 45e7d1e..e2e0b52 100755 --- a/transformers/dart-dvhcvn.sh +++ b/transformers/dart-dvhcvn.sh @@ -24,10 +24,10 @@ _dateVersion=$( cat $_datePath | tr '/' " " | awk '{ for (i=NF; i>1; i--) printf echo 'homepage: https://github.com/daohoangson/dvhcvn'; \ echo ''; \ echo 'environment:'; \ - echo ' sdk: ">=2.12.0 <3.0.0"'; \ + echo ' sdk: ">=2.12.0 <4.0.0"'; \ echo ''; \ echo 'dev_dependencies:'; \ - echo ' lint: ^1.7.2'; \ + echo ' lint: ^2.3.0'; \ echo ' test:'; \ } >"$_dartPath/pubspec.yaml" echo 'Generated pubspec' diff --git a/transformers/dart-dvhcvn/CHANGELOG.md b/transformers/dart-dvhcvn/CHANGELOG.md index 854ccf8..4cc194a 100644 --- a/transformers/dart-dvhcvn/CHANGELOG.md +++ b/transformers/dart-dvhcvn/CHANGELOG.md @@ -1,53 +1,84 @@ +## 2.0.20241101 + +- 1202/NQ-UBTVQH15: Nghị quyết về việc sắp xếp đơn vị hành chính cấp xã của tỉnh Tiền Giang giai đoạn 2023-2025; +- 1196/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp xã của tỉnh Khánh Hòa giai đoạn 2023-2025; +- 1192/NQ-UBTVQH: Nghị quyết về việc sắp xếp đơn vị hành chính cấp xã của thành phố Cần Thơ giai đoạn 2023-2025; +- 1195/NQ-UBTVQH15: Về việc sắp xếp đơn vị hành chính cấp xã của tỉnh Gia Lao giai đoạn 2023-2025; +- 1200/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp xã của tỉnh Phú Yên giai đoạn 2023-2025; +- 1197/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp xã của tỉnh Lào Cai giai đoạn 2023-2025; +- 1194/NQ-UBTVQH15: Nghị quyết về việc sắp xếp đơn vị hành chính cấp xã của tỉnh Đồng Nai giai đoạn 2023-2025; +- 1199/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp huyện, cấp xã của tỉnh Quảng Ninh giai đoạn 2023-2025; +- 1203/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp ã của tỉnh Vĩnh Long giai đoạn 2023-2025; +- 1201/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp xã của tỉnh Thải Bình giai đoạn 2023-2025; +- 1198/NQ-UBTVQH15: Nghị quyết về việc sắp xếp đơn vị hành chính cấp xã của tỉnh Ninh Thuận giai đoạn 2023-2025; +- 1193/NQ-UBTVQH15: Nghị quyết vv sắp xếp đơn vị hành chính cấp xã của tỉnh Đăk Lăk giai đoạn 2023- 2025; + +## 2.0.20240901 + +- 1105/NQ-UBTVQH15: Nghị quyết về việc sắp xếp đơn vị hành chính cấp xã giai đoạn 2023-2025 của tỉnh Sóc Trăng; +- 1106/NQ-UBTVQH15: Nghị quyết sắp xếp đơn vị hành chính cấp xã giai đoạn 2023-2025 của tỉnh Tuyên Quang; +- 1104/NQ-UBTVQH15: Nghị quyết về việc sắp xếp đơn vị hành chính cấp huyện, cấp xã giai đoạn 2023-2025 của tỉnh Nam Định; + +## 2.0.20240501 + +- 1012/NQ-UBTVQH15: Nghị quyết vv thành lập phường An Điền, phường An Tây thuộc thị xã Bến Cát và thành lập thành phố Bến Cát, tỉnh Bình Dương; +- 1013/NQ-UBTVQH15: Nghị quyết về việc sắp xếp, thành lập các phường thuộc thị xã Gò Công và thành lập thành phố Gò Công, tỉnh Tiền Giang; + +## 2.0.20240201 + +- 938/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Việt Yên và các phường thuộc thị xã Việt Yên, tỉnh Bắc Giang; +- 939/NQ-UBTVQH15: Nghị quyết về việc nhập xã Thiệu Phú vào thị trấn Thiệu Hóa và thành lập thị trấn Hậu Hiền thuộc huyện Thiệu Hóa, tỉnh Thanh Hóa; + ## 2.0.20230410 -* 721/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Tịnh Biên, các phường thuộc thị xã Tịnh Biên, thị trấn Đa Phước thuộc huyện An Phú và thị trấn Hội An thuộc huyện Chợ Mới, tỉnh An Giang; -* 722/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Vân Tùng thuộc huyện Ngân Sơn, tỉnh Bắc Kạn; -* 723/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Thuận Thành và các phường thuộc thị xã Thuận Thành, thị xã Quế Võ và các phường thuộc thị xã Quế Võ, tỉnh Bắc Ninh; -* 724/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Tiên Thủy thuộc huyện Châu Thành, thị trấn Tiệm Tôm thuộc huyện Ba Tri và thị trấn Phước Mỹ Trung thuộc huyện Mỏ Cày Bắc, tỉnh Bến Tre; -* 725/NQ-UBTVQH15: Nghị quyết về việc thành lập thành phố Tân Uyên thuộc tỉnh Bình Dương; -* 726/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Powng Drang thuộc huyện Krông Búk, tỉnh Đắk Lắk; -* 727/NQ-UBTVQH15: Nghị quyết về việc thành lập các phường thuộc thị xã Điện Bàn và thị trấn Trung Phước thuộc huyện Nông Sơn, tỉnh Quảng Nam; -* 728/NQ-UBTVQH15: Nghị quyết về việc điều chỉnh địa giới đơn vị hành chính giữa xã Long Khánh và xã Ngũ Lạc thuộc huyện Duyên Hải, tỉnh Trà Vinh; -* 729/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Hóa Thượng thuộc huyện Đồng Hỷ và nhập xã Quân Chu vào thị trấn Quân Chu thuộc huyện Đại Từ, tỉnh Thái Nguyên; -* 730/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Kim Long thuộc huyện Tam Dương, thị trấn Tam Hồng thuộc huyện Yên Lạc và phường Định Trung thuộc thành phố Vĩnh Yên, tỉnh Vĩnh Phúc; +- 721/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Tịnh Biên, các phường thuộc thị xã Tịnh Biên, thị trấn Đa Phước thuộc huyện An Phú và thị trấn Hội An thuộc huyện Chợ Mới, tỉnh An Giang; +- 722/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Vân Tùng thuộc huyện Ngân Sơn, tỉnh Bắc Kạn; +- 723/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Thuận Thành và các phường thuộc thị xã Thuận Thành, thị xã Quế Võ và các phường thuộc thị xã Quế Võ, tỉnh Bắc Ninh; +- 724/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Tiên Thủy thuộc huyện Châu Thành, thị trấn Tiệm Tôm thuộc huyện Ba Tri và thị trấn Phước Mỹ Trung thuộc huyện Mỏ Cày Bắc, tỉnh Bến Tre; +- 725/NQ-UBTVQH15: Nghị quyết về việc thành lập thành phố Tân Uyên thuộc tỉnh Bình Dương; +- 726/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Powng Drang thuộc huyện Krông Búk, tỉnh Đắk Lắk; +- 727/NQ-UBTVQH15: Nghị quyết về việc thành lập các phường thuộc thị xã Điện Bàn và thị trấn Trung Phước thuộc huyện Nông Sơn, tỉnh Quảng Nam; +- 728/NQ-UBTVQH15: Nghị quyết về việc điều chỉnh địa giới đơn vị hành chính giữa xã Long Khánh và xã Ngũ Lạc thuộc huyện Duyên Hải, tỉnh Trà Vinh; +- 729/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Hóa Thượng thuộc huyện Đồng Hỷ và nhập xã Quân Chu vào thị trấn Quân Chu thuộc huyện Đại Từ, tỉnh Thái Nguyên; +- 730/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Kim Long thuộc huyện Tam Dương, thị trấn Tam Hồng thuộc huyện Yên Lạc và phường Định Trung thuộc thành phố Vĩnh Yên, tỉnh Vĩnh Phúc; ## 2.0.20221001 -* 510/NQ-UBTVQH15: Nghị quyết thành lập thị trấn Phương Sơn thuộc huyện Lục Nam và thị trấn Bắc Lý thuộc huyện Hiệp Hòa, tỉnh Bắc Giang; -* 569/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Bình Phú thuộc huyện Cai Lậy, tỉnh Tiền Giang; -* 570/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Chơn Thành và các phường thuộc thị xã Chơn Thành, tỉnh Bình Phước; +- 510/NQ-UBTVQH15: Nghị quyết thành lập thị trấn Phương Sơn thuộc huyện Lục Nam và thị trấn Bắc Lý thuộc huyện Hiệp Hòa, tỉnh Bắc Giang; +- 569/NQ-UBTVQH15: Nghị quyết về việc thành lập thị trấn Bình Phú thuộc huyện Cai Lậy, tỉnh Tiền Giang; +- 570/NQ-UBTVQH15: Nghị quyết về việc thành lập thị xã Chơn Thành và các phường thuộc thị xã Chơn Thành, tỉnh Bình Phước; ## 2.0.20220410 -* 469/NQ-UBTVQH15: Nghị quyết về việc thành lập các phường thuộc thị xã Phổ Yên và thành lập thành phố Phổ Yên, tỉnh Thái Nguyên; +- 469/NQ-UBTVQH15: Nghị quyết về việc thành lập các phường thuộc thị xã Phổ Yên và thành lập thành phố Phổ Yên, tỉnh Thái Nguyên; ## 2.0.20211101 -* Migrate to null safety (#23, authored by @definev) +- Migrate to null safety (#23, authored by @definev) ## 1.3.20211101 -* 387/NQ-UBTVQH15: Thành lập thành phố Từ Sơn thuộc tỉnh Bắc Ninh; +- 387/NQ-UBTVQH15: Thành lập thành phố Từ Sơn thuộc tỉnh Bắc Ninh; ## 1.3.20210701 -* 1260/NQ-UBTVQH14: Thành lập thị trấn Quý Lộc và thị trấn Yên Lâm thuộc huyện Yên Định, tỉnh Thanh Hóa; -* 1261/NQ-UBTVQH14: Thành lập thị trân Long Giao thuộc huyện Cẩm Mỹ, tỉnh Đồng Nai; -* 1262/NQ-UBTVQH14: Điều chỉnh địa giới hành chính cấp huyện, cấp xã và thành lập các thị trấn thuộc tỉnh Tuyên Quang; +- 1260/NQ-UBTVQH14: Thành lập thị trấn Quý Lộc và thị trấn Yên Lâm thuộc huyện Yên Định, tỉnh Thanh Hóa; +- 1261/NQ-UBTVQH14: Thành lập thị trân Long Giao thuộc huyện Cẩm Mỹ, tỉnh Đồng Nai; +- 1262/NQ-UBTVQH14: Điều chỉnh địa giới hành chính cấp huyện, cấp xã và thành lập các thị trấn thuộc tỉnh Tuyên Quang; ## 1.3.20210201 -* 1189/NQ-UBTVQH14: Thành lập phường Quỳnh Lâm và phường Trung Minh thuộc thành phố Hòa Bình, tỉnh Hòa Bình; -* 1188/NQ-UBTVQH14: thành lập thị trấn Cát Tiến thuộc huyện Phù Cát, tỉnh Bình Định; -* 1191/NQ-UBTVQH14: thành lập các phường thuộc thị xã Từ Sơn, tỉnh Bắc Ninh; -* 1107/NQ-UBTVQH14: Thành lập thị trấn Vĩnh Thanh Trung thuộc huyện Châu Phú, thị trấn Cô Tô thuộc huyện Tri Tôn và thị trấn Vĩnh Bình thuộc huyện Châu Thành, tỉnh An Giang; -* 1110/NQ-UBTVQH14: thành lập thị trấn Tân Bình thuộc huyện Bắc Tân Uyên, tỉnh Bình Dương; -* 1107/NQ-UBTVQH14: Thành lập thị trấn Vĩnh Thạnh Trung thuộc huyện Châu Phú, thị trấn Cô Tô thuộc huyện Tri Tôn và thị trấn Vĩnh Bình thuộc huyện Châu Thành, tỉnh An Giang; -* 1108/NQ-UBTVQH14: Thành lập các phường thuộc thành phố Thanh Hóa, tỉnh Thanh Hóa; -* 1111/NQ-UBTVQH14: Sắp xếp các đơn vị hành chính cấp huyện, cấp xã và thành lập thành phố Thủ Đức thuộc Thành phố Hồ Chí Minh; -* 1109/NQ-UBTVQH14: Thành lập thành phố Phú Quốc và các phường thuộc thành phố Phú Quốc, tỉnh Kiên Giang; -* 1003/NQ-UBTVQH14: thành lập phường An Bình A, phường An Bình B thuộc thị xã Hồng Ngự và thành phố Hồng Ngự thuộc tỉnh Đồng Tháp; +- 1189/NQ-UBTVQH14: Thành lập phường Quỳnh Lâm và phường Trung Minh thuộc thành phố Hòa Bình, tỉnh Hòa Bình; +- 1188/NQ-UBTVQH14: thành lập thị trấn Cát Tiến thuộc huyện Phù Cát, tỉnh Bình Định; +- 1191/NQ-UBTVQH14: thành lập các phường thuộc thị xã Từ Sơn, tỉnh Bắc Ninh; +- 1107/NQ-UBTVQH14: Thành lập thị trấn Vĩnh Thanh Trung thuộc huyện Châu Phú, thị trấn Cô Tô thuộc huyện Tri Tôn và thị trấn Vĩnh Bình thuộc huyện Châu Thành, tỉnh An Giang; +- 1110/NQ-UBTVQH14: thành lập thị trấn Tân Bình thuộc huyện Bắc Tân Uyên, tỉnh Bình Dương; +- 1107/NQ-UBTVQH14: Thành lập thị trấn Vĩnh Thạnh Trung thuộc huyện Châu Phú, thị trấn Cô Tô thuộc huyện Tri Tôn và thị trấn Vĩnh Bình thuộc huyện Châu Thành, tỉnh An Giang; +- 1108/NQ-UBTVQH14: Thành lập các phường thuộc thành phố Thanh Hóa, tỉnh Thanh Hóa; +- 1111/NQ-UBTVQH14: Sắp xếp các đơn vị hành chính cấp huyện, cấp xã và thành lập thành phố Thủ Đức thuộc Thành phố Hồ Chí Minh; +- 1109/NQ-UBTVQH14: Thành lập thành phố Phú Quốc và các phường thuộc thành phố Phú Quốc, tỉnh Kiên Giang; +- 1003/NQ-UBTVQH14: thành lập phường An Bình A, phường An Bình B thuộc thị xã Hồng Ngự và thành phố Hồng Ngự thuộc tỉnh Đồng Tháp; ## 1.3.20200601 -* First version +- First version diff --git a/transformers/dart-dvhcvn/lib/src/data.dart b/transformers/dart-dvhcvn/lib/src/data.dart index 6894f94..42c7de8 100644 --- a/transformers/dart-dvhcvn/lib/src/data.dart +++ b/transformers/dart-dvhcvn/lib/src/data.dart @@ -1308,12 +1308,11 @@ const level1s = [ Level3(4, 6, '02584', 'Xã Quyết Thắng', Type.xa), Level3(4, 6, '02587', 'Xã Đồng Quý', Type.xa), Level3(4, 6, '02590', 'Xã Tân Thanh', Type.xa), - Level3(4, 6, '02593', 'Xã Vân Sơn', Type.xa), Level3(4, 6, '02596', 'Xã Văn Phú', Type.xa), Level3(4, 6, '02599', 'Xã Chi Thiết', Type.xa), Level3(4, 6, '02602', 'Xã Đông Lợi', Type.xa), Level3(4, 6, '02605', 'Xã Thiện Kế', Type.xa), - Level3(4, 6, '02608', 'Xã Hồng Lạc', Type.xa), + Level3(4, 6, '02608', 'Xã Hồng Sơn', Type.xa), Level3(4, 6, '02611', 'Xã Phú Lương', Type.xa), Level3(4, 6, '02614', 'Xã Ninh Lai', Type.xa), Level3(4, 6, '02617', 'Xã Đại Phú', Type.xa), @@ -1406,7 +1405,6 @@ const level1s = [ Level3(5, 4, '02863', 'Xã Hoàng Thu Phố', Type.xa), Level3(5, 4, '02866', 'Xã Bản Phố', Type.xa), Level3(5, 4, '02869', 'Xã Bản Liền', Type.xa), - Level3(5, 4, '02872', 'Xã Tà Chải', Type.xa), Level3(5, 4, '02875', 'Xã Na Hối', Type.xa), Level3(5, 4, '02878', 'Xã Cốc Ly', Type.xa), Level3(5, 4, '02881', 'Xã Nậm Mòn', Type.xa), @@ -2800,7 +2798,6 @@ const level1s = [ Level3(13, 0, '06673', 'Phường Bãi Cháy', Type.phuong), Level3(13, 0, '06676', 'Phường Cao Thắng', Type.phuong), Level3(13, 0, '06679', 'Phường Hùng Thắng', Type.phuong), - Level3(13, 0, '06682', 'Phường Yết Kiêu', Type.phuong), Level3(13, 0, '06685', 'Phường Trần Hưng Đạo', Type.phuong), Level3(13, 0, '06688', 'Phường Hồng Hải', Type.phuong), Level3(13, 0, '06691', 'Phường Hồng Gai', Type.phuong), @@ -2827,7 +2824,6 @@ const level1s = [ Level3(13, 1, '06709', 'Phường Ka Long', Type.phuong), Level3(13, 1, '06712', 'Phường Trần Phú', Type.phuong), Level3(13, 1, '06715', 'Phường Ninh Dương', Type.phuong), - Level3(13, 1, '06718', 'Phường Hoà Lạc', Type.phuong), Level3(13, 1, '06721', 'Phường Trà Cổ', Type.phuong), Level3(13, 1, '06724', 'Xã Hải Sơn', Type.xa), Level3(13, 1, '06727', 'Xã Bắc Sơn', Type.xa), @@ -2856,8 +2852,7 @@ const level1s = [ Level3(13, 2, '06790', 'Phường Cẩm Thành', Type.phuong), Level3(13, 2, '06793', 'Phường Cẩm Trung', Type.phuong), Level3(13, 2, '06796', 'Phường Cẩm Bình', Type.phuong), - Level3(13, 2, '06799', 'Xã Cộng Hòa', Type.xa), - Level3(13, 2, '06802', 'Xã Cẩm Hải', Type.xa), + Level3(13, 2, '06799', 'Xã Hải Hòa', Type.xa), Level3(13, 2, '06805', 'Xã Dương Huy', Type.xa), ]), Level2(13, '196', 'Thành phố Uông Bí', Type.tp, [ @@ -2924,9 +2919,8 @@ const level1s = [ Level3(13, 8, '06976', 'Xã Thanh Lâm', Type.xa), Level3(13, 8, '06979', 'Xã Đạp Thanh', Type.xa), Level3(13, 8, '06982', 'Xã Nam Sơn', Type.xa), - Level3(13, 8, '06985', 'Xã Lương Mông', Type.xa), + Level3(13, 8, '06985', 'Xã Lương Minh', Type.xa), Level3(13, 8, '06988', 'Xã Đồn Đạc', Type.xa), - Level3(13, 8, '06991', 'Xã Minh Cầm', Type.xa), ]), Level2(13, '203', 'Huyện Vân Đồn', Type.huyen, [ Level3(13, 9, '06994', 'Thị trấn Cái Rồng', Type.thiTran), @@ -2942,19 +2936,17 @@ const level1s = [ Level3(13, 9, '07024', 'Xã Quan Lạn', Type.xa), Level3(13, 9, '07027', 'Xã Ngọc Vừng', Type.xa), ]), - Level2(13, '205', 'Thị xã Đông Triều', Type.thiXa, [ + Level2(13, '205', 'Thành phố Đông Triều', Type.tp, [ Level3(13, 10, '07069', 'Phường Mạo Khê', Type.phuong), - Level3(13, 10, '07072', 'Phường Đông Triều', Type.phuong), Level3(13, 10, '07075', 'Xã An Sinh', Type.xa), Level3(13, 10, '07078', 'Xã Tràng Lương', Type.xa), - Level3(13, 10, '07081', 'Xã Bình Khê', Type.xa), + Level3(13, 10, '07081', 'Phường Bình Khê', Type.phuong), Level3(13, 10, '07084', 'Xã Việt Dân', Type.xa), - Level3(13, 10, '07087', 'Xã Tân Việt', Type.xa), - Level3(13, 10, '07090', 'Xã Bình Dương', Type.xa), + Level3(13, 10, '07090', 'Phường Bình Dương', Type.phuong), Level3(13, 10, '07093', 'Phường Đức Chính', Type.phuong), Level3(13, 10, '07096', 'Phường Tràng An', Type.phuong), Level3(13, 10, '07099', 'Xã Nguyễn Huệ', Type.xa), - Level3(13, 10, '07102', 'Xã Thủy An', Type.xa), + Level3(13, 10, '07102', 'Phường Thủy An', Type.phuong), Level3(13, 10, '07105', 'Phường Xuân Sơn', Type.phuong), Level3(13, 10, '07108', 'Xã Hồng Thái Tây', Type.xa), Level3(13, 10, '07111', 'Xã Hồng Thái Đông', Type.xa), @@ -2963,7 +2955,7 @@ const level1s = [ Level3(13, 10, '07120', 'Phường Hồng Phong', Type.phuong), Level3(13, 10, '07123', 'Phường Kim Sơn', Type.phuong), Level3(13, 10, '07126', 'Phường Hưng Đạo', Type.phuong), - Level3(13, 10, '07129', 'Xã Yên Đức', Type.xa), + Level3(13, 10, '07129', 'Phường Yên Đức', Type.phuong), ]), Level2(13, '206', 'Thị xã Quảng Yên', Type.thiXa, [ Level3(13, 11, '07132', 'Phường Quảng Yên', Type.phuong), @@ -3176,24 +3168,24 @@ const level1s = [ Level3(14, 7, '07747', 'Xã Đồng Việt', Type.xa), Level3(14, 7, '07750', 'Xã Đồng Phúc', Type.xa), ]), - Level2(14, '222', 'Huyện Việt Yên', Type.huyen, [ + Level2(14, '222', 'Thị Xã Việt Yên', Type.thiXa, [ Level3(14, 8, '07759', 'Xã Thượng Lan', Type.xa), Level3(14, 8, '07762', 'Xã Việt Tiến', Type.xa), Level3(14, 8, '07765', 'Xã Nghĩa Trung', Type.xa), Level3(14, 8, '07768', 'Xã Minh Đức', Type.xa), Level3(14, 8, '07771', 'Xã Hương Mai', Type.xa), - Level3(14, 8, '07774', 'Xã Tự Lạn', Type.xa), - Level3(14, 8, '07777', 'Thị trấn Bích Động', Type.thiTran), + Level3(14, 8, '07774', 'Phường Tự Lạn', Type.phuong), + Level3(14, 8, '07777', 'Phường Bích Động', Type.phuong), Level3(14, 8, '07780', 'Xã Trung Sơn', Type.xa), - Level3(14, 8, '07783', 'Xã Hồng Thái', Type.xa), + Level3(14, 8, '07783', 'Phường Hồng Thái', Type.phuong), Level3(14, 8, '07786', 'Xã Tiên Sơn', Type.xa), - Level3(14, 8, '07789', 'Xã Tăng Tiến', Type.xa), - Level3(14, 8, '07792', 'Xã Quảng Minh', Type.xa), - Level3(14, 8, '07795', 'Thị trấn Nếnh', Type.thiTran), - Level3(14, 8, '07798', 'Xã Ninh Sơn', Type.xa), - Level3(14, 8, '07801', 'Xã Vân Trung', Type.xa), + Level3(14, 8, '07789', 'Phường Tăng Tiến', Type.phuong), + Level3(14, 8, '07792', 'Phường Quảng Minh', Type.phuong), + Level3(14, 8, '07795', 'Phường Nếnh', Type.phuong), + Level3(14, 8, '07798', 'Phường Ninh Sơn', Type.phuong), + Level3(14, 8, '07801', 'Phường Vân Trung', Type.phuong), Level3(14, 8, '07804', 'Xã Vân Hà', Type.xa), - Level3(14, 8, '07807', 'Xã Quang Châu', Type.xa), + Level3(14, 8, '07807', 'Phường Quang Châu', Type.phuong), ]), Level2(14, '223', 'Huyện Hiệp Hòa', Type.huyen, [ Level3(14, 9, '07813', 'Xã Đồng Tân', Type.xa), @@ -4518,26 +4510,22 @@ const level1s = [ Level3(21, 1, '12547', 'Xã An Vũ', Type.xa), Level3(21, 1, '12550', 'Xã An Lễ', Type.xa), Level3(21, 1, '12553', 'Xã Quỳnh Hưng', Type.xa), - Level3(21, 1, '12556', 'Xã Quỳnh Bảo', Type.xa), Level3(21, 1, '12559', 'Xã An Mỹ', Type.xa), Level3(21, 1, '12562', 'Xã Quỳnh Nguyên', Type.xa), Level3(21, 1, '12565', 'Xã An Vinh', Type.xa), - Level3(21, 1, '12568', 'Xã Quỳnh Xá', Type.xa), Level3(21, 1, '12571', 'Xã An Dục', Type.xa), Level3(21, 1, '12574', 'Xã Đông Hải', Type.xa), - Level3(21, 1, '12577', 'Xã Quỳnh Trang', Type.xa), + Level3(21, 1, '12577', 'Xã Trang Bảo Xá', Type.xa), Level3(21, 1, '12580', 'Xã An Tràng', Type.xa), Level3(21, 1, '12583', 'Xã Đồng Tiến', Type.xa), ]), Level2(21, '339', 'Huyện Hưng Hà', Type.huyen, [ Level3(21, 2, '12586', 'Thị trấn Hưng Hà', Type.thiTran), - Level3(21, 2, '12589', 'Xã Điệp Nông', Type.xa), + Level3(21, 2, '12589', 'Xã Quang Trung', Type.xa), Level3(21, 2, '12592', 'Xã Tân Lễ', Type.xa), Level3(21, 2, '12595', 'Xã Cộng Hòa', Type.xa), - Level3(21, 2, '12598', 'Xã Dân Chủ', Type.xa), Level3(21, 2, '12601', 'Xã Canh Tân', Type.xa), Level3(21, 2, '12604', 'Xã Hòa Tiến', Type.xa), - Level3(21, 2, '12607', 'Xã Hùng Dũng', Type.xa), Level3(21, 2, '12610', 'Xã Tân Tiến', Type.xa), Level3(21, 2, '12613', 'Thị trấn Hưng Nhân', Type.thiTran), Level3(21, 2, '12616', 'Xã Đoan Hùng', Type.xa), @@ -4568,10 +4556,8 @@ const level1s = [ ]), Level2(21, '340', 'Huyện Đông Hưng', Type.huyen, [ Level3(21, 3, '12688', 'Thị trấn Đông Hưng', Type.thiTran), - Level3(21, 3, '12691', 'Xã Đô Lương', Type.xa), Level3(21, 3, '12694', 'Xã Đông Phương', Type.xa), - Level3(21, 3, '12697', 'Xã Liên Giang', Type.xa), - Level3(21, 3, '12700', 'Xã An Châu', Type.xa), + Level3(21, 3, '12700', 'Xã Liên An Đô', Type.xa), Level3(21, 3, '12703', 'Xã Đông Sơn', Type.xa), Level3(21, 3, '12706', 'Xã Đông Cường', Type.xa), Level3(21, 3, '12709', 'Xã Phú Lương', Type.xa), @@ -4580,10 +4566,8 @@ const level1s = [ Level3(21, 3, '12718', 'Xã Đông La', Type.xa), Level3(21, 3, '12721', 'Xã Minh Tân', Type.xa), Level3(21, 3, '12724', 'Xã Đông Xá', Type.xa), - Level3(21, 3, '12727', 'Xã Chương Dương', Type.xa), Level3(21, 3, '12730', 'Xã Nguyên Xá', Type.xa), - Level3(21, 3, '12733', 'Xã Phong Châu', Type.xa), - Level3(21, 3, '12736', 'Xã Hợp Tiến', Type.xa), + Level3(21, 3, '12736', 'Xã Phong Dương Tiến', Type.xa), Level3(21, 3, '12739', 'Xã Hồng Việt', Type.xa), Level3(21, 3, '12745', 'Xã Hà Giang', Type.xa), Level3(21, 3, '12748', 'Xã Đông Kinh', Type.xa), @@ -4594,13 +4578,11 @@ const level1s = [ Level3(21, 3, '12763', 'Xã Liên Hoa', Type.xa), Level3(21, 3, '12769', 'Xã Đông Tân', Type.xa), Level3(21, 3, '12772', 'Xã Đông Vinh', Type.xa), - Level3(21, 3, '12775', 'Xã Đông Động', Type.xa), + Level3(21, 3, '12775', 'Xã Xuân Quang Động', Type.xa), Level3(21, 3, '12778', 'Xã Hồng Bạch', Type.xa), Level3(21, 3, '12784', 'Xã Trọng Quan', Type.xa), Level3(21, 3, '12790', 'Xã Hồng Giang', Type.xa), Level3(21, 3, '12793', 'Xã Đông Quan', Type.xa), - Level3(21, 3, '12796', 'Xã Đông Quang', Type.xa), - Level3(21, 3, '12799', 'Xã Đông Xuân', Type.xa), Level3(21, 3, '12802', 'Xã Đông Á', Type.xa), Level3(21, 3, '12808', 'Xã Đông Hoàng', Type.xa), Level3(21, 3, '12811', 'Xã Đông Dương', Type.xa), @@ -4648,30 +4630,26 @@ const level1s = [ Level3(21, 5, '12970', 'Thị trấn Tiền Hải', Type.thiTran), Level3(21, 5, '12976', 'Xã Đông Trà', Type.xa), Level3(21, 5, '12979', 'Xã Đông Long', Type.xa), - Level3(21, 5, '12982', 'Xã Đông Quí', Type.xa), Level3(21, 5, '12985', 'Xã Vũ Lăng', Type.xa), Level3(21, 5, '12988', 'Xã Đông Xuyên', Type.xa), Level3(21, 5, '12991', 'Xã Tây Lương', Type.xa), Level3(21, 5, '12994', 'Xã Tây Ninh', Type.xa), - Level3(21, 5, '12997', 'Xã Đông Trung', Type.xa), + Level3(21, 5, '12997', 'Xã Đông Quang', Type.xa), Level3(21, 5, '13000', 'Xã Đông Hoàng', Type.xa), Level3(21, 5, '13003', 'Xã Đông Minh', Type.xa), - Level3(21, 5, '13009', 'Xã Đông Phong', Type.xa), Level3(21, 5, '13012', 'Xã An Ninh', Type.xa), Level3(21, 5, '13018', 'Xã Đông Cơ', Type.xa), Level3(21, 5, '13021', 'Xã Tây Giang', Type.xa), Level3(21, 5, '13024', 'Xã Đông Lâm', Type.xa), Level3(21, 5, '13027', 'Xã Phương Công', Type.xa), - Level3(21, 5, '13030', 'Xã Tây Phong', Type.xa), - Level3(21, 5, '13033', 'Xã Tây Tiến', Type.xa), + Level3(21, 5, '13030', 'Xã Ái Quốc', Type.xa), Level3(21, 5, '13036', 'Xã Nam Cường', Type.xa), Level3(21, 5, '13039', 'Xã Vân Trường', Type.xa), - Level3(21, 5, '13042', 'Xã Nam Thắng', Type.xa), Level3(21, 5, '13045', 'Xã Nam Chính', Type.xa), Level3(21, 5, '13048', 'Xã Bắc Hải', Type.xa), Level3(21, 5, '13051', 'Xã Nam Thịnh', Type.xa), Level3(21, 5, '13054', 'Xã Nam Hà', Type.xa), - Level3(21, 5, '13057', 'Xã Nam Thanh', Type.xa), + Level3(21, 5, '13057', 'Xã Nam Tiến', Type.xa), Level3(21, 5, '13060', 'Xã Nam Trung', Type.xa), Level3(21, 5, '13063', 'Xã Nam Hồng', Type.xa), Level3(21, 5, '13066', 'Xã Nam Hưng', Type.xa), @@ -4689,9 +4667,7 @@ const level1s = [ Level3(21, 6, '13102', 'Xã Lê Lợi', Type.xa), Level3(21, 6, '13111', 'Xã Vũ Lễ', Type.xa), Level3(21, 6, '13114', 'Xã Thanh Tân', Type.xa), - Level3(21, 6, '13117', 'Xã Thượng Hiền', Type.xa), - Level3(21, 6, '13120', 'Xã Nam Cao', Type.xa), - Level3(21, 6, '13123', 'Xã Đình Phùng', Type.xa), + Level3(21, 6, '13120', 'Xã Thống Nhất', Type.xa), Level3(21, 6, '13126', 'Xã Vũ Ninh', Type.xa), Level3(21, 6, '13129', 'Xã Vũ An', Type.xa), Level3(21, 6, '13132', 'Xã Quang Lịch', Type.xa), @@ -4700,13 +4676,11 @@ const level1s = [ Level3(21, 6, '13141', 'Xã Vũ Quí', Type.xa), Level3(21, 6, '13144', 'Xã Quang Bình', Type.xa), Level3(21, 6, '13150', 'Xã Vũ Trung', Type.xa), - Level3(21, 6, '13153', 'Xã Vũ Thắng', Type.xa), Level3(21, 6, '13156', 'Xã Vũ Công', Type.xa), - Level3(21, 6, '13159', 'Xã Vũ Hòa', Type.xa), + Level3(21, 6, '13159', 'Xã Hồng Vũ', Type.xa), Level3(21, 6, '13162', 'Xã Quang Minh', Type.xa), Level3(21, 6, '13165', 'Xã Quang Trung', Type.xa), Level3(21, 6, '13171', 'Xã Minh Quang', Type.xa), - Level3(21, 6, '13174', 'Xã Vũ Bình', Type.xa), Level3(21, 6, '13177', 'Xã Minh Tân', Type.xa), Level3(21, 6, '13180', 'Xã Nam Bình', Type.xa), Level3(21, 6, '13183', 'Xã Bình Thanh', Type.xa), @@ -4871,250 +4845,197 @@ const level1s = [ ]), Level1('36', 'Tỉnh Nam Định', Type.tinh, [ Level2(23, '356', 'Thành phố Nam Định', Type.tp, [ - Level3(23, 0, '13633', 'Phường Hạ Long', Type.phuong), - Level3(23, 0, '13636', 'Phường Trần Tế Xương', Type.phuong), - Level3(23, 0, '13639', 'Phường Vị Hoàng', Type.phuong), - Level3(23, 0, '13642', 'Phường Vị Xuyên', Type.phuong), - Level3(23, 0, '13645', 'Phường Quang Trung', Type.phuong), - Level3(23, 0, '13648', 'Phường Cửa Bắc', Type.phuong), - Level3(23, 0, '13651', 'Phường Nguyễn Du', Type.phuong), - Level3(23, 0, '13654', 'Phường Bà Triệu', Type.phuong), + Level3(23, 0, '13636', 'Phường Vị Xuyên', Type.phuong), Level3(23, 0, '13657', 'Phường Trường Thi', Type.phuong), - Level3(23, 0, '13660', 'Phường Phan Đình Phùng', Type.phuong), - Level3(23, 0, '13663', 'Phường Ngô Quyền', Type.phuong), Level3(23, 0, '13666', 'Phường Trần Hưng Đạo', Type.phuong), - Level3(23, 0, '13669', 'Phường Trần Đăng Ninh', Type.phuong), - Level3(23, 0, '13672', 'Phường Năng Tĩnh', Type.phuong), - Level3(23, 0, '13675', 'Phường Văn Miếu', Type.phuong), - Level3(23, 0, '13678', 'Phường Trần Quang Khải', Type.phuong), - Level3(23, 0, '13681', 'Phường Thống Nhất', Type.phuong), + Level3(23, 0, '13669', 'Phường Cửa Bắc', Type.phuong), + Level3(23, 0, '13678', 'Phường Năng Tĩnh', Type.phuong), + Level3(23, 0, '13681', 'Phường Quang Trung', Type.phuong), Level3(23, 0, '13684', 'Phường Lộc Hạ', Type.phuong), Level3(23, 0, '13687', 'Phường Lộc Vượng', Type.phuong), Level3(23, 0, '13690', 'Phường Cửa Nam', Type.phuong), Level3(23, 0, '13693', 'Phường Lộc Hòa', Type.phuong), - Level3(23, 0, '13696', 'Xã Nam Phong', Type.xa), + Level3(23, 0, '13696', 'Phường Nam Phong', Type.phuong), Level3(23, 0, '13699', 'Phường Mỹ Xá', Type.phuong), - Level3(23, 0, '13702', 'Xã Lộc An', Type.xa), - Level3(23, 0, '13705', 'Xã Nam Vân', Type.xa), - ]), - Level2(23, '358', 'Huyện Mỹ Lộc', Type.huyen, [ - Level3(23, 1, '13708', 'Thị trấn Mỹ Lộc', Type.thiTran), - Level3(23, 1, '13711', 'Xã Mỹ Hà', Type.xa), - Level3(23, 1, '13714', 'Xã Mỹ Tiến', Type.xa), - Level3(23, 1, '13717', 'Xã Mỹ Thắng', Type.xa), - Level3(23, 1, '13720', 'Xã Mỹ Trung', Type.xa), - Level3(23, 1, '13723', 'Xã Mỹ Tân', Type.xa), - Level3(23, 1, '13726', 'Xã Mỹ Phúc', Type.xa), - Level3(23, 1, '13729', 'Xã Mỹ Hưng', Type.xa), - Level3(23, 1, '13732', 'Xã Mỹ Thuận', Type.xa), - Level3(23, 1, '13735', 'Xã Mỹ Thịnh', Type.xa), - Level3(23, 1, '13738', 'Xã Mỹ Thành', Type.xa), + Level3(23, 0, '13705', 'Phường Nam Vân', Type.phuong), + Level3(23, 0, '13708', 'Phường Hưng Lộc', Type.phuong), + Level3(23, 0, '13711', 'Xã Mỹ Hà', Type.xa), + Level3(23, 0, '13717', 'Xã Mỹ Thắng', Type.xa), + Level3(23, 0, '13720', 'Xã Mỹ Trung', Type.xa), + Level3(23, 0, '13723', 'Xã Mỹ Tân', Type.xa), + Level3(23, 0, '13726', 'Xã Mỹ Phúc', Type.xa), + Level3(23, 0, '13732', 'Xã Mỹ Thuận', Type.xa), + Level3(23, 0, '13735', 'Xã Mỹ Lộc', Type.xa), ]), Level2(23, '359', 'Huyện Vụ Bản', Type.huyen, [ - Level3(23, 2, '13741', 'Thị trấn Gôi', Type.thiTran), - Level3(23, 2, '13744', 'Xã Minh Thuận', Type.xa), - Level3(23, 2, '13747', 'Xã Hiển Khánh', Type.xa), - Level3(23, 2, '13750', 'Xã Tân Khánh', Type.xa), - Level3(23, 2, '13753', 'Xã Hợp Hưng', Type.xa), - Level3(23, 2, '13756', 'Xã Đại An', Type.xa), - Level3(23, 2, '13759', 'Xã Tân Thành', Type.xa), - Level3(23, 2, '13762', 'Xã Cộng Hòa', Type.xa), - Level3(23, 2, '13765', 'Xã Trung Thành', Type.xa), - Level3(23, 2, '13768', 'Xã Quang Trung', Type.xa), - Level3(23, 2, '13771', 'Xã Minh Tân', Type.xa), - Level3(23, 2, '13774', 'Xã Liên Bảo', Type.xa), - Level3(23, 2, '13777', 'Xã Thành Lợi', Type.xa), - Level3(23, 2, '13780', 'Xã Kim Thái', Type.xa), - Level3(23, 2, '13783', 'Xã Liên Minh', Type.xa), - Level3(23, 2, '13786', 'Xã Đại Thắng', Type.xa), - Level3(23, 2, '13789', 'Xã Tam Thanh', Type.xa), - Level3(23, 2, '13792', 'Xã Vĩnh Hào', Type.xa), + Level3(23, 1, '13741', 'Thị trấn Gôi', Type.thiTran), + Level3(23, 1, '13747', 'Xã Hiển Khánh', Type.xa), + Level3(23, 1, '13750', 'Xã Minh Tân', Type.xa), + Level3(23, 1, '13753', 'Xã Hợp Hưng', Type.xa), + Level3(23, 1, '13756', 'Xã Đại An', Type.xa), + Level3(23, 1, '13762', 'Xã Cộng Hòa', Type.xa), + Level3(23, 1, '13765', 'Xã Trung Thành', Type.xa), + Level3(23, 1, '13768', 'Xã Quang Trung', Type.xa), + Level3(23, 1, '13777', 'Xã Thành Lợi', Type.xa), + Level3(23, 1, '13780', 'Xã Kim Thái', Type.xa), + Level3(23, 1, '13783', 'Xã Liên Minh', Type.xa), + Level3(23, 1, '13786', 'Xã Đại Thắng', Type.xa), + Level3(23, 1, '13789', 'Xã Tam Thanh', Type.xa), + Level3(23, 1, '13792', 'Xã Vĩnh Hào', Type.xa), ]), Level2(23, '360', 'Huyện Ý Yên', Type.huyen, [ - Level3(23, 3, '13795', 'Thị trấn Lâm', Type.thiTran), - Level3(23, 3, '13798', 'Xã Yên Trung', Type.xa), - Level3(23, 3, '13801', 'Xã Yên Thành', Type.xa), - Level3(23, 3, '13804', 'Xã Yên Tân', Type.xa), - Level3(23, 3, '13807', 'Xã Yên Lợi', Type.xa), - Level3(23, 3, '13810', 'Xã Yên Thọ', Type.xa), - Level3(23, 3, '13813', 'Xã Yên Nghĩa', Type.xa), - Level3(23, 3, '13816', 'Xã Yên Minh', Type.xa), - Level3(23, 3, '13819', 'Xã Yên Phương', Type.xa), - Level3(23, 3, '13822', 'Xã Yên Chính', Type.xa), - Level3(23, 3, '13825', 'Xã Yên Bình', Type.xa), - Level3(23, 3, '13828', 'Xã Yên Phú', Type.xa), - Level3(23, 3, '13831', 'Xã Yên Mỹ', Type.xa), - Level3(23, 3, '13834', 'Xã Yên Dương', Type.xa), - Level3(23, 3, '13840', 'Xã Yên Hưng', Type.xa), - Level3(23, 3, '13843', 'Xã Yên Khánh', Type.xa), - Level3(23, 3, '13846', 'Xã Yên Phong', Type.xa), - Level3(23, 3, '13849', 'Xã Yên Ninh', Type.xa), - Level3(23, 3, '13852', 'Xã Yên Lương', Type.xa), - Level3(23, 3, '13855', 'Xã Yên Hồng', Type.xa), - Level3(23, 3, '13858', 'Xã Yên Quang', Type.xa), - Level3(23, 3, '13861', 'Xã Yên Tiến', Type.xa), - Level3(23, 3, '13864', 'Xã Yên Thắng', Type.xa), - Level3(23, 3, '13867', 'Xã Yên Phúc', Type.xa), - Level3(23, 3, '13870', 'Xã Yên Cường', Type.xa), - Level3(23, 3, '13873', 'Xã Yên Lộc', Type.xa), - Level3(23, 3, '13876', 'Xã Yên Bằng', Type.xa), - Level3(23, 3, '13879', 'Xã Yên Đồng', Type.xa), - Level3(23, 3, '13882', 'Xã Yên Khang', Type.xa), - Level3(23, 3, '13885', 'Xã Yên Nhân', Type.xa), - Level3(23, 3, '13888', 'Xã Yên Trị', Type.xa), + Level3(23, 2, '13795', 'Thị trấn Lâm', Type.thiTran), + Level3(23, 2, '13801', 'Xã Trung Nghĩa', Type.xa), + Level3(23, 2, '13807', 'Xã Tân Minh', Type.xa), + Level3(23, 2, '13810', 'Xã Yên Thọ', Type.xa), + Level3(23, 2, '13819', 'Xã Phú Hưng', Type.xa), + Level3(23, 2, '13822', 'Xã Yên Chính', Type.xa), + Level3(23, 2, '13825', 'Xã Yên Bình', Type.xa), + Level3(23, 2, '13831', 'Xã Yên Mỹ', Type.xa), + Level3(23, 2, '13834', 'Xã Yên Dương', Type.xa), + Level3(23, 2, '13843', 'Xã Yên Khánh', Type.xa), + Level3(23, 2, '13846', 'Xã Yên Phong', Type.xa), + Level3(23, 2, '13849', 'Xã Yên Ninh', Type.xa), + Level3(23, 2, '13852', 'Xã Yên Lương', Type.xa), + Level3(23, 2, '13861', 'Xã Yên Tiến', Type.xa), + Level3(23, 2, '13864', 'Xã Yên Thắng', Type.xa), + Level3(23, 2, '13867', 'Xã Yên Phúc', Type.xa), + Level3(23, 2, '13870', 'Xã Yên Cường', Type.xa), + Level3(23, 2, '13873', 'Xã Yên Lộc', Type.xa), + Level3(23, 2, '13876', 'Xã Hồng Quang', Type.xa), + Level3(23, 2, '13879', 'Xã Yên Đồng', Type.xa), + Level3(23, 2, '13882', 'Xã Yên Khang', Type.xa), + Level3(23, 2, '13885', 'Xã Yên Nhân', Type.xa), + Level3(23, 2, '13888', 'Xã Yên Trị', Type.xa), ]), Level2(23, '361', 'Huyện Nghĩa Hưng', Type.huyen, [ - Level3(23, 4, '13891', 'Thị trấn Liễu Đề', Type.thiTran), - Level3(23, 4, '13894', 'Thị trấn Rạng Đông', Type.thiTran), - Level3(23, 4, '13897', 'Xã Nghĩa Đồng', Type.xa), - Level3(23, 4, '13900', 'Xã Nghĩa Thịnh', Type.xa), - Level3(23, 4, '13903', 'Xã Nghĩa Minh', Type.xa), - Level3(23, 4, '13906', 'Xã Nghĩa Thái', Type.xa), - Level3(23, 4, '13909', 'Xã Hoàng Nam', Type.xa), - Level3(23, 4, '13912', 'Xã Nghĩa Châu', Type.xa), - Level3(23, 4, '13915', 'Xã Nghĩa Trung', Type.xa), - Level3(23, 4, '13918', 'Xã Nghĩa Sơn', Type.xa), - Level3(23, 4, '13921', 'Xã Nghĩa Lạc', Type.xa), - Level3(23, 4, '13924', 'Xã Nghĩa Hồng', Type.xa), - Level3(23, 4, '13927', 'Xã Nghĩa Phong', Type.xa), - Level3(23, 4, '13930', 'Xã Nghĩa Phú', Type.xa), - Level3(23, 4, '13933', 'Xã Nghĩa Bình', Type.xa), - Level3(23, 4, '13936', 'Thị trấn Quỹ Nhất', Type.thiTran), - Level3(23, 4, '13939', 'Xã Nghĩa Tân', Type.xa), - Level3(23, 4, '13942', 'Xã Nghĩa Hùng', Type.xa), - Level3(23, 4, '13945', 'Xã Nghĩa Lâm', Type.xa), - Level3(23, 4, '13948', 'Xã Nghĩa Thành', Type.xa), - Level3(23, 4, '13951', 'Xã Phúc Thắng', Type.xa), - Level3(23, 4, '13954', 'Xã Nghĩa Lợi', Type.xa), - Level3(23, 4, '13957', 'Xã Nghĩa Hải', Type.xa), - Level3(23, 4, '13963', 'Xã Nam Điền', Type.xa), + Level3(23, 3, '13891', 'Thị trấn Liễu Đề', Type.thiTran), + Level3(23, 3, '13894', 'Thị trấn Rạng Đông', Type.thiTran), + Level3(23, 3, '13900', 'Xã Đồng Thịnh', Type.xa), + Level3(23, 3, '13906', 'Xã Nghĩa Thái', Type.xa), + Level3(23, 3, '13909', 'Xã Hoàng Nam', Type.xa), + Level3(23, 3, '13912', 'Xã Nghĩa Châu', Type.xa), + Level3(23, 3, '13915', 'Xã Nghĩa Trung', Type.xa), + Level3(23, 3, '13918', 'Xã Nghĩa Sơn', Type.xa), + Level3(23, 3, '13921', 'Xã Nghĩa Lạc', Type.xa), + Level3(23, 3, '13924', 'Xã Nghĩa Hồng', Type.xa), + Level3(23, 3, '13927', 'Xã Nghĩa Phong', Type.xa), + Level3(23, 3, '13930', 'Xã Nghĩa Phú', Type.xa), + Level3(23, 3, '13939', 'Thị trấn Quỹ Nhất', Type.thiTran), + Level3(23, 3, '13942', 'Xã Nghĩa Hùng', Type.xa), + Level3(23, 3, '13945', 'Xã Nghĩa Lâm', Type.xa), + Level3(23, 3, '13948', 'Xã Nghĩa Thành', Type.xa), + Level3(23, 3, '13951', 'Xã Phúc Thắng', Type.xa), + Level3(23, 3, '13954', 'Xã Nghĩa Lợi', Type.xa), + Level3(23, 3, '13957', 'Xã Nghĩa Hải', Type.xa), + Level3(23, 3, '13963', 'Xã Nam Điền', Type.xa), ]), Level2(23, '362', 'Huyện Nam Trực', Type.huyen, [ - Level3(23, 5, '13966', 'Thị trấn Nam Giang', Type.thiTran), - Level3(23, 5, '13969', 'Xã Nam Mỹ', Type.xa), - Level3(23, 5, '13972', 'Xã Điền Xá', Type.xa), - Level3(23, 5, '13975', 'Xã Nghĩa An', Type.xa), - Level3(23, 5, '13978', 'Xã Nam Thắng', Type.xa), - Level3(23, 5, '13981', 'Xã Nam Toàn', Type.xa), - Level3(23, 5, '13984', 'Xã Hồng Quang', Type.xa), - Level3(23, 5, '13987', 'Xã Tân Thịnh', Type.xa), - Level3(23, 5, '13990', 'Xã Nam Cường', Type.xa), - Level3(23, 5, '13993', 'Xã Nam Hồng', Type.xa), - Level3(23, 5, '13996', 'Xã Nam Hùng', Type.xa), - Level3(23, 5, '13999', 'Xã Nam Hoa', Type.xa), - Level3(23, 5, '14002', 'Xã Nam Dương', Type.xa), - Level3(23, 5, '14005', 'Xã Nam Thanh', Type.xa), - Level3(23, 5, '14008', 'Xã Nam Lợi', Type.xa), - Level3(23, 5, '14011', 'Xã Bình Minh', Type.xa), - Level3(23, 5, '14014', 'Xã Đồng Sơn', Type.xa), - Level3(23, 5, '14017', 'Xã Nam Tiến', Type.xa), - Level3(23, 5, '14020', 'Xã Nam Hải', Type.xa), - Level3(23, 5, '14023', 'Xã Nam Thái', Type.xa), + Level3(23, 4, '13966', 'Thị trấn Nam Giang', Type.thiTran), + Level3(23, 4, '13972', 'Xã Nam Điền', Type.xa), + Level3(23, 4, '13975', 'Xã Nghĩa An', Type.xa), + Level3(23, 4, '13978', 'Xã Nam Thắng', Type.xa), + Level3(23, 4, '13984', 'Xã Hồng Quang', Type.xa), + Level3(23, 4, '13987', 'Xã Tân Thịnh', Type.xa), + Level3(23, 4, '13990', 'Xã Nam Cường', Type.xa), + Level3(23, 4, '13993', 'Xã Nam Hồng', Type.xa), + Level3(23, 4, '13996', 'Xã Nam Hùng', Type.xa), + Level3(23, 4, '13999', 'Xã Nam Hoa', Type.xa), + Level3(23, 4, '14002', 'Xã Nam Dương', Type.xa), + Level3(23, 4, '14005', 'Xã Nam Thanh', Type.xa), + Level3(23, 4, '14008', 'Xã Nam Lợi', Type.xa), + Level3(23, 4, '14011', 'Xã Bình Minh', Type.xa), + Level3(23, 4, '14014', 'Xã Đồng Sơn', Type.xa), + Level3(23, 4, '14017', 'Xã Nam Tiến', Type.xa), + Level3(23, 4, '14020', 'Xã Nam Hải', Type.xa), + Level3(23, 4, '14023', 'Xã Nam Thái', Type.xa), ]), Level2(23, '363', 'Huyện Trực Ninh', Type.huyen, [ - Level3(23, 6, '14026', 'Thị trấn Cổ Lễ', Type.thiTran), - Level3(23, 6, '14029', 'Xã Phương Định', Type.xa), - Level3(23, 6, '14032', 'Xã Trực Chính', Type.xa), - Level3(23, 6, '14035', 'Xã Trung Đông', Type.xa), - Level3(23, 6, '14038', 'Xã Liêm Hải', Type.xa), - Level3(23, 6, '14041', 'Xã Trực Tuấn', Type.xa), - Level3(23, 6, '14044', 'Xã Việt Hùng', Type.xa), - Level3(23, 6, '14047', 'Xã Trực Đạo', Type.xa), - Level3(23, 6, '14050', 'Xã Trực Hưng', Type.xa), - Level3(23, 6, '14053', 'Xã Trực Nội', Type.xa), - Level3(23, 6, '14056', 'Thị trấn Cát Thành', Type.thiTran), - Level3(23, 6, '14059', 'Xã Trực Thanh', Type.xa), - Level3(23, 6, '14062', 'Xã Trực Khang', Type.xa), - Level3(23, 6, '14065', 'Xã Trực Thuận', Type.xa), - Level3(23, 6, '14068', 'Xã Trực Mỹ', Type.xa), - Level3(23, 6, '14071', 'Xã Trực Đại', Type.xa), - Level3(23, 6, '14074', 'Xã Trực Cường', Type.xa), - Level3(23, 6, '14077', 'Thị trấn Ninh Cường', Type.thiTran), - Level3(23, 6, '14080', 'Xã Trực Thái', Type.xa), - Level3(23, 6, '14083', 'Xã Trực Hùng', Type.xa), - Level3(23, 6, '14086', 'Xã Trực Thắng', Type.xa), + Level3(23, 5, '14026', 'Thị trấn Cổ Lễ', Type.thiTran), + Level3(23, 5, '14029', 'Xã Phương Định', Type.xa), + Level3(23, 5, '14032', 'Xã Trực Chính', Type.xa), + Level3(23, 5, '14035', 'Xã Trung Đông', Type.xa), + Level3(23, 5, '14038', 'Xã Liêm Hải', Type.xa), + Level3(23, 5, '14041', 'Xã Trực Tuấn', Type.xa), + Level3(23, 5, '14044', 'Xã Việt Hùng', Type.xa), + Level3(23, 5, '14047', 'Xã Trực Đạo', Type.xa), + Level3(23, 5, '14050', 'Xã Trực Hưng', Type.xa), + Level3(23, 5, '14053', 'Xã Trực Nội', Type.xa), + Level3(23, 5, '14056', 'Thị trấn Cát Thành', Type.thiTran), + Level3(23, 5, '14059', 'Xã Trực Thanh', Type.xa), + Level3(23, 5, '14062', 'Xã Trực Khang', Type.xa), + Level3(23, 5, '14065', 'Xã Trực Thuận', Type.xa), + Level3(23, 5, '14068', 'Xã Trực Mỹ', Type.xa), + Level3(23, 5, '14071', 'Xã Trực Đại', Type.xa), + Level3(23, 5, '14074', 'Xã Trực Cường', Type.xa), + Level3(23, 5, '14077', 'Thị trấn Ninh Cường', Type.thiTran), + Level3(23, 5, '14080', 'Xã Trực Thái', Type.xa), + Level3(23, 5, '14083', 'Xã Trực Hùng', Type.xa), + Level3(23, 5, '14086', 'Xã Trực Thắng', Type.xa), ]), Level2(23, '364', 'Huyện Xuân Trường', Type.huyen, [ - Level3(23, 7, '14089', 'Thị trấn Xuân Trường', Type.thiTran), - Level3(23, 7, '14092', 'Xã Xuân Châu', Type.xa), - Level3(23, 7, '14095', 'Xã Xuân Hồng', Type.xa), - Level3(23, 7, '14098', 'Xã Xuân Thành', Type.xa), - Level3(23, 7, '14101', 'Xã Xuân Thượng', Type.xa), - Level3(23, 7, '14104', 'Xã Xuân Phong', Type.xa), - Level3(23, 7, '14107', 'Xã Xuân Đài', Type.xa), - Level3(23, 7, '14110', 'Xã Xuân Tân', Type.xa), - Level3(23, 7, '14113', 'Xã Xuân Thủy', Type.xa), - Level3(23, 7, '14116', 'Xã Xuân Ngọc', Type.xa), - Level3(23, 7, '14119', 'Xã Xuân Bắc', Type.xa), - Level3(23, 7, '14122', 'Xã Xuân Phương', Type.xa), - Level3(23, 7, '14125', 'Xã Thọ Nghiệp', Type.xa), - Level3(23, 7, '14128', 'Xã Xuân Phú', Type.xa), - Level3(23, 7, '14131', 'Xã Xuân Trung', Type.xa), - Level3(23, 7, '14134', 'Xã Xuân Vinh', Type.xa), - Level3(23, 7, '14137', 'Xã Xuân Kiên', Type.xa), - Level3(23, 7, '14140', 'Xã Xuân Tiến', Type.xa), - Level3(23, 7, '14143', 'Xã Xuân Ninh', Type.xa), - Level3(23, 7, '14146', 'Xã Xuân Hòa', Type.xa), + Level3(23, 6, '14089', 'Thị trấn Xuân Trường', Type.thiTran), + Level3(23, 6, '14092', 'Xã Xuân Châu', Type.xa), + Level3(23, 6, '14095', 'Xã Xuân Hồng', Type.xa), + Level3(23, 6, '14098', 'Xã Xuân Thành', Type.xa), + Level3(23, 6, '14101', 'Xã Xuân Thượng', Type.xa), + Level3(23, 6, '14104', 'Xã Xuân Giang', Type.xa), + Level3(23, 6, '14110', 'Xã Xuân Tân', Type.xa), + Level3(23, 6, '14116', 'Xã Xuân Ngọc', Type.xa), + Level3(23, 6, '14122', 'Xã Trà Lũ', Type.xa), + Level3(23, 6, '14125', 'Xã Thọ Nghiệp', Type.xa), + Level3(23, 6, '14128', 'Xã Xuân Phú', Type.xa), + Level3(23, 6, '14134', 'Xã Xuân Vinh', Type.xa), + Level3(23, 6, '14143', 'Xã Xuân Ninh', Type.xa), + Level3(23, 6, '14146', 'Xã Xuân Phúc', Type.xa), ]), Level2(23, '365', 'Huyện Giao Thủy', Type.huyen, [ - Level3(23, 8, '14149', 'Thị trấn Ngô Đồng', Type.thiTran), - Level3(23, 8, '14152', 'Thị trấn Quất Lâm', Type.thiTran), - Level3(23, 8, '14155', 'Xã Giao Hương', Type.xa), - Level3(23, 8, '14158', 'Xã Hồng Thuận', Type.xa), - Level3(23, 8, '14161', 'Xã Giao Thiện', Type.xa), - Level3(23, 8, '14164', 'Xã Giao Thanh', Type.xa), - Level3(23, 8, '14167', 'Xã Hoành Sơn', Type.xa), - Level3(23, 8, '14170', 'Xã Bình Hòa', Type.xa), - Level3(23, 8, '14173', 'Xã Giao Tiến', Type.xa), - Level3(23, 8, '14176', 'Xã Giao Hà', Type.xa), - Level3(23, 8, '14179', 'Xã Giao Nhân', Type.xa), - Level3(23, 8, '14182', 'Xã Giao An', Type.xa), - Level3(23, 8, '14185', 'Xã Giao Lạc', Type.xa), - Level3(23, 8, '14188', 'Xã Giao Châu', Type.xa), - Level3(23, 8, '14191', 'Xã Giao Tân', Type.xa), - Level3(23, 8, '14194', 'Xã Giao Yến', Type.xa), - Level3(23, 8, '14197', 'Xã Giao Xuân', Type.xa), - Level3(23, 8, '14200', 'Xã Giao Thịnh', Type.xa), - Level3(23, 8, '14203', 'Xã Giao Hải', Type.xa), - Level3(23, 8, '14206', 'Xã Bạch Long', Type.xa), - Level3(23, 8, '14209', 'Xã Giao Long', Type.xa), - Level3(23, 8, '14212', 'Xã Giao Phong', Type.xa), + Level3(23, 7, '14152', 'Thị trấn Quất Lâm', Type.thiTran), + Level3(23, 7, '14155', 'Xã Giao Hương', Type.xa), + Level3(23, 7, '14158', 'Xã Hồng Thuận', Type.xa), + Level3(23, 7, '14161', 'Xã Giao Thiện', Type.xa), + Level3(23, 7, '14164', 'Xã Giao Thanh', Type.xa), + Level3(23, 7, '14167', 'Thị trấn Giao Thủy', Type.thiTran), + Level3(23, 7, '14170', 'Xã Bình Hòa', Type.xa), + Level3(23, 7, '14176', 'Xã Giao Hà', Type.xa), + Level3(23, 7, '14179', 'Xã Giao Nhân', Type.xa), + Level3(23, 7, '14182', 'Xã Giao An', Type.xa), + Level3(23, 7, '14185', 'Xã Giao Lạc', Type.xa), + Level3(23, 7, '14188', 'Xã Giao Châu', Type.xa), + Level3(23, 7, '14191', 'Xã Giao Tân', Type.xa), + Level3(23, 7, '14194', 'Xã Giao Yến', Type.xa), + Level3(23, 7, '14197', 'Xã Giao Xuân', Type.xa), + Level3(23, 7, '14200', 'Xã Giao Thịnh', Type.xa), + Level3(23, 7, '14203', 'Xã Giao Hải', Type.xa), + Level3(23, 7, '14206', 'Xã Bạch Long', Type.xa), + Level3(23, 7, '14209', 'Xã Giao Long', Type.xa), + Level3(23, 7, '14212', 'Xã Giao Phong', Type.xa), ]), Level2(23, '366', 'Huyện Hải Hậu', Type.huyen, [ - Level3(23, 9, '14215', 'Thị trấn Yên Định', Type.thiTran), - Level3(23, 9, '14218', 'Thị trấn Cồn', Type.thiTran), - Level3(23, 9, '14221', 'Thị trấn Thịnh Long', Type.thiTran), - Level3(23, 9, '14224', 'Xã Hải Nam', Type.xa), - Level3(23, 9, '14227', 'Xã Hải Trung', Type.xa), - Level3(23, 9, '14230', 'Xã Hải Vân', Type.xa), - Level3(23, 9, '14233', 'Xã Hải Minh', Type.xa), - Level3(23, 9, '14236', 'Xã Hải Anh', Type.xa), - Level3(23, 9, '14239', 'Xã Hải Hưng', Type.xa), - Level3(23, 9, '14242', 'Xã Hải Bắc', Type.xa), - Level3(23, 9, '14245', 'Xã Hải Phúc', Type.xa), - Level3(23, 9, '14248', 'Xã Hải Thanh', Type.xa), - Level3(23, 9, '14251', 'Xã Hải Hà', Type.xa), - Level3(23, 9, '14254', 'Xã Hải Long', Type.xa), - Level3(23, 9, '14257', 'Xã Hải Phương', Type.xa), - Level3(23, 9, '14260', 'Xã Hải Đường', Type.xa), - Level3(23, 9, '14263', 'Xã Hải Lộc', Type.xa), - Level3(23, 9, '14266', 'Xã Hải Quang', Type.xa), - Level3(23, 9, '14269', 'Xã Hải Đông', Type.xa), - Level3(23, 9, '14272', 'Xã Hải Sơn', Type.xa), - Level3(23, 9, '14275', 'Xã Hải Tân', Type.xa), - Level3(23, 9, '14281', 'Xã Hải Phong', Type.xa), - Level3(23, 9, '14284', 'Xã Hải An', Type.xa), - Level3(23, 9, '14287', 'Xã Hải Tây', Type.xa), - Level3(23, 9, '14290', 'Xã Hải Lý', Type.xa), - Level3(23, 9, '14293', 'Xã Hải Phú', Type.xa), - Level3(23, 9, '14296', 'Xã Hải Giang', Type.xa), - Level3(23, 9, '14299', 'Xã Hải Cường', Type.xa), - Level3(23, 9, '14302', 'Xã Hải Ninh', Type.xa), - Level3(23, 9, '14305', 'Xã Hải Chính', Type.xa), - Level3(23, 9, '14308', 'Xã Hải Xuân', Type.xa), - Level3(23, 9, '14311', 'Xã Hải Châu', Type.xa), - Level3(23, 9, '14314', 'Xã Hải Triều', Type.xa), - Level3(23, 9, '14317', 'Xã Hải Hòa', Type.xa), + Level3(23, 8, '14215', 'Thị trấn Yên Định', Type.thiTran), + Level3(23, 8, '14218', 'Thị trấn Cồn', Type.thiTran), + Level3(23, 8, '14221', 'Thị trấn Thịnh Long', Type.thiTran), + Level3(23, 8, '14224', 'Xã Hải Nam', Type.xa), + Level3(23, 8, '14227', 'Xã Hải Trung', Type.xa), + Level3(23, 8, '14233', 'Xã Hải Minh', Type.xa), + Level3(23, 8, '14236', 'Xã Hải Anh', Type.xa), + Level3(23, 8, '14248', 'Xã Hải Hưng', Type.xa), + Level3(23, 8, '14254', 'Xã Hải Long', Type.xa), + Level3(23, 8, '14260', 'Xã Hải Đường', Type.xa), + Level3(23, 8, '14263', 'Xã Hải Lộc', Type.xa), + Level3(23, 8, '14266', 'Xã Hải Quang', Type.xa), + Level3(23, 8, '14269', 'Xã Hải Đông', Type.xa), + Level3(23, 8, '14272', 'Xã Hải Sơn', Type.xa), + Level3(23, 8, '14275', 'Xã Hải Tân', Type.xa), + Level3(23, 8, '14281', 'Xã Hải Phong', Type.xa), + Level3(23, 8, '14284', 'Xã Hải An', Type.xa), + Level3(23, 8, '14287', 'Xã Hải Tây', Type.xa), + Level3(23, 8, '14293', 'Xã Hải Phú', Type.xa), + Level3(23, 8, '14296', 'Xã Hải Giang', Type.xa), + Level3(23, 8, '14302', 'Xã Hải Ninh', Type.xa), + Level3(23, 8, '14308', 'Xã Hải Xuân', Type.xa), + Level3(23, 8, '14311', 'Xã Hải Châu', Type.xa), + Level3(23, 8, '14317', 'Xã Hải Hòa', Type.xa), ]), ]), Level1('37', 'Tỉnh Ninh Bình', Type.tinh, [ @@ -5640,7 +5561,6 @@ const level1s = [ Level3(25, 17, '15781', 'Xã Thiệu Phúc', Type.xa), Level3(25, 17, '15784', 'Xã Thiệu Tiến', Type.xa), Level3(25, 17, '15787', 'Xã Thiệu Công', Type.xa), - Level3(25, 17, '15790', 'Xã Thiệu Phú', Type.xa), Level3(25, 17, '15793', 'Xã Thiệu Long', Type.xa), Level3(25, 17, '15796', 'Xã Thiệu Giang', Type.xa), Level3(25, 17, '15799', 'Xã Thiệu Duy', Type.xa), @@ -5652,7 +5572,7 @@ const level1s = [ Level3(25, 17, '15817', 'Xã Thiệu Toán', Type.xa), Level3(25, 17, '15820', 'Xã Thiệu Chính', Type.xa), Level3(25, 17, '15823', 'Xã Thiệu Hòa', Type.xa), - Level3(25, 17, '15829', 'Xã Minh Tâm', Type.xa), + Level3(25, 17, '15829', 'Thị trấn Hậu Hiền', Type.thiTran), Level3(25, 17, '15832', 'Xã Thiệu Viên', Type.xa), Level3(25, 17, '15835', 'Xã Thiệu Lý', Type.xa), Level3(25, 17, '15838', 'Xã Thiệu Vận', Type.xa), @@ -7855,19 +7775,15 @@ const level1s = [ Level1('54', 'Tỉnh Phú Yên', Type.tinh, [ Level2(35, '555', 'Thành phố Tuy Hoà', Type.tp, [ Level3(35, 0, '22015', 'Phường 1', Type.phuong), - Level3(35, 0, '22018', 'Phường 8', Type.phuong), Level3(35, 0, '22021', 'Phường 2', Type.phuong), Level3(35, 0, '22024', 'Phường 9', Type.phuong), - Level3(35, 0, '22027', 'Phường 3', Type.phuong), Level3(35, 0, '22030', 'Phường 4', Type.phuong), Level3(35, 0, '22033', 'Phường 5', Type.phuong), Level3(35, 0, '22036', 'Phường 7', Type.phuong), - Level3(35, 0, '22039', 'Phường 6', Type.phuong), Level3(35, 0, '22040', 'Phường Phú Thạnh', Type.phuong), Level3(35, 0, '22041', 'Phường Phú Đông', Type.phuong), Level3(35, 0, '22042', 'Xã Hòa Kiến', Type.xa), Level3(35, 0, '22045', 'Xã Bình Kiến', Type.xa), - Level3(35, 0, '22048', 'Xã Bình Ngọc', Type.xa), Level3(35, 0, '22162', 'Xã An Phú', Type.xa), Level3(35, 0, '22240', 'Phường Phú Lâm', Type.phuong), ]), @@ -7989,16 +7905,11 @@ const level1s = [ Level3(36, 0, '22333', 'Phường Vĩnh Phước', Type.phuong), Level3(36, 0, '22336', 'Phường Ngọc Hiệp', Type.phuong), Level3(36, 0, '22339', 'Phường Vĩnh Thọ', Type.phuong), - Level3(36, 0, '22342', 'Phường Xương Huân', Type.phuong), - Level3(36, 0, '22345', 'Phường Vạn Thắng', Type.phuong), Level3(36, 0, '22348', 'Phường Vạn Thạnh', Type.phuong), Level3(36, 0, '22351', 'Phường Phương Sài', Type.phuong), - Level3(36, 0, '22354', 'Phường Phương Sơn', Type.phuong), Level3(36, 0, '22357', 'Phường Phước Hải', Type.phuong), - Level3(36, 0, '22360', 'Phường Phước Tân', Type.phuong), Level3(36, 0, '22363', 'Phường Lộc Thọ', Type.phuong), - Level3(36, 0, '22366', 'Phường Phước Tiến', Type.phuong), - Level3(36, 0, '22369', 'Phường Tân Lập', Type.phuong), + Level3(36, 0, '22366', 'Phường Tân Tiến', Type.phuong), Level3(36, 0, '22372', 'Phường Phước Hòa', Type.phuong), Level3(36, 0, '22375', 'Phường Vĩnh Nguyên', Type.phuong), Level3(36, 0, '22378', 'Phường Phước Long', Type.phuong), @@ -8078,7 +7989,6 @@ const level1s = [ Level3(36, 4, '22570', 'Phường Ninh Đa', Type.phuong), Level3(36, 4, '22573', 'Xã Ninh Phụng', Type.xa), Level3(36, 4, '22576', 'Xã Ninh Bình', Type.xa), - Level3(36, 4, '22579', 'Xã Ninh Phước', Type.xa), Level3(36, 4, '22582', 'Xã Ninh Phú', Type.xa), Level3(36, 4, '22585', 'Xã Ninh Tân', Type.xa), Level3(36, 4, '22588', 'Xã Ninh Quang', Type.xa), @@ -8087,7 +7997,7 @@ const level1s = [ Level3(36, 4, '22597', 'Xã Ninh Hưng', Type.xa), Level3(36, 4, '22600', 'Xã Ninh Lộc', Type.xa), Level3(36, 4, '22603', 'Xã Ninh Ích', Type.xa), - Level3(36, 4, '22606', 'Xã Ninh Vân', Type.xa), + Level3(36, 4, '22606', 'Xã Ninh Phước', Type.xa), ]), Level2(36, '573', 'Huyện Khánh Vĩnh', Type.huyen, [ Level3(36, 5, '22609', 'Thị trấn Khánh Vĩnh', Type.thiTran), @@ -8109,9 +8019,8 @@ const level1s = [ Level3(36, 6, '22651', 'Thị trấn Diên Khánh', Type.thiTran), Level3(36, 6, '22654', 'Xã Diên Lâm', Type.xa), Level3(36, 6, '22657', 'Xã Diên Điền', Type.xa), - Level3(36, 6, '22660', 'Xã Diên Xuân', Type.xa), + Level3(36, 6, '22660', 'Xã Xuân Đồng', Type.xa), Level3(36, 6, '22663', 'Xã Diên Sơn', Type.xa), - Level3(36, 6, '22666', 'Xã Diên Đồng', Type.xa), Level3(36, 6, '22669', 'Xã Diên Phú', Type.xa), Level3(36, 6, '22672', 'Xã Diên Thọ', Type.xa), Level3(36, 6, '22675', 'Xã Diên Phước', Type.xa), @@ -8146,10 +8055,7 @@ const level1s = [ Level3(37, 0, '22738', 'Phường Đô Vinh', Type.phuong), Level3(37, 0, '22741', 'Phường Phước Mỹ', Type.phuong), Level3(37, 0, '22744', 'Phường Bảo An', Type.phuong), - Level3(37, 0, '22747', 'Phường Phủ Hà', Type.phuong), - Level3(37, 0, '22750', 'Phường Thanh Sơn', Type.phuong), - Level3(37, 0, '22753', 'Phường Mỹ Hương', Type.phuong), - Level3(37, 0, '22756', 'Phường Tấn Tài', Type.phuong), + Level3(37, 0, '22750', 'Phường Phủ Hà', Type.phuong), Level3(37, 0, '22759', 'Phường Kinh Dinh', Type.phuong), Level3(37, 0, '22762', 'Phường Đạo Long', Type.phuong), Level3(37, 0, '22765', 'Phường Đài Sơn', Type.phuong), @@ -8509,7 +8415,6 @@ const level1s = [ Level3(40, 0, '23584', 'Phường Yên Thế', Type.phuong), Level3(40, 0, '23586', 'Phường Chi Lăng', Type.phuong), Level3(40, 0, '23590', 'Xã Biển Hồ', Type.xa), - Level3(40, 0, '23593', 'Xã Tân Sơn', Type.xa), Level3(40, 0, '23596', 'Xã Trà Đa', Type.xa), Level3(40, 0, '23599', 'Xã Chư Á', Type.xa), Level3(40, 0, '23602', 'Xã An Phú', Type.xa), @@ -8553,8 +8458,7 @@ const level1s = [ Level3(40, 3, '23662', 'Xã Nghĩa An', Type.xa), Level3(40, 3, '23665', 'Xã Tơ Tung', Type.xa), Level3(40, 3, '23668', 'Xã Kông Lơng Khơng', Type.xa), - Level3(40, 3, '23671', 'Xã Kông Pla', Type.xa), - Level3(40, 3, '23674', 'Xã Đăk HLơ', Type.xa), + Level3(40, 3, '23674', 'Xã Kông Bơ La', Type.xa), ]), Level2(40, '626', 'Huyện Đăk Đoa', Type.huyen, [ Level3(40, 4, '23677', 'Thị trấn Đăk Đoa', Type.thiTran), @@ -8753,11 +8657,9 @@ const level1s = [ Level3(41, 0, '24118', 'Phường Tân Lập', Type.phuong), Level3(41, 0, '24121', 'Phường Tân Hòa', Type.phuong), Level3(41, 0, '24124', 'Phường Tân An', Type.phuong), - Level3(41, 0, '24127', 'Phường Thống Nhất', Type.phuong), Level3(41, 0, '24130', 'Phường Thành Nhất', Type.phuong), - Level3(41, 0, '24133', 'Phường Thắng Lợi', Type.phuong), + Level3(41, 0, '24133', 'Phường Thành Công', Type.phuong), Level3(41, 0, '24136', 'Phường Tân Lợi', Type.phuong), - Level3(41, 0, '24139', 'Phường Thành Công', Type.phuong), Level3(41, 0, '24142', 'Phường Tân Thành', Type.phuong), Level3(41, 0, '24145', 'Phường Tân Tiến', Type.phuong), Level3(41, 0, '24148', 'Phường Tự An', Type.phuong), @@ -8778,7 +8680,6 @@ const level1s = [ Level3(41, 1, '24311', 'Phường Thiện An', Type.phuong), Level3(41, 1, '24318', 'Phường Đạt Hiếu', Type.phuong), Level3(41, 1, '24322', 'Phường Đoàn Kết', Type.phuong), - Level3(41, 1, '24325', 'Xã Ea Blang', Type.xa), Level3(41, 1, '24328', 'Xã Ea Drông', Type.xa), Level3(41, 1, '24331', 'Phường Thống Nhất', Type.phuong), Level3(41, 1, '24332', 'Phường Bình Tân', Type.phuong), @@ -8901,7 +8802,6 @@ const level1s = [ Level3(41, 10, '24451', 'Xã Dang Kang', Type.xa), Level3(41, 10, '24454', 'Xã Cư KTy', Type.xa), Level3(41, 10, '24457', 'Xã Hòa Thành', Type.xa), - Level3(41, 10, '24460', 'Xã Hòa Tân', Type.xa), Level3(41, 10, '24463', 'Xã Hòa Phong', Type.xa), Level3(41, 10, '24466', 'Xã Hòa Lễ', Type.xa), Level3(41, 10, '24469', 'Xã Yang Reh', Type.xa), @@ -9510,11 +9410,11 @@ const level1s = [ Level3(46, 2, '25807', 'Xã Thanh An', Type.xa), Level3(46, 2, '25810', 'Xã Thanh Tuyền', Type.xa), ]), - Level2(46, '721', 'Thị xã Bến Cát', Type.thiXa, [ + Level2(46, '721', 'Thành phố Bến Cát', Type.tp, [ Level3(46, 3, '25813', 'Phường Mỹ Phước', Type.phuong), Level3(46, 3, '25837', 'Phường Chánh Phú Hòa', Type.phuong), - Level3(46, 3, '25840', 'Xã An Điền', Type.xa), - Level3(46, 3, '25843', 'Xã An Tây', Type.xa), + Level3(46, 3, '25840', 'Phường An Điền', Type.phuong), + Level3(46, 3, '25843', 'Phường An Tây', Type.phuong), Level3(46, 3, '25846', 'Phường Thới Hòa', Type.phuong), Level3(46, 3, '25849', 'Phường Hòa Lợi', Type.phuong), Level3(46, 3, '25852', 'Phường Tân Định', Type.phuong), @@ -9590,17 +9490,12 @@ const level1s = [ Level3(47, 0, '26005', 'Phường Tân Hòa', Type.phuong), Level3(47, 0, '26008', 'Phường Tân Hiệp', Type.phuong), Level3(47, 0, '26011', 'Phường Bửu Long', Type.phuong), - Level3(47, 0, '26014', 'Phường Tân Tiến', Type.phuong), + Level3(47, 0, '26014', 'Phường Tân Mai', Type.phuong), Level3(47, 0, '26017', 'Phường Tam Hiệp', Type.phuong), Level3(47, 0, '26020', 'Phường Long Bình', Type.phuong), Level3(47, 0, '26023', 'Phường Quang Vinh', Type.phuong), - Level3(47, 0, '26026', 'Phường Tân Mai', Type.phuong), Level3(47, 0, '26029', 'Phường Thống Nhất', Type.phuong), - Level3(47, 0, '26032', 'Phường Trung Dũng', Type.phuong), - Level3(47, 0, '26035', 'Phường Tam Hòa', Type.phuong), - Level3(47, 0, '26038', 'Phường Hòa Bình', Type.phuong), - Level3(47, 0, '26041', 'Phường Quyết Thắng', Type.phuong), - Level3(47, 0, '26044', 'Phường Thanh Bình', Type.phuong), + Level3(47, 0, '26041', 'Phường Trung Dũng', Type.phuong), Level3(47, 0, '26047', 'Phường Bình Đa', Type.phuong), Level3(47, 0, '26050', 'Phường An Bình', Type.phuong), Level3(47, 0, '26053', 'Phường Bửu Hòa', Type.phuong), @@ -9615,8 +9510,6 @@ const level1s = [ Level3(47, 0, '26380', 'Xã Long Hưng', Type.xa), ]), Level2(47, '732', 'Thành phố Long Khánh', Type.tp, [ - Level3(47, 1, '26071', 'Phường Xuân Trung', Type.phuong), - Level3(47, 1, '26074', 'Phường Xuân Thanh', Type.phuong), Level3(47, 1, '26077', 'Phường Xuân Bình', Type.phuong), Level3(47, 1, '26080', 'Phường Xuân An', Type.phuong), Level3(47, 1, '26083', 'Phường Xuân Hoà', Type.phuong), @@ -9636,13 +9529,11 @@ const level1s = [ Level3(47, 2, '26119', 'Xã Dak Lua', Type.xa), Level3(47, 2, '26122', 'Xã Nam Cát Tiên', Type.xa), Level3(47, 2, '26125', 'Xã Phú An', Type.xa), - Level3(47, 2, '26128', 'Xã Núi Tượng', Type.xa), Level3(47, 2, '26131', 'Xã Tà Lài', Type.xa), Level3(47, 2, '26134', 'Xã Phú Lập', Type.xa), - Level3(47, 2, '26137', 'Xã Phú Sơn', Type.xa), Level3(47, 2, '26140', 'Xã Phú Thịnh', Type.xa), Level3(47, 2, '26143', 'Xã Thanh Sơn', Type.xa), - Level3(47, 2, '26146', 'Xã Phú Trung', Type.xa), + Level3(47, 2, '26146', 'Xã Phú Sơn', Type.xa), Level3(47, 2, '26149', 'Xã Phú Xuân', Type.xa), Level3(47, 2, '26152', 'Xã Phú Lộc', Type.xa), Level3(47, 2, '26155', 'Xã Phú Lâm', Type.xa), @@ -9661,9 +9552,7 @@ const level1s = [ Level3(47, 3, '26188', 'Xã Thạnh Phú', Type.xa), Level3(47, 3, '26191', 'Xã Thiện Tân', Type.xa), Level3(47, 3, '26194', 'Xã Tân Bình', Type.xa), - Level3(47, 3, '26197', 'Xã Bình Hòa', Type.xa), Level3(47, 3, '26200', 'Xã Mã Đà', Type.xa), - Level3(47, 3, '26203', 'Xã Hiếu Liêm', Type.xa), ]), Level2(47, '736', 'Huyện Định Quán', Type.huyen, [ Level3(47, 4, '26206', 'Thị trấn Định Quán', Type.thiTran), @@ -10456,11 +10345,8 @@ const level1s = [ Level2(51, '815', 'Thành phố Mỹ Tho', Type.tp, [ Level3(51, 0, '28249', 'Phường 5', Type.phuong), Level3(51, 0, '28252', 'Phường 4', Type.phuong), - Level3(51, 0, '28255', 'Phường 7', Type.phuong), - Level3(51, 0, '28258', 'Phường 3', Type.phuong), Level3(51, 0, '28261', 'Phường 1', Type.phuong), Level3(51, 0, '28264', 'Phường 2', Type.phuong), - Level3(51, 0, '28267', 'Phường 8', Type.phuong), Level3(51, 0, '28270', 'Phường 6', Type.phuong), Level3(51, 0, '28273', 'Phường 9', Type.phuong), Level3(51, 0, '28276', 'Phường 10', Type.phuong), @@ -10472,16 +10358,14 @@ const level1s = [ Level3(51, 0, '28567', 'Xã Phước Thạnh', Type.xa), Level3(51, 0, '28591', 'Xã Thới Sơn', Type.xa), ]), - Level2(51, '816', 'Thị xã Gò Công', Type.thiXa, [ - Level3(51, 1, '28294', 'Phường 3', Type.phuong), + Level2(51, '816', 'Thành phố Gò Công', Type.tp, [ Level3(51, 1, '28297', 'Phường 2', Type.phuong), - Level3(51, 1, '28300', 'Phường 4', Type.phuong), - Level3(51, 1, '28303', 'Phường 1', Type.phuong), + Level3(51, 1, '28300', 'Phường 1', Type.phuong), Level3(51, 1, '28306', 'Phường 5', Type.phuong), - Level3(51, 1, '28309', 'Xã Long Hưng', Type.xa), - Level3(51, 1, '28312', 'Xã Long Thuận', Type.xa), - Level3(51, 1, '28315', 'Xã Long Chánh', Type.xa), - Level3(51, 1, '28318', 'Xã Long Hòa', Type.xa), + Level3(51, 1, '28309', 'Phường Long Hưng', Type.phuong), + Level3(51, 1, '28312', 'Phường Long Thuận', Type.phuong), + Level3(51, 1, '28315', 'Phường Long Chánh', Type.phuong), + Level3(51, 1, '28318', 'Phường Long Hòa', Type.phuong), Level3(51, 1, '28708', 'Xã Bình Đông', Type.xa), Level3(51, 1, '28717', 'Xã Bình Xuân', Type.xa), Level3(51, 1, '28729', 'Xã Tân Trung', Type.xa), @@ -10568,15 +10452,12 @@ const level1s = [ Level3(51, 6, '28522', 'Xã Tân Hội Đông', Type.xa), Level3(51, 6, '28525', 'Xã Tân Hương', Type.xa), Level3(51, 6, '28528', 'Xã Tân Lý Đông', Type.xa), - Level3(51, 6, '28531', 'Xã Tân Lý Tây', Type.xa), Level3(51, 6, '28534', 'Xã Thân Cửu Nghĩa', Type.xa), Level3(51, 6, '28537', 'Xã Tam Hiệp', Type.xa), Level3(51, 6, '28540', 'Xã Điềm Hy', Type.xa), Level3(51, 6, '28543', 'Xã Nhị Bình', Type.xa), - Level3(51, 6, '28546', 'Xã Dưỡng Điềm', Type.xa), Level3(51, 6, '28549', 'Xã Đông Hòa', Type.xa), Level3(51, 6, '28552', 'Xã Long Định', Type.xa), - Level3(51, 6, '28555', 'Xã Hữu Đạo', Type.xa), Level3(51, 6, '28558', 'Xã Long An', Type.xa), Level3(51, 6, '28561', 'Xã Long Hưng', Type.xa), Level3(51, 6, '28564', 'Xã Bình Trưng', Type.xa), @@ -10955,8 +10836,7 @@ const level1s = [ Level2(54, '855', 'Thành phố Vĩnh Long', Type.tp, [ Level3(54, 0, '29542', 'Phường 9', Type.phuong), Level3(54, 0, '29545', 'Phường 5', Type.phuong), - Level3(54, 0, '29548', 'Phường 1', Type.phuong), - Level3(54, 0, '29551', 'Phường 2', Type.phuong), + Level3(54, 0, '29551', 'Phường 1', Type.phuong), Level3(54, 0, '29554', 'Phường 4', Type.phuong), Level3(54, 0, '29557', 'Phường 3', Type.phuong), Level3(54, 0, '29560', 'Phường 8', Type.phuong), @@ -10966,7 +10846,6 @@ const level1s = [ Level3(54, 0, '29572', 'Phường Trường An', Type.phuong), ]), Level2(54, '857', 'Huyện Long Hồ', Type.huyen, [ - Level3(54, 1, '29575', 'Thị trấn Long Hồ', Type.thiTran), Level3(54, 1, '29578', 'Xã Đồng Phú', Type.xa), Level3(54, 1, '29581', 'Xã Bình Hòa Phước', Type.xa), Level3(54, 1, '29584', 'Xã Hòa Ninh', Type.xa), @@ -10975,7 +10854,7 @@ const level1s = [ Level3(54, 1, '29593', 'Xã Tân Hạnh', Type.xa), Level3(54, 1, '29596', 'Xã Phước Hậu', Type.xa), Level3(54, 1, '29599', 'Xã Long Phước', Type.xa), - Level3(54, 1, '29602', 'Xã Phú Đức', Type.xa), + Level3(54, 1, '29602', 'Thị trấn Long Hồ', Type.thiTran), Level3(54, 1, '29605', 'Xã Lộc Hòa', Type.xa), Level3(54, 1, '29608', 'Xã Long An', Type.xa), Level3(54, 1, '29611', 'Xã Phú Quới', Type.xa), @@ -11032,7 +10911,6 @@ const level1s = [ Level3(54, 4, '29749', 'Xã Tân Phú', Type.xa), Level3(54, 4, '29752', 'Xã Long Phú', Type.xa), Level3(54, 4, '29755', 'Xã Mỹ Thạnh Trung', Type.xa), - Level3(54, 4, '29758', 'Xã Tường Lộc', Type.xa), Level3(54, 4, '29761', 'Xã Loan Mỹ', Type.xa), Level3(54, 4, '29764', 'Xã Ngãi Tứ', Type.xa), Level3(54, 4, '29767', 'Xã Bình Ninh', Type.xa), @@ -11059,12 +10937,10 @@ const level1s = [ Level3(54, 6, '29845', 'Xã Vĩnh Xuân', Type.xa), Level3(54, 6, '29848', 'Xã Thuận Thới', Type.xa), Level3(54, 6, '29851', 'Xã Phú Thành', Type.xa), - Level3(54, 6, '29854', 'Xã Thiện Mỹ', Type.xa), Level3(54, 6, '29857', 'Xã Lục Sỹ Thành', Type.xa), Level3(54, 6, '29860', 'Xã Tích Thiện', Type.xa), ]), Level2(54, '863', 'Huyện Bình Tân', Type.huyen, [ - Level3(54, 7, '29773', 'Xã Tân Hưng', Type.xa), Level3(54, 7, '29776', 'Xã Tân Thành', Type.xa), Level3(54, 7, '29779', 'Xã Thành Trung', Type.xa), Level3(54, 7, '29782', 'Xã Tân An Thạnh', Type.xa), @@ -11606,10 +11482,7 @@ const level1s = [ Level3(58, 0, '31117', 'Phường Cái Khế', Type.phuong), Level3(58, 0, '31120', 'Phường An Hòa', Type.phuong), Level3(58, 0, '31123', 'Phường Thới Bình', Type.phuong), - Level3(58, 0, '31126', 'Phường An Nghiệp', Type.phuong), - Level3(58, 0, '31129', 'Phường An Cư', Type.phuong), Level3(58, 0, '31135', 'Phường Tân An', Type.phuong), - Level3(58, 0, '31141', 'Phường An Phú', Type.phuong), Level3(58, 0, '31144', 'Phường Xuân Khánh', Type.phuong), Level3(58, 0, '31147', 'Phường Hưng Lợi', Type.phuong), Level3(58, 0, '31149', 'Phường An Khánh', Type.phuong), @@ -11804,10 +11677,9 @@ const level1s = [ Level3(60, 0, '31504', 'Phường 8', Type.phuong), Level3(60, 0, '31507', 'Phường 6', Type.phuong), Level3(60, 0, '31510', 'Phường 2', Type.phuong), - Level3(60, 0, '31513', 'Phường 1', Type.phuong), Level3(60, 0, '31516', 'Phường 4', Type.phuong), Level3(60, 0, '31519', 'Phường 3', Type.phuong), - Level3(60, 0, '31522', 'Phường 9', Type.phuong), + Level3(60, 0, '31522', 'Phường 1', Type.phuong), Level3(60, 0, '31525', 'Phường 10', Type.phuong), ]), Level2(60, '942', 'Huyện Châu Thành', Type.huyen, [ diff --git a/transformers/dart-dvhcvn/pubspec.yaml b/transformers/dart-dvhcvn/pubspec.yaml index 30b1458..1815173 100644 --- a/transformers/dart-dvhcvn/pubspec.yaml +++ b/transformers/dart-dvhcvn/pubspec.yaml @@ -1,11 +1,11 @@ name: dvhcvn -version: 2.0.20230410 -description: "Three tiers of Vietnam's administrative units (last update: 10/04/2023)" +version: 2.0.20241101 +description: "Three tiers of Vietnam's administrative units (last update: 01/11/2024)" homepage: https://github.com/daohoangson/dvhcvn environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dev_dependencies: - lint: ^1.7.2 - test: + lint: ^2.3.0 + test: ^1.25.8 diff --git a/transformers/js-dvhcvn.sh b/transformers/js-dvhcvn.sh new file mode 100755 index 0000000..df5e915 --- /dev/null +++ b/transformers/js-dvhcvn.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -euo pipefail + +_dir=$(cd $(dirname $BASH_SOURCE[0]) && pwd) + +_dataDir="$_dir/../data" +_datePath="$_dataDir/date.txt" +_jsPath="$_dir/js-dvhcvn" +_packageJsonPath="$_jsPath/package.json" + +if [ ! -f $_datePath ]; then + echo "$_datePath does not exist!" >&2 + exit 1 +fi +_date=$(cat $_datePath) +_dateVersion=$(cat $_datePath | tr '/' " " | awk '{ for (i=NF; i>1; i--) printf("%s ",$i); print $1; }' | sed 's# ##g') + +_packageJson=$(cat $_packageJsonPath) +echo "$_packageJson" | + jq ".version = \"1.1.$_dateVersion\"" | + jq ".description = \"Three tiers of Vietnam's administrative units (last update: $_date)\"" | + tee $_packageJsonPath + +( + cd "$_jsPath" && + rm -rf ./lib && + npm install && + npm run build +) diff --git a/transformers/js-dvhcvn/bin/generate.spec.ts b/transformers/js-dvhcvn/bin/generate.spec.ts index 8d81516..a99b6c2 100644 --- a/transformers/js-dvhcvn/bin/generate.spec.ts +++ b/transformers/js-dvhcvn/bin/generate.spec.ts @@ -27,7 +27,7 @@ describe("generate", () => { }); it("should process level 1", () => { - processLevel1(0, { + processLevel1({}, 0, { level1_id: "01", name: "Thành phố Hà Nội", type: "Thành phố Trung ương", @@ -39,7 +39,7 @@ describe("generate", () => { }); it("should process level 2", () => { - processLevel2(0, 0, { + processLevel2({}, 0, 0, { level2_id: "001", name: "Quận Ba Đình", type: "Quận", @@ -103,12 +103,14 @@ describe("generate", () => { "new Level3(0, 0, '00001', 'Phường Phúc Xá', Type.phuong),\n" + "]),\n" + "]),\n" + - "];" + "];\n" + + "\n" + + 'export const parents: Record = {"001":"01","00001":"001"};' ); }); it("should handle name with single quote", () => { - processLevel1(0, { + processLevel1({}, 0, { level1_id: "foo", name: "Tỉnh Foo's", type: "Tỉnh", @@ -120,7 +122,7 @@ describe("generate", () => { }); it("should handle name with double quote", () => { - processLevel1(0, { + processLevel1({}, 0, { level1_id: "foo", name: 'Tỉnh Foo"bar', type: "Tỉnh", @@ -132,7 +134,7 @@ describe("generate", () => { }); it("should handle name with single and double quotes", () => { - processLevel1(0, { + processLevel1({}, 0, { level1_id: "foo", name: "Tỉnh 'Foo\"bar", type: "Tỉnh", @@ -145,7 +147,7 @@ describe("generate", () => { it("should handle invalid type", () => { const fn = () => - processLevel1(0, { + processLevel1({}, 0, { level1_id: "foo", name: "Bar Foo", type: "Bar", diff --git a/transformers/js-dvhcvn/bin/generate.ts b/transformers/js-dvhcvn/bin/generate.ts index ad3d5d7..9801e74 100644 --- a/transformers/js-dvhcvn/bin/generate.ts +++ b/transformers/js-dvhcvn/bin/generate.ts @@ -18,6 +18,8 @@ const types: { [key: string]: string } = { "Thị xã": "thi_xa", }; +type Parents = Record; + export function main(args: string[]): void { stdout.writeln("import { Level1, Level2, Level3, Type } from './model';"); stdout.writeln(); @@ -27,11 +29,18 @@ export function main(args: string[]): void { const txt = readFileSync(args[0], "utf8"); const json = JSON.parse(txt); const data = json.data as any[]; + const parents: Parents = {}; for (let i = 0; i < data.length; i++) { - processLevel1(i, data[i]); + processLevel1(parents, i, data[i]); } stdout.write("];"); + + stdout.write( + `\n\nexport const parents: Record = ${JSON.stringify( + parents + )};` + ); } function _getString(str: string): string { @@ -45,7 +54,11 @@ function _getType(str: string): string { throw new Error(`Type not found: ${str}`); } -export function processLevel1(level1Index: number, level1: any): void { +export function processLevel1( + parents: Parents, + level1Index: number, + level1: any +): void { const id = _getString(level1.level1_id); const name = _getString(level1.name); const type = _getType(level1.type); @@ -53,13 +66,16 @@ export function processLevel1(level1Index: number, level1: any): void { const level2s = level1.level2s as any[]; for (let i = 0; i < level2s.length; i++) { - processLevel2(level1Index, i, level2s[i]); + const level2 = level2s[i]; + parents[level2.level2_id] = level1.level1_id; + processLevel2(parents, level1Index, i, level2); } stdout.writeln("]),"); } export function processLevel2( + parents: Parents, level1Index: number, level2Index: number, level2: any @@ -71,6 +87,7 @@ export function processLevel2( const level3s = level2.level3s as any[]; for (const level3 of level3s) { + parents[level3.level3_id] = level2.level2_id; processLevel3(level1Index, level2Index, level3); } diff --git a/transformers/js-dvhcvn/package-lock.json b/transformers/js-dvhcvn/package-lock.json index d95f7ea..e39ad2d 100644 --- a/transformers/js-dvhcvn/package-lock.json +++ b/transformers/js-dvhcvn/package-lock.json @@ -1,12 +1,12 @@ { "name": "dvhcvn", - "version": "1.0.20230410", + "version": "1.1.20241101", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "dvhcvn", - "version": "1.0.20230410", + "version": "1.1.20241101", "license": "GPL-3.0", "devDependencies": { "@rollup/plugin-typescript": "^11.1.3", @@ -14,9 +14,9 @@ "@vitest/coverage-v8": "^0.34.5", "prettier": "^2.8.8", "rollup": "^3.29.3", - "ts-node": "^10.2.1", "tslib": "^2.6.2", - "typescript": "^4.3.5", + "tsx": "^4.7.2", + "typescript": "^5.3.3", "vitest": "^0.34.5" } }, @@ -39,23 +39,18 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, - "node_modules/@cspotcode/source-map-consumer": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", - "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz", - "integrity": "sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==", + "node_modules/@esbuild/aix-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", + "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", + "cpu": [ + "ppc64" + ], "dev": true, - "dependencies": { - "@cspotcode/source-map-consumer": "0.8.0" - }, + "optional": true, + "os": [ + "aix" + ], "engines": { "node": ">=12" } @@ -535,30 +530,6 @@ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true }, - "node_modules/@tsconfig/node10": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", - "dev": true - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", - "dev": true - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", - "dev": true - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", - "dev": true - }, "node_modules/@types/chai": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", @@ -782,12 +753,6 @@ "node": ">=0.4.0" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, "node_modules/assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -861,12 +826,6 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -896,15 +855,6 @@ "node": ">=6" } }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", @@ -955,9 +905,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -975,14 +925,26 @@ "dev": true }, "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, "engines": { "node": "*" } }, + "node_modules/get-tsconfig": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", + "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", + "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -1174,12 +1136,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -1309,9 +1265,9 @@ } }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -1368,6 +1324,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/rollup": { "version": "3.29.3", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", @@ -1521,68 +1486,421 @@ "node": ">=14.0.0" } }, - "node_modules/ts-node": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", - "integrity": "sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==", + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true + }, + "node_modules/tsx": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.2.tgz", + "integrity": "sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==", "dev": true, "dependencies": { - "@cspotcode/source-map-support": "0.6.1", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "yn": "3.1.1" + "esbuild": "~0.19.10", + "get-tsconfig": "^4.7.2" }, "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" + "tsx": "dist/cli.mjs" }, "engines": { - "node": ">=12.0.0" + "node": ">=18.0.0" }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } + "optionalDependencies": { + "fsevents": "~2.3.3" + } + }, + "node_modules/tsx/node_modules/@esbuild/android-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", + "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/android-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", + "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/android-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", + "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/darwin-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", + "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/darwin-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", + "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", + "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/freebsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", + "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" } }, - "node_modules/ts-node/node_modules/acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", + "node_modules/tsx/node_modules/@esbuild/linux-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", + "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", + "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", + "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-loong64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", + "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-mips64el": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", + "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", + "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-riscv64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", + "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-s390x": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", + "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "cpu": [ + "s390x" + ], "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", + "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/netbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", + "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/openbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", + "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/sunos-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", + "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/win32-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", + "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/win32-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", + "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/win32-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", + "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/esbuild": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", + "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", + "dev": true, + "hasInstallScript": true, "bin": { - "acorn": "bin/acorn" + "esbuild": "bin/esbuild" }, "engines": { - "node": ">=0.4.0" + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.19.12", + "@esbuild/android-arm": "0.19.12", + "@esbuild/android-arm64": "0.19.12", + "@esbuild/android-x64": "0.19.12", + "@esbuild/darwin-arm64": "0.19.12", + "@esbuild/darwin-x64": "0.19.12", + "@esbuild/freebsd-arm64": "0.19.12", + "@esbuild/freebsd-x64": "0.19.12", + "@esbuild/linux-arm": "0.19.12", + "@esbuild/linux-arm64": "0.19.12", + "@esbuild/linux-ia32": "0.19.12", + "@esbuild/linux-loong64": "0.19.12", + "@esbuild/linux-mips64el": "0.19.12", + "@esbuild/linux-ppc64": "0.19.12", + "@esbuild/linux-riscv64": "0.19.12", + "@esbuild/linux-s390x": "0.19.12", + "@esbuild/linux-x64": "0.19.12", + "@esbuild/netbsd-x64": "0.19.12", + "@esbuild/openbsd-x64": "0.19.12", + "@esbuild/sunos-x64": "0.19.12", + "@esbuild/win32-arm64": "0.19.12", + "@esbuild/win32-ia32": "0.19.12", + "@esbuild/win32-x64": "0.19.12" } }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -1593,16 +1911,16 @@ } }, "node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/ufo": { @@ -1626,9 +1944,9 @@ } }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -1820,15 +2138,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", @@ -1859,20 +2168,12 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, - "@cspotcode/source-map-consumer": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", - "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", - "dev": true - }, - "@cspotcode/source-map-support": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz", - "integrity": "sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==", + "@esbuild/aix-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", + "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", "dev": true, - "requires": { - "@cspotcode/source-map-consumer": "0.8.0" - } + "optional": true }, "@esbuild/android-arm": { "version": "0.18.20", @@ -2109,30 +2410,6 @@ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true }, - "@tsconfig/node10": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", - "dev": true - }, - "@tsconfig/node12": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", - "dev": true - }, - "@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", - "dev": true - }, - "@tsconfig/node16": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", - "dev": true - }, "@types/chai": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", @@ -2311,12 +2588,6 @@ "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, - "arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, "assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -2378,12 +2649,6 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, - "create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -2402,12 +2667,6 @@ "type-detect": "^4.0.0" } }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, "esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", @@ -2451,9 +2710,9 @@ "dev": true }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "optional": true }, @@ -2464,11 +2723,20 @@ "dev": true }, "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true }, + "get-tsconfig": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", + "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", + "dev": true, + "requires": { + "resolve-pkg-maps": "^1.0.0" + } + }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -2615,12 +2883,6 @@ "semver": "^7.5.3" } }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -2719,9 +2981,9 @@ } }, "postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { "nanoid": "^3.3.6", @@ -2746,6 +3008,12 @@ "supports-preserve-symlinks-flag": "^1.0.0" } }, + "resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true + }, "rollup": { "version": "3.29.3", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", @@ -2855,40 +3123,210 @@ "integrity": "sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==", "dev": true }, - "ts-node": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", - "integrity": "sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==", + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true + }, + "tsx": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.2.tgz", + "integrity": "sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==", "dev": true, "requires": { - "@cspotcode/source-map-support": "0.6.1", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "yn": "3.1.1" + "esbuild": "~0.19.10", + "fsevents": "~2.3.3", + "get-tsconfig": "^4.7.2" }, "dependencies": { - "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", - "dev": true + "@esbuild/android-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", + "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", + "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", + "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", + "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", + "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", + "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", + "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", + "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", + "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", + "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", + "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", + "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", + "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", + "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", + "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", + "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", + "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", + "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", + "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", + "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", + "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", + "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", + "dev": true, + "optional": true + }, + "esbuild": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", + "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", + "dev": true, + "requires": { + "@esbuild/aix-ppc64": "0.19.12", + "@esbuild/android-arm": "0.19.12", + "@esbuild/android-arm64": "0.19.12", + "@esbuild/android-x64": "0.19.12", + "@esbuild/darwin-arm64": "0.19.12", + "@esbuild/darwin-x64": "0.19.12", + "@esbuild/freebsd-arm64": "0.19.12", + "@esbuild/freebsd-x64": "0.19.12", + "@esbuild/linux-arm": "0.19.12", + "@esbuild/linux-arm64": "0.19.12", + "@esbuild/linux-ia32": "0.19.12", + "@esbuild/linux-loong64": "0.19.12", + "@esbuild/linux-mips64el": "0.19.12", + "@esbuild/linux-ppc64": "0.19.12", + "@esbuild/linux-riscv64": "0.19.12", + "@esbuild/linux-s390x": "0.19.12", + "@esbuild/linux-x64": "0.19.12", + "@esbuild/netbsd-x64": "0.19.12", + "@esbuild/openbsd-x64": "0.19.12", + "@esbuild/sunos-x64": "0.19.12", + "@esbuild/win32-arm64": "0.19.12", + "@esbuild/win32-ia32": "0.19.12", + "@esbuild/win32-x64": "0.19.12" + } } } }, - "tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -2896,9 +3334,9 @@ "dev": true }, "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true }, "ufo": { @@ -2919,9 +3357,9 @@ } }, "vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "requires": { "esbuild": "^0.18.10", @@ -3006,12 +3444,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true - }, "yocto-queue": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", diff --git a/transformers/js-dvhcvn/package.json b/transformers/js-dvhcvn/package.json index 019e3cc..6715751 100644 --- a/transformers/js-dvhcvn/package.json +++ b/transformers/js-dvhcvn/package.json @@ -1,7 +1,7 @@ { "name": "dvhcvn", - "version": "1.0.20230410", - "description": "Three tiers of Vietnam's administrative units (last update: 01/07/2021)", + "version": "1.1.20241101", + "description": "Three tiers of Vietnam's administrative units (last update: 01/11/2024)", "files": [ "lib/*" ], @@ -11,10 +11,8 @@ "build": "rollup -c", "prebuild": "npm run generate", "format": "prettier --write '**/*.{js,json,ts}'", - "generate": "ts-node bin/generate.ts ../../data/dvhcvn.json > src/data.ts", - "postgenerate": "npm run format", - "prepare": "npm run build", - "prepublishOnly": "npm test", + "generate": "tsx bin/generate.ts ../../data/dvhcvn.json > src/data.ts", + "postgenerate": "npm run format && npm run test:coverage", "test": "vitest", "test:coverage": "vitest --coverage --no-watch" }, @@ -40,9 +38,9 @@ "@vitest/coverage-v8": "^0.34.5", "prettier": "^2.8.8", "rollup": "^3.29.3", - "ts-node": "^10.2.1", "tslib": "^2.6.2", - "typescript": "^4.3.5", + "tsx": "^4.7.2", + "typescript": "^5.3.3", "vitest": "^0.34.5" } } diff --git a/transformers/js-dvhcvn/rollup.config.mjs b/transformers/js-dvhcvn/rollup.config.mjs index c277d69..5b702b8 100644 --- a/transformers/js-dvhcvn/rollup.config.mjs +++ b/transformers/js-dvhcvn/rollup.config.mjs @@ -5,7 +5,9 @@ import typescript from "@rollup/plugin-typescript"; /** @type {import("rollup").RollupOptions} */ export default { input: "src/index.ts", - plugins: [typescript()], + plugins: [typescript({ + exclude: ["bin/**"], + })], output: { file: "lib/index.js", format: "cjs", diff --git a/transformers/js-dvhcvn/src/data.spec.ts b/transformers/js-dvhcvn/src/data.spec.ts index 7fa1d9c..9c58a1e 100644 --- a/transformers/js-dvhcvn/src/data.spec.ts +++ b/transformers/js-dvhcvn/src/data.spec.ts @@ -5,6 +5,23 @@ test("level1s is not empty", () => { expect(dvhcvn.level1s.length).toBeGreaterThan(0); }); +describe("findByLevel", () => { + test("returns level 1", () => { + const level1 = dvhcvn.findById("01"); + expect(level1?.name).toBe("Thành phố Hà Nội"); + }); + + test("returns level 2", () => { + const level2 = dvhcvn.findById("001"); + expect(level2?.name).toBe("Quận Ba Đình"); + }); + + test("returns level 3", () => { + const level3 = dvhcvn.findById("00001"); + expect(level3?.name).toBe("Phường Phúc Xá"); + }); +}); + test("findLevel1ById returns", () => { const level1 = dvhcvn.findLevel1ById("01"); expect(level1?.name).toBe("Thành phố Hà Nội"); diff --git a/transformers/js-dvhcvn/src/data.ts b/transformers/js-dvhcvn/src/data.ts index 811208d..c426da9 100644 --- a/transformers/js-dvhcvn/src/data.ts +++ b/transformers/js-dvhcvn/src/data.ts @@ -1307,12 +1307,11 @@ export const level1s = [ new Level3(4, 6, "02584", "Xã Quyết Thắng", Type.xa), new Level3(4, 6, "02587", "Xã Đồng Quý", Type.xa), new Level3(4, 6, "02590", "Xã Tân Thanh", Type.xa), - new Level3(4, 6, "02593", "Xã Vân Sơn", Type.xa), new Level3(4, 6, "02596", "Xã Văn Phú", Type.xa), new Level3(4, 6, "02599", "Xã Chi Thiết", Type.xa), new Level3(4, 6, "02602", "Xã Đông Lợi", Type.xa), new Level3(4, 6, "02605", "Xã Thiện Kế", Type.xa), - new Level3(4, 6, "02608", "Xã Hồng Lạc", Type.xa), + new Level3(4, 6, "02608", "Xã Hồng Sơn", Type.xa), new Level3(4, 6, "02611", "Xã Phú Lương", Type.xa), new Level3(4, 6, "02614", "Xã Ninh Lai", Type.xa), new Level3(4, 6, "02617", "Xã Đại Phú", Type.xa), @@ -1405,7 +1404,6 @@ export const level1s = [ new Level3(5, 4, "02863", "Xã Hoàng Thu Phố", Type.xa), new Level3(5, 4, "02866", "Xã Bản Phố", Type.xa), new Level3(5, 4, "02869", "Xã Bản Liền", Type.xa), - new Level3(5, 4, "02872", "Xã Tà Chải", Type.xa), new Level3(5, 4, "02875", "Xã Na Hối", Type.xa), new Level3(5, 4, "02878", "Xã Cốc Ly", Type.xa), new Level3(5, 4, "02881", "Xã Nậm Mòn", Type.xa), @@ -2799,7 +2797,6 @@ export const level1s = [ new Level3(13, 0, "06673", "Phường Bãi Cháy", Type.phuong), new Level3(13, 0, "06676", "Phường Cao Thắng", Type.phuong), new Level3(13, 0, "06679", "Phường Hùng Thắng", Type.phuong), - new Level3(13, 0, "06682", "Phường Yết Kiêu", Type.phuong), new Level3(13, 0, "06685", "Phường Trần Hưng Đạo", Type.phuong), new Level3(13, 0, "06688", "Phường Hồng Hải", Type.phuong), new Level3(13, 0, "06691", "Phường Hồng Gai", Type.phuong), @@ -2826,7 +2823,6 @@ export const level1s = [ new Level3(13, 1, "06709", "Phường Ka Long", Type.phuong), new Level3(13, 1, "06712", "Phường Trần Phú", Type.phuong), new Level3(13, 1, "06715", "Phường Ninh Dương", Type.phuong), - new Level3(13, 1, "06718", "Phường Hoà Lạc", Type.phuong), new Level3(13, 1, "06721", "Phường Trà Cổ", Type.phuong), new Level3(13, 1, "06724", "Xã Hải Sơn", Type.xa), new Level3(13, 1, "06727", "Xã Bắc Sơn", Type.xa), @@ -2855,8 +2851,7 @@ export const level1s = [ new Level3(13, 2, "06790", "Phường Cẩm Thành", Type.phuong), new Level3(13, 2, "06793", "Phường Cẩm Trung", Type.phuong), new Level3(13, 2, "06796", "Phường Cẩm Bình", Type.phuong), - new Level3(13, 2, "06799", "Xã Cộng Hòa", Type.xa), - new Level3(13, 2, "06802", "Xã Cẩm Hải", Type.xa), + new Level3(13, 2, "06799", "Xã Hải Hòa", Type.xa), new Level3(13, 2, "06805", "Xã Dương Huy", Type.xa), ]), new Level2(13, "196", "Thành phố Uông Bí", Type.tp, [ @@ -2923,9 +2918,8 @@ export const level1s = [ new Level3(13, 8, "06976", "Xã Thanh Lâm", Type.xa), new Level3(13, 8, "06979", "Xã Đạp Thanh", Type.xa), new Level3(13, 8, "06982", "Xã Nam Sơn", Type.xa), - new Level3(13, 8, "06985", "Xã Lương Mông", Type.xa), + new Level3(13, 8, "06985", "Xã Lương Minh", Type.xa), new Level3(13, 8, "06988", "Xã Đồn Đạc", Type.xa), - new Level3(13, 8, "06991", "Xã Minh Cầm", Type.xa), ]), new Level2(13, "203", "Huyện Vân Đồn", Type.huyen, [ new Level3(13, 9, "06994", "Thị trấn Cái Rồng", Type.thi_tran), @@ -2941,19 +2935,17 @@ export const level1s = [ new Level3(13, 9, "07024", "Xã Quan Lạn", Type.xa), new Level3(13, 9, "07027", "Xã Ngọc Vừng", Type.xa), ]), - new Level2(13, "205", "Thị xã Đông Triều", Type.thi_xa, [ + new Level2(13, "205", "Thành phố Đông Triều", Type.tp, [ new Level3(13, 10, "07069", "Phường Mạo Khê", Type.phuong), - new Level3(13, 10, "07072", "Phường Đông Triều", Type.phuong), new Level3(13, 10, "07075", "Xã An Sinh", Type.xa), new Level3(13, 10, "07078", "Xã Tràng Lương", Type.xa), - new Level3(13, 10, "07081", "Xã Bình Khê", Type.xa), + new Level3(13, 10, "07081", "Phường Bình Khê", Type.phuong), new Level3(13, 10, "07084", "Xã Việt Dân", Type.xa), - new Level3(13, 10, "07087", "Xã Tân Việt", Type.xa), - new Level3(13, 10, "07090", "Xã Bình Dương", Type.xa), + new Level3(13, 10, "07090", "Phường Bình Dương", Type.phuong), new Level3(13, 10, "07093", "Phường Đức Chính", Type.phuong), new Level3(13, 10, "07096", "Phường Tràng An", Type.phuong), new Level3(13, 10, "07099", "Xã Nguyễn Huệ", Type.xa), - new Level3(13, 10, "07102", "Xã Thủy An", Type.xa), + new Level3(13, 10, "07102", "Phường Thủy An", Type.phuong), new Level3(13, 10, "07105", "Phường Xuân Sơn", Type.phuong), new Level3(13, 10, "07108", "Xã Hồng Thái Tây", Type.xa), new Level3(13, 10, "07111", "Xã Hồng Thái Đông", Type.xa), @@ -2962,7 +2954,7 @@ export const level1s = [ new Level3(13, 10, "07120", "Phường Hồng Phong", Type.phuong), new Level3(13, 10, "07123", "Phường Kim Sơn", Type.phuong), new Level3(13, 10, "07126", "Phường Hưng Đạo", Type.phuong), - new Level3(13, 10, "07129", "Xã Yên Đức", Type.xa), + new Level3(13, 10, "07129", "Phường Yên Đức", Type.phuong), ]), new Level2(13, "206", "Thị xã Quảng Yên", Type.thi_xa, [ new Level3(13, 11, "07132", "Phường Quảng Yên", Type.phuong), @@ -3175,24 +3167,24 @@ export const level1s = [ new Level3(14, 7, "07747", "Xã Đồng Việt", Type.xa), new Level3(14, 7, "07750", "Xã Đồng Phúc", Type.xa), ]), - new Level2(14, "222", "Huyện Việt Yên", Type.huyen, [ + new Level2(14, "222", "Thị Xã Việt Yên", Type.thi_xa, [ new Level3(14, 8, "07759", "Xã Thượng Lan", Type.xa), new Level3(14, 8, "07762", "Xã Việt Tiến", Type.xa), new Level3(14, 8, "07765", "Xã Nghĩa Trung", Type.xa), new Level3(14, 8, "07768", "Xã Minh Đức", Type.xa), new Level3(14, 8, "07771", "Xã Hương Mai", Type.xa), - new Level3(14, 8, "07774", "Xã Tự Lạn", Type.xa), - new Level3(14, 8, "07777", "Thị trấn Bích Động", Type.thi_tran), + new Level3(14, 8, "07774", "Phường Tự Lạn", Type.phuong), + new Level3(14, 8, "07777", "Phường Bích Động", Type.phuong), new Level3(14, 8, "07780", "Xã Trung Sơn", Type.xa), - new Level3(14, 8, "07783", "Xã Hồng Thái", Type.xa), + new Level3(14, 8, "07783", "Phường Hồng Thái", Type.phuong), new Level3(14, 8, "07786", "Xã Tiên Sơn", Type.xa), - new Level3(14, 8, "07789", "Xã Tăng Tiến", Type.xa), - new Level3(14, 8, "07792", "Xã Quảng Minh", Type.xa), - new Level3(14, 8, "07795", "Thị trấn Nếnh", Type.thi_tran), - new Level3(14, 8, "07798", "Xã Ninh Sơn", Type.xa), - new Level3(14, 8, "07801", "Xã Vân Trung", Type.xa), + new Level3(14, 8, "07789", "Phường Tăng Tiến", Type.phuong), + new Level3(14, 8, "07792", "Phường Quảng Minh", Type.phuong), + new Level3(14, 8, "07795", "Phường Nếnh", Type.phuong), + new Level3(14, 8, "07798", "Phường Ninh Sơn", Type.phuong), + new Level3(14, 8, "07801", "Phường Vân Trung", Type.phuong), new Level3(14, 8, "07804", "Xã Vân Hà", Type.xa), - new Level3(14, 8, "07807", "Xã Quang Châu", Type.xa), + new Level3(14, 8, "07807", "Phường Quang Châu", Type.phuong), ]), new Level2(14, "223", "Huyện Hiệp Hòa", Type.huyen, [ new Level3(14, 9, "07813", "Xã Đồng Tân", Type.xa), @@ -4517,26 +4509,22 @@ export const level1s = [ new Level3(21, 1, "12547", "Xã An Vũ", Type.xa), new Level3(21, 1, "12550", "Xã An Lễ", Type.xa), new Level3(21, 1, "12553", "Xã Quỳnh Hưng", Type.xa), - new Level3(21, 1, "12556", "Xã Quỳnh Bảo", Type.xa), new Level3(21, 1, "12559", "Xã An Mỹ", Type.xa), new Level3(21, 1, "12562", "Xã Quỳnh Nguyên", Type.xa), new Level3(21, 1, "12565", "Xã An Vinh", Type.xa), - new Level3(21, 1, "12568", "Xã Quỳnh Xá", Type.xa), new Level3(21, 1, "12571", "Xã An Dục", Type.xa), new Level3(21, 1, "12574", "Xã Đông Hải", Type.xa), - new Level3(21, 1, "12577", "Xã Quỳnh Trang", Type.xa), + new Level3(21, 1, "12577", "Xã Trang Bảo Xá", Type.xa), new Level3(21, 1, "12580", "Xã An Tràng", Type.xa), new Level3(21, 1, "12583", "Xã Đồng Tiến", Type.xa), ]), new Level2(21, "339", "Huyện Hưng Hà", Type.huyen, [ new Level3(21, 2, "12586", "Thị trấn Hưng Hà", Type.thi_tran), - new Level3(21, 2, "12589", "Xã Điệp Nông", Type.xa), + new Level3(21, 2, "12589", "Xã Quang Trung", Type.xa), new Level3(21, 2, "12592", "Xã Tân Lễ", Type.xa), new Level3(21, 2, "12595", "Xã Cộng Hòa", Type.xa), - new Level3(21, 2, "12598", "Xã Dân Chủ", Type.xa), new Level3(21, 2, "12601", "Xã Canh Tân", Type.xa), new Level3(21, 2, "12604", "Xã Hòa Tiến", Type.xa), - new Level3(21, 2, "12607", "Xã Hùng Dũng", Type.xa), new Level3(21, 2, "12610", "Xã Tân Tiến", Type.xa), new Level3(21, 2, "12613", "Thị trấn Hưng Nhân", Type.thi_tran), new Level3(21, 2, "12616", "Xã Đoan Hùng", Type.xa), @@ -4567,10 +4555,8 @@ export const level1s = [ ]), new Level2(21, "340", "Huyện Đông Hưng", Type.huyen, [ new Level3(21, 3, "12688", "Thị trấn Đông Hưng", Type.thi_tran), - new Level3(21, 3, "12691", "Xã Đô Lương", Type.xa), new Level3(21, 3, "12694", "Xã Đông Phương", Type.xa), - new Level3(21, 3, "12697", "Xã Liên Giang", Type.xa), - new Level3(21, 3, "12700", "Xã An Châu", Type.xa), + new Level3(21, 3, "12700", "Xã Liên An Đô", Type.xa), new Level3(21, 3, "12703", "Xã Đông Sơn", Type.xa), new Level3(21, 3, "12706", "Xã Đông Cường", Type.xa), new Level3(21, 3, "12709", "Xã Phú Lương", Type.xa), @@ -4579,10 +4565,8 @@ export const level1s = [ new Level3(21, 3, "12718", "Xã Đông La", Type.xa), new Level3(21, 3, "12721", "Xã Minh Tân", Type.xa), new Level3(21, 3, "12724", "Xã Đông Xá", Type.xa), - new Level3(21, 3, "12727", "Xã Chương Dương", Type.xa), new Level3(21, 3, "12730", "Xã Nguyên Xá", Type.xa), - new Level3(21, 3, "12733", "Xã Phong Châu", Type.xa), - new Level3(21, 3, "12736", "Xã Hợp Tiến", Type.xa), + new Level3(21, 3, "12736", "Xã Phong Dương Tiến", Type.xa), new Level3(21, 3, "12739", "Xã Hồng Việt", Type.xa), new Level3(21, 3, "12745", "Xã Hà Giang", Type.xa), new Level3(21, 3, "12748", "Xã Đông Kinh", Type.xa), @@ -4593,13 +4577,11 @@ export const level1s = [ new Level3(21, 3, "12763", "Xã Liên Hoa", Type.xa), new Level3(21, 3, "12769", "Xã Đông Tân", Type.xa), new Level3(21, 3, "12772", "Xã Đông Vinh", Type.xa), - new Level3(21, 3, "12775", "Xã Đông Động", Type.xa), + new Level3(21, 3, "12775", "Xã Xuân Quang Động", Type.xa), new Level3(21, 3, "12778", "Xã Hồng Bạch", Type.xa), new Level3(21, 3, "12784", "Xã Trọng Quan", Type.xa), new Level3(21, 3, "12790", "Xã Hồng Giang", Type.xa), new Level3(21, 3, "12793", "Xã Đông Quan", Type.xa), - new Level3(21, 3, "12796", "Xã Đông Quang", Type.xa), - new Level3(21, 3, "12799", "Xã Đông Xuân", Type.xa), new Level3(21, 3, "12802", "Xã Đông Á", Type.xa), new Level3(21, 3, "12808", "Xã Đông Hoàng", Type.xa), new Level3(21, 3, "12811", "Xã Đông Dương", Type.xa), @@ -4647,30 +4629,26 @@ export const level1s = [ new Level3(21, 5, "12970", "Thị trấn Tiền Hải", Type.thi_tran), new Level3(21, 5, "12976", "Xã Đông Trà", Type.xa), new Level3(21, 5, "12979", "Xã Đông Long", Type.xa), - new Level3(21, 5, "12982", "Xã Đông Quí", Type.xa), new Level3(21, 5, "12985", "Xã Vũ Lăng", Type.xa), new Level3(21, 5, "12988", "Xã Đông Xuyên", Type.xa), new Level3(21, 5, "12991", "Xã Tây Lương", Type.xa), new Level3(21, 5, "12994", "Xã Tây Ninh", Type.xa), - new Level3(21, 5, "12997", "Xã Đông Trung", Type.xa), + new Level3(21, 5, "12997", "Xã Đông Quang", Type.xa), new Level3(21, 5, "13000", "Xã Đông Hoàng", Type.xa), new Level3(21, 5, "13003", "Xã Đông Minh", Type.xa), - new Level3(21, 5, "13009", "Xã Đông Phong", Type.xa), new Level3(21, 5, "13012", "Xã An Ninh", Type.xa), new Level3(21, 5, "13018", "Xã Đông Cơ", Type.xa), new Level3(21, 5, "13021", "Xã Tây Giang", Type.xa), new Level3(21, 5, "13024", "Xã Đông Lâm", Type.xa), new Level3(21, 5, "13027", "Xã Phương Công", Type.xa), - new Level3(21, 5, "13030", "Xã Tây Phong", Type.xa), - new Level3(21, 5, "13033", "Xã Tây Tiến", Type.xa), + new Level3(21, 5, "13030", "Xã Ái Quốc", Type.xa), new Level3(21, 5, "13036", "Xã Nam Cường", Type.xa), new Level3(21, 5, "13039", "Xã Vân Trường", Type.xa), - new Level3(21, 5, "13042", "Xã Nam Thắng", Type.xa), new Level3(21, 5, "13045", "Xã Nam Chính", Type.xa), new Level3(21, 5, "13048", "Xã Bắc Hải", Type.xa), new Level3(21, 5, "13051", "Xã Nam Thịnh", Type.xa), new Level3(21, 5, "13054", "Xã Nam Hà", Type.xa), - new Level3(21, 5, "13057", "Xã Nam Thanh", Type.xa), + new Level3(21, 5, "13057", "Xã Nam Tiến", Type.xa), new Level3(21, 5, "13060", "Xã Nam Trung", Type.xa), new Level3(21, 5, "13063", "Xã Nam Hồng", Type.xa), new Level3(21, 5, "13066", "Xã Nam Hưng", Type.xa), @@ -4688,9 +4666,7 @@ export const level1s = [ new Level3(21, 6, "13102", "Xã Lê Lợi", Type.xa), new Level3(21, 6, "13111", "Xã Vũ Lễ", Type.xa), new Level3(21, 6, "13114", "Xã Thanh Tân", Type.xa), - new Level3(21, 6, "13117", "Xã Thượng Hiền", Type.xa), - new Level3(21, 6, "13120", "Xã Nam Cao", Type.xa), - new Level3(21, 6, "13123", "Xã Đình Phùng", Type.xa), + new Level3(21, 6, "13120", "Xã Thống Nhất", Type.xa), new Level3(21, 6, "13126", "Xã Vũ Ninh", Type.xa), new Level3(21, 6, "13129", "Xã Vũ An", Type.xa), new Level3(21, 6, "13132", "Xã Quang Lịch", Type.xa), @@ -4699,13 +4675,11 @@ export const level1s = [ new Level3(21, 6, "13141", "Xã Vũ Quí", Type.xa), new Level3(21, 6, "13144", "Xã Quang Bình", Type.xa), new Level3(21, 6, "13150", "Xã Vũ Trung", Type.xa), - new Level3(21, 6, "13153", "Xã Vũ Thắng", Type.xa), new Level3(21, 6, "13156", "Xã Vũ Công", Type.xa), - new Level3(21, 6, "13159", "Xã Vũ Hòa", Type.xa), + new Level3(21, 6, "13159", "Xã Hồng Vũ", Type.xa), new Level3(21, 6, "13162", "Xã Quang Minh", Type.xa), new Level3(21, 6, "13165", "Xã Quang Trung", Type.xa), new Level3(21, 6, "13171", "Xã Minh Quang", Type.xa), - new Level3(21, 6, "13174", "Xã Vũ Bình", Type.xa), new Level3(21, 6, "13177", "Xã Minh Tân", Type.xa), new Level3(21, 6, "13180", "Xã Nam Bình", Type.xa), new Level3(21, 6, "13183", "Xã Bình Thanh", Type.xa), @@ -4870,250 +4844,197 @@ export const level1s = [ ]), new Level1("36", "Tỉnh Nam Định", Type.tinh, [ new Level2(23, "356", "Thành phố Nam Định", Type.tp, [ - new Level3(23, 0, "13633", "Phường Hạ Long", Type.phuong), - new Level3(23, 0, "13636", "Phường Trần Tế Xương", Type.phuong), - new Level3(23, 0, "13639", "Phường Vị Hoàng", Type.phuong), - new Level3(23, 0, "13642", "Phường Vị Xuyên", Type.phuong), - new Level3(23, 0, "13645", "Phường Quang Trung", Type.phuong), - new Level3(23, 0, "13648", "Phường Cửa Bắc", Type.phuong), - new Level3(23, 0, "13651", "Phường Nguyễn Du", Type.phuong), - new Level3(23, 0, "13654", "Phường Bà Triệu", Type.phuong), + new Level3(23, 0, "13636", "Phường Vị Xuyên", Type.phuong), new Level3(23, 0, "13657", "Phường Trường Thi", Type.phuong), - new Level3(23, 0, "13660", "Phường Phan Đình Phùng", Type.phuong), - new Level3(23, 0, "13663", "Phường Ngô Quyền", Type.phuong), new Level3(23, 0, "13666", "Phường Trần Hưng Đạo", Type.phuong), - new Level3(23, 0, "13669", "Phường Trần Đăng Ninh", Type.phuong), - new Level3(23, 0, "13672", "Phường Năng Tĩnh", Type.phuong), - new Level3(23, 0, "13675", "Phường Văn Miếu", Type.phuong), - new Level3(23, 0, "13678", "Phường Trần Quang Khải", Type.phuong), - new Level3(23, 0, "13681", "Phường Thống Nhất", Type.phuong), + new Level3(23, 0, "13669", "Phường Cửa Bắc", Type.phuong), + new Level3(23, 0, "13678", "Phường Năng Tĩnh", Type.phuong), + new Level3(23, 0, "13681", "Phường Quang Trung", Type.phuong), new Level3(23, 0, "13684", "Phường Lộc Hạ", Type.phuong), new Level3(23, 0, "13687", "Phường Lộc Vượng", Type.phuong), new Level3(23, 0, "13690", "Phường Cửa Nam", Type.phuong), new Level3(23, 0, "13693", "Phường Lộc Hòa", Type.phuong), - new Level3(23, 0, "13696", "Xã Nam Phong", Type.xa), + new Level3(23, 0, "13696", "Phường Nam Phong", Type.phuong), new Level3(23, 0, "13699", "Phường Mỹ Xá", Type.phuong), - new Level3(23, 0, "13702", "Xã Lộc An", Type.xa), - new Level3(23, 0, "13705", "Xã Nam Vân", Type.xa), - ]), - new Level2(23, "358", "Huyện Mỹ Lộc", Type.huyen, [ - new Level3(23, 1, "13708", "Thị trấn Mỹ Lộc", Type.thi_tran), - new Level3(23, 1, "13711", "Xã Mỹ Hà", Type.xa), - new Level3(23, 1, "13714", "Xã Mỹ Tiến", Type.xa), - new Level3(23, 1, "13717", "Xã Mỹ Thắng", Type.xa), - new Level3(23, 1, "13720", "Xã Mỹ Trung", Type.xa), - new Level3(23, 1, "13723", "Xã Mỹ Tân", Type.xa), - new Level3(23, 1, "13726", "Xã Mỹ Phúc", Type.xa), - new Level3(23, 1, "13729", "Xã Mỹ Hưng", Type.xa), - new Level3(23, 1, "13732", "Xã Mỹ Thuận", Type.xa), - new Level3(23, 1, "13735", "Xã Mỹ Thịnh", Type.xa), - new Level3(23, 1, "13738", "Xã Mỹ Thành", Type.xa), + new Level3(23, 0, "13705", "Phường Nam Vân", Type.phuong), + new Level3(23, 0, "13708", "Phường Hưng Lộc", Type.phuong), + new Level3(23, 0, "13711", "Xã Mỹ Hà", Type.xa), + new Level3(23, 0, "13717", "Xã Mỹ Thắng", Type.xa), + new Level3(23, 0, "13720", "Xã Mỹ Trung", Type.xa), + new Level3(23, 0, "13723", "Xã Mỹ Tân", Type.xa), + new Level3(23, 0, "13726", "Xã Mỹ Phúc", Type.xa), + new Level3(23, 0, "13732", "Xã Mỹ Thuận", Type.xa), + new Level3(23, 0, "13735", "Xã Mỹ Lộc", Type.xa), ]), new Level2(23, "359", "Huyện Vụ Bản", Type.huyen, [ - new Level3(23, 2, "13741", "Thị trấn Gôi", Type.thi_tran), - new Level3(23, 2, "13744", "Xã Minh Thuận", Type.xa), - new Level3(23, 2, "13747", "Xã Hiển Khánh", Type.xa), - new Level3(23, 2, "13750", "Xã Tân Khánh", Type.xa), - new Level3(23, 2, "13753", "Xã Hợp Hưng", Type.xa), - new Level3(23, 2, "13756", "Xã Đại An", Type.xa), - new Level3(23, 2, "13759", "Xã Tân Thành", Type.xa), - new Level3(23, 2, "13762", "Xã Cộng Hòa", Type.xa), - new Level3(23, 2, "13765", "Xã Trung Thành", Type.xa), - new Level3(23, 2, "13768", "Xã Quang Trung", Type.xa), - new Level3(23, 2, "13771", "Xã Minh Tân", Type.xa), - new Level3(23, 2, "13774", "Xã Liên Bảo", Type.xa), - new Level3(23, 2, "13777", "Xã Thành Lợi", Type.xa), - new Level3(23, 2, "13780", "Xã Kim Thái", Type.xa), - new Level3(23, 2, "13783", "Xã Liên Minh", Type.xa), - new Level3(23, 2, "13786", "Xã Đại Thắng", Type.xa), - new Level3(23, 2, "13789", "Xã Tam Thanh", Type.xa), - new Level3(23, 2, "13792", "Xã Vĩnh Hào", Type.xa), + new Level3(23, 1, "13741", "Thị trấn Gôi", Type.thi_tran), + new Level3(23, 1, "13747", "Xã Hiển Khánh", Type.xa), + new Level3(23, 1, "13750", "Xã Minh Tân", Type.xa), + new Level3(23, 1, "13753", "Xã Hợp Hưng", Type.xa), + new Level3(23, 1, "13756", "Xã Đại An", Type.xa), + new Level3(23, 1, "13762", "Xã Cộng Hòa", Type.xa), + new Level3(23, 1, "13765", "Xã Trung Thành", Type.xa), + new Level3(23, 1, "13768", "Xã Quang Trung", Type.xa), + new Level3(23, 1, "13777", "Xã Thành Lợi", Type.xa), + new Level3(23, 1, "13780", "Xã Kim Thái", Type.xa), + new Level3(23, 1, "13783", "Xã Liên Minh", Type.xa), + new Level3(23, 1, "13786", "Xã Đại Thắng", Type.xa), + new Level3(23, 1, "13789", "Xã Tam Thanh", Type.xa), + new Level3(23, 1, "13792", "Xã Vĩnh Hào", Type.xa), ]), new Level2(23, "360", "Huyện Ý Yên", Type.huyen, [ - new Level3(23, 3, "13795", "Thị trấn Lâm", Type.thi_tran), - new Level3(23, 3, "13798", "Xã Yên Trung", Type.xa), - new Level3(23, 3, "13801", "Xã Yên Thành", Type.xa), - new Level3(23, 3, "13804", "Xã Yên Tân", Type.xa), - new Level3(23, 3, "13807", "Xã Yên Lợi", Type.xa), - new Level3(23, 3, "13810", "Xã Yên Thọ", Type.xa), - new Level3(23, 3, "13813", "Xã Yên Nghĩa", Type.xa), - new Level3(23, 3, "13816", "Xã Yên Minh", Type.xa), - new Level3(23, 3, "13819", "Xã Yên Phương", Type.xa), - new Level3(23, 3, "13822", "Xã Yên Chính", Type.xa), - new Level3(23, 3, "13825", "Xã Yên Bình", Type.xa), - new Level3(23, 3, "13828", "Xã Yên Phú", Type.xa), - new Level3(23, 3, "13831", "Xã Yên Mỹ", Type.xa), - new Level3(23, 3, "13834", "Xã Yên Dương", Type.xa), - new Level3(23, 3, "13840", "Xã Yên Hưng", Type.xa), - new Level3(23, 3, "13843", "Xã Yên Khánh", Type.xa), - new Level3(23, 3, "13846", "Xã Yên Phong", Type.xa), - new Level3(23, 3, "13849", "Xã Yên Ninh", Type.xa), - new Level3(23, 3, "13852", "Xã Yên Lương", Type.xa), - new Level3(23, 3, "13855", "Xã Yên Hồng", Type.xa), - new Level3(23, 3, "13858", "Xã Yên Quang", Type.xa), - new Level3(23, 3, "13861", "Xã Yên Tiến", Type.xa), - new Level3(23, 3, "13864", "Xã Yên Thắng", Type.xa), - new Level3(23, 3, "13867", "Xã Yên Phúc", Type.xa), - new Level3(23, 3, "13870", "Xã Yên Cường", Type.xa), - new Level3(23, 3, "13873", "Xã Yên Lộc", Type.xa), - new Level3(23, 3, "13876", "Xã Yên Bằng", Type.xa), - new Level3(23, 3, "13879", "Xã Yên Đồng", Type.xa), - new Level3(23, 3, "13882", "Xã Yên Khang", Type.xa), - new Level3(23, 3, "13885", "Xã Yên Nhân", Type.xa), - new Level3(23, 3, "13888", "Xã Yên Trị", Type.xa), + new Level3(23, 2, "13795", "Thị trấn Lâm", Type.thi_tran), + new Level3(23, 2, "13801", "Xã Trung Nghĩa", Type.xa), + new Level3(23, 2, "13807", "Xã Tân Minh", Type.xa), + new Level3(23, 2, "13810", "Xã Yên Thọ", Type.xa), + new Level3(23, 2, "13819", "Xã Phú Hưng", Type.xa), + new Level3(23, 2, "13822", "Xã Yên Chính", Type.xa), + new Level3(23, 2, "13825", "Xã Yên Bình", Type.xa), + new Level3(23, 2, "13831", "Xã Yên Mỹ", Type.xa), + new Level3(23, 2, "13834", "Xã Yên Dương", Type.xa), + new Level3(23, 2, "13843", "Xã Yên Khánh", Type.xa), + new Level3(23, 2, "13846", "Xã Yên Phong", Type.xa), + new Level3(23, 2, "13849", "Xã Yên Ninh", Type.xa), + new Level3(23, 2, "13852", "Xã Yên Lương", Type.xa), + new Level3(23, 2, "13861", "Xã Yên Tiến", Type.xa), + new Level3(23, 2, "13864", "Xã Yên Thắng", Type.xa), + new Level3(23, 2, "13867", "Xã Yên Phúc", Type.xa), + new Level3(23, 2, "13870", "Xã Yên Cường", Type.xa), + new Level3(23, 2, "13873", "Xã Yên Lộc", Type.xa), + new Level3(23, 2, "13876", "Xã Hồng Quang", Type.xa), + new Level3(23, 2, "13879", "Xã Yên Đồng", Type.xa), + new Level3(23, 2, "13882", "Xã Yên Khang", Type.xa), + new Level3(23, 2, "13885", "Xã Yên Nhân", Type.xa), + new Level3(23, 2, "13888", "Xã Yên Trị", Type.xa), ]), new Level2(23, "361", "Huyện Nghĩa Hưng", Type.huyen, [ - new Level3(23, 4, "13891", "Thị trấn Liễu Đề", Type.thi_tran), - new Level3(23, 4, "13894", "Thị trấn Rạng Đông", Type.thi_tran), - new Level3(23, 4, "13897", "Xã Nghĩa Đồng", Type.xa), - new Level3(23, 4, "13900", "Xã Nghĩa Thịnh", Type.xa), - new Level3(23, 4, "13903", "Xã Nghĩa Minh", Type.xa), - new Level3(23, 4, "13906", "Xã Nghĩa Thái", Type.xa), - new Level3(23, 4, "13909", "Xã Hoàng Nam", Type.xa), - new Level3(23, 4, "13912", "Xã Nghĩa Châu", Type.xa), - new Level3(23, 4, "13915", "Xã Nghĩa Trung", Type.xa), - new Level3(23, 4, "13918", "Xã Nghĩa Sơn", Type.xa), - new Level3(23, 4, "13921", "Xã Nghĩa Lạc", Type.xa), - new Level3(23, 4, "13924", "Xã Nghĩa Hồng", Type.xa), - new Level3(23, 4, "13927", "Xã Nghĩa Phong", Type.xa), - new Level3(23, 4, "13930", "Xã Nghĩa Phú", Type.xa), - new Level3(23, 4, "13933", "Xã Nghĩa Bình", Type.xa), - new Level3(23, 4, "13936", "Thị trấn Quỹ Nhất", Type.thi_tran), - new Level3(23, 4, "13939", "Xã Nghĩa Tân", Type.xa), - new Level3(23, 4, "13942", "Xã Nghĩa Hùng", Type.xa), - new Level3(23, 4, "13945", "Xã Nghĩa Lâm", Type.xa), - new Level3(23, 4, "13948", "Xã Nghĩa Thành", Type.xa), - new Level3(23, 4, "13951", "Xã Phúc Thắng", Type.xa), - new Level3(23, 4, "13954", "Xã Nghĩa Lợi", Type.xa), - new Level3(23, 4, "13957", "Xã Nghĩa Hải", Type.xa), - new Level3(23, 4, "13963", "Xã Nam Điền", Type.xa), + new Level3(23, 3, "13891", "Thị trấn Liễu Đề", Type.thi_tran), + new Level3(23, 3, "13894", "Thị trấn Rạng Đông", Type.thi_tran), + new Level3(23, 3, "13900", "Xã Đồng Thịnh", Type.xa), + new Level3(23, 3, "13906", "Xã Nghĩa Thái", Type.xa), + new Level3(23, 3, "13909", "Xã Hoàng Nam", Type.xa), + new Level3(23, 3, "13912", "Xã Nghĩa Châu", Type.xa), + new Level3(23, 3, "13915", "Xã Nghĩa Trung", Type.xa), + new Level3(23, 3, "13918", "Xã Nghĩa Sơn", Type.xa), + new Level3(23, 3, "13921", "Xã Nghĩa Lạc", Type.xa), + new Level3(23, 3, "13924", "Xã Nghĩa Hồng", Type.xa), + new Level3(23, 3, "13927", "Xã Nghĩa Phong", Type.xa), + new Level3(23, 3, "13930", "Xã Nghĩa Phú", Type.xa), + new Level3(23, 3, "13939", "Thị trấn Quỹ Nhất", Type.thi_tran), + new Level3(23, 3, "13942", "Xã Nghĩa Hùng", Type.xa), + new Level3(23, 3, "13945", "Xã Nghĩa Lâm", Type.xa), + new Level3(23, 3, "13948", "Xã Nghĩa Thành", Type.xa), + new Level3(23, 3, "13951", "Xã Phúc Thắng", Type.xa), + new Level3(23, 3, "13954", "Xã Nghĩa Lợi", Type.xa), + new Level3(23, 3, "13957", "Xã Nghĩa Hải", Type.xa), + new Level3(23, 3, "13963", "Xã Nam Điền", Type.xa), ]), new Level2(23, "362", "Huyện Nam Trực", Type.huyen, [ - new Level3(23, 5, "13966", "Thị trấn Nam Giang", Type.thi_tran), - new Level3(23, 5, "13969", "Xã Nam Mỹ", Type.xa), - new Level3(23, 5, "13972", "Xã Điền Xá", Type.xa), - new Level3(23, 5, "13975", "Xã Nghĩa An", Type.xa), - new Level3(23, 5, "13978", "Xã Nam Thắng", Type.xa), - new Level3(23, 5, "13981", "Xã Nam Toàn", Type.xa), - new Level3(23, 5, "13984", "Xã Hồng Quang", Type.xa), - new Level3(23, 5, "13987", "Xã Tân Thịnh", Type.xa), - new Level3(23, 5, "13990", "Xã Nam Cường", Type.xa), - new Level3(23, 5, "13993", "Xã Nam Hồng", Type.xa), - new Level3(23, 5, "13996", "Xã Nam Hùng", Type.xa), - new Level3(23, 5, "13999", "Xã Nam Hoa", Type.xa), - new Level3(23, 5, "14002", "Xã Nam Dương", Type.xa), - new Level3(23, 5, "14005", "Xã Nam Thanh", Type.xa), - new Level3(23, 5, "14008", "Xã Nam Lợi", Type.xa), - new Level3(23, 5, "14011", "Xã Bình Minh", Type.xa), - new Level3(23, 5, "14014", "Xã Đồng Sơn", Type.xa), - new Level3(23, 5, "14017", "Xã Nam Tiến", Type.xa), - new Level3(23, 5, "14020", "Xã Nam Hải", Type.xa), - new Level3(23, 5, "14023", "Xã Nam Thái", Type.xa), + new Level3(23, 4, "13966", "Thị trấn Nam Giang", Type.thi_tran), + new Level3(23, 4, "13972", "Xã Nam Điền", Type.xa), + new Level3(23, 4, "13975", "Xã Nghĩa An", Type.xa), + new Level3(23, 4, "13978", "Xã Nam Thắng", Type.xa), + new Level3(23, 4, "13984", "Xã Hồng Quang", Type.xa), + new Level3(23, 4, "13987", "Xã Tân Thịnh", Type.xa), + new Level3(23, 4, "13990", "Xã Nam Cường", Type.xa), + new Level3(23, 4, "13993", "Xã Nam Hồng", Type.xa), + new Level3(23, 4, "13996", "Xã Nam Hùng", Type.xa), + new Level3(23, 4, "13999", "Xã Nam Hoa", Type.xa), + new Level3(23, 4, "14002", "Xã Nam Dương", Type.xa), + new Level3(23, 4, "14005", "Xã Nam Thanh", Type.xa), + new Level3(23, 4, "14008", "Xã Nam Lợi", Type.xa), + new Level3(23, 4, "14011", "Xã Bình Minh", Type.xa), + new Level3(23, 4, "14014", "Xã Đồng Sơn", Type.xa), + new Level3(23, 4, "14017", "Xã Nam Tiến", Type.xa), + new Level3(23, 4, "14020", "Xã Nam Hải", Type.xa), + new Level3(23, 4, "14023", "Xã Nam Thái", Type.xa), ]), new Level2(23, "363", "Huyện Trực Ninh", Type.huyen, [ - new Level3(23, 6, "14026", "Thị trấn Cổ Lễ", Type.thi_tran), - new Level3(23, 6, "14029", "Xã Phương Định", Type.xa), - new Level3(23, 6, "14032", "Xã Trực Chính", Type.xa), - new Level3(23, 6, "14035", "Xã Trung Đông", Type.xa), - new Level3(23, 6, "14038", "Xã Liêm Hải", Type.xa), - new Level3(23, 6, "14041", "Xã Trực Tuấn", Type.xa), - new Level3(23, 6, "14044", "Xã Việt Hùng", Type.xa), - new Level3(23, 6, "14047", "Xã Trực Đạo", Type.xa), - new Level3(23, 6, "14050", "Xã Trực Hưng", Type.xa), - new Level3(23, 6, "14053", "Xã Trực Nội", Type.xa), - new Level3(23, 6, "14056", "Thị trấn Cát Thành", Type.thi_tran), - new Level3(23, 6, "14059", "Xã Trực Thanh", Type.xa), - new Level3(23, 6, "14062", "Xã Trực Khang", Type.xa), - new Level3(23, 6, "14065", "Xã Trực Thuận", Type.xa), - new Level3(23, 6, "14068", "Xã Trực Mỹ", Type.xa), - new Level3(23, 6, "14071", "Xã Trực Đại", Type.xa), - new Level3(23, 6, "14074", "Xã Trực Cường", Type.xa), - new Level3(23, 6, "14077", "Thị trấn Ninh Cường", Type.thi_tran), - new Level3(23, 6, "14080", "Xã Trực Thái", Type.xa), - new Level3(23, 6, "14083", "Xã Trực Hùng", Type.xa), - new Level3(23, 6, "14086", "Xã Trực Thắng", Type.xa), + new Level3(23, 5, "14026", "Thị trấn Cổ Lễ", Type.thi_tran), + new Level3(23, 5, "14029", "Xã Phương Định", Type.xa), + new Level3(23, 5, "14032", "Xã Trực Chính", Type.xa), + new Level3(23, 5, "14035", "Xã Trung Đông", Type.xa), + new Level3(23, 5, "14038", "Xã Liêm Hải", Type.xa), + new Level3(23, 5, "14041", "Xã Trực Tuấn", Type.xa), + new Level3(23, 5, "14044", "Xã Việt Hùng", Type.xa), + new Level3(23, 5, "14047", "Xã Trực Đạo", Type.xa), + new Level3(23, 5, "14050", "Xã Trực Hưng", Type.xa), + new Level3(23, 5, "14053", "Xã Trực Nội", Type.xa), + new Level3(23, 5, "14056", "Thị trấn Cát Thành", Type.thi_tran), + new Level3(23, 5, "14059", "Xã Trực Thanh", Type.xa), + new Level3(23, 5, "14062", "Xã Trực Khang", Type.xa), + new Level3(23, 5, "14065", "Xã Trực Thuận", Type.xa), + new Level3(23, 5, "14068", "Xã Trực Mỹ", Type.xa), + new Level3(23, 5, "14071", "Xã Trực Đại", Type.xa), + new Level3(23, 5, "14074", "Xã Trực Cường", Type.xa), + new Level3(23, 5, "14077", "Thị trấn Ninh Cường", Type.thi_tran), + new Level3(23, 5, "14080", "Xã Trực Thái", Type.xa), + new Level3(23, 5, "14083", "Xã Trực Hùng", Type.xa), + new Level3(23, 5, "14086", "Xã Trực Thắng", Type.xa), ]), new Level2(23, "364", "Huyện Xuân Trường", Type.huyen, [ - new Level3(23, 7, "14089", "Thị trấn Xuân Trường", Type.thi_tran), - new Level3(23, 7, "14092", "Xã Xuân Châu", Type.xa), - new Level3(23, 7, "14095", "Xã Xuân Hồng", Type.xa), - new Level3(23, 7, "14098", "Xã Xuân Thành", Type.xa), - new Level3(23, 7, "14101", "Xã Xuân Thượng", Type.xa), - new Level3(23, 7, "14104", "Xã Xuân Phong", Type.xa), - new Level3(23, 7, "14107", "Xã Xuân Đài", Type.xa), - new Level3(23, 7, "14110", "Xã Xuân Tân", Type.xa), - new Level3(23, 7, "14113", "Xã Xuân Thủy", Type.xa), - new Level3(23, 7, "14116", "Xã Xuân Ngọc", Type.xa), - new Level3(23, 7, "14119", "Xã Xuân Bắc", Type.xa), - new Level3(23, 7, "14122", "Xã Xuân Phương", Type.xa), - new Level3(23, 7, "14125", "Xã Thọ Nghiệp", Type.xa), - new Level3(23, 7, "14128", "Xã Xuân Phú", Type.xa), - new Level3(23, 7, "14131", "Xã Xuân Trung", Type.xa), - new Level3(23, 7, "14134", "Xã Xuân Vinh", Type.xa), - new Level3(23, 7, "14137", "Xã Xuân Kiên", Type.xa), - new Level3(23, 7, "14140", "Xã Xuân Tiến", Type.xa), - new Level3(23, 7, "14143", "Xã Xuân Ninh", Type.xa), - new Level3(23, 7, "14146", "Xã Xuân Hòa", Type.xa), + new Level3(23, 6, "14089", "Thị trấn Xuân Trường", Type.thi_tran), + new Level3(23, 6, "14092", "Xã Xuân Châu", Type.xa), + new Level3(23, 6, "14095", "Xã Xuân Hồng", Type.xa), + new Level3(23, 6, "14098", "Xã Xuân Thành", Type.xa), + new Level3(23, 6, "14101", "Xã Xuân Thượng", Type.xa), + new Level3(23, 6, "14104", "Xã Xuân Giang", Type.xa), + new Level3(23, 6, "14110", "Xã Xuân Tân", Type.xa), + new Level3(23, 6, "14116", "Xã Xuân Ngọc", Type.xa), + new Level3(23, 6, "14122", "Xã Trà Lũ", Type.xa), + new Level3(23, 6, "14125", "Xã Thọ Nghiệp", Type.xa), + new Level3(23, 6, "14128", "Xã Xuân Phú", Type.xa), + new Level3(23, 6, "14134", "Xã Xuân Vinh", Type.xa), + new Level3(23, 6, "14143", "Xã Xuân Ninh", Type.xa), + new Level3(23, 6, "14146", "Xã Xuân Phúc", Type.xa), ]), new Level2(23, "365", "Huyện Giao Thủy", Type.huyen, [ - new Level3(23, 8, "14149", "Thị trấn Ngô Đồng", Type.thi_tran), - new Level3(23, 8, "14152", "Thị trấn Quất Lâm", Type.thi_tran), - new Level3(23, 8, "14155", "Xã Giao Hương", Type.xa), - new Level3(23, 8, "14158", "Xã Hồng Thuận", Type.xa), - new Level3(23, 8, "14161", "Xã Giao Thiện", Type.xa), - new Level3(23, 8, "14164", "Xã Giao Thanh", Type.xa), - new Level3(23, 8, "14167", "Xã Hoành Sơn", Type.xa), - new Level3(23, 8, "14170", "Xã Bình Hòa", Type.xa), - new Level3(23, 8, "14173", "Xã Giao Tiến", Type.xa), - new Level3(23, 8, "14176", "Xã Giao Hà", Type.xa), - new Level3(23, 8, "14179", "Xã Giao Nhân", Type.xa), - new Level3(23, 8, "14182", "Xã Giao An", Type.xa), - new Level3(23, 8, "14185", "Xã Giao Lạc", Type.xa), - new Level3(23, 8, "14188", "Xã Giao Châu", Type.xa), - new Level3(23, 8, "14191", "Xã Giao Tân", Type.xa), - new Level3(23, 8, "14194", "Xã Giao Yến", Type.xa), - new Level3(23, 8, "14197", "Xã Giao Xuân", Type.xa), - new Level3(23, 8, "14200", "Xã Giao Thịnh", Type.xa), - new Level3(23, 8, "14203", "Xã Giao Hải", Type.xa), - new Level3(23, 8, "14206", "Xã Bạch Long", Type.xa), - new Level3(23, 8, "14209", "Xã Giao Long", Type.xa), - new Level3(23, 8, "14212", "Xã Giao Phong", Type.xa), + new Level3(23, 7, "14152", "Thị trấn Quất Lâm", Type.thi_tran), + new Level3(23, 7, "14155", "Xã Giao Hương", Type.xa), + new Level3(23, 7, "14158", "Xã Hồng Thuận", Type.xa), + new Level3(23, 7, "14161", "Xã Giao Thiện", Type.xa), + new Level3(23, 7, "14164", "Xã Giao Thanh", Type.xa), + new Level3(23, 7, "14167", "Thị trấn Giao Thủy", Type.thi_tran), + new Level3(23, 7, "14170", "Xã Bình Hòa", Type.xa), + new Level3(23, 7, "14176", "Xã Giao Hà", Type.xa), + new Level3(23, 7, "14179", "Xã Giao Nhân", Type.xa), + new Level3(23, 7, "14182", "Xã Giao An", Type.xa), + new Level3(23, 7, "14185", "Xã Giao Lạc", Type.xa), + new Level3(23, 7, "14188", "Xã Giao Châu", Type.xa), + new Level3(23, 7, "14191", "Xã Giao Tân", Type.xa), + new Level3(23, 7, "14194", "Xã Giao Yến", Type.xa), + new Level3(23, 7, "14197", "Xã Giao Xuân", Type.xa), + new Level3(23, 7, "14200", "Xã Giao Thịnh", Type.xa), + new Level3(23, 7, "14203", "Xã Giao Hải", Type.xa), + new Level3(23, 7, "14206", "Xã Bạch Long", Type.xa), + new Level3(23, 7, "14209", "Xã Giao Long", Type.xa), + new Level3(23, 7, "14212", "Xã Giao Phong", Type.xa), ]), new Level2(23, "366", "Huyện Hải Hậu", Type.huyen, [ - new Level3(23, 9, "14215", "Thị trấn Yên Định", Type.thi_tran), - new Level3(23, 9, "14218", "Thị trấn Cồn", Type.thi_tran), - new Level3(23, 9, "14221", "Thị trấn Thịnh Long", Type.thi_tran), - new Level3(23, 9, "14224", "Xã Hải Nam", Type.xa), - new Level3(23, 9, "14227", "Xã Hải Trung", Type.xa), - new Level3(23, 9, "14230", "Xã Hải Vân", Type.xa), - new Level3(23, 9, "14233", "Xã Hải Minh", Type.xa), - new Level3(23, 9, "14236", "Xã Hải Anh", Type.xa), - new Level3(23, 9, "14239", "Xã Hải Hưng", Type.xa), - new Level3(23, 9, "14242", "Xã Hải Bắc", Type.xa), - new Level3(23, 9, "14245", "Xã Hải Phúc", Type.xa), - new Level3(23, 9, "14248", "Xã Hải Thanh", Type.xa), - new Level3(23, 9, "14251", "Xã Hải Hà", Type.xa), - new Level3(23, 9, "14254", "Xã Hải Long", Type.xa), - new Level3(23, 9, "14257", "Xã Hải Phương", Type.xa), - new Level3(23, 9, "14260", "Xã Hải Đường", Type.xa), - new Level3(23, 9, "14263", "Xã Hải Lộc", Type.xa), - new Level3(23, 9, "14266", "Xã Hải Quang", Type.xa), - new Level3(23, 9, "14269", "Xã Hải Đông", Type.xa), - new Level3(23, 9, "14272", "Xã Hải Sơn", Type.xa), - new Level3(23, 9, "14275", "Xã Hải Tân", Type.xa), - new Level3(23, 9, "14281", "Xã Hải Phong", Type.xa), - new Level3(23, 9, "14284", "Xã Hải An", Type.xa), - new Level3(23, 9, "14287", "Xã Hải Tây", Type.xa), - new Level3(23, 9, "14290", "Xã Hải Lý", Type.xa), - new Level3(23, 9, "14293", "Xã Hải Phú", Type.xa), - new Level3(23, 9, "14296", "Xã Hải Giang", Type.xa), - new Level3(23, 9, "14299", "Xã Hải Cường", Type.xa), - new Level3(23, 9, "14302", "Xã Hải Ninh", Type.xa), - new Level3(23, 9, "14305", "Xã Hải Chính", Type.xa), - new Level3(23, 9, "14308", "Xã Hải Xuân", Type.xa), - new Level3(23, 9, "14311", "Xã Hải Châu", Type.xa), - new Level3(23, 9, "14314", "Xã Hải Triều", Type.xa), - new Level3(23, 9, "14317", "Xã Hải Hòa", Type.xa), + new Level3(23, 8, "14215", "Thị trấn Yên Định", Type.thi_tran), + new Level3(23, 8, "14218", "Thị trấn Cồn", Type.thi_tran), + new Level3(23, 8, "14221", "Thị trấn Thịnh Long", Type.thi_tran), + new Level3(23, 8, "14224", "Xã Hải Nam", Type.xa), + new Level3(23, 8, "14227", "Xã Hải Trung", Type.xa), + new Level3(23, 8, "14233", "Xã Hải Minh", Type.xa), + new Level3(23, 8, "14236", "Xã Hải Anh", Type.xa), + new Level3(23, 8, "14248", "Xã Hải Hưng", Type.xa), + new Level3(23, 8, "14254", "Xã Hải Long", Type.xa), + new Level3(23, 8, "14260", "Xã Hải Đường", Type.xa), + new Level3(23, 8, "14263", "Xã Hải Lộc", Type.xa), + new Level3(23, 8, "14266", "Xã Hải Quang", Type.xa), + new Level3(23, 8, "14269", "Xã Hải Đông", Type.xa), + new Level3(23, 8, "14272", "Xã Hải Sơn", Type.xa), + new Level3(23, 8, "14275", "Xã Hải Tân", Type.xa), + new Level3(23, 8, "14281", "Xã Hải Phong", Type.xa), + new Level3(23, 8, "14284", "Xã Hải An", Type.xa), + new Level3(23, 8, "14287", "Xã Hải Tây", Type.xa), + new Level3(23, 8, "14293", "Xã Hải Phú", Type.xa), + new Level3(23, 8, "14296", "Xã Hải Giang", Type.xa), + new Level3(23, 8, "14302", "Xã Hải Ninh", Type.xa), + new Level3(23, 8, "14308", "Xã Hải Xuân", Type.xa), + new Level3(23, 8, "14311", "Xã Hải Châu", Type.xa), + new Level3(23, 8, "14317", "Xã Hải Hòa", Type.xa), ]), ]), new Level1("37", "Tỉnh Ninh Bình", Type.tinh, [ @@ -5639,7 +5560,6 @@ export const level1s = [ new Level3(25, 17, "15781", "Xã Thiệu Phúc", Type.xa), new Level3(25, 17, "15784", "Xã Thiệu Tiến", Type.xa), new Level3(25, 17, "15787", "Xã Thiệu Công", Type.xa), - new Level3(25, 17, "15790", "Xã Thiệu Phú", Type.xa), new Level3(25, 17, "15793", "Xã Thiệu Long", Type.xa), new Level3(25, 17, "15796", "Xã Thiệu Giang", Type.xa), new Level3(25, 17, "15799", "Xã Thiệu Duy", Type.xa), @@ -5651,7 +5571,7 @@ export const level1s = [ new Level3(25, 17, "15817", "Xã Thiệu Toán", Type.xa), new Level3(25, 17, "15820", "Xã Thiệu Chính", Type.xa), new Level3(25, 17, "15823", "Xã Thiệu Hòa", Type.xa), - new Level3(25, 17, "15829", "Xã Minh Tâm", Type.xa), + new Level3(25, 17, "15829", "Thị trấn Hậu Hiền", Type.thi_tran), new Level3(25, 17, "15832", "Xã Thiệu Viên", Type.xa), new Level3(25, 17, "15835", "Xã Thiệu Lý", Type.xa), new Level3(25, 17, "15838", "Xã Thiệu Vận", Type.xa), @@ -7854,19 +7774,15 @@ export const level1s = [ new Level1("54", "Tỉnh Phú Yên", Type.tinh, [ new Level2(35, "555", "Thành phố Tuy Hoà", Type.tp, [ new Level3(35, 0, "22015", "Phường 1", Type.phuong), - new Level3(35, 0, "22018", "Phường 8", Type.phuong), new Level3(35, 0, "22021", "Phường 2", Type.phuong), new Level3(35, 0, "22024", "Phường 9", Type.phuong), - new Level3(35, 0, "22027", "Phường 3", Type.phuong), new Level3(35, 0, "22030", "Phường 4", Type.phuong), new Level3(35, 0, "22033", "Phường 5", Type.phuong), new Level3(35, 0, "22036", "Phường 7", Type.phuong), - new Level3(35, 0, "22039", "Phường 6", Type.phuong), new Level3(35, 0, "22040", "Phường Phú Thạnh", Type.phuong), new Level3(35, 0, "22041", "Phường Phú Đông", Type.phuong), new Level3(35, 0, "22042", "Xã Hòa Kiến", Type.xa), new Level3(35, 0, "22045", "Xã Bình Kiến", Type.xa), - new Level3(35, 0, "22048", "Xã Bình Ngọc", Type.xa), new Level3(35, 0, "22162", "Xã An Phú", Type.xa), new Level3(35, 0, "22240", "Phường Phú Lâm", Type.phuong), ]), @@ -7988,16 +7904,11 @@ export const level1s = [ new Level3(36, 0, "22333", "Phường Vĩnh Phước", Type.phuong), new Level3(36, 0, "22336", "Phường Ngọc Hiệp", Type.phuong), new Level3(36, 0, "22339", "Phường Vĩnh Thọ", Type.phuong), - new Level3(36, 0, "22342", "Phường Xương Huân", Type.phuong), - new Level3(36, 0, "22345", "Phường Vạn Thắng", Type.phuong), new Level3(36, 0, "22348", "Phường Vạn Thạnh", Type.phuong), new Level3(36, 0, "22351", "Phường Phương Sài", Type.phuong), - new Level3(36, 0, "22354", "Phường Phương Sơn", Type.phuong), new Level3(36, 0, "22357", "Phường Phước Hải", Type.phuong), - new Level3(36, 0, "22360", "Phường Phước Tân", Type.phuong), new Level3(36, 0, "22363", "Phường Lộc Thọ", Type.phuong), - new Level3(36, 0, "22366", "Phường Phước Tiến", Type.phuong), - new Level3(36, 0, "22369", "Phường Tân Lập", Type.phuong), + new Level3(36, 0, "22366", "Phường Tân Tiến", Type.phuong), new Level3(36, 0, "22372", "Phường Phước Hòa", Type.phuong), new Level3(36, 0, "22375", "Phường Vĩnh Nguyên", Type.phuong), new Level3(36, 0, "22378", "Phường Phước Long", Type.phuong), @@ -8077,7 +7988,6 @@ export const level1s = [ new Level3(36, 4, "22570", "Phường Ninh Đa", Type.phuong), new Level3(36, 4, "22573", "Xã Ninh Phụng", Type.xa), new Level3(36, 4, "22576", "Xã Ninh Bình", Type.xa), - new Level3(36, 4, "22579", "Xã Ninh Phước", Type.xa), new Level3(36, 4, "22582", "Xã Ninh Phú", Type.xa), new Level3(36, 4, "22585", "Xã Ninh Tân", Type.xa), new Level3(36, 4, "22588", "Xã Ninh Quang", Type.xa), @@ -8086,7 +7996,7 @@ export const level1s = [ new Level3(36, 4, "22597", "Xã Ninh Hưng", Type.xa), new Level3(36, 4, "22600", "Xã Ninh Lộc", Type.xa), new Level3(36, 4, "22603", "Xã Ninh Ích", Type.xa), - new Level3(36, 4, "22606", "Xã Ninh Vân", Type.xa), + new Level3(36, 4, "22606", "Xã Ninh Phước", Type.xa), ]), new Level2(36, "573", "Huyện Khánh Vĩnh", Type.huyen, [ new Level3(36, 5, "22609", "Thị trấn Khánh Vĩnh", Type.thi_tran), @@ -8108,9 +8018,8 @@ export const level1s = [ new Level3(36, 6, "22651", "Thị trấn Diên Khánh", Type.thi_tran), new Level3(36, 6, "22654", "Xã Diên Lâm", Type.xa), new Level3(36, 6, "22657", "Xã Diên Điền", Type.xa), - new Level3(36, 6, "22660", "Xã Diên Xuân", Type.xa), + new Level3(36, 6, "22660", "Xã Xuân Đồng", Type.xa), new Level3(36, 6, "22663", "Xã Diên Sơn", Type.xa), - new Level3(36, 6, "22666", "Xã Diên Đồng", Type.xa), new Level3(36, 6, "22669", "Xã Diên Phú", Type.xa), new Level3(36, 6, "22672", "Xã Diên Thọ", Type.xa), new Level3(36, 6, "22675", "Xã Diên Phước", Type.xa), @@ -8145,10 +8054,7 @@ export const level1s = [ new Level3(37, 0, "22738", "Phường Đô Vinh", Type.phuong), new Level3(37, 0, "22741", "Phường Phước Mỹ", Type.phuong), new Level3(37, 0, "22744", "Phường Bảo An", Type.phuong), - new Level3(37, 0, "22747", "Phường Phủ Hà", Type.phuong), - new Level3(37, 0, "22750", "Phường Thanh Sơn", Type.phuong), - new Level3(37, 0, "22753", "Phường Mỹ Hương", Type.phuong), - new Level3(37, 0, "22756", "Phường Tấn Tài", Type.phuong), + new Level3(37, 0, "22750", "Phường Phủ Hà", Type.phuong), new Level3(37, 0, "22759", "Phường Kinh Dinh", Type.phuong), new Level3(37, 0, "22762", "Phường Đạo Long", Type.phuong), new Level3(37, 0, "22765", "Phường Đài Sơn", Type.phuong), @@ -8508,7 +8414,6 @@ export const level1s = [ new Level3(40, 0, "23584", "Phường Yên Thế", Type.phuong), new Level3(40, 0, "23586", "Phường Chi Lăng", Type.phuong), new Level3(40, 0, "23590", "Xã Biển Hồ", Type.xa), - new Level3(40, 0, "23593", "Xã Tân Sơn", Type.xa), new Level3(40, 0, "23596", "Xã Trà Đa", Type.xa), new Level3(40, 0, "23599", "Xã Chư Á", Type.xa), new Level3(40, 0, "23602", "Xã An Phú", Type.xa), @@ -8552,8 +8457,7 @@ export const level1s = [ new Level3(40, 3, "23662", "Xã Nghĩa An", Type.xa), new Level3(40, 3, "23665", "Xã Tơ Tung", Type.xa), new Level3(40, 3, "23668", "Xã Kông Lơng Khơng", Type.xa), - new Level3(40, 3, "23671", "Xã Kông Pla", Type.xa), - new Level3(40, 3, "23674", "Xã Đăk HLơ", Type.xa), + new Level3(40, 3, "23674", "Xã Kông Bơ La", Type.xa), ]), new Level2(40, "626", "Huyện Đăk Đoa", Type.huyen, [ new Level3(40, 4, "23677", "Thị trấn Đăk Đoa", Type.thi_tran), @@ -8752,11 +8656,9 @@ export const level1s = [ new Level3(41, 0, "24118", "Phường Tân Lập", Type.phuong), new Level3(41, 0, "24121", "Phường Tân Hòa", Type.phuong), new Level3(41, 0, "24124", "Phường Tân An", Type.phuong), - new Level3(41, 0, "24127", "Phường Thống Nhất", Type.phuong), new Level3(41, 0, "24130", "Phường Thành Nhất", Type.phuong), - new Level3(41, 0, "24133", "Phường Thắng Lợi", Type.phuong), + new Level3(41, 0, "24133", "Phường Thành Công", Type.phuong), new Level3(41, 0, "24136", "Phường Tân Lợi", Type.phuong), - new Level3(41, 0, "24139", "Phường Thành Công", Type.phuong), new Level3(41, 0, "24142", "Phường Tân Thành", Type.phuong), new Level3(41, 0, "24145", "Phường Tân Tiến", Type.phuong), new Level3(41, 0, "24148", "Phường Tự An", Type.phuong), @@ -8777,7 +8679,6 @@ export const level1s = [ new Level3(41, 1, "24311", "Phường Thiện An", Type.phuong), new Level3(41, 1, "24318", "Phường Đạt Hiếu", Type.phuong), new Level3(41, 1, "24322", "Phường Đoàn Kết", Type.phuong), - new Level3(41, 1, "24325", "Xã Ea Blang", Type.xa), new Level3(41, 1, "24328", "Xã Ea Drông", Type.xa), new Level3(41, 1, "24331", "Phường Thống Nhất", Type.phuong), new Level3(41, 1, "24332", "Phường Bình Tân", Type.phuong), @@ -8900,7 +8801,6 @@ export const level1s = [ new Level3(41, 10, "24451", "Xã Dang Kang", Type.xa), new Level3(41, 10, "24454", "Xã Cư KTy", Type.xa), new Level3(41, 10, "24457", "Xã Hòa Thành", Type.xa), - new Level3(41, 10, "24460", "Xã Hòa Tân", Type.xa), new Level3(41, 10, "24463", "Xã Hòa Phong", Type.xa), new Level3(41, 10, "24466", "Xã Hòa Lễ", Type.xa), new Level3(41, 10, "24469", "Xã Yang Reh", Type.xa), @@ -9509,11 +9409,11 @@ export const level1s = [ new Level3(46, 2, "25807", "Xã Thanh An", Type.xa), new Level3(46, 2, "25810", "Xã Thanh Tuyền", Type.xa), ]), - new Level2(46, "721", "Thị xã Bến Cát", Type.thi_xa, [ + new Level2(46, "721", "Thành phố Bến Cát", Type.tp, [ new Level3(46, 3, "25813", "Phường Mỹ Phước", Type.phuong), new Level3(46, 3, "25837", "Phường Chánh Phú Hòa", Type.phuong), - new Level3(46, 3, "25840", "Xã An Điền", Type.xa), - new Level3(46, 3, "25843", "Xã An Tây", Type.xa), + new Level3(46, 3, "25840", "Phường An Điền", Type.phuong), + new Level3(46, 3, "25843", "Phường An Tây", Type.phuong), new Level3(46, 3, "25846", "Phường Thới Hòa", Type.phuong), new Level3(46, 3, "25849", "Phường Hòa Lợi", Type.phuong), new Level3(46, 3, "25852", "Phường Tân Định", Type.phuong), @@ -9589,17 +9489,12 @@ export const level1s = [ new Level3(47, 0, "26005", "Phường Tân Hòa", Type.phuong), new Level3(47, 0, "26008", "Phường Tân Hiệp", Type.phuong), new Level3(47, 0, "26011", "Phường Bửu Long", Type.phuong), - new Level3(47, 0, "26014", "Phường Tân Tiến", Type.phuong), + new Level3(47, 0, "26014", "Phường Tân Mai", Type.phuong), new Level3(47, 0, "26017", "Phường Tam Hiệp", Type.phuong), new Level3(47, 0, "26020", "Phường Long Bình", Type.phuong), new Level3(47, 0, "26023", "Phường Quang Vinh", Type.phuong), - new Level3(47, 0, "26026", "Phường Tân Mai", Type.phuong), new Level3(47, 0, "26029", "Phường Thống Nhất", Type.phuong), - new Level3(47, 0, "26032", "Phường Trung Dũng", Type.phuong), - new Level3(47, 0, "26035", "Phường Tam Hòa", Type.phuong), - new Level3(47, 0, "26038", "Phường Hòa Bình", Type.phuong), - new Level3(47, 0, "26041", "Phường Quyết Thắng", Type.phuong), - new Level3(47, 0, "26044", "Phường Thanh Bình", Type.phuong), + new Level3(47, 0, "26041", "Phường Trung Dũng", Type.phuong), new Level3(47, 0, "26047", "Phường Bình Đa", Type.phuong), new Level3(47, 0, "26050", "Phường An Bình", Type.phuong), new Level3(47, 0, "26053", "Phường Bửu Hòa", Type.phuong), @@ -9614,8 +9509,6 @@ export const level1s = [ new Level3(47, 0, "26380", "Xã Long Hưng", Type.xa), ]), new Level2(47, "732", "Thành phố Long Khánh", Type.tp, [ - new Level3(47, 1, "26071", "Phường Xuân Trung", Type.phuong), - new Level3(47, 1, "26074", "Phường Xuân Thanh", Type.phuong), new Level3(47, 1, "26077", "Phường Xuân Bình", Type.phuong), new Level3(47, 1, "26080", "Phường Xuân An", Type.phuong), new Level3(47, 1, "26083", "Phường Xuân Hoà", Type.phuong), @@ -9635,13 +9528,11 @@ export const level1s = [ new Level3(47, 2, "26119", "Xã Dak Lua", Type.xa), new Level3(47, 2, "26122", "Xã Nam Cát Tiên", Type.xa), new Level3(47, 2, "26125", "Xã Phú An", Type.xa), - new Level3(47, 2, "26128", "Xã Núi Tượng", Type.xa), new Level3(47, 2, "26131", "Xã Tà Lài", Type.xa), new Level3(47, 2, "26134", "Xã Phú Lập", Type.xa), - new Level3(47, 2, "26137", "Xã Phú Sơn", Type.xa), new Level3(47, 2, "26140", "Xã Phú Thịnh", Type.xa), new Level3(47, 2, "26143", "Xã Thanh Sơn", Type.xa), - new Level3(47, 2, "26146", "Xã Phú Trung", Type.xa), + new Level3(47, 2, "26146", "Xã Phú Sơn", Type.xa), new Level3(47, 2, "26149", "Xã Phú Xuân", Type.xa), new Level3(47, 2, "26152", "Xã Phú Lộc", Type.xa), new Level3(47, 2, "26155", "Xã Phú Lâm", Type.xa), @@ -9660,9 +9551,7 @@ export const level1s = [ new Level3(47, 3, "26188", "Xã Thạnh Phú", Type.xa), new Level3(47, 3, "26191", "Xã Thiện Tân", Type.xa), new Level3(47, 3, "26194", "Xã Tân Bình", Type.xa), - new Level3(47, 3, "26197", "Xã Bình Hòa", Type.xa), new Level3(47, 3, "26200", "Xã Mã Đà", Type.xa), - new Level3(47, 3, "26203", "Xã Hiếu Liêm", Type.xa), ]), new Level2(47, "736", "Huyện Định Quán", Type.huyen, [ new Level3(47, 4, "26206", "Thị trấn Định Quán", Type.thi_tran), @@ -10455,11 +10344,8 @@ export const level1s = [ new Level2(51, "815", "Thành phố Mỹ Tho", Type.tp, [ new Level3(51, 0, "28249", "Phường 5", Type.phuong), new Level3(51, 0, "28252", "Phường 4", Type.phuong), - new Level3(51, 0, "28255", "Phường 7", Type.phuong), - new Level3(51, 0, "28258", "Phường 3", Type.phuong), new Level3(51, 0, "28261", "Phường 1", Type.phuong), new Level3(51, 0, "28264", "Phường 2", Type.phuong), - new Level3(51, 0, "28267", "Phường 8", Type.phuong), new Level3(51, 0, "28270", "Phường 6", Type.phuong), new Level3(51, 0, "28273", "Phường 9", Type.phuong), new Level3(51, 0, "28276", "Phường 10", Type.phuong), @@ -10471,16 +10357,14 @@ export const level1s = [ new Level3(51, 0, "28567", "Xã Phước Thạnh", Type.xa), new Level3(51, 0, "28591", "Xã Thới Sơn", Type.xa), ]), - new Level2(51, "816", "Thị xã Gò Công", Type.thi_xa, [ - new Level3(51, 1, "28294", "Phường 3", Type.phuong), + new Level2(51, "816", "Thành phố Gò Công", Type.tp, [ new Level3(51, 1, "28297", "Phường 2", Type.phuong), - new Level3(51, 1, "28300", "Phường 4", Type.phuong), - new Level3(51, 1, "28303", "Phường 1", Type.phuong), + new Level3(51, 1, "28300", "Phường 1", Type.phuong), new Level3(51, 1, "28306", "Phường 5", Type.phuong), - new Level3(51, 1, "28309", "Xã Long Hưng", Type.xa), - new Level3(51, 1, "28312", "Xã Long Thuận", Type.xa), - new Level3(51, 1, "28315", "Xã Long Chánh", Type.xa), - new Level3(51, 1, "28318", "Xã Long Hòa", Type.xa), + new Level3(51, 1, "28309", "Phường Long Hưng", Type.phuong), + new Level3(51, 1, "28312", "Phường Long Thuận", Type.phuong), + new Level3(51, 1, "28315", "Phường Long Chánh", Type.phuong), + new Level3(51, 1, "28318", "Phường Long Hòa", Type.phuong), new Level3(51, 1, "28708", "Xã Bình Đông", Type.xa), new Level3(51, 1, "28717", "Xã Bình Xuân", Type.xa), new Level3(51, 1, "28729", "Xã Tân Trung", Type.xa), @@ -10567,15 +10451,12 @@ export const level1s = [ new Level3(51, 6, "28522", "Xã Tân Hội Đông", Type.xa), new Level3(51, 6, "28525", "Xã Tân Hương", Type.xa), new Level3(51, 6, "28528", "Xã Tân Lý Đông", Type.xa), - new Level3(51, 6, "28531", "Xã Tân Lý Tây", Type.xa), new Level3(51, 6, "28534", "Xã Thân Cửu Nghĩa", Type.xa), new Level3(51, 6, "28537", "Xã Tam Hiệp", Type.xa), new Level3(51, 6, "28540", "Xã Điềm Hy", Type.xa), new Level3(51, 6, "28543", "Xã Nhị Bình", Type.xa), - new Level3(51, 6, "28546", "Xã Dưỡng Điềm", Type.xa), new Level3(51, 6, "28549", "Xã Đông Hòa", Type.xa), new Level3(51, 6, "28552", "Xã Long Định", Type.xa), - new Level3(51, 6, "28555", "Xã Hữu Đạo", Type.xa), new Level3(51, 6, "28558", "Xã Long An", Type.xa), new Level3(51, 6, "28561", "Xã Long Hưng", Type.xa), new Level3(51, 6, "28564", "Xã Bình Trưng", Type.xa), @@ -10954,8 +10835,7 @@ export const level1s = [ new Level2(54, "855", "Thành phố Vĩnh Long", Type.tp, [ new Level3(54, 0, "29542", "Phường 9", Type.phuong), new Level3(54, 0, "29545", "Phường 5", Type.phuong), - new Level3(54, 0, "29548", "Phường 1", Type.phuong), - new Level3(54, 0, "29551", "Phường 2", Type.phuong), + new Level3(54, 0, "29551", "Phường 1", Type.phuong), new Level3(54, 0, "29554", "Phường 4", Type.phuong), new Level3(54, 0, "29557", "Phường 3", Type.phuong), new Level3(54, 0, "29560", "Phường 8", Type.phuong), @@ -10965,7 +10845,6 @@ export const level1s = [ new Level3(54, 0, "29572", "Phường Trường An", Type.phuong), ]), new Level2(54, "857", "Huyện Long Hồ", Type.huyen, [ - new Level3(54, 1, "29575", "Thị trấn Long Hồ", Type.thi_tran), new Level3(54, 1, "29578", "Xã Đồng Phú", Type.xa), new Level3(54, 1, "29581", "Xã Bình Hòa Phước", Type.xa), new Level3(54, 1, "29584", "Xã Hòa Ninh", Type.xa), @@ -10974,7 +10853,7 @@ export const level1s = [ new Level3(54, 1, "29593", "Xã Tân Hạnh", Type.xa), new Level3(54, 1, "29596", "Xã Phước Hậu", Type.xa), new Level3(54, 1, "29599", "Xã Long Phước", Type.xa), - new Level3(54, 1, "29602", "Xã Phú Đức", Type.xa), + new Level3(54, 1, "29602", "Thị trấn Long Hồ", Type.thi_tran), new Level3(54, 1, "29605", "Xã Lộc Hòa", Type.xa), new Level3(54, 1, "29608", "Xã Long An", Type.xa), new Level3(54, 1, "29611", "Xã Phú Quới", Type.xa), @@ -11031,7 +10910,6 @@ export const level1s = [ new Level3(54, 4, "29749", "Xã Tân Phú", Type.xa), new Level3(54, 4, "29752", "Xã Long Phú", Type.xa), new Level3(54, 4, "29755", "Xã Mỹ Thạnh Trung", Type.xa), - new Level3(54, 4, "29758", "Xã Tường Lộc", Type.xa), new Level3(54, 4, "29761", "Xã Loan Mỹ", Type.xa), new Level3(54, 4, "29764", "Xã Ngãi Tứ", Type.xa), new Level3(54, 4, "29767", "Xã Bình Ninh", Type.xa), @@ -11058,12 +10936,10 @@ export const level1s = [ new Level3(54, 6, "29845", "Xã Vĩnh Xuân", Type.xa), new Level3(54, 6, "29848", "Xã Thuận Thới", Type.xa), new Level3(54, 6, "29851", "Xã Phú Thành", Type.xa), - new Level3(54, 6, "29854", "Xã Thiện Mỹ", Type.xa), new Level3(54, 6, "29857", "Xã Lục Sỹ Thành", Type.xa), new Level3(54, 6, "29860", "Xã Tích Thiện", Type.xa), ]), new Level2(54, "863", "Huyện Bình Tân", Type.huyen, [ - new Level3(54, 7, "29773", "Xã Tân Hưng", Type.xa), new Level3(54, 7, "29776", "Xã Tân Thành", Type.xa), new Level3(54, 7, "29779", "Xã Thành Trung", Type.xa), new Level3(54, 7, "29782", "Xã Tân An Thạnh", Type.xa), @@ -11605,10 +11481,7 @@ export const level1s = [ new Level3(58, 0, "31117", "Phường Cái Khế", Type.phuong), new Level3(58, 0, "31120", "Phường An Hòa", Type.phuong), new Level3(58, 0, "31123", "Phường Thới Bình", Type.phuong), - new Level3(58, 0, "31126", "Phường An Nghiệp", Type.phuong), - new Level3(58, 0, "31129", "Phường An Cư", Type.phuong), new Level3(58, 0, "31135", "Phường Tân An", Type.phuong), - new Level3(58, 0, "31141", "Phường An Phú", Type.phuong), new Level3(58, 0, "31144", "Phường Xuân Khánh", Type.phuong), new Level3(58, 0, "31147", "Phường Hưng Lợi", Type.phuong), new Level3(58, 0, "31149", "Phường An Khánh", Type.phuong), @@ -11803,10 +11676,9 @@ export const level1s = [ new Level3(60, 0, "31504", "Phường 8", Type.phuong), new Level3(60, 0, "31507", "Phường 6", Type.phuong), new Level3(60, 0, "31510", "Phường 2", Type.phuong), - new Level3(60, 0, "31513", "Phường 1", Type.phuong), new Level3(60, 0, "31516", "Phường 4", Type.phuong), new Level3(60, 0, "31519", "Phường 3", Type.phuong), - new Level3(60, 0, "31522", "Phường 9", Type.phuong), + new Level3(60, 0, "31522", "Phường 1", Type.phuong), new Level3(60, 0, "31525", "Phường 10", Type.phuong), ]), new Level2(60, "942", "Huyện Châu Thành", Type.huyen, [ @@ -12131,3 +12003,11182 @@ export const level1s = [ ]), ]), ]; + +export const parents: Record = { + "100": "11", + "101": "11", + "102": "11", + "103": "11", + "105": "12", + "106": "12", + "107": "12", + "108": "12", + "109": "12", + "110": "12", + "111": "12", + "112": "12", + "116": "14", + "118": "14", + "119": "14", + "120": "14", + "121": "14", + "122": "14", + "123": "14", + "124": "14", + "125": "14", + "126": "14", + "127": "14", + "128": "14", + "132": "15", + "133": "15", + "135": "15", + "136": "15", + "137": "15", + "138": "15", + "139": "15", + "140": "15", + "141": "15", + "148": "17", + "150": "17", + "152": "17", + "153": "17", + "154": "17", + "155": "17", + "156": "17", + "157": "17", + "158": "17", + "159": "17", + "164": "19", + "165": "19", + "167": "19", + "168": "19", + "169": "19", + "170": "19", + "171": "19", + "172": "19", + "173": "19", + "178": "20", + "180": "20", + "181": "20", + "182": "20", + "183": "20", + "184": "20", + "185": "20", + "186": "20", + "187": "20", + "188": "20", + "189": "20", + "193": "22", + "194": "22", + "195": "22", + "196": "22", + "198": "22", + "199": "22", + "200": "22", + "201": "22", + "202": "22", + "203": "22", + "205": "22", + "206": "22", + "207": "22", + "213": "24", + "215": "24", + "216": "24", + "217": "24", + "218": "24", + "219": "24", + "220": "24", + "221": "24", + "222": "24", + "223": "24", + "227": "25", + "228": "25", + "230": "25", + "231": "25", + "232": "25", + "233": "25", + "234": "25", + "235": "25", + "236": "25", + "237": "25", + "238": "25", + "239": "25", + "240": "25", + "243": "26", + "244": "26", + "246": "26", + "247": "26", + "248": "26", + "249": "26", + "250": "01", + "251": "26", + "252": "26", + "253": "26", + "256": "27", + "258": "27", + "259": "27", + "260": "27", + "261": "27", + "262": "27", + "263": "27", + "264": "27", + "268": "01", + "269": "01", + "271": "01", + "272": "01", + "273": "01", + "274": "01", + "275": "01", + "276": "01", + "277": "01", + "278": "01", + "279": "01", + "280": "01", + "281": "01", + "282": "01", + "288": "30", + "290": "30", + "291": "30", + "292": "30", + "293": "30", + "294": "30", + "295": "30", + "296": "30", + "297": "30", + "298": "30", + "299": "30", + "300": "30", + "303": "31", + "304": "31", + "305": "31", + "306": "31", + "307": "31", + "308": "31", + "309": "31", + "311": "31", + "312": "31", + "313": "31", + "314": "31", + "315": "31", + "316": "31", + "317": "31", + "318": "31", + "323": "33", + "325": "33", + "326": "33", + "327": "33", + "328": "33", + "329": "33", + "330": "33", + "331": "33", + "332": "33", + "333": "33", + "336": "34", + "338": "34", + "339": "34", + "340": "34", + "341": "34", + "342": "34", + "343": "34", + "344": "34", + "347": "35", + "349": "35", + "350": "35", + "351": "35", + "352": "35", + "353": "35", + "356": "36", + "359": "36", + "360": "36", + "361": "36", + "362": "36", + "363": "36", + "364": "36", + "365": "36", + "366": "36", + "369": "37", + "370": "37", + "372": "37", + "373": "37", + "374": "37", + "375": "37", + "376": "37", + "377": "37", + "380": "38", + "381": "38", + "382": "38", + "384": "38", + "385": "38", + "386": "38", + "387": "38", + "388": "38", + "389": "38", + "390": "38", + "391": "38", + "392": "38", + "393": "38", + "394": "38", + "395": "38", + "396": "38", + "397": "38", + "398": "38", + "399": "38", + "400": "38", + "401": "38", + "402": "38", + "403": "38", + "404": "38", + "405": "38", + "406": "38", + "407": "38", + "412": "40", + "413": "40", + "414": "40", + "415": "40", + "416": "40", + "417": "40", + "418": "40", + "419": "40", + "420": "40", + "421": "40", + "422": "40", + "423": "40", + "424": "40", + "425": "40", + "426": "40", + "427": "40", + "428": "40", + "429": "40", + "430": "40", + "431": "40", + "432": "40", + "436": "42", + "437": "42", + "439": "42", + "440": "42", + "441": "42", + "442": "42", + "443": "42", + "444": "42", + "445": "42", + "446": "42", + "447": "42", + "448": "42", + "449": "42", + "450": "44", + "452": "44", + "453": "44", + "454": "44", + "455": "44", + "456": "44", + "457": "44", + "458": "44", + "461": "45", + "462": "45", + "464": "45", + "465": "45", + "466": "45", + "467": "45", + "468": "45", + "469": "45", + "470": "45", + "471": "45", + "474": "46", + "476": "46", + "477": "46", + "478": "46", + "479": "46", + "480": "46", + "481": "46", + "482": "46", + "483": "46", + "490": "48", + "491": "48", + "492": "48", + "493": "48", + "494": "48", + "495": "48", + "497": "48", + "498": "48", + "502": "49", + "503": "49", + "504": "49", + "505": "49", + "506": "49", + "507": "49", + "508": "49", + "509": "49", + "510": "49", + "511": "49", + "512": "49", + "513": "49", + "514": "49", + "515": "49", + "516": "49", + "517": "49", + "518": "49", + "519": "49", + "522": "51", + "524": "51", + "525": "51", + "527": "51", + "528": "51", + "529": "51", + "530": "51", + "531": "51", + "532": "51", + "533": "51", + "534": "51", + "535": "51", + "536": "51", + "540": "52", + "542": "52", + "543": "52", + "544": "52", + "545": "52", + "546": "52", + "547": "52", + "548": "52", + "549": "52", + "550": "52", + "551": "52", + "555": "54", + "557": "54", + "558": "54", + "559": "54", + "560": "54", + "561": "54", + "562": "54", + "563": "54", + "564": "54", + "568": "56", + "569": "56", + "570": "56", + "571": "56", + "572": "56", + "573": "56", + "574": "56", + "575": "56", + "576": "56", + "582": "58", + "584": "58", + "585": "58", + "586": "58", + "587": "58", + "588": "58", + "589": "58", + "593": "60", + "594": "60", + "595": "60", + "596": "60", + "597": "60", + "598": "60", + "599": "60", + "600": "60", + "601": "60", + "602": "60", + "608": "62", + "610": "62", + "611": "62", + "612": "62", + "613": "62", + "614": "62", + "615": "62", + "616": "62", + "617": "62", + "618": "62", + "622": "64", + "623": "64", + "624": "64", + "625": "64", + "626": "64", + "627": "64", + "628": "64", + "629": "64", + "630": "64", + "631": "64", + "632": "64", + "633": "64", + "634": "64", + "635": "64", + "637": "64", + "638": "64", + "639": "64", + "643": "66", + "644": "66", + "645": "66", + "646": "66", + "647": "66", + "648": "66", + "649": "66", + "650": "66", + "651": "66", + "652": "66", + "653": "66", + "654": "66", + "655": "66", + "656": "66", + "657": "66", + "660": "67", + "661": "67", + "662": "67", + "663": "67", + "664": "67", + "665": "67", + "666": "67", + "667": "67", + "672": "68", + "673": "68", + "674": "68", + "675": "68", + "676": "68", + "677": "68", + "678": "68", + "679": "68", + "680": "68", + "681": "68", + "682": "68", + "683": "68", + "688": "70", + "689": "70", + "690": "70", + "691": "70", + "692": "70", + "693": "70", + "694": "70", + "695": "70", + "696": "70", + "697": "70", + "698": "70", + "703": "72", + "705": "72", + "706": "72", + "707": "72", + "708": "72", + "709": "72", + "710": "72", + "711": "72", + "712": "72", + "718": "74", + "719": "74", + "720": "74", + "721": "74", + "722": "74", + "723": "74", + "724": "74", + "725": "74", + "726": "74", + "731": "75", + "732": "75", + "734": "75", + "735": "75", + "736": "75", + "737": "75", + "738": "75", + "739": "75", + "740": "75", + "741": "75", + "742": "75", + "747": "77", + "748": "77", + "750": "77", + "751": "77", + "752": "77", + "753": "77", + "754": "77", + "755": "77", + "760": "79", + "761": "79", + "764": "79", + "765": "79", + "766": "79", + "767": "79", + "768": "79", + "769": "79", + "770": "79", + "771": "79", + "772": "79", + "773": "79", + "774": "79", + "775": "79", + "776": "79", + "777": "79", + "778": "79", + "783": "79", + "784": "79", + "785": "79", + "786": "79", + "787": "79", + "794": "80", + "795": "80", + "796": "80", + "797": "80", + "798": "80", + "799": "80", + "800": "80", + "801": "80", + "802": "80", + "803": "80", + "804": "80", + "805": "80", + "806": "80", + "807": "80", + "808": "80", + "815": "82", + "816": "82", + "817": "82", + "818": "82", + "819": "82", + "820": "82", + "821": "82", + "822": "82", + "823": "82", + "824": "82", + "825": "82", + "829": "83", + "831": "83", + "832": "83", + "833": "83", + "834": "83", + "835": "83", + "836": "83", + "837": "83", + "838": "83", + "842": "84", + "844": "84", + "845": "84", + "846": "84", + "847": "84", + "848": "84", + "849": "84", + "850": "84", + "851": "84", + "855": "86", + "857": "86", + "858": "86", + "859": "86", + "860": "86", + "861": "86", + "862": "86", + "863": "86", + "866": "87", + "867": "87", + "868": "87", + "869": "87", + "870": "87", + "871": "87", + "872": "87", + "873": "87", + "874": "87", + "875": "87", + "876": "87", + "877": "87", + "883": "89", + "884": "89", + "886": "89", + "887": "89", + "888": "89", + "889": "89", + "890": "89", + "891": "89", + "892": "89", + "893": "89", + "894": "89", + "899": "91", + "900": "91", + "902": "91", + "903": "91", + "904": "91", + "905": "91", + "906": "91", + "907": "91", + "908": "91", + "909": "91", + "910": "91", + "911": "91", + "912": "91", + "913": "91", + "914": "91", + "916": "92", + "917": "92", + "918": "92", + "919": "92", + "923": "92", + "924": "92", + "925": "92", + "926": "92", + "927": "92", + "930": "93", + "931": "93", + "932": "93", + "933": "93", + "934": "93", + "935": "93", + "936": "93", + "937": "93", + "941": "94", + "942": "94", + "943": "94", + "944": "94", + "945": "94", + "946": "94", + "947": "94", + "948": "94", + "949": "94", + "950": "94", + "951": "94", + "954": "95", + "956": "95", + "957": "95", + "958": "95", + "959": "95", + "960": "95", + "961": "95", + "964": "96", + "966": "96", + "967": "96", + "968": "96", + "969": "96", + "970": "96", + "971": "96", + "972": "96", + "973": "96", + "10000": "276", + "10003": "276", + "10006": "276", + "10009": "276", + "10012": "276", + "10015": "277", + "10018": "277", + "10021": "277", + "10024": "277", + "10027": "277", + "10030": "277", + "10033": "277", + "10039": "277", + "10042": "277", + "10045": "277", + "10048": "277", + "10051": "277", + "10054": "277", + "10057": "277", + "10060": "277", + "10063": "277", + "10066": "277", + "10069": "277", + "10072": "277", + "10075": "277", + "10078": "277", + "10081": "277", + "10084": "277", + "10087": "277", + "10090": "277", + "10093": "277", + "10096": "277", + "10099": "277", + "10102": "277", + "10105": "277", + "10108": "277", + "10111": "277", + "10114": "278", + "10117": "268", + "10120": "278", + "10123": "268", + "10126": "278", + "10129": "278", + "10132": "278", + "10135": "278", + "10138": "278", + "10141": "278", + "10144": "278", + "10147": "278", + "10150": "278", + "10153": "278", + "10156": "278", + "10159": "278", + "10162": "278", + "10165": "278", + "10168": "278", + "10171": "278", + "10174": "278", + "10177": "278", + "10180": "278", + "10183": "279", + "10186": "279", + "10189": "279", + "10192": "279", + "10195": "279", + "10198": "279", + "10201": "279", + "10204": "279", + "10207": "279", + "10210": "279", + "10213": "279", + "10216": "279", + "10219": "279", + "10222": "279", + "10225": "279", + "10228": "279", + "10231": "279", + "10234": "279", + "10237": "279", + "10240": "279", + "10243": "279", + "10246": "279", + "10249": "279", + "10252": "279", + "10255": "279", + "10258": "279", + "10261": "279", + "10264": "279", + "10267": "279", + "10270": "280", + "10273": "280", + "10276": "280", + "10279": "280", + "10282": "280", + "10288": "280", + "10291": "280", + "10294": "280", + "10297": "280", + "10300": "280", + "10303": "280", + "10306": "280", + "10309": "280", + "10312": "280", + "10315": "280", + "10318": "280", + "10321": "280", + "10324": "280", + "10327": "280", + "10330": "280", + "10333": "280", + "10336": "280", + "10339": "280", + "10342": "280", + "10345": "280", + "10348": "280", + "10351": "280", + "10354": "281", + "10357": "281", + "10360": "281", + "10363": "281", + "10366": "281", + "10369": "281", + "10372": "281", + "10375": "281", + "10378": "281", + "10381": "281", + "10384": "281", + "10387": "281", + "10390": "281", + "10393": "281", + "10396": "281", + "10399": "281", + "10402": "281", + "10405": "281", + "10408": "281", + "10411": "281", + "10414": "281", + "10417": "281", + "10420": "281", + "10423": "281", + "10426": "281", + "10429": "281", + "10432": "281", + "10435": "281", + "10438": "281", + "10441": "282", + "10444": "282", + "10447": "282", + "10450": "282", + "10453": "282", + "10456": "282", + "10459": "282", + "10462": "282", + "10465": "282", + "10468": "282", + "10471": "282", + "10474": "282", + "10477": "282", + "10480": "282", + "10483": "282", + "10486": "282", + "10489": "282", + "10492": "282", + "10495": "282", + "10498": "282", + "10501": "282", + "10504": "282", + "10507": "288", + "10510": "288", + "10513": "288", + "10514": "288", + "10516": "288", + "10519": "288", + "10522": "288", + "10525": "288", + "10528": "288", + "10531": "288", + "10532": "288", + "10534": "288", + "10537": "288", + "10540": "288", + "10543": "288", + "10546": "290", + "10549": "290", + "10552": "290", + "10555": "290", + "10558": "290", + "10561": "290", + "10564": "290", + "10567": "290", + "10570": "290", + "10573": "290", + "10576": "290", + "10579": "290", + "10582": "290", + "10585": "290", + "10588": "290", + "10591": "290", + "10594": "290", + "10600": "290", + "10603": "290", + "10606": "291", + "10609": "291", + "10612": "291", + "10615": "291", + "10618": "291", + "10621": "291", + "10624": "291", + "10627": "291", + "10630": "291", + "10633": "291", + "10636": "291", + "10639": "291", + "10642": "291", + "10645": "291", + "10648": "291", + "10651": "291", + "10654": "291", + "10657": "291", + "10660": "288", + "10663": "288", + "10666": "291", + "10672": "288", + "10675": "292", + "10678": "292", + "10681": "292", + "10684": "292", + "10687": "292", + "10693": "292", + "10696": "292", + "10699": "292", + "10702": "292", + "10705": "292", + "10708": "292", + "10714": "292", + "10717": "292", + "10720": "292", + "10723": "292", + "10726": "292", + "10729": "292", + "10732": "292", + "10735": "292", + "10738": "292", + "10741": "292", + "10744": "292", + "10747": "292", + "10750": "293", + "10753": "293", + "10756": "293", + "10759": "293", + "10762": "293", + "10768": "293", + "10771": "293", + "10774": "293", + "10777": "293", + "10780": "293", + "10783": "293", + "10786": "293", + "10792": "293", + "10798": "293", + "10801": "293", + "10804": "293", + "10807": "293", + "10810": "293", + "10813": "294", + "10816": "294", + "10819": "294", + "10822": "288", + "10825": "294", + "10828": "294", + "10831": "294", + "10834": "294", + "10837": "288", + "10840": "294", + "10843": "294", + "10846": "294", + "10849": "294", + "10852": "294", + "10855": "294", + "10861": "294", + "10864": "294", + "10867": "294", + "10876": "294", + "10879": "294", + "10882": "294", + "10885": "294", + "10888": "295", + "10891": "295", + "10894": "295", + "10897": "295", + "10900": "295", + "10903": "295", + "10906": "295", + "10909": "295", + "10912": "295", + "10918": "295", + "10924": "295", + "10927": "295", + "10930": "295", + "10933": "295", + "10936": "295", + "10939": "295", + "10942": "295", + "10945": "296", + "10951": "296", + "10954": "296", + "10960": "296", + "10963": "296", + "10966": "296", + "10969": "296", + "10972": "296", + "10975": "296", + "10978": "296", + "10981": "296", + "10984": "296", + "10987": "296", + "10990": "296", + "10993": "296", + "10996": "296", + "10999": "297", + "11002": "288", + "11005": "288", + "11008": "297", + "11011": "288", + "11017": "288", + "11020": "297", + "11029": "297", + "11032": "297", + "11035": "297", + "11038": "297", + "11041": "297", + "11044": "297", + "11047": "297", + "11050": "297", + "11053": "297", + "11056": "297", + "11059": "297", + "11062": "297", + "11065": "297", + "11068": "297", + "11071": "297", + "11074": "298", + "11077": "288", + "11083": "298", + "11086": "298", + "11089": "298", + "11092": "298", + "11095": "298", + "11098": "298", + "11101": "298", + "11110": "298", + "11113": "298", + "11116": "298", + "11119": "298", + "11122": "298", + "11125": "298", + "11128": "298", + "11131": "298", + "11134": "298", + "11137": "298", + "11140": "298", + "11143": "298", + "11146": "298", + "11149": "298", + "11152": "298", + "11155": "299", + "11161": "299", + "11164": "299", + "11167": "299", + "11173": "299", + "11176": "299", + "11179": "299", + "11185": "299", + "11188": "299", + "11197": "299", + "11200": "299", + "11203": "299", + "11206": "299", + "11209": "299", + "11215": "299", + "11218": "299", + "11224": "299", + "11227": "299", + "11230": "299", + "11233": "299", + "11239": "300", + "11242": "300", + "11245": "300", + "11248": "300", + "11251": "300", + "11254": "300", + "11257": "300", + "11260": "300", + "11263": "300", + "11266": "300", + "11269": "300", + "11275": "300", + "11278": "300", + "11281": "300", + "11284": "300", + "11287": "300", + "11293": "300", + "11296": "303", + "11299": "303", + "11302": "303", + "11305": "303", + "11308": "303", + "11311": "303", + "11314": "303", + "11320": "303", + "11323": "303", + "11329": "304", + "11332": "304", + "11335": "304", + "11338": "304", + "11341": "304", + "11344": "304", + "11347": "304", + "11350": "304", + "11356": "304", + "11359": "304", + "11362": "304", + "11365": "304", + "11368": "305", + "11371": "305", + "11374": "305", + "11377": "305", + "11380": "305", + "11383": "305", + "11386": "305", + "11389": "305", + "11392": "305", + "11395": "305", + "11398": "305", + "11401": "305", + "11404": "305", + "11405": "305", + "11407": "305", + "11410": "306", + "11411": "306", + "11413": "306", + "11414": "306", + "11416": "306", + "11419": "306", + "11422": "306", + "11425": "306", + "11428": "307", + "11429": "307", + "11431": "307", + "11434": "307", + "11437": "307", + "11440": "307", + "11443": "307", + "11446": "307", + "11449": "307", + "11452": "307", + "11455": "308", + "11458": "308", + "11461": "308", + "11465": "308", + "11467": "308", + "11470": "311", + "11473": "311", + "11476": "311", + "11479": "311", + "11482": "311", + "11485": "311", + "11488": "311", + "11491": "311", + "11494": "311", + "11497": "311", + "11500": "311", + "11503": "311", + "11506": "311", + "11509": "311", + "11512": "311", + "11515": "311", + "11518": "311", + "11521": "311", + "11524": "311", + "11527": "311", + "11530": "311", + "11533": "311", + "11536": "311", + "11539": "311", + "11542": "311", + "11545": "311", + "11548": "311", + "11551": "311", + "11554": "311", + "11557": "311", + "11560": "311", + "11563": "311", + "11566": "311", + "11569": "311", + "11572": "311", + "11575": "311", + "11578": "311", + "11581": "312", + "11584": "312", + "11587": "312", + "11590": "312", + "11593": "312", + "11596": "312", + "11599": "312", + "11602": "312", + "11605": "312", + "11608": "312", + "11611": "312", + "11614": "312", + "11617": "312", + "11620": "312", + "11623": "312", + "11626": "312", + "11629": "313", + "11632": "313", + "11635": "313", + "11638": "313", + "11641": "313", + "11644": "313", + "11647": "313", + "11650": "313", + "11653": "313", + "11656": "313", + "11659": "313", + "11662": "313", + "11665": "313", + "11668": "313", + "11671": "313", + "11674": "313", + "11677": "313", + "11680": "314", + "11683": "309", + "11686": "309", + "11689": "309", + "11692": "309", + "11695": "314", + "11698": "314", + "11701": "314", + "11704": "314", + "11707": "309", + "11710": "314", + "11713": "314", + "11716": "314", + "11719": "314", + "11722": "314", + "11725": "314", + "11728": "314", + "11731": "314", + "11734": "314", + "11737": "308", + "11740": "309", + "11743": "314", + "11746": "314", + "11749": "314", + "11752": "314", + "11755": "315", + "11758": "315", + "11761": "315", + "11764": "315", + "11770": "315", + "11773": "315", + "11776": "315", + "11779": "315", + "11782": "315", + "11785": "315", + "11788": "315", + "11791": "315", + "11794": "315", + "11797": "315", + "11800": "315", + "11803": "315", + "11806": "315", + "11809": "315", + "11812": "315", + "11815": "315", + "11821": "315", + "11824": "316", + "11827": "316", + "11830": "316", + "11833": "316", + "11836": "316", + "11839": "316", + "11842": "316", + "11845": "316", + "11848": "316", + "11851": "316", + "11854": "316", + "11857": "316", + "11860": "316", + "11863": "316", + "11866": "316", + "11869": "316", + "11872": "316", + "11875": "316", + "11878": "316", + "11881": "316", + "11884": "316", + "11887": "316", + "11890": "316", + "11893": "316", + "11896": "316", + "11899": "316", + "11902": "316", + "11905": "316", + "11908": "316", + "11911": "316", + "11914": "317", + "11917": "317", + "11920": "317", + "11923": "317", + "11926": "317", + "11929": "317", + "11932": "317", + "11935": "317", + "11938": "317", + "11941": "317", + "11944": "317", + "11947": "317", + "11950": "323", + "11953": "323", + "11956": "323", + "11959": "323", + "11962": "323", + "11965": "323", + "11968": "323", + "11971": "323", + "11974": "323", + "11977": "323", + "11980": "323", + "11983": "323", + "11986": "325", + "11989": "325", + "11992": "325", + "11995": "325", + "11998": "325", + "12001": "325", + "12004": "325", + "12007": "325", + "12010": "325", + "12013": "325", + "12016": "325", + "12019": "326", + "12022": "326", + "12025": "326", + "12028": "326", + "12031": "326", + "12034": "326", + "12037": "326", + "12040": "326", + "12043": "326", + "12046": "326", + "12049": "326", + "12052": "327", + "12055": "327", + "12058": "327", + "12061": "327", + "12064": "327", + "12067": "327", + "12070": "327", + "12073": "327", + "12076": "327", + "12079": "327", + "12082": "327", + "12085": "327", + "12088": "327", + "12091": "327", + "12094": "327", + "12097": "327", + "12100": "327", + "12103": "328", + "12106": "328", + "12109": "328", + "12112": "328", + "12115": "328", + "12118": "328", + "12121": "328", + "12124": "328", + "12127": "328", + "12130": "328", + "12133": "328", + "12136": "328", + "12139": "328", + "12142": "329", + "12145": "329", + "12148": "329", + "12151": "329", + "12154": "329", + "12157": "329", + "12160": "329", + "12163": "329", + "12166": "329", + "12169": "329", + "12172": "329", + "12175": "329", + "12178": "329", + "12181": "329", + "12184": "329", + "12187": "329", + "12190": "329", + "12193": "329", + "12196": "329", + "12199": "329", + "12202": "329", + "12205": "330", + "12208": "330", + "12211": "330", + "12214": "330", + "12217": "330", + "12220": "330", + "12223": "330", + "12226": "330", + "12229": "330", + "12232": "330", + "12235": "330", + "12238": "330", + "12241": "330", + "12244": "330", + "12247": "330", + "12250": "330", + "12253": "330", + "12256": "330", + "12259": "330", + "12262": "330", + "12265": "330", + "12268": "330", + "12271": "330", + "12274": "330", + "12277": "330", + "12280": "331", + "12283": "331", + "12286": "331", + "12289": "331", + "12292": "331", + "12295": "331", + "12298": "331", + "12301": "331", + "12304": "331", + "12307": "331", + "12310": "331", + "12313": "331", + "12316": "331", + "12319": "331", + "12322": "331", + "12325": "331", + "12328": "331", + "12331": "323", + "12334": "323", + "12337": "332", + "12340": "332", + "12343": "332", + "12346": "332", + "12349": "332", + "12352": "332", + "12355": "332", + "12358": "332", + "12361": "332", + "12364": "332", + "12367": "332", + "12370": "332", + "12373": "332", + "12376": "332", + "12379": "332", + "12382": "323", + "12385": "323", + "12388": "323", + "12391": "333", + "12394": "333", + "12397": "333", + "12400": "333", + "12403": "333", + "12406": "333", + "12409": "333", + "12412": "333", + "12415": "333", + "12418": "333", + "12421": "333", + "12424": "333", + "12427": "333", + "12430": "333", + "12433": "336", + "12436": "336", + "12439": "336", + "12442": "336", + "12445": "336", + "12448": "336", + "12451": "336", + "12452": "336", + "12454": "336", + "12457": "336", + "12460": "336", + "12463": "336", + "12466": "336", + "12469": "336", + "12472": "338", + "12475": "338", + "12478": "338", + "12481": "338", + "12484": "338", + "12487": "338", + "12490": "338", + "12493": "338", + "12496": "338", + "12499": "338", + "12502": "338", + "12505": "338", + "12508": "338", + "12511": "338", + "12514": "338", + "12517": "338", + "12520": "338", + "12523": "338", + "12526": "338", + "12529": "338", + "12532": "338", + "12535": "338", + "12538": "338", + "12541": "338", + "12547": "338", + "12550": "338", + "12553": "338", + "12559": "338", + "12562": "338", + "12565": "338", + "12571": "338", + "12574": "338", + "12577": "338", + "12580": "338", + "12583": "338", + "12586": "339", + "12589": "339", + "12592": "339", + "12595": "339", + "12601": "339", + "12604": "339", + "12610": "339", + "12613": "339", + "12616": "339", + "12619": "339", + "12622": "339", + "12625": "339", + "12628": "339", + "12631": "339", + "12634": "339", + "12637": "339", + "12640": "339", + "12643": "339", + "12646": "339", + "12649": "339", + "12652": "339", + "12655": "339", + "12656": "339", + "12658": "339", + "12661": "339", + "12664": "339", + "12667": "339", + "12670": "339", + "12673": "339", + "12676": "339", + "12679": "339", + "12682": "339", + "12685": "339", + "12688": "340", + "12694": "340", + "12700": "340", + "12703": "340", + "12706": "340", + "12709": "340", + "12712": "340", + "12715": "340", + "12718": "340", + "12721": "340", + "12724": "340", + "12730": "340", + "12736": "340", + "12739": "340", + "12745": "340", + "12748": "340", + "12751": "340", + "12754": "340", + "12757": "340", + "12760": "340", + "12763": "340", + "12769": "340", + "12772": "340", + "12775": "340", + "12778": "340", + "12784": "340", + "12790": "340", + "12793": "340", + "12802": "340", + "12808": "340", + "12811": "340", + "12817": "336", + "12820": "336", + "12823": "340", + "12826": "341", + "12832": "341", + "12841": "341", + "12844": "341", + "12847": "341", + "12850": "341", + "12853": "341", + "12856": "341", + "12859": "341", + "12862": "341", + "12865": "341", + "12868": "341", + "12871": "341", + "12874": "341", + "12877": "341", + "12880": "341", + "12889": "341", + "12892": "341", + "12898": "341", + "12901": "341", + "12904": "341", + "12907": "341", + "12910": "341", + "12916": "341", + "12919": "341", + "12922": "341", + "12925": "341", + "12934": "341", + "12937": "341", + "12940": "341", + "12943": "341", + "12949": "341", + "12958": "341", + "12961": "341", + "12964": "341", + "12967": "341", + "12970": "342", + "12976": "342", + "12979": "342", + "12985": "342", + "12988": "342", + "12991": "342", + "12994": "342", + "12997": "342", + "13000": "342", + "13003": "342", + "13012": "342", + "13018": "342", + "13021": "342", + "13024": "342", + "13027": "342", + "13030": "342", + "13036": "342", + "13039": "342", + "13045": "342", + "13048": "342", + "13051": "342", + "13054": "342", + "13057": "342", + "13060": "342", + "13063": "342", + "13066": "342", + "13069": "342", + "13072": "342", + "13075": "343", + "13078": "343", + "13081": "343", + "13084": "336", + "13087": "343", + "13090": "343", + "13093": "343", + "13096": "343", + "13102": "343", + "13108": "336", + "13111": "343", + "13114": "343", + "13120": "343", + "13126": "343", + "13129": "343", + "13132": "343", + "13135": "343", + "13138": "343", + "13141": "343", + "13144": "343", + "13150": "343", + "13156": "343", + "13159": "343", + "13162": "343", + "13165": "343", + "13171": "343", + "13177": "343", + "13180": "343", + "13183": "343", + "13186": "343", + "13189": "343", + "13192": "344", + "13195": "344", + "13198": "344", + "13201": "344", + "13204": "344", + "13207": "344", + "13210": "344", + "13213": "344", + "13216": "344", + "13219": "344", + "13222": "344", + "13225": "336", + "13228": "344", + "13231": "344", + "13234": "344", + "13237": "344", + "13240": "344", + "13243": "344", + "13246": "344", + "13249": "344", + "13252": "344", + "13255": "344", + "13258": "344", + "13261": "344", + "13264": "344", + "13267": "344", + "13270": "344", + "13273": "344", + "13276": "344", + "13279": "344", + "13282": "344", + "13285": "347", + "13288": "347", + "13291": "347", + "13294": "347", + "13297": "347", + "13300": "347", + "13303": "347", + "13306": "347", + "13309": "347", + "13312": "347", + "13315": "347", + "13318": "347", + "13321": "349", + "13324": "349", + "13327": "349", + "13330": "349", + "13333": "349", + "13336": "349", + "13339": "349", + "13342": "349", + "13345": "349", + "13348": "349", + "13351": "349", + "13354": "349", + "13357": "349", + "13360": "349", + "13363": "349", + "13366": "347", + "13369": "349", + "13372": "347", + "13381": "347", + "13384": "350", + "13387": "350", + "13390": "350", + "13393": "350", + "13396": "350", + "13399": "350", + "13402": "350", + "13405": "350", + "13408": "350", + "13411": "350", + "13414": "350", + "13417": "350", + "13420": "350", + "13423": "350", + "13426": "347", + "13429": "350", + "13432": "350", + "13435": "350", + "13438": "350", + "13441": "351", + "13444": "347", + "13447": "347", + "13450": "351", + "13453": "351", + "13456": "351", + "13459": "347", + "13465": "351", + "13468": "351", + "13471": "351", + "13474": "351", + "13477": "351", + "13480": "351", + "13483": "351", + "13486": "351", + "13489": "351", + "13492": "351", + "13495": "351", + "13498": "351", + "13501": "352", + "13504": "352", + "13507": "347", + "13510": "352", + "13513": "347", + "13516": "352", + "13519": "352", + "13522": "352", + "13525": "352", + "13528": "352", + "13531": "352", + "13534": "352", + "13540": "352", + "13543": "352", + "13546": "352", + "13552": "352", + "13555": "352", + "13558": "352", + "13561": "352", + "13567": "353", + "13570": "353", + "13573": "353", + "13576": "353", + "13579": "353", + "13582": "353", + "13585": "353", + "13588": "353", + "13591": "353", + "13594": "353", + "13597": "353", + "13600": "353", + "13606": "353", + "13609": "353", + "13612": "353", + "13615": "353", + "13618": "353", + "13621": "353", + "13624": "353", + "13627": "353", + "13630": "353", + "13636": "356", + "13657": "356", + "13666": "356", + "13669": "356", + "13678": "356", + "13681": "356", + "13684": "356", + "13687": "356", + "13690": "356", + "13693": "356", + "13696": "356", + "13699": "356", + "13705": "356", + "13708": "356", + "13711": "356", + "13717": "356", + "13720": "356", + "13723": "356", + "13726": "356", + "13732": "356", + "13735": "356", + "13741": "359", + "13747": "359", + "13750": "359", + "13753": "359", + "13756": "359", + "13762": "359", + "13765": "359", + "13768": "359", + "13777": "359", + "13780": "359", + "13783": "359", + "13786": "359", + "13789": "359", + "13792": "359", + "13795": "360", + "13801": "360", + "13807": "360", + "13810": "360", + "13819": "360", + "13822": "360", + "13825": "360", + "13831": "360", + "13834": "360", + "13843": "360", + "13846": "360", + "13849": "360", + "13852": "360", + "13861": "360", + "13864": "360", + "13867": "360", + "13870": "360", + "13873": "360", + "13876": "360", + "13879": "360", + "13882": "360", + "13885": "360", + "13888": "360", + "13891": "361", + "13894": "361", + "13900": "361", + "13906": "361", + "13909": "361", + "13912": "361", + "13915": "361", + "13918": "361", + "13921": "361", + "13924": "361", + "13927": "361", + "13930": "361", + "13939": "361", + "13942": "361", + "13945": "361", + "13948": "361", + "13951": "361", + "13954": "361", + "13957": "361", + "13963": "361", + "13966": "362", + "13972": "362", + "13975": "362", + "13978": "362", + "13984": "362", + "13987": "362", + "13990": "362", + "13993": "362", + "13996": "362", + "13999": "362", + "14002": "362", + "14005": "362", + "14008": "362", + "14011": "362", + "14014": "362", + "14017": "362", + "14020": "362", + "14023": "362", + "14026": "363", + "14029": "363", + "14032": "363", + "14035": "363", + "14038": "363", + "14041": "363", + "14044": "363", + "14047": "363", + "14050": "363", + "14053": "363", + "14056": "363", + "14059": "363", + "14062": "363", + "14065": "363", + "14068": "363", + "14071": "363", + "14074": "363", + "14077": "363", + "14080": "363", + "14083": "363", + "14086": "363", + "14089": "364", + "14092": "364", + "14095": "364", + "14098": "364", + "14101": "364", + "14104": "364", + "14110": "364", + "14116": "364", + "14122": "364", + "14125": "364", + "14128": "364", + "14134": "364", + "14143": "364", + "14146": "364", + "14152": "365", + "14155": "365", + "14158": "365", + "14161": "365", + "14164": "365", + "14167": "365", + "14170": "365", + "14176": "365", + "14179": "365", + "14182": "365", + "14185": "365", + "14188": "365", + "14191": "365", + "14194": "365", + "14197": "365", + "14200": "365", + "14203": "365", + "14206": "365", + "14209": "365", + "14212": "365", + "14215": "366", + "14218": "366", + "14221": "366", + "14224": "366", + "14227": "366", + "14233": "366", + "14236": "366", + "14248": "366", + "14254": "366", + "14260": "366", + "14263": "366", + "14266": "366", + "14269": "366", + "14272": "366", + "14275": "366", + "14281": "366", + "14284": "366", + "14287": "366", + "14293": "366", + "14296": "366", + "14302": "366", + "14308": "366", + "14311": "366", + "14317": "366", + "14320": "369", + "14323": "369", + "14326": "369", + "14329": "369", + "14332": "369", + "14335": "369", + "14338": "369", + "14341": "369", + "14344": "369", + "14347": "369", + "14350": "369", + "14353": "369", + "14356": "369", + "14359": "369", + "14362": "370", + "14365": "370", + "14368": "370", + "14369": "370", + "14371": "370", + "14374": "370", + "14375": "370", + "14377": "370", + "14380": "370", + "14383": "372", + "14386": "372", + "14389": "372", + "14392": "372", + "14395": "372", + "14398": "372", + "14401": "372", + "14404": "372", + "14407": "372", + "14410": "372", + "14413": "372", + "14416": "372", + "14419": "372", + "14422": "372", + "14425": "372", + "14428": "372", + "14431": "372", + "14434": "372", + "14437": "372", + "14440": "372", + "14443": "372", + "14446": "372", + "14449": "372", + "14452": "372", + "14455": "372", + "14458": "372", + "14461": "372", + "14464": "373", + "14467": "373", + "14470": "373", + "14473": "373", + "14476": "373", + "14479": "373", + "14482": "373", + "14485": "373", + "14488": "373", + "14491": "373", + "14494": "373", + "14497": "373", + "14500": "373", + "14503": "373", + "14506": "373", + "14509": "373", + "14512": "373", + "14515": "373", + "14518": "373", + "14521": "373", + "14524": "373", + "14527": "374", + "14530": "374", + "14533": "374", + "14536": "374", + "14539": "374", + "14542": "374", + "14545": "374", + "14548": "374", + "14551": "374", + "14554": "374", + "14557": "374", + "14560": "375", + "14563": "375", + "14566": "375", + "14569": "375", + "14572": "375", + "14575": "375", + "14578": "375", + "14581": "375", + "14584": "375", + "14587": "375", + "14590": "375", + "14593": "375", + "14596": "375", + "14599": "375", + "14602": "375", + "14608": "375", + "14611": "375", + "14614": "375", + "14617": "375", + "14620": "376", + "14623": "376", + "14629": "376", + "14632": "376", + "14635": "376", + "14638": "376", + "14641": "376", + "14647": "376", + "14650": "376", + "14653": "376", + "14656": "376", + "14659": "376", + "14662": "376", + "14665": "376", + "14668": "376", + "14671": "376", + "14674": "376", + "14677": "376", + "14680": "376", + "14683": "376", + "14686": "376", + "14689": "376", + "14692": "376", + "14695": "376", + "14698": "376", + "14701": "377", + "14704": "377", + "14707": "377", + "14710": "377", + "14713": "377", + "14719": "377", + "14722": "377", + "14725": "377", + "14728": "377", + "14731": "377", + "14734": "377", + "14737": "377", + "14740": "377", + "14743": "377", + "14746": "377", + "14749": "377", + "14752": "377", + "14755": "380", + "14758": "380", + "14761": "380", + "14764": "380", + "14767": "380", + "14770": "380", + "14773": "380", + "14776": "380", + "14779": "380", + "14782": "380", + "14785": "380", + "14788": "380", + "14791": "380", + "14794": "380", + "14797": "380", + "14800": "380", + "14803": "380", + "14806": "380", + "14809": "381", + "14812": "381", + "14815": "381", + "14818": "381", + "14821": "381", + "14823": "381", + "14824": "381", + "14830": "382", + "14833": "382", + "14836": "382", + "14839": "382", + "14842": "382", + "14845": "384", + "14848": "384", + "14854": "384", + "14857": "384", + "14860": "384", + "14863": "384", + "14864": "384", + "14866": "384", + "14869": "385", + "14872": "385", + "14875": "385", + "14878": "385", + "14881": "385", + "14884": "385", + "14887": "385", + "14890": "385", + "14896": "385", + "14899": "385", + "14902": "385", + "14908": "385", + "14911": "385", + "14914": "385", + "14917": "385", + "14923": "386", + "14926": "386", + "14929": "386", + "14932": "386", + "14935": "386", + "14938": "386", + "14941": "386", + "14944": "386", + "14947": "386", + "14950": "386", + "14953": "386", + "14956": "386", + "14959": "386", + "14962": "386", + "14965": "386", + "14968": "386", + "14971": "386", + "14974": "386", + "14977": "386", + "14980": "386", + "14986": "386", + "14995": "387", + "14998": "387", + "14999": "387", + "15001": "387", + "15004": "387", + "15007": "387", + "15010": "387", + "15013": "387", + "15016": "387", + "15019": "387", + "15022": "387", + "15025": "387", + "15031": "388", + "15034": "388", + "15037": "388", + "15040": "388", + "15043": "388", + "15046": "388", + "15049": "388", + "15052": "388", + "15055": "388", + "15058": "388", + "15061": "389", + "15064": "389", + "15067": "389", + "15070": "389", + "15073": "389", + "15076": "389", + "15079": "389", + "15085": "389", + "15088": "389", + "15091": "389", + "15094": "389", + "15097": "389", + "15100": "389", + "15103": "389", + "15106": "389", + "15109": "389", + "15112": "389", + "15115": "389", + "15118": "389", + "15121": "389", + "15124": "389", + "15127": "390", + "15133": "390", + "15136": "390", + "15139": "390", + "15142": "390", + "15145": "390", + "15148": "390", + "15151": "390", + "15154": "390", + "15160": "390", + "15163": "390", + "15169": "390", + "15172": "390", + "15175": "390", + "15178": "390", + "15181": "390", + "15184": "390", + "15187": "391", + "15190": "391", + "15196": "391", + "15199": "391", + "15202": "391", + "15205": "391", + "15208": "391", + "15211": "391", + "15214": "391", + "15217": "391", + "15220": "391", + "15223": "391", + "15226": "391", + "15229": "391", + "15232": "391", + "15235": "391", + "15238": "391", + "15241": "391", + "15247": "391", + "15250": "391", + "15253": "391", + "15256": "391", + "15259": "391", + "15265": "391", + "15268": "391", + "15271": "392", + "15274": "392", + "15277": "392", + "15280": "392", + "15283": "392", + "15286": "392", + "15292": "392", + "15298": "392", + "15304": "392", + "15307": "392", + "15313": "392", + "15316": "392", + "15319": "392", + "15322": "392", + "15325": "392", + "15328": "392", + "15331": "392", + "15334": "392", + "15340": "392", + "15343": "392", + "15349": "393", + "15352": "393", + "15355": "393", + "15358": "393", + "15361": "393", + "15364": "393", + "15367": "393", + "15376": "393", + "15379": "393", + "15382": "393", + "15385": "393", + "15388": "393", + "15391": "393", + "15397": "394", + "15403": "394", + "15406": "394", + "15409": "394", + "15412": "394", + "15415": "394", + "15418": "394", + "15421": "394", + "15427": "394", + "15430": "394", + "15433": "394", + "15436": "394", + "15439": "394", + "15442": "394", + "15445": "394", + "15448": "394", + "15451": "394", + "15454": "394", + "15457": "394", + "15460": "394", + "15463": "394", + "15466": "394", + "15469": "394", + "15472": "394", + "15475": "394", + "15478": "394", + "15493": "395", + "15499": "395", + "15502": "395", + "15505": "395", + "15508": "395", + "15511": "395", + "15514": "395", + "15517": "395", + "15520": "395", + "15523": "395", + "15526": "395", + "15532": "395", + "15535": "395", + "15538": "395", + "15541": "395", + "15544": "395", + "15547": "395", + "15550": "395", + "15553": "395", + "15556": "395", + "15559": "395", + "15565": "395", + "15568": "395", + "15571": "395", + "15574": "395", + "15577": "395", + "15583": "395", + "15586": "395", + "15592": "395", + "15598": "395", + "15607": "396", + "15610": "396", + "15619": "396", + "15622": "396", + "15628": "396", + "15631": "396", + "15634": "396", + "15637": "396", + "15640": "396", + "15643": "396", + "15646": "396", + "15649": "396", + "15652": "396", + "15655": "396", + "15658": "396", + "15661": "396", + "15664": "397", + "15667": "397", + "15670": "397", + "15673": "397", + "15676": "397", + "15679": "397", + "15682": "397", + "15685": "397", + "15688": "397", + "15691": "397", + "15700": "397", + "15703": "397", + "15706": "397", + "15709": "397", + "15712": "397", + "15715": "397", + "15718": "397", + "15721": "397", + "15724": "397", + "15727": "397", + "15730": "397", + "15733": "397", + "15736": "397", + "15739": "397", + "15742": "397", + "15745": "397", + "15748": "397", + "15751": "397", + "15754": "397", + "15757": "397", + "15760": "397", + "15763": "397", + "15766": "397", + "15769": "397", + "15772": "398", + "15775": "398", + "15778": "398", + "15781": "398", + "15784": "398", + "15787": "398", + "15793": "398", + "15796": "398", + "15799": "398", + "15802": "398", + "15805": "398", + "15808": "398", + "15811": "398", + "15814": "398", + "15817": "398", + "15820": "398", + "15823": "398", + "15829": "398", + "15832": "398", + "15835": "398", + "15838": "398", + "15841": "398", + "15847": "398", + "15850": "380", + "15853": "398", + "15856": "380", + "15859": "380", + "15865": "399", + "15871": "399", + "15877": "399", + "15880": "399", + "15883": "399", + "15886": "399", + "15889": "399", + "15892": "399", + "15895": "399", + "15901": "399", + "15907": "399", + "15910": "399", + "15913": "380", + "15916": "399", + "15919": "399", + "15922": "380", + "15925": "380", + "15928": "399", + "15937": "399", + "15940": "399", + "15946": "399", + "15949": "399", + "15952": "399", + "15955": "399", + "15958": "399", + "15961": "399", + "15964": "399", + "15967": "399", + "15970": "380", + "15973": "399", + "15976": "399", + "15979": "399", + "15982": "399", + "15985": "399", + "15988": "399", + "15991": "399", + "15994": "399", + "15997": "399", + "16000": "399", + "16003": "399", + "16006": "399", + "16012": "400", + "16015": "400", + "16018": "400", + "16021": "400", + "16027": "400", + "16030": "400", + "16033": "400", + "16036": "400", + "16039": "400", + "16042": "400", + "16045": "400", + "16048": "400", + "16057": "400", + "16063": "400", + "16066": "400", + "16069": "400", + "16072": "400", + "16075": "400", + "16078": "400", + "16081": "400", + "16084": "400", + "16087": "400", + "16090": "400", + "16093": "401", + "16096": "401", + "16099": "401", + "16102": "401", + "16105": "401", + "16108": "401", + "16114": "401", + "16117": "401", + "16120": "401", + "16123": "401", + "16132": "401", + "16135": "401", + "16138": "401", + "16141": "401", + "16144": "401", + "16147": "401", + "16150": "401", + "16153": "401", + "16156": "401", + "16159": "401", + "16162": "401", + "16165": "401", + "16168": "401", + "16171": "401", + "16174": "402", + "16177": "402", + "16180": "402", + "16183": "402", + "16186": "402", + "16195": "402", + "16198": "402", + "16201": "402", + "16204": "402", + "16207": "402", + "16210": "402", + "16213": "402", + "16216": "402", + "16219": "402", + "16222": "402", + "16225": "402", + "16228": "403", + "16231": "403", + "16234": "403", + "16240": "403", + "16243": "403", + "16246": "403", + "16249": "403", + "16252": "403", + "16258": "403", + "16261": "403", + "16264": "403", + "16267": "403", + "16273": "403", + "16276": "403", + "16279": "404", + "16282": "404", + "16285": "404", + "16288": "404", + "16291": "404", + "16294": "404", + "16297": "404", + "16303": "404", + "16309": "404", + "16315": "404", + "16318": "404", + "16321": "404", + "16324": "404", + "16327": "404", + "16330": "404", + "16333": "404", + "16336": "404", + "16339": "404", + "16342": "404", + "16345": "404", + "16348": "404", + "16351": "404", + "16354": "404", + "16357": "404", + "16360": "404", + "16363": "404", + "16366": "404", + "16369": "404", + "16375": "404", + "16378": "405", + "16381": "405", + "16384": "405", + "16390": "405", + "16393": "405", + "16396": "380", + "16399": "405", + "16402": "405", + "16405": "405", + "16408": "405", + "16414": "405", + "16417": "405", + "16420": "405", + "16423": "405", + "16426": "405", + "16429": "380", + "16432": "380", + "16435": "380", + "16438": "406", + "16441": "380", + "16447": "406", + "16453": "406", + "16456": "406", + "16459": "380", + "16462": "406", + "16465": "406", + "16468": "406", + "16471": "406", + "16474": "406", + "16477": "406", + "16480": "406", + "16483": "406", + "16489": "406", + "16492": "406", + "16495": "406", + "16498": "406", + "16501": "406", + "16507": "380", + "16510": "406", + "16513": "382", + "16516": "382", + "16519": "406", + "16522": "380", + "16525": "380", + "16528": "382", + "16531": "382", + "16534": "382", + "16537": "382", + "16540": "406", + "16543": "406", + "16546": "406", + "16549": "406", + "16552": "406", + "16555": "406", + "16558": "406", + "16561": "407", + "16564": "407", + "16567": "407", + "16570": "407", + "16576": "407", + "16579": "407", + "16582": "407", + "16585": "407", + "16591": "407", + "16594": "407", + "16597": "407", + "16600": "407", + "16603": "407", + "16606": "407", + "16609": "407", + "16612": "407", + "16618": "407", + "16621": "407", + "16624": "407", + "16627": "407", + "16630": "407", + "16633": "407", + "16636": "407", + "16639": "407", + "16642": "407", + "16645": "407", + "16648": "407", + "16651": "407", + "16654": "407", + "16657": "407", + "16660": "407", + "16663": "412", + "16666": "412", + "16669": "412", + "16670": "412", + "16672": "412", + "16673": "412", + "16675": "412", + "16678": "412", + "16681": "412", + "16684": "412", + "16687": "412", + "16690": "412", + "16693": "412", + "16696": "412", + "16699": "412", + "16702": "412", + "16705": "412", + "16708": "412", + "16711": "412", + "16714": "412", + "16717": "413", + "16720": "413", + "16723": "413", + "16726": "413", + "16729": "413", + "16732": "413", + "16735": "413", + "16738": "415", + "16741": "415", + "16744": "415", + "16747": "415", + "16750": "415", + "16753": "415", + "16756": "415", + "16759": "415", + "16763": "415", + "16765": "415", + "16768": "415", + "16771": "415", + "16774": "415", + "16777": "416", + "16780": "416", + "16783": "416", + "16786": "416", + "16789": "416", + "16792": "416", + "16795": "416", + "16798": "416", + "16801": "416", + "16804": "416", + "16807": "416", + "16810": "416", + "16813": "417", + "16816": "417", + "16819": "417", + "16822": "417", + "16825": "417", + "16828": "417", + "16831": "417", + "16834": "417", + "16837": "417", + "16840": "417", + "16843": "417", + "16846": "417", + "16849": "417", + "16852": "417", + "16855": "417", + "16858": "417", + "16861": "417", + "16864": "417", + "16867": "417", + "16870": "417", + "16873": "417", + "16876": "418", + "16879": "418", + "16882": "418", + "16885": "418", + "16900": "418", + "16903": "418", + "16904": "418", + "16906": "418", + "16909": "418", + "16912": "418", + "16915": "418", + "16921": "418", + "16924": "418", + "16927": "418", + "16930": "418", + "16933": "418", + "16936": "418", + "16939": "414", + "16941": "419", + "16942": "419", + "16945": "419", + "16948": "419", + "16951": "419", + "16954": "419", + "16957": "419", + "16960": "419", + "16963": "419", + "16966": "419", + "16969": "419", + "16972": "419", + "16975": "419", + "16978": "419", + "16981": "419", + "16984": "419", + "16987": "419", + "16993": "414", + "16994": "414", + "16996": "419", + "17003": "414", + "17005": "414", + "17008": "414", + "17011": "414", + "17014": "414", + "17017": "414", + "17020": "419", + "17023": "419", + "17026": "419", + "17029": "419", + "17032": "419", + "17035": "420", + "17038": "420", + "17041": "420", + "17044": "420", + "17047": "420", + "17050": "420", + "17053": "420", + "17056": "420", + "17059": "420", + "17062": "420", + "17065": "420", + "17068": "420", + "17071": "420", + "17074": "420", + "17077": "420", + "17080": "420", + "17083": "420", + "17086": "420", + "17089": "420", + "17092": "420", + "17095": "420", + "17098": "421", + "17101": "421", + "17104": "432", + "17107": "432", + "17110": "432", + "17113": "432", + "17116": "432", + "17119": "421", + "17122": "421", + "17125": "432", + "17128": "432", + "17131": "432", + "17134": "432", + "17137": "432", + "17140": "421", + "17143": "421", + "17146": "421", + "17149": "421", + "17152": "421", + "17155": "421", + "17158": "421", + "17161": "421", + "17164": "421", + "17167": "421", + "17170": "421", + "17173": "421", + "17176": "421", + "17179": "421", + "17182": "421", + "17185": "421", + "17188": "421", + "17191": "421", + "17194": "421", + "17197": "421", + "17200": "421", + "17203": "421", + "17206": "421", + "17209": "421", + "17212": "421", + "17215": "421", + "17218": "421", + "17221": "421", + "17224": "421", + "17227": "422", + "17230": "422", + "17233": "422", + "17236": "422", + "17239": "422", + "17242": "422", + "17245": "422", + "17248": "422", + "17251": "422", + "17254": "422", + "17257": "422", + "17260": "422", + "17263": "422", + "17266": "423", + "17269": "423", + "17272": "423", + "17275": "423", + "17278": "423", + "17281": "423", + "17284": "423", + "17287": "423", + "17290": "423", + "17293": "423", + "17296": "423", + "17299": "423", + "17302": "423", + "17305": "423", + "17308": "423", + "17311": "423", + "17314": "423", + "17317": "423", + "17320": "423", + "17323": "423", + "17325": "423", + "17326": "423", + "17329": "424", + "17332": "424", + "17335": "424", + "17338": "424", + "17341": "424", + "17344": "424", + "17347": "424", + "17350": "424", + "17353": "424", + "17356": "424", + "17357": "424", + "17359": "424", + "17362": "424", + "17365": "424", + "17368": "424", + "17371": "424", + "17374": "424", + "17377": "424", + "17380": "424", + "17383": "424", + "17386": "424", + "17389": "425", + "17392": "425", + "17395": "425", + "17398": "425", + "17401": "425", + "17404": "425", + "17407": "425", + "17410": "425", + "17413": "425", + "17416": "425", + "17419": "425", + "17422": "425", + "17425": "425", + "17428": "425", + "17431": "425", + "17434": "425", + "17437": "425", + "17440": "425", + "17443": "425", + "17446": "425", + "17449": "425", + "17452": "425", + "17455": "425", + "17458": "425", + "17461": "425", + "17464": "425", + "17467": "425", + "17476": "425", + "17479": "425", + "17482": "425", + "17485": "425", + "17488": "425", + "17491": "425", + "17494": "425", + "17497": "425", + "17500": "425", + "17503": "425", + "17506": "426", + "17509": "426", + "17510": "426", + "17512": "426", + "17515": "426", + "17518": "426", + "17521": "426", + "17524": "426", + "17525": "426", + "17527": "426", + "17530": "426", + "17533": "426", + "17536": "426", + "17539": "426", + "17542": "426", + "17545": "426", + "17548": "426", + "17551": "426", + "17554": "426", + "17557": "426", + "17560": "426", + "17563": "426", + "17566": "426", + "17569": "426", + "17572": "426", + "17575": "426", + "17578": "426", + "17581": "426", + "17584": "426", + "17587": "426", + "17590": "426", + "17593": "426", + "17596": "426", + "17599": "426", + "17602": "426", + "17605": "426", + "17608": "426", + "17611": "426", + "17614": "426", + "17617": "427", + "17619": "427", + "17620": "427", + "17623": "427", + "17626": "427", + "17629": "427", + "17632": "427", + "17635": "427", + "17638": "427", + "17641": "427", + "17644": "427", + "17647": "427", + "17650": "427", + "17653": "427", + "17656": "427", + "17659": "427", + "17662": "427", + "17665": "427", + "17668": "427", + "17671": "427", + "17674": "427", + "17677": "427", + "17680": "427", + "17683": "427", + "17686": "427", + "17689": "427", + "17692": "427", + "17695": "427", + "17698": "427", + "17701": "427", + "17704": "427", + "17707": "427", + "17710": "427", + "17713": "428", + "17716": "428", + "17719": "428", + "17722": "428", + "17723": "428", + "17725": "428", + "17728": "428", + "17731": "428", + "17734": "428", + "17737": "428", + "17743": "428", + "17749": "428", + "17752": "428", + "17755": "428", + "17758": "428", + "17759": "428", + "17761": "428", + "17764": "428", + "17767": "428", + "17770": "428", + "17773": "428", + "17776": "428", + "17779": "428", + "17782": "428", + "17785": "428", + "17788": "428", + "17791": "428", + "17794": "428", + "17797": "428", + "17800": "428", + "17803": "428", + "17806": "428", + "17809": "428", + "17812": "428", + "17815": "428", + "17818": "428", + "17821": "428", + "17824": "428", + "17827": "429", + "17830": "429", + "17833": "429", + "17836": "429", + "17839": "429", + "17842": "429", + "17845": "429", + "17848": "429", + "17851": "429", + "17854": "429", + "17857": "429", + "17860": "429", + "17863": "429", + "17866": "429", + "17869": "429", + "17875": "429", + "17878": "429", + "17881": "429", + "17884": "429", + "17887": "429", + "17890": "429", + "17893": "429", + "17896": "429", + "17899": "429", + "17902": "429", + "17905": "429", + "17908": "412", + "17911": "429", + "17914": "412", + "17917": "429", + "17920": "412", + "17923": "412", + "17926": "429", + "17932": "430", + "17935": "430", + "17938": "430", + "17941": "430", + "17944": "430", + "17947": "430", + "17950": "430", + "17953": "430", + "17956": "430", + "17959": "430", + "17962": "430", + "17968": "430", + "17971": "430", + "17977": "430", + "17980": "430", + "17983": "430", + "17986": "430", + "17989": "430", + "17998": "430", + "18001": "431", + "18004": "431", + "18007": "431", + "18008": "431", + "18010": "431", + "18013": "412", + "18016": "431", + "18019": "431", + "18022": "431", + "18025": "431", + "18028": "431", + "18031": "431", + "18034": "431", + "18037": "431", + "18040": "431", + "18043": "431", + "18052": "431", + "18055": "431", + "18064": "431", + "18070": "436", + "18073": "436", + "18076": "436", + "18077": "436", + "18079": "436", + "18082": "436", + "18085": "436", + "18088": "436", + "18091": "436", + "18094": "436", + "18097": "436", + "18100": "436", + "18103": "436", + "18109": "436", + "18112": "436", + "18115": "437", + "18118": "437", + "18121": "437", + "18124": "437", + "18127": "437", + "18130": "437", + "18133": "439", + "18136": "439", + "18139": "439", + "18142": "439", + "18145": "439", + "18148": "439", + "18157": "439", + "18160": "439", + "18163": "439", + "18172": "439", + "18175": "439", + "18178": "439", + "18181": "439", + "18184": "439", + "18187": "439", + "18190": "439", + "18193": "439", + "18196": "439", + "18199": "439", + "18202": "439", + "18205": "439", + "18211": "439", + "18214": "439", + "18217": "439", + "18223": "439", + "18229": "440", + "18235": "440", + "18241": "440", + "18244": "440", + "18247": "440", + "18253": "440", + "18259": "440", + "18262": "440", + "18274": "440", + "18277": "440", + "18280": "440", + "18283": "440", + "18298": "440", + "18304": "440", + "18307": "440", + "18310": "440", + "18313": "441", + "18316": "441", + "18319": "441", + "18322": "441", + "18325": "441", + "18328": "441", + "18331": "441", + "18334": "441", + "18340": "441", + "18343": "441", + "18352": "442", + "18355": "442", + "18358": "442", + "18364": "442", + "18367": "442", + "18370": "442", + "18373": "442", + "18376": "442", + "18379": "442", + "18382": "442", + "18385": "442", + "18388": "442", + "18391": "442", + "18394": "442", + "18397": "442", + "18400": "442", + "18403": "442", + "18406": "443", + "18409": "448", + "18412": "448", + "18415": "443", + "18418": "443", + "18421": "448", + "18427": "443", + "18430": "448", + "18433": "443", + "18436": "443", + "18439": "443", + "18445": "443", + "18454": "443", + "18457": "448", + "18463": "443", + "18466": "443", + "18472": "443", + "18475": "443", + "18478": "443", + "18481": "443", + "18484": "443", + "18487": "443", + "18490": "443", + "18493": "448", + "18496": "444", + "18499": "444", + "18502": "444", + "18505": "444", + "18508": "444", + "18514": "444", + "18517": "444", + "18520": "444", + "18523": "444", + "18526": "444", + "18529": "444", + "18532": "444", + "18535": "444", + "18538": "444", + "18541": "444", + "18544": "444", + "18547": "444", + "18550": "444", + "18553": "444", + "18556": "444", + "18559": "444", + "18562": "445", + "18565": "445", + "18568": "448", + "18571": "445", + "18577": "448", + "18580": "448", + "18583": "448", + "18586": "445", + "18589": "445", + "18592": "445", + "18595": "445", + "18598": "448", + "18601": "445", + "18604": "445", + "18607": "445", + "18619": "445", + "18622": "445", + "18625": "445", + "18628": "445", + "18631": "445", + "18634": "445", + "18637": "445", + "18643": "445", + "18649": "445", + "18652": "445", + "18658": "445", + "18667": "445", + "18670": "448", + "18673": "446", + "18676": "446", + "18679": "446", + "18682": "446", + "18685": "446", + "18691": "446", + "18694": "446", + "18697": "446", + "18706": "446", + "18709": "446", + "18712": "446", + "18715": "446", + "18721": "446", + "18724": "446", + "18727": "446", + "18730": "446", + "18733": "446", + "18736": "446", + "18739": "446", + "18742": "446", + "18745": "446", + "18748": "446", + "18751": "446", + "18754": "449", + "18757": "447", + "18760": "447", + "18763": "447", + "18766": "447", + "18769": "447", + "18772": "447", + "18775": "447", + "18778": "447", + "18781": "449", + "18784": "447", + "18787": "447", + "18790": "447", + "18793": "447", + "18796": "449", + "18799": "447", + "18802": "447", + "18805": "447", + "18808": "449", + "18811": "447", + "18814": "447", + "18820": "449", + "18823": "449", + "18829": "449", + "18832": "449", + "18835": "449", + "18838": "447", + "18841": "449", + "18844": "447", + "18847": "449", + "18850": "447", + "18853": "450", + "18856": "450", + "18859": "450", + "18865": "450", + "18868": "450", + "18871": "450", + "18874": "450", + "18877": "450", + "18880": "450", + "18883": "450", + "18886": "450", + "18889": "450", + "18892": "450", + "18895": "450", + "18898": "450", + "18901": "452", + "18904": "452", + "18907": "452", + "18910": "452", + "18913": "452", + "18916": "452", + "18919": "452", + "18922": "452", + "18925": "452", + "18928": "452", + "18931": "452", + "18934": "452", + "18937": "452", + "18943": "452", + "18946": "452", + "18949": "453", + "18952": "453", + "18955": "453", + "18958": "453", + "18961": "453", + "18964": "453", + "18967": "453", + "18970": "453", + "18973": "453", + "18976": "453", + "18979": "453", + "18985": "453", + "18988": "453", + "18991": "453", + "18994": "453", + "18997": "453", + "19000": "453", + "19003": "453", + "19006": "453", + "19009": "458", + "19012": "454", + "19015": "454", + "19018": "454", + "19021": "454", + "19024": "454", + "19027": "454", + "19030": "454", + "19033": "454", + "19036": "454", + "19039": "454", + "19042": "454", + "19045": "454", + "19048": "454", + "19051": "454", + "19057": "454", + "19060": "458", + "19063": "454", + "19066": "458", + "19069": "458", + "19072": "454", + "19075": "458", + "19078": "458", + "19081": "458", + "19084": "458", + "19087": "458", + "19090": "458", + "19093": "458", + "19096": "458", + "19099": "458", + "19102": "458", + "19105": "458", + "19108": "458", + "19111": "455", + "19114": "455", + "19117": "455", + "19120": "455", + "19123": "455", + "19126": "455", + "19129": "455", + "19132": "455", + "19135": "455", + "19138": "455", + "19141": "455", + "19144": "455", + "19147": "455", + "19150": "455", + "19156": "455", + "19159": "455", + "19162": "455", + "19165": "455", + "19168": "455", + "19174": "455", + "19177": "455", + "19180": "455", + "19183": "455", + "19186": "455", + "19189": "455", + "19192": "455", + "19195": "455", + "19198": "455", + "19201": "456", + "19204": "456", + "19207": "456", + "19210": "456", + "19213": "456", + "19216": "456", + "19219": "456", + "19222": "456", + "19225": "456", + "19228": "456", + "19231": "456", + "19234": "456", + "19237": "456", + "19240": "456", + "19243": "456", + "19246": "457", + "19249": "457", + "19252": "457", + "19255": "457", + "19258": "457", + "19261": "457", + "19264": "457", + "19267": "457", + "19270": "457", + "19273": "457", + "19276": "457", + "19279": "457", + "19285": "457", + "19288": "457", + "19291": "457", + "19294": "457", + "19297": "457", + "19300": "457", + "19303": "457", + "19306": "457", + "19309": "457", + "19312": "457", + "19315": "457", + "19318": "457", + "19321": "457", + "19327": "457", + "19330": "461", + "19333": "461", + "19336": "461", + "19339": "461", + "19342": "461", + "19345": "461", + "19348": "461", + "19351": "461", + "19354": "461", + "19357": "462", + "19358": "462", + "19360": "462", + "19361": "462", + "19363": "464", + "19366": "464", + "19369": "464", + "19372": "464", + "19375": "464", + "19378": "464", + "19384": "464", + "19387": "464", + "19393": "464", + "19396": "464", + "19402": "464", + "19405": "464", + "19408": "464", + "19414": "464", + "19417": "464", + "19420": "464", + "19423": "464", + "19426": "464", + "19429": "465", + "19432": "465", + "19435": "465", + "19438": "465", + "19441": "465", + "19444": "465", + "19447": "465", + "19450": "465", + "19453": "465", + "19456": "465", + "19459": "465", + "19462": "465", + "19465": "465", + "19468": "465", + "19471": "465", + "19474": "465", + "19477": "465", + "19480": "465", + "19483": "465", + "19489": "465", + "19492": "465", + "19495": "466", + "19496": "466", + "19498": "466", + "19501": "466", + "19504": "466", + "19507": "466", + "19510": "466", + "19519": "466", + "19522": "466", + "19525": "466", + "19531": "466", + "19534": "466", + "19537": "466", + "19543": "466", + "19546": "466", + "19549": "466", + "19552": "466", + "19555": "467", + "19558": "467", + "19561": "467", + "19564": "467", + "19567": "467", + "19570": "467", + "19576": "467", + "19579": "467", + "19582": "467", + "19585": "467", + "19588": "467", + "19591": "467", + "19594": "467", + "19597": "468", + "19600": "468", + "19603": "468", + "19606": "468", + "19612": "468", + "19615": "468", + "19618": "468", + "19621": "468", + "19624": "469", + "19627": "469", + "19630": "469", + "19633": "469", + "19636": "469", + "19639": "469", + "19642": "469", + "19645": "469", + "19648": "469", + "19651": "469", + "19654": "469", + "19657": "469", + "19660": "469", + "19666": "469", + "19669": "469", + "19672": "469", + "19675": "469", + "19678": "469", + "19681": "470", + "19684": "470", + "19687": "470", + "19693": "470", + "19696": "470", + "19699": "470", + "19702": "470", + "19705": "462", + "19708": "470", + "19711": "470", + "19714": "470", + "19717": "470", + "19726": "470", + "19729": "470", + "19735": "470", + "19738": "470", + "19741": "470", + "19750": "474", + "19753": "474", + "19756": "474", + "19759": "474", + "19762": "474", + "19768": "474", + "19774": "474", + "19777": "474", + "19780": "474", + "19783": "474", + "19786": "474", + "19789": "474", + "19792": "474", + "19795": "474", + "19798": "474", + "19801": "474", + "19803": "474", + "19804": "474", + "19807": "474", + "19810": "474", + "19813": "474", + "19815": "474", + "19816": "474", + "19819": "476", + "19822": "476", + "19825": "476", + "19828": "476", + "19831": "476", + "19834": "476", + "19837": "476", + "19840": "476", + "19843": "476", + "19846": "476", + "19849": "476", + "19852": "476", + "19855": "476", + "19858": "476", + "19861": "476", + "19864": "476", + "19867": "477", + "19870": "477", + "19873": "477", + "19876": "477", + "19879": "477", + "19882": "477", + "19885": "477", + "19888": "477", + "19891": "477", + "19894": "477", + "19897": "477", + "19900": "474", + "19903": "478", + "19906": "474", + "19909": "474", + "19912": "478", + "19915": "478", + "19918": "478", + "19921": "478", + "19924": "474", + "19927": "478", + "19930": "474", + "19933": "478", + "19936": "478", + "19939": "478", + "19942": "478", + "19945": "478", + "19948": "478", + "19954": "478", + "19957": "478", + "19960": "479", + "19963": "474", + "19966": "479", + "19969": "479", + "19972": "479", + "19975": "479", + "19978": "479", + "19981": "474", + "19984": "479", + "19987": "479", + "19990": "479", + "19993": "479", + "19996": "480", + "19999": "474", + "20002": "474", + "20005": "480", + "20008": "480", + "20011": "480", + "20014": "474", + "20017": "480", + "20020": "480", + "20023": "474", + "20026": "480", + "20029": "474", + "20032": "474", + "20035": "480", + "20041": "480", + "20044": "481", + "20047": "481", + "20050": "481", + "20053": "481", + "20056": "481", + "20059": "481", + "20065": "481", + "20068": "481", + "20071": "481", + "20074": "481", + "20080": "481", + "20083": "481", + "20086": "481", + "20089": "481", + "20095": "481", + "20098": "481", + "20101": "481", + "20104": "481", + "20107": "482", + "20110": "482", + "20113": "482", + "20116": "482", + "20122": "482", + "20125": "482", + "20128": "482", + "20131": "482", + "20134": "482", + "20137": "482", + "20140": "482", + "20143": "482", + "20146": "482", + "20149": "482", + "20152": "482", + "20155": "482", + "20158": "482", + "20161": "483", + "20164": "483", + "20167": "483", + "20170": "483", + "20173": "483", + "20179": "483", + "20182": "483", + "20185": "483", + "20188": "483", + "20191": "483", + "20194": "490", + "20195": "490", + "20197": "490", + "20198": "490", + "20200": "490", + "20203": "491", + "20206": "491", + "20207": "491", + "20209": "491", + "20212": "491", + "20215": "491", + "20218": "491", + "20221": "491", + "20224": "491", + "20225": "491", + "20227": "492", + "20230": "492", + "20233": "492", + "20236": "492", + "20239": "492", + "20242": "492", + "20245": "492", + "20246": "492", + "20248": "492", + "20251": "492", + "20254": "492", + "20257": "492", + "20258": "492", + "20260": "495", + "20263": "493", + "20266": "493", + "20269": "493", + "20272": "493", + "20275": "493", + "20278": "493", + "20281": "493", + "20284": "494", + "20285": "494", + "20287": "494", + "20290": "494", + "20293": "497", + "20296": "497", + "20299": "497", + "20302": "497", + "20305": "495", + "20306": "495", + "20308": "497", + "20311": "495", + "20312": "495", + "20314": "495", + "20317": "497", + "20320": "497", + "20323": "497", + "20326": "497", + "20329": "497", + "20332": "497", + "20335": "502", + "20338": "502", + "20341": "502", + "20344": "502", + "20347": "502", + "20350": "502", + "20353": "502", + "20356": "502", + "20359": "502", + "20362": "502", + "20364": "518", + "20365": "518", + "20368": "518", + "20371": "502", + "20374": "518", + "20375": "502", + "20377": "518", + "20380": "518", + "20383": "518", + "20386": "518", + "20387": "518", + "20389": "502", + "20392": "518", + "20395": "518", + "20398": "503", + "20401": "503", + "20404": "503", + "20407": "503", + "20410": "503", + "20413": "503", + "20416": "503", + "20419": "503", + "20422": "503", + "20425": "503", + "20428": "503", + "20431": "503", + "20434": "503", + "20437": "504", + "20440": "504", + "20443": "504", + "20446": "504", + "20449": "504", + "20452": "504", + "20455": "504", + "20458": "504", + "20461": "504", + "20464": "504", + "20467": "505", + "20470": "505", + "20473": "505", + "20476": "505", + "20479": "505", + "20482": "505", + "20485": "505", + "20488": "505", + "20491": "505", + "20494": "505", + "20497": "505", + "20500": "506", + "20503": "506", + "20506": "506", + "20509": "506", + "20512": "506", + "20515": "506", + "20518": "506", + "20521": "506", + "20524": "506", + "20527": "506", + "20530": "506", + "20533": "506", + "20536": "506", + "20539": "506", + "20542": "506", + "20545": "506", + "20547": "506", + "20548": "506", + "20551": "507", + "20554": "507", + "20557": "507", + "20560": "507", + "20561": "507", + "20562": "507", + "20563": "507", + "20566": "507", + "20569": "507", + "20572": "507", + "20575": "507", + "20578": "507", + "20579": "507", + "20580": "507", + "20581": "507", + "20584": "507", + "20587": "507", + "20590": "507", + "20593": "507", + "20596": "507", + "20599": "508", + "20602": "508", + "20605": "508", + "20608": "508", + "20611": "508", + "20614": "508", + "20617": "508", + "20620": "508", + "20623": "508", + "20626": "508", + "20629": "508", + "20632": "508", + "20635": "508", + "20638": "508", + "20641": "509", + "20644": "509", + "20647": "509", + "20650": "509", + "20651": "509", + "20656": "519", + "20659": "509", + "20662": "509", + "20665": "509", + "20668": "519", + "20669": "519", + "20671": "519", + "20672": "519", + "20677": "509", + "20680": "509", + "20683": "509", + "20686": "509", + "20689": "509", + "20692": "519", + "20695": "510", + "20698": "510", + "20699": "510", + "20701": "510", + "20702": "510", + "20704": "510", + "20705": "510", + "20707": "510", + "20710": "510", + "20713": "510", + "20716": "510", + "20719": "510", + "20722": "511", + "20725": "511", + "20728": "511", + "20729": "511", + "20731": "511", + "20734": "511", + "20737": "511", + "20740": "511", + "20743": "511", + "20746": "511", + "20749": "511", + "20752": "511", + "20758": "512", + "20761": "512", + "20764": "512", + "20767": "512", + "20770": "512", + "20773": "512", + "20776": "512", + "20779": "512", + "20782": "512", + "20785": "512", + "20788": "512", + "20791": "513", + "20794": "513", + "20797": "513", + "20800": "513", + "20803": "513", + "20806": "513", + "20809": "513", + "20812": "513", + "20815": "513", + "20818": "513", + "20821": "513", + "20822": "513", + "20824": "513", + "20827": "513", + "20830": "513", + "20833": "513", + "20836": "513", + "20839": "513", + "20842": "513", + "20845": "513", + "20848": "513", + "20851": "513", + "20854": "514", + "20857": "514", + "20860": "514", + "20863": "514", + "20866": "514", + "20869": "514", + "20872": "514", + "20875": "514", + "20878": "514", + "20881": "514", + "20884": "514", + "20887": "514", + "20890": "514", + "20893": "514", + "20896": "514", + "20899": "515", + "20900": "515", + "20902": "515", + "20905": "515", + "20908": "515", + "20911": "515", + "20914": "515", + "20917": "515", + "20920": "515", + "20923": "515", + "20926": "515", + "20929": "515", + "20932": "515", + "20935": "516", + "20938": "516", + "20941": "516", + "20944": "516", + "20947": "516", + "20950": "516", + "20953": "516", + "20956": "516", + "20959": "516", + "20962": "516", + "20965": "517", + "20968": "517", + "20971": "517", + "20974": "517", + "20977": "517", + "20980": "517", + "20983": "517", + "20984": "517", + "20986": "517", + "20989": "517", + "20992": "517", + "20995": "517", + "20998": "517", + "21001": "517", + "21004": "517", + "21005": "517", + "21007": "517", + "21010": "522", + "21013": "522", + "21016": "522", + "21019": "522", + "21022": "522", + "21025": "522", + "21028": "522", + "21031": "522", + "21034": "522", + "21037": "522", + "21040": "524", + "21043": "524", + "21046": "524", + "21049": "524", + "21052": "524", + "21055": "524", + "21058": "524", + "21061": "524", + "21064": "524", + "21067": "524", + "21070": "524", + "21073": "524", + "21079": "524", + "21082": "524", + "21085": "524", + "21088": "524", + "21091": "524", + "21100": "524", + "21103": "524", + "21106": "524", + "21109": "524", + "21112": "524", + "21115": "525", + "21118": "525", + "21121": "525", + "21124": "525", + "21127": "525", + "21130": "525", + "21133": "525", + "21136": "525", + "21139": "525", + "21142": "525", + "21145": "525", + "21148": "525", + "21154": "525", + "21157": "525", + "21163": "525", + "21166": "525", + "21172": "522", + "21175": "527", + "21178": "527", + "21181": "527", + "21184": "527", + "21187": "522", + "21190": "522", + "21193": "527", + "21196": "527", + "21199": "522", + "21202": "522", + "21205": "527", + "21208": "522", + "21211": "522", + "21214": "522", + "21217": "527", + "21220": "527", + "21223": "522", + "21226": "527", + "21229": "527", + "21232": "522", + "21235": "528", + "21238": "528", + "21241": "528", + "21244": "528", + "21247": "528", + "21250": "528", + "21253": "522", + "21256": "522", + "21259": "528", + "21262": "522", + "21268": "528", + "21271": "528", + "21274": "528", + "21277": "528", + "21280": "528", + "21283": "528", + "21286": "528", + "21289": "529", + "21292": "529", + "21295": "529", + "21298": "529", + "21301": "529", + "21304": "529", + "21307": "529", + "21310": "529", + "21313": "529", + "21316": "529", + "21319": "529", + "21322": "529", + "21325": "529", + "21328": "529", + "21331": "530", + "21334": "530", + "21335": "530", + "21337": "530", + "21338": "530", + "21340": "530", + "21341": "530", + "21343": "530", + "21346": "530", + "21349": "531", + "21352": "531", + "21355": "531", + "21358": "531", + "21361": "531", + "21364": "532", + "21367": "532", + "21370": "532", + "21373": "532", + "21376": "532", + "21379": "532", + "21382": "532", + "21385": "532", + "21388": "532", + "21391": "532", + "21394": "532", + "21397": "532", + "21400": "533", + "21403": "533", + "21406": "533", + "21409": "533", + "21412": "533", + "21415": "533", + "21418": "533", + "21421": "533", + "21424": "533", + "21427": "533", + "21430": "533", + "21433": "533", + "21436": "533", + "21439": "534", + "21442": "534", + "21445": "534", + "21448": "534", + "21451": "534", + "21454": "534", + "21457": "534", + "21460": "534", + "21463": "534", + "21466": "534", + "21469": "534", + "21472": "534", + "21475": "534", + "21478": "534", + "21481": "534", + "21484": "535", + "21487": "535", + "21490": "535", + "21493": "535", + "21496": "535", + "21499": "535", + "21500": "535", + "21502": "535", + "21505": "535", + "21508": "535", + "21511": "535", + "21517": "535", + "21520": "535", + "21523": "535", + "21526": "535", + "21529": "535", + "21532": "535", + "21535": "535", + "21538": "535", + "21550": "540", + "21553": "540", + "21556": "540", + "21559": "540", + "21562": "540", + "21565": "540", + "21568": "540", + "21571": "540", + "21574": "540", + "21577": "540", + "21580": "540", + "21583": "540", + "21586": "540", + "21589": "540", + "21592": "540", + "21595": "540", + "21598": "540", + "21601": "540", + "21604": "540", + "21607": "540", + "21609": "542", + "21610": "542", + "21613": "542", + "21616": "542", + "21619": "542", + "21622": "542", + "21625": "542", + "21628": "542", + "21631": "542", + "21634": "542", + "21637": "543", + "21640": "543", + "21643": "543", + "21646": "543", + "21649": "543", + "21652": "543", + "21655": "543", + "21658": "543", + "21661": "543", + "21664": "543", + "21667": "543", + "21670": "543", + "21673": "543", + "21676": "543", + "21679": "543", + "21682": "543", + "21685": "543", + "21688": "544", + "21690": "544", + "21691": "544", + "21694": "544", + "21697": "544", + "21700": "544", + "21703": "544", + "21706": "544", + "21709": "544", + "21712": "544", + "21715": "544", + "21718": "544", + "21721": "544", + "21724": "544", + "21727": "544", + "21730": "545", + "21733": "545", + "21736": "545", + "21739": "545", + "21742": "545", + "21745": "545", + "21748": "545", + "21751": "545", + "21754": "545", + "21757": "545", + "21760": "545", + "21763": "545", + "21766": "545", + "21769": "545", + "21772": "545", + "21775": "545", + "21778": "545", + "21781": "545", + "21784": "545", + "21786": "546", + "21787": "546", + "21790": "546", + "21796": "546", + "21799": "546", + "21801": "546", + "21802": "546", + "21804": "546", + "21805": "546", + "21808": "547", + "21811": "547", + "21814": "547", + "21817": "547", + "21820": "547", + "21823": "547", + "21826": "547", + "21829": "547", + "21832": "547", + "21835": "547", + "21838": "547", + "21841": "547", + "21844": "547", + "21847": "547", + "21850": "547", + "21853": "548", + "21856": "548", + "21859": "548", + "21862": "548", + "21865": "548", + "21868": "548", + "21871": "548", + "21874": "548", + "21877": "548", + "21880": "548", + "21883": "548", + "21886": "548", + "21889": "548", + "21892": "548", + "21895": "548", + "21898": "548", + "21901": "548", + "21904": "548", + "21907": "549", + "21910": "549", + "21913": "549", + "21916": "549", + "21919": "549", + "21922": "549", + "21925": "549", + "21928": "549", + "21931": "549", + "21934": "549", + "21937": "549", + "21940": "549", + "21943": "549", + "21946": "549", + "21949": "549", + "21952": "550", + "21955": "550", + "21958": "550", + "21961": "550", + "21964": "550", + "21967": "550", + "21970": "550", + "21973": "550", + "21976": "550", + "21979": "550", + "21982": "550", + "21985": "550", + "21988": "550", + "21991": "540", + "21994": "551", + "21997": "551", + "22000": "551", + "22003": "551", + "22006": "551", + "22009": "551", + "22012": "551", + "22015": "555", + "22021": "555", + "22024": "555", + "22030": "555", + "22033": "555", + "22036": "555", + "22040": "555", + "22041": "555", + "22042": "555", + "22045": "555", + "22051": "557", + "22052": "557", + "22053": "557", + "22054": "557", + "22057": "557", + "22060": "557", + "22066": "557", + "22069": "557", + "22072": "557", + "22073": "557", + "22075": "557", + "22076": "557", + "22078": "557", + "22081": "558", + "22084": "558", + "22087": "558", + "22090": "558", + "22093": "558", + "22096": "558", + "22099": "558", + "22102": "558", + "22105": "558", + "22108": "558", + "22111": "558", + "22114": "559", + "22117": "559", + "22120": "559", + "22123": "559", + "22126": "559", + "22129": "559", + "22132": "559", + "22138": "559", + "22141": "559", + "22144": "559", + "22147": "559", + "22150": "559", + "22153": "559", + "22156": "559", + "22159": "559", + "22162": "555", + "22165": "560", + "22168": "560", + "22171": "560", + "22174": "560", + "22177": "560", + "22180": "560", + "22183": "560", + "22186": "560", + "22189": "560", + "22192": "560", + "22195": "560", + "22198": "560", + "22201": "560", + "22204": "560", + "22207": "561", + "22210": "561", + "22213": "561", + "22216": "561", + "22219": "561", + "22222": "561", + "22225": "561", + "22228": "561", + "22231": "561", + "22234": "561", + "22237": "561", + "22240": "555", + "22243": "564", + "22246": "564", + "22249": "562", + "22250": "562", + "22252": "562", + "22255": "562", + "22258": "564", + "22261": "564", + "22264": "562", + "22267": "564", + "22270": "562", + "22273": "562", + "22276": "562", + "22279": "564", + "22282": "564", + "22285": "562", + "22288": "562", + "22291": "564", + "22294": "562", + "22297": "564", + "22300": "564", + "22303": "563", + "22306": "563", + "22309": "563", + "22312": "563", + "22315": "563", + "22318": "563", + "22319": "563", + "22321": "563", + "22324": "563", + "22327": "568", + "22330": "568", + "22333": "568", + "22336": "568", + "22339": "568", + "22348": "568", + "22351": "568", + "22357": "568", + "22363": "568", + "22366": "568", + "22372": "568", + "22375": "568", + "22378": "568", + "22381": "568", + "22384": "568", + "22387": "568", + "22390": "568", + "22393": "568", + "22396": "568", + "22399": "568", + "22402": "568", + "22405": "568", + "22408": "569", + "22411": "569", + "22414": "569", + "22417": "569", + "22420": "569", + "22423": "569", + "22426": "569", + "22429": "569", + "22432": "569", + "22435": "570", + "22438": "570", + "22441": "570", + "22444": "570", + "22447": "570", + "22450": "570", + "22453": "570", + "22456": "570", + "22459": "570", + "22462": "570", + "22465": "570", + "22468": "569", + "22471": "570", + "22474": "569", + "22477": "569", + "22480": "569", + "22483": "569", + "22486": "569", + "22489": "571", + "22492": "571", + "22495": "571", + "22498": "571", + "22501": "571", + "22504": "571", + "22507": "571", + "22510": "571", + "22513": "571", + "22516": "571", + "22519": "571", + "22522": "571", + "22525": "571", + "22528": "572", + "22531": "572", + "22534": "572", + "22537": "572", + "22540": "572", + "22543": "572", + "22546": "572", + "22549": "572", + "22552": "572", + "22555": "572", + "22558": "572", + "22561": "572", + "22564": "572", + "22567": "572", + "22570": "572", + "22573": "572", + "22576": "572", + "22582": "572", + "22585": "572", + "22588": "572", + "22591": "572", + "22594": "572", + "22597": "572", + "22600": "572", + "22603": "572", + "22606": "572", + "22609": "573", + "22612": "573", + "22615": "573", + "22618": "573", + "22621": "573", + "22624": "573", + "22627": "573", + "22630": "573", + "22633": "573", + "22636": "573", + "22639": "573", + "22642": "573", + "22645": "573", + "22648": "573", + "22651": "574", + "22654": "574", + "22657": "574", + "22660": "574", + "22663": "574", + "22669": "574", + "22672": "574", + "22675": "574", + "22678": "574", + "22681": "574", + "22684": "574", + "22687": "574", + "22690": "574", + "22693": "574", + "22696": "574", + "22702": "574", + "22705": "574", + "22708": "570", + "22711": "570", + "22714": "575", + "22717": "575", + "22720": "575", + "22723": "575", + "22726": "575", + "22729": "575", + "22732": "575", + "22735": "575", + "22736": "576", + "22737": "576", + "22738": "582", + "22739": "576", + "22741": "582", + "22744": "582", + "22750": "582", + "22759": "582", + "22762": "582", + "22765": "582", + "22768": "582", + "22771": "582", + "22774": "582", + "22777": "582", + "22779": "582", + "22780": "582", + "22783": "584", + "22786": "584", + "22789": "584", + "22792": "584", + "22795": "584", + "22798": "584", + "22801": "584", + "22804": "584", + "22807": "584", + "22810": "585", + "22813": "585", + "22816": "585", + "22819": "585", + "22822": "585", + "22825": "585", + "22828": "585", + "22831": "585", + "22834": "586", + "22837": "588", + "22840": "588", + "22843": "588", + "22846": "586", + "22849": "588", + "22852": "586", + "22853": "588", + "22855": "586", + "22856": "588", + "22858": "586", + "22861": "586", + "22864": "586", + "22867": "586", + "22868": "586", + "22870": "587", + "22873": "587", + "22876": "587", + "22879": "587", + "22882": "587", + "22885": "589", + "22888": "587", + "22891": "587", + "22894": "587", + "22897": "589", + "22898": "589", + "22900": "589", + "22903": "589", + "22906": "589", + "22909": "589", + "22910": "589", + "22912": "587", + "22915": "593", + "22918": "593", + "22921": "593", + "22924": "593", + "22927": "593", + "22930": "593", + "22933": "593", + "22936": "593", + "22939": "593", + "22942": "593", + "22945": "593", + "22948": "593", + "22951": "593", + "22954": "593", + "22957": "593", + "22960": "593", + "22963": "593", + "22966": "593", + "22969": "595", + "22972": "595", + "22975": "595", + "22978": "595", + "22981": "595", + "22984": "595", + "22987": "595", + "22990": "595", + "22993": "595", + "22996": "595", + "22999": "595", + "23005": "596", + "23008": "596", + "23011": "596", + "23014": "596", + "23017": "596", + "23020": "596", + "23023": "596", + "23026": "596", + "23029": "596", + "23032": "596", + "23035": "596", + "23038": "596", + "23041": "596", + "23044": "596", + "23047": "596", + "23050": "596", + "23053": "596", + "23056": "596", + "23059": "597", + "23062": "597", + "23065": "597", + "23068": "597", + "23071": "597", + "23074": "597", + "23077": "597", + "23080": "597", + "23083": "597", + "23086": "597", + "23089": "597", + "23092": "597", + "23095": "597", + "23098": "597", + "23101": "597", + "23104": "597", + "23107": "597", + "23110": "598", + "23113": "598", + "23116": "598", + "23119": "598", + "23122": "598", + "23125": "598", + "23128": "598", + "23131": "598", + "23134": "598", + "23137": "598", + "23140": "598", + "23143": "598", + "23146": "598", + "23149": "599", + "23152": "599", + "23158": "599", + "23161": "599", + "23164": "599", + "23167": "599", + "23170": "599", + "23173": "599", + "23176": "599", + "23179": "599", + "23182": "599", + "23185": "599", + "23188": "599", + "23191": "600", + "23194": "600", + "23197": "600", + "23200": "600", + "23203": "600", + "23206": "600", + "23212": "600", + "23215": "600", + "23218": "600", + "23221": "600", + "23224": "600", + "23227": "600", + "23230": "601", + "23231": "594", + "23232": "594", + "23234": "594", + "23235": "594", + "23236": "601", + "23237": "594", + "23239": "601", + "23242": "601", + "23245": "594", + "23246": "594", + "23248": "594", + "23251": "601", + "23254": "601", + "23255": "601", + "23257": "601", + "23260": "601", + "23266": "601", + "23268": "594", + "23272": "602", + "23275": "602", + "23278": "602", + "23281": "608", + "23284": "608", + "23287": "608", + "23290": "608", + "23293": "608", + "23296": "608", + "23299": "608", + "23302": "608", + "23305": "608", + "23308": "608", + "23311": "608", + "23314": "608", + "23317": "608", + "23320": "608", + "23323": "608", + "23326": "608", + "23327": "608", + "23329": "608", + "23332": "608", + "23335": "608", + "23338": "608", + "23341": "610", + "23344": "610", + "23347": "610", + "23350": "610", + "23353": "610", + "23356": "610", + "23359": "610", + "23362": "610", + "23365": "610", + "23368": "610", + "23371": "610", + "23374": "610", + "23377": "611", + "23380": "611", + "23383": "611", + "23386": "611", + "23389": "611", + "23392": "611", + "23395": "611", + "23398": "611", + "23401": "612", + "23404": "617", + "23407": "617", + "23410": "617", + "23413": "617", + "23416": "617", + "23417": "617", + "23419": "617", + "23422": "617", + "23425": "617", + "23427": "612", + "23428": "612", + "23430": "612", + "23431": "612", + "23434": "612", + "23437": "612", + "23440": "612", + "23443": "612", + "23446": "617", + "23449": "617", + "23452": "613", + "23455": "613", + "23458": "613", + "23461": "613", + "23464": "613", + "23467": "613", + "23470": "613", + "23473": "613", + "23476": "613", + "23479": "614", + "23482": "614", + "23485": "614", + "23488": "614", + "23491": "614", + "23494": "614", + "23497": "614", + "23500": "615", + "23503": "615", + "23504": "615", + "23506": "615", + "23509": "615", + "23510": "615", + "23512": "615", + "23515": "615", + "23518": "615", + "23521": "615", + "23524": "615", + "23527": "616", + "23530": "616", + "23533": "616", + "23534": "616", + "23535": "618", + "23536": "616", + "23537": "618", + "23538": "618", + "23539": "616", + "23542": "616", + "23545": "616", + "23548": "616", + "23551": "616", + "23554": "616", + "23557": "622", + "23560": "622", + "23563": "622", + "23566": "622", + "23569": "622", + "23570": "622", + "23572": "622", + "23575": "622", + "23578": "622", + "23579": "622", + "23581": "622", + "23582": "622", + "23584": "622", + "23586": "622", + "23590": "622", + "23596": "622", + "23599": "622", + "23602": "622", + "23605": "622", + "23608": "622", + "23611": "622", + "23614": "623", + "23617": "623", + "23620": "623", + "23623": "623", + "23626": "623", + "23627": "623", + "23629": "623", + "23630": "623", + "23632": "623", + "23633": "623", + "23635": "623", + "23638": "625", + "23641": "625", + "23644": "625", + "23647": "625", + "23650": "625", + "23653": "625", + "23656": "625", + "23659": "625", + "23660": "625", + "23662": "625", + "23665": "625", + "23668": "625", + "23674": "625", + "23677": "626", + "23680": "626", + "23683": "626", + "23684": "626", + "23686": "626", + "23689": "626", + "23692": "626", + "23695": "626", + "23698": "626", + "23701": "626", + "23704": "626", + "23707": "626", + "23710": "626", + "23713": "626", + "23714": "626", + "23716": "626", + "23719": "626", + "23722": "627", + "23725": "627", + "23728": "627", + "23731": "627", + "23734": "627", + "23737": "627", + "23738": "627", + "23740": "627", + "23743": "627", + "23746": "627", + "23749": "627", + "23752": "627", + "23755": "627", + "23761": "627", + "23764": "628", + "23767": "628", + "23768": "628", + "23770": "628", + "23771": "628", + "23773": "628", + "23776": "628", + "23778": "628", + "23779": "628", + "23782": "628", + "23785": "628", + "23788": "628", + "23791": "628", + "23794": "629", + "23797": "629", + "23798": "629", + "23799": "629", + "23800": "629", + "23803": "629", + "23806": "629", + "23809": "629", + "23812": "629", + "23815": "629", + "23818": "629", + "23821": "629", + "23824": "630", + "23827": "630", + "23830": "630", + "23833": "630", + "23836": "630", + "23839": "630", + "23840": "630", + "23842": "630", + "23843": "630", + "23845": "630", + "23846": "630", + "23848": "630", + "23851": "630", + "23854": "630", + "23857": "631", + "23860": "631", + "23863": "631", + "23866": "631", + "23869": "631", + "23872": "631", + "23875": "631", + "23878": "631", + "23881": "631", + "23884": "631", + "23887": "632", + "23888": "632", + "23890": "632", + "23893": "632", + "23896": "632", + "23899": "632", + "23902": "632", + "23905": "632", + "23908": "632", + "23911": "632", + "23914": "632", + "23917": "632", + "23920": "632", + "23923": "632", + "23924": "632", + "23926": "632", + "23929": "632", + "23932": "632", + "23935": "632", + "23938": "632", + "23941": "633", + "23942": "639", + "23944": "633", + "23945": "633", + "23946": "633", + "23947": "633", + "23950": "633", + "23953": "633", + "23954": "633", + "23956": "633", + "23959": "633", + "23962": "633", + "23965": "633", + "23966": "633", + "23968": "633", + "23971": "639", + "23972": "639", + "23974": "639", + "23977": "633", + "23978": "639", + "23980": "639", + "23983": "639", + "23986": "639", + "23987": "639", + "23989": "634", + "23992": "634", + "23995": "634", + "23998": "634", + "24001": "634", + "24004": "634", + "24007": "634", + "24010": "634", + "24013": "635", + "24016": "635", + "24019": "635", + "24022": "635", + "24025": "635", + "24028": "635", + "24031": "635", + "24034": "635", + "24037": "635", + "24041": "624", + "24042": "624", + "24043": "638", + "24044": "624", + "24045": "624", + "24046": "638", + "24048": "638", + "24049": "638", + "24052": "638", + "24055": "638", + "24058": "638", + "24060": "638", + "24061": "638", + "24064": "624", + "24065": "624", + "24067": "638", + "24070": "624", + "24073": "624", + "24076": "637", + "24079": "637", + "24082": "637", + "24085": "637", + "24088": "637", + "24091": "637", + "24094": "637", + "24097": "637", + "24100": "637", + "24103": "637", + "24106": "637", + "24109": "637", + "24112": "637", + "24115": "637", + "24118": "643", + "24121": "643", + "24124": "643", + "24130": "643", + "24133": "643", + "24136": "643", + "24142": "643", + "24145": "643", + "24148": "643", + "24151": "643", + "24154": "643", + "24157": "643", + "24160": "643", + "24163": "643", + "24166": "643", + "24169": "643", + "24172": "643", + "24175": "643", + "24178": "643", + "24181": "645", + "24184": "645", + "24187": "645", + "24190": "645", + "24193": "645", + "24194": "645", + "24196": "645", + "24199": "645", + "24202": "645", + "24205": "645", + "24207": "645", + "24208": "645", + "24211": "646", + "24214": "646", + "24215": "646", + "24217": "646", + "24220": "646", + "24221": "646", + "24223": "646", + "24226": "646", + "24229": "646", + "24232": "646", + "24235": "647", + "24238": "647", + "24241": "647", + "24244": "647", + "24247": "647", + "24250": "647", + "24253": "647", + "24256": "648", + "24259": "648", + "24262": "648", + "24264": "648", + "24265": "648", + "24268": "648", + "24271": "648", + "24274": "648", + "24277": "648", + "24280": "648", + "24283": "648", + "24286": "648", + "24289": "648", + "24292": "648", + "24295": "648", + "24298": "648", + "24301": "648", + "24305": "644", + "24307": "649", + "24308": "644", + "24310": "649", + "24311": "644", + "24313": "649", + "24314": "649", + "24316": "649", + "24317": "649", + "24318": "644", + "24319": "649", + "24322": "644", + "24328": "644", + "24331": "644", + "24332": "644", + "24334": "644", + "24337": "644", + "24340": "644", + "24343": "650", + "24346": "650", + "24349": "650", + "24352": "650", + "24355": "650", + "24358": "650", + "24359": "650", + "24360": "650", + "24361": "650", + "24364": "650", + "24367": "650", + "24370": "650", + "24373": "651", + "24376": "651", + "24379": "651", + "24380": "651", + "24382": "651", + "24385": "651", + "24388": "651", + "24391": "651", + "24394": "651", + "24397": "651", + "24400": "651", + "24401": "651", + "24403": "651", + "24404": "651", + "24406": "651", + "24409": "651", + "24412": "652", + "24415": "652", + "24418": "652", + "24421": "652", + "24424": "652", + "24427": "652", + "24430": "652", + "24433": "652", + "24436": "652", + "24439": "652", + "24442": "652", + "24444": "652", + "24445": "652", + "24448": "653", + "24451": "653", + "24454": "653", + "24457": "653", + "24463": "653", + "24466": "653", + "24469": "653", + "24472": "653", + "24475": "653", + "24478": "653", + "24481": "653", + "24484": "653", + "24487": "653", + "24490": "654", + "24493": "654", + "24496": "654", + "24499": "654", + "24502": "654", + "24505": "654", + "24508": "654", + "24511": "654", + "24514": "654", + "24517": "654", + "24520": "654", + "24523": "654", + "24526": "654", + "24529": "654", + "24532": "654", + "24535": "654", + "24538": "655", + "24540": "657", + "24541": "657", + "24544": "657", + "24547": "657", + "24550": "657", + "24553": "657", + "24556": "655", + "24559": "655", + "24561": "657", + "24562": "657", + "24565": "655", + "24568": "655", + "24571": "655", + "24574": "655", + "24577": "655", + "24580": "656", + "24583": "656", + "24586": "656", + "24589": "656", + "24592": "656", + "24595": "656", + "24598": "656", + "24601": "656", + "24604": "656", + "24607": "656", + "24610": "656", + "24611": "660", + "24612": "660", + "24614": "660", + "24615": "660", + "24616": "661", + "24617": "660", + "24618": "660", + "24619": "660", + "24620": "661", + "24622": "661", + "24625": "661", + "24628": "660", + "24631": "661", + "24634": "661", + "24637": "661", + "24640": "662", + "24643": "662", + "24646": "662", + "24649": "662", + "24652": "662", + "24655": "662", + "24658": "662", + "24661": "662", + "24664": "663", + "24667": "663", + "24670": "663", + "24673": "663", + "24676": "663", + "24677": "663", + "24678": "663", + "24679": "663", + "24682": "663", + "24685": "663", + "24688": "664", + "24691": "664", + "24692": "664", + "24694": "664", + "24697": "664", + "24699": "664", + "24700": "664", + "24703": "664", + "24706": "664", + "24709": "664", + "24712": "664", + "24715": "664", + "24717": "665", + "24718": "665", + "24719": "665", + "24721": "665", + "24722": "665", + "24724": "665", + "24727": "665", + "24728": "665", + "24730": "665", + "24733": "666", + "24736": "667", + "24739": "667", + "24740": "667", + "24742": "667", + "24745": "666", + "24746": "667", + "24748": "667", + "24750": "666", + "24751": "666", + "24754": "666", + "24756": "666", + "24757": "666", + "24760": "666", + "24761": "666", + "24763": "666", + "24766": "666", + "24769": "672", + "24772": "672", + "24775": "672", + "24778": "672", + "24781": "672", + "24784": "672", + "24787": "672", + "24790": "672", + "24793": "672", + "24796": "672", + "24799": "672", + "24802": "672", + "24805": "672", + "24808": "672", + "24810": "672", + "24811": "672", + "24814": "673", + "24817": "673", + "24820": "673", + "24823": "673", + "24826": "673", + "24829": "673", + "24832": "673", + "24835": "673", + "24838": "673", + "24841": "673", + "24844": "673", + "24846": "675", + "24847": "675", + "24848": "675", + "24850": "675", + "24853": "674", + "24856": "674", + "24859": "674", + "24862": "675", + "24865": "675", + "24868": "676", + "24871": "676", + "24874": "674", + "24875": "674", + "24877": "674", + "24880": "676", + "24883": "676", + "24886": "674", + "24889": "674", + "24892": "676", + "24895": "676", + "24898": "676", + "24901": "676", + "24904": "676", + "24907": "676", + "24910": "676", + "24913": "676", + "24916": "676", + "24919": "676", + "24922": "676", + "24925": "676", + "24928": "677", + "24931": "677", + "24934": "677", + "24937": "677", + "24940": "677", + "24943": "677", + "24946": "677", + "24949": "677", + "24952": "677", + "24955": "677", + "24958": "678", + "24961": "678", + "24964": "678", + "24967": "678", + "24970": "678", + "24973": "678", + "24976": "678", + "24979": "678", + "24982": "678", + "24985": "678", + "24988": "678", + "24989": "678", + "24991": "678", + "24994": "678", + "24997": "678", + "25000": "679", + "25003": "679", + "25006": "679", + "25007": "679", + "25009": "679", + "25012": "679", + "25015": "679", + "25018": "679", + "25021": "679", + "25024": "679", + "25027": "679", + "25030": "679", + "25033": "679", + "25036": "679", + "25039": "679", + "25042": "679", + "25045": "679", + "25048": "679", + "25051": "679", + "25054": "680", + "25057": "680", + "25060": "680", + "25063": "680", + "25066": "680", + "25069": "680", + "25072": "680", + "25075": "680", + "25078": "680", + "25081": "680", + "25084": "680", + "25087": "680", + "25090": "680", + "25093": "680", + "25096": "681", + "25099": "681", + "25105": "681", + "25108": "681", + "25111": "681", + "25114": "681", + "25117": "681", + "25120": "681", + "25123": "681", + "25126": "682", + "25129": "682", + "25132": "682", + "25135": "682", + "25138": "682", + "25141": "682", + "25147": "682", + "25153": "682", + "25156": "682", + "25159": "683", + "25162": "683", + "25165": "683", + "25168": "683", + "25171": "683", + "25180": "683", + "25183": "683", + "25189": "683", + "25192": "683", + "25195": "689", + "25198": "689", + "25201": "689", + "25204": "689", + "25205": "689", + "25207": "689", + "25210": "689", + "25213": "689", + "25216": "688", + "25217": "688", + "25219": "688", + "25220": "688", + "25222": "691", + "25225": "691", + "25228": "691", + "25229": "691", + "25231": "691", + "25232": "691", + "25234": "691", + "25237": "688", + "25240": "698", + "25243": "698", + "25244": "698", + "25245": "688", + "25246": "698", + "25249": "688", + "25250": "698", + "25252": "698", + "25255": "698", + "25258": "698", + "25261": "698", + "25264": "698", + "25267": "691", + "25270": "692", + "25273": "692", + "25276": "692", + "25279": "692", + "25280": "692", + "25282": "692", + "25285": "692", + "25288": "692", + "25291": "692", + "25292": "692", + "25294": "692", + "25297": "692", + "25300": "692", + "25303": "692", + "25305": "692", + "25306": "692", + "25308": "693", + "25309": "693", + "25310": "693", + "25312": "693", + "25315": "693", + "25318": "693", + "25320": "690", + "25321": "693", + "25324": "690", + "25325": "690", + "25326": "690", + "25327": "694", + "25330": "694", + "25333": "690", + "25336": "690", + "25339": "694", + "25342": "694", + "25345": "694", + "25348": "694", + "25349": "694", + "25351": "694", + "25354": "694", + "25357": "694", + "25360": "694", + "25361": "694", + "25363": "695", + "25366": "695", + "25369": "695", + "25372": "695", + "25375": "695", + "25378": "695", + "25381": "695", + "25384": "695", + "25387": "695", + "25390": "695", + "25393": "695", + "25396": "696", + "25398": "696", + "25399": "696", + "25400": "696", + "25402": "696", + "25404": "696", + "25405": "696", + "25408": "696", + "25411": "696", + "25414": "696", + "25417": "696", + "25420": "696", + "25423": "696", + "25424": "696", + "25426": "696", + "25429": "696", + "25432": "697", + "25433": "697", + "25435": "697", + "25438": "694", + "25439": "697", + "25441": "697", + "25444": "697", + "25447": "697", + "25450": "697", + "25453": "697", + "25456": "703", + "25459": "703", + "25462": "703", + "25465": "703", + "25468": "703", + "25471": "703", + "25474": "703", + "25477": "703", + "25480": "703", + "25483": "703", + "25486": "705", + "25489": "705", + "25492": "705", + "25495": "705", + "25498": "705", + "25501": "705", + "25504": "705", + "25507": "705", + "25510": "705", + "25513": "705", + "25516": "706", + "25519": "706", + "25522": "706", + "25525": "706", + "25528": "706", + "25531": "706", + "25534": "706", + "25537": "706", + "25540": "706", + "25543": "706", + "25546": "706", + "25549": "706", + "25552": "707", + "25555": "707", + "25558": "707", + "25561": "707", + "25564": "707", + "25567": "707", + "25570": "707", + "25573": "707", + "25576": "707", + "25579": "707", + "25582": "707", + "25585": "708", + "25588": "708", + "25591": "708", + "25594": "708", + "25597": "708", + "25600": "708", + "25603": "708", + "25606": "708", + "25609": "708", + "25612": "708", + "25615": "708", + "25618": "708", + "25621": "708", + "25624": "708", + "25627": "708", + "25630": "709", + "25633": "709", + "25636": "709", + "25639": "709", + "25642": "709", + "25645": "709", + "25648": "709", + "25651": "709", + "25654": "710", + "25657": "710", + "25660": "710", + "25663": "710", + "25666": "710", + "25669": "710", + "25672": "710", + "25675": "710", + "25678": "710", + "25681": "711", + "25684": "711", + "25687": "711", + "25690": "711", + "25693": "711", + "25696": "711", + "25699": "711", + "25702": "711", + "25705": "711", + "25708": "712", + "25711": "712", + "25714": "712", + "25717": "712", + "25720": "712", + "25723": "712", + "25729": "712", + "25732": "712", + "25735": "712", + "25738": "712", + "25741": "718", + "25744": "718", + "25747": "718", + "25750": "718", + "25753": "718", + "25756": "718", + "25759": "718", + "25760": "718", + "25762": "718", + "25763": "718", + "25765": "718", + "25768": "718", + "25771": "718", + "25774": "718", + "25777": "720", + "25780": "720", + "25783": "720", + "25786": "720", + "25789": "720", + "25792": "720", + "25795": "720", + "25798": "720", + "25801": "720", + "25804": "720", + "25807": "720", + "25810": "720", + "25813": "721", + "25816": "719", + "25819": "719", + "25822": "719", + "25825": "719", + "25828": "719", + "25831": "719", + "25834": "719", + "25837": "721", + "25840": "721", + "25843": "721", + "25846": "721", + "25849": "721", + "25852": "721", + "25855": "721", + "25858": "722", + "25861": "722", + "25864": "722", + "25865": "722", + "25867": "722", + "25870": "722", + "25873": "722", + "25876": "722", + "25879": "722", + "25882": "722", + "25885": "722", + "25888": "723", + "25891": "723", + "25894": "726", + "25897": "726", + "25900": "726", + "25903": "726", + "25906": "726", + "25907": "726", + "25908": "726", + "25909": "726", + "25912": "723", + "25915": "723", + "25918": "726", + "25920": "723", + "25921": "723", + "25924": "723", + "25927": "726", + "25930": "723", + "25933": "723", + "25936": "723", + "25937": "723", + "25939": "723", + "25942": "724", + "25945": "724", + "25948": "724", + "25951": "724", + "25954": "724", + "25957": "724", + "25960": "724", + "25963": "725", + "25966": "725", + "25969": "725", + "25972": "725", + "25975": "725", + "25978": "725", + "25981": "725", + "25984": "725", + "25987": "725", + "25990": "725", + "25993": "731", + "25996": "731", + "25999": "731", + "26002": "731", + "26005": "731", + "26008": "731", + "26011": "731", + "26014": "731", + "26017": "731", + "26020": "731", + "26023": "731", + "26029": "731", + "26041": "731", + "26047": "731", + "26050": "731", + "26053": "731", + "26056": "731", + "26059": "731", + "26062": "731", + "26065": "731", + "26068": "731", + "26077": "732", + "26080": "732", + "26083": "732", + "26086": "732", + "26089": "732", + "26092": "732", + "26095": "732", + "26098": "732", + "26101": "732", + "26104": "732", + "26107": "732", + "26110": "732", + "26113": "732", + "26116": "734", + "26119": "734", + "26122": "734", + "26125": "734", + "26131": "734", + "26134": "734", + "26140": "734", + "26143": "734", + "26146": "734", + "26149": "734", + "26152": "734", + "26155": "734", + "26158": "734", + "26161": "734", + "26164": "734", + "26167": "734", + "26170": "735", + "26173": "735", + "26176": "735", + "26179": "735", + "26182": "735", + "26185": "735", + "26188": "735", + "26191": "735", + "26194": "735", + "26200": "735", + "26206": "736", + "26209": "736", + "26212": "736", + "26215": "736", + "26218": "736", + "26221": "736", + "26224": "736", + "26227": "736", + "26230": "736", + "26233": "736", + "26236": "736", + "26239": "736", + "26242": "736", + "26245": "736", + "26248": "737", + "26251": "737", + "26254": "737", + "26257": "737", + "26260": "737", + "26263": "737", + "26266": "737", + "26269": "737", + "26272": "737", + "26275": "737", + "26278": "737", + "26281": "737", + "26284": "737", + "26287": "737", + "26290": "737", + "26293": "737", + "26296": "737", + "26299": "738", + "26302": "738", + "26305": "738", + "26308": "738", + "26311": "738", + "26314": "738", + "26317": "738", + "26320": "738", + "26323": "738", + "26326": "738", + "26329": "739", + "26332": "739", + "26335": "739", + "26338": "739", + "26341": "739", + "26344": "739", + "26347": "739", + "26350": "739", + "26353": "739", + "26356": "739", + "26359": "739", + "26362": "739", + "26365": "739", + "26368": "740", + "26371": "731", + "26374": "731", + "26377": "731", + "26380": "731", + "26383": "740", + "26386": "740", + "26389": "740", + "26392": "740", + "26395": "740", + "26398": "740", + "26401": "740", + "26404": "740", + "26410": "740", + "26413": "740", + "26416": "740", + "26419": "740", + "26422": "740", + "26425": "741", + "26428": "741", + "26431": "741", + "26434": "741", + "26437": "741", + "26440": "741", + "26443": "741", + "26446": "741", + "26449": "741", + "26452": "741", + "26455": "741", + "26458": "741", + "26461": "741", + "26464": "741", + "26467": "741", + "26470": "742", + "26473": "742", + "26476": "742", + "26479": "742", + "26482": "742", + "26485": "742", + "26488": "742", + "26491": "742", + "26494": "742", + "26497": "742", + "26500": "742", + "26503": "742", + "26506": "747", + "26508": "747", + "26509": "747", + "26512": "747", + "26515": "747", + "26518": "747", + "26521": "747", + "26524": "747", + "26526": "747", + "26527": "747", + "26530": "747", + "26533": "747", + "26535": "747", + "26536": "747", + "26539": "747", + "26542": "747", + "26545": "747", + "26548": "748", + "26551": "748", + "26554": "748", + "26557": "748", + "26558": "748", + "26560": "748", + "26563": "748", + "26566": "748", + "26567": "748", + "26569": "748", + "26572": "748", + "26574": "750", + "26575": "750", + "26578": "750", + "26581": "750", + "26584": "750", + "26587": "750", + "26590": "750", + "26593": "750", + "26596": "750", + "26599": "750", + "26602": "750", + "26605": "750", + "26608": "750", + "26611": "750", + "26614": "750", + "26617": "750", + "26620": "751", + "26623": "751", + "26626": "751", + "26629": "751", + "26632": "751", + "26635": "751", + "26638": "751", + "26641": "751", + "26644": "751", + "26647": "751", + "26650": "751", + "26653": "751", + "26656": "751", + "26659": "752", + "26662": "752", + "26665": "752", + "26668": "752", + "26671": "752", + "26674": "752", + "26677": "752", + "26680": "753", + "26683": "753", + "26686": "753", + "26689": "753", + "26692": "753", + "26695": "753", + "26698": "753", + "26701": "753", + "26704": "754", + "26707": "754", + "26710": "754", + "26713": "754", + "26716": "754", + "26719": "754", + "26722": "754", + "26725": "754", + "26728": "754", + "26731": "754", + "26734": "760", + "26737": "760", + "26740": "760", + "26743": "760", + "26746": "760", + "26749": "760", + "26752": "760", + "26755": "760", + "26758": "760", + "26761": "760", + "26764": "761", + "26767": "761", + "26770": "761", + "26773": "761", + "26776": "761", + "26779": "761", + "26782": "761", + "26785": "761", + "26787": "761", + "26788": "761", + "26791": "761", + "26794": "769", + "26797": "769", + "26800": "769", + "26803": "769", + "26806": "769", + "26809": "769", + "26812": "769", + "26815": "769", + "26818": "769", + "26821": "769", + "26824": "769", + "26827": "769", + "26830": "769", + "26833": "769", + "26836": "769", + "26839": "769", + "26842": "769", + "26845": "769", + "26848": "769", + "26851": "769", + "26854": "769", + "26857": "769", + "26860": "769", + "26863": "769", + "26866": "769", + "26869": "764", + "26872": "764", + "26875": "764", + "26876": "764", + "26878": "764", + "26881": "764", + "26882": "764", + "26884": "764", + "26887": "764", + "26890": "764", + "26893": "764", + "26896": "764", + "26897": "764", + "26898": "764", + "26899": "764", + "26902": "764", + "26905": "765", + "26908": "765", + "26911": "765", + "26914": "765", + "26917": "765", + "26920": "765", + "26923": "765", + "26926": "765", + "26929": "765", + "26932": "765", + "26935": "765", + "26938": "765", + "26941": "765", + "26944": "765", + "26947": "765", + "26950": "765", + "26953": "765", + "26956": "765", + "26959": "765", + "26962": "765", + "26965": "766", + "26968": "766", + "26971": "766", + "26974": "766", + "26977": "766", + "26980": "766", + "26983": "766", + "26986": "766", + "26989": "766", + "26992": "766", + "26995": "766", + "26998": "766", + "27001": "766", + "27004": "766", + "27007": "766", + "27010": "767", + "27013": "767", + "27016": "767", + "27019": "767", + "27022": "767", + "27025": "767", + "27028": "767", + "27031": "767", + "27034": "767", + "27037": "767", + "27040": "767", + "27043": "768", + "27046": "768", + "27049": "768", + "27052": "768", + "27055": "768", + "27058": "768", + "27061": "768", + "27064": "768", + "27067": "768", + "27070": "768", + "27073": "768", + "27076": "768", + "27085": "768", + "27088": "769", + "27091": "769", + "27094": "769", + "27097": "769", + "27100": "769", + "27109": "769", + "27112": "769", + "27115": "769", + "27118": "769", + "27127": "770", + "27130": "770", + "27133": "770", + "27136": "770", + "27139": "770", + "27142": "770", + "27145": "770", + "27148": "770", + "27151": "770", + "27154": "770", + "27157": "770", + "27160": "770", + "27163": "771", + "27166": "771", + "27169": "771", + "27172": "771", + "27175": "771", + "27178": "771", + "27181": "771", + "27184": "771", + "27187": "771", + "27190": "771", + "27193": "771", + "27196": "771", + "27199": "771", + "27202": "771", + "27208": "772", + "27211": "772", + "27214": "772", + "27217": "772", + "27220": "772", + "27223": "772", + "27226": "772", + "27229": "772", + "27232": "772", + "27235": "772", + "27238": "772", + "27241": "772", + "27244": "772", + "27247": "772", + "27250": "772", + "27253": "772", + "27259": "773", + "27262": "773", + "27265": "773", + "27268": "773", + "27271": "773", + "27277": "773", + "27280": "773", + "27283": "773", + "27286": "773", + "27289": "773", + "27292": "773", + "27295": "773", + "27298": "773", + "27301": "774", + "27304": "774", + "27307": "774", + "27310": "774", + "27313": "774", + "27316": "774", + "27322": "774", + "27325": "774", + "27328": "774", + "27331": "774", + "27334": "774", + "27337": "774", + "27340": "774", + "27343": "774", + "27346": "775", + "27349": "775", + "27352": "775", + "27355": "775", + "27358": "775", + "27361": "775", + "27364": "775", + "27367": "775", + "27370": "775", + "27373": "775", + "27376": "775", + "27379": "775", + "27382": "775", + "27385": "775", + "27388": "776", + "27391": "776", + "27394": "776", + "27397": "776", + "27400": "776", + "27403": "776", + "27406": "776", + "27409": "776", + "27412": "776", + "27415": "776", + "27418": "776", + "27421": "776", + "27424": "776", + "27427": "776", + "27430": "776", + "27433": "776", + "27436": "777", + "27439": "777", + "27442": "777", + "27445": "777", + "27448": "777", + "27451": "777", + "27454": "777", + "27457": "777", + "27460": "777", + "27463": "777", + "27466": "778", + "27469": "778", + "27472": "778", + "27475": "778", + "27478": "778", + "27481": "778", + "27484": "778", + "27487": "778", + "27490": "778", + "27493": "778", + "27496": "783", + "27499": "783", + "27502": "783", + "27505": "783", + "27508": "783", + "27511": "783", + "27514": "783", + "27517": "783", + "27520": "783", + "27523": "783", + "27526": "783", + "27529": "783", + "27532": "783", + "27535": "783", + "27538": "783", + "27541": "783", + "27544": "783", + "27547": "783", + "27550": "783", + "27553": "783", + "27556": "783", + "27559": "784", + "27562": "784", + "27565": "784", + "27568": "784", + "27571": "784", + "27574": "784", + "27577": "784", + "27580": "784", + "27583": "784", + "27586": "784", + "27589": "784", + "27592": "784", + "27595": "785", + "27598": "785", + "27601": "785", + "27604": "785", + "27607": "785", + "27610": "785", + "27613": "785", + "27616": "785", + "27619": "785", + "27622": "785", + "27625": "785", + "27628": "785", + "27631": "785", + "27634": "785", + "27637": "785", + "27640": "785", + "27643": "786", + "27646": "786", + "27649": "786", + "27652": "786", + "27655": "786", + "27658": "786", + "27661": "786", + "27664": "787", + "27667": "787", + "27670": "787", + "27673": "787", + "27676": "787", + "27679": "787", + "27682": "787", + "27685": "794", + "27688": "794", + "27691": "794", + "27692": "794", + "27694": "794", + "27697": "794", + "27698": "794", + "27700": "794", + "27703": "794", + "27706": "794", + "27709": "794", + "27712": "794", + "27715": "794", + "27718": "794", + "27721": "796", + "27724": "796", + "27727": "796", + "27730": "796", + "27733": "796", + "27736": "796", + "27739": "796", + "27742": "796", + "27745": "796", + "27748": "796", + "27751": "796", + "27754": "796", + "27757": "797", + "27760": "797", + "27763": "797", + "27766": "797", + "27769": "797", + "27772": "797", + "27775": "797", + "27778": "797", + "27781": "797", + "27784": "797", + "27787": "795", + "27788": "795", + "27790": "795", + "27793": "795", + "27796": "798", + "27799": "795", + "27802": "798", + "27805": "795", + "27806": "795", + "27808": "798", + "27811": "798", + "27814": "798", + "27817": "795", + "27820": "798", + "27823": "798", + "27826": "799", + "27829": "799", + "27832": "799", + "27835": "799", + "27838": "799", + "27841": "799", + "27844": "799", + "27847": "799", + "27850": "799", + "27853": "799", + "27856": "799", + "27859": "799", + "27862": "799", + "27865": "800", + "27868": "800", + "27871": "800", + "27874": "800", + "27877": "800", + "27880": "800", + "27883": "800", + "27886": "800", + "27889": "800", + "27892": "800", + "27895": "800", + "27898": "801", + "27901": "801", + "27904": "801", + "27907": "801", + "27910": "801", + "27913": "801", + "27916": "801", + "27919": "801", + "27922": "801", + "27925": "801", + "27928": "801", + "27931": "802", + "27934": "802", + "27937": "802", + "27940": "802", + "27943": "802", + "27946": "802", + "27949": "802", + "27952": "802", + "27955": "802", + "27958": "802", + "27961": "802", + "27964": "802", + "27967": "802", + "27970": "802", + "27973": "802", + "27976": "802", + "27979": "802", + "27982": "802", + "27985": "802", + "27988": "802", + "27991": "803", + "27994": "803", + "27997": "803", + "28000": "803", + "28003": "803", + "28006": "803", + "28009": "803", + "28012": "803", + "28015": "803", + "28018": "803", + "28021": "803", + "28024": "803", + "28027": "803", + "28030": "803", + "28033": "803", + "28036": "804", + "28039": "804", + "28042": "804", + "28045": "804", + "28048": "804", + "28051": "804", + "28054": "804", + "28057": "804", + "28060": "804", + "28063": "804", + "28066": "804", + "28072": "804", + "28075": "805", + "28078": "805", + "28084": "805", + "28087": "805", + "28090": "805", + "28093": "805", + "28096": "805", + "28099": "805", + "28102": "805", + "28105": "805", + "28108": "806", + "28111": "806", + "28114": "806", + "28117": "806", + "28120": "806", + "28123": "806", + "28126": "806", + "28129": "806", + "28132": "806", + "28135": "806", + "28138": "806", + "28141": "806", + "28144": "806", + "28147": "806", + "28150": "806", + "28153": "806", + "28156": "806", + "28159": "807", + "28162": "807", + "28165": "807", + "28168": "807", + "28174": "807", + "28177": "807", + "28180": "807", + "28183": "807", + "28189": "807", + "28192": "807", + "28195": "807", + "28198": "807", + "28201": "807", + "28204": "807", + "28207": "807", + "28210": "808", + "28213": "808", + "28216": "808", + "28219": "808", + "28222": "808", + "28225": "808", + "28228": "808", + "28231": "808", + "28234": "808", + "28237": "808", + "28240": "808", + "28243": "808", + "28246": "808", + "28249": "815", + "28252": "815", + "28261": "815", + "28264": "815", + "28270": "815", + "28273": "815", + "28276": "815", + "28279": "815", + "28282": "815", + "28285": "815", + "28288": "815", + "28291": "815", + "28297": "816", + "28300": "816", + "28306": "816", + "28309": "816", + "28312": "816", + "28315": "816", + "28318": "816", + "28321": "818", + "28324": "818", + "28327": "818", + "28330": "818", + "28333": "818", + "28336": "818", + "28339": "818", + "28342": "818", + "28345": "818", + "28348": "818", + "28354": "818", + "28357": "818", + "28360": "819", + "28363": "819", + "28366": "819", + "28369": "819", + "28372": "819", + "28375": "819", + "28378": "819", + "28381": "819", + "28384": "819", + "28387": "819", + "28390": "819", + "28393": "819", + "28396": "819", + "28399": "819", + "28402": "819", + "28405": "819", + "28408": "819", + "28411": "819", + "28414": "819", + "28417": "819", + "28420": "819", + "28423": "819", + "28426": "819", + "28429": "819", + "28432": "819", + "28435": "817", + "28436": "817", + "28437": "817", + "28438": "820", + "28439": "817", + "28440": "817", + "28441": "820", + "28444": "820", + "28447": "817", + "28450": "817", + "28453": "817", + "28456": "820", + "28459": "817", + "28462": "817", + "28465": "820", + "28468": "817", + "28471": "820", + "28474": "817", + "28477": "817", + "28480": "817", + "28483": "817", + "28486": "817", + "28489": "820", + "28492": "820", + "28495": "820", + "28498": "820", + "28501": "820", + "28504": "820", + "28507": "820", + "28510": "820", + "28513": "820", + "28516": "820", + "28519": "821", + "28522": "821", + "28525": "821", + "28528": "821", + "28534": "821", + "28537": "821", + "28540": "821", + "28543": "821", + "28549": "821", + "28552": "821", + "28558": "821", + "28561": "821", + "28564": "821", + "28567": "815", + "28570": "821", + "28573": "821", + "28576": "821", + "28579": "821", + "28582": "821", + "28585": "821", + "28588": "821", + "28591": "815", + "28594": "822", + "28597": "822", + "28600": "822", + "28603": "822", + "28606": "822", + "28609": "822", + "28612": "822", + "28615": "822", + "28618": "822", + "28621": "822", + "28624": "822", + "28627": "822", + "28630": "822", + "28633": "822", + "28636": "822", + "28639": "822", + "28642": "822", + "28645": "822", + "28648": "822", + "28651": "823", + "28654": "823", + "28657": "823", + "28660": "823", + "28663": "823", + "28666": "823", + "28669": "823", + "28672": "823", + "28675": "823", + "28678": "823", + "28681": "823", + "28684": "823", + "28687": "823", + "28690": "825", + "28693": "825", + "28696": "825", + "28699": "825", + "28702": "824", + "28705": "824", + "28708": "816", + "28711": "824", + "28714": "824", + "28717": "816", + "28720": "824", + "28723": "824", + "28726": "824", + "28729": "816", + "28732": "824", + "28735": "824", + "28738": "824", + "28741": "824", + "28744": "824", + "28747": "824", + "28750": "825", + "28753": "825", + "28756": "829", + "28757": "829", + "28759": "829", + "28762": "829", + "28765": "829", + "28768": "829", + "28777": "829", + "28780": "829", + "28783": "829", + "28786": "829", + "28789": "829", + "28792": "829", + "28795": "829", + "28798": "829", + "28801": "831", + "28804": "831", + "28807": "831", + "28810": "831", + "28813": "831", + "28819": "831", + "28822": "831", + "28825": "831", + "28828": "831", + "28831": "831", + "28834": "831", + "28837": "831", + "28840": "831", + "28843": "831", + "28846": "831", + "28849": "831", + "28852": "831", + "28855": "831", + "28858": "831", + "28861": "831", + "28864": "831", + "28870": "832", + "28873": "832", + "28876": "832", + "28879": "832", + "28882": "832", + "28885": "832", + "28888": "832", + "28889": "838", + "28891": "832", + "28894": "832", + "28897": "832", + "28900": "832", + "28901": "838", + "28903": "833", + "28906": "838", + "28909": "838", + "28912": "838", + "28915": "838", + "28918": "838", + "28921": "838", + "28924": "838", + "28927": "838", + "28930": "833", + "28933": "838", + "28936": "838", + "28939": "833", + "28940": "833", + "28942": "833", + "28945": "833", + "28948": "838", + "28951": "833", + "28957": "833", + "28960": "833", + "28963": "833", + "28966": "833", + "28969": "833", + "28972": "833", + "28975": "833", + "28978": "833", + "28981": "833", + "28984": "834", + "28987": "834", + "28993": "834", + "28996": "834", + "28999": "834", + "29002": "834", + "29005": "834", + "29008": "834", + "29011": "834", + "29014": "834", + "29017": "834", + "29020": "834", + "29023": "834", + "29026": "834", + "29029": "834", + "29032": "834", + "29035": "834", + "29038": "834", + "29041": "834", + "29044": "834", + "29047": "834", + "29050": "835", + "29053": "835", + "29056": "835", + "29059": "835", + "29062": "835", + "29065": "835", + "29068": "835", + "29071": "835", + "29074": "835", + "29077": "835", + "29080": "835", + "29083": "835", + "29086": "835", + "29089": "835", + "29092": "835", + "29095": "835", + "29098": "835", + "29101": "835", + "29104": "835", + "29107": "835", + "29110": "836", + "29113": "836", + "29116": "836", + "29119": "836", + "29122": "836", + "29125": "836", + "29128": "836", + "29131": "836", + "29134": "836", + "29137": "836", + "29143": "836", + "29146": "836", + "29149": "836", + "29152": "836", + "29155": "836", + "29158": "836", + "29161": "836", + "29164": "836", + "29167": "836", + "29170": "836", + "29173": "836", + "29176": "836", + "29179": "836", + "29182": "837", + "29185": "837", + "29188": "837", + "29191": "837", + "29194": "837", + "29197": "837", + "29200": "837", + "29203": "837", + "29206": "837", + "29209": "837", + "29212": "837", + "29215": "837", + "29218": "837", + "29221": "837", + "29224": "837", + "29227": "837", + "29230": "837", + "29233": "837", + "29236": "842", + "29239": "842", + "29242": "842", + "29245": "842", + "29248": "842", + "29251": "842", + "29254": "842", + "29257": "842", + "29260": "842", + "29263": "842", + "29266": "844", + "29269": "844", + "29272": "844", + "29275": "844", + "29278": "844", + "29281": "844", + "29284": "844", + "29287": "844", + "29290": "844", + "29293": "844", + "29296": "844", + "29299": "844", + "29302": "844", + "29305": "844", + "29308": "845", + "29311": "845", + "29314": "845", + "29317": "845", + "29320": "845", + "29323": "845", + "29326": "845", + "29329": "845", + "29332": "845", + "29335": "845", + "29338": "845", + "29341": "846", + "29344": "846", + "29347": "846", + "29350": "846", + "29353": "846", + "29356": "846", + "29359": "846", + "29362": "846", + "29365": "846", + "29368": "846", + "29371": "846", + "29374": "847", + "29377": "847", + "29380": "847", + "29383": "847", + "29386": "847", + "29389": "847", + "29392": "847", + "29395": "847", + "29398": "847", + "29401": "847", + "29404": "847", + "29407": "847", + "29410": "847", + "29413": "847", + "29416": "848", + "29419": "848", + "29422": "848", + "29425": "848", + "29428": "848", + "29431": "848", + "29434": "848", + "29437": "848", + "29440": "848", + "29443": "848", + "29446": "848", + "29449": "848", + "29452": "848", + "29455": "848", + "29458": "848", + "29461": "849", + "29462": "849", + "29464": "849", + "29467": "849", + "29470": "849", + "29473": "849", + "29476": "849", + "29479": "849", + "29482": "849", + "29485": "849", + "29488": "849", + "29489": "849", + "29491": "849", + "29494": "849", + "29497": "850", + "29500": "850", + "29503": "849", + "29506": "849", + "29509": "849", + "29512": "851", + "29513": "850", + "29515": "851", + "29516": "851", + "29518": "851", + "29521": "850", + "29524": "851", + "29527": "851", + "29530": "850", + "29533": "850", + "29536": "850", + "29539": "851", + "29542": "855", + "29545": "855", + "29551": "855", + "29554": "855", + "29557": "855", + "29560": "855", + "29563": "855", + "29566": "855", + "29569": "855", + "29572": "855", + "29578": "857", + "29581": "857", + "29584": "857", + "29587": "857", + "29590": "857", + "29593": "857", + "29596": "857", + "29599": "857", + "29602": "857", + "29605": "857", + "29608": "857", + "29611": "857", + "29614": "857", + "29617": "857", + "29623": "858", + "29626": "858", + "29629": "858", + "29632": "858", + "29635": "858", + "29638": "858", + "29641": "858", + "29644": "858", + "29647": "858", + "29650": "858", + "29653": "858", + "29656": "858", + "29659": "859", + "29662": "859", + "29665": "859", + "29668": "859", + "29671": "859", + "29674": "859", + "29677": "859", + "29680": "859", + "29683": "859", + "29686": "859", + "29689": "859", + "29692": "859", + "29695": "859", + "29698": "859", + "29701": "859", + "29704": "859", + "29707": "859", + "29710": "859", + "29713": "859", + "29716": "859", + "29719": "860", + "29722": "860", + "29725": "860", + "29728": "860", + "29731": "860", + "29734": "860", + "29737": "860", + "29740": "860", + "29743": "860", + "29746": "860", + "29749": "860", + "29752": "860", + "29755": "860", + "29761": "860", + "29764": "860", + "29767": "860", + "29770": "861", + "29771": "861", + "29776": "863", + "29779": "863", + "29782": "863", + "29785": "863", + "29788": "863", + "29791": "863", + "29794": "863", + "29797": "863", + "29800": "863", + "29806": "861", + "29809": "861", + "29812": "861", + "29813": "861", + "29815": "861", + "29818": "861", + "29821": "862", + "29824": "862", + "29827": "862", + "29830": "862", + "29833": "862", + "29836": "862", + "29839": "862", + "29842": "862", + "29845": "862", + "29848": "862", + "29851": "862", + "29857": "862", + "29860": "862", + "29863": "866", + "29866": "866", + "29869": "866", + "29872": "866", + "29875": "866", + "29878": "866", + "29881": "866", + "29884": "866", + "29887": "866", + "29888": "866", + "29890": "866", + "29892": "866", + "29893": "866", + "29896": "866", + "29899": "866", + "29902": "867", + "29905": "867", + "29908": "867", + "29911": "867", + "29914": "867", + "29917": "867", + "29919": "867", + "29920": "867", + "29923": "867", + "29926": "869", + "29929": "869", + "29932": "869", + "29935": "869", + "29938": "869", + "29941": "869", + "29944": "869", + "29947": "869", + "29950": "869", + "29954": "868", + "29955": "868", + "29956": "870", + "29959": "868", + "29962": "870", + "29965": "868", + "29971": "870", + "29974": "870", + "29977": "870", + "29978": "868", + "29980": "870", + "29983": "870", + "29986": "868", + "29989": "868", + "29992": "870", + "29995": "870", + "29998": "870", + "30001": "871", + "30004": "871", + "30007": "871", + "30010": "871", + "30013": "871", + "30016": "871", + "30019": "871", + "30022": "871", + "30025": "871", + "30028": "871", + "30031": "871", + "30034": "871", + "30037": "872", + "30040": "872", + "30043": "872", + "30046": "872", + "30049": "872", + "30052": "872", + "30055": "872", + "30058": "872", + "30061": "872", + "30064": "872", + "30067": "872", + "30070": "872", + "30073": "872", + "30076": "873", + "30079": "873", + "30082": "873", + "30085": "873", + "30088": "873", + "30091": "873", + "30094": "873", + "30097": "873", + "30100": "873", + "30103": "873", + "30106": "873", + "30109": "873", + "30112": "873", + "30115": "873", + "30118": "873", + "30121": "873", + "30124": "873", + "30127": "873", + "30130": "874", + "30133": "874", + "30136": "874", + "30139": "874", + "30142": "874", + "30145": "874", + "30148": "874", + "30151": "874", + "30154": "874", + "30157": "874", + "30160": "874", + "30163": "874", + "30166": "874", + "30169": "875", + "30172": "875", + "30175": "875", + "30178": "875", + "30181": "875", + "30184": "875", + "30187": "875", + "30190": "875", + "30193": "875", + "30196": "875", + "30199": "875", + "30202": "875", + "30205": "875", + "30208": "876", + "30211": "876", + "30214": "876", + "30217": "876", + "30220": "876", + "30223": "876", + "30226": "876", + "30229": "876", + "30232": "876", + "30235": "876", + "30238": "876", + "30241": "876", + "30244": "877", + "30247": "877", + "30250": "877", + "30253": "877", + "30256": "877", + "30259": "877", + "30262": "877", + "30265": "877", + "30268": "877", + "30271": "877", + "30274": "877", + "30277": "877", + "30280": "883", + "30283": "883", + "30285": "883", + "30286": "883", + "30289": "883", + "30292": "883", + "30295": "883", + "30298": "883", + "30301": "883", + "30304": "883", + "30307": "883", + "30310": "883", + "30313": "883", + "30316": "884", + "30319": "884", + "30322": "884", + "30325": "884", + "30328": "884", + "30331": "884", + "30334": "884", + "30337": "886", + "30340": "886", + "30341": "886", + "30343": "886", + "30346": "886", + "30349": "886", + "30352": "886", + "30355": "886", + "30358": "886", + "30361": "886", + "30364": "886", + "30367": "886", + "30370": "886", + "30373": "886", + "30376": "887", + "30377": "887", + "30378": "887", + "30379": "887", + "30382": "887", + "30385": "887", + "30387": "887", + "30388": "887", + "30391": "887", + "30394": "887", + "30397": "887", + "30400": "887", + "30403": "887", + "30406": "888", + "30409": "888", + "30412": "887", + "30415": "888", + "30418": "888", + "30421": "888", + "30424": "888", + "30427": "888", + "30430": "888", + "30433": "888", + "30436": "888", + "30439": "888", + "30442": "888", + "30445": "888", + "30448": "888", + "30451": "888", + "30454": "888", + "30457": "888", + "30460": "888", + "30463": "889", + "30466": "889", + "30469": "889", + "30472": "889", + "30475": "889", + "30478": "889", + "30481": "889", + "30484": "889", + "30487": "889", + "30490": "889", + "30493": "889", + "30496": "889", + "30499": "889", + "30502": "890", + "30505": "890", + "30508": "890", + "30511": "890", + "30514": "890", + "30517": "890", + "30520": "890", + "30523": "890", + "30526": "890", + "30529": "890", + "30532": "890", + "30535": "890", + "30538": "890", + "30541": "890", + "30544": "891", + "30547": "891", + "30550": "891", + "30553": "891", + "30556": "891", + "30559": "891", + "30562": "891", + "30565": "891", + "30568": "891", + "30571": "891", + "30574": "891", + "30577": "891", + "30580": "891", + "30583": "891", + "30586": "891", + "30589": "892", + "30592": "892", + "30595": "892", + "30598": "892", + "30601": "892", + "30604": "892", + "30607": "892", + "30610": "892", + "30613": "892", + "30616": "892", + "30619": "892", + "30622": "892", + "30625": "892", + "30628": "893", + "30631": "893", + "30634": "893", + "30637": "893", + "30640": "893", + "30643": "893", + "30646": "893", + "30649": "893", + "30652": "893", + "30655": "893", + "30658": "893", + "30661": "893", + "30664": "893", + "30667": "893", + "30670": "893", + "30673": "893", + "30676": "893", + "30679": "893", + "30682": "894", + "30685": "894", + "30688": "894", + "30691": "894", + "30692": "894", + "30694": "894", + "30697": "894", + "30700": "894", + "30703": "894", + "30706": "894", + "30709": "894", + "30712": "894", + "30715": "894", + "30718": "894", + "30721": "894", + "30724": "894", + "30727": "894", + "30730": "899", + "30733": "899", + "30736": "899", + "30739": "899", + "30742": "899", + "30745": "899", + "30748": "899", + "30751": "899", + "30754": "899", + "30757": "899", + "30760": "899", + "30763": "899", + "30766": "900", + "30769": "900", + "30772": "900", + "30775": "900", + "30778": "900", + "30781": "900", + "30784": "900", + "30787": "902", + "30790": "902", + "30791": "914", + "30793": "914", + "30796": "914", + "30797": "914", + "30799": "914", + "30802": "902", + "30805": "902", + "30808": "902", + "30809": "902", + "30811": "902", + "30814": "902", + "30817": "903", + "30820": "903", + "30823": "903", + "30826": "903", + "30828": "903", + "30829": "903", + "30832": "903", + "30835": "903", + "30836": "903", + "30838": "903", + "30840": "903", + "30841": "903", + "30844": "903", + "30847": "903", + "30850": "904", + "30853": "904", + "30856": "904", + "30859": "904", + "30860": "904", + "30862": "904", + "30865": "904", + "30868": "904", + "30871": "904", + "30874": "904", + "30877": "904", + "30880": "905", + "30883": "905", + "30886": "905", + "30887": "905", + "30889": "905", + "30892": "905", + "30893": "905", + "30895": "905", + "30898": "905", + "30901": "905", + "30904": "906", + "30907": "906", + "30910": "906", + "30913": "906", + "30916": "906", + "30917": "906", + "30919": "906", + "30922": "906", + "30925": "906", + "30928": "906", + "30931": "906", + "30934": "906", + "30937": "906", + "30940": "906", + "30943": "906", + "30946": "906", + "30947": "906", + "30949": "906", + "30950": "906", + "30952": "907", + "30955": "907", + "30958": "907", + "30961": "907", + "30964": "907", + "30967": "907", + "30970": "907", + "30973": "907", + "30976": "907", + "30979": "907", + "30982": "907", + "30985": "908", + "30988": "908", + "30991": "908", + "30994": "908", + "30997": "908", + "31000": "908", + "31003": "908", + "31006": "908", + "31009": "908", + "31012": "913", + "31015": "913", + "31018": "909", + "31021": "909", + "31024": "909", + "31027": "913", + "31030": "909", + "31031": "909", + "31033": "909", + "31036": "909", + "31039": "909", + "31042": "909", + "31045": "909", + "31048": "909", + "31051": "910", + "31054": "913", + "31057": "913", + "31060": "910", + "31063": "910", + "31064": "910", + "31066": "913", + "31069": "910", + "31072": "910", + "31074": "910", + "31075": "910", + "31078": "911", + "31081": "911", + "31084": "911", + "31087": "911", + "31090": "911", + "31093": "911", + "31096": "911", + "31102": "911", + "31105": "911", + "31108": "912", + "31111": "912", + "31114": "912", + "31115": "912", + "31117": "916", + "31120": "916", + "31123": "916", + "31135": "916", + "31144": "916", + "31147": "916", + "31149": "916", + "31150": "916", + "31153": "917", + "31154": "917", + "31156": "917", + "31157": "917", + "31159": "917", + "31162": "917", + "31165": "917", + "31168": "918", + "31169": "918", + "31171": "918", + "31174": "918", + "31177": "918", + "31178": "918", + "31180": "918", + "31183": "918", + "31186": "919", + "31189": "919", + "31192": "919", + "31195": "919", + "31198": "919", + "31201": "919", + "31204": "919", + "31207": "923", + "31210": "923", + "31211": "924", + "31212": "923", + "31213": "923", + "31216": "923", + "31217": "923", + "31219": "923", + "31222": "925", + "31225": "925", + "31227": "923", + "31228": "923", + "31231": "924", + "31232": "924", + "31234": "924", + "31237": "924", + "31240": "924", + "31241": "924", + "31243": "924", + "31244": "924", + "31246": "924", + "31249": "925", + "31252": "924", + "31255": "925", + "31258": "927", + "31261": "925", + "31264": "925", + "31267": "927", + "31268": "927", + "31270": "927", + "31273": "925", + "31274": "925", + "31276": "925", + "31277": "925", + "31279": "927", + "31282": "927", + "31285": "927", + "31286": "927", + "31288": "927", + "31291": "927", + "31294": "927", + "31297": "927", + "31298": "927", + "31299": "926", + "31300": "926", + "31303": "926", + "31306": "926", + "31309": "926", + "31312": "926", + "31315": "926", + "31318": "930", + "31321": "930", + "31324": "930", + "31327": "930", + "31330": "930", + "31333": "930", + "31336": "930", + "31338": "930", + "31339": "930", + "31340": "931", + "31341": "931", + "31342": "932", + "31343": "931", + "31344": "931", + "31345": "932", + "31346": "932", + "31348": "932", + "31351": "932", + "31357": "932", + "31359": "932", + "31360": "932", + "31362": "932", + "31363": "932", + "31366": "933", + "31369": "933", + "31375": "933", + "31378": "933", + "31379": "933", + "31381": "933", + "31384": "933", + "31387": "933", + "31393": "934", + "31396": "934", + "31399": "934", + "31402": "934", + "31405": "934", + "31408": "934", + "31411": "931", + "31414": "931", + "31417": "934", + "31420": "934", + "31423": "934", + "31426": "934", + "31429": "934", + "31432": "934", + "31433": "934", + "31435": "934", + "31438": "934", + "31441": "935", + "31444": "935", + "31447": "935", + "31450": "935", + "31453": "935", + "31456": "935", + "31459": "935", + "31462": "935", + "31465": "935", + "31468": "935", + "31471": "937", + "31472": "937", + "31473": "937", + "31474": "937", + "31475": "937", + "31477": "937", + "31478": "937", + "31480": "937", + "31481": "937", + "31483": "936", + "31484": "936", + "31486": "936", + "31489": "936", + "31490": "936", + "31492": "936", + "31493": "936", + "31495": "936", + "31498": "941", + "31501": "941", + "31504": "941", + "31507": "941", + "31510": "941", + "31516": "941", + "31519": "941", + "31522": "941", + "31525": "941", + "31528": "943", + "31531": "943", + "31534": "943", + "31537": "943", + "31540": "943", + "31543": "943", + "31546": "943", + "31549": "943", + "31552": "943", + "31555": "943", + "31558": "943", + "31561": "943", + "31564": "943", + "31567": "944", + "31569": "942", + "31570": "942", + "31573": "942", + "31576": "942", + "31579": "944", + "31582": "942", + "31585": "942", + "31588": "944", + "31591": "944", + "31594": "942", + "31597": "944", + "31600": "942", + "31603": "944", + "31606": "944", + "31609": "944", + "31612": "944", + "31615": "945", + "31618": "945", + "31621": "945", + "31624": "945", + "31627": "945", + "31630": "945", + "31633": "945", + "31636": "945", + "31639": "946", + "31642": "946", + "31645": "946", + "31648": "946", + "31651": "946", + "31654": "946", + "31657": "946", + "31660": "946", + "31663": "946", + "31666": "946", + "31669": "946", + "31672": "951", + "31673": "951", + "31675": "951", + "31678": "951", + "31679": "951", + "31681": "951", + "31684": "947", + "31687": "951", + "31690": "947", + "31693": "947", + "31696": "951", + "31699": "951", + "31702": "951", + "31705": "951", + "31708": "947", + "31711": "947", + "31714": "947", + "31717": "947", + "31720": "947", + "31723": "947", + "31726": "947", + "31729": "947", + "31732": "948", + "31735": "948", + "31738": "948", + "31741": "948", + "31744": "948", + "31747": "948", + "31750": "948", + "31753": "948", + "31756": "949", + "31757": "949", + "31759": "949", + "31762": "949", + "31765": "949", + "31768": "949", + "31771": "949", + "31774": "949", + "31777": "949", + "31780": "949", + "31783": "950", + "31786": "950", + "31789": "950", + "31792": "950", + "31795": "950", + "31798": "950", + "31801": "950", + "31804": "950", + "31807": "950", + "31810": "950", + "31813": "954", + "31816": "954", + "31819": "954", + "31822": "954", + "31825": "954", + "31828": "954", + "31831": "954", + "31834": "954", + "31837": "954", + "31840": "954", + "31843": "956", + "31846": "956", + "31849": "956", + "31852": "956", + "31855": "956", + "31858": "956", + "31861": "956", + "31863": "956", + "31864": "956", + "31867": "957", + "31870": "957", + "31873": "957", + "31876": "957", + "31879": "957", + "31882": "957", + "31885": "957", + "31888": "957", + "31891": "961", + "31894": "958", + "31897": "958", + "31900": "958", + "31903": "958", + "31906": "958", + "31909": "958", + "31912": "958", + "31915": "961", + "31918": "961", + "31921": "958", + "31924": "961", + "31927": "961", + "31930": "961", + "31933": "961", + "31936": "961", + "31942": "959", + "31945": "959", + "31948": "959", + "31951": "959", + "31954": "959", + "31957": "959", + "31960": "959", + "31963": "959", + "31966": "959", + "31969": "959", + "31972": "960", + "31975": "960", + "31978": "960", + "31981": "960", + "31984": "960", + "31985": "960", + "31987": "960", + "31988": "960", + "31990": "960", + "31993": "960", + "31996": "960", + "31999": "964", + "32002": "964", + "32005": "964", + "32008": "964", + "32011": "964", + "32014": "964", + "32017": "964", + "32020": "964", + "32022": "964", + "32023": "964", + "32025": "964", + "32026": "964", + "32029": "964", + "32032": "964", + "32035": "964", + "32038": "964", + "32041": "964", + "32044": "966", + "32047": "966", + "32048": "966", + "32050": "966", + "32053": "966", + "32056": "966", + "32059": "966", + "32062": "966", + "32065": "967", + "32068": "967", + "32069": "967", + "32071": "967", + "32072": "967", + "32074": "967", + "32077": "967", + "32080": "967", + "32083": "967", + "32086": "967", + "32089": "967", + "32092": "967", + "32095": "968", + "32098": "968", + "32101": "968", + "32104": "968", + "32107": "968", + "32108": "968", + "32110": "968", + "32113": "968", + "32116": "968", + "32119": "968", + "32122": "968", + "32124": "968", + "32125": "968", + "32128": "969", + "32130": "969", + "32131": "969", + "32134": "969", + "32137": "969", + "32140": "969", + "32141": "969", + "32142": "969", + "32143": "969", + "32146": "969", + "32149": "969", + "32152": "970", + "32155": "970", + "32158": "970", + "32161": "970", + "32162": "970", + "32164": "970", + "32167": "970", + "32170": "970", + "32173": "970", + "32174": "970", + "32176": "970", + "32179": "970", + "32182": "970", + "32185": "970", + "32186": "970", + "32188": "970", + "32191": "971", + "32194": "971", + "32197": "971", + "32200": "971", + "32201": "971", + "32203": "971", + "32206": "971", + "32209": "971", + "32212": "972", + "32214": "972", + "32215": "972", + "32218": "972", + "32221": "972", + "32224": "972", + "32227": "972", + "32228": "972", + "32230": "972", + "32233": "973", + "32236": "973", + "32239": "973", + "32242": "973", + "32244": "973", + "32245": "973", + "32248": "973", + "001": "01", + "00001": "001", + "00004": "001", + "00006": "001", + "00007": "001", + "00008": "001", + "00010": "001", + "00013": "001", + "00016": "001", + "00019": "001", + "00022": "001", + "00025": "001", + "00028": "001", + "00031": "001", + "00034": "001", + "002": "01", + "00037": "002", + "00040": "002", + "00043": "002", + "00046": "002", + "00049": "002", + "00052": "002", + "00055": "002", + "00058": "002", + "00061": "002", + "00064": "002", + "00067": "002", + "00070": "002", + "00073": "002", + "00076": "002", + "00079": "002", + "00082": "002", + "00085": "002", + "00088": "002", + "003": "01", + "00091": "003", + "00094": "003", + "00097": "003", + "00100": "003", + "00103": "003", + "00106": "003", + "00109": "003", + "00112": "003", + "004": "01", + "00115": "004", + "00118": "004", + "00121": "004", + "00124": "004", + "00127": "004", + "00130": "004", + "00133": "004", + "00136": "004", + "00139": "004", + "00142": "004", + "00145": "004", + "00148": "004", + "00151": "004", + "00154": "004", + "005": "01", + "00157": "005", + "00160": "005", + "00163": "005", + "00166": "005", + "00167": "005", + "00169": "005", + "00172": "005", + "00175": "005", + "006": "01", + "00178": "006", + "00181": "006", + "00184": "006", + "00187": "006", + "00190": "006", + "00193": "006", + "00196": "006", + "00199": "006", + "00202": "006", + "00205": "006", + "00208": "006", + "00211": "006", + "00214": "006", + "00217": "006", + "00220": "006", + "00223": "006", + "00226": "006", + "00229": "006", + "00232": "006", + "00235": "006", + "00238": "006", + "007": "01", + "00241": "007", + "00244": "007", + "00247": "007", + "00256": "007", + "00259": "007", + "00262": "007", + "00265": "007", + "00268": "007", + "00271": "007", + "00274": "007", + "00277": "007", + "00280": "007", + "00283": "007", + "00286": "007", + "00289": "007", + "00292": "007", + "00295": "007", + "00298": "007", + "008": "01", + "00301": "008", + "00304": "008", + "00307": "008", + "00310": "008", + "00313": "008", + "00316": "008", + "00319": "008", + "00322": "008", + "00325": "008", + "00328": "008", + "00331": "008", + "00334": "008", + "00337": "008", + "00340": "008", + "009": "01", + "00343": "009", + "00346": "009", + "00349": "009", + "00352": "009", + "00355": "009", + "00358": "009", + "00361": "009", + "00364": "009", + "00367": "009", + "00370": "009", + "00373": "009", + "016": "01", + "00376": "016", + "00379": "016", + "00382": "016", + "00385": "016", + "00388": "016", + "00391": "016", + "00394": "016", + "00397": "016", + "00400": "016", + "00403": "016", + "00406": "016", + "00409": "016", + "00412": "016", + "00415": "016", + "00418": "016", + "00421": "016", + "00424": "016", + "00427": "016", + "00430": "016", + "00433": "016", + "00436": "016", + "00439": "016", + "00442": "016", + "00445": "016", + "00448": "016", + "00451": "016", + "017": "01", + "00454": "017", + "00457": "017", + "00460": "017", + "00463": "017", + "00466": "017", + "00469": "017", + "00472": "017", + "00475": "017", + "00478": "017", + "00481": "017", + "00484": "017", + "00487": "017", + "00490": "017", + "00493": "017", + "00496": "017", + "00499": "017", + "00502": "017", + "00505": "017", + "00508": "017", + "00511": "017", + "00514": "017", + "00517": "017", + "00520": "017", + "00523": "017", + "018": "01", + "00526": "018", + "00529": "018", + "00532": "018", + "00535": "018", + "00538": "018", + "00541": "018", + "00544": "018", + "00547": "018", + "00550": "018", + "00553": "018", + "00556": "018", + "00559": "018", + "00562": "018", + "00565": "018", + "00568": "018", + "00571": "018", + "00574": "018", + "00577": "018", + "00580": "018", + "00583": "018", + "00586": "018", + "00589": "018", + "019": "01", + "00592": "019", + "00622": "019", + "00623": "019", + "00625": "019", + "00626": "019", + "00628": "019", + "00631": "019", + "00632": "019", + "00634": "019", + "00637": "019", + "020": "01", + "00640": "020", + "00643": "020", + "00646": "020", + "00649": "020", + "00652": "020", + "00655": "020", + "00658": "020", + "00661": "020", + "00664": "020", + "00667": "020", + "00670": "020", + "00673": "020", + "00676": "020", + "00679": "020", + "00682": "020", + "00685": "020", + "021": "01", + "00595": "021", + "00598": "021", + "00601": "021", + "00602": "021", + "00604": "021", + "00607": "021", + "00610": "021", + "00611": "021", + "00613": "021", + "00616": "021", + "00617": "021", + "00619": "021", + "00620": "021", + "08973": "250", + "08974": "250", + "08977": "250", + "08980": "250", + "08983": "250", + "08986": "250", + "08989": "250", + "08992": "250", + "08995": "250", + "08998": "250", + "09001": "250", + "09004": "250", + "09007": "250", + "09010": "250", + "09013": "250", + "09016": "250", + "09019": "250", + "09022": "250", + "09538": "268", + "09541": "268", + "09542": "268", + "09544": "268", + "09547": "268", + "09550": "268", + "09551": "268", + "09552": "268", + "09553": "268", + "09556": "268", + "09562": "268", + "09565": "268", + "09568": "268", + "09571": "268", + "09886": "268", + "09574": "269", + "09577": "269", + "09580": "269", + "09583": "269", + "09586": "269", + "09589": "269", + "09592": "269", + "09595": "269", + "09598": "269", + "09601": "269", + "09604": "269", + "09607": "269", + "09610": "269", + "09613": "269", + "09616": "269", + "09619": "271", + "09625": "271", + "09628": "271", + "09631": "271", + "09634": "271", + "09637": "271", + "09640": "271", + "09643": "271", + "09646": "271", + "09649": "271", + "09652": "271", + "09655": "271", + "09658": "271", + "09661": "271", + "09664": "271", + "09667": "271", + "09670": "271", + "09673": "271", + "09676": "271", + "09679": "271", + "09682": "271", + "09685": "271", + "09688": "271", + "09691": "271", + "09694": "271", + "09697": "271", + "09700": "271", + "09703": "271", + "09706": "271", + "09709": "271", + "09712": "271", + "09715": "272", + "09718": "272", + "09721": "272", + "09724": "272", + "09727": "272", + "09733": "272", + "09739": "272", + "09742": "272", + "09745": "272", + "09748": "272", + "09751": "272", + "09754": "272", + "09757": "272", + "09760": "272", + "09763": "272", + "09766": "272", + "09769": "272", + "09772": "272", + "09775": "272", + "09778": "272", + "09781": "272", + "09784": "273", + "09787": "273", + "09790": "273", + "09793": "273", + "09796": "273", + "09799": "273", + "09802": "273", + "09805": "273", + "09808": "273", + "09811": "273", + "09814": "273", + "09817": "273", + "09820": "273", + "09823": "273", + "09826": "273", + "09829": "273", + "09832": "274", + "09835": "274", + "09838": "274", + "09841": "274", + "09844": "274", + "09847": "274", + "09850": "274", + "09853": "274", + "09856": "274", + "09859": "274", + "09862": "274", + "09865": "274", + "09868": "274", + "09871": "274", + "09874": "274", + "09877": "274", + "09880": "274", + "09883": "274", + "09889": "274", + "09892": "274", + "04939": "275", + "09895": "275", + "09898": "275", + "09901": "275", + "09904": "275", + "09907": "275", + "09910": "275", + "09913": "275", + "09916": "275", + "09919": "275", + "09922": "275", + "09925": "275", + "09928": "275", + "09931": "275", + "09934": "275", + "09937": "275", + "09940": "275", + "09943": "275", + "09946": "275", + "09949": "275", + "09952": "275", + "04927": "276", + "04930": "276", + "04936": "276", + "09955": "276", + "09958": "276", + "09961": "276", + "09964": "276", + "09967": "276", + "09970": "276", + "09973": "276", + "09976": "276", + "09979": "276", + "09982": "276", + "09985": "276", + "09988": "276", + "09991": "276", + "09994": "276", + "09997": "276", + "024": "02", + "00688": "024", + "00691": "024", + "00692": "024", + "00694": "024", + "00697": "024", + "00700": "024", + "00946": "024", + "00949": "024", + "026": "02", + "00712": "026", + "00715": "026", + "00718": "026", + "00721": "026", + "00724": "026", + "00727": "026", + "00730": "026", + "00733": "026", + "00736": "026", + "00739": "026", + "00742": "026", + "00745": "026", + "00748": "026", + "00751": "026", + "00754": "026", + "00757": "026", + "00760": "026", + "00763": "026", + "00766": "026", + "027": "02", + "00769": "027", + "00772": "027", + "00775": "027", + "00778": "027", + "00781": "027", + "00784": "027", + "00787": "027", + "00790": "027", + "00793": "027", + "00796": "027", + "00799": "027", + "00802": "027", + "00805": "027", + "00808": "027", + "00811": "027", + "00814": "027", + "00815": "027", + "00817": "027", + "028": "02", + "00820": "028", + "00823": "028", + "00826": "028", + "00829": "028", + "00832": "028", + "00835": "028", + "00838": "028", + "00841": "028", + "00844": "028", + "00847": "028", + "00850": "028", + "00853": "028", + "00856": "028", + "00859": "028", + "00862": "028", + "00865": "028", + "00868": "028", + "00871": "028", + "029": "02", + "00874": "029", + "00877": "029", + "00880": "029", + "00883": "029", + "00886": "029", + "00889": "029", + "00892": "029", + "00895": "029", + "00898": "029", + "00901": "029", + "00904": "029", + "00907": "029", + "00910": "029", + "030": "02", + "00703": "030", + "00706": "030", + "00709": "030", + "00913": "030", + "00916": "030", + "00919": "030", + "00922": "030", + "00925": "030", + "00928": "030", + "00931": "030", + "00934": "030", + "00937": "030", + "00940": "030", + "00943": "030", + "00952": "030", + "00955": "030", + "00958": "030", + "00961": "030", + "00964": "030", + "00967": "030", + "00970": "030", + "00973": "030", + "00976": "030", + "00979": "030", + "031": "02", + "00982": "031", + "00985": "031", + "00988": "031", + "00991": "031", + "00994": "031", + "00997": "031", + "01000": "031", + "01003": "031", + "01006": "031", + "01009": "031", + "01012": "031", + "01015": "031", + "01018": "031", + "032": "02", + "01021": "032", + "01024": "032", + "01027": "032", + "01030": "032", + "01033": "032", + "01036": "032", + "01039": "032", + "01042": "032", + "01045": "032", + "01048": "032", + "01051": "032", + "01054": "032", + "01057": "032", + "01060": "032", + "01063": "032", + "01066": "032", + "01069": "032", + "01072": "032", + "01075": "032", + "01081": "032", + "01084": "032", + "01087": "032", + "01090": "032", + "01093": "032", + "033": "02", + "01096": "033", + "01099": "033", + "01102": "033", + "01105": "033", + "01108": "033", + "01114": "033", + "01117": "033", + "01120": "033", + "01123": "033", + "01126": "033", + "01129": "033", + "01132": "033", + "01135": "033", + "01138": "033", + "01141": "033", + "01144": "033", + "01147": "033", + "01150": "033", + "034": "02", + "01153": "034", + "01156": "034", + "01159": "034", + "01162": "034", + "01165": "034", + "01168": "034", + "01171": "034", + "01174": "034", + "01177": "034", + "01180": "034", + "01183": "034", + "01186": "034", + "01189": "034", + "01192": "034", + "01195": "034", + "01198": "034", + "01201": "034", + "01204": "034", + "01207": "034", + "01210": "034", + "01213": "034", + "01216": "034", + "01219": "034", + "035": "02", + "01222": "035", + "01225": "035", + "01228": "035", + "01231": "035", + "01234": "035", + "01237": "035", + "01240": "035", + "01243": "035", + "01246": "035", + "01249": "035", + "01252": "035", + "01255": "035", + "01258": "035", + "01261": "035", + "01264": "035", + "040": "04", + "01267": "040", + "01270": "040", + "01273": "040", + "01276": "040", + "01279": "040", + "01282": "040", + "01285": "040", + "01288": "040", + "01693": "040", + "01705": "040", + "01720": "040", + "042": "04", + "01290": "042", + "01291": "042", + "01294": "042", + "01296": "042", + "01297": "042", + "01300": "042", + "01303": "042", + "01304": "042", + "01309": "042", + "01312": "042", + "01315": "042", + "01316": "042", + "01318": "042", + "043": "04", + "01321": "043", + "01324": "043", + "01327": "043", + "01330": "043", + "01333": "043", + "01336": "043", + "01339": "043", + "01342": "043", + "01343": "043", + "01345": "043", + "01348": "043", + "01351": "043", + "01352": "043", + "01354": "043", + "01357": "043", + "01359": "043", + "01360": "043", + "045": "04", + "01363": "045", + "01366": "045", + "01367": "045", + "01372": "045", + "01375": "045", + "01378": "045", + "01381": "045", + "01384": "045", + "01387": "045", + "01392": "045", + "01393": "045", + "01399": "045", + "01402": "045", + "01411": "045", + "01414": "045", + "01417": "045", + "01420": "045", + "01429": "045", + "01432": "045", + "01435": "045", + "01438": "045", + "047": "04", + "01447": "047", + "01453": "047", + "01456": "047", + "01462": "047", + "01465": "047", + "01468": "047", + "01471": "047", + "01477": "047", + "01480": "047", + "01481": "047", + "01483": "047", + "01489": "047", + "01495": "047", + "01498": "047", + "01501": "047", + "01504": "047", + "01507": "047", + "01516": "047", + "01519": "047", + "01522": "047", + "01525": "047", + "048": "04", + "01534": "048", + "01537": "048", + "01540": "048", + "01543": "048", + "01546": "048", + "01549": "048", + "01552": "048", + "01555": "048", + "01558": "048", + "01561": "048", + "01564": "048", + "01567": "048", + "01573": "048", + "049": "04", + "01474": "049", + "01576": "049", + "01579": "049", + "01582": "049", + "01594": "049", + "01597": "049", + "01603": "049", + "01606": "049", + "01609": "049", + "01615": "049", + "01618": "049", + "01624": "049", + "01627": "049", + "01630": "049", + "01636": "049", + "01639": "049", + "01645": "049", + "01648": "049", + "01651": "049", + "051": "04", + "01654": "051", + "01657": "051", + "01660": "051", + "01666": "051", + "01669": "051", + "01672": "051", + "01675": "051", + "01687": "051", + "01696": "051", + "01699": "051", + "01702": "051", + "01708": "051", + "01711": "051", + "01714": "051", + "01723": "051", + "052": "04", + "01726": "052", + "01729": "052", + "01732": "052", + "01735": "052", + "01738": "052", + "01744": "052", + "01747": "052", + "01750": "052", + "01756": "052", + "01762": "052", + "01765": "052", + "01768": "052", + "01771": "052", + "01774": "052", + "01777": "052", + "01780": "052", + "01783": "052", + "053": "04", + "01786": "053", + "01789": "053", + "01792": "053", + "01795": "053", + "01801": "053", + "01804": "053", + "01807": "053", + "01810": "053", + "01813": "053", + "01816": "053", + "01819": "053", + "01822": "053", + "01828": "053", + "01831": "053", + "058": "06", + "01834": "058", + "01837": "058", + "01840": "058", + "01843": "058", + "01846": "058", + "01849": "058", + "01852": "058", + "01855": "058", + "060": "06", + "01858": "060", + "01861": "060", + "01864": "060", + "01867": "060", + "01870": "060", + "01873": "060", + "01876": "060", + "01879": "060", + "01882": "060", + "01885": "060", + "061": "06", + "01888": "061", + "01891": "061", + "01894": "061", + "01897": "061", + "01900": "061", + "01906": "061", + "01909": "061", + "01912": "061", + "01915": "061", + "01918": "061", + "01921": "061", + "01924": "061", + "01927": "061", + "01930": "061", + "01933": "061", + "062": "06", + "01936": "062", + "01939": "062", + "01942": "062", + "01945": "062", + "01948": "062", + "01951": "062", + "01954": "062", + "01957": "062", + "01960": "062", + "01963": "062", + "063": "06", + "01969": "063", + "01975": "063", + "01978": "063", + "01981": "063", + "01984": "063", + "01990": "063", + "01993": "063", + "01999": "063", + "02002": "063", + "02005": "063", + "02008": "063", + "02011": "063", + "02014": "063", + "02017": "063", + "064": "06", + "02020": "064", + "02023": "064", + "02026": "064", + "02029": "064", + "02032": "064", + "02035": "064", + "02038": "064", + "02041": "064", + "02044": "064", + "02047": "064", + "02050": "064", + "02053": "064", + "02059": "064", + "02062": "064", + "02065": "064", + "02068": "064", + "02071": "064", + "02077": "064", + "02080": "064", + "02083": "064", + "065": "06", + "02086": "065", + "02089": "065", + "02092": "065", + "02095": "065", + "02098": "065", + "02101": "065", + "02104": "065", + "02107": "065", + "02110": "065", + "02113": "065", + "02116": "065", + "02122": "065", + "02125": "065", + "02131": "065", + "066": "06", + "02137": "066", + "02140": "066", + "02143": "066", + "02146": "066", + "02152": "066", + "02155": "066", + "02158": "066", + "02161": "066", + "02170": "066", + "02173": "066", + "02176": "066", + "02179": "066", + "02185": "066", + "02188": "066", + "02191": "066", + "02194": "066", + "02197": "066", + "070": "08", + "02200": "070", + "02203": "070", + "02206": "070", + "02209": "070", + "02212": "070", + "02215": "070", + "02216": "070", + "02218": "070", + "02497": "070", + "02503": "070", + "02509": "070", + "02512": "070", + "02515": "070", + "02521": "070", + "02524": "070", + "071": "08", + "02233": "071", + "02242": "071", + "02251": "071", + "02266": "071", + "02269": "071", + "02290": "071", + "02293": "071", + "02296": "071", + "02299": "071", + "02302": "071", + "072": "08", + "02221": "072", + "02227": "072", + "02230": "072", + "02239": "072", + "02245": "072", + "02248": "072", + "02254": "072", + "02260": "072", + "02263": "072", + "02275": "072", + "02281": "072", + "02284": "072", + "073": "08", + "02287": "073", + "02305": "073", + "02308": "073", + "02311": "073", + "02314": "073", + "02317": "073", + "02320": "073", + "02323": "073", + "02326": "073", + "02329": "073", + "02332": "073", + "02335": "073", + "02338": "073", + "02341": "073", + "02344": "073", + "02347": "073", + "02350": "073", + "02353": "073", + "02356": "073", + "02359": "073", + "02362": "073", + "02365": "073", + "02368": "073", + "02371": "073", + "074": "08", + "02374": "074", + "02377": "074", + "02380": "074", + "02383": "074", + "02386": "074", + "02389": "074", + "02392": "074", + "02395": "074", + "02398": "074", + "02401": "074", + "02404": "074", + "02407": "074", + "02410": "074", + "02413": "074", + "02416": "074", + "02419": "074", + "02422": "074", + "02425": "074", + "075": "08", + "02431": "075", + "02434": "075", + "02437": "075", + "02440": "075", + "02443": "075", + "02446": "075", + "02449": "075", + "02452": "075", + "02455": "075", + "02458": "075", + "02461": "075", + "02464": "075", + "02467": "075", + "02470": "075", + "02473": "075", + "02476": "075", + "02479": "075", + "02482": "075", + "02485": "075", + "02488": "075", + "02491": "075", + "02494": "075", + "02500": "075", + "02506": "075", + "02518": "075", + "02527": "075", + "02530": "075", + "02533": "075", + "076": "08", + "02536": "076", + "02539": "076", + "02542": "076", + "02545": "076", + "02548": "076", + "02551": "076", + "02554": "076", + "02557": "076", + "02560": "076", + "02563": "076", + "02566": "076", + "02569": "076", + "02572": "076", + "02575": "076", + "02578": "076", + "02584": "076", + "02587": "076", + "02590": "076", + "02596": "076", + "02599": "076", + "02602": "076", + "02605": "076", + "02608": "076", + "02611": "076", + "02614": "076", + "02617": "076", + "02620": "076", + "02623": "076", + "02626": "076", + "02632": "076", + "080": "10", + "02635": "080", + "02641": "080", + "02644": "080", + "02647": "080", + "02650": "080", + "02653": "080", + "02656": "080", + "02658": "080", + "02659": "080", + "02662": "080", + "02665": "080", + "02668": "080", + "02671": "080", + "02674": "080", + "02677": "080", + "02680": "080", + "02746": "080", + "082": "10", + "02683": "082", + "02686": "082", + "02689": "082", + "02692": "082", + "02695": "082", + "02701": "082", + "02704": "082", + "02707": "082", + "02710": "082", + "02713": "082", + "02716": "082", + "02719": "082", + "02722": "082", + "02725": "082", + "02728": "082", + "02731": "082", + "02734": "082", + "02737": "082", + "02740": "082", + "02743": "082", + "02749": "082", + "083": "10", + "02752": "083", + "02755": "083", + "02758": "083", + "02761": "083", + "02764": "083", + "02767": "083", + "02770": "083", + "02773": "083", + "02776": "083", + "02779": "083", + "02782": "083", + "02785": "083", + "02788": "083", + "02791": "083", + "02794": "083", + "02797": "083", + "084": "10", + "02800": "084", + "02803": "084", + "02806": "084", + "02809": "084", + "02812": "084", + "02818": "084", + "02821": "084", + "02824": "084", + "02827": "084", + "02836": "084", + "085": "10", + "02839": "085", + "02842": "085", + "02848": "085", + "02851": "085", + "02854": "085", + "02857": "085", + "02863": "085", + "02866": "085", + "02869": "085", + "02875": "085", + "02878": "085", + "02881": "085", + "02884": "085", + "02887": "085", + "02890": "085", + "02893": "085", + "02896": "085", + "02899": "085", + "086": "10", + "02902": "086", + "02905": "086", + "02908": "086", + "02911": "086", + "02914": "086", + "02917": "086", + "02920": "086", + "02923": "086", + "02926": "086", + "02929": "086", + "02932": "086", + "02935": "086", + "02938": "086", + "02944": "086", + "087": "10", + "02947": "087", + "02950": "087", + "02953": "087", + "02956": "087", + "02959": "087", + "02962": "087", + "02965": "087", + "02968": "087", + "02971": "087", + "02974": "087", + "02977": "087", + "02980": "087", + "02983": "087", + "02986": "087", + "02989": "087", + "02992": "087", + "02998": "087", + "088": "10", + "03001": "088", + "03002": "088", + "03003": "088", + "03004": "088", + "03006": "088", + "03010": "088", + "03013": "088", + "03016": "088", + "03019": "088", + "03022": "088", + "03028": "088", + "03037": "088", + "03040": "088", + "03043": "088", + "03046": "088", + "03052": "088", + "089": "10", + "03055": "089", + "03061": "089", + "03064": "089", + "03067": "089", + "03070": "089", + "03073": "089", + "03076": "089", + "03079": "089", + "03082": "089", + "03085": "089", + "03088": "089", + "03091": "089", + "03094": "089", + "03097": "089", + "03100": "089", + "03103": "089", + "03106": "089", + "03109": "089", + "03112": "089", + "03115": "089", + "03118": "089", + "03121": "089", + "094": "11", + "03124": "094", + "03127": "094", + "03130": "094", + "03133": "094", + "03136": "094", + "03139": "094", + "03142": "094", + "03145": "094", + "03316": "094", + "03317": "094", + "03325": "094", + "03326": "094", + "095": "11", + "03148": "095", + "03151": "095", + "03184": "095", + "096": "11", + "03154": "096", + "03155": "096", + "03157": "096", + "03158": "096", + "03159": "096", + "03160": "096", + "03161": "096", + "03162": "096", + "03163": "096", + "03164": "096", + "03177": "096", + "097": "11", + "03172": "097", + "03178": "097", + "03181": "097", + "03190": "097", + "03191": "097", + "03193": "097", + "03194": "097", + "03196": "097", + "03197": "097", + "03200": "097", + "03201": "097", + "03202": "097", + "098": "11", + "03217": "098", + "03220": "098", + "03223": "098", + "03226": "098", + "03229": "098", + "03232": "098", + "03235": "098", + "03238": "098", + "03241": "098", + "03244": "098", + "03247": "098", + "03250": "098", + "099": "11", + "03253": "099", + "03259": "099", + "03260": "099", + "03262": "099", + "03263": "099", + "03265": "099", + "03268": "099", + "03269": "099", + "03271": "099", + "03274": "099", + "03277": "099", + "03280": "099", + "03283": "099", + "03284": "099", + "03289": "099", + "03295": "099", + "03298": "099", + "03299": "099", + "03304": "099", + "03319": "100", + "03322": "100", + "03323": "100", + "03328": "100", + "03331": "100", + "03334": "100", + "03337": "100", + "03340": "100", + "03343": "100", + "03346": "100", + "03349": "100", + "03352": "100", + "03355": "100", + "03356": "100", + "03358": "100", + "03359": "100", + "03361": "100", + "03364": "100", + "03365": "100", + "03367": "100", + "03368": "100", + "03203": "101", + "03205": "101", + "03208": "101", + "03211": "101", + "03214": "101", + "03370": "101", + "03371": "101", + "03373": "101", + "03376": "101", + "03379": "101", + "03382": "101", + "03383": "101", + "03384": "101", + "03385": "101", + "03256": "102", + "03286": "102", + "03287": "102", + "03292": "102", + "03301": "102", + "03302": "102", + "03307": "102", + "03310": "102", + "03312": "102", + "03313": "102", + "03156": "103", + "03165": "103", + "03166": "103", + "03167": "103", + "03168": "103", + "03169": "103", + "03170": "103", + "03171": "103", + "03173": "103", + "03174": "103", + "03175": "103", + "03176": "103", + "03187": "103", + "03198": "103", + "03199": "103", + "03386": "105", + "03387": "105", + "03388": "105", + "03389": "105", + "03403": "105", + "03408": "105", + "03409": "105", + "03390": "106", + "03394": "106", + "03400": "106", + "03405": "106", + "03406": "106", + "03412": "106", + "03413": "106", + "03415": "106", + "03418": "106", + "03421": "106", + "03424": "106", + "03427": "106", + "03430": "106", + "03433": "107", + "03436": "107", + "03439": "107", + "03440": "107", + "03442": "107", + "03445": "107", + "03448": "107", + "03451": "107", + "03454": "107", + "03457": "107", + "03463": "107", + "03466": "107", + "03467": "107", + "03469": "107", + "03478": "108", + "03487": "108", + "03493": "108", + "03496": "108", + "03499": "108", + "03505": "108", + "03508": "108", + "03509": "108", + "03511": "108", + "03514": "108", + "03517": "108", + "03520": "108", + "03523": "108", + "03526": "108", + "03527": "108", + "03529": "108", + "03532": "108", + "03535": "108", + "03538": "108", + "03541": "108", + "03544": "108", + "03547": "108", + "03391": "109", + "03490": "109", + "03549": "109", + "03550": "109", + "03553": "109", + "03559": "109", + "03562": "109", + "03565": "109", + "03568": "109", + "03571": "109", + "03574": "109", + "03577": "109", + "03580": "109", + "03583": "109", + "03586": "109", + "03589": "109", + "03592": "109", + "03595": "110", + "03618": "110", + "03619": "110", + "03625": "110", + "03628": "110", + "03631": "110", + "03632": "110", + "03634": "110", + "03637": "110", + "03638": "110", + "03640": "110", + "03643": "110", + "03598": "111", + "03601": "111", + "03602": "111", + "03604": "111", + "03605": "111", + "03607": "111", + "03610": "111", + "03613": "111", + "03616": "111", + "03622": "111", + "03434": "112", + "03460": "112", + "03472": "112", + "03473": "112", + "03474": "112", + "03475": "112", + "03481": "112", + "03484": "112", + "03488": "112", + "03502": "112", + "03503": "112", + "03646": "116", + "03649": "116", + "03652": "116", + "03655": "116", + "03658": "116", + "03661": "116", + "03664": "116", + "03667": "116", + "03670": "116", + "03673": "116", + "03676": "116", + "03679": "116", + "03682": "118", + "03685": "118", + "03688": "118", + "03694": "118", + "03697": "118", + "03700": "118", + "03703": "118", + "03706": "118", + "03709": "118", + "03712": "118", + "03718": "118", + "03721": "119", + "03724": "119", + "03727": "119", + "03730": "119", + "03733": "119", + "03736": "119", + "03739": "119", + "03742": "119", + "03745": "119", + "03748": "119", + "03751": "119", + "03754": "119", + "03757": "119", + "03760": "119", + "03763": "119", + "03766": "119", + "03769": "119", + "03772": "119", + "03775": "119", + "03778": "119", + "03781": "119", + "03784": "119", + "03787": "119", + "03790": "119", + "03793": "119", + "03796": "119", + "03799": "119", + "03802": "119", + "03805": "119", + "03808": "120", + "03811": "120", + "03814": "120", + "03817": "120", + "03820": "120", + "03823": "120", + "03826": "120", + "03829": "120", + "03832": "120", + "03835": "120", + "03838": "120", + "03841": "120", + "03844": "120", + "03847": "120", + "03850": "120", + "03853": "120", + "03856": "121", + "03859": "121", + "03862": "121", + "03865": "121", + "03868": "121", + "03869": "121", + "03871": "121", + "03874": "121", + "03877": "121", + "03880": "121", + "03883": "121", + "03886": "121", + "03889": "121", + "03890": "121", + "03892": "121", + "03895": "121", + "03898": "122", + "03901": "122", + "03904": "122", + "03907": "122", + "03910": "122", + "03913": "122", + "03916": "122", + "03919": "122", + "03922": "122", + "03925": "122", + "03928": "122", + "03931": "122", + "03934": "122", + "03937": "122", + "03940": "122", + "03943": "122", + "03946": "122", + "03949": "122", + "03952": "122", + "03955": "122", + "03958": "122", + "03961": "122", + "03964": "122", + "03967": "122", + "03970": "122", + "03973": "122", + "03976": "122", + "03979": "123", + "03982": "123", + "03985": "123", + "03988": "123", + "03991": "123", + "03997": "123", + "04000": "123", + "04003": "123", + "04012": "123", + "04015": "123", + "04024": "123", + "04027": "123", + "04030": "123", + "04033": "123", + "04045": "123", + "04060": "124", + "04063": "124", + "04066": "124", + "04069": "124", + "04072": "124", + "04075": "124", + "04078": "124", + "04081": "124", + "04084": "124", + "04087": "124", + "04090": "124", + "04093": "124", + "04096": "124", + "04099": "124", + "04102": "124", + "04105": "125", + "04108": "125", + "04111": "125", + "04114": "125", + "04117": "125", + "04120": "125", + "04123": "125", + "04126": "125", + "04129": "125", + "04132": "125", + "04135": "125", + "04136": "125", + "04138": "125", + "04141": "125", + "04144": "125", + "04147": "125", + "04150": "125", + "04153": "125", + "04156": "125", + "04159": "125", + "04162": "125", + "04165": "125", + "04168": "126", + "04171": "126", + "04174": "126", + "04177": "126", + "04180": "126", + "04183": "126", + "04186": "126", + "04189": "126", + "04192": "126", + "04195": "126", + "04198": "126", + "04201": "126", + "04204": "126", + "04207": "126", + "04210": "126", + "04213": "126", + "04216": "126", + "04219": "126", + "04222": "126", + "04225": "127", + "04228": "127", + "04231": "127", + "04234": "127", + "04237": "127", + "04240": "127", + "04243": "127", + "04246": "127", + "03994": "128", + "04006": "128", + "04009": "128", + "04018": "128", + "04021": "128", + "04036": "128", + "04039": "128", + "04042": "128", + "04048": "128", + "04051": "128", + "04054": "128", + "04056": "128", + "04057": "128", + "04058": "128", + "04249": "132", + "04252": "132", + "04255": "132", + "04258": "132", + "04261": "132", + "04264": "132", + "04267": "132", + "04270": "132", + "04273": "132", + "04276": "132", + "04279": "132", + "04540": "132", + "04543": "132", + "04546": "132", + "04558": "132", + "04282": "133", + "04285": "133", + "04288": "133", + "04291": "133", + "04294": "133", + "04297": "133", + "04300": "133", + "04624": "133", + "04660": "133", + "04663": "133", + "04675": "133", + "04678": "133", + "04681": "133", + "04684": "133", + "04303": "135", + "04306": "135", + "04309": "135", + "04312": "135", + "04315": "135", + "04318": "135", + "04321": "135", + "04324": "135", + "04327": "135", + "04330": "135", + "04333": "135", + "04336": "135", + "04339": "135", + "04342": "135", + "04345": "135", + "04348": "135", + "04351": "135", + "04354": "135", + "04357": "135", + "04360": "135", + "04363": "135", + "04366": "135", + "04369": "135", + "04372": "135", + "04375": "136", + "04378": "136", + "04381": "136", + "04384": "136", + "04387": "136", + "04390": "136", + "04393": "136", + "04396": "136", + "04399": "136", + "04402": "136", + "04405": "136", + "04408": "136", + "04411": "136", + "04414": "136", + "04417": "136", + "04420": "136", + "04423": "136", + "04426": "136", + "04429": "136", + "04435": "136", + "04438": "136", + "04441": "136", + "04447": "136", + "04450": "136", + "04453": "136", + "04456": "137", + "04459": "137", + "04462": "137", + "04465": "137", + "04468": "137", + "04471": "137", + "04474": "137", + "04477": "137", + "04480": "137", + "04483": "137", + "04486": "137", + "04489": "137", + "04492": "137", + "04495": "137", + "04498": "138", + "04501": "138", + "04504": "138", + "04507": "138", + "04510": "138", + "04513": "138", + "04516": "138", + "04519": "138", + "04522": "138", + "04525": "138", + "04528": "138", + "04531": "138", + "04537": "138", + "04561": "138", + "04564": "138", + "04567": "138", + "04570": "138", + "04573": "138", + "04576": "138", + "04579": "138", + "04582": "138", + "04585": "139", + "04588": "139", + "04591": "139", + "04594": "139", + "04597": "139", + "04600": "139", + "04603": "139", + "04606": "139", + "04609": "139", + "04612": "139", + "04615": "139", + "04618": "139", + "04621": "140", + "04627": "140", + "04630": "140", + "04633": "140", + "04636": "140", + "04639": "140", + "04642": "140", + "04645": "140", + "04648": "140", + "04651": "140", + "04654": "140", + "04657": "140", + "04666": "140", + "04669": "140", + "04672": "140", + "04687": "140", + "04690": "140", + "04693": "140", + "04696": "140", + "04699": "140", + "04702": "140", + "04705": "140", + "04708": "140", + "04711": "140", + "04714": "141", + "04717": "141", + "04720": "141", + "04726": "141", + "04729": "141", + "04732": "141", + "04735": "141", + "04738": "141", + "04741": "141", + "04744": "141", + "04747": "141", + "04750": "141", + "04753": "141", + "04756": "141", + "04759": "141", + "04762": "141", + "04765": "141", + "04768": "141", + "04771": "141", + "04774": "141", + "04777": "141", + "04780": "141", + "04783": "141", + "04786": "141", + "04789": "148", + "04792": "148", + "04795": "148", + "04798": "148", + "04801": "148", + "04804": "148", + "04807": "148", + "04813": "148", + "04816": "148", + "04819": "148", + "04825": "148", + "04828": "148", + "04894": "148", + "04897": "148", + "04903": "148", + "04906": "148", + "04912": "148", + "04918": "148", + "04921": "148", + "04831": "150", + "04834": "150", + "04840": "150", + "04846": "150", + "04849": "150", + "04852": "150", + "04855": "150", + "04858": "150", + "04861": "150", + "04867": "150", + "04870": "150", + "04873": "150", + "04876": "150", + "04879": "150", + "04885": "150", + "04888": "150", + "04891": "150", + "04924": "152", + "04942": "152", + "04945": "152", + "04951": "152", + "04954": "152", + "04957": "152", + "04960": "152", + "04969": "152", + "05008": "152", + "05041": "152", + "05047": "152", + "04978": "153", + "04984": "153", + "04987": "153", + "04990": "153", + "04999": "153", + "05005": "153", + "05014": "153", + "05017": "153", + "05026": "153", + "05035": "153", + "05038": "153", + "05065": "153", + "05068": "153", + "05077": "153", + "05080": "153", + "05083": "153", + "05086": "153", + "05089": "154", + "05092": "154", + "05095": "154", + "05098": "154", + "05101": "154", + "05104": "154", + "05110": "154", + "05116": "154", + "05119": "154", + "05125": "154", + "05128": "155", + "05134": "155", + "05137": "155", + "05140": "155", + "05143": "155", + "05152": "155", + "05158": "155", + "05164": "155", + "05167": "155", + "05170": "155", + "05173": "155", + "05176": "155", + "05182": "155", + "05191": "155", + "05194": "155", + "05197": "155", + "04882": "156", + "05200": "156", + "05206": "156", + "05209": "156", + "05212": "156", + "05221": "156", + "05224": "156", + "05227": "156", + "05233": "156", + "05242": "156", + "05245": "156", + "05248": "156", + "05251": "156", + "05254": "156", + "05257": "156", + "05263": "156", + "05266": "157", + "05269": "157", + "05272": "157", + "05275": "157", + "05278": "157", + "05281": "157", + "05284": "157", + "05287": "157", + "05290": "157", + "05293": "157", + "05299": "157", + "05302": "157", + "05305": "157", + "05308": "157", + "05320": "157", + "05323": "157", + "05329": "157", + "05332": "157", + "05335": "157", + "05338": "157", + "05341": "157", + "05344": "157", + "05347": "157", + "05350": "157", + "05353": "158", + "05356": "158", + "05362": "158", + "05365": "158", + "05368": "158", + "05371": "158", + "05374": "158", + "05380": "158", + "05383": "158", + "05386": "158", + "05389": "158", + "04981": "159", + "05392": "159", + "05395": "159", + "05398": "159", + "05404": "159", + "05413": "159", + "05419": "159", + "05422": "159", + "05425": "159", + "05428": "159", + "05431": "164", + "05434": "164", + "05437": "164", + "05440": "164", + "05443": "164", + "05446": "164", + "05449": "164", + "05452": "164", + "05455": "164", + "05458": "164", + "05461": "164", + "05464": "164", + "05467": "164", + "05470": "164", + "05473": "164", + "05476": "164", + "05479": "164", + "05482": "164", + "05485": "164", + "05488": "164", + "05491": "164", + "05494": "164", + "05497": "164", + "05500": "164", + "05503": "164", + "05653": "164", + "05659": "164", + "05695": "164", + "05701": "164", + "05710": "164", + "05713": "164", + "05914": "164", + "05506": "165", + "05509": "165", + "05512": "165", + "05515": "165", + "05518": "165", + "05521": "165", + "05527": "165", + "05528": "165", + "05530": "165", + "05533": "165", + "05536": "167", + "05539": "167", + "05542": "167", + "05545": "167", + "05548": "167", + "05551": "167", + "05554": "167", + "05560": "167", + "05563": "167", + "05566": "167", + "05569": "167", + "05572": "167", + "05575": "167", + "05578": "167", + "05581": "167", + "05584": "167", + "05587": "167", + "05590": "167", + "05593": "167", + "05596": "167", + "05599": "167", + "05602": "167", + "05605": "167", + "05608": "168", + "05611": "168", + "05614": "168", + "05617": "168", + "05620": "168", + "05623": "168", + "05626": "168", + "05629": "168", + "05632": "168", + "05635": "168", + "05638": "168", + "05641": "168", + "05644": "168", + "05647": "168", + "05650": "168", + "05656": "169", + "05662": "169", + "05665": "169", + "05668": "169", + "05671": "169", + "05674": "169", + "05677": "169", + "05680": "169", + "05683": "169", + "05686": "169", + "05689": "169", + "05692": "169", + "05698": "169", + "05704": "169", + "05707": "169", + "05716": "170", + "05719": "170", + "05722": "170", + "05725": "170", + "05728": "170", + "05731": "170", + "05734": "170", + "05737": "170", + "05740": "170", + "05743": "170", + "05746": "170", + "05749": "170", + "05752": "170", + "05755": "170", + "05758": "170", + "05761": "171", + "05767": "171", + "05770": "171", + "05773": "171", + "05776": "171", + "05779": "171", + "05782": "171", + "05785": "171", + "05788": "171", + "05791": "171", + "05794": "171", + "05797": "171", + "05800": "171", + "05803": "171", + "05809": "171", + "05812": "171", + "05815": "171", + "05818": "171", + "05821": "171", + "05824": "171", + "05827": "171", + "05830": "171", + "05833": "171", + "05836": "171", + "05839": "171", + "05842": "171", + "05845": "171", + "05848": "171", + "05851": "171", + "05854": "172", + "05857": "172", + "05860": "172", + "05863": "172", + "05866": "172", + "05869": "172", + "05872": "172", + "05875": "172", + "05878": "172", + "05881": "172", + "05884": "172", + "05887": "172", + "05890": "172", + "05893": "172", + "05896": "172", + "05899": "172", + "05902": "172", + "05905": "172", + "05908": "173", + "05911": "173", + "05917": "173", + "05920": "173", + "05923": "173", + "05926": "173", + "05929": "173", + "05932": "173", + "05935": "173", + "05938": "173", + "05941": "173", + "05944": "173", + "05947": "173", + "05950": "173", + "05953": "173", + "05956": "173", + "05959": "173", + "05962": "173", + "05965": "173", + "05968": "173", + "05971": "178", + "05974": "178", + "05977": "178", + "05980": "178", + "05983": "178", + "05986": "178", + "05989": "178", + "05992": "178", + "05995": "180", + "05998": "180", + "06001": "180", + "06004": "180", + "06007": "180", + "06010": "180", + "06013": "180", + "06016": "180", + "06019": "180", + "06022": "180", + "06025": "180", + "06028": "180", + "06031": "180", + "06034": "180", + "06037": "180", + "06040": "180", + "06043": "180", + "06046": "180", + "06049": "180", + "06055": "180", + "06058": "180", + "06061": "180", + "06067": "181", + "06070": "181", + "06073": "181", + "06076": "181", + "06079": "181", + "06082": "181", + "06085": "181", + "06088": "181", + "06091": "181", + "06094": "181", + "06097": "181", + "06100": "181", + "06103": "181", + "06106": "181", + "06109": "181", + "06112": "181", + "06115": "181", + "06118": "181", + "06121": "181", + "06124": "182", + "06127": "182", + "06133": "182", + "06136": "182", + "06139": "182", + "06142": "182", + "06148": "182", + "06151": "182", + "06154": "182", + "06157": "182", + "06160": "182", + "06163": "182", + "06166": "182", + "06172": "182", + "06175": "182", + "06178": "182", + "06181": "182", + "06184": "183", + "06187": "183", + "06190": "183", + "06193": "183", + "06196": "183", + "06199": "183", + "06202": "183", + "06205": "183", + "06208": "183", + "06211": "183", + "06214": "183", + "06217": "183", + "06220": "183", + "06223": "183", + "06226": "183", + "06232": "183", + "06235": "183", + "06238": "183", + "06241": "183", + "06244": "183", + "06247": "183", + "06250": "183", + "06253": "184", + "06256": "184", + "06268": "184", + "06274": "184", + "06277": "184", + "06280": "184", + "06283": "184", + "06286": "184", + "06292": "184", + "06295": "184", + "06298": "184", + "06301": "184", + "06307": "184", + "06313": "184", + "06316": "184", + "06319": "184", + "06322": "184", + "06325": "185", + "06328": "185", + "06331": "185", + "06337": "185", + "06340": "185", + "06343": "185", + "06349": "185", + "06352": "185", + "06355": "185", + "06358": "185", + "06361": "185", + "06364": "185", + "06367": "185", + "06370": "185", + "06373": "185", + "06376": "185", + "06379": "185", + "06382": "185", + "06385": "186", + "06388": "186", + "06391": "186", + "06394": "186", + "06397": "186", + "06400": "186", + "06403": "186", + "06406": "186", + "06412": "186", + "06415": "186", + "06418": "186", + "06421": "186", + "06424": "186", + "06427": "186", + "06430": "186", + "06433": "186", + "06436": "186", + "06442": "186", + "06445": "186", + "06448": "186", + "06451": "186", + "06454": "186", + "06457": "186", + "06460": "186", + "06463": "187", + "06466": "187", + "06469": "187", + "06472": "187", + "06475": "187", + "06478": "187", + "06481": "187", + "06484": "187", + "06487": "187", + "06490": "187", + "06493": "187", + "06496": "187", + "06499": "187", + "06502": "187", + "06505": "187", + "06508": "187", + "06514": "187", + "06517": "187", + "06520": "187", + "06523": "187", + "06526": "188", + "06529": "188", + "06532": "188", + "06541": "188", + "06544": "188", + "06547": "188", + "06550": "188", + "06553": "188", + "06559": "188", + "06562": "188", + "06565": "188", + "06574": "188", + "06577": "188", + "06589": "188", + "06592": "188", + "06595": "188", + "06598": "188", + "06601": "188", + "06604": "188", + "06607": "188", + "06610": "188", + "06613": "189", + "06616": "189", + "06619": "189", + "06622": "189", + "06625": "189", + "06628": "189", + "06631": "189", + "06634": "189", + "06637": "189", + "06640": "189", + "06643": "189", + "06646": "189", + "06649": "193", + "06652": "193", + "06655": "193", + "06658": "193", + "06661": "193", + "06664": "193", + "06667": "193", + "06670": "193", + "06673": "193", + "06676": "193", + "06679": "193", + "06685": "193", + "06688": "193", + "06691": "193", + "06694": "193", + "06697": "193", + "06700": "193", + "06703": "193", + "06706": "193", + "07030": "193", + "07033": "193", + "07036": "193", + "07039": "193", + "07042": "193", + "07045": "193", + "07048": "193", + "07051": "193", + "07054": "193", + "07057": "193", + "07060": "193", + "07063": "193", + "07066": "193", + "06709": "194", + "06712": "194", + "06715": "194", + "06721": "194", + "06724": "194", + "06727": "194", + "06730": "194", + "06733": "194", + "06736": "194", + "06739": "194", + "06742": "194", + "06745": "194", + "06748": "194", + "06751": "194", + "06754": "194", + "06757": "194", + "06760": "195", + "06763": "195", + "06766": "195", + "06769": "195", + "06772": "195", + "06775": "195", + "06778": "195", + "06781": "195", + "06784": "195", + "06787": "195", + "06790": "195", + "06793": "195", + "06796": "195", + "06799": "195", + "06805": "195", + "06808": "196", + "06811": "196", + "06814": "196", + "06817": "196", + "06820": "196", + "06823": "196", + "06826": "196", + "06829": "196", + "06832": "196", + "06835": "196", + "06838": "198", + "06841": "198", + "06844": "198", + "06847": "198", + "06853": "198", + "06856": "198", + "06859": "198", + "06862": "199", + "06865": "199", + "06868": "199", + "06871": "199", + "06874": "199", + "06877": "199", + "06880": "199", + "06883": "199", + "06886": "199", + "06889": "199", + "06892": "199", + "06895": "200", + "06898": "200", + "06901": "200", + "06904": "200", + "06910": "200", + "06913": "200", + "06916": "200", + "06917": "200", + "06919": "200", + "06922": "201", + "06925": "201", + "06928": "201", + "06931": "201", + "06937": "201", + "06940": "201", + "06943": "201", + "06946": "201", + "06949": "201", + "06952": "201", + "06967": "201", + "06970": "202", + "06973": "202", + "06976": "202", + "06979": "202", + "06982": "202", + "06985": "202", + "06988": "202", + "06994": "203", + "06997": "203", + "07000": "203", + "07003": "203", + "07006": "203", + "07009": "203", + "07012": "203", + "07015": "203", + "07018": "203", + "07021": "203", + "07024": "203", + "07027": "203", + "07069": "205", + "07075": "205", + "07078": "205", + "07081": "205", + "07084": "205", + "07090": "205", + "07093": "205", + "07096": "205", + "07099": "205", + "07102": "205", + "07105": "205", + "07108": "205", + "07111": "205", + "07114": "205", + "07117": "205", + "07120": "205", + "07123": "205", + "07126": "205", + "07129": "205", + "07132": "206", + "07135": "206", + "07138": "206", + "07144": "206", + "07147": "206", + "07150": "206", + "07153": "206", + "07156": "206", + "07159": "206", + "07162": "206", + "07165": "206", + "07168": "206", + "07171": "206", + "07174": "206", + "07177": "206", + "07180": "206", + "07183": "206", + "07186": "206", + "07189": "206", + "07192": "207", + "07195": "207", + "07198": "207", + "07201": "213", + "07204": "213", + "07207": "213", + "07210": "213", + "07213": "213", + "07216": "213", + "07219": "213", + "07222": "213", + "07225": "213", + "07228": "213", + "07231": "213", + "07441": "213", + "07687": "213", + "07696": "213", + "07699": "213", + "07705": "213", + "07243": "215", + "07246": "215", + "07249": "215", + "07252": "215", + "07255": "215", + "07258": "215", + "07260": "215", + "07261": "215", + "07264": "215", + "07267": "215", + "07270": "215", + "07273": "215", + "07276": "215", + "07279": "215", + "07282": "215", + "07285": "215", + "07288": "215", + "07291": "215", + "07294": "215", + "07303": "216", + "07306": "216", + "07309": "216", + "07312": "216", + "07315": "216", + "07318": "216", + "07321": "216", + "07324": "216", + "07327": "216", + "07330": "216", + "07333": "216", + "07336": "216", + "07339": "216", + "07342": "216", + "07345": "216", + "07348": "216", + "07351": "216", + "07354": "216", + "07357": "216", + "07360": "216", + "07363": "216", + "07366": "216", + "07375": "217", + "07378": "217", + "07381": "217", + "07384": "217", + "07387": "217", + "07390": "217", + "07393": "217", + "07396": "217", + "07399": "217", + "07402": "217", + "07405": "217", + "07408": "217", + "07411": "217", + "07414": "217", + "07417": "217", + "07420": "217", + "07426": "217", + "07429": "217", + "07432": "217", + "07435": "217", + "07438": "217", + "07444": "218", + "07450": "218", + "07453": "218", + "07456": "218", + "07459": "218", + "07462": "218", + "07465": "218", + "07468": "218", + "07471": "218", + "07477": "218", + "07480": "218", + "07483": "218", + "07486": "218", + "07489": "218", + "07492": "218", + "07495": "218", + "07498": "218", + "07501": "218", + "07504": "218", + "07507": "218", + "07510": "218", + "07513": "218", + "07516": "218", + "07519": "218", + "07522": "218", + "07525": "219", + "07528": "219", + "07531": "219", + "07534": "219", + "07537": "219", + "07540": "219", + "07543": "219", + "07546": "219", + "07549": "219", + "07552": "219", + "07555": "219", + "07558": "219", + "07561": "219", + "07564": "219", + "07567": "219", + "07570": "219", + "07573": "219", + "07576": "219", + "07579": "219", + "07582": "219", + "07588": "219", + "07591": "219", + "07594": "219", + "07597": "219", + "07600": "219", + "07603": "219", + "07606": "219", + "07609": "219", + "07612": "219", + "07615": "220", + "07616": "220", + "07621": "220", + "07624": "220", + "07627": "220", + "07630": "220", + "07636": "220", + "07642": "220", + "07645": "220", + "07648": "220", + "07651": "220", + "07654": "220", + "07660": "220", + "07663": "220", + "07666": "220", + "07672": "220", + "07678": "220", + "07681": "221", + "07682": "221", + "07684": "221", + "07690": "221", + "07702": "221", + "07708": "221", + "07711": "221", + "07714": "221", + "07717": "221", + "07720": "221", + "07723": "221", + "07726": "221", + "07729": "221", + "07735": "221", + "07738": "221", + "07741": "221", + "07747": "221", + "07750": "221", + "07759": "222", + "07762": "222", + "07765": "222", + "07768": "222", + "07771": "222", + "07774": "222", + "07777": "222", + "07780": "222", + "07783": "222", + "07786": "222", + "07789": "222", + "07792": "222", + "07795": "222", + "07798": "222", + "07801": "222", + "07804": "222", + "07807": "222", + "07813": "223", + "07816": "223", + "07819": "223", + "07822": "223", + "07825": "223", + "07828": "223", + "07831": "223", + "07834": "223", + "07837": "223", + "07840": "223", + "07843": "223", + "07846": "223", + "07849": "223", + "07852": "223", + "07855": "223", + "07858": "223", + "07861": "223", + "07864": "223", + "07867": "223", + "07870": "223", + "07873": "223", + "07876": "223", + "07879": "223", + "07882": "223", + "07885": "223", + "07888": "227", + "07891": "227", + "07894": "227", + "07897": "227", + "07900": "227", + "07903": "227", + "07906": "227", + "07909": "227", + "07912": "227", + "07915": "227", + "07918": "227", + "07921": "227", + "07924": "227", + "07927": "227", + "07930": "227", + "07933": "227", + "07936": "227", + "08281": "227", + "08287": "227", + "08503": "227", + "08506": "227", + "08515": "227", + "07942": "228", + "07945": "228", + "07948": "228", + "07951": "228", + "07954": "228", + "07957": "228", + "07960": "228", + "07963": "228", + "07966": "228", + "07969": "230", + "07975": "230", + "07981": "230", + "07984": "230", + "07987": "230", + "07993": "230", + "07996": "230", + "07999": "230", + "08005": "230", + "08008": "230", + "08014": "230", + "08017": "230", + "08023": "230", + "08026": "230", + "08029": "230", + "08032": "230", + "08035": "230", + "08038": "230", + "08041": "230", + "08044": "230", + "08047": "230", + "08050": "230", + "08053": "231", + "08056": "231", + "08062": "231", + "08065": "231", + "08071": "231", + "08080": "231", + "08089": "231", + "08092": "231", + "08095": "231", + "08104": "231", + "08110": "231", + "08113": "231", + "08119": "231", + "08122": "231", + "08125": "231", + "08128": "231", + "08131": "231", + "08134": "231", + "08140": "231", + "08143": "231", + "08152": "232", + "08156": "232", + "08158": "232", + "08161": "232", + "08164": "232", + "08170": "232", + "08173": "232", + "08179": "232", + "08194": "232", + "08197": "232", + "08200": "232", + "08203": "232", + "08206": "232", + "08209": "232", + "08215": "232", + "08218": "232", + "08221": "232", + "08224": "232", + "08227": "232", + "08230": "233", + "08233": "233", + "08234": "233", + "08236": "233", + "08239": "233", + "08242": "233", + "08245": "233", + "08248": "233", + "08251": "233", + "08254": "233", + "08257": "233", + "08260": "233", + "08263": "233", + "08266": "233", + "08272": "233", + "08275": "233", + "08278": "233", + "08290": "234", + "08293": "234", + "08296": "234", + "08299": "234", + "08302": "234", + "08305": "234", + "08308": "234", + "08311": "234", + "08314": "234", + "08317": "234", + "08320": "234", + "08323": "234", + "08326": "234", + "08329": "234", + "08332": "234", + "08335": "234", + "08338": "234", + "08341": "235", + "08344": "235", + "08347": "235", + "08350": "235", + "08353": "235", + "08356": "235", + "08362": "235", + "08374": "235", + "08377": "235", + "08380": "235", + "08383": "235", + "08389": "235", + "08392": "235", + "08395": "235", + "08398": "235", + "08401": "235", + "08404": "235", + "08407": "235", + "08413": "235", + "08416": "235", + "08419": "235", + "08422": "235", + "08428": "235", + "08431": "235", + "08434": "236", + "08440": "236", + "08443": "236", + "08446": "236", + "08461": "236", + "08467": "236", + "08470": "236", + "08473": "236", + "08476": "236", + "08479": "236", + "08482": "236", + "08491": "236", + "08494": "237", + "08497": "237", + "08498": "237", + "08500": "237", + "08509": "237", + "08512": "237", + "08518": "237", + "08521": "237", + "08527": "237", + "08533": "237", + "08536": "237", + "08539": "237", + "08542": "238", + "08563": "238", + "08572": "238", + "08575": "238", + "08581": "238", + "08584": "238", + "08587": "238", + "08602": "238", + "08605": "238", + "08611": "238", + "08614": "238", + "08623": "238", + "08629": "238", + "08632": "238", + "08635": "238", + "08638": "238", + "08641": "238", + "08644": "238", + "08647": "238", + "08650": "238", + "08653": "238", + "08656": "238", + "08659": "238", + "08662": "239", + "08665": "239", + "08668": "239", + "08671": "239", + "08674": "239", + "08677": "239", + "08680": "239", + "08683": "239", + "08686": "239", + "08689": "239", + "08701": "239", + "08545": "240", + "08548": "240", + "08551": "240", + "08554": "240", + "08557": "240", + "08560": "240", + "08566": "240", + "08569": "240", + "08578": "240", + "08590": "240", + "08593": "240", + "08596": "240", + "08599": "240", + "08608": "240", + "08617": "240", + "08620": "240", + "08626": "240", + "08707": "243", + "08710": "243", + "08713": "243", + "08716": "243", + "08719": "243", + "08722": "243", + "08725": "243", + "08728": "243", + "08731": "243", + "08734": "244", + "08737": "244", + "08740": "244", + "08743": "244", + "08746": "244", + "08747": "244", + "08749": "244", + "08752": "244", + "08755": "244", + "08758": "244", + "08761": "246", + "08764": "246", + "08767": "246", + "08770": "246", + "08785": "246", + "08788": "246", + "08789": "246", + "08791": "246", + "08794": "246", + "08797": "246", + "08812": "246", + "08815": "246", + "08833": "246", + "08836": "246", + "08839": "246", + "08842": "246", + "08845": "246", + "08857": "246", + "08863": "246", + "08866": "246", + "08869": "247", + "08872": "247", + "08875": "247", + "08878": "247", + "08881": "247", + "08884": "247", + "08887": "247", + "08890": "247", + "08893": "247", + "08896": "247", + "08899": "247", + "08902": "247", + "08905": "247", + "08908": "248", + "08911": "248", + "08914": "248", + "08917": "248", + "08920": "248", + "08923": "248", + "08926": "248", + "08929": "248", + "08932": "248", + "08935": "249", + "08936": "249", + "08938": "249", + "08944": "249", + "08947": "249", + "08950": "249", + "08953": "249", + "08956": "249", + "08959": "249", + "08962": "249", + "08965": "249", + "08968": "249", + "08971": "249", + "09025": "251", + "09028": "251", + "09031": "251", + "09034": "251", + "09037": "251", + "09040": "251", + "09043": "251", + "09046": "251", + "09049": "251", + "09052": "251", + "09055": "251", + "09058": "251", + "09061": "251", + "09064": "251", + "09067": "251", + "09070": "251", + "09073": "251", + "09076": "252", + "09079": "252", + "09082": "252", + "09085": "252", + "09088": "252", + "09091": "252", + "09094": "252", + "09097": "252", + "09100": "252", + "09103": "252", + "09106": "252", + "09109": "252", + "09112": "252", + "09115": "252", + "09118": "252", + "09124": "252", + "09127": "252", + "09130": "252", + "09133": "252", + "09136": "252", + "09139": "252", + "09142": "252", + "09145": "252", + "09148": "252", + "09151": "252", + "09154": "252", + "09157": "252", + "09160": "252", + "08773": "253", + "08776": "253", + "08779": "253", + "08782": "253", + "08800": "253", + "08803": "253", + "08806": "253", + "08809": "253", + "08818": "253", + "08821": "253", + "08824": "253", + "08827": "253", + "08830": "253", + "08848": "253", + "08851": "253", + "08854": "253", + "08860": "253", + "09163": "256", + "09166": "256", + "09169": "256", + "09172": "256", + "09175": "256", + "09178": "256", + "09181": "256", + "09184": "256", + "09187": "256", + "09190": "256", + "09214": "256", + "09226": "256", + "09235": "256", + "09244": "256", + "09256": "256", + "09271": "256", + "09286": "256", + "09325": "256", + "09331": "256", + "09193": "258", + "09196": "258", + "09199": "258", + "09202": "258", + "09205": "258", + "09208": "258", + "09211": "258", + "09217": "258", + "09220": "258", + "09223": "258", + "09229": "258", + "09232": "258", + "09238": "258", + "09241": "258", + "09247": "259", + "09250": "259", + "09253": "259", + "09259": "259", + "09262": "259", + "09265": "259", + "09268": "259", + "09274": "259", + "09277": "259", + "09280": "259", + "09283": "259", + "09289": "259", + "09292": "259", + "09295": "259", + "09298": "259", + "09301": "259", + "09304": "259", + "09307": "259", + "09310": "259", + "09313": "259", + "09316": "259", + "09319": "260", + "09322": "260", + "09328": "260", + "09334": "260", + "09337": "260", + "09340": "260", + "09343": "260", + "09346": "260", + "09349": "260", + "09352": "260", + "09355": "260", + "09358": "260", + "09361": "260", + "09364": "260", + "09367": "261", + "09370": "261", + "09373": "261", + "09376": "261", + "09379": "261", + "09382": "261", + "09383": "261", + "09385": "261", + "09388": "261", + "09391": "261", + "09394": "261", + "09397": "261", + "09400": "262", + "09403": "262", + "09406": "262", + "09409": "262", + "09412": "262", + "09415": "262", + "09418": "262", + "09421": "262", + "09424": "262", + "09427": "262", + "09430": "262", + "09433": "262", + "09436": "262", + "09439": "262", + "09442": "262", + "09445": "262", + "09448": "262", + "09451": "262", + "09454": "263", + "09457": "263", + "09460": "263", + "09463": "263", + "09466": "263", + "09469": "263", + "09472": "263", + "09475": "263", + "09478": "263", + "09481": "263", + "09484": "263", + "09487": "263", + "09490": "263", + "09493": "263", + "09496": "264", + "09499": "264", + "09502": "264", + "09505": "264", + "09508": "264", + "09511": "264", + "09514": "264", + "09517": "264", + "09520": "264", + "09523": "264", + "09526": "264", + "09529": "264", + "09532": "264", + "09535": "264", +}; diff --git a/transformers/js-dvhcvn/src/index.ts b/transformers/js-dvhcvn/src/index.ts index 79e9c56..43e9510 100644 --- a/transformers/js-dvhcvn/src/index.ts +++ b/transformers/js-dvhcvn/src/index.ts @@ -1,13 +1,37 @@ -import { level1s } from "./data"; -import { findById, findByName } from "./internal"; -import { Level1 } from "./model"; +import { level1s, parents } from "./data"; +import { findLevelXById, findLevelXByName } from "./internal"; +import { Level1, Level2, Level3 } from "./model"; + +export function findById(id: string): Level1 | Level2 | Level3 | undefined { + switch (id.length) { + case 5: + const level2Id = parents[id]; + if (typeof level2Id === "string") { + const level1Id = parents[level2Id]; + if (typeof level1Id === "string") { + return findLevel1ById(level1Id) + ?.findLevel2ById(level2Id) + ?.findLevel3ById(id); + } + } + break; + case 3: + const level1Id = parents[id]; + if (typeof level1Id === "string") { + return findLevel1ById(level1Id)?.findLevel2ById(id); + } + break; + } + + return findLevel1ById(id); +} export function findLevel1ById(id: string): Level1 | undefined { - return findById(level1s, id); + return findLevelXById(level1s, id); } export function findLevel1ByName(name: string): Level1 | undefined { - return findByName(level1s, name); + return findLevelXByName(level1s, name); } export * from "./data"; diff --git a/transformers/js-dvhcvn/src/internal.ts b/transformers/js-dvhcvn/src/internal.ts index 163e7cf..9cd88fa 100644 --- a/transformers/js-dvhcvn/src/internal.ts +++ b/transformers/js-dvhcvn/src/internal.ts @@ -43,7 +43,7 @@ export abstract class Entity< } } -export function findById>( +export function findLevelXById>( list: T[] | undefined, id: string ): T | undefined { @@ -54,7 +54,7 @@ export function findById>( } } -export function findByName>( +export function findLevelXByName>( list: T[] | undefined, name: string ): T | undefined { diff --git a/transformers/js-dvhcvn/src/model.ts b/transformers/js-dvhcvn/src/model.ts index a8e1f92..0d3cfdd 100644 --- a/transformers/js-dvhcvn/src/model.ts +++ b/transformers/js-dvhcvn/src/model.ts @@ -1,5 +1,5 @@ import { level1s } from "./data"; -import { Entity, findById, findByName } from "./internal"; +import { Entity, findLevelXById, findLevelXByName } from "./internal"; export class Level1 extends Entity { public get parent(): undefined { @@ -7,11 +7,11 @@ export class Level1 extends Entity { } public findLevel2ById(id: string): Level2 | undefined { - return findById(this.children, id); + return findLevelXById(this.children, id); } public findLevel2ByName(name: string): Level2 | undefined { - return findByName(this.children, name); + return findLevelXByName(this.children, name); } } @@ -31,11 +31,11 @@ export class Level2 extends Entity { } public findLevel3ById(id: string): Level3 | undefined { - return findById(this.children, id); + return findLevelXById(this.children, id); } public findLevel3ByName(name: string): Level3 | undefined { - return findByName(this.children, name); + return findLevelXByName(this.children, name); } } diff --git a/transformers/sort/.gitignore b/transformers/sort/.gitignore new file mode 100644 index 0000000..f7275bb --- /dev/null +++ b/transformers/sort/.gitignore @@ -0,0 +1 @@ +venv/ diff --git a/transformers/sort/sort.sh b/transformers/sort/sort.sh index 35e2118..7d586c8 100755 --- a/transformers/sort/sort.sh +++ b/transformers/sort/sort.sh @@ -15,4 +15,9 @@ fi rm -f $_outputPath echo "Generating $_outputPath..." + +python3 -m venv "$_dir/venv" +source "$_dir/venv/bin/activate" +python3 -m pip install unidecode + python3 "$_dir/sort.py" <$_inputPath >$_outputPath diff --git a/vercel.json b/vercel.json index 9307a5c..af952ff 100644 --- a/vercel.json +++ b/vercel.json @@ -6,5 +6,11 @@ { "src": "demo/*.html", "use": "@now/static" }, { "src": "demo/*.js", "use": "@now/static" } ], + "redirects": [ + { + "source": "/", + "destination": "https://github.com/daohoangson/dvhcvn#demo" + } + ], "version": 2 }