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-core/src/repository_utils.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'crates/mozart-core/src/repository_utils.rs') diff --git a/crates/mozart-core/src/repository_utils.rs b/crates/mozart-core/src/repository_utils.rs index b16a0d6..7a797c4 100644 --- a/crates/mozart-core/src/repository_utils.rs +++ b/crates/mozart-core/src/repository_utils.rs @@ -19,7 +19,7 @@ use std::collections::BTreeSet; /// `package_name` only in that case. pub trait Required { fn package_name(&self) -> &str; - fn requires(&self) -> &std::collections::BTreeMap; + fn requires(&self) -> &indexmap::IndexMap; fn package_names(&self) -> Option> { None } @@ -38,8 +38,8 @@ pub trait Required { /// discovered, matching PHP's `$bucket[] = $candidate;` push pattern. pub fn filter_required_packages( packages: &[P], - requirer_requires: &std::collections::BTreeMap, - requirer_dev_requires: Option<&std::collections::BTreeMap>, + requirer_requires: &indexmap::IndexMap, + requirer_dev_requires: Option<&indexmap::IndexMap>, ) -> Vec where P: Required, @@ -78,24 +78,23 @@ where #[cfg(test)] mod tests { use super::*; - use std::collections::BTreeMap; struct Pkg { name: String, - requires: BTreeMap, + requires: indexmap::IndexMap, } impl Required for Pkg { fn package_name(&self) -> &str { &self.name } - fn requires(&self) -> &BTreeMap { + fn requires(&self) -> &indexmap::IndexMap { &self.requires } } fn pkg(name: &str, requires: &[&str]) -> Pkg { - let mut r = BTreeMap::new(); + let mut r = indexmap::IndexMap::new(); for n in requires { r.insert(n.to_string(), "*".to_string()); } @@ -105,8 +104,8 @@ mod tests { } } - fn root_requires(names: &[&str]) -> BTreeMap { - let mut m = BTreeMap::new(); + fn root_requires(names: &[&str]) -> indexmap::IndexMap { + let mut m = indexmap::IndexMap::new(); for n in names { m.insert(n.to_string(), "*".to_string()); } @@ -167,7 +166,7 @@ mod tests { #[test] fn empty_requires_yields_nothing() { let packages = vec![pkg("a/a", &[]), pkg("b/b", &[])]; - let root: BTreeMap = BTreeMap::new(); + let root: indexmap::IndexMap<_, ()> = indexmap::IndexMap::new(); let kept = filter_required_packages(&packages, &root, None); assert!(kept.is_empty()); } -- cgit v1.3.1