From d3cdb9e3f73314e04061d4d18f654e7e80b0dc18 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 3 May 2026 20:03:42 +0900 Subject: feat(repository): support only/exclude/canonical repo filters Composer's FilterRepository wraps a repository with three knobs: `only` / `exclude` to drop packages by name, and `canonical: false` to relax the repo's authoritative claim on its package names so lower-priority repos can still answer. Mozart was ignoring all three, so first-listed inline / composer-repo entries always shadowed later repos and `only` / `exclude` lists were silently no-ops. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/mozart-registry/src/composer_repo.rs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'crates/mozart-registry/src/composer_repo.rs') diff --git a/crates/mozart-registry/src/composer_repo.rs b/crates/mozart-registry/src/composer_repo.rs index 28063cc..6594668 100644 --- a/crates/mozart-registry/src/composer_repo.rs +++ b/crates/mozart-registry/src/composer_repo.rs @@ -20,6 +20,8 @@ //! exercise the legacy embedded-packages form. use crate::packagist::PackagistVersion; +use crate::repository_filter::RepositoryFilter; +use indexmap::IndexSet; use mozart_core::package::RawRepository; use std::path::PathBuf; @@ -35,6 +37,7 @@ pub struct ComposerRepoPackage { /// `file://foobar` → `file:///abs/path/to/fixtures/foobar`. pub fn collect_composer_packages(repositories: &[RawRepository]) -> Vec { let mut out = Vec::new(); + let mut claimed: IndexSet = IndexSet::new(); for repo in repositories { if repo.repo_type != "composer" { continue; @@ -55,18 +58,34 @@ pub fn collect_composer_packages(repositories: &[RawRepository]) -> Vec = IndexSet::new(); for (name, versions) in packages { + if !filter.is_allowed(name) { + continue; + } + if claimed.contains(name) { + continue; + } let Some(versions_obj) = versions.as_object() else { continue; }; + let mut emitted = false; for (_, version_value) in versions_obj { if let Ok(pv) = serde_json::from_value::(version_value.clone()) { out.push(ComposerRepoPackage { name: name.clone(), version: pv, }); + emitted = true; } } + if emitted { + names_this_repo.insert(name.clone()); + } + } + if filter.canonical { + claimed.extend(names_this_repo); } } out @@ -98,6 +117,9 @@ mod tests { repo_type: "composer".to_string(), url: Some(url), package: None, + only: None, + exclude: None, + canonical: None, } } @@ -132,6 +154,9 @@ mod tests { repo_type: "vcs".to_string(), url: Some("https://example.com/foo.git".to_string()), package: None, + only: None, + exclude: None, + canonical: None, }]; assert!(collect_composer_packages(&repos).is_empty()); } -- cgit v1.3.1