japanese_address_parser 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6eb9e4ea89bdffa891da4f3854646b82b78e4d9e94965fe537227a1f0705361
-  data.tar.gz: 7bd4611b889b08db8673fdf0f0d12aa80c5f3eb9eb74e34017e3d51923f14b3b
+  metadata.gz: 53a31a273123299a2e48aea1fa82e3bd4d0d33d7e8f1a694ef39a1926004576a
+  data.tar.gz: 21198c935bf0dc0892f5ff395403ef4aaa08d03f60d576e7cfbeaa556ae9ebed
 SHA512:
-  metadata.gz: f63cdb14a5a9bd9de00ce62908f94cfb749043aa5f16e5c8bef464f5900708f9c123e02fb2118b02b99ca916e2fcf901435d13af1a467e9fb93ea216aad1634e
-  data.tar.gz: c6b74305c0445243169db577bd48150ca88f04ff8b4855af588924d7fc9fa0d63cc570da9661db7828002c383d21b94c45fac186c48ebc04d9b15c351e475530
+  metadata.gz: 742a64618c177ef65bf6dcb0677993ba531f734efda24b81dc2a5f0839aef47ae42c57e829b5c9a3e9b984dbb4b1960303a1b05c8d88dcfc516b473948f8219e
+  data.tar.gz: dab2e5dedbeda742af992a5b9574697523f9816c9765741c8f6b9eec6b06723c98247f9248d20a61aeebdcaf541d09d734c2a30a12ca22a47b5b2f1ab2da5694

data/CHANGELOG.md

