refactor: re-export module items to shorten import paths

6 files changed, 43 insertions, 37 deletions

diff --git a/crates/shirabe/src/io/base_io.rs b/crates/shirabe/src/io/base_io.rs
index f2b7ee5..f778336 100644
--- a/crates/shirabe/src/io/base_io.rs
+++ b/crates/shirabe/src/io/base_io.rs
@@ -1,13 +1,13 @@
 //! ref: composer/src/Composer/IO/BaseIO.php
 
 use crate::config::Config;
+use crate::io::IOInterface;
 use crate::io::io_interface;
-use crate::io::io_interface::IOInterface;
-use crate::util::process_executor::ProcessExecutor;
-use crate::util::silencer::Silencer;
+use crate::util::ProcessExecutor;
+use crate::util::Silencer;
 use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::psr::log::log_level::LogLevel;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::psr::log::LogLevel;
 use shirabe_php_shim::{
     JSON_INVALID_UTF8_IGNORE, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PhpMixed,
     UnexpectedValueException, array_merge, in_array, json_encode_ex,
diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs
index ce4070a..867eb0e 100644
--- a/crates/shirabe/src/io/buffer_io.rs
+++ b/crates/shirabe/src/io/buffer_io.rs
@@ -1,15 +1,15 @@
 //! ref: composer/src/Composer/IO/BufferIO.php
 
-use crate::io::console_io::ConsoleIO;
+use crate::io::ConsoleIO;
 use anyhow::Result;
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet;
-use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::component::console::input::string_input::StringInput;
-use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface;
-use shirabe_external_packages::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface;
-use shirabe_external_packages::symfony::console::helper::question_helper::QuestionHelper;
-use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::symfony::component::console::helper::HelperSet;
+use shirabe_external_packages::symfony::component::console::input::InputInterface;
+use shirabe_external_packages::symfony::component::console::input::StringInput;
+use shirabe_external_packages::symfony::component::console::output::OutputInterface;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatterInterface;
+use shirabe_external_packages::symfony::console::helper::QuestionHelper;
+use shirabe_external_packages::symfony::console::output::StreamOutput;
 use shirabe_php_shim::{
     PHP_EOL, PhpMixed, RuntimeException, fopen, fseek, fwrite, rewind, stream_get_contents,
     strip_tags,
@@ -71,16 +71,16 @@ impl BufferIO {
         let output = Preg::replace_callback(
             r"{(?<=^|\n|\x08)(.+?)(\x08+)}",
             |matches: &indexmap::IndexMap<
-                shirabe_external_packages::composer::pcre::preg::CaptureKey,
+                shirabe_external_packages::composer::pcre::CaptureKey,
                 String,
             >|
              -> String {
                 let empty = String::new();
                 let g1 = matches
-                    .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(1))
+                    .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(1))
                     .unwrap_or(&empty);
                 let g2 = matches
-                    .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(2))
+                    .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(2))
                     .unwrap_or(&empty);
                 let pre = strip_tags(g1);
 
@@ -131,7 +131,7 @@ impl BufferIO {
 
 // TODO(phase-b): PHP `class BufferIO extends ConsoleIO` — delegate all IOInterface,
 // LoggerInterface, and BaseIO methods to `self.inner` (ConsoleIO).
-impl shirabe_external_packages::psr::log::logger_interface::LoggerInterface for BufferIO {
+impl shirabe_external_packages::psr::log::LoggerInterface for BufferIO {
     fn emergency(&self, message: &str, context: &[(&str, &str)]) {
         self.inner.emergency(message, context)
     }
@@ -161,7 +161,7 @@ impl shirabe_external_packages::psr::log::logger_interface::LoggerInterface for
     }
 }
 
-impl crate::io::io_interface::IOInterface for BufferIO {
+impl crate::io::IOInterface for BufferIO {
     fn is_interactive(&self) -> bool {
         self.inner.is_interactive()
     }
@@ -261,7 +261,7 @@ impl crate::io::io_interface::IOInterface for BufferIO {
     }
 }
 
-impl crate::io::base_io::BaseIO for BufferIO {
+impl crate::io::BaseIO for BufferIO {
     fn authentications(
         &self,
     ) -> &indexmap::IndexMap<String, indexmap::IndexMap<String, Option<String>>> {
diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs
index 2182c37..b4bae47 100644
--- a/crates/shirabe/src/io/console_io.rs
+++ b/crates/shirabe/src/io/console_io.rs
@@ -4,18 +4,18 @@ use crate::config::Config;
 use crate::io::io_interface;
 use indexmap::IndexMap;
 use indexmap::indexmap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::psr::log::logger_interface::LoggerInterface;
-use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet;
-use shirabe_external_packages::symfony::component::console::helper::progress_bar::ProgressBar;
-use shirabe_external_packages::symfony::component::console::helper::table::Table;
-use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface;
-use shirabe_external_packages::symfony::component::console::output::console_output_interface::ConsoleOutputInterface;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::psr::log::LoggerInterface;
+use shirabe_external_packages::symfony::component::console::helper::HelperSet;
+use shirabe_external_packages::symfony::component::console::helper::ProgressBar;
+use shirabe_external_packages::symfony::component::console::helper::Table;
+use shirabe_external_packages::symfony::component::console::input::InputInterface;
+use shirabe_external_packages::symfony::component::console::output::ConsoleOutputInterface;
 use shirabe_external_packages::symfony::component::console::output::output_interface::{
     self as output_interface, OutputInterface,
 };
-use shirabe_external_packages::symfony::component::console::question::choice_question::ChoiceQuestion;
-use shirabe_external_packages::symfony::component::console::question::question::Question;
+use shirabe_external_packages::symfony::component::console::question::ChoiceQuestion;
+use shirabe_external_packages::symfony::component::console::question::Question;
 use shirabe_php_shim::{
     PhpMixed, array_filter, array_keys, array_search, count, function_exists, implode, in_array,
     is_array, is_string, mb_check_encoding, mb_convert_encoding, microtime, sprintf, str_repeat,
@@ -23,10 +23,10 @@ use shirabe_php_shim::{
 };
 use std::cell::RefCell;
 
-use crate::io::base_io::BaseIO;
-use crate::io::io_interface::IOInterface;
-use crate::question::strict_confirmation_question::StrictConfirmationQuestion;
-use crate::util::silencer::Silencer;
+use crate::io::BaseIO;
+use crate::io::IOInterface;
+use crate::question::StrictConfirmationQuestion;
+use crate::util::Silencer;
 
 /// The Input/Output helper.
 pub struct ConsoleIO {
diff --git a/crates/shirabe/src/io/io_interface.rs b/crates/shirabe/src/io/io_interface.rs
index f014594..1d97700 100644
--- a/crates/shirabe/src/io/io_interface.rs
+++ b/crates/shirabe/src/io/io_interface.rs
@@ -2,7 +2,7 @@
 
 use crate::config::Config;
 use indexmap::IndexMap;
-use shirabe_external_packages::psr::log::logger_interface::LoggerInterface;
+use shirabe_external_packages::psr::log::LoggerInterface;
 use shirabe_php_shim::PhpMixed;
 
 pub const QUIET: i64 = 1;
diff --git a/crates/shirabe/src/io/mod.rs b/crates/shirabe/src/io/mod.rs
index a75d459..f7c8ad1 100644
--- a/crates/shirabe/src/io/mod.rs
+++ b/crates/shirabe/src/io/mod.rs
@@ -3,3 +3,9 @@ pub mod buffer_io;
 pub mod console_io;
 pub mod io_interface;
 pub mod null_io;
+
+pub use base_io::*;
+pub use buffer_io::*;
+pub use console_io::*;
+pub use io_interface::*;
+pub use null_io::*;
diff --git a/crates/shirabe/src/io/null_io.rs b/crates/shirabe/src/io/null_io.rs
index 1a06e6e..e3cfdcf 100644
--- a/crates/shirabe/src/io/null_io.rs
+++ b/crates/shirabe/src/io/null_io.rs
@@ -1,8 +1,8 @@
 //! ref: composer/src/Composer/IO/NullIO.php
 
-use crate::io::base_io::BaseIO;
-use crate::io::io_interface::IOInterface;
-use shirabe_external_packages::psr::log::logger_interface::LoggerInterface;
+use crate::io::BaseIO;
+use crate::io::IOInterface;
+use shirabe_external_packages::psr::log::LoggerInterface;
 use shirabe_php_shim::PhpMixed;
 
 #[derive(Debug)]