feat(trace): more trace fixes

crates/turbo-trace/Cargo.toml

@@ -10,7 +10,7 @@ clap = { version = "4.5.17", features = ["derive"] }
 futures = { workspace = true }
 globwalk = { version = "0.1.0", path = "../turborepo-globwalk" }
 miette = { workspace = true, features = ["fancy"] }
-oxc_resolver = { version = "2.0.0" }
+oxc_resolver = { version = "2.1.0" }
 swc_common = { workspace = true, features = ["concurrent", "tty-emitter"] }
 swc_ecma_ast = { workspace = true }
 swc_ecma_parser = { workspace = true }

crates/turbo-trace/src/tracer.rs

@@ -59,14 +59,15 @@
         span: SourceSpan,
         #[source_code]
         text: String,
+        #[help]
+        reason: String,
     },
     #[error("failed to walk files")]
     GlobError(Arc<globwalk::WalkError>),
 }
 
 impl TraceResult {
-    #[allow(dead_code)]
     pub fn emit_errors(&self) {
         let handler = Handler::with_tty_emitter(
             ColorConfig::Auto,
             true,
@@ -152,8 +153,7 @@
             file_content.clone(),
         );
 
-        let syntax = if file_path.extension() == Some("ts") || file_path.extension() == Some("tsx")
-        {
+        let syntax = if matches!(file_path.extension(), Some("ts") | Some("tsx")) {
             Syntax::Typescript(TsSyntax {
                 tsx: file_path.extension() == Some("tsx"),
                 decorators: true,
@@ -211,6 +211,18 @@
                     debug!("built in: {:?}", err);
                 }
                 Err(err) => {
+                    // Try to resolve the import as a type import via `@/types/<import>`
+                    let type_package = format!("@types/{}", import);
+                    let resolved_type_import = resolver
+                        .resolve(file_path, type_package.as_str())
+                        .ok()
+                        .and_then(|resolved| resolved.into_path_buf().try_into().ok());
+
+                    if let Some(resolved_type_import) = resolved_type_import {
+                        files.push(resolved_type_import);
+                        continue;
+                    }
+
                     debug!("failed to resolve: {:?}", err);
                     let (start, end) = source_map.span_to_char_offset(&source_file, *span);
                     let start = start as usize;
@@ -221,8 +233,8 @@
                         file_path: file_path.to_string(),
                         span: SourceSpan::new(start.into(), (end - start).into()),
                         text: file_content.clone(),
+                        reason: err.to_string(),
                     });
-                    continue;
                 }
             }
         }
@@ -316,7 +328,14 @@
             .with_force_extension(EnforceExtension::Disabled)
             .with_extension(".ts")
             .with_extension(".tsx")
-            .with_module(self.cwd.join_component("node_modules").to_string())
+            .with_extension(".jsx")
+            .with_extension(".d.ts")
+            .with_extension(".mjs")
+            .with_extension(".cjs")
+            // Some packages export a `module` field instead of `main`. This is non-standard,
+            // but was a proposal at some point.
+            .with_main_field("module")
+            .with_main_field("types")
             // Condition names are used to determine which export to use when importing a module.
             // We add a bunch so oxc_resolver can resolve all kinds of imports.
             .with_condition_names(&["import", "require", "node", "default"]);

crates/turborepo-lib/src/query/file.rs

@@ -76,6 +76,7 @@ impl File {
 #[derive(SimpleObject, Debug, Default)]
 pub struct TraceError {
     message: String,
+    reason: String,
     path: Option<String>,
     import: Option<String>,
     start: Option<usize>,
@@ -113,6 +114,7 @@ impl From<turbo_trace::TraceError> for TraceError {
                 span,
                 text,
                 file_path,
+                reason,
                 ..
             } => {
                 let import = text
@@ -123,6 +125,7 @@ impl From<turbo_trace::TraceError> for TraceError {
                 TraceError {
                     message,
                     import,
+                    reason,
                     path: Some(file_path),
                     start: Some(span.offset()),
                     end: Some(span.offset() + span.len()),

crates/turborepo/tests/query.rs

@@ -78,7 +78,7 @@ fn test_trace_on_monorepo() -> Result<(), anyhow::Error> {
             "query",
             "get `apps/my-app/index.ts` with dependencies" => "query { file(path: \"apps/my-app/index.ts\") { path dependencies { files { items { path } } errors { items { message } } } } }",
             "get `packages/utils/index.ts` with dependents" => "query { file(path: \"packages/utils/index.ts\") { path dependents { files { items { path } } errors { items { message } } } } }",
-            "get `packages/another/index.js` with dependents" => "query { file(path: \"packages/another/index.js\") { path dependents { files { items { path } } errors { items { message } } } } }",
+            "get `packages/another/index.js` with dependents" => "query { file(path: \"packages/another/index.jsx\") { path dependents { files { items { path } } errors { items { message } } } } }",
         );
 
         Ok(())

crates/turborepo/tests/snapshots/query__turbo_trace_monorepo_get_`apps__my-app__index.ts`_with_dependencies_(npm@10.5.0).snap

@@ -13,7 +13,16 @@ expression: query_output
               "path": "apps/my-app/types.ts"
             },
             {
-              "path": "packages/another/index.js"
+              "path": "node_modules/@types/d3-scale/index.d.ts"
+            },
+            {
+              "path": "node_modules/@types/d3-time/index.d.ts"
+            },
+            {
+              "path": "packages/another/index.jsx"
+            },
+            {
+              "path": "packages/module-package/my-module.mjs"
             },
             {
               "path": "packages/utils/index.ts"

crates/turborepo/tests/snapshots/query__turbo_trace_monorepo_get_`packages__another__index.js`_with_dependents_(npm@10.5.0).snap

@@ -5,7 +5,7 @@ expression: query_output
 {
   "data": {
     "file": {
-      "path": "packages/another/index.js",
+      "path": "packages/another/index.jsx",
       "dependents": {
         "files": {
           "items": [

crates/turborepo/tests/snapshots/query__turbo_trace_monorepo_get_`packages__utils__index.ts`_with_dependents_(npm@10.5.0).snap

@@ -13,7 +13,7 @@ expression: query_output
               "path": "apps/my-app/index.ts"
             },
             {
-              "path": "packages/another/index.js"
+              "path": "packages/another/index.jsx"
             }
           ]
         },

turborepo-tests/integration/fixtures/turbo_trace_monorepo/apps/my-app/index.ts

@@ -1,4 +1,6 @@
 import { useMyHook } from "utils/my-hook";
 import ship from "utils";
-import { blackbeard } from "../../packages/another/index.js";
+import { blackbeard } from "../../packages/another/index.jsx";
 import { Pirate } from "@/types.ts";
+import { walkThePlank } from "module-package";
+import type { ScalePoint } from "d3-scale";

turborepo-tests/integration/fixtures/turbo_trace_monorepo/apps/my-app/package.json

@@ -5,6 +5,7 @@
     "maybefails": "exit 4"
   },
   "dependencies": {
-    "utils": "*"
+    "utils": "*",
+    "@types/d3-scale": "^4.0.2"
   }
 }

turborepo-tests/integration/fixtures/turbo_trace_monorepo/apps/my-app/types.ts

@@ -1,4 +1,4 @@
-import { blackbeard } from "@/../../packages/another/index.js";
+import { blackbeard } from "@/../../packages/another/index.jsx";
 
 export interface Pirate {
   ship: string;

turborepo-tests/integration/fixtures/turbo_trace_monorepo/packages/module-package/my-module.mjs

@@ -0,0 +1 @@
+export const walkThePlank = "walk the plank matey";

turborepo-tests/integration/fixtures/turbo_trace_monorepo/packages/module-package/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "module-package",
+  "module": "my-module.mjs"
+}