@@ -17,6 +17,16 @@ Change Log の形式は [Keep a Changelog](http://keepachangelog.com/) に従い
 
 ### Security
 
+## [3.1.1] - 2023-09-07
+
+### Changed
+
+- [#95](https://github.com/yamat47/japanese_address_parser/pull/95) Bump @geolonia/normalize-japanese-addresses from 2.8.0 to 2.9.2 in /js([@yamat47](https://github.com/yamat47))
+
+### Security
+
+- [#94](https://github.com/yamat47/japanese_address_parser/pull/94) Bump activesupport from 7.0.4.3 to 7.0.7.1([@yamat47](https://github.com/yamat47))
+
 ## [3.1.0] - 2023-07-24
 
 ### Changed

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    japanese_address_parser (3.1.0)
+    japanese_address_parser (3.1.1)
       schmooze
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.0.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,14 +18,14 @@ GEM
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     ffi (1.15.5)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
     language_server-protocol (3.17.0.1)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.18.0)
+    minitest (5.19.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)

data/js/node_modules/.package-lock.json

@@ -9,9 +9,9 @@
       "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
     },
     "node_modules/@geolonia/normalize-japanese-addresses": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.8.0.tgz",
-      "integrity": "sha512-BNKTl+38nq+ZKABa9nmwixLyDTXDPYDWSG3DluTjvhog3LEVWcTOHy0taIWXpumlvoz67ingq2qxdjtvW8ktzQ==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.9.2.tgz",
+      "integrity": "sha512-sbeV/seJ/ue6pn2sLo+Ccunl6eB3yNhrUIzNpT2IiR9Fw6fW5f1lLdApODqhTmz++xr1dyPwZOzTXCGEaXejDA==",
       "dependencies": {
         "@geolonia/japanese-numeral": "^0.1.16",
         "isomorphic-unfetch": "^3.1.0",

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/lib/cacheRegexes.d.ts

@@ -1,4 +1,4 @@
-declare type PrefectureList = {
+export declare type PrefectureList = {
     [key: string]: string[];
 };
 interface SingleTown {
@@ -8,7 +8,13 @@ interface SingleTown {
     lat: string;
     lng: string;
 }
-declare type TownList = SingleTown[];
+export declare type TownList = SingleTown[];
+interface SingleAddr {
+    addr: string;
+    lat: string | null;
+    lng: string | null;
+}
+export declare type AddrList = SingleAddr[];
 interface GaikuListItem {
     gaiku: string;
     lat: string;
@@ -28,6 +34,7 @@ export declare const getCityRegexPatterns: (pref: string, cities: string[]) => [
 export declare const getTowns: (pref: string, city: string) => Promise<TownList>;
 export declare const getGaikuList: (pref: string, city: string, town: string) => Promise<GaikuListItem[]>;
 export declare const getResidentials: (pref: string, city: string, town: string) => Promise<ResidentialList>;
+export declare const getAddrs: (pref: string, city: string, town: string) => Promise<AddrList>;
 export declare const getTownRegexPatterns: (pref: string, city: string) => Promise<[SingleTown, string][]>;
 export declare const getSameNamedPrefectureCityRegexPatterns: (prefs: string[], prefList: PrefectureList) => [string, string][];
 export {};

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-browser.js

@@ -348,6 +348,7 @@
 
     var gh_pages_endpoint = 'https://geolonia.github.io/japanese-addresses/api/ja';
     var currentConfig = {
+        interfaceVersion: 1,
         japaneseAddressesApi: gh_pages_endpoint,
         townCacheSize: 1000,
     };
@@ -355,8 +356,13 @@
     var kan2num = function (string) {
         var kanjiNumbers = dist.findKanjiNumbers(string);
         for (var i = 0; i < kanjiNumbers.length; i++) {
-            // @ts-ignore
-            string = string.replace(kanjiNumbers[i], dist.kanji2number(kanjiNumbers[i]));
+            try {
+                // @ts-ignore
+                string = string.replace(kanjiNumbers[i], dist.kanji2number(kanjiNumbers[i]));
+            }
+            catch (error) {
+                // ignore
+            }
         }
         return string;
     };
@@ -1228,6 +1234,7 @@
     var cachedTowns = {};
     var cachedGaikuListItem = {};
     var cachedResidentials = {};
+    var cachedAddrs = {}; // TODO: use LRU
     var cachedSameNamedPrefectureCityRegexPatterns = undefined;
     var getPrefectures = function () { return __awaiter(void 0, void 0, void 0, function () {
         var prefsResp, data;
@@ -1237,7 +1244,7 @@
                     if (typeof cachedPrefectures !== 'undefined') {
                         return [2 /*return*/, cachedPrefectures];
                     }
-                    return [4 /*yield*/, __internals.fetch('.json')]; // ja.json
+                    return [4 /*yield*/, __internals.fetch('.json', { level: 1 })]; // ja.json
                 case 1:
                     prefsResp = _a.sent() // ja.json
                     ;
@@ -1291,7 +1298,7 @@
                     if (typeof cachedTown !== 'undefined') {
                         return [2 /*return*/, cachedTown];
                     }
-                    return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city) + '.json'].join('/'))];
+                    return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city) + '.json'].join('/'), { level: 3, pref: pref, city: city })];
                 case 1:
                     townsResp = _a.sent();
                     return [4 /*yield*/, townsResp.json()];
@@ -1306,7 +1313,10 @@
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    cacheKey = pref + "-" + city + "-" + town;
+                    if (currentConfig.interfaceVersion > 1) {
+                        throw new Error("Invalid config.interfaceVersion: " + currentConfig.interfaceVersion + "'}. Please set config.interfaceVersion to 1.");
+                    }
+                    cacheKey = pref + "-" + city + "-" + town + "-v" + currentConfig.interfaceVersion;
                     cache = cachedGaikuListItem[cacheKey];
                     if (typeof cache !== 'undefined') {
                         return [2 /*return*/, cache];
@@ -1334,7 +1344,10 @@
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    cacheKey = pref + "-" + city + "-" + town;
+                    if (currentConfig.interfaceVersion > 1) {
+                        throw new Error("Invalid config.interfaceVersion: " + currentConfig.interfaceVersion + "'}. Please set config.interfaceVersion to 1.");
+                    }
+                    cacheKey = pref + "-" + city + "-" + town + "-v" + currentConfig.interfaceVersion;
                     cache = cachedResidentials[cacheKey];
                     if (typeof cache !== 'undefined') {
                         return [2 /*return*/, cache];
@@ -1368,6 +1381,39 @@
             }
         });
     }); };
