Skip to content

Commit b2283fb

Browse files
committed
chore: ci
1 parent a2b85e6 commit b2283fb

File tree

1 file changed

+30
-16
lines changed

1 file changed

+30
-16
lines changed

crates/pm/src/service/registry.rs

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ impl RegistryService {
149149
let version_list = full_manifest.versions.keys().collect::<Vec<_>>();
150150

151151
// Extract essential data for versions.json
152-
versions_data["version_list"] =
153-
serde_json::json!(version_list);
152+
versions_data["version_list"] = serde_json::json!(version_list);
154153
versions_data["dist-tags"] =
155154
serde_json::to_value(&full_manifest.dist_tags).unwrap_or(serde_json::json!({}));
156155
versions_data["time"] =
@@ -167,7 +166,6 @@ impl RegistryService {
167166
}
168167
}
169168

170-
171169
/// Resolve specific version manifest with three-tier caching
172170
/// Priority: memory > disk > network
173171
pub async fn resolve_version_manifest(name: &str, version: &str) -> Result<VersionManifest> {
@@ -309,16 +307,20 @@ impl RegistryService {
309307

310308
let target_version = match dist_tags.get(spec) {
311309
Some(version) => version.to_string(),
312-
None => match semver::max_satisfying(version_list.iter().map(|s| s.as_str()), spec) {
310+
None => match semver::max_satisfying(version_list.iter().map(|s| s.as_str()), spec)
311+
{
313312
Some(version) => version.to_string(),
314313
None => {
315314
log_verbose(&format!(
316315
"No matching version found for {}@{} from {} available versions",
317-
name, spec, version_list.len()
316+
name,
317+
spec,
318+
version_list.len()
318319
));
319320
return Err(anyhow::anyhow!(
320321
"No matching version found for {}@{}",
321-
name, spec
322+
name,
323+
spec
322324
));
323325
}
324326
},
@@ -407,7 +409,7 @@ pub async fn resolve(name: &str, spec: &str) -> Result<ResolvedPackage> {
407409
#[cfg(test)]
408410
mod tests {
409411
use super::*;
410-
use crate::service::cache::{VersionsInfo, Versions};
412+
use crate::service::cache::{Versions, VersionsInfo};
411413
use std::collections::HashMap;
412414

413415
/// Test dist-tags matching logic
@@ -455,7 +457,10 @@ mod tests {
455457
match result {
456458
Ok(resolved) => {
457459
assert_eq!(resolved.version, expected_version);
458-
println!("✓ {}@{} resolved to {}", "test-package", spec, resolved.version);
460+
println!(
461+
"✓ {}@{} resolved to {}",
462+
"test-package", spec, resolved.version
463+
);
459464
}
460465
Err(e) => {
461466
panic!("Failed to resolve {}@{}: {}", "test-package", spec, e);
@@ -480,7 +485,8 @@ mod tests {
480485
};
481486

482487
// Should fall back to semver matching
483-
let result = test_resolve_with_dist_tags(&versions_info_empty, "test-package", "^1.0.0").await;
488+
let result =
489+
test_resolve_with_dist_tags(&versions_info_empty, "test-package", "^1.0.0").await;
484490
match result {
485491
Ok(resolved) => {
486492
assert_eq!(resolved.version, "1.1.0"); // Should match highest semver
@@ -511,7 +517,10 @@ mod tests {
511517
match result {
512518
Ok(resolved) => {
513519
assert_eq!(resolved.version, "1.1.0"); // Should match highest semver
514-
println!("✓ Non-existent dist-tag fallback to semver: {}", resolved.version);
520+
println!(
521+
"✓ Non-existent dist-tag fallback to semver: {}",
522+
resolved.version
523+
);
515524
}
516525
Err(e) => {
517526
panic!("Failed to resolve with non-existent dist-tag: {}", e);
@@ -540,18 +549,21 @@ mod tests {
540549
};
541550

542551
let test_cases = vec![
543-
("^1.0.0", "1.2.0"), // Should match highest 1.x
544-
("~1.1.0", "1.1.0"), // Should match exact 1.1.x
552+
("^1.0.0", "1.2.0"), // Should match highest 1.x
553+
("~1.1.0", "1.1.0"), // Should match exact 1.1.x
545554
(">=1.0.0 <2.0.0", "1.2.0"), // Should match highest in range
546-
("2.x", "2.1.0"), // Should match highest 2.x
555+
("2.x", "2.1.0"), // Should match highest 2.x
547556
];
548557

549558
for (spec, expected_version) in test_cases {
550559
let result = test_resolve_with_dist_tags(&versions_info, "test-package", spec).await;
551560
match result {
552561
Ok(resolved) => {
553562
assert_eq!(resolved.version, expected_version);
554-
println!("✓ Semver fallback {}@{} resolved to {}", "test-package", spec, resolved.version);
563+
println!(
564+
"✓ Semver fallback {}@{} resolved to {}",
565+
"test-package", spec, resolved.version
566+
);
555567
}
556568
Err(e) => {
557569
panic!("Failed to resolve {}@{}: {}", "test-package", spec, e);
@@ -591,7 +603,8 @@ mod tests {
591603
last_updated: 1234567890,
592604
};
593605

594-
let result = test_resolve_with_dist_tags(&empty_versions_info, "test-package", "^1.0.0").await;
606+
let result =
607+
test_resolve_with_dist_tags(&empty_versions_info, "test-package", "^1.0.0").await;
595608
assert!(result.is_err(), "Should fail for empty version list");
596609
println!("✓ Correctly failed for empty version list");
597610
}
@@ -617,7 +630,8 @@ mod tests {
617630
None => {
618631
return Err(anyhow::anyhow!(
619632
"No matching version found for {}@{}",
620-
name, spec
633+
name,
634+
spec
621635
));
622636
}
623637
},

0 commit comments

Comments
 (0)