Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions crates/turborepo-repository/src/package_graph/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,7 @@ impl<'a, T: PackageDiscovery + Send + Sync> BuildState<'a, ResolvedPackageManage
package_manager,
knowledge,
relationship_knowledge,
relationship_projections: std::sync::OnceLock::new(),
deferred_closures: std::sync::Mutex::new(None),
external_dep_to_internal_dependents: std::sync::OnceLock::new(),
root_internal_dependencies: std::sync::OnceLock::new(),
Expand Down Expand Up @@ -1320,6 +1321,7 @@ impl<T: PackageDiscovery + Send + Sync> BuildState<'_, ResolvedLockfile, T> {
lockfile: arc_lockfile,
knowledge,
relationship_knowledge,
relationship_projections: std::sync::OnceLock::new(),
deferred_closures: std::sync::Mutex::new(deferred_closures),
external_dep_to_internal_dependents: std::sync::OnceLock::new(),
root_internal_dependencies: std::sync::OnceLock::new(),
Expand Down Expand Up @@ -1998,6 +2000,65 @@ mod test {
"web should depend on ui, got: {:?}",
web_deps
);
let mut graph_ordering: Vec<_> = web_deps
.iter()
.filter_map(|node| match node {
PackageNode::Workspace(name) => Some(name.clone()),
PackageNode::Root => None,
})
.collect();
graph_ordering.sort();
let projected_ordering: Vec<_> = graph
.ordering_relationships()
.direct_dependencies(&web_name)
.expect("web is authoritative")
.cloned()
.collect();
assert_eq!(projected_ordering, graph_ordering);

let mut graph_dependencies: Vec<_> = graph
.dependencies(&PackageNode::Workspace(web_name.clone()))
.into_iter()
.filter_map(|node| match node {
PackageNode::Workspace(name) if name != &web_name => Some(name.clone()),
PackageNode::Root | PackageNode::Workspace(_) => None,
})
.collect();
graph_dependencies.sort();
assert_eq!(
graph
.filtering_relationships()
.transitive_dependencies(&web_name),
Some(graph_dependencies.clone())
);
assert_eq!(
graph.hash_relationships().dependency_inputs(&web_name),
Some(graph_dependencies)
);

let mut graph_dependents: Vec<_> = graph
.ancestors(&PackageNode::Workspace(ui_name.clone()))
.into_iter()
.filter_map(|node| match node {
PackageNode::Workspace(name) if name != &ui_name => Some(name.clone()),
PackageNode::Root | PackageNode::Workspace(_) => None,
})
.collect();
graph_dependents.sort();
assert_eq!(
graph
.filtering_relationships()
.transitive_dependents(&ui_name),
Some(graph_dependents.clone())
);
graph_dependents.push(ui_name.clone());
graph_dependents.sort();
assert_eq!(
graph
.affected_relationships()
.affected_by(std::slice::from_ref(&ui_name)),
Ok(graph_dependents)
);

