refactor: re-export module items to shorten import paths

8 files changed, 38 insertions, 28 deletions

diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs
index 72ffabf..2e06e4d 100644
--- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs
+++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs
@@ -1,11 +1,11 @@
 //! ref: composer/src/Composer/Package/Archiver/ArchivableFilesFinder.php
 
-use crate::package::archiver::composer_exclude_filter::ComposerExcludeFilter;
-use crate::package::archiver::git_exclude_filter::GitExcludeFilter;
-use crate::util::filesystem::Filesystem;
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::symfony::component::finder::finder::Finder;
-use shirabe_external_packages::symfony::component::finder::spl_file_info::SplFileInfo;
+use crate::package::archiver::ComposerExcludeFilter;
+use crate::package::archiver::GitExcludeFilter;
+use crate::util::Filesystem;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::symfony::component::finder::Finder;
+use shirabe_external_packages::symfony::component::finder::SplFileInfo;
 use shirabe_php_shim::{RuntimeException, preg_quote, realpath};
 
 pub struct ArchivableFilesFinder {
diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs
index 094ddc3..390efc4 100644
--- a/crates/shirabe/src/package/archiver/archive_manager.rs
+++ b/crates/shirabe/src/package/archiver/archive_manager.rs
@@ -1,22 +1,22 @@
 //! ref: composer/src/Composer/Package/Archiver/ArchiveManager.php
 
 use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
+use shirabe_external_packages::composer::pcre::Preg;
 use shirabe_php_shim::{
     InvalidArgumentException, RuntimeException, bin2hex, file_exists, random_bytes, realpath,
     sys_get_temp_dir,
 };
 
-use crate::downloader::download_manager::DownloadManager;
-use crate::json::json_file::JsonFile;
-use crate::package::archiver::archiver_interface::ArchiverInterface;
-use crate::package::archiver::phar_archiver::PharArchiver;
-use crate::package::archiver::zip_archiver::ZipArchiver;
-use crate::package::complete_package_interface::CompletePackageInterface;
-use crate::package::root_package_interface::RootPackageInterface;
-use crate::util::filesystem::Filesystem;
+use crate::downloader::DownloadManager;
+use crate::json::JsonFile;
+use crate::package::CompletePackageInterface;
+use crate::package::RootPackageInterface;
+use crate::package::archiver::ArchiverInterface;
+use crate::package::archiver::PharArchiver;
+use crate::package::archiver::ZipArchiver;
+use crate::util::Filesystem;
+use crate::util::SyncHelper;
 use crate::util::r#loop::Loop;
-use crate::util::sync_helper::SyncHelper;
 
 pub struct ArchiveManager {
     pub(crate) download_manager: std::rc::Rc<std::cell::RefCell<DownloadManager>>,
diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs
index 1a716d0..d3c0da1 100644
--- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs
+++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php
 
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::symfony::component::finder::glob::Glob;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::symfony::component::finder::Glob;
 
 #[derive(Debug)]
 pub struct BaseExcludeFilterBase {
diff --git a/crates/shirabe/src/package/archiver/composer_exclude_filter.rs b/crates/shirabe/src/package/archiver/composer_exclude_filter.rs
index 979e67e..e685a4a 100644
--- a/crates/shirabe/src/package/archiver/composer_exclude_filter.rs
+++ b/crates/shirabe/src/package/archiver/composer_exclude_filter.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/Package/Archiver/ComposerExcludeFilter.php
 
-use super::base_exclude_filter::BaseExcludeFilterBase;
+use super::BaseExcludeFilterBase;
 
 #[derive(Debug)]
 pub struct ComposerExcludeFilter {
diff --git a/crates/shirabe/src/package/archiver/git_exclude_filter.rs b/crates/shirabe/src/package/archiver/git_exclude_filter.rs
index 1a0ec4d..ffa349c 100644
--- a/crates/shirabe/src/package/archiver/git_exclude_filter.rs
+++ b/crates/shirabe/src/package/archiver/git_exclude_filter.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/Package/Archiver/GitExcludeFilter.php
 
-use crate::package::archiver::base_exclude_filter::BaseExcludeFilterBase;
-use shirabe_external_packages::composer::pcre::preg::Preg;
+use crate::package::archiver::BaseExcludeFilterBase;
+use shirabe_external_packages::composer::pcre::Preg;
 use std::path::Path;
 
 pub struct GitExcludeFilter {
diff --git a/crates/shirabe/src/package/archiver/mod.rs b/crates/shirabe/src/package/archiver/mod.rs
index ecf86c8..b4df5b0 100644
--- a/crates/shirabe/src/package/archiver/mod.rs
+++ b/crates/shirabe/src/package/archiver/mod.rs
@@ -7,3 +7,13 @@ pub mod composer_exclude_filter;
 pub mod git_exclude_filter;
 pub mod phar_archiver;
 pub mod zip_archiver;
+
+pub use archivable_files_filter::*;
+pub use archivable_files_finder::*;
+pub use archive_manager::*;
+pub use archiver_interface::*;
+pub use base_exclude_filter::*;
+pub use composer_exclude_filter::*;
+pub use git_exclude_filter::*;
+pub use phar_archiver::*;
+pub use zip_archiver::*;
diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs
index 17bc05b..bf5332a 100644
--- a/crates/shirabe/src/package/archiver/phar_archiver.rs
+++ b/crates/shirabe/src/package/archiver/phar_archiver.rs
@@ -6,9 +6,9 @@ use shirabe_php_shim::{
     file_put_contents, function_exists, gzcompress, pack, str_repeat, strrpos, unlink,
 };
 
-use crate::package::archiver::archivable_files_filter::ArchivableFilesFilter;
-use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder;
-use crate::package::archiver::archiver_interface::ArchiverInterface;
+use crate::package::archiver::ArchivableFilesFilter;
+use crate::package::archiver::ArchivableFilesFinder;
+use crate::package::archiver::ArchiverInterface;
 
 fn formats() -> IndexMap<&'static str, i64> {
     let mut m = IndexMap::new();
diff --git a/crates/shirabe/src/package/archiver/zip_archiver.rs b/crates/shirabe/src/package/archiver/zip_archiver.rs
index a5dd4f4..79d714b 100644
--- a/crates/shirabe/src/package/archiver/zip_archiver.rs
+++ b/crates/shirabe/src/package/archiver/zip_archiver.rs
@@ -1,9 +1,9 @@
 //! ref: composer/src/Composer/Package/Archiver/ZipArchiver.php
 
-use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder;
-use crate::package::archiver::archiver_interface::ArchiverInterface;
-use crate::util::filesystem::Filesystem;
-use crate::util::platform::Platform;
+use crate::package::archiver::ArchivableFilesFinder;
+use crate::package::archiver::ArchiverInterface;
+use crate::util::Filesystem;
+use crate::util::Platform;
 use indexmap::IndexMap;
 use shirabe_php_shim::{
     PhpMixed, RuntimeException, ZipArchive, class_exists, fileperms, method_exists, pack, realpath,