+    var getAddrs = function (pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+        var cacheKey, cache, addrsResp, addrs;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (currentConfig.interfaceVersion < 2) {
+                        throw new Error("Invalid config.interfaceVersion: " + currentConfig.interfaceVersion + "'}. Please set config.interfaceVersion to 2 or higher");
+                    }
+                    cacheKey = pref + "-" + city + "-" + town + "-v" + currentConfig.interfaceVersion;
+                    cache = cachedAddrs[cacheKey];
+                    if (typeof cache !== 'undefined') {
+                        return [2 /*return*/, cache];
+                    }
+                    return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city), encodeURI(town) + '.json'].join('/'), { level: 8, pref: pref, city: city, town: town })];
+                case 1:
+                    addrsResp = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    _b.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, addrsResp.json()];
+                case 3:
+                    addrs = (_b.sent());
+                    return [3 /*break*/, 5];
+                case 4:
+                    _b.sent();
+                    addrs = [];
+                    return [3 /*break*/, 5];
+                case 5:
+                    addrs.sort(function (res1, res2) { return res1.addr.length - res2.addr.length; });
+                    return [2 /*return*/, (cachedAddrs[cacheKey] = addrs)];
+            }
+        });
+    }); };
     // 十六町 のように漢数字と町が連結しているか
     var isKanjiNumberFollewedByCho = function (targetTownName) {
         var xCho = targetTownName.match(/.町/g);
@@ -1599,10 +1645,32 @@
             }
         });
     }); };
+    var normalizeAddrPart = function (addr, pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+        var addrListItem, addrItem, other;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getAddrs(pref, city, town)
+                    // 住居表示住所、および地番住所が見つからなかった
+                ];
+                case 1:
+                    addrListItem = _a.sent();
+                    // 住居表示住所、および地番住所が見つからなかった
+                    if (addrListItem.length === 0) {
+                        return [2 /*return*/, null];
+                    }
+                    addrItem = addrListItem.find(function (item) { return addr.startsWith(item.addr); });
+                    if (addrItem) {
+                        other = addr.replace(addrItem.addr, '').trim();
+                        return [2 /*return*/, { addr: addrItem.addr, other: other, lat: addrItem.lat, lng: addrItem.lng }];
+                    }
+                    return [2 /*return*/, null];
+            }
+        });
+    }); };
     var normalize$1 = function (address, _option) {
         if (_option === void 0) { _option = defaultOption; }
         return __awaiter(void 0, void 0, void 0, function () {
-            var option, addr, pref, city, town, lat, lng, level, normalized, prefectures, prefs, prefPatterns, sameNamedPrefectureCityRegexPatterns, i, _a, prefectureCity, reg, match, i, _b, _pref, pattern, match, matched, _pref, cities, cityPatterns, i, _c, _city, pattern, match, i, normalized_1, cities, cityPatterns, i, _d, _city, pattern, match, result;
+            var option, addr, pref, city, town, lat, lng, level, normalized, prefectures, prefs, prefPatterns, sameNamedPrefectureCityRegexPatterns, i, _a, prefectureCity, reg, match, i, _b, _pref, pattern, match, matched, _pref, cities, cityPatterns, i, _c, _city, pattern, match, i, normalized_1, cities, cityPatterns, i, _d, _city, pattern, match, normalizedAddrPart, other, result, result;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -1762,7 +1830,7 @@
                                 // `-1` のようなケース
                                 return kan2num(s);
                             })
-                                .replace(/-[^0-9]+([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                                .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, function (s) {
                                 // `-あ1` のようなケース
                                 return kan2num(zen2han(s));
                             })
@@ -1775,12 +1843,52 @@
                         _e.label = 8;
                     case 8:
                         addr = patchAddr(pref, city, town, addr);
-                        if (!(option.level > 3 && normalized && town)) return [3 /*break*/, 10];
-                        return [4 /*yield*/, normalizeResidentialPart(addr, pref, city, town)];
+                        if (pref)
+                            level = level + 1;
+                        if (city)
+                            level = level + 1;
+                        if (town)
+                            level = level + 1;
+                        if (option.level <= 3 || level < 3) {
+                            return [2 /*return*/, { pref: pref, city: city, town: town, addr: addr, level: level, lat: lat, lng: lng }];
+                        }
+                        if (!(currentConfig.interfaceVersion === 2)) return [3 /*break*/, 10];
+                        return [4 /*yield*/, normalizeAddrPart(addr, pref, city, town)];
                     case 9:
-                        normalized = _e.sent();
-                        _e.label = 10;
+                        normalizedAddrPart = _e.sent();
+                        other = undefined;
+                        if (normalizedAddrPart) {
+                            addr = normalizedAddrPart.addr;
+                            if (normalizedAddrPart.other) {
+                                other = normalizedAddrPart.other;
+                            }
+                            if (normalizedAddrPart.lat !== null)
+                                lat = parseFloat(normalizedAddrPart.lat);
+                            if (normalizedAddrPart.lng !== null)
+                                lng = parseFloat(normalizedAddrPart.lng);
+                            level = 8;
+                        }
+                        result = {
+                            pref: pref,
+                            city: city,
+                            town: town,
+                            addr: addr,
+                            level: level,
+                            lat: lat,
+                            lng: lng,
+                        };
+                        if (other) {
+                            result.other = other;
+                        }
+                        return [2 /*return*/, result];
                     case 10:
+                        if (!(currentConfig.interfaceVersion === 1)) return [3 /*break*/, 13];
+                        if (!(option.level > 3 && normalized && town)) return [3 /*break*/, 12];
+                        return [4 /*yield*/, normalizeResidentialPart(addr, pref, city, town)];
+                    case 11:
+                        normalized = _e.sent();
+                        _e.label = 12;
+                    case 12:
                         if (normalized) {
                             lat = parseFloat(normalized.lat);
                             lng = parseFloat(normalized.lng);
@@ -1789,12 +1897,6 @@
                             lat = null;
                             lng = null;
                         }
-                        if (pref)
-                            level = level + 1;
-                        if (city)
-                            level = level + 1;
-                        if (town)
-                            level = level + 1;
                         result = {
                             pref: pref,
                             city: city,
@@ -1814,6 +1916,7 @@
                             result.level = 8;
                         }
                         return [2 /*return*/, result];
+                    case 13: throw new Error('invalid interfaceVersion');
                 }
             });
         });

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-es.js

