install: migrate workspace packages from yarn.lock

src/install/lockfile/bun.lock.rs

@@ -3358,23 +3358,7 @@ pub(crate) fn resolve_peer_dep_version_based(
     string_buf: &[u8],
 ) -> Option<PackageID> {
     let range = deferred_peer_range(dep, catalogs, string_buf)?;
-    // `package_index` is keyed by real package names; `range` (not `dep.name`) carries them for aliases.
-    let name_hash = match range.tag {
-        DependencyVersionTag::Npm => StringBuilder::string_hash(range.npm().name.slice(string_buf)),
-        DependencyVersionTag::DistTag => {
-            StringBuilder::string_hash(range.dist_tag().name.slice(string_buf))
-        }
-        DependencyVersionTag::Git => {
-            StringBuilder::string_hash(range.git().package_name.slice(string_buf))
-        }
-        DependencyVersionTag::Github => {
-            StringBuilder::string_hash(range.github().package_name.slice(string_buf))
-        }
-        DependencyVersionTag::Tarball => {
-            StringBuilder::string_hash(range.tarball().package_name.slice(string_buf))
-        }
-        _ => dep.name_hash,
-    };
+    let name_hash = peer_candidate_name_hash(dep, range, string_buf);
 
     // The fresh resolver rewrites the name and range through
     // `lockfile.overrides` (and any catalog entry an override points at)
@@ -3396,6 +3380,41 @@ pub(crate) fn resolve_peer_dep_version_based(
         return None;
     }
 
+    resolve_peer_dep_by_range(range, name_hash, package_index, pkg_resolutions, string_buf)
+}
+
+/// `package_index` is keyed by real package names; `range` (not `dep.name`) carries them for aliases.
+pub(crate) fn peer_candidate_name_hash(
+    dep: &Dependency,
+    range: &DependencyVersion,
+    string_buf: &[u8],
+) -> PackageNameHash {
+    match range.tag {
+        DependencyVersionTag::Npm => StringBuilder::string_hash(range.npm().name.slice(string_buf)),
+        DependencyVersionTag::DistTag => {
+            StringBuilder::string_hash(range.dist_tag().name.slice(string_buf))
+        }
+        DependencyVersionTag::Git => {
+            StringBuilder::string_hash(range.git().package_name.slice(string_buf))
+        }
+        DependencyVersionTag::Github => {
+            StringBuilder::string_hash(range.github().package_name.slice(string_buf))
+        }
+        DependencyVersionTag::Tarball => {
+            StringBuilder::string_hash(range.tarball().package_name.slice(string_buf))
+        }
+        _ => dep.name_hash,
+    }
+}
+
+/// The scan itself; the yarn.lock migration also binds `*` and overridden peers with it.
+pub(crate) fn resolve_peer_dep_by_range(
+    range: &DependencyVersion,
+    name_hash: PackageNameHash,
+    package_index: &PackageIndexMap,
+    pkg_resolutions: &[Resolution],
+    string_buf: &[u8],
+) -> Option<PackageID> {
     let entry = package_index.get(&name_hash)?;
     let candidates: &[PackageID] = match entry {
         PackageIndexEntry::Id(id) => core::slice::from_ref(id),

src/install/migration.rs

@@ -76,7 +76,7 @@ pub fn detect_and_load_other_lockfile<'a>(
         let Ok(data) = File::read_from(dir, b"yarn.lock") else {
             break 'yarn;
         };
-        let migrate_result = match yarn::migrate_yarn_lockfile(this, manager, log, &data, dir) {
+        let migrate_result = match yarn::migrate_yarn_lockfile(this, manager, log, &data) {
             Ok(r) => r,
             Err(e) => {
                 return LoadResult::Err(LoadResultErr {