YuukiToriyama · YuukiToriyama · Mar 22, 2024 · Feb 25, 2024 · Feb 25, 2024 · Feb 25, 2024
diff --git a/.github/scripts/free_test.js b/.github/scripts/free_test.js
@@ -1,4 +1,4 @@
-const {Parser} = require("../../pkg");
+const {Parser} = require("../../wasm/pkg");
 const readline = require("readline");
 const fs = require("fs");
 

diff --git a/.github/workflows/free-test.yaml b/.github/workflows/free-test.yaml
@@ -26,8 +26,10 @@ jobs:
             return commit.data.object.sha
 
       - name: Install wasm-pack
+        working-directory: wasm
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - name: Build wasm module
+        working-directory: wasm
         run: wasm-pack build --target nodejs --scope toriyama
 
       - name: Setup Node.js

diff --git a/.github/workflows/ghpages.yaml b/.github/workflows/ghpages.yaml
@@ -17,14 +17,16 @@ jobs:
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - name: Unit Testing for Wasm module
+        working-directory: wasm
         run: wasm-pack test --firefox --headless
       - name: Build wasm module
-        run: wasm-pack build --target web --scope toriyama --features debug
+        working-directory: wasm
+        run: wasm-pack build --target web --scope toriyama --out-name japanese_address_parser --features debug
       - name: Move files
         run: |
           mkdir ./publish
-          rm ./pkg/.gitignore
-          mv ./pkg ./publish
+          rm ./wasm/pkg/.gitignore
+          mv ./wasm/pkg ./publish
           mv ./public ./publish
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3

diff --git a/.github/workflows/upload-cratesio.yaml b/.github/workflows/upload-cratesio.yaml
@@ -8,6 +8,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: core
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/upload-npmjs.yaml b/.github/workflows/upload-npmjs.yaml
@@ -8,6 +8,9 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: wasm
     steps:
       - uses: actions/checkout@v4
 
@@ -22,7 +25,24 @@ jobs:
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
       - name: Build wasm module
-        run: wasm-pack build --release --target web --scope toriyama
+        run: wasm-pack build --release --target web --scope toriyama --out-name japanese_address_parser
+
+      # package.jsonの`name`が`@toriyama/wasm`になっているため、`@toriyama/japanese-address-parser`に書き換える
+      - name: Check if jq command is available
+        run: |
+          which jq
+          jq --version
+
+      - name: Edit package.name
+        run: |
+          cat pkg/package.json | jq '.name = "@toriyama/japanese-address-parser"' > tmp.json
+          mv tmp.json pkg/package.json
+
+      - name: Check if package.name was changed
+        run: |
+          # package.nameが正しく置換されているかを確認している。
+          # 正しく置換されていればJSONファイルを表示し、置換されていなければエラーを返しJobを中断させる。
+          cat pkg/package.json | jq 'if .name == "@toriyama/japanese-address-parser" then . else error("package.nameが正しく置換されていない") end'
 
       - name: Upload wasm to npmjs.com
         run: |

diff --git a/.github/workflows/wasm-pack-test.yaml b/.github/workflows/wasm-pack-test.yaml
@@ -8,6 +8,9 @@ on:
 jobs:
   wasm-pack:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: wasm
     steps:
       - uses: actions/checkout@v4
       - name: Install wasm-pack

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,39 +1,22 @@
-[package]
-name = "japanese-address-parser"
+[workspace]
+members = [
+    "core",
+    "wasm",
+    "tests"
+]
+resolver = "2"
+
+[workspace.package]
 version = "0.1.0-beta.10"
 edition = "2021"
 description = "A Rust Library to parse japanses addresses."
-authors = ["Yuuki Toriyama <[email protected]>"]
 repository = "https://github.com/YuukiToriyama/japanese-address-parser"
+authors = ["Yuuki Toriyama <[email protected]>"]
 license = "MIT"
 keywords = ["parser", "geo", "wasm"]
 categories = ["parser-implementations", "wasm"]
-exclude = [
-    "public/*",
-    "tests/*",
-    ".github/*",
-]
-
-[lib]
-crate-type = ["rlib", "cdylib"]
 
