-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
feat(query): map file to package #9174
Open
NicholasLYang
wants to merge
7
commits into
main
Choose a base branch
from
nicholasyang/file-to-package
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+331
−40
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fc933df
Map file to package and affected packages
NicholasLYang 0707262
Adding tests and fixing up types
NicholasLYang 0a57cb9
Fixing up and adding tests
NicholasLYang 8181982
Fix test
NicholasLYang 2950f53
PR feedback
NicholasLYang 5bcc3e4
Fix test
NicholasLYang 81f96ba
Revert test
NicholasLYang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,19 @@ | ||
use std::sync::Arc; | ||
|
||
use async_graphql::{Object, SimpleObject}; | ||
use async_graphql::{Object, SimpleObject, Union}; | ||
use camino::Utf8PathBuf; | ||
use itertools::Itertools; | ||
use swc_ecma_ast::EsVersion; | ||
use swc_ecma_parser::{EsSyntax, Syntax, TsSyntax}; | ||
use turbo_trace::Tracer; | ||
use turbopath::AbsoluteSystemPathBuf; | ||
use turborepo_repository::{ | ||
change_mapper::{ChangeMapper, GlobalDepsPackageChangeMapper}, | ||
package_graph::PackageNode, | ||
}; | ||
|
||
use crate::{ | ||
query::{Array, Error}, | ||
query::{package::Package, Array, Error, PackageChangeReason}, | ||
run::Run, | ||
}; | ||
|
||
|
@@ -135,23 +139,119 @@ impl TraceResult { | |
} | ||
} | ||
|
||
#[derive(SimpleObject)] | ||
struct All { | ||
reason: PackageChangeReason, | ||
count: usize, | ||
} | ||
|
||
#[derive(Union)] | ||
enum PackageMapping { | ||
All(All), | ||
Package(Package), | ||
} | ||
|
||
impl File { | ||
fn get_package(&self) -> Result<Option<PackageMapping>, Error> { | ||
let change_mapper = ChangeMapper::new( | ||
self.run.pkg_dep_graph(), | ||
vec![], | ||
GlobalDepsPackageChangeMapper::new( | ||
self.run.pkg_dep_graph(), | ||
self.run | ||
.root_turbo_json() | ||
.global_deps | ||
.iter() | ||
.map(|dep| dep.as_str()), | ||
)?, | ||
); | ||
|
||
// If the file is not in the repo, we can't get the package | ||
let Ok(anchored_path) = self.run.repo_root().anchor(&self.path) else { | ||
return Ok(None); | ||
}; | ||
|
||
let package = change_mapper | ||
.package_detector() | ||
.detect_package(&anchored_path); | ||
|
||
match package { | ||
turborepo_repository::change_mapper::PackageMapping::All(reason) => { | ||
Ok(Some(PackageMapping::All(All { | ||
reason: reason.into(), | ||
count: self.run.pkg_dep_graph().len(), | ||
}))) | ||
} | ||
turborepo_repository::change_mapper::PackageMapping::Package((package, _)) => { | ||
Ok(Some(PackageMapping::Package(Package { | ||
run: self.run.clone(), | ||
name: package.name.clone(), | ||
}))) | ||
} | ||
turborepo_repository::change_mapper::PackageMapping::None => Ok(None), | ||
} | ||
} | ||
} | ||
|
||
#[Object] | ||
impl File { | ||
async fn contents(&self) -> Result<String, Error> { | ||
let contents = self.path.read_to_string()?; | ||
Ok(contents) | ||
Ok(self.path.read_to_string()?) | ||
} | ||
|
||
async fn path(&self) -> Result<String, Error> { | ||
Ok(self | ||
.run | ||
// This is `Option` because the file may not be in the repo | ||
async fn path(&self) -> Option<String> { | ||
self.run | ||
.repo_root() | ||
.anchor(&self.path) | ||
.map(|path| path.to_string())?) | ||
.ok() | ||
.map(|path| path.to_string()) | ||
} | ||
|
||
async fn absolute_path(&self) -> Result<String, Error> { | ||
Ok(self.path.to_string()) | ||
async fn absolute_path(&self) -> String { | ||
self.path.to_string() | ||
} | ||
|
||
async fn package(&self) -> Result<Option<PackageMapping>, Error> { | ||
self.get_package() | ||
} | ||
|
||
/// Gets the affected packages for the file, i.e. all packages that depend | ||
/// on the file. | ||
async fn affected_packages(&self) -> Result<Array<Package>, Error> { | ||
match self.get_package() { | ||
Ok(Some(PackageMapping::All(_))) => Ok(self | ||
.run | ||
.pkg_dep_graph() | ||
.packages() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this need to be sorted? |
||
.map(|(name, _)| Package { | ||
run: self.run.clone(), | ||
name: name.clone(), | ||
}) | ||
.sorted_by(|a, b| a.name.cmp(&b.name)) | ||
.collect()), | ||
Ok(Some(PackageMapping::Package(package))) => { | ||
let node: PackageNode = PackageNode::Workspace(package.name.clone()); | ||
Ok(self | ||
.run | ||
.pkg_dep_graph() | ||
.ancestors(&node) | ||
.iter() | ||
.map(|package| Package { | ||
run: self.run.clone(), | ||
name: package.as_package_name().clone(), | ||
}) | ||
// Add the package itself to the list | ||
.chain(std::iter::once(Package { | ||
run: self.run.clone(), | ||
name: package.name.clone(), | ||
})) | ||
.sorted_by(|a, b| a.name.cmp(&b.name)) | ||
.collect()) | ||
} | ||
Ok(None) => Ok(Array::new()), | ||
Err(e) => Err(e), | ||
} | ||
} | ||
|
||
async fn dependencies(&self, depth: Option<usize>, ts_config: Option<String>) -> TraceResult { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Union types in GraphQL are pretty annoying. Maybe I should change this to just return all the packages? I'm a little worried that could be too much data.