refactor: deno_graph 0.84

Cargo.toml

@@ -11,8 +11,8 @@ license = "MIT"
 members = ["lib"]
 
 [workspace.dependencies]
-deno_graph = { version = "0.83.0", default-features = false }
-deno_ast = { version = "0.42.0", features = ["transpiling"] }
+deno_graph = { version = "0.84.0", default-features = false }
+deno_ast = { version = "0.43.0", features = ["transpiling"] }
 import_map = "0.20.0"
 serde = "1"
 

src/v2.rs

@@ -16,9 +16,9 @@ use deno_ast::EmitOptions;
 use deno_ast::ModuleSpecifier;
 use deno_ast::SourceMapOption;
 use deno_ast::TranspileOptions;
-use deno_graph::CapturingModuleParser;
+use deno_graph::CapturingEsParser;
+use deno_graph::EsParser;
 use deno_graph::ModuleGraph;
-use deno_graph::ModuleParser;
 use deno_graph::ParseOptions;
 use deno_npm::resolution::SerializedNpmResolutionSnapshot;
 use deno_npm::resolution::SerializedNpmResolutionSnapshotPackage;
@@ -279,7 +279,7 @@ impl<'a> EszipRelativeFileBaseUrl<'a> {
 
 pub struct FromGraphOptions<'a> {
   pub graph: ModuleGraph,
-  pub parser: CapturingModuleParser<'a>,
+  pub parser: CapturingEsParser<'a>,
   pub transpile_options: TranspileOptions,
   pub emit_options: EmitOptions,
   /// Base to make all descendant file:/// modules relative to.
@@ -1294,7 +1294,7 @@ impl EszipV2 {
     #[allow(clippy::too_many_arguments)]
     fn visit_module<'a>(
       graph: &'a ModuleGraph,
-      parser: CapturingModuleParser,
+      parser: CapturingEsParser,
       transpile_options: &TranspileOptions,
       emit_options: &EmitOptions,
       modules: &mut LinkedHashMap<String, EszipV2Module>,
@@ -1347,7 +1347,7 @@ impl EszipV2 {
             | deno_graph::MediaType::Tsx
             | deno_graph::MediaType::Dts
             | deno_graph::MediaType::Dmts => {
-              let parsed_source = parser.parse_module(ParseOptions {
+              let parsed_source = parser.parse_program(ParseOptions {
                 specifier: &module.specifier,
                 source: module.source.clone(),
                 media_type: module.media_type,
@@ -1367,8 +1367,10 @@ impl EszipV2 {
               let emit = parsed_source
                 .transpile(transpile_options, &emit_options)?
                 .into_source();
-              source = emit.source.into();
-              source_map = Arc::from(emit.source_map.unwrap_or_default());
+              source = emit.text.into_bytes().into();
+              source_map = Arc::from(
+                emit.source_map.map(|s| s.into_bytes()).unwrap_or_default(),
+              );
             }
             _ => {
               return Err(anyhow::anyhow!(