@@ -342,6 +342,7 @@ exports.findKanjiNumbers = findKanjiNumbers;
 
 var gh_pages_endpoint = 'https://geolonia.github.io/japanese-addresses/api/ja';
 var currentConfig = {
+    interfaceVersion: 1,
     japaneseAddressesApi: gh_pages_endpoint,
     townCacheSize: 1000,
 };
@@ -349,8 +350,13 @@ var currentConfig = {
 var kan2num = function (string) {
     var kanjiNumbers = dist.findKanjiNumbers(string);
     for (var i = 0; i < kanjiNumbers.length; i++) {
-        // @ts-ignore
-        string = string.replace(kanjiNumbers[i], dist.kanji2number(kanjiNumbers[i]));
+        try {
+            // @ts-ignore
+            string = string.replace(kanjiNumbers[i], dist.kanji2number(kanjiNumbers[i]));
+        }
+        catch (error) {
+            // ignore
+        }
     }
     return string;
 };
@@ -1222,6 +1228,7 @@ var cachedPrefectures = undefined;
 var cachedTowns = {};
 var cachedGaikuListItem = {};
 var cachedResidentials = {};
+var cachedAddrs = {}; // TODO: use LRU
 var cachedSameNamedPrefectureCityRegexPatterns = undefined;
 var getPrefectures = function () { return __awaiter(void 0, void 0, void 0, function () {
     var prefsResp, data;
@@ -1231,7 +1238,7 @@ var getPrefectures = function () { return __awaiter(void 0, void 0, void 0, func
                 if (typeof cachedPrefectures !== 'undefined') {
                     return [2 /*return*/, cachedPrefectures];
                 }
-                return [4 /*yield*/, __internals.fetch('.json')]; // ja.json
+                return [4 /*yield*/, __internals.fetch('.json', { level: 1 })]; // ja.json
             case 1:
                 prefsResp = _a.sent() // ja.json
                 ;
@@ -1285,7 +1292,7 @@ var getTowns = function (pref, city) { return __awaiter(void 0, void 0, void 0,
                 if (typeof cachedTown !== 'undefined') {
                     return [2 /*return*/, cachedTown];
                 }
-                return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city) + '.json'].join('/'))];
+                return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city) + '.json'].join('/'), { level: 3, pref: pref, city: city })];
             case 1:
                 townsResp = _a.sent();
                 return [4 /*yield*/, townsResp.json()];
