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/suggests_command.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/command/suggests_command.rs') diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index 9d5897c..6b617b1 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -1,7 +1,6 @@ //! ref: composer/src/Composer/Command/SuggestsCommand.php use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::composer::Composer; use crate::console::input::InputArgument; use crate::console::input::InputOption; use crate::installer::SuggestedPackagesReporter; @@ -45,15 +44,19 @@ impl SuggestsCommand { input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result { - let mut composer = self.require_composer(None, None)?; + let composer = self.require_composer(None, None)?; + let mut composer = crate::command::composer_full_mut(&composer); let mut installed_repos: Vec> = vec![Box::new( RootPackageRepository::new(composer.get_package().clone_box()), )]; - if composer.get_locker_mut().is_locked() { + if composer.get_locker().borrow_mut().is_locked() { // TODO(phase-b): get_platform_overrides returns IndexMap; PlatformRepository::new expects IndexMap - let _platform_overrides = composer.get_locker_mut().get_platform_overrides()?; + let _platform_overrides = composer + .get_locker() + .borrow_mut() + .get_platform_overrides()?; let platform_overrides: IndexMap = todo!("convert IndexMap to IndexMap"); installed_repos.push(Box::new(PlatformRepository::new( @@ -61,7 +64,8 @@ impl SuggestsCommand { platform_overrides, )?)); let locked_repo = composer - .get_locker_mut() + .get_locker() + .borrow_mut() .get_locked_repository(!input.get_option("no-dev").as_bool().unwrap_or(false))?; installed_repos.push(Box::new(locked_repo)); } else { @@ -76,6 +80,7 @@ impl SuggestsCommand { installed_repos.push( composer .get_repository_manager() + .borrow() .get_local_repository() .clone_box(), ); -- cgit v1.3.1