From 4df5f8491320e5795718cf0222e80fa27e57c8ad Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 11 May 2026 02:05:34 +0900 Subject: refactor(package): rename traits and switch dep maps to IndexMap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename Package/CompletePackage to PackageInterface/CompletePackageInterface to mirror Composer's interface names, and split each into its own module under crates/mozart-core/src/package/. Switch dependency-link and metadata maps from BTreeMap to indexmap::IndexMap so serialized JSON preserves the original key ordering rather than sorting alphabetically — matching PHP associative-array semantics. The --sort-packages behaviour in `require` is preserved via sort_unstable_keys. --- crates/mozart/src/commands/dependency.rs | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'crates/mozart/src/commands/dependency.rs') diff --git a/crates/mozart/src/commands/dependency.rs b/crates/mozart/src/commands/dependency.rs index 70d1644..5766b08 100644 --- a/crates/mozart/src/commands/dependency.rs +++ b/crates/mozart/src/commands/dependency.rs @@ -9,7 +9,6 @@ use indexmap::IndexSet; use mozart_core::console::IoInterface; use mozart_core::console_format; use mozart_core::console_writeln; -use std::collections::BTreeMap; use std::path::Path; /// Inputs for [`do_execute`], collected from the `depends` / `prohibits` CLI args. @@ -160,11 +159,11 @@ pub struct PackageInfo { pub name: String, pub version: String, /// Runtime requirements (`require` section). - pub require: BTreeMap, + pub require: indexmap::IndexMap, /// Dev requirements (`require-dev`) — only non-empty for the root package. - pub require_dev: BTreeMap, + pub require_dev: indexmap::IndexMap, /// Conflict declarations (`conflict` section). - pub conflict: BTreeMap, + pub conflict: indexmap::IndexMap, /// Whether this is the root `composer.json` package. pub is_root: bool, } @@ -218,9 +217,9 @@ pub fn load_packages(working_dir: &Path, locked: bool) -> Result Result = root + let conflict = root .extra_fields .get("conflict") .and_then(|v| v.as_object()) @@ -267,7 +266,7 @@ fn load_from_lockfile(lock_path: &Path) -> Result> { name: pkg.name.clone(), version: pkg.version.clone(), require: pkg.require.clone(), - require_dev: BTreeMap::new(), // locked packages don't expose require-dev + require_dev: indexmap::IndexMap::new(), // locked packages don't expose require-dev conflict: pkg.conflict.clone(), is_root: false, }); @@ -279,7 +278,7 @@ fn load_from_lockfile(lock_path: &Path) -> Result> { name: pkg.name.clone(), version: pkg.version.clone(), require: pkg.require.clone(), - require_dev: BTreeMap::new(), + require_dev: indexmap::IndexMap::new(), conflict: pkg.conflict.clone(), is_root: false, }); @@ -325,7 +324,7 @@ fn load_from_installed(working_dir: &Path) -> Result> { name: p.name.clone(), version: p.version.clone(), require, - require_dev: BTreeMap::new(), + require_dev: indexmap::IndexMap::new(), conflict, is_root: false, } @@ -367,7 +366,7 @@ fn get_dependents_forward( let needle_set: IndexSet = needles.iter().map(|n| n.to_lowercase()).collect(); // Build name→PackageInfo lookup - let pkg_map: BTreeMap = packages + let pkg_map: indexmap::IndexMap<_, _> = packages .iter() .map(|p| (p.name.to_lowercase(), p)) .collect(); @@ -448,7 +447,7 @@ fn collect_direct_requires(packages: &[PackageInfo], needle: &str) -> Vec, + pkg_map: &indexmap::IndexMap, visited: &mut IndexSet, _original_needles: &IndexSet, ) -> Vec { @@ -760,7 +759,7 @@ mod tests { .iter() .map(|(k, v)| (k.to_string(), v.to_string())) .collect(), - require_dev: BTreeMap::new(), + require_dev: indexmap::IndexMap::new(), conflict: conflict .iter() .map(|(k, v)| (k.to_string(), v.to_string())) -- cgit v1.3.1