@@ -1300,7 +1307,10 @@ var getGaikuList = function (pref, city, town) { return __awaiter(void 0, void 0
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                cacheKey = pref + "-" + city + "-" + town;
+                if (currentConfig.interfaceVersion > 1) {
+                    throw new Error("Invalid config.interfaceVersion: " + currentConfig.interfaceVersion + "'}. Please set config.interfaceVersion to 1.");
+                }
+                cacheKey = pref + "-" + city + "-" + town + "-v" + currentConfig.interfaceVersion;
                 cache = cachedGaikuListItem[cacheKey];
                 if (typeof cache !== 'undefined') {
                     return [2 /*return*/, cache];
@@ -1328,7 +1338,10 @@ var getResidentials = function (pref, city, town) { return __awaiter(void 0, voi
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                cacheKey = pref + "-" + city + "-" + town;
+                if (currentConfig.interfaceVersion > 1) {
+                    throw new Error("Invalid config.interfaceVersion: " + currentConfig.interfaceVersion + "'}. Please set config.interfaceVersion to 1.");
+                }
+                cacheKey = pref + "-" + city + "-" + town + "-v" + currentConfig.interfaceVersion;
                 cache = cachedResidentials[cacheKey];
                 if (typeof cache !== 'undefined') {
                     return [2 /*return*/, cache];
@@ -1362,6 +1375,39 @@ var getResidentials = function (pref, city, town) { return __awaiter(void 0, voi
         }
     });
 }); };
+var getAddrs = function (pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+    var cacheKey, cache, addrsResp, addrs;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                if (currentConfig.interfaceVersion < 2) {
+                    throw new Error("Invalid config.interfaceVersion: " + currentConfig.interfaceVersion + "'}. Please set config.interfaceVersion to 2 or higher");
+                }
+                cacheKey = pref + "-" + city + "-" + town + "-v" + currentConfig.interfaceVersion;
+                cache = cachedAddrs[cacheKey];
+                if (typeof cache !== 'undefined') {
+                    return [2 /*return*/, cache];
+                }
+                return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city), encodeURI(town) + '.json'].join('/'), { level: 8, pref: pref, city: city, town: town })];
+            case 1:
+                addrsResp = _b.sent();
+                _b.label = 2;
+            case 2:
+                _b.trys.push([2, 4, , 5]);
+                return [4 /*yield*/, addrsResp.json()];
+            case 3:
+                addrs = (_b.sent());
+                return [3 /*break*/, 5];
+            case 4:
+                _b.sent();
+                addrs = [];
+                return [3 /*break*/, 5];
+            case 5:
+                addrs.sort(function (res1, res2) { return res1.addr.length - res2.addr.length; });
+                return [2 /*return*/, (cachedAddrs[cacheKey] = addrs)];
+        }
+    });
+}); };
 // 十六町 のように漢数字と町が連結しているか
 var isKanjiNumberFollewedByCho = function (targetTownName) {
     var xCho = targetTownName.match(/.町/g);
@@ -1593,10 +1639,32 @@ var normalizeResidentialPart = function (addr, pref, city, town) { return __awai
         }
     });
 }); };
