japanese_address_parser 3.0.5 → 3.1.1

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;

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

@@ -78,6 +78,7 @@ function __generator(thisArg, body) {
 
 var gh_pages_endpoint = 'https://geolonia.github.io/japanese-addresses/api/ja';
 var currentConfig = {
+    interfaceVersion: 1,
     japaneseAddressesApi: gh_pages_endpoint,
     townCacheSize: 1000,
 };
@@ -85,8 +86,13 @@ var currentConfig = {
 var kan2num = function (string) {
     var kanjiNumbers = japaneseNumeral.findKanjiNumbers(string);
     for (var i = 0; i < kanjiNumbers.length; i++) {
-        // @ts-ignore
-        string = string.replace(kanjiNumbers[i], japaneseNumeral.kanji2number(kanjiNumbers[i]));
+        try {
+            // @ts-ignore
+            string = string.replace(kanjiNumbers[i], japaneseNumeral.kanji2number(kanjiNumbers[i]));
+        }
+        catch (error) {
+            // ignore
+        }
     }
     return string;
 };
@@ -132,8 +138,8 @@ var patchAddr = function (pref, city, town, addr) {
 };
 
 // JIS 第2水準 => 第1水準 及び 旧字体 => 新字体
-var JIS_OLD_KANJI = '亞,圍,壹,榮,驛,應,櫻,假,會,懷,覺,樂,陷,歡,氣,戲,據,挾,區,徑,溪,輕,藝,儉,圈,權,嚴,恆,國,齋,雜,蠶,殘,兒,實,釋,從,縱,敍,燒,條,剩,壤,釀,眞,盡,醉,髓,聲,竊,淺,錢,禪,爭,插,騷,屬,對,滯,擇,單,斷,癡,鑄,敕,鐵,傳,黨,鬪,屆,腦,廢,發,蠻,拂,邊,瓣,寶,沒,滿,藥,餘,樣,亂,兩,禮,靈,爐,灣,惡,醫,飮,營,圓,歐,奧,價,繪,擴,學,罐,勸,觀,歸,犧,擧,狹,驅,莖,經,繼,缺,劍,檢,顯,廣,鑛,碎,劑,參,慘,絲,辭,舍,壽,澁,肅,將,證,乘,疊,孃,觸,寢,圖,穗,樞,齊,攝,戰,潛,雙,莊,裝,藏,續,體,臺,澤,膽,彈,蟲,廳,鎭,點,燈,盜,獨,貳,霸,賣,髮,祕,佛,變,辯,豐,飜,默,與,譽,謠,覽,獵,勵,齡,勞,壓,爲,隱,衞,鹽,毆,穩,畫,壞,殼,嶽,卷,關,顏,僞,舊,峽,曉,勳,惠,螢,鷄,縣,險,獻,驗,效,號,濟,册,棧,贊,齒,濕,寫,收,獸,處,稱,奬,淨,繩,讓,囑,愼,粹,隨,數,靜,專,踐,纖,壯,搜,總,臟,墮,帶,瀧,擔,團,遲,晝,聽,遞,轉,當,稻,讀,惱,拜,麥,拔,濱,竝,辨,舖,襃,萬,譯,豫,搖,來,龍,壘,隸,戀,樓,鰺,鶯,蠣,攪,竈,灌,諫,頸,礦,蘂,靱,賤,壺,礪,檮,濤,邇,蠅,檜,儘,藪,籠,彌'.split(/,/);
-var JIS_NEW_KANJI = '亜,囲,壱,栄,駅,応,桜,仮,会,懐,覚,楽,陥,歓,気,戯,拠,挟,区,径,渓,軽,芸,倹,圏,権,厳,恒,国,斎,雑,蚕,残,児,実,釈,従,縦,叙,焼,条,剰,壌,醸,真,尽,酔,髄,声,窃,浅,銭,禅,争,挿,騒,属,対,滞,択,単,断,痴,鋳,勅,鉄,伝,党,闘,届,脳,廃,発,蛮,払,辺,弁,宝,没,満,薬,余,様,乱,両,礼,霊,炉,湾,悪,医,飲,営,円,欧,奥,価,絵,拡,学,缶,勧,観,帰,犠,挙,狭,駆,茎,経,継,欠,剣,検,顕,広,鉱,砕,剤,参,惨,糸,辞,舎,寿,渋,粛,将,証,乗,畳,嬢,触,寝,図,穂,枢,斉,摂,戦,潜,双,荘,装,蔵,続,体,台,沢,胆,弾,虫,庁,鎮,点,灯,盗,独,弐,覇,売,髪,秘,仏,変,弁,豊,翻,黙,与,誉,謡,覧,猟,励,齢,労,圧,為,隠,衛,塩,殴,穏,画,壊,殻,岳,巻,関,顔,偽,旧,峡,暁,勲,恵,蛍,鶏,県,険,献,験,効,号,済,冊,桟,賛,歯,湿,写,収,獣,処,称,奨,浄,縄,譲,嘱,慎,粋,随,数,静,専,践,繊,壮,捜,総,臓,堕,帯,滝,担,団,遅,昼,聴,逓,転,当,稲,読,悩,拝,麦,抜,浜,並,弁,舗,褒,万,訳,予,揺,来,竜,塁,隷,恋,楼,鯵,鴬,蛎,撹,竃,潅,諌,頚,砿,蕊,靭,賎,壷,砺,梼,涛,迩,蝿,桧,侭,薮,篭,弥'.split(/,/);
+var JIS_OLD_KANJI = '亞,圍,壹,榮,驛,應,櫻,假,會,懷,覺,樂,陷,歡,氣,戲,據,挾,區,徑,溪,輕,藝,儉,圈,權,嚴,恆,國,齋,雜,蠶,殘,兒,實,釋,從,縱,敍,燒,條,剩,壤,釀,眞,盡,醉,髓,聲,竊,淺,錢,禪,爭,插,騷,屬,對,滯,擇,單,斷,癡,鑄,敕,鐵,傳,黨,鬪,屆,腦,廢,發,蠻,拂,邊,瓣,寶,沒,滿,藥,餘,樣,亂,兩,禮,靈,爐,灣,惡,醫,飮,營,圓,歐,奧,價,繪,擴,學,罐,勸,觀,歸,犧,擧,狹,驅,莖,經,繼,缺,劍,檢,顯,廣,鑛,碎,劑,參,慘,絲,辭,舍,壽,澁,肅,將,證,乘,疊,孃,觸,寢,圖,穗,樞,齊,攝,戰,潛,雙,莊,裝,藏,續,體,臺,澤,膽,彈,蟲,廳,鎭,點,燈,盜,獨,貳,霸,賣,髮,祕,佛,變,辯,豐,飜,默,與,譽,謠,覽,獵,勵,齡,勞,壓,爲,隱,衞,鹽,毆,穩,畫,壞,殼,嶽,卷,關,顏,僞,舊,峽,曉,勳,惠,螢,鷄,縣,險,獻,驗,效,號,濟,册,棧,贊,齒,濕,寫,收,獸,處,稱,奬,淨,繩,讓,囑,愼,粹,隨,數,靜,專,踐,纖,壯,搜,總,臟,墮,帶,瀧,擔,團,遲,晝,聽,遞,轉,當,稻,讀,惱,拜,麥,拔,濱,竝,辨,舖,襃,萬,譯,豫,搖,來,龍,壘,隸,戀,樓,鰺,鶯,蠣,攪,竈,灌,諫,頸,礦,蘂,靱,賤,壺,礪,檮,濤,邇,蠅,檜,儘,藪,籠,彌,麩'.split(/,/);
+var JIS_NEW_KANJI = '亜,囲,壱,栄,駅,応,桜,仮,会,懐,覚,楽,陥,歓,気,戯,拠,挟,区,径,渓,軽,芸,倹,圏,権,厳,恒,国,斎,雑,蚕,残,児,実,釈,従,縦,叙,焼,条,剰,壌,醸,真,尽,酔,髄,声,窃,浅,銭,禅,争,挿,騒,属,対,滞,択,単,断,痴,鋳,勅,鉄,伝,党,闘,届,脳,廃,発,蛮,払,辺,弁,宝,没,満,薬,余,様,乱,両,礼,霊,炉,湾,悪,医,飲,営,円,欧,奥,価,絵,拡,学,缶,勧,観,帰,犠,挙,狭,駆,茎,経,継,欠,剣,検,顕,広,鉱,砕,剤,参,惨,糸,辞,舎,寿,渋,粛,将,証,乗,畳,嬢,触,寝,図,穂,枢,斉,摂,戦,潜,双,荘,装,蔵,続,体,台,沢,胆,弾,虫,庁,鎮,点,灯,盗,独,弐,覇,売,髪,秘,仏,変,弁,豊,翻,黙,与,誉,謡,覧,猟,励,齢,労,圧,為,隠,衛,塩,殴,穏,画,壊,殻,岳,巻,関,顔,偽,旧,峡,暁,勲,恵,蛍,鶏,県,険,献,験,効,号,済,冊,桟,賛,歯,湿,写,収,獣,処,称,奨,浄,縄,譲,嘱,慎,粋,随,数,静,専,践,繊,壮,捜,総,臓,堕,帯,滝,担,団,遅,昼,聴,逓,転,当,稲,読,悩,拝,麦,抜,浜,並,弁,舗,褒,万,訳,予,揺,来,竜,塁,隷,恋,楼,鯵,鴬,蛎,撹,竃,潅,諌,頚,砿,蕊,靭,賎,壷,砺,梼,涛,迩,蝿,桧,侭,薮,篭,弥,麸'.split(/,/);
 var JIS_KANJI_REGEX_PATTERNS = JIS_OLD_KANJI.map(function (old, i) {
     var pattern = old + "|" + JIS_NEW_KANJI[i];
     return [pattern, old, JIS_NEW_KANJI[i]];
@@ -152,6 +158,7 @@ var toRegexPattern = function (string) {
     _str = _str
         .replace(/三栄町|四谷三栄町/g, '(三栄町|四谷三栄町)')
         .replace(/鬮野川|くじ野川|くじの川/g, '(鬮野川|くじ野川|くじの川)')
+        .replace(/柿碕町|柿さき町/g, '(柿碕町|柿さき町)')
         .replace(/通り|とおり/g, '(通り|とおり)')
         .replace(/埠頭|ふ頭/g, '(埠頭|ふ頭)')
         .replace(/番町|番丁/g, '(番町|番丁)')
@@ -190,6 +197,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;
@@ -199,7 +207,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
                 ;
@@ -253,7 +261,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()];
@@ -268,7 +276,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];
@@ -296,7 +307,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];
@@ -330,6 +344,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);
@@ -339,9 +386,9 @@ var isKanjiNumberFollewedByCho = function (targetTownName) {
     return kanjiNumbers.length > 0;
 };
 var getTownRegexPatterns = function (pref, city) { return __awaiter(void 0, void 0, void 0, function () {
-    var cachedResult, pre_towns, townSet, towns, isKyoto, _i, pre_towns_1, town, originalTown, townAbbr, patterns;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var cachedResult, pre_towns, townSet, towns, isKyoto, _i, pre_towns_1, town, originalTown, townAbbr, patterns, _a, towns_1, town, chomeMatch, chomeNamePart, chomeNum, pattern;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 cachedResult = cachedTownRegexes.get(pref + "-" + city);
                 if (typeof cachedResult !== 'undefined') {
@@ -349,7 +396,7 @@ var getTownRegexPatterns = function (pref, city) { return __awaiter(void 0, void
                 }
                 return [4 /*yield*/, getTowns(pref, city)];
             case 1:
-                pre_towns = _a.sent();
+                pre_towns = _b.sent();
                 townSet = new Set(pre_towns.map(function (town) { return town.town; }));
                 towns = [];
                 isKyoto = city.match(/^京都市/);
@@ -415,6 +462,18 @@ var getTownRegexPatterns = function (pref, city) { return __awaiter(void 0, void
                     }));
                     return [town, pattern];
                 });
+                // X丁目の丁目なしの数字だけ許容するため、最後に数字だけ追加していく
+                for (_a = 0, towns_1 = towns; _a < towns_1.length; _a++) {
+                    town = towns_1[_a];
+                    chomeMatch = town.town.match(/([^一二三四五六七八九十]+)([一二三四五六七八九十]+)(丁目?)/);
+                    if (!chomeMatch) {
+                        continue;
+                    }
+                    chomeNamePart = chomeMatch[1];
+                    chomeNum = chomeMatch[2];
+                    pattern = toRegexPattern("^" + chomeNamePart + "(" + chomeNum + "|" + kan2num(chomeNum) + ")");
+                    patterns.push([town, pattern]);
+                }
                 cachedTownRegexes.set(pref + "-" + city, patterns);
                 return [2 /*return*/, patterns];
         }
@@ -538,10 +597,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:
@@ -684,7 +765,7 @@ var normalize$1 = function (address, _option) {
                             });
                         })
                             .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号?/, '$1-$3')
