这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(bun): deserialize correctly and use optionalPeers #10219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 31, 2025
Merged

fix(bun): deserialize correctly and use optionalPeers #10219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a372f5f
Properly use all dependencies by fixing deserialization and accountin…
camero2734 Mar 22, 2025
18efc2f
Update tests
camero2734 Mar 22, 2025
ae9cc5f
Return missing package error string back to the way it was before
camero2734 Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/turborepo-lockfiles/src/bun/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,16 @@ mod test {
dependencies: Some(("is-number".into(), "^6.0.0".into()))
.into_iter()
.collect(),
dev_dependencies: Some(("is-bigint".into(), "1.1.0".into()))
.into_iter()
.collect(),
peer_dependencies: Some(("is-even".into(), "1.0.0".into()))
.into_iter()
.collect(),
optional_peers: Some("is-even".into()).into_iter().collect(),
optional_dependencies: Some(("is-regexp".into(), "1.0.0".into()))
.into_iter()
.collect(),
..Default::default()
}),
checksum: Some("sha".into()),
Expand Down Expand Up @@ -193,7 +203,7 @@ mod test {
);
#[test_case(json!({"name": "bun-test", "devDependencies": {"turbo": "^2.3.3"}}), basic_workspace() ; "basic")]
#[test_case(json!({"name": "docs", "version": "0.1.0"}), workspace_with_version() ; "with version")]
#[test_case(json!(["is-odd@3.0.1", "", {"dependencies": {"is-number": "^6.0.0"}}, "sha"]), registry_pkg() ; "registry package")]
#[test_case(json!(["is-odd@3.0.1", "", {"dependencies": {"is-number": "^6.0.0"}, "devDependencies": {"is-bigint": "1.1.0"}, "peerDependencies": {"is-even": "1.0.0"}, "optionalDependencies": {"is-regexp": "1.0.0"}, "optionalPeers": ["is-even"]}, "sha"]), registry_pkg() ; "registry package")]
#[test_case(json!(["docs", {"dependencies": {"is-odd": "3.0.1"}}]), workspace_pkg() ; "workspace package")]
#[test_case(json!(["some-package@root:", {"bin": "bin", "binDir": "binDir"}]), root_pkg() ; "root package")]
fn test_deserialization<T: for<'a> Deserialize<'a> + PartialEq + std::fmt::Debug>(
Expand Down
16 changes: 15 additions & 1 deletion crates/turborepo-lockfiles/src/bun/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct PackageEntry {
}

#[derive(Debug, Deserialize, Default, PartialEq, Clone, Serialize)]
#[serde(rename_all = "camelCase")]
struct PackageInfo {
#[serde(default, skip_serializing_if = "Map::is_empty")]
dependencies: Map<String, String>,
Expand All @@ -92,6 +93,8 @@ struct PackageInfo {
optional_dependencies: Map<String, String>,
#[serde(default, skip_serializing_if = "Map::is_empty")]
peer_dependencies: Map<String, String>,
#[serde(default, skip_serializing_if = "HashSet::is_empty")]
optional_peers: HashSet<String>,
// We do not care about the rest here
// the values here should be generic
#[serde(flatten)]
Expand Down Expand Up @@ -163,9 +166,20 @@ impl Lockfile for BunLockfile {
.ok_or_else(|| crate::Error::MissingPackage(key.into()))?;

let mut deps = HashMap::new();
for (dependency, version) in entry.info.iter().flat_map(|info| info.all_dependencies()) {

let Some(info) = &entry.info else {
return Ok(Some(deps));
};

let optional_peers = &info.optional_peers;
for (dependency, version) in info.all_dependencies() {
let parent_key = format!("{entry_key}/{dependency}");
let Some((dep_key, _)) = self.package_entry(&parent_key) else {
// This is an optional peer dependency
if optional_peers.contains(&dependency.to_string()) {
continue;
}

return Err(crate::Error::MissingPackage(dependency.to_string()));
};
deps.insert(dep_key.to_string(), version.to_string());
Expand Down
12 changes: 11 additions & 1 deletion crates/turborepo-lockfiles/src/bun/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ mod test {
dependencies: Some(("is-number".into(), "^6.0.0".into()))
.into_iter()
.collect(),
dev_dependencies: Some(("is-bigint".into(), "1.1.0".into()))
.into_iter()
.collect(),
peer_dependencies: Some(("is-even".into(), "1.0.0".into()))
.into_iter()
.collect(),
optional_peers: Some("is-even".into()).into_iter().collect(),
optional_dependencies: Some(("is-regexp".into(), "1.0.0".into()))
.into_iter()
.collect(),
..Default::default()
}),
checksum: Some("sha".into()),
Expand Down Expand Up @@ -143,7 +153,7 @@ mod test {
);
#[test_case(json!({"name": "bun-test", "devDependencies": {"turbo": "^2.3.3"}}), basic_workspace() ; "basic")]
#[test_case(json!({"name": "docs", "version": "0.1.0"}), workspace_with_version() ; "with version")]
#[test_case(json!(["is-odd@3.0.1", "", {"dependencies": {"is-number": "^6.0.0"}}, "sha"]), registry_pkg() ; "registry package")]
#[test_case(json!(["is-odd@3.0.1", "", {"dependencies": {"is-number": "^6.0.0"}, "devDependencies": {"is-bigint": "1.1.0"}, "peerDependencies": {"is-even": "1.0.0"}, "optionalDependencies": {"is-regexp": "1.0.0"}, "optionalPeers": ["is-even"]}, "sha"]), registry_pkg() ; "registry package")]
#[test_case(json!(["docs", {"dependencies": {"is-odd": "3.0.1"}}]), workspace_pkg() ; "workspace package")]
#[test_case(json!(["some-package@root:", {"bin": "bin", "binDir": "binDir"}]), root_pkg() ; "root package")]
fn test_serialization<T: Serialize + PartialEq + std::fmt::Debug>(
Expand Down
Loading