Merge pull request #77 from rodneylab/fix__add_multiple_crate_version_support

fix: 💫 add support for muliple aliased crate versions

Author: rodneylab

src/domain/cargo_toml/mod.rs

@@ -82,7 +82,7 @@ impl File {
                     )
                 })
             }
-            CargoDependencyValue::Git(GitCargoDependency { git }) => {
+            CargoDependencyValue::Git(GitCargoDependency { git, .. }) => {
                 log::warn!(
                     "Git dependency `{git}` found, but version change detection for git \
                         dependencies is not currently supported"
@@ -101,6 +101,17 @@ impl File {
     ) -> anyhow::Result<()> {
         for (name, current_value) in current_dependencies {
             let current_version = Self::get_version(current_value)?;
+            let package_name = match current_value {
+                CargoDependencyValue::Simple(_) => name,
+                CargoDependencyValue::Git(GitCargoDependency { package, .. })
+                | CargoDependencyValue::Detailed(DetailedCargoDependency { package, .. }) => {
+                    if let Some(package_value) = package {
+                        package_value
+                    } else {
+                        name
+                    }
+                }
+            };
             if let Some(previous_value) = previous_dependencies.get(name) {
                 // Handle dependencies in previous and current (filtering for ones with changed
                 // versions)
@@ -116,13 +127,13 @@ impl File {
                         if let Some(label_value) = label {
                             let _ =
                                 writeln!(result,
-                                "{change_type} bump {name} {label_value} from {previous_version} \
+                                "{change_type} bump {package_name} {label_value} from {previous_version} \
                                     to {current_version}",
                             );
                         } else {
                             let _ = writeln!(
                                 result,
-                                "{change_type} bump {name} from {previous_version} to \
+                                "{change_type} bump {package_name} from {previous_version} to \
                                     {current_version}",
                             );
                         }
@@ -131,27 +142,27 @@ impl File {
                     Some(Ordering::Less) => {
                         if let Some(label_value) = label {
                             let _ = writeln!(result,
-                            "{change_type} drop {name} {label_value} from {previous_version} to \
+                            "{change_type} drop {package_name} {label_value} from {previous_version} to \
                                 {current_version}"
                         );
                         } else {
                             let _ = writeln!(
                                 result,
-                                "{change_type} drop {name} from {previous_version} to \
+                                "{change_type} drop {package_name} from {previous_version} to \
                                 {current_version}"
                             );
                         }
                     }
                     None => {
                         if let Some(label_value) = label {
                             let _ = writeln!(result,
-                                "{change_type} change {name} {label_value} from {previous_version} \
+                                "{change_type} change {package_name} {label_value} from {previous_version} \
                                 to {current_version}\n"
                             );
                         } else {
                             let _ = writeln!(
                                 result,
-                                "{change_type} change {name} from {previous_version} to \
+                                "{change_type} change {package_name} from {previous_version} to \
                                 {current_version}"
                             );
                         }
@@ -160,9 +171,12 @@ impl File {
             } else {
                 // Handle added dependencies
                 if let Some(label_value) = label {
-                    let _ = writeln!(result, "✨ add {name} {label_value} {current_version}");
+                    let _ = writeln!(
+                        result,
+                        "✨ add {package_name} {label_value} {current_version}"
+                    );
                 } else {
-                    let _ = writeln!(result, "✨ add {name} {current_version}");
+                    let _ = writeln!(result, "✨ add {package_name} {current_version}");
                 }
             }
         }
@@ -190,24 +204,40 @@ impl File {
 
         // Handle removed dependencies
         for name in previous_keys {
-            let version = match previous_dependencies
+            let (version, package_name): (SemverVersion, &str) = match previous_dependencies
                 .get(&name)
                 .expect("Previous dependencies should include this dependency.")
             {
-                CargoDependencyValue::Simple(version) => SemverVersion::new(version).unwrap(),
-                CargoDependencyValue::Detailed(DetailedCargoDependency { version, .. }) => {
-                    SemverVersion::new(version)
-                        .expect("Previous dependencies should include this dependency.")
+                CargoDependencyValue::Simple(version) => {
+                    let version = SemverVersion::new(version).unwrap();
+                    (version, &name)
+                }
+                CargoDependencyValue::Detailed(DetailedCargoDependency { package, version }) => {
+                    let version = SemverVersion::new(version)
+                        .expect("Previous dependencies should include this dependency.");
+                    let name = if let Some(package_value) = package {
+                        package_value
+                    } else {
+                        &name
+                    };
+                    (version, name)
                 }
-                CargoDependencyValue::Git(GitCargoDependency { git }) => {
+                CargoDependencyValue::Git(GitCargoDependency { git, package }) => {
                     log::warn!("Git dependency `{git}` found, but version change detection for git dependencies is not currently supported");
-                    SemverVersion::new("0").expect("`0` should be a valid semver version")
+                    let version =
+                        SemverVersion::new("0").expect("`0` should be a valid semver version");
+                    let name = if let Some(package_value) = package {
+                        package_value
+                    } else {
+                        &name
+                    };
+                    (version, name)
                 }
             };
             if let Some(label_value) = label {
-                let _ = writeln!(result, "🗑️ remove {name} {label_value} {version}");
+                let _ = writeln!(result, "🗑️ remove {package_name} {label_value} {version}");
             } else {
-                let _ = writeln!(result, "🗑️ remove {name} {version}");
+                let _ = writeln!(result, "🗑️ remove {package_name} {version}");
             }
         }
 
@@ -290,6 +320,7 @@ pub struct DetailedCargoDependency {
     // #[allow(dead_code, reason = "Field needed for deserialisation")]
     #[allow(dead_code)]
     version: String,
+    package: Option<String>,
 }
 
 #[derive(Debug, Deserialize, PartialEq)]
@@ -298,6 +329,7 @@ pub struct GitCargoDependency {
     // #[allow(dead_code, reason = "Field needed for deserialisation")]
     #[allow(dead_code)]
     git: String,
+    package: Option<String>,
 }
 
 #[derive(Debug, Deserialize, PartialEq)]

src/domain/cargo_toml/snapshots/rust_crate_diffs__domain__cargo_toml__tests__new_from_buffer_creates_expected_config.snap

@@ -1,6 +1,5 @@
 ---
 source: src/domain/cargo_toml/tests.rs
 expression: "format!(\"{outcome:?}\")"
-snapshot_kind: text
 ---
-File { dependencies: {"ahash": Simple("0.8.11"), "clap": Detailed(DetailedCargoDependency { version: "4.5.23" }), "clap-verbosity-flag": Simple("3.0.1"), "config": Simple("0.14.1"), "env_logger": Simple("0.11.5"), "git2": Simple("0.19.0"), "log": Simple("0.4.22"), "serde": Detailed(DetailedCargoDependency { version: "1.0.215" }), "sqlx": Detailed(DetailedCargoDependency { version: "0.8.2" })}, build_dependencies: None, dev_dependencies: Some({"assert_fs": Simple("1.1.2"), "trycmd": Simple("0.15.8")}) }
+File { dependencies: {"ahash": Simple("0.8.11"), "clap": Detailed(DetailedCargoDependency { version: "4.5.23", package: None }), "clap-verbosity-flag": Simple("3.0.1"), "config": Simple("0.14.1"), "env_logger": Simple("0.11.5"), "git2": Simple("0.19.0"), "log": Simple("0.4.22"), "serde": Detailed(DetailedCargoDependency { version: "1.0.215", package: None }), "sqlx": Detailed(DetailedCargoDependency { version: "0.8.2", package: None })}, build_dependencies: None, dev_dependencies: Some({"assert_fs": Simple("1.1.2"), "trycmd": Simple("0.15.8")}) }

src/domain/cargo_toml/snapshots/rust_crate_diffs__domain__cargo_toml__tests__new_successfully_parses_valid_cargo_toml_dependencies.snap

@@ -1,22 +1,24 @@
 ---
 source: src/domain/cargo_toml/tests.rs
 expression: dependencies
-snapshot_kind: text
 ---
 {
   "ahash": "0.8.11",
   "clap": {
-    "version": "4.5.23"
+    "version": "4.5.23",
+    "package": null
   },
   "clap-verbosity-flag": "3.0.1",
   "config": "0.14.1",
   "env_logger": "0.11.5",
   "git2": "0.19.0",
   "log": "0.4.22",
   "serde": {
-    "version": "1.0.215"
+    "version": "1.0.215",
+    "package": null
   },
   "sqlx": {
-    "version": "0.8.2"
+    "version": "0.8.2",
+    "package": null
   }
 }

src/domain/cargo_toml/tests.rs

@@ -61,14 +61,16 @@ fn new_successfully_parses_valid_cargo_toml_dependencies() {
     assert_eq!(
         dependencies.get("serde"),
         Some(CargoDependencyValue::Detailed(DetailedCargoDependency {
-            version: String::from("1.0.215")
+            version: String::from("1.0.215"),
+            package: None
         }))
         .as_ref()
     );
     assert_eq!(
         dependencies.get("sqlx"),
         Some(CargoDependencyValue::Detailed(DetailedCargoDependency {
-            version: String::from("0.8.2")
+            version: String::from("0.8.2"),
+            package: None
         }))
         .as_ref()
     );
@@ -627,3 +629,142 @@ fn new_from_buffer_creates_expected_config() {
     // assert
     insta::assert_snapshot!(format!("{outcome:?}"));
 }
+
+#[test]
+fn get_changes_from_current_dependencies_emits_package_field_for_name_when_present() {
+    // arrange
+    let updated_cargo_toml_content = r#"[package]
+name = "some-example-crate"
+version = "0.1.0"
+authors = ["Rust Coder <[email protected]>"]
+edition = "2024"
+license = "BSD-3-Clause"
+repository = "https://github.com/example/example-repo"
+rust-version = "1.75"
+description = "An example Rust app"
+
+[dependencies]
+getrandom = { version = "0.3.2", features = ["wasm_js"] }
+getrandom2 = { package = "getrandom", version = "0.2.15", features = ["js"] }
+"#;
+
+    let earlier_cargo_toml_content = r#"[package]
+name = "some-example-crate"
+version = "0.1.0"
+authors = ["Rust Coder <[email protected]>"]
+edition = "2024"
+license = "BSD-3-Clause"
+repository = "https://github.com/example/example-repo"
+rust-version = "1.75"
+description = "An example Rust app"
+
+[dependencies]
+getrandom = { version = "0.3", features = ["wasm_js"] }
+getrandom2 = { package = "getrandom", version = "0.2.1", features = ["js"] }
+"#;
+    // assert
+    let updated_cargo_toml = File::new_from_str(updated_cargo_toml_content).unwrap();
+    let earlier_cargo_toml = File::new_from_str(earlier_cargo_toml_content).unwrap();
+
+    // act
+    let output = updated_cargo_toml
+        .print_changes_versus_previous_version(&earlier_cargo_toml)
+        .unwrap();
+
+    // assert
+    assert_eq!(
+        output,
+        String::from(
+            "🤷 bump getrandom from 0.3 to 0.3.2\n📦 bump getrandom from 0.2.1 to 0.2.15\n"
+        )
+    );
+}
+
+#[test]
+fn get_changes_from_current_dependencies_emits_package_field_for_name_when_present_and_tracks_changed_alias(
+) {
+    // arrange
+    let updated_cargo_toml_content = r#"[package]
+name = "some-example-crate"
+version = "0.1.0"
+authors = ["Rust Coder <[email protected]>"]
+edition = "2024"
+license = "BSD-3-Clause"
+repository = "https://github.com/example/example-repo"
+rust-version = "1.75"
+description = "An example Rust app"
+
+[dependencies]
+getrandom = { version = "0.3.2", features = ["wasm_js"] }
+getrandom2 = { package = "getrandom", version = "0.2.15", features = ["js"] }
+"#;
+
+    let earlier_cargo_toml_content = r#"[package]
+name = "some-example-crate"
+version = "0.1.0"
+authors = ["Rust Coder <[email protected]>"]
+edition = "2024"
+license = "BSD-3-Clause"
+repository = "https://github.com/example/example-repo"
+rust-version = "1.75"
+description = "An example Rust app"
+
+[dependencies]
+getrandom_current = { version = "0.3", features = ["wasm_js"] }
+getrandom_previous = { package = "getrandom", version = "0.2.1", features = ["js"] }
+"#;
+    // assert
+    let updated_cargo_toml = File::new_from_str(updated_cargo_toml_content).unwrap();
+    let earlier_cargo_toml = File::new_from_str(earlier_cargo_toml_content).unwrap();
+
+    // act
+    let output = updated_cargo_toml
+        .print_changes_versus_previous_version(&earlier_cargo_toml)
+        .unwrap();
+
+    // assert
+    assert_eq!(
+        output,
+        String::from(
+   "✨ add getrandom 0.3.2\n✨ add getrandom 0.2.15\n🗑\u{fe0f} remove getrandom_current 0.3\n🗑\u{fe0f} remove getrandom 0.2.1\n"
+        )
+    );
+}
+
+#[test]
+fn get_changes_from_current_dependencies_reports_addition_and_removal_of_git_dependencies() {
+    // arrange
+    let updated_cargo_toml_content = r#"[package]
+name = "gpui-tryout"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+gpui = { git = "https://github.com/zed-industries/zed", rev = "f1af2a4a58b4e48a0ce442181120859cd4df4b30" } # v0.174.4
+http_client = { git = "https://github.com/zed-industries/zed", rev = "f1af2a4a58b4e48a0ce442181120859cd4df4b30" } # v0.174.4
+"#;
+
+    let earlier_cargo_toml_content = r#"[package]
+name = "gpui-tryout"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+gpui = { git = "https://github.com/zed-industries/zed", rev = "a3f070195111f8d80111cd73b8a26d7aa2228040" } # v0.171.6
+reqwest_client = { git = "https://github.com/zed-industries/zed", rev = "a3f070195111f8d80111cd73b8a26d7aa2228040" } # v0.171.6
+"#;
+    // assert
+    let updated_cargo_toml = File::new_from_str(updated_cargo_toml_content).unwrap();
+    let earlier_cargo_toml = File::new_from_str(earlier_cargo_toml_content).unwrap();
+
+    // act
+    let output = updated_cargo_toml
+        .print_changes_versus_previous_version(&earlier_cargo_toml)
+        .unwrap();
+
+    // assert
+    assert_eq!(
+        output,
+        String::from("✨ add http_client 0\n🗑\u{fe0f} remove reqwest_client 0\n")
+    );
+}