+var normalizeAddrPart = function (addr, pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+    var addrListItem, addrItem, other;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, getAddrs(pref, city, town)
+                // 住居表示住所、および地番住所が見つからなかった
+            ];
+            case 1:
+                addrListItem = _a.sent();
+                // 住居表示住所、および地番住所が見つからなかった
+                if (addrListItem.length === 0) {
+                    return [2 /*return*/, null];
+                }
+                addrItem = addrListItem.find(function (item) { return addr.startsWith(item.addr); });
+                if (addrItem) {
+                    other = addr.replace(addrItem.addr, '').trim();
+                    return [2 /*return*/, { addr: addrItem.addr, other: other, lat: addrItem.lat, lng: addrItem.lng }];
+                }
+                return [2 /*return*/, null];
+        }
+    });
+}); };
 var normalize$1 = function (address, _option) {
     if (_option === void 0) { _option = defaultOption; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var option, addr, pref, city, town, lat, lng, level, normalized, prefectures, prefs, prefPatterns, sameNamedPrefectureCityRegexPatterns, i, _a, prefectureCity, reg, match, i, _b, _pref, pattern, match, matched, _pref, cities, cityPatterns, i, _c, _city, pattern, match, i, normalized_1, cities, cityPatterns, i, _d, _city, pattern, match, result;
+        var option, addr, pref, city, town, lat, lng, level, normalized, prefectures, prefs, prefPatterns, sameNamedPrefectureCityRegexPatterns, i, _a, prefectureCity, reg, match, i, _b, _pref, pattern, match, matched, _pref, cities, cityPatterns, i, _c, _city, pattern, match, i, normalized_1, cities, cityPatterns, i, _d, _city, pattern, match, normalizedAddrPart, other, result, result;
         return __generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -1756,7 +1824,7 @@ var normalize$1 = function (address, _option) {
                             // `-1` のようなケース
                             return kan2num(s);
                         })
-                            .replace(/-[^0-9]+([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                            .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, function (s) {
                             // `-あ1` のようなケース
                             return kan2num(zen2han(s));
                         })
@@ -1769,12 +1837,52 @@ var normalize$1 = function (address, _option) {
                     _e.label = 8;
                 case 8:
                     addr = patchAddr(pref, city, town, addr);
-                    if (!(option.level > 3 && normalized && town)) return [3 /*break*/, 10];
-                    return [4 /*yield*/, normalizeResidentialPart(addr, pref, city, town)];
+                    if (pref)
+                        level = level + 1;
+                    if (city)
+                        level = level + 1;
+                    if (town)
+                        level = level + 1;
+                    if (option.level <= 3 || level < 3) {
+                        return [2 /*return*/, { pref: pref, city: city, town: town, addr: addr, level: level, lat: lat, lng: lng }];
+                    }
+                    if (!(currentConfig.interfaceVersion === 2)) return [3 /*break*/, 10];
+                    return [4 /*yield*/, normalizeAddrPart(addr, pref, city, town)];
                 case 9:
-                    normalized = _e.sent();
-                    _e.label = 10;
+                    normalizedAddrPart = _e.sent();
+                    other = undefined;
+                    if (normalizedAddrPart) {
+                        addr = normalizedAddrPart.addr;
+                        if (normalizedAddrPart.other) {
+                            other = normalizedAddrPart.other;
+                        }
+                        if (normalizedAddrPart.lat !== null)
+                            lat = parseFloat(normalizedAddrPart.lat);
+                        if (normalizedAddrPart.lng !== null)
+                            lng = parseFloat(normalizedAddrPart.lng);
+                        level = 8;
+                    }
+                    result = {
+                        pref: pref,
+                        city: city,
+                        town: town,
+                        addr: addr,
+                        level: level,
+                        lat: lat,
+                        lng: lng,
+                    };
+                    if (other) {
+                        result.other = other;
+                    }
+                    return [2 /*return*/, result];
                 case 10:
+                    if (!(currentConfig.interfaceVersion === 1)) return [3 /*break*/, 13];
+                    if (!(option.level > 3 && normalized && town)) return [3 /*break*/, 12];
+                    return [4 /*yield*/, normalizeResidentialPart(addr, pref, city, town)];
+                case 11:
+                    normalized = _e.sent();
+                    _e.label = 12;
+                case 12:
                     if (normalized) {
                         lat = parseFloat(normalized.lat);
                         lng = parseFloat(normalized.lng);
@@ -1783,12 +1891,6 @@ var normalize$1 = function (address, _option) {
                         lat = null;
                         lng = null;
                     }
-                    if (pref)
-                        level = level + 1;
-                    if (city)
-                        level = level + 1;
-                    if (town)
-                        level = level + 1;
                     result = {
                         pref: pref,
                         city: city,
@@ -1808,6 +1910,7 @@ var normalize$1 = function (address, _option) {
                         result.level = 8;
                     }
                     return [2 /*return*/, result];
+                case 13: throw new Error('invalid interfaceVersion');
             }
         });
     });

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-node.d.ts

@@ -1,3 +1,9 @@
 import * as Normalize from './normalize';
+export declare const requestHandlers: {
+    file: (fileURL: URL) => {
+        json: () => Promise<any>;
+    };
+    http: (fileURL: URL) => Promise<Response>;
+};
 export declare const config: Normalize.Config;
 export declare const normalize: Normalize.Normalizer;