From 0b06f54103490e3ce5658e82bbc0119633e26cd8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 22 May 2026 01:29:48 +0900 Subject: refactor(composer): unify Composer/PartialComposer via Rc handles Model PHP's `Composer extends PartialComposer` as a PartialOrFullComposer enum and merge partial_composer.rs into composer.rs. Introduce ComposerHandle / PartialComposerHandle (plus their Weak variants) so the graph can be shared, and build it at once with Rc::new_cyclic in the factory to resolve the back-reference cycles. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/command/search_command.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/command/search_command.rs') diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index 16df221..fb6b047 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -1,7 +1,6 @@ //! ref: composer/src/Composer/Command/SearchCommand.php use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::composer::Composer; use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::io::IOInterface; @@ -77,21 +76,27 @@ impl SearchCommand { let io_box = self.get_io().clone_box(); self.create_composer_instance(input, io_box.as_ref(), None, false, None)? }; + let composer_ref = crate::command::composer_full(&composer); // TODO(phase-b): get_local_repository returns &dyn InstalledRepositoryInterface but we need Box let local_repo: Box = todo!("share local_repo as RepositoryInterface"); let installed_repo = CompositeRepository::new(vec![local_repo, Box::new(platform_repo)]); let mut all_repos: Vec> = vec![Box::new(installed_repo)]; // TODO(phase-b): get_repositories returns &Vec>; needs ownership reshape - for r in composer.get_repository_manager().get_repositories() { + for r in composer_ref + .get_repository_manager() + .borrow() + .get_repositories() + { all_repos.push(r.clone_box()); } let repos = CompositeRepository::new(all_repos); // TODO(plugin): dispatch CommandEvent for search command let command_event = CommandEvent::new(PluginEvents::COMMAND, "search", input, output); - composer - .get_event_dispatcher() + let dispatcher = composer_ref.get_event_dispatcher().clone(); + drop(composer_ref); + dispatcher .borrow_mut() .dispatch(Some(command_event.get_name()), None); -- cgit v1.3.1