aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/mozart-sat-resolver
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-05-03 13:14:00 +0900
committernsfisis <nsfisis@gmail.com>2026-05-03 13:14:00 +0900
commit3c0527aa63574f17c9f372b6187d5690e0cbaff0 (patch)
tree8159e09b685f7faf2870970d465b9698093b8973 /crates/mozart-sat-resolver
parentc53dfc52f6449c8d5ca0b160a2a25f99790711f2 (diff)
downloadphp-mozart-3c0527aa63574f17c9f372b6187d5690e0cbaff0.tar.gz
php-mozart-3c0527aa63574f17c9f372b6187d5690e0cbaff0.tar.zst
php-mozart-3c0527aa63574f17c9f372b6187d5690e0cbaff0.zip
fix(resolver): apply root "X as Y" aliases via pool second pass
Mirrors Composer's `RootPackageLoader::extractAliases` + `PoolBuilder::loadPackage` flow: strip the `as` clause from each root require so the SAT side sees only the LEFT-hand constraint, and after every package is loaded run a second pass that materializes an alias entry for any input matching `(name, version_normalized)`. Locked-only packages in a partial update are excluded via a new `ResolveRequest::locked_package_names` so they don't pick up the alias (`propagateUpdate=false` in Composer). Two adjacent fixes uncovered while making `install_aliased_alias` green: - `Version::cmp` treated unnamed wildcard branches (`1.0.x-dev`, `is_dev_branch=true && name=None`) as below every numeric version. They are semantically the same as the four-segment `*-dev` form Composer's `normalizeBranch` emits, so let only *named* branches take the shortcut. - `Constraint::Exact` / `NotEqual` used the derived `==`, which compared `is_dev_branch` field-by-field and missed the wildcard/numeric equivalence. Switch to `cmp` so both forms count as equal. - `Pool::matches_package` now falls back to parsing `pretty_version` when the `version` parse doesn't match the constraint, so a `dev-master` query lines up with a pool entry stored as the internal `9999999.x.x.x-dev` expansion. Net effect on installer fixtures: `install_aliased_alias` newly green, plus `aliased_priority`, `aliased_priority_conflicting`, and `install_dev_using_dist` come along for the ride. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/mozart-sat-resolver')
-rw-r--r--crates/mozart-sat-resolver/src/pool.rs26
-rw-r--r--crates/mozart-sat-resolver/src/pool_builder.rs8
2 files changed, 30 insertions, 4 deletions
diff --git a/crates/mozart-sat-resolver/src/pool.rs b/crates/mozart-sat-resolver/src/pool.rs
index 9268675..2c52791 100644
--- a/crates/mozart-sat-resolver/src/pool.rs
+++ b/crates/mozart-sat-resolver/src/pool.rs
@@ -272,11 +272,29 @@ impl Pool {
return match constraint {
None => true,
Some(vc) => {
- if let Ok(v) = mozart_semver::Version::parse(&candidate.version) {
- vc.matches(&v)
- } else {
- false
+ // Try the normalized version first; fall back to the
+ // pretty version. Composer normalizes both sides of a
+ // constraint match to a single string form (e.g.
+ // `dev-master` → `9999999-dev`), so a query for
+ // `dev-master` matches a package whose pretty version
+ // is `dev-master` even when the pool stores its
+ // version field in a different normalized shape (e.g.
+ // the four-segment `9999999.9999999.9999999.9999999-dev`
+ // expansion Mozart uses internally for default-branch
+ // and root-alias entries). The pretty fallback bridges
+ // that gap without forcing the pool to commit to a
+ // single normalization.
+ if let Ok(v) = mozart_semver::Version::parse(&candidate.version)
+ && vc.matches(&v)
+ {
+ return true;
}
+ if let Ok(pv) = mozart_semver::Version::parse(&candidate.pretty_version)
+ && vc.matches(&pv)
+ {
+ return true;
+ }
+ false
}
};
}
diff --git a/crates/mozart-sat-resolver/src/pool_builder.rs b/crates/mozart-sat-resolver/src/pool_builder.rs
index 3883d85..6088e7d 100644
--- a/crates/mozart-sat-resolver/src/pool_builder.rs
+++ b/crates/mozart-sat-resolver/src/pool_builder.rs
@@ -108,6 +108,14 @@ impl PoolBuilder {
self.inputs.len()
}
+ /// Read-only access to package inputs collected so far. Used by the
+ /// registry layer to materialize root aliases (`require: "X as Y"`) once
+ /// every base + branch-alias entry is in place: a second pass scans for
+ /// matching `(name, version)` and pushes the alias entry on top.
+ pub fn inputs(&self) -> &[PoolPackageInput] {
+ &self.inputs
+ }
+
/// Whether the builder has no packages.
pub fn is_empty(&self) -> bool {
self.inputs.is_empty()