-[features]
-debug = []
-
-[dependencies]
-console_error_panic_hook = "0.1.7"
-itertools = "0.12.0"
-js-sys = "0.3.67"
-nom = "7.1.3"
-regex = "1.10.2"
-reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls", "blocking"] }
-serde = { version = "1.0.192", features = ["derive"] }
-serde-wasm-bindgen = "0.6.1"
+[workspace.dependencies]
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"
-
-[dev-dependencies]
-csv = "1.3.0"
-test-case = "3.3.1"
-tokio = { version = "1.35.1", features = ["rt", "macros"] }
 wasm-bindgen-test = "0.3.38"
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "japanese-address-parser"
+version.workspace = true
+edition.workspace = true
+description.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
+readme = "../README.md"
+keywords.workspace = true
+categories.workspace = true
+
+[lib]
+crate-type = ["rlib", "cdylib"]
+
+[dependencies]
+itertools = "0.12.0"
+js-sys = "0.3.67"
+nom = "7.1.3"
+regex = "1.10.2"
+reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls", "blocking"] }
+serde = { version = "1.0.192", features = ["derive"] }
+
+[dev-dependencies]
+test-case = "3.3.1"
+tokio = { version = "1.35.1", features = ["rt", "macros"] }
+wasm-bindgen-test = { workspace = true }
diff --git a/core/LICENSE b/core/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 ToriChan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/api.rs → core/src/api.rs b/src/api.rs → core/src/api.rs
diff --git a/src/api/city_master_api.rs → core/src/api/city_master_api.rs b/src/api/city_master_api.rs → core/src/api/city_master_api.rs
diff --git a/src/api/prefecture_master_api.rs → core/src/api/prefecture_master_api.rs b/src/api/prefecture_master_api.rs → core/src/api/prefecture_master_api.rs
diff --git a/src/entity.rs → core/src/entity.rs b/src/entity.rs → core/src/entity.rs
diff --git a/src/err.rs → core/src/err.rs b/src/err.rs → core/src/err.rs
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -0,0 +1,5 @@
+pub mod api;
+pub mod entity;
+mod err;
+pub mod parser;
+mod util;
diff --git a/src/parser.rs → core/src/parser.rs b/src/parser.rs → core/src/parser.rs
diff --git a/src/parser/adapter.rs → core/src/parser/adapter.rs b/src/parser/adapter.rs → core/src/parser/adapter.rs
diff --git a/...adapter/orthographical_variant_adapter.rs → ...adapter/orthographical_variant_adapter.rs b/...adapter/orthographical_variant_adapter.rs → ...adapter/orthographical_variant_adapter.rs
diff --git a/src/parser/filter.rs → core/src/parser/filter.rs b/src/parser/filter.rs → core/src/parser/filter.rs
diff --git a/src/parser/filter/fullwidth_character.rs → .../src/parser/filter/fullwidth_character.rs b/src/parser/filter/fullwidth_character.rs → .../src/parser/filter/fullwidth_character.rs
diff --git a/...parser/filter/invalid_town_name_format.rs → ...parser/filter/invalid_town_name_format.rs b/...parser/filter/invalid_town_name_format.rs → ...parser/filter/invalid_town_name_format.rs
diff --git a/src/parser/filter/non_kanji_block_number.rs → ...c/parser/filter/non_kanji_block_number.rs b/src/parser/filter/non_kanji_block_number.rs → ...c/parser/filter/non_kanji_block_number.rs
diff --git a/src/parser/read_city.rs → core/src/parser/read_city.rs b/src/parser/read_city.rs → core/src/parser/read_city.rs
diff --git a/src/parser/read_house_number.rs → core/src/parser/read_house_number.rs b/src/parser/read_house_number.rs → core/src/parser/read_house_number.rs
diff --git a/src/parser/read_prefecture.rs → core/src/parser/read_prefecture.rs b/src/parser/read_prefecture.rs → core/src/parser/read_prefecture.rs
diff --git a/src/parser/read_town.rs → core/src/parser/read_town.rs b/src/parser/read_town.rs → core/src/parser/read_town.rs
diff --git a/src/util.rs → core/src/util.rs b/src/util.rs → core/src/util.rs
diff --git a/src/util/converter.rs → core/src/util/converter.rs b/src/util/converter.rs → core/src/util/converter.rs
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "tests"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+publish = false
+
+[[test]]
+name = "integration_tests"
+path = "integration_tests.rs"
+
+[dev-dependencies]
+csv = "1.3.0"
+japanese-address-parser = { path = "../core"}
+serde = { version = "1.0.197", features = ["derive"] }
+tokio = { version = "1.35.1", features = ["rt", "macros"] }
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -1,6 +1,6 @@
 use csv::ReaderBuilder;
 use japanese_address_parser::api::{Api, ApiImpl};
