feat(scheduler): extract deps versions from yarn.lock (TabbyML#1711)

Closes TabbyML#876

Author: G07cha

Cargo.lock

@@ -32,6 +32,7 @@ tokio-cron-scheduler = { workspace = true }
 tokio = { workspace = true, features = ["process"] }
 package-lock-json-parser = "0.4.0"
 npm-package-json = "0.1.3"
+yarn-lock-parser = "0.7.0"
 
 [dev-dependencies]
 temp_testdir = "0.2"

crates/tabby-scheduler/Cargo.toml

@@ -48,52 +48,86 @@ pub fn process_package_lock_json(path: &Path) -> Result<Vec<Package>> {
     }
 }
 
+pub fn process_yarn_lock(path: &Path) -> Result<Vec<Package>> {
+    let yarn_lock_file = path.join("yarn.lock");
+    let yarn_lock_contents = read_to_string(yarn_lock_file)?;
+    let lockfile_packages = yarn_lock_parser::parse_str(&yarn_lock_contents)?;
+    let package_json_deps = process_package_json(path)?;
+
+    let mut deps = HashSet::new();
+
+    for package_dep in package_json_deps {
+        let version = lockfile_packages
+            .binary_search_by(|p| p.name.cmp(&package_dep.name))
+            .map_or(package_dep.version, |dep| {
+                Some(lockfile_packages[dep].version.to_string())
+            });
+
+        deps.insert(Package {
+            version,
+            ..package_dep
+        });
+    }
+
+    Ok(deps.into_iter().collect())
+}
+
 #[cfg(test)]
 mod tests {
     use std::{env, path::PathBuf};
 
     use super::*;
 
+    thread_local! {
+            static EXPECTED_DEPS: Vec<Package> = Vec::from([
+                Package {
+                    language: String::from("javascript"),
+                    name: String::from("fsevents"),
+                    version: Some(String::from("2.2.2")),
+                },
+                Package {
+                    language: String::from("javascript"),
+                    name: String::from("react"),
+                    version: Some(String::from("18.2.0")),
+                },
+                Package {
+                    language: String::from("javascript"),
+                    name: String::from("vite"),
+                    version: Some(String::from("5.1.4")),
+                },
+                Package {
+                    language: String::from("javascript"),
+                    name: String::from("zustand"),
+                    version: Some(String::from("4.5.1")),
+                },
+            ]);
+    }
+
     #[test]
     fn it_parses_top_level_deps_from_package_lock() -> Result<()> {
-        let mut expected_deps = Vec::from([
-            Package {
-                language: String::from("javascript"),
-                name: String::from("fsevents"),
-                version: Some(String::from("2.2.2")),
-            },
-            Package {
-                language: String::from("javascript"),
-                name: String::from("react"),
-                version: Some(String::from("18.2.0")),
-            },
-            Package {
-                language: String::from("javascript"),
-                name: String::from("vite"),
-                version: Some(String::from("5.1.4")),
-            },
-            Package {
-                language: String::from("javascript"),
-                name: String::from("zustand"),
-                version: Some(String::from("4.5.1")),
-            },
-        ]);
-        let project_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
-        let test_fixtures_path = project_path.join("testdata");
-        let mut deps = process_package_lock_json(test_fixtures_path.as_path())?;
-
-        deps.sort();
-        expected_deps.sort();
-
-        assert_eq!(deps, expected_deps);
-        Ok(())
+        EXPECTED_DEPS.with(|expected_deps| {
+            let project_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
+            let test_fixtures_path = project_path.join("testdata");
+            let mut deps = process_package_lock_json(test_fixtures_path.as_path())?;
+
+            deps.sort();
+
+            assert_eq!(expected_deps, &deps);
+            Ok(())
+        })
     }
 
     #[test]
-    fn it_does_not_panic() {
-        let temp_dir = env::temp_dir();
-        let res = process_package_lock_json(temp_dir.as_path());
+    fn it_parses_top_level_deps_from_yarn_lock() -> Result<()> {
+        EXPECTED_DEPS.with(|expected_deps| {
+            let project_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
+            let test_fixtures_path = project_path.join("testdata");
+            let mut deps = process_yarn_lock(test_fixtures_path.as_path())?;
 
-        assert!(res.is_err());
+            deps.sort();
+
+            assert_eq!(expected_deps, &deps);
+            Ok(())
+        })
     }
 }

crates/tabby-scheduler/src/dataset/deps/javascript.rs

@@ -19,6 +19,10 @@ pub fn collect(path: &Path, file: &mut DependencyFile) {
         file.direct.append(&mut deps);
     }
 
+    if let Ok(mut deps) = javascript::process_yarn_lock(path) {
+        file.direct.append(&mut deps);
+    }
+
     // Remove duplicates across sources.
     let deps = file.direct.clone().into_iter().collect::<HashSet<_>>();
     file.direct = deps.into_iter().collect();