refactor: re-export module items to shorten import paths

6 files changed, 31 insertions, 24 deletions

diff --git a/crates/shirabe/src/advisory/audit_config.rs b/crates/shirabe/src/advisory/audit_config.rs
index bdf3e8d..1feff3f 100644
--- a/crates/shirabe/src/advisory/audit_config.rs
+++ b/crates/shirabe/src/advisory/audit_config.rs
@@ -3,7 +3,7 @@
 use indexmap::IndexMap;
 use shirabe_php_shim::{InvalidArgumentException, PhpMixed};
 
-use crate::advisory::auditor::Auditor;
+use crate::advisory::Auditor;
 use crate::config::Config;
 
 #[derive(Debug, Clone)]
diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs
index 8a2f624..5418fac 100644
--- a/crates/shirabe/src/advisory/auditor.rs
+++ b/crates/shirabe/src/advisory/auditor.rs
@@ -3,24 +3,25 @@
 use crate::io::io_interface;
 use anyhow::Result;
 use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
 use shirabe_php_shim::{
     DATE_ATOM, InvalidArgumentException, PhpMixed, array_all, array_any, array_key_exists,
     array_keys, array_reduce, get_class, is_string, sprintf, str_starts_with,
 };
 
-use crate::advisory::ignored_security_advisory::IgnoredSecurityAdvisory;
-use crate::advisory::security_advisory::SecurityAdvisory;
-use crate::io::console_io::ConsoleIO;
-use crate::io::io_interface::IOInterface;
-use crate::json::json_file::JsonFile;
-use crate::package::base_package::{self, BasePackage};
-use crate::package::complete_package_interface::CompletePackageInterface;
-use crate::package::package_interface::PackageInterface;
-use crate::repository::advisory_provider_interface::PartialOrSecurityAdvisory;
-use crate::repository::repository_set::RepositorySet;
-use crate::util::package_info::PackageInfo;
+use crate::advisory::IgnoredSecurityAdvisory;
+use crate::advisory::SecurityAdvisory;
+use crate::io::ConsoleIO;
+use crate::io::IOInterface;
+use crate::json::JsonFile;
+use crate::package::CompletePackageInterface;
+use crate::package::PackageInterface;
+use crate::package::base_package;
+use crate::package::base_package::BasePackage;
+use crate::repository::PartialOrSecurityAdvisory;
+use crate::repository::RepositorySet;
+use crate::util::PackageInfo;
 
 /// @internal
 #[derive(Debug)]
diff --git a/crates/shirabe/src/advisory/ignored_security_advisory.rs b/crates/shirabe/src/advisory/ignored_security_advisory.rs
index 03e7d78..1cd5f75 100644
--- a/crates/shirabe/src/advisory/ignored_security_advisory.rs
+++ b/crates/shirabe/src/advisory/ignored_security_advisory.rs
@@ -1,10 +1,10 @@
 //! ref: composer/src/Composer/Advisory/IgnoredSecurityAdvisory.php
 
-use crate::advisory::security_advisory::SecurityAdvisory;
+use crate::advisory::SecurityAdvisory;
 use chrono::{DateTime, Utc};
 use indexmap::IndexMap;
 use shirabe_php_shim::PhpMixed;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
+use shirabe_semver::constraint::ConstraintInterface;
 
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/crates/shirabe/src/advisory/mod.rs b/crates/shirabe/src/advisory/mod.rs
index 783e9b7..bcfbe93 100644
--- a/crates/shirabe/src/advisory/mod.rs
+++ b/crates/shirabe/src/advisory/mod.rs
@@ -3,3 +3,9 @@ pub mod auditor;
 pub mod ignored_security_advisory;
 pub mod partial_security_advisory;
 pub mod security_advisory;
+
+pub use audit_config::*;
+pub use auditor::*;
+pub use ignored_security_advisory::*;
+pub use partial_security_advisory::*;
+pub use security_advisory::*;
diff --git a/crates/shirabe/src/advisory/partial_security_advisory.rs b/crates/shirabe/src/advisory/partial_security_advisory.rs
index a47ec02..6953ef3 100644
--- a/crates/shirabe/src/advisory/partial_security_advisory.rs
+++ b/crates/shirabe/src/advisory/partial_security_advisory.rs
@@ -1,14 +1,14 @@
 //! ref: composer/src/Composer/Advisory/PartialSecurityAdvisory.php
 
-use crate::advisory::security_advisory::SecurityAdvisory;
-use crate::repository::advisory_provider_interface::PartialOrSecurityAdvisory;
+use crate::advisory::SecurityAdvisory;
+use crate::repository::PartialOrSecurityAdvisory;
 use anyhow::Result;
 use chrono::{DateTime, TimeZone, Utc};
 use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
+use shirabe_external_packages::composer::pcre::Preg;
 use shirabe_php_shim::{PhpMixed, UnexpectedValueException};
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
 use shirabe_semver::version_parser::VersionParser;
 
 fn serialize_constraint<S: serde::Serializer>(
diff --git a/crates/shirabe/src/advisory/security_advisory.rs b/crates/shirabe/src/advisory/security_advisory.rs
index bf10c2a..9787d37 100644
--- a/crates/shirabe/src/advisory/security_advisory.rs
+++ b/crates/shirabe/src/advisory/security_advisory.rs
@@ -2,10 +2,10 @@
 
 use chrono::{DateTime, Utc};
 use indexmap::IndexMap;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
+use shirabe_semver::constraint::ConstraintInterface;
 
-use crate::advisory::ignored_security_advisory::IgnoredSecurityAdvisory;
-use crate::advisory::partial_security_advisory::PartialSecurityAdvisory;
+use crate::advisory::IgnoredSecurityAdvisory;
+use crate::advisory::PartialSecurityAdvisory;
 
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]