+                            .replace(/([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
                             .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
                             .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
                             .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
@@ -701,7 +782,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));
                         })
@@ -714,12 +795,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);
@@ -728,12 +849,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,
@@ -753,45 +868,79 @@ var normalize$1 = function (address, _option) {
                         result.level = 8;
                     }
                     return [2 /*return*/, result];
+                case 13: throw new Error('invalid interfaceVersion');
             }
         });
     });
 };
 
-var fetchOrReadFile = function (input) { return __awaiter(void 0, void 0, void 0, function () {
-    var fileURL, filePath_1;
-    return __generator(this, function (_a) {
-        fileURL = new URL("" + config$1.japaneseAddressesApi + input);
-        if (fileURL.protocol === 'http:' || fileURL.protocol === 'https:') {
-            if (config$1.geoloniaApiKey) {
-                fileURL.search = "?geolonia-api-key=" + config$1.geoloniaApiKey;
-            }
-            return [2 /*return*/, unfetch__default['default'](fileURL.toString())];
-        }
-        else if (fileURL.protocol === 'file:') {
-            filePath_1 = decodeURI(fileURL.pathname);
-            return [2 /*return*/, {
-                    json: function () { return __awaiter(void 0, void 0, void 0, function () {
-                        var contents;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, fs.promises.readFile(filePath_1)];
-                                case 1:
-                                    contents = _a.sent();
-                                    return [2 /*return*/, JSON.parse(contents.toString('utf-8'))];
-                            }
-                        });
-                    }); },
-                }];
-        }
-        else {
-            throw new Error("Unknown URL schema: " + fileURL.protocol);
+var requestHandlers = {
+    file: function (fileURL) {
+        var filePath = process.platform === 'win32'
+            ? decodeURI(fileURL.pathname).substr(1)
+            : decodeURI(fileURL.pathname);
+        return {
+            json: function () { return __awaiter(void 0, void 0, void 0, function () {
+                var contents;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, fs.promises.readFile(filePath)];
+                        case 1:
+                            contents = _a.sent();
+                            return [2 /*return*/, JSON.parse(contents.toString('utf-8'))];
+                    }
+                });
+            }); },
+        };
+    },
+    http: function (fileURL) {
+        if (config$1.geoloniaApiKey) {
+            fileURL.search = "?geolonia-api-key=" + config$1.geoloniaApiKey;
         }
+        return unfetch__default['default'](fileURL.toString());
+    },
+};
+/**
+ * 正規化のためのデータを取得する
+ * @param input - Path part like '東京都/文京区.json'
+ * @param requestOptions - input を構造化したデータ
+ */
+var fetchOrReadFile = function (input, requestOptions) {
+    if (requestOptions === void 0) { requestOptions = { level: -1 }; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var fileURL, result_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    fileURL = new URL("" + config$1.japaneseAddressesApi + input);
+                    if (!(config$1.transformRequest && requestOptions.level !== -1)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, config$1.transformRequest(fileURL, requestOptions)];
+                case 1:
+                    result_1 = _a.sent();
+                    return [2 /*return*/, {
+                            json: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                                return [2 /*return*/, Promise.resolve(result_1)];
+                            }); }); },
+                        }];
+                case 2:
+                    if (fileURL.protocol === 'http:' || fileURL.protocol === 'https:') {
+                        return [2 /*return*/, requestHandlers.http(fileURL)];
+                    }
+                    else if (fileURL.protocol === 'file:') {
+                        return [2 /*return*/, requestHandlers.file(fileURL)];
+                    }
+                    else {
+                        throw new Error("Unknown URL schema: " + fileURL.protocol);
+                    }
+                case 3: return [2 /*return*/];
+            }
+        });
     });
