fix: improved using declaration support (#20959)

Upgrades to deno_ast 0.30.

8 files changed, 56 insertions, 43 deletions

diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs
index cbde8768f..b36ff023a 100644
--- a/cli/tools/bundle.rs
+++ b/cli/tools/bundle.rs
@@ -148,6 +148,7 @@ fn bundle_module_graph(
   deno_emit::bundle_graph(
     graph,
     deno_emit::BundleOptions {
+      minify: false,
       bundle_type: deno_emit::BundleType::Module,
       emit_options: crate::args::ts_config_to_emit_options(
         ts_config_result.ts_config,
diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
index 23aef89fb..67566d811 100644
--- a/cli/tools/coverage/mod.rs
+++ b/cli/tools/coverage/mod.rs
@@ -138,12 +138,13 @@ impl CoverageCollector {
       let filename = format!("{}.json", Uuid::new_v4());
       let filepath = self.dir.join(filename);
 
-      let mut out = BufWriter::new(File::create(filepath)?);
+      let mut out = BufWriter::new(File::create(&filepath)?);
       let coverage = serde_json::to_string(&script_coverage)?;
-      let formatted_coverage = format_json(&coverage, &Default::default())
-        .ok()
-        .flatten()
-        .unwrap_or(coverage);
+      let formatted_coverage =
+        format_json(&filepath, &coverage, &Default::default())
+          .ok()
+          .flatten()
+          .unwrap_or(coverage);
 
       out.write_all(formatted_coverage.as_bytes())?;
       out.flush()?;
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index b9525b7b2..92facc7ec 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -191,13 +191,13 @@ fn format_markdown(
           rest => rest,
         };
 
+        let fake_filename =
+          PathBuf::from(format!("deno_fmt_stdin.{extension}"));
         if matches!(extension, "json" | "jsonc") {
           let mut json_config = get_resolved_json_config(fmt_options);
           json_config.line_width = line_width;
-          dprint_plugin_json::format_text(text, &json_config)
+          dprint_plugin_json::format_text(&fake_filename, text, &json_config)
         } else {
-          let fake_filename =
-            PathBuf::from(format!("deno_fmt_stdin.{extension}"));
           let mut codeblock_config =
             get_resolved_typescript_config(fmt_options);
           codeblock_config.line_width = line_width;
@@ -218,11 +218,12 @@ fn format_markdown(
 /// of configuration builder of <https://github.com/dprint/dprint-plugin-json>.
 /// See <https://github.com/dprint/dprint-plugin-json/blob/cfa1052dbfa0b54eb3d814318034cdc514c813d7/src/configuration/builder.rs#L87> for configuration.
 pub fn format_json(
+  file_path: &Path,
   file_text: &str,
   fmt_options: &FmtOptionsConfig,
 ) -> Result<Option<String>, AnyError> {
   let config = get_resolved_json_config(fmt_options);
-  dprint_plugin_json::format_text(file_text, &config)
+  dprint_plugin_json::format_text(file_path, file_text, &config)
 }
 
 /// Formats a single TS, TSX, JS, JSX, JSONC, JSON, or MD file.
@@ -238,7 +239,7 @@ pub fn format_file(
   ) {
     format_markdown(file_text, fmt_options)
   } else if matches!(ext.as_str(), "json" | "jsonc") {
-    format_json(file_text, fmt_options)
+    format_json(file_path, file_text, fmt_options)
   } else {
     let config = get_resolved_typescript_config(fmt_options);
     dprint_plugin_typescript::format_text(file_path, file_text, &config)
diff --git a/cli/tools/repl/editor.rs b/cli/tools/repl/editor.rs
index 5c2832aab..52fad4759 100644
--- a/cli/tools/repl/editor.rs
+++ b/cli/tools/repl/editor.rs
@@ -374,32 +374,35 @@ impl Highlighter for EditorHelper {
               }
               Word::Keyword(_) => colors::cyan(&line[range]).to_string(),
               Word::Ident(ident) => {
-                if ident == *"undefined" {
-                  colors::gray(&line[range]).to_string()
-                } else if ident == *"Infinity" || ident == *"NaN" {
-                  colors::yellow(&line[range]).to_string()
-                } else if ident == *"async" || ident == *"of" {
-                  colors::cyan(&line[range]).to_string()
-                } else {
-                  let next = lexed_items.peek().map(|item| &item.inner);
-                  if matches!(
-                    next,
-                    Some(deno_ast::TokenOrComment::Token(Token::LParen))
-                  ) {
-                    // We're looking for something that looks like a function
-                    // We use a simple heuristic: 'ident' followed by 'LParen'
-                    colors::intense_blue(&line[range]).to_string()
-                  } else if ident == *"from"
-                    && matches!(
+                match ident.as_ref() {
+                  "undefined" => colors::gray(&line[range]).to_string(),
+                  "Infinity" | "NaN" => {
+                    colors::yellow(&line[range]).to_string()
+                  }
+                  "async" | "of" => colors::cyan(&line[range]).to_string(),
+                  _ => {
+                    let next = lexed_items.peek().map(|item| &item.inner);
+                    if matches!(
                       next,
-                      Some(deno_ast::TokenOrComment::Token(Token::Str { .. }))
-                    )
-                  {
-                    // When ident 'from' is followed by a string literal, highlight it
-                    // E.g. "export * from 'something'" or "import a from 'something'"
-                    colors::cyan(&line[range]).to_string()
-                  } else {
-                    line[range].to_string()
+                      Some(deno_ast::TokenOrComment::Token(Token::LParen))
+                    ) {
+                      // We're looking for something that looks like a function
+                      // We use a simple heuristic: 'ident' followed by 'LParen'
+                      colors::intense_blue(&line[range]).to_string()
+                    } else if ident.as_ref() == "from"
+                      && matches!(
+                        next,
+                        Some(deno_ast::TokenOrComment::Token(
+                          Token::Str { .. }
+                        ))
+                      )
+                    {
+                      // When ident 'from' is followed by a string literal, highlight it
+                      // E.g. "export * from 'something'" or "import a from 'something'"
+                      colors::cyan(&line[range]).to_string()
+                    } else {
+                      line[range].to_string()
+                    }
                   }
                 }
               }
diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs
index 338a253d2..8f8d085dd 100644
--- a/cli/tools/repl/session.rs
+++ b/cli/tools/repl/session.rs
@@ -32,6 +32,7 @@ use deno_core::serde_json;
 use deno_core::serde_json::Value;
 use deno_core::unsync::spawn;
 use deno_core::LocalInspectorSession;
+use deno_graph::source::ResolutionMode;
 use deno_graph::source::Resolver;
 use deno_runtime::worker::MainWorker;
 use deno_semver::npm::NpmPackageReqReference;
@@ -572,7 +573,7 @@ impl ReplSession {
       .flat_map(|i| {
         self
           .resolver
-          .resolve(i, &self.referrer)
+          .resolve(i, &self.referrer, ResolutionMode::Execution)
           .ok()
           .or_else(|| ModuleSpecifier::parse(i).ok())
       })
diff --git a/cli/tools/vendor/build.rs b/cli/tools/vendor/build.rs
index 3e5f13d81..dd7c053c1 100644
--- a/cli/tools/vendor/build.rs
+++ b/cli/tools/vendor/build.rs
@@ -11,6 +11,7 @@ use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
 use deno_core::futures::future::LocalBoxFuture;
 use deno_core::parking_lot::Mutex;
+use deno_graph::source::ResolutionMode;
 use deno_graph::EsmModule;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
@@ -111,9 +112,11 @@ pub async fn build<
   // add the jsx import source to the entry points to ensure it is always vendored
   if let Some(jsx_import_source) = jsx_import_source {
     if let Some(specifier_text) = jsx_import_source.maybe_specifier_text() {
-      if let Ok(specifier) =
-        resolver.resolve(&specifier_text, &jsx_import_source.base_url)
-      {
+      if let Ok(specifier) = resolver.resolve(
+        &specifier_text,
+        &jsx_import_source.base_url,
+        ResolutionMode::Execution,
+      ) {
         entry_points.push(specifier);
       }
     }
diff --git a/cli/tools/vendor/import_map.rs b/cli/tools/vendor/import_map.rs
index 36a70d4e0..b5893e9f5 100644
--- a/cli/tools/vendor/import_map.rs
+++ b/cli/tools/vendor/import_map.rs
@@ -4,6 +4,7 @@ use deno_ast::LineAndColumnIndex;
 use deno_ast::ModuleSpecifier;
 use deno_ast::SourceTextInfo;
 use deno_core::error::AnyError;
+use deno_graph::source::ResolutionMode;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
 use deno_graph::Position;
@@ -213,9 +214,11 @@ pub fn build_import_map(
   // add the jsx import source to the destination import map, if mapped in the original import map
   if let Some(jsx_import_source) = jsx_import_source {
     if let Some(specifier_text) = jsx_import_source.maybe_specifier_text() {
-      if let Ok(resolved_url) =
-        resolver.resolve(&specifier_text, &jsx_import_source.base_url)
-      {
+      if let Ok(resolved_url) = resolver.resolve(
+        &specifier_text,
+        &jsx_import_source.base_url,
+        ResolutionMode::Execution,
+      ) {
         builder.imports.add(specifier_text, &resolved_url);
       }
     }
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index c324a56dd..42909598d 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -355,7 +355,7 @@ fn update_config_text(
 
   let new_text = deno_ast::apply_text_changes(text, text_changes);
   modified_result.new_text = if should_format {
-    format_json(&new_text, fmt_options)
+    format_json(&PathBuf::from("deno.json"), &new_text, fmt_options)
       .ok()
       .map(|formatted_text| formatted_text.unwrap_or(new_text))
   } else {