fix(compile): extract static methods from BasePackage trait

6 files changed, 14 insertions, 9 deletions

diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs
index 7707bb6..5c0cf6e 100644
--- a/crates/shirabe/src/command/bump_command.rs
+++ b/crates/shirabe/src/command/bump_command.rs
@@ -1,6 +1,7 @@
 //! ref: composer/src/Composer/Command/BumpCommand.php
 
 use crate::io::io_interface;
+use crate::package::base_package;
 use anyhow::Result;
 use shirabe_external_packages::composer::pcre::preg::Preg;
 use shirabe_external_packages::symfony::component::console::command::command::Command;
@@ -232,7 +233,7 @@ impl BumpCommand {
                 .collect::<std::collections::HashSet<_>>()
                 .into_iter()
                 .collect();
-            let pattern = BasePackage::package_names_to_regexp(&unique_lower);
+            let pattern = base_package::package_names_to_regexp(&unique_lower);
             for (key, reqs) in tasks.iter_mut() {
                 reqs.retain(|pkg_name, _| Preg::is_match(&pattern, pkg_name).unwrap_or(false));
             }
diff --git a/crates/shirabe/src/command/completion_trait.rs b/crates/shirabe/src/command/completion_trait.rs
index ea2db2b..4e04441 100644
--- a/crates/shirabe/src/command/completion_trait.rs
+++ b/crates/shirabe/src/command/completion_trait.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/Command/CompletionTrait.php
 
 use crate::composer::Composer;
-use crate::package::base_package::BasePackage;
+use crate::package::base_package::{self, BasePackage};
 use crate::package::package_interface::PackageInterface;
 use crate::repository::composite_repository::CompositeRepository;
 use crate::repository::installed_repository::InstalledRepository;
@@ -263,7 +263,7 @@ pub trait CompletionTrait {
             );
 
             let pattern =
-                BasePackage::package_name_to_regexp(&format!("{}*", input.get_completion_value()));
+                base_package::package_name_to_regexp(&format!("{}*", input.get_completion_value()));
 
             repos
                 .get_packages()
diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs
index 031977e..d16b001 100644
--- a/crates/shirabe/src/command/reinstall_command.rs
+++ b/crates/shirabe/src/command/reinstall_command.rs
@@ -20,6 +20,7 @@ use crate::dependency_resolver::operation::uninstall_operation::UninstallOperati
 use crate::dependency_resolver::transaction::Transaction;
 use crate::io::io_interface::IOInterface;
 use crate::package::alias_package::AliasPackage;
+use crate::package::base_package;
 use crate::package::base_package::BasePackage;
 use crate::plugin::command_event::CommandEvent;
 use crate::plugin::plugin_events::PluginEvents;
@@ -134,7 +135,7 @@ impl ReinstallCommand {
                 })
                 .unwrap_or_default();
             for pattern in &patterns {
-                let pattern_regexp = BasePackage::package_name_to_regexp(pattern);
+                let pattern_regexp = base_package::package_name_to_regexp(pattern);
                 let mut matched = false;
                 for package in local_repo.get_canonical_packages() {
                     if Preg::is_match(&pattern_regexp, package.get_name()).unwrap_or(false) {
diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs
index a66a343..c9e967b 100644
--- a/crates/shirabe/src/command/remove_command.rs
+++ b/crates/shirabe/src/command/remove_command.rs
@@ -21,6 +21,7 @@ use crate::factory::Factory;
 use crate::installer::Installer;
 use crate::io::io_interface::IOInterface;
 use crate::json::json_file::JsonFile;
+use crate::package::base_package;
 use crate::package::base_package::BasePackage;
 
 #[derive(Debug)]
@@ -416,7 +417,7 @@ impl RemoveCommand {
                     .map(|m| m.keys().cloned().collect())
                     .unwrap_or_default();
                 let matches_in_type =
-                    Preg::grep(&BasePackage::package_name_to_regexp(package), &type_keys)
+                    Preg::grep(&base_package::package_name_to_regexp(package), &type_keys)
                         .unwrap_or_default();
 
                 let alt_type_keys: Vec<String> = composer_data
@@ -426,7 +427,7 @@ impl RemoveCommand {
                     .map(|m| m.keys().cloned().collect())
                     .unwrap_or_default();
                 let matches_in_alt_type = Preg::grep(
-                    &BasePackage::package_name_to_regexp(package),
+                    &base_package::package_name_to_regexp(package),
                     &alt_type_keys,
                 )
                 .unwrap_or_default();
diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs
index f32f414..36dedf3 100644
--- a/crates/shirabe/src/command/show_command.rs
+++ b/crates/shirabe/src/command/show_command.rs
@@ -26,6 +26,7 @@ use crate::dependency_resolver::default_policy::DefaultPolicy;
 use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface;
 use crate::io::io_interface::IOInterface;
 use crate::json::json_file::JsonFile;
+use crate::package::base_package;
 use crate::package::base_package::BasePackage;
 use crate::package::complete_package_interface::CompletePackageInterface;
 use crate::package::link::Link;
@@ -741,7 +742,7 @@ impl ShowCommand {
         let show_major_only = input.get_option("major-only").as_bool() == Some(true);
         let show_minor_only = input.get_option("minor-only").as_bool() == Some(true);
         let show_patch_only = input.get_option("patch-only").as_bool() == Some(true);
-        let ignored_packages_regex = BasePackage::package_names_to_regexp(
+        let ignored_packages_regex = base_package::package_names_to_regexp(
             input
                 .get_option("ignore")
                 .as_list()
diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs
index fc04e87..b484a93 100644
--- a/crates/shirabe/src/command/update_command.rs
+++ b/crates/shirabe/src/command/update_command.rs
@@ -1,6 +1,7 @@
 //! ref: composer/src/Composer/Command/UpdateCommand.php
 
 use crate::io::io_interface;
+use crate::package::base_package;
 use anyhow::Result;
 use indexmap::IndexMap;
 use shirabe_external_packages::composer::pcre::preg::Preg;
@@ -514,8 +515,8 @@ impl UpdateCommand {
         );
 
         let filter: Option<String> = if packages.len() > 0 {
-            // TODO(phase-b): BasePackage::package_names_to_regexp signature
-            Some(BasePackage::package_names_to_regexp(&packages, "%s"))
+            // TODO(phase-b): base_package::package_names_to_regexp signature
+            Some(base_package::package_names_to_regexp(&packages, "%s"))
         } else {
             None
         };