-use japanese_address_parser::parser;
+use japanese_address_parser::parser::parse;
 use serde::Deserialize;
 use std::fs::File;
 use std::panic;
@@ -30,7 +30,7 @@ pub async fn run_data_driven_tests(file_path: &str) {
     let mut success_count = 0;
     for record in &records {
         let api = ApiImpl::new();
-        let result = parser::parse(api, &record.address).await;
+        let result = parse(api, &record.address).await;
 
         let test_result = panic::catch_unwind(|| {
             assert_eq!(result.address.prefecture, record.prefecture);

diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -5,33 +5,31 @@ mod common;
 #[tokio::test]
 #[ignore]
 async fn 県庁所在地のデータテスト() {
-    run_data_driven_tests("./tests/test_data/県庁所在地の住所データ.csv").await
+    run_data_driven_tests("./test_data/県庁所在地の住所データ.csv").await
 }
 
 #[tokio::test]
 async fn 市区町村名レベルでの表記ゆれ() {
-    run_data_driven_tests("./tests/test_data/市区町村名レベルでの表記ゆれ.csv").await
+    run_data_driven_tests("./test_data/市区町村名レベルでの表記ゆれ.csv").await
 }
 
 #[tokio::test]
 async fn 異字体旧字体への対応テスト() {
-    run_data_driven_tests("./tests/test_data/異字体旧字体への対応.csv").await
+    run_data_driven_tests("./test_data/異字体旧字体への対応.csv").await
 }
 
 #[tokio::test]
 async fn 丁目が算用数字の場合への対応テスト() {
-    run_data_driven_tests("./tests/test_data/丁目が算用数字の場合への対応.csv").await
+    run_data_driven_tests("./test_data/丁目が算用数字の場合への対応.csv").await
 }
 
 #[tokio::test]
 async fn 住居表示実施済みの住所において正式でない表記への対応テスト() {
-    run_data_driven_tests(
-        "./tests/test_data/住居表示実施済みの住所において正式でない表記への対応.csv",
-    )
-    .await
+    run_data_driven_tests("./test_data/住居表示実施済みの住所において正式でない表記への対応.csv")
+        .await
 }
 
 #[tokio::test]
 async fn 大字表記省略への対応テスト() {
-    run_data_driven_tests("./tests/test_data/大字表記省略への対応.csv").await
+    run_data_driven_tests("./test_data/大字表記省略への対応.csv").await
 }
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "wasm"
+version.workspace = true
+edition.workspace = true
+description.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
+readme = "../README.md"
+keywords.workspace = true
+categories.workspace = true
+
+[lib]
+crate-type = ["cdylib"]
+
+[features]
+debug = []
+
+[dependencies]
+console_error_panic_hook = "0.1.7"
+japanese-address-parser = { path = "../core" }
+serde-wasm-bindgen = "0.6.1"
+wasm-bindgen = { workspace = true }
+wasm-bindgen-futures = { workspace = true }
diff --git a/wasm/LICENSE b/wasm/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 ToriChan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/lib.rs → wasm/src/lib.rs b/src/lib.rs → wasm/src/lib.rs
@@ -1,13 +1,8 @@
-use crate::api::{Api, ApiImpl};
+use japanese_address_parser::api::{Api, ApiImpl};
+use japanese_address_parser::parser;
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen::JsValue;
 
-pub mod api;
-pub mod entity;
-mod err;
-pub mod parser;
-mod util;
-
 #[wasm_bindgen(typescript_custom_section)]
 const TYPESCRIPT_TYPE: &'static str = r#"
 export interface ParseResult {
@@ -40,7 +35,7 @@
 #[wasm_bindgen]
 impl Parser {
    #[wasm_bindgen(constructor)]
    pub fn new() -> Self {
        Parser {}
    }