-}); };
+};
 __internals.fetch = fetchOrReadFile;
 var config = config$1;
 var normalize = normalize$1;
 
 exports.config = config;
 exports.normalize = normalize;
+exports.requestHandlers = requestHandlers;

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

@@ -1,18 +1,35 @@
+import { PrefectureList, TownList, AddrList } from './lib/cacheRegexes';
+declare type TransformRequestResponse = null | PrefectureList | TownList | AddrList;
+export declare type TransformRequestQuery = {
+    level: number;
+    pref?: string;
+    city?: string;
+    town?: string;
+};
+export declare type TransformRequestFunction = (url: URL, query: TransformRequestQuery) => TransformRequestResponse | Promise<TransformRequestResponse>;
 /**
  * normalize {@link Normalizer} の動作オプション。
  */
 export interface Config {
+    /**
+     * レスポンス型のバージョン。デフォルト 1
+     * 1 の場合は jyukyo: string, gaiku: string
+     * 2 の場合は addr: string,　other: string
+     */
+    interfaceVersion: number;
     /** 住所データを URL 形式で指定。 file:// 形式で指定するとローカルファイルを参照できます。 */
     japaneseAddressesApi: string;
     /** 町丁目のデータを何件までキャッシュするか。デフォルト 1,000 */
     townCacheSize: number;
+    /** 住所データへのリクエストを変形するオプション。 interfaceVersion === 2 で有効 */
+    transformRequest?: TransformRequestFunction;
     geoloniaApiKey?: string;
 }
 export declare const config: Config;
 /**
  * 住所の正規化結果として戻されるオブジェクト
  */