// api -> utils (internal)
let api_deps = graph
Expand Down
123 changes: 122 additions & 1 deletion crates/turborepo-repository/src/package_graph/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@ use crate::{

pub mod builder;
mod dep_splitter;
mod projections;

pub use builder::{Error, PackageGraphBuilder};
pub use projections::{
AffectedRelationships, FilteringRelationships, HashRelationships, OrderingRelationships,
PruneDependencyMode, PruneRelationships, RelationshipProjectionError,
};

pub use crate::package_json::DependencyKind;

Expand Down Expand Up @@ -58,6 +63,7 @@ pub struct PackageGraph {
/// unresolved external declaration maps.
#[allow(dead_code)]
relationship_knowledge: Arc<RelationshipKnowledge>,
relationship_projections: OnceLock<projections::RelationshipProjections>,
/// Receiver for background transitive-closure computation when the graph
/// was built with deferred closures. Consumed (exactly once) by
/// [`Self::ensure_transitive_closures`].
Expand Down Expand Up @@ -281,6 +287,47 @@ pub struct ExternalDependencyChange {
}

impl PackageGraph {
fn relationship_projections(&self) -> &projections::RelationshipProjections {
self.relationship_projections.get_or_init(|| {
projections::RelationshipProjections::build(
&self.knowledge,
&self.relationship_knowledge,
)
})
}

/// Returns direct graph-forming relationships for task ordering.
///
/// The view shares this graph generation's immutable relationship index and
/// never exposes the structural [`PackageNode::Root`] sentinel.
pub fn ordering_relationships(&self) -> &OrderingRelationships {
self.relationship_projections().ordering()
}

/// Returns transitive relationships with root-implied filtering semantics.
pub fn filtering_relationships(&self) -> &FilteringRelationships {
self.relationship_projections().filtering()
}

/// Returns reverse ordering relationships for affectedness propagation.
pub fn affected_relationships(&self) -> &AffectedRelationships {
self.relationship_projections().affected()
}

/// Returns full transitive internal dependency inputs for hashing.
pub fn hash_relationships(&self) -> &HashRelationships {
self.relationship_projections().hash()
}

/// Returns install-oriented package relationships for pruning.
///
/// Required peers whose declaration names match authoritative workspaces
/// are included independently of classification and graph declaration
/// precedence; optional peers are excluded.
pub fn prune_relationships(&self) -> &PruneRelationships {
self.relationship_projections().prune()
}

pub fn builder(
repo_root: &AbsoluteSystemPath,
root_package_json: PackageJson,
Expand Down Expand Up @@ -2274,9 +2321,15 @@ mod test {
write(&["rust", "app", "src", "main.rs"], "fn main() {}\n");
write(
&["rust", "lib-a", "Cargo.toml"],
"[package]\nname = \"lib-a\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
"[package]\nname = \"lib-a\"\nversion = \"0.1.0\"\nedition = \
\"2021\"\n\n[dependencies]\nlib-b = { path = \"../lib-b\" }\n",
);
write(&["rust", "lib-a", "src", "lib.rs"], "");
write(
&["rust", "lib-b", "Cargo.toml"],
"[package]\nname = \"lib-b\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
);
write(&["rust", "lib-b", "src", "lib.rs"], "");
write(
&["Cargo.lock"],
r#"version = 4
Expand All @@ -2289,6 +2342,11 @@ dependencies = ["lib-a"]
[[package]]
name = "lib-a"
version = "0.1.0"
dependencies = ["lib-b"]

[[package]]
name = "lib-b"
version = "0.1.0"
"#,
);
}
Expand Down Expand Up @@ -2445,6 +2503,20 @@ version = "0.1.0"
app_deps.contains(&PackageNode::Workspace(PackageName::from("lib-a"))),
"app should depend on lib-a, got {app_deps:?}"
);
assert_eq!(
pkg_graph
.ordering_relationships()
.direct_dependencies(&PackageName::from("app"))
.map(|dependencies| dependencies.cloned().collect::<Vec<_>>()),
Some(vec![PackageName::from("lib-a")])
);
assert_eq!(
pkg_graph
.hash_relationships()
.dependency_inputs(&PackageName::from("app")),
Some(vec![PackageName::from("lib-a"), PackageName::from("lib-b")]),
"mixed repositories retain transitive native hash inputs"
);
let workspace_deps = pkg_graph
.immediate_dependencies(&PackageNode::Workspace(PackageName::from("acme")))
.unwrap();
Expand Down Expand Up @@ -2500,6 +2572,55 @@ version = "0.1.0"
.unwrap();

assert!(pkg_graph.validate().is_ok());
assert!(
pkg_graph.relationship_projections.get().is_none(),
"relationship projections must remain lazy for current consumers"
);

assert_eq!(
pkg_graph
.ordering_relationships()
.direct_dependencies(&PackageName::Root)
.map(|dependencies| dependencies.cloned().collect::<Vec<_>>()),
Some(Vec::new()),
"pure Cargo recognizes the root Turbo namespace without JS edges"
);
assert!(pkg_graph.relationship_projections.get().is_some());
let app = PackageName::from("app");
let expected_dependencies = vec![PackageName::from("lib-a"), PackageName::from("lib-b")];
assert_eq!(
pkg_graph.hash_relationships().dependency_inputs(&app),
Some(expected_dependencies.clone()),
"Cargo hash inputs include transitive path dependencies"
);
assert_eq!(
pkg_graph
.filtering_relationships()
.transitive_dependencies(&app),
Some(expected_dependencies.clone())
);
let mut graph_dependencies: Vec<_> = pkg_graph
.dependencies(&PackageNode::Workspace(app.clone()))
.into_iter()
.filter_map(|node| match node {
PackageNode::Workspace(name) if name != &app => Some(name.clone()),
PackageNode::Root | PackageNode::Workspace(_) => None,
})
.collect();
graph_dependencies.sort();
assert_eq!(graph_dependencies, expected_dependencies);
assert_eq!(
pkg_graph.prune_relationships().package_closure(
std::slice::from_ref(&app),
PruneDependencyMode::ProductionOnly,
),
Ok(vec![
PackageName::Root,
PackageName::from("app"),
PackageName::from("lib-a"),
PackageName::from("lib-b"),
])
);

assert!(
pkg_graph
Expand Down
Loading
Loading