japanese_address_parser 3.0.5 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d28fd38a1eb9e6e7c3a6a8898bc94d22362d37682c484054f2590008a2323c1f
-  data.tar.gz: 8eee70a4afd90a33efba50d1e58a5598df1fe6f08dcb172cab0091aedf2df0c3
+  metadata.gz: 53a31a273123299a2e48aea1fa82e3bd4d0d33d7e8f1a694ef39a1926004576a
+  data.tar.gz: 21198c935bf0dc0892f5ff395403ef4aaa08d03f60d576e7cfbeaa556ae9ebed
 SHA512:
-  metadata.gz: a8619ac4af9c11b814e4dd745445f783a6aadbda4bf0ab1c455015dcee0ce2091099a2a8c7ac6dcc645058bc20cfc25cf5f4bf680a4e713c9e4a566420485f84
-  data.tar.gz: 646b35be9a561c4ba8e4429e4d83ab06dfe461e5752a2ff9851dd5fea78cca2df511c484b6c758ca18b1be0b6c3419c66b73a7cb19341eba13db4768eb0d1bab
+  metadata.gz: 742a64618c177ef65bf6dcb0677993ba531f734efda24b81dc2a5f0839aef47ae42c57e829b5c9a3e9b984dbb4b1960303a1b05c8d88dcfc516b473948f8219e
+  data.tar.gz: dab2e5dedbeda742af992a5b9574697523f9816c9765741c8f6b9eec6b06723c98247f9248d20a61aeebdcaf541d09d734c2a30a12ca22a47b5b2f1ab2da5694

data/CHANGELOG.md

@@ -9,8 +9,6 @@ Change Log の形式は [Keep a Changelog](http://keepachangelog.com/) に従い
 
 ### Changed
 
-- [#79](https://github.com/yamat47/japanese_address_parser/pull/79) Bump activesupport from 7.0.4 to 7.0.4.1([@yamat47](https://github.com/yamat47))
-
 ### Deprecated
 
 ### Removed
@@ -19,6 +17,28 @@ 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
+
+- [#79](https://github.com/yamat47/japanese_address_parser/pull/79) Bump activesupport from 7.0.4 to 7.0.4.1([@yamat47](https://github.com/yamat47))
+- [#84](https://github.com/yamat47/japanese_address_parser/pull/84) Bump activesupport from 7.0.4.1 to 7.0.4.3([@yamat47](https://github.com/yamat47))
+- [#85](https://github.com/yamat47/japanese_address_parser/pull/85) CIに必要な権限を追加した。([@yamat47](https://github.com/yamat47))
+
+### Removed
+
+- [#89](https://github.com/yamat47/japanese_address_parser/pull/89) 最新のRubyでCIを実行するのを一時的に停止した。([@yamat47](https://github.com/yamat47))
+
 ## [3.0.5]
 ### Changed
 

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    japanese_address_parser (3.0.5)
+    japanese_address_parser (3.1.1)
       schmooze
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.1)
+    activesupport (7.0.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     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.17.0)
+    minitest (5.19.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -81,7 +81,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     typeprof (0.21.3)
       rbs (>= 1.8.1)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
 

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

@@ -1,5 +1,90 @@
 {
+  "name": "japanese_address_parser",
   "lockfileVersion": 3,
   "requires": true,
-  "packages": {}
+  "packages": {
+    "node_modules/@geolonia/japanese-numeral": {
+      "version": "0.1.16",
+      "resolved": "https://registry.npmjs.org/@geolonia/japanese-numeral/-/japanese-numeral-0.1.16.tgz",
+      "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
+    },
+    "node_modules/@geolonia/normalize-japanese-addresses": {
+      "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",
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "node_modules/isomorphic-unfetch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
+      "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "unfetch": "^4.2.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/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "node_modules/unfetch": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
+      "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA=="
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
 }

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;
     };
@@ -402,8 +408,8 @@
     };
 
     // 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]];
@@ -422,6 +428,7 @@
         _str = _str
             .replace(/三栄町|四谷三栄町/g, '(三栄町|四谷三栄町)')
             .replace(/鬮野川|くじ野川|くじの川/g, '(鬮野川|くじ野川|くじの川)')
+            .replace(/柿碕町|柿さき町/g, '(柿碕町|柿さき町)')
             .replace(/通り|とおり/g, '(通り|とおり)')
             .replace(/埠頭|ふ頭/g, '(埠頭|ふ頭)')
             .replace(/番町|番丁/g, '(番町|番丁)')
@@ -1227,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;
@@ -1236,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
                     ;
@@ -1290,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()];
@@ -1305,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];
@@ -1333,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];
@@ -1367,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);
@@ -1376,9 +1423,9 @@
         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') {
@@ -1386,7 +1433,7 @@
                     }
                     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(/^京都市/);
@@ -1452,6 +1499,18 @@
                         }));
                         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];
             }
@@ -1586,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:
@@ -1732,7 +1813,7 @@
                                 });
                             })
                                 .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) {
@@ -1749,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));
                             })
@@ -1762,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);
@@ -1776,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,
@@ -1801,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.d.ts

@@ -0,0 +1,3 @@
+import * as Normalize from './normalize';
+export declare const config: Normalize.Config;
+export declare const normalize: Normalize.Normalizer;