From 971824aa15334fd12d08ae0f441f6bf6079344c3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 10:33:53 +0900 Subject: feat(shirabe): resolve phase-b TODOs with shared ownership Replace TODO(phase-b) placeholders (todo!() and commented-out code) with real implementations: - Share JsonFile via Rc> so JsonConfigSource and the owning command can hold the same instance (base_config_command, config_command, repository_command, require_command, create_project, remove_command, factory) - Change InstallerInterface methods (is_installed, download, prepare, cleanup, get_install_path) to &mut self so initialize_vendor_dir can run, propagated to all installer implementations - Pass io/config/filesystem/process by clone instead of moving or stubbing (auth_helper, svn_driver, curl_downloader, library_installer) - Make TransportException Clone and store it by value in VcsRepository - Clone operations in Transaction sort, root_aliases/temporary_constraints in RepositorySet::create_pool, and share CompletePackage via handle in PlatformRepository - Wire up set_option, set_requires/set_dev_requires, installation manager setters, BumpCommand::set_composer, and clean_backups/set_local_phar --- crates/shirabe/src/repository/repository_set.rs | 33 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/repository/repository_set.rs') diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs index 3cc4b9f..367a46a 100644 --- a/crates/shirabe/src/repository/repository_set.rs +++ b/crates/shirabe/src/repository/repository_set.rs @@ -459,7 +459,7 @@ impl RepositorySet { /// @param list|null $allowedTypes Only packages of those types are allowed if set to non-null pub fn create_pool( &mut self, - request: Request, + mut request: Request, io: std::rc::Rc>, event_dispatcher: Option>>, pool_optimizer: Option, @@ -467,17 +467,34 @@ impl RepositorySet { allowed_types: Option>, security_advisory_pool_filter: Option, ) -> Result { + let root_aliases = self + .root_aliases + .iter() + .map(|(name, versions)| { + let versions = versions + .iter() + .map(|(version, entry)| { + let mut fields = IndexMap::new(); + fields.insert("alias".to_string(), entry.alias.clone()); + fields.insert( + "alias_normalized".to_string(), + entry.alias_normalized.clone(), + ); + (version.clone(), fields) + }) + .collect(); + (name.clone(), versions) + }) + .collect(); let mut pool_builder = PoolBuilder::new( self.acceptable_stabilities.clone(), self.stability_flags.clone(), - // TODO(phase-b): clone root_aliases into PoolBuilder's expected type - todo!("self.root_aliases.clone()"), + root_aliases, self.root_references.clone(), io, event_dispatcher, pool_optimizer, - // TODO(phase-b): clone temporary_constraints - todo!("self.temporary_constraints.clone()"), + self.temporary_constraints.clone(), security_advisory_pool_filter, ); pool_builder.set_ignored_types(ignored_types); @@ -501,11 +518,7 @@ impl RepositorySet { self.locked = true; - // TODO(phase-b): pool_builder.build_pool takes owned Vec and &mut Request; revisit sharing model - pool_builder.build_pool( - todo!("share self.repositories"), - todo!("share request as &mut"), - ) + pool_builder.build_pool(self.repositories.clone(), &mut request) } /// Create a pool for dependency resolution from the packages in this repository set. -- cgit v1.3.1