PR feedback

vercel · Sep 19, 2024 · 26e893a · 26e893a
1 parent ae983e0
commit 26e893a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/crates/turbo-trace/src/main.rs b/crates/turbo-trace/src/main.rs
@@ -30,7 +30,7 @@ fn main() -> Result<(), PathError> {
         .map(|f| AbsoluteSystemPathBuf::from_unknown(&abs_cwd, f))
         .collect();
 
-    let tracer = Tracer::new(files, abs_cwd, args.ts_config)?;
+    let tracer = Tracer::new(abs_cwd, files, args.ts_config)?;
 
     let result = tracer.trace();
 

diff --git a/crates/turbo-trace/src/tracer.rs b/crates/turbo-trace/src/tracer.rs
@@ -15,7 +15,6 @@ use turbopath::{AbsoluteSystemPathBuf, PathError};
 use crate::import_finder::ImportFinder;
 
 pub struct Tracer {
-    cwd: AbsoluteSystemPathBuf,
     files: Vec<AbsoluteSystemPathBuf>,
     seen: HashSet<AbsoluteSystemPathBuf>,
     ts_config: Option<AbsoluteSystemPathBuf>,
@@ -28,6 +27,8 @@ pub enum TraceError {
     FileNotFound(AbsoluteSystemPathBuf),
     #[error(transparent)]
     PathEncoding(PathError),
+    #[error("tracing a root file `{0}`, no parent found")]
+    RootFile(AbsoluteSystemPathBuf),
     #[error("failed to resolve import")]
     Resolve {
         #[label("import here")]
@@ -44,8 +45,8 @@ pub struct TraceResult {
 
 impl Tracer {
     pub fn new(
-        files: Vec<AbsoluteSystemPathBuf>,
         cwd: AbsoluteSystemPathBuf,
+        files: Vec<AbsoluteSystemPathBuf>,
         ts_config: Option<Utf8PathBuf>,
     ) -> Result<Self, PathError> {
         let ts_config =
@@ -54,7 +55,6 @@ impl Tracer {
         let seen = HashSet::new();
 
         Ok(Self {
-            cwd,
             files,
             seen,
             ts_config,
@@ -138,7 +138,10 @@ impl Tracer {
             // Convert found imports/requires to absolute paths and add them to files to
             // visit
             for (import, span) in finder.imports() {
-                let file_dir = file_path.parent().unwrap_or(&self.cwd);
+                let Some(file_dir) = file_path.parent() else {
+                    errors.push(TraceError::RootFile(file_path.to_owned()));
+                    continue;
+                };
                 match resolver.resolve(&file_dir, &import) {
                     Ok(resolved) => match resolved.into_path_buf().try_into() {
                         Ok(path) => self.files.push(path),

diff --git a/crates/turborepo-lib/src/query/file.rs b/crates/turborepo-lib/src/query/file.rs
@@ -39,8 +39,8 @@ impl File {
 
     async fn dependencies(&self) -> Result<Vec<File>, Error> {
         let tracer = Tracer::new(
-            vec![self.path.clone()],
             self.run.repo_root().to_owned(),
+            vec![self.path.clone()],
             None,
         )?;