From 436e12381dd79e419dce755718be17b66d73e17f Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 9 Jun 2026 00:09:08 +0900 Subject: feat(event-dispatcher): unify event dispatch via EventInterface trait Extract a superclass-trait EventInterface from the base Event. pool_builder's PrePoolCreateEvent stays deferred: its constructor needs owned, non-cloneable Request and repository boxes the builder only holds by reference (owned-payload blocker). The event is plugin-only, so its construction is re-tagged TODO(plugin). Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/plugin/command_event.rs | 23 ++++++++++++++++++++ .../shirabe/src/plugin/post_file_download_event.rs | 24 +++++++++++++++++++++ crates/shirabe/src/plugin/pre_command_run_event.rs | 25 ++++++++++++++++++++++ .../shirabe/src/plugin/pre_file_download_event.rs | 23 ++++++++++++++++++++ crates/shirabe/src/plugin/pre_pool_create_event.rs | 25 ++++++++++++++++++++++ 5 files changed, 120 insertions(+) (limited to 'crates/shirabe/src/plugin') diff --git a/crates/shirabe/src/plugin/command_event.rs b/crates/shirabe/src/plugin/command_event.rs index fc19fcb..ca63461 100644 --- a/crates/shirabe/src/plugin/command_event.rs +++ b/crates/shirabe/src/plugin/command_event.rs @@ -1,6 +1,7 @@ //! ref: composer/src/Composer/Plugin/CommandEvent.php use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventInterface; use indexmap::IndexMap; use shirabe_external_packages::symfony::console::input::InputInterface; use shirabe_external_packages::symfony::console::output::OutputInterface; @@ -57,3 +58,25 @@ impl CommandEvent { &self.command_name } } + +impl EventInterface for CommandEvent { + fn get_name(&self) -> &str { + self.inner.get_name() + } + + fn get_arguments(&self) -> &Vec { + self.inner.get_arguments() + } + + fn get_flags(&self) -> &IndexMap { + self.inner.get_flags() + } + + fn is_propagation_stopped(&self) -> bool { + self.inner.is_propagation_stopped() + } + + fn stop_propagation(&mut self) { + self.inner.stop_propagation(); + } +} diff --git a/crates/shirabe/src/plugin/post_file_download_event.rs b/crates/shirabe/src/plugin/post_file_download_event.rs index 2124f1e..9ba946e 100644 --- a/crates/shirabe/src/plugin/post_file_download_event.rs +++ b/crates/shirabe/src/plugin/post_file_download_event.rs @@ -1,8 +1,10 @@ //! ref: composer/src/Composer/Plugin/PostFileDownloadEvent.php +use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventInterface; #[derive(Debug)] pub struct PostFileDownloadEvent { @@ -57,3 +59,25 @@ impl PostFileDownloadEvent { &self.r#type } } + +impl EventInterface for PostFileDownloadEvent { + fn get_name(&self) -> &str { + self.inner.get_name() + } + + fn get_arguments(&self) -> &Vec { + self.inner.get_arguments() + } + + fn get_flags(&self) -> &IndexMap { + self.inner.get_flags() + } + + fn is_propagation_stopped(&self) -> bool { + self.inner.is_propagation_stopped() + } + + fn stop_propagation(&mut self) { + self.inner.stop_propagation(); + } +} diff --git a/crates/shirabe/src/plugin/pre_command_run_event.rs b/crates/shirabe/src/plugin/pre_command_run_event.rs index 29567cb..854c47f 100644 --- a/crates/shirabe/src/plugin/pre_command_run_event.rs +++ b/crates/shirabe/src/plugin/pre_command_run_event.rs @@ -2,7 +2,10 @@ // TODO(plugin): this event is part of the plugin API and is dispatched before a command runs use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventInterface; +use indexmap::IndexMap; use shirabe_external_packages::symfony::console::input::InputInterface; +use shirabe_php_shim::PhpMixed; #[derive(Debug)] pub struct PreCommandRunEvent { @@ -37,3 +40,25 @@ impl PreCommandRunEvent { &self.command } } + +impl EventInterface for PreCommandRunEvent { + fn get_name(&self) -> &str { + self.inner.get_name() + } + + fn get_arguments(&self) -> &Vec { + self.inner.get_arguments() + } + + fn get_flags(&self) -> &IndexMap { + self.inner.get_flags() + } + + fn is_propagation_stopped(&self) -> bool { + self.inner.is_propagation_stopped() + } + + fn stop_propagation(&mut self) { + self.inner.stop_propagation(); + } +} diff --git a/crates/shirabe/src/plugin/pre_file_download_event.rs b/crates/shirabe/src/plugin/pre_file_download_event.rs index f6198b6..3bf6296 100644 --- a/crates/shirabe/src/plugin/pre_file_download_event.rs +++ b/crates/shirabe/src/plugin/pre_file_download_event.rs @@ -4,6 +4,7 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventInterface; use crate::util::HttpDownloader; #[derive(Debug)] @@ -76,3 +77,25 @@ impl PreFileDownloadEvent { self.transport_options = options; } } + +impl EventInterface for PreFileDownloadEvent { + fn get_name(&self) -> &str { + self.inner.get_name() + } + + fn get_arguments(&self) -> &Vec { + self.inner.get_arguments() + } + + fn get_flags(&self) -> &IndexMap { + self.inner.get_flags() + } + + fn is_propagation_stopped(&self) -> bool { + self.inner.is_propagation_stopped() + } + + fn stop_propagation(&mut self) { + self.inner.stop_propagation(); + } +} diff --git a/crates/shirabe/src/plugin/pre_pool_create_event.rs b/crates/shirabe/src/plugin/pre_pool_create_event.rs index 2bbaa6c..303159a 100644 --- a/crates/shirabe/src/plugin/pre_pool_create_event.rs +++ b/crates/shirabe/src/plugin/pre_pool_create_event.rs @@ -2,8 +2,11 @@ use indexmap::IndexMap; +use shirabe_php_shim::PhpMixed; + use crate::dependency_resolver::Request; use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventInterface; use crate::package::BasePackageHandle; use crate::repository::RepositoryInterface; @@ -92,3 +95,25 @@ impl PrePoolCreateEvent { self.unacceptable_fixed_packages = packages; } } + +impl EventInterface for PrePoolCreateEvent { + fn get_name(&self) -> &str { + self.inner.get_name() + } + + fn get_arguments(&self) -> &Vec { + self.inner.get_arguments() + } + + fn get_flags(&self) -> &IndexMap { + self.inner.get_flags() + } + + fn is_propagation_stopped(&self) -> bool { + self.inner.is_propagation_stopped() + } + + fn stop_propagation(&mut self) { + self.inner.stop_propagation(); + } +} -- cgit v1.3.1