Merge c888f22cd0 into 0d3d4f5466

cli/graph_util.rs

@@ -149,6 +149,51 @@ pub fn graph_walk_errors<'a>(
   roots: &'a [ModuleSpecifier],
   options: GraphWalkErrorsOptions,
 ) -> impl Iterator<Item = JsErrorBox> + 'a {
+  fn should_ignore_resolution_error_for_types(err: &ResolutionError) -> bool {
+    match err {
+      ResolutionError::InvalidSpecifier { .. } => true,
+      ResolutionError::ResolverError { error, .. } => match error.as_ref() {
+        ResolveError::Specifier(_) => true,
+        ResolveError::ImportMap(err) => match err.as_kind() {
+          import_map::ImportMapErrorKind::UnmappedBareSpecifier(_, _) => true,
+          import_map::ImportMapErrorKind::JsonParse(_)
+          | import_map::ImportMapErrorKind::ImportMapNotObject
+          | import_map::ImportMapErrorKind::ImportsFieldNotObject
+          | import_map::ImportMapErrorKind::ScopesFieldNotObject
+          | import_map::ImportMapErrorKind::ScopePrefixNotObject(_)
+          | import_map::ImportMapErrorKind::BlockedByNullEntry(_)
+          | import_map::ImportMapErrorKind::SpecifierResolutionFailure {
+            ..
+          }
+          | import_map::ImportMapErrorKind::SpecifierBacktracksAbovePrefix {
+            ..
+          } => false,
+        },
+        ResolveError::Other(_) => false,
+      },
+      ResolutionError::InvalidDowngrade { .. }
+      | ResolutionError::InvalidJsrHttpsTypesImport { .. }
+      | ResolutionError::InvalidLocalImport { .. } => false,
+    }
+  }
+
+  fn should_ignore_module_graph_error_for_types(
+    err: &ModuleGraphError,
+  ) -> bool {
+    match err {
+      ModuleGraphError::ResolutionError(err) => {
+        should_ignore_resolution_error_for_types(err)
+      }
+      ModuleGraphError::TypesResolutionError(err) => {
+        should_ignore_resolution_error_for_types(err)
+      }
+      ModuleGraphError::ModuleError(module_error) => match module_error {
+        ModuleError::Missing { .. } => true,
+        _ => false,
+      },
+    }
+  }
+
   graph
     .walk(
       roots.iter(),
@@ -190,10 +235,7 @@ pub fn graph_walk_errors<'a>(
 
       if graph.graph_kind().include_types()
         && (message.contains(RUN_WITH_SLOPPY_IMPORTS_MSG)
-          || matches!(
+          || should_ignore_module_graph_error_for_types(&error))
-            error,
-            ModuleGraphError::ModuleError(ModuleError::Missing(..))
-          ))
       {
         // ignore and let typescript surface this as a diagnostic instead
         log::debug!("Ignoring: {}", message);

cli/tools/check.rs

@@ -326,6 +326,9 @@ impl TypeChecker {
       check_mode: type_check_mode,
     })?;
 
+    eprintln!("Ambient modules: {:?}", response.ambient_modules);
+    panic!("STOP"); // prevent saving the type checker cache
+
     let response_diagnostics =
       response.diagnostics.filter(filter_remote_diagnostics);
 

cli/tsc/99_main_compiler.js

@@ -410,6 +410,7 @@ delete Object.prototype.__proto__;
     }
     if (start !== undefined && length !== undefined && file) {
       let startPos = file.getLineAndCharacterOfPosition(start);
+      /** @type {string | undefined} */
       let sourceLine = file.getFullText().split("\n")[startPos.line];
       const originalFileName = file.fileName;
       const fileName = ops.op_remap_specifier
@@ -1109,8 +1110,10 @@ delete Object.prototype.__proto__;
 
     performanceProgram({ program });
 
+    const checker = program.getProgram().getTypeChecker();
     ops.op_respond({
       diagnostics: fromTypeScriptDiagnostics(diagnostics),
+      ambientModules: checker.getAmbientModules().map((symbol) => symbol.name),
       stats: performanceEnd(),
     });
     debug("<<< exec stop");

cli/tsc/mod.rs

@@ -385,6 +385,7 @@ pub struct Response {
   pub diagnostics: Diagnostics,
   /// If there was any build info associated with the exec request.
   pub maybe_tsbuildinfo: Option<String>,
+  pub ambient_modules: Vec<String>,
   /// Statistics from the check.
   pub stats: Stats,
 }
@@ -1047,8 +1048,10 @@ fn op_is_node_file(state: &mut OpState, #[string] path: &str) -> bool {
 }
 
 #[derive(Debug, Deserialize, Eq, PartialEq)]
+#[serde(rename_all = "camelCase")]
 struct RespondArgs {
   pub diagnostics: Diagnostics,
+  pub ambient_modules: Vec<String>,
   pub stats: Stats,
 }
 
@@ -1163,14 +1166,13 @@ pub fn exec(request: Request) -> Result<Response, ExecError> {
   let state = op_state.take::<State>();
 
   if let Some(response) = state.maybe_response {
-    let diagnostics = response.diagnostics;
     let maybe_tsbuildinfo = state.maybe_tsbuildinfo;
-    let stats = response.stats;
 
     Ok(Response {
-      diagnostics,
+      diagnostics: response.diagnostics,
+      ambient_modules: response.ambient_modules,
       maybe_tsbuildinfo,
-      stats,
+      stats: response.stats,
     })
   } else {
     Err(ExecError::ResponseNotSet)
@@ -1506,6 +1508,7 @@ mod tests {
           reports_unnecessary: None,
           other: Default::default(),
         }]),
+        ambient_modules: vec![],
         stats: Stats(vec![("a".to_string(), 12)])
       })
     );