refactor: use new deno_ast emitter API (#429)

Cargo.toml

@@ -29,7 +29,7 @@ wasm_executor = []
 anyhow = "1.0.43"
 async-trait = "0.1.68"
 data-url = "0.3.0"
-deno_ast = { version = "0.35.0", features = ["dep_analysis"] }
+deno_ast = { version = "0.36.0", features = ["dep_analysis", "emit"] }
 deno_semver = "0.5.4"
 deno_unsync = { version = "0.3.2", optional = true }
 encoding_rs = "0.8.33"

src/fast_check/swc_helpers.rs

@@ -1,17 +1,7 @@
 // Copyright 2018-2024 the Deno authors. MIT license.
 
-use std::rc::Rc;
-
 use deno_ast::swc::ast::*;
-use deno_ast::swc::codegen::text_writer::JsWriter;
-use deno_ast::swc::codegen::Node;
-use deno_ast::swc::common::comments::SingleThreadedComments;
-use deno_ast::swc::common::FileName;
-use deno_ast::swc::common::SourceMap;
 use deno_ast::swc::common::DUMMY_SP;
-use deno_ast::swc_codegen_config;
-use deno_ast::ModuleSpecifier;
-use deno_ast::SourceTextInfo;
 
 pub fn ident(name: String) -> Ident {
   Ident {
@@ -170,44 +160,3 @@ pub fn maybe_lit_to_ts_type(lit: &Lit) -> Option<TsType> {
     Lit::JSXText(_) => None,
   }
 }
-
-pub fn emit(
-  specifier: &ModuleSpecifier,
-  comments: &SingleThreadedComments,
-  text_info: &SourceTextInfo,
-  module: &deno_ast::swc::ast::Module,
-) -> Result<(String, Vec<u8>), anyhow::Error> {
-  let source_map = Rc::new(SourceMap::default());
-  let file_name = FileName::Url(specifier.clone());
-  source_map.new_source_file(file_name, text_info.text_str().to_string());
-
-  let mut src_map_buf = vec![];
-  let mut buf = vec![];
-  {
-    let mut writer = Box::new(JsWriter::new(
-      source_map.clone(),
-      "\n",
-      &mut buf,
-      Some(&mut src_map_buf),
-    ));
-    writer.set_indent_str("  "); // two spaces
-
-    let mut emitter = deno_ast::swc::codegen::Emitter {
-      cfg: swc_codegen_config(),
-      comments: Some(comments),
-      cm: source_map.clone(),
-      wr: writer,
-    };
-    module.emit_with(&mut emitter)?;
-  }
-  let src = String::from_utf8(buf)?;
-  let map = {
-    let mut buf = Vec::new();
-    source_map
-      .build_source_map_from(&src_map_buf, None)
-      .to_writer(&mut buf)?;
-    buf
-  };
-
-  Ok((src, map))
-}

src/fast_check/transform.rs

@@ -7,15 +7,19 @@
 use std::collections::HashSet;
 use std::sync::Arc;
 
+use deno_ast::emit;
 use deno_ast::swc::ast::*;
 use deno_ast::swc::common::comments::CommentKind;
 use deno_ast::swc::common::comments::SingleThreadedComments;
 use deno_ast::swc::common::comments::SingleThreadedCommentsMapInner;
 use deno_ast::swc::common::Spanned;
 use deno_ast::swc::common::DUMMY_SP;
+use deno_ast::EmitOptions;
+use deno_ast::EmittedSource;
 use deno_ast::ModuleSpecifier;
 use deno_ast::MultiThreadedComments;
 use deno_ast::ParsedSource;
+use deno_ast::SourceMap;
 use deno_ast::SourceRange;
 use deno_ast::SourceRangedForSpanned;
 
@@ -26,7 +30,6 @@ use crate::WorkspaceMember;
 
 use super::range_finder::ModulePublicRanges;
 use super::swc_helpers::any_type_ann;
-use super::swc_helpers::emit;
 use super::swc_helpers::get_return_stmts_with_arg_from_function_body;
 use super::swc_helpers::ident;
 use super::swc_helpers::is_void_type;
@@ -79,7 +82,8 @@ impl CommentsMut {
 
 #[derive(Debug, Clone)]
 pub struct FastCheckDtsModule {
-  pub text: String,
+  pub program: Program,
+  pub comments: SingleThreadedComments,
   pub diagnostics: Vec<FastCheckDtsDiagnostic>,
 }
 
@@ -135,11 +139,20 @@ pub fn transform(
   };
 
   // now emit
-  let (text, source_map) = emit(
-    specifier,
+  let source_map = SourceMap::single(
+    specifier.clone(),
+    parsed_source.text_info().text_str().to_owned(),
+  );
+  let program = Program::Module(module);
+  let EmittedSource { text, source_map } = emit(
+    &program,
     &fast_check_comments,
-    parsed_source.text_info(),
-    &module,
+    &source_map,
+    &EmitOptions {
+      keep_comments: true,
+      source_map: deno_ast::SourceMapOption::Separate,
+      inline_sources: false,
+    },
   )
   .map_err(|e| {
     vec![FastCheckDiagnostic::Emit {
@@ -152,18 +165,11 @@ pub fn transform(
     let mut dts_transformer =
       FastCheckDtsTransformer::new(parsed_source.text_info(), specifier);
 
-    let module = dts_transformer.transform(module)?;
-    let (text, _source_map) =
-      emit(specifier, &dts_comments, parsed_source.text_info(), &module)
-        .map_err(|e| {
-          vec![FastCheckDiagnostic::Emit {
-            specifier: specifier.clone(),
-            inner: Arc::new(e),
-          }]
-        })?;
+    let module = dts_transformer.transform(program.expect_module())?;
 
     Some(FastCheckDtsModule {
-      text,
+      program: Program::Module(module),
+      comments: dts_comments,
       diagnostics: dts_transformer.diagnostics,
     })
   } else {
@@ -174,7 +180,7 @@ pub fn transform(
     module_info: module_info.into(),
     text: text.into(),
     dts,
-    source_map: source_map.into(),
+    source_map: source_map.unwrap().into_bytes().into(),
   })
 }
 

src/fast_check/transform_dts.rs

@@ -930,7 +930,6 @@ impl<'a> FastCheckDtsTransformer<'a> {
 
 #[cfg(test)]
 mod tests {
-  use crate::fast_check::swc_helpers::emit;
   use crate::fast_check::transform_dts::FastCheckDtsTransformer;
   use crate::source::MemoryLoader;
   use crate::source::Source;
@@ -939,6 +938,10 @@ mod tests {
   use crate::CapturingModuleAnalyzer;
   use crate::GraphKind;
   use crate::ModuleGraph;
+  use deno_ast::emit;
+  use deno_ast::EmitOptions;
+  use deno_ast::EmittedSource;
+  use deno_ast::SourceMap;
   use url::Url;
 
   async fn transform_dts_test(source: &str, expected: &str) {
@@ -985,8 +988,22 @@ mod tests {
 
     let comments = parsed_source.comments().as_single_threaded();
 
-    let (actual, _) =
-      emit(&specifier, &comments, parsed_source.text_info(), &module).unwrap();
+    let source_map = SourceMap::single(
+      specifier,
+      parsed_source.text_info().text_str().to_owned(),
+    );
+
+    let EmittedSource { text: actual, .. } = emit(
+      &deno_ast::swc::ast::Program::Module(module),
+      &comments,
+      &source_map,
+      &EmitOptions {
+        keep_comments: true,
+        source_map: deno_ast::SourceMapOption::None,
+        inline_sources: false,
+      },
+    )
+    .unwrap();
 
     assert_eq!(actual.trim(), expected.trim());
   }

src/graph.rs

@@ -4589,6 +4589,10 @@ mod tests {
   use crate::packages::JsrPackageInfoVersion;
   use crate::ParserModuleAnalyzer;
   use deno_ast::dep::ImportAttribute;
+  use deno_ast::emit;
+  use deno_ast::EmitOptions;
+  use deno_ast::EmittedSource;
+  use deno_ast::SourceMap;
   use pretty_assertions::assert_eq;
   use serde_json::json;
 
@@ -5382,8 +5386,21 @@ mod tests {
       unreachable!();
     };
     let dts = fsm.dts.unwrap();
+    let source_map =
+      SourceMap::single(module.specifier.clone(), module.source.to_string());
+    let EmittedSource { text, .. } = emit(
+      &dts.program,
+      &dts.comments,
+      &source_map,
+      &EmitOptions {
+        keep_comments: true,
+        source_map: deno_ast::SourceMapOption::None,
+        ..Default::default()
+      },
+    )
+    .unwrap();
     assert_eq!(
-      dts.text.to_string().trim(),
+      text.trim(),
       "export declare function add(a: number, b: number): number;"
     );
     assert!(dts.diagnostics.is_empty());
@@ -5451,10 +5468,22 @@ mod tests {
         unreachable!();
       };
       let dts = fsm.dts.unwrap();
-      assert_eq!(
-        dts.text.to_string().trim(),
-        "export * from 'jsr:@package/foo';"
+      let source_map = SourceMap::single(
+        module.specifier().clone(),
+        module.source().unwrap().to_string(),
       );
+      let EmittedSource { text, .. } = emit(
+        &dts.program,
+        &dts.comments,
+        &source_map,
+        &EmitOptions {
+          keep_comments: true,
+          source_map: deno_ast::SourceMapOption::None,
+          ..Default::default()
+        },
+      )
+      .unwrap();
+      assert_eq!(text.trim(), "export * from 'jsr:@package/foo';");
       assert!(dts.diagnostics.is_empty());
     }
 

tests/integration_test.rs

@@ -10,7 +10,11 @@ use std::path::PathBuf;
 use std::rc::Rc;
 
 use anyhow::anyhow;
+use deno_ast::emit;
+use deno_ast::EmitOptions;
+use deno_ast::EmittedSource;
 use deno_ast::ModuleSpecifier;
+use deno_ast::SourceMap;
 use deno_graph::source::CacheSetting;
 use deno_graph::source::LoadFuture;
 use deno_graph::source::LoadOptions;
@@ -112,9 +116,24 @@ async fn test_graph_specs() {
           ));
 
           if let Some(dts) = &fast_check.dts {
-            if !dts.text.is_empty() {
+            let source_map = SourceMap::single(
+              module.specifier.clone(),
+              module.source.to_string(),
+            );
+            let EmittedSource { text, .. } = emit(
+              &dts.program,
+              &dts.comments,
+              &source_map,
+              &EmitOptions {
+                keep_comments: true,
+                source_map: deno_ast::SourceMapOption::None,
+                ..Default::default()
+              },
+            )
+            .unwrap();
+            if !text.is_empty() {
               output_text.push_str(&indent("--- DTS ---\n"));
-              output_text.push_str(&indent(&dts.text));
+              output_text.push_str(&indent(&text));
             }
             if !dts.diagnostics.is_empty() {
               output_text.push_str(&indent("--- DTS Diagnostics ---\n"));

tests/specs/graph/jsr/FastCheck_ClassMethodsWithTsPrivate.txt

@@ -157,7 +157,7 @@ Fast check https://jsr.io/@scope/a/1.0.0/mod.ts:
     private "stringOnly"(value: string): string;
     private "stringOnly"(): string;
   }
-  export declare namespace Test {
+  export declare module Test {
     export class AmbientClassInModule {
       private constructor(value: string);
       private constructor(private: Private);
@@ -187,7 +187,7 @@ Fast check https://jsr.io/@scope/a/1.0.0/mod.ts:
     private "stringOnly"(value: string): string;
     private "stringOnly"(): string;
   }
-  export declare namespace Test {
+  export declare module Test {
     export class AmbientClassInModule {
       private constructor(value: string);
       private constructor(private: Private);

tests/specs/graph/jsr/FastCheck_InitIdentsAndMembers.txt

@@ -126,7 +126,7 @@ Fast check https://jsr.io/@scope/a/1.0.0/mod.ts:
   }
   class Public {
   }
-  namespace Test {
+  module Test {
     export class A {
     }
   }
@@ -140,7 +140,7 @@ Fast check https://jsr.io/@scope/a/1.0.0/mod.ts:
   }
   declare class Public {
   }
-  declare namespace Test {
+  declare module Test {
     export class A {
     }
   }
@@ -155,15 +155,15 @@ Fast check https://jsr.io/@scope/b/1.0.0/mod.ts:
   {}
   class BaseHandler {
   }
-  namespace Test {
+  module Test {
     export class A {
     }
   }
   export function test(a = BaseHandler, C = Test.A): void {}
   --- DTS ---
   declare class BaseHandler {
   }
-  declare namespace Test {
+  declare module Test {
     export class A {
     }
   }

tests/specs/graph/jsr/FastCheck_Issue22829.txt

@@ -111,7 +111,7 @@ Fast check https://jsr.io/@scope/a/1.0.0/functions.ts:
     func,
     other: other_func
   };
-  export declare namespace functions {
+  export declare module functions {
     type Function<T> = Internal<T>;
   }
   --- DTS ---
@@ -123,7 +123,7 @@ Fast check https://jsr.io/@scope/a/1.0.0/functions.ts:
   export declare const functions: {
     readonly other;
   };
-  export declare namespace functions {
+  export declare module functions {
     type Function<T> = Internal<T>;
   }
   --- DTS Diagnostics ---