From c7f53c5d7d581ebf76803650c63ec615b1558dc8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 28 May 2026 03:31:41 +0900 Subject: refactor(composer): represent composer via trait-based handles Replace the PartialComposer/Composer structs and the single Rc> enum with PartialComposer and Composer traits (Composer: PartialComposer), InnerPartialComposer / InnerFullComposer data structs, and the handle types FullComposerHandle (impl Composer) and AnyComposerHandle (polymorphic enum, impl PartialComposer), plus their weak variants. Factory builds the full and partial graphs via separate Rc::new_cyclic branches that share a build_composer_base helper. Call sites now use trait methods that encapsulate borrowing instead of borrow_partial() / composer_full*(). Co-Authored-By: Claude Opus 4.7 --- crates/shirabe/src/command/archive_command.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/command/archive_command.rs') diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index aab7b51..c777f54 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -8,7 +8,7 @@ use shirabe_external_packages::symfony::component::console::output::OutputInterf use shirabe_php_shim::{LogicException, get_debug_type}; use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::composer::PartialComposerHandle; +use crate::composer::{AnyComposerHandle, Composer, PartialComposer}; use crate::config::Config; use crate::console::input::InputArgument; use crate::console::input::InputOption; @@ -67,10 +67,10 @@ impl ArchiveCommand { let composer = self.try_composer(None, None); let config = if let Some(ref composer) = composer { - let config = composer.borrow_partial().get_config(); + let config = composer.get_config(); // TODO(plugin): dispatch CommandEvent let command_event = CommandEvent::new(PluginEvents::COMMAND, "archive", input, output); - let event_dispatcher = composer.borrow_partial().get_event_dispatcher(); + let event_dispatcher = composer.get_event_dispatcher(); event_dispatcher .borrow_mut() .dispatch(Some(command_event.get_name()), None); @@ -138,7 +138,6 @@ impl ArchiveCommand { && let Some(ref composer) = composer { composer - .borrow_partial() .get_event_dispatcher() .borrow_mut() .dispatch_script( @@ -162,7 +161,7 @@ impl ArchiveCommand { dest: &str, file_name: Option, ignore_filters: bool, - composer: Option<&PartialComposerHandle>, + composer: Option<&AnyComposerHandle>, ) -> Result { let composer_guard = composer.map(crate::command::composer_full); let owned_archive_manager; -- cgit v1.3.1