Merge pull request #356 from YuukiToriyama/feature/revert-multi-module/master

マルチクレート化の切り戻しをrelease/v0.1.7にマージ

Author: YuukiToriyama

.github/workflows/run-test.yaml

@@ -19,19 +19,6 @@ jobs:
           shared-key: 'test-on-pr'
           key: 'main'
           save-if: ${{ github.ref == 'refs/heads/main' }} # mainブランチにコミットが追加された時のみキャッシュを保存する
-      - name: Test domain
-        working-directory: domain
-        run: cargo test
-      - name: Test service
-        working-directory: service
-        run: |
-          cargo test
-          cargo test --features=blocking
-      - name: Test repository
-        working-directory: repository
-        run: |
-          cargo test
-          cargo test --features=blocking
       - name: Test core
         working-directory: core
         run: |

Cargo.toml

@@ -4,9 +4,6 @@ members = [
     "wasm",
     "python",
     "tests",
-    "domain",
-    "service",
-    "repository",
 ]
 resolver = "2"
 

core/Cargo.toml

@@ -16,18 +16,20 @@ crate-type = ["rlib", "cdylib"]
 
 [features]
 default = []
-blocking = ["repository/blocking"]
+blocking = ["reqwest/blocking"]
 
 [dependencies]
-domain = { path = "../domain" }
-repository = { path = "../repository" }
 itertools = "0.13.0"
 js-sys = "0.3.67"
 nom = "7.1.3"
 rapidfuzz = "0.5.0"
 regex = "1.10.2"
 serde.workspace = true
+reqwest = { version = "0.12.5", default-features = false, features = ["json", "rustls-tls"] }
 
 [dev-dependencies]
 tokio.workspace = true
 wasm-bindgen-test = { workspace = true }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+mockito = "1.4.0" # mockitoがwasm32に対応していないため

core/src/api.rs

@@ -1,10 +1,10 @@
-pub use repository::geolonia::city_master_api;
-pub use repository::geolonia::prefecture_master_api;
+pub use crate::repository::geolonia::city_master_api;
+pub use crate::repository::geolonia::prefecture_master_api;
 
-use domain::geolonia::entity::{City, Prefecture};
-use domain::geolonia::error::Error;
-use repository::geolonia::city_master_api::CityMasterApi;
-use repository::geolonia::prefecture_master_api::PrefectureMasterApi;
+use crate::domain::geolonia::entity::{City, Prefecture};
+use crate::domain::geolonia::error::Error;
+use crate::repository::geolonia::city_master_api::CityMasterApi;
+use crate::repository::geolonia::prefecture_master_api::PrefectureMasterApi;
 
 #[derive(Default)]
 pub struct AsyncApi {

domain/src/lib.rs renamed to core/src/domain.rs

@@ -1,5 +1,5 @@
+pub use crate::domain::geolonia::entity::Address;
+pub use crate::domain::geolonia::entity::City;
+pub use crate::domain::geolonia::entity::Prefecture;
+pub use crate::domain::geolonia::entity::Town;
 pub use crate::parser::ParseResult;
-pub use domain::geolonia::entity::Address;
-pub use domain::geolonia::entity::City;
-pub use domain::geolonia::entity::Prefecture;
-pub use domain::geolonia::entity::Town;

domain/src/geolonia.rs renamed to core/src/domain/geolonia.rs

@@ -4,8 +4,11 @@ compile_error! {
 }
 
 pub mod api;
+mod domain;
 #[deprecated(since = "0.1.6", note = "This module will be deleted in v0.2")]
 pub mod entity;
 pub mod parser;
+mod repository;
+mod service;
 mod tokenizer;
 mod util;