-export interface NormalizeResult {
+interface NormalizeResult_v1 {
     /** 都道府県 */
     pref: string;
     /** 市区町村 */
@@ -27,7 +44,7 @@ export interface NormalizeResult {
     addr: string;
     /** 緯度。データが存在しない場合は null */
     lat: number | null;
-    /** 軽度。データが存在しない場合は null */
+    /** 経度。データが存在しない場合は null */
     lng: number | null;
     /**
      * 住所文字列をどこまで判別できたかを表す正規化レベル
@@ -40,6 +57,32 @@ export interface NormalizeResult {
      */
     level: number;
 }
+declare type NormalizeResult_v2 = {
+    /** 都道府県 */
+    pref: string;
+    /** 市区町村 */
+    city: string;
+    /** 町丁目 */
+    town: string;
+    /** 住居表示または地番 */
+    addr: string;
+    /** 正規化後の住所文字列 */
+    other?: string;
+    /** 緯度。データが存在しない場合は null */
+    lat: number | null;
+    /** 経度。データが存在しない場合は null */
+    lng: number | null;
+    /**
+     * 住所文字列をどこまで判別できたかを表す正規化レベル
+     * - 0 - 都道府県も判別できなかった。
+     * - 1 - 都道府県まで判別できた。
+     * - 2 - 市区町村まで判別できた。
+     * - 3 - 町丁目まで判別できた。
+     * - 8 - 住居表示住所の街区符号・住居番号までの判別または地番住所の判別ができた。
+     */
+    level: number;
+};
+export declare type NormalizeResult = NormalizeResult_v1 | NormalizeResult_v2;
 /**
  * 正規化関数の {@link normalize} のオプション
  */
@@ -64,7 +107,7 @@ export interface Option {
  * @see https://github.com/geolonia/normalize-japanese-addresses#normalizeaddress-string
  */
 export declare type Normalizer = (input: string, option?: Option) => Promise<NormalizeResult>;
-export declare type FetchLike = (input: string) => Promise<Response | {
+export declare type FetchLike = (input: string, requestQuery?: TransformRequestQuery) => Promise<Response | {
     json: () => Promise<unknown>;
 }>;
 /**
@@ -74,3 +117,4 @@ export declare const __internals: {
     fetch: FetchLike;
 };
 export declare const normalize: Normalizer;
+export {};

data/js/node_modules/@geolonia/normalize-japanese-addresses/package.json

@@ -1,19 +1,23 @@
 {
   "name": "@geolonia/normalize-japanese-addresses",
-  "version": "2.7.3",
+  "version": "2.9.2",
   "description": "",
   "browser": "./dist/main-browser.js",
   "main": "./dist/main-node.js",
   "types": "./dist/normalize.d.ts",
   "scripts": {
-    "test": "npm run test:main && npm run test:addresses && npm run test:node && npm run test:residential",
+    "test": "npm run test:main && npm run test:addresses && npm run test:node:platform && npm run test:advanced",
+    "test:node:platform": "npm run test:node-win || npm run test:node",
     "test:main": "jest test/main.test.ts",
     "test:addresses": "jest test/addresses.test.ts",
-    "test:residential": "jest test/residential.test.ts --runInBand",
-    "test:node": "curl -sL https://github.com/geolonia/japanese-addresses/archive/refs/heads/master.tar.gz | tar xvfz - -C ./test > /dev/null 2>&1 && jest test/fs.test.ts",
+    "test:advanced": "jest test/advanced --runInBand",
+    "test:util": "jest test/util.test.ts",
+    "test:node": "curl -sL https://github.com/geolonia/japanese-addresses/archive/refs/heads/master.tar.gz | tar xvfz - -C ./test > nul 2>&1 && jest test/fs.test.ts",
+    "test:node-win": "curl -sL https://github.com/geolonia/japanese-addresses/archive/refs/heads/master.tar.gz -o master.tar.gz && 7z x master.tar.gz -y -o./ && 7z x ./master.tar -y -o./test && del master.tar.gz master.tar && jest test/fs.test.ts",
     "test:generate-test-data": "npx ts-node -O '{\"module\":\"commonjs\"}' test/build-test-data.ts > test/addresses.csv",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.test.ts\" --fix",
-    "build": "rm -rf ./dist && rollup -c ./rollup.config.ts"
+    "build": "npm run clean && rollup -c rollup.config.ts",
+    "clean": "node -e \"const fs = require('fs'); try { fs.rmSync('dist', { recursive: true, force: true }) } catch (err) { console.error(err) }\""
   },
   "author": "",
   "license": "MIT",

data/js/node_modules/@geolonia/normalize-japanese-addresses/rollup.config.ts

@@ -25,4 +25,13 @@ export default [
     output: { file: pkg.main, format: 'cjs' },
     plugins: [typescript()],
   },
+  {
+    input: 'src/main-es.ts',
+    output: {
+      dir: 'dist',
+      name: 'normalize',
+      format: 'esm',
+    },
+    plugins: [typescript(), resolve({ browser: true }), commonjs()],
+  },
 ]

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/config.ts

@@ -4,6 +4,7 @@ export const gh_pages_endpoint =
   'https://geolonia.github.io/japanese-addresses/api/ja'
 
 export const currentConfig: Config = {
+  interfaceVersion: 1,
   japaneseAddressesApi: gh_pages_endpoint,
   townCacheSize: 1_000,
 }