From da6f05c12d08ac96b4286664cd8205d3fee042d8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 14:15:55 +0900 Subject: feat(phase-c): resolve owned-argument phase-b TODOs Replace value-by-value signature workarounds with proper ownership: - validate_json_schema: borrow JsonFile via ValidateJsonInput<&JsonFile>, restoring the dropped local auth file validation call - Auditor::audit / Solver::new / create_pool: pass cloned Rc handles and share Pool via Rc>; create_pool now takes &mut Request - MarkAlias{Installed,Uninstalled}Operation: hand over AliasPackageHandle from the alias-confirmed branch - dispatch_installer_event: clone the base Transaction (Rc-backed contents) and enable the PRE_OPERATIONS_EXEC dispatch - SuggestedPackagesReporter: share between command and installer via Rc> to mirror PHP reference semantics PrePoolCreateEvent remains a TODO: it is plugin-only and would require a speculative Rc migration of Request whose payload is never read today. --- .../dependency_resolver/local_repo_transaction.rs | 4 +++ .../shirabe/src/dependency_resolver/transaction.rs | 32 ++++++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver') diff --git a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs index eb77add..e592741 100644 --- a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs @@ -26,4 +26,8 @@ impl LocalRepoTransaction { pub fn get_operations(&self) -> &Vec> { self.inner.get_operations() } + + pub(crate) fn to_transaction(&self) -> Transaction { + self.inner.clone() + } } diff --git a/crates/shirabe/src/dependency_resolver/transaction.rs b/crates/shirabe/src/dependency_resolver/transaction.rs index f9ee5f0..3450815 100644 --- a/crates/shirabe/src/dependency_resolver/transaction.rs +++ b/crates/shirabe/src/dependency_resolver/transaction.rs @@ -1,6 +1,7 @@ //! ref: composer/src/Composer/DependencyResolver/Transaction.php use indexmap::IndexMap; +use indexmap::IndexSet; use shirabe_php_shim::{ PhpMixed, array_filter, array_intersect, array_keys, array_pop, array_unshift, strcmp, uasort, }; @@ -11,12 +12,13 @@ use crate::dependency_resolver::operation::MarkAliasUninstalledOperation; use crate::dependency_resolver::operation::OperationInterface; use crate::dependency_resolver::operation::UninstallOperation; use crate::dependency_resolver::operation::UpdateOperation; +use crate::package::AliasPackageHandle; use crate::package::Link; use crate::package::PackageInterfaceHandle; use crate::repository::PlatformRepository; /// @internal -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct Transaction { /// @var OperationInterface[] pub(crate) operations: Vec>, @@ -118,13 +120,13 @@ impl Transaction { let mut present_package_map: IndexMap = IndexMap::new(); let mut remove_map: IndexMap = IndexMap::new(); - let mut present_alias_map: IndexMap = IndexMap::new(); - let mut remove_alias_map: IndexMap = IndexMap::new(); + let mut present_alias_map: IndexSet = IndexSet::new(); + let mut remove_alias_map: IndexMap = IndexMap::new(); for package in &self.present_packages { - if package.as_alias().is_some() { + if let Some(alias) = package.as_alias() { let key = format!("{}::{}", package.get_name(), package.get_version()); - present_alias_map.insert(key.clone(), package.clone()); - remove_alias_map.insert(key, package.clone()); + present_alias_map.insert(key.clone()); + remove_alias_map.insert(key, alias); } else { present_package_map.insert(package.get_name().to_string(), package.clone()); remove_map.insert(package.get_name().to_string(), package.clone()); @@ -163,15 +165,12 @@ impl Transaction { } else if !processed.contains_key(&package.ptr_id().to_string()) { processed.insert(package.ptr_id().to_string(), true); - if package.as_alias().is_some() { + if let Some(alias) = package.as_alias() { let alias_key = format!("{}::{}", package.get_name(), package.get_version()); - if present_alias_map.contains_key(&alias_key) { + if present_alias_map.contains(&alias_key) { remove_alias_map.shift_remove(&alias_key); } else { - // TODO(phase-b): MarkAliasInstalledOperation::new expects AliasPackage by value - operations.push(std::rc::Rc::new(MarkAliasInstalledOperation::new(todo!( - "package as AliasPackage by value" - )))); + operations.push(std::rc::Rc::new(MarkAliasInstalledOperation::new(alias))); } } else if let Some(source) = present_package_map.get(&package.get_name()).cloned() { // do we need to update? @@ -216,11 +215,10 @@ impl Transaction { as std::rc::Rc, ); } - for (_name_version, _package) in remove_alias_map { - // TODO(phase-b): MarkAliasUninstalledOperation::new expects AliasPackage by value - operations.push(std::rc::Rc::new(MarkAliasUninstalledOperation::new(todo!( - "package as AliasPackage by value" - )))); + for (_name_version, package) in remove_alias_map { + operations.push(std::rc::Rc::new(MarkAliasUninstalledOperation::new( + package, + ))); } let operations = self.move_plugins_to_front(operations); -- cgit v1.3.1