fix(es/codegen): Set sourceRoot of sourcemaps

crates/binding_macros/src/wasm.rs

@@ -9,7 +9,7 @@ use once_cell::sync::Lazy;
 #[doc(hidden)]
 pub use serde_wasm_bindgen;
 use serde_wasm_bindgen::Serializer;
-use swc::{config::ErrorFormat, Compiler, HandlerOpts};
+use swc::{config::ErrorFormat, Compiler, HandlerOpts, PrintArgs};
 #[doc(hidden)]
 pub use swc::{
     config::{Options, ParseOptions, SourceMapsConfig},
@@ -149,6 +149,7 @@ macro_rules! build_parse_sync {
     pub fn parse_sync(s: $crate::wasm::js_sys::JsString, opts: $crate::wasm::JsValue) -> Result<$crate::wasm::JsValue, $crate::wasm::JsValue> {
       use serde::Serialize;
       use $crate::wasm::VisitMutWith;
+      use $crate::wasm::PrintArgs;
 
       let c = $crate::wasm::compiler();
 
@@ -245,20 +246,17 @@ macro_rules! build_print_sync {
                   let s = $crate::wasm::anyhow::Context::context(c
                     .print(
                         &program,
-                        None,
-                        None,
-                        true,
-                        opts.source_maps
-                            .clone()
-                            .unwrap_or($crate::wasm::SourceMapsConfig::Bool(false)),
-                        &Default::default(),
-                        None,
-                        None,
-                        opts.config.emit_source_map_columns.into_bool(),
-                        Default::default(),
-                        swc_core::ecma::codegen::Config::default()
-                            .with_target(opts.codegen_target().unwrap_or($crate::wasm::EsVersion::Es2020))
-                            .with_minify(opts.config.minify.into())
+                        PrintArgs {
+                          inline_sources_content: true,
+                          source_map: opts.source_maps
+                              .clone()
+                              .unwrap_or($crate::wasm::SourceMapsConfig::Bool(false)),
+                          emit_source_map_columns: opts.config.emit_source_map_columns.into_bool(),
+                          codegen_config: swc_core::ecma::codegen::Config::default()
+                              .with_target(opts.codegen_target().unwrap_or($crate::wasm::EsVersion::Es2020))
+                              .with_minify(opts.config.minify.into()),
+                          ..Default::default()
+                        },
                     ),"failed to print code")?;
 
                     serde_wasm_bindgen::to_value(&s)

crates/swc/benches/typescript.rs

@@ -6,10 +6,11 @@ use std::{
 };
 
 use criterion::{black_box, criterion_group, criterion_main, Bencher, Criterion};
-use swc::config::{Config, IsModule, JscConfig, Options, SourceMapsConfig};
+use swc::config::{Config, IsModule, JscConfig, Options};
 use swc_common::{
     errors::Handler, FileName, FilePathMapping, Mark, SourceFile, SourceMap, GLOBALS,
 };
+use swc_compiler_base::PrintArgs;
 use swc_ecma_ast::{EsVersion, Program};
 use swc_ecma_parser::Syntax;
 use swc_ecma_transforms::{fixer, hygiene, resolver, typescript};
@@ -112,16 +113,11 @@ fn bench_codegen(b: &mut Bencher, _target: EsVersion) {
             black_box(GLOBALS.set(&Default::default(), || {
                 c.print(
                     &module,
-                    None,
-                    None,
-                    false,
-                    SourceMapsConfig::Bool(false),
-                    &Default::default(),
-                    None,
-                    None,
-                    false,
-                    Default::default(),
-                    swc_ecma_codegen::Config::default().with_target(EsVersion::Es2020),
+                    PrintArgs {
+                        codegen_config: swc_ecma_codegen::Config::default()
+                            .with_target(EsVersion::Es2020),
+                        ..Default::default()
+                    },
                 )
                 .unwrap()
             }));

crates/swc/src/config/mod.rs

@@ -220,6 +220,7 @@ impl Options {
         base: &FileName,
         parse: impl FnOnce(Syntax, EsVersion, IsModule) -> Result<Program, Error>,
         output_path: Option<&Path>,
+        source_root: Option<String>,
         source_file_name: Option<String>,
         handler: &Handler,
         config: Option<Config>,
@@ -769,6 +770,7 @@ impl Options {
             inline_sources_content: cfg.inline_sources_content.into_bool(),
             input_source_map: cfg.input_source_map.clone().unwrap_or_default(),
             output_path: output_path.map(|v| v.to_path_buf()),
+            source_root,
             source_file_name,
             comments: comments.cloned(),
             preserve_comments,
@@ -1076,6 +1078,7 @@ pub struct BuiltInput<P: swc_ecma_visit::Fold> {
     pub is_module: IsModule,
     pub output_path: Option<PathBuf>,
 
+    pub source_root: Option<String>,
     pub source_file_name: Option<String>,
 
     pub comments: Option<SingleThreadedComments>,
@@ -1107,6 +1110,7 @@ where
             input_source_map: self.input_source_map,
             is_module: self.is_module,
             output_path: self.output_path,
+            source_root: self.source_root,
             source_file_name: self.source_file_name,
             preserve_comments: self.preserve_comments,
             inline_sources_content: self.inline_sources_content,

crates/swc/src/lib.rs

@@ -119,18 +119,17 @@ use std::{
 };
 
 use anyhow::{bail, Context, Error};
-use atoms::JsWord;
 use base64::prelude::{Engine, BASE64_STANDARD};
-use common::{collections::AHashMap, comments::SingleThreadedComments, errors::HANDLER};
+use common::{comments::SingleThreadedComments, errors::HANDLER};
 use jsonc_parser::{parse_to_serde_value, ParseOptions};
 use once_cell::sync::Lazy;
 use serde_json::error::Category;
 pub use sourcemap;
 use swc_common::{
-    chain, comments::Comments, errors::Handler, sync::Lrc, BytePos, FileName, Mark, SourceFile,
-    SourceMap, Spanned, GLOBALS,
+    chain, comments::Comments, errors::Handler, sync::Lrc, FileName, Mark, SourceFile, SourceMap,
+    Spanned, GLOBALS,
 };
-pub use swc_compiler_base::TransformOutput;
+pub use swc_compiler_base::{PrintArgs, TransformOutput};
 pub use swc_config::config_types::{BoolConfig, BoolOr, BoolOrDataConfig};
 use swc_ecma_ast::{EsVersion, Program};
 use swc_ecma_codegen::{self, Node};
@@ -437,37 +436,11 @@ impl Compiler {
     /// This method receives target file path, but does not write file to the
     /// path. See: https://github.com/swc-project/swc/issues/1255
     #[allow(clippy::too_many_arguments)]
-    pub fn print<T>(
-        &self,
-        node: &T,
-        source_file_name: Option<&str>,
-        output_path: Option<PathBuf>,
-        inline_sources_content: bool,
-        source_map: SourceMapsConfig,
-        source_map_names: &AHashMap<BytePos, JsWord>,
-        orig: Option<&sourcemap::SourceMap>,
-        comments: Option<&dyn Comments>,
-        emit_source_map_columns: bool,
-        preamble: &str,
-        codegen_config: swc_ecma_codegen::Config,
-    ) -> Result<TransformOutput, Error>
+    pub fn print<T>(&self, node: &T, args: PrintArgs) -> Result<TransformOutput, Error>
     where
         T: Node + VisitWith<swc_compiler_base::IdentCollector>,
     {
-        swc_compiler_base::print(
-            self.cm.clone(),
-            node,
-            source_file_name,
-            output_path,
-            inline_sources_content,
-            source_map,
-            source_map_names,
-            orig,
-            comments,
-            emit_source_map_columns,
-            preamble,
-            codegen_config,
-        )
+        swc_compiler_base::print(self.cm.clone(), node, args)
     }
 }
 
@@ -636,6 +609,7 @@ impl Compiler {
                     ),
                 },
                 opts.output_path.as_deref(),
+                opts.source_root.clone(),
                 opts.source_file_name.clone(),
                 handler,
                 Some(config),
@@ -893,22 +867,25 @@ impl Compiler {
 
             self.print(
                 &module,
-                Some(&fm.name.to_string()),
-                opts.output_path.clone().map(From::from),
-                opts.inline_sources_content,
-                source_map,
-                &source_map_names,
-                orig.as_ref(),
-                Some(&comments),
-                opts.emit_source_map_columns,
-                &opts.format.preamble,
-                swc_ecma_codegen::Config::default()
-                    .with_target(target)
-                    .with_minify(true)
-                    .with_ascii_only(opts.format.ascii_only)
-                    .with_emit_assert_for_import_attributes(
-                        opts.format.emit_assert_for_import_attributes,
-                    ),
+                PrintArgs {
+                    source_root: None,
+                    source_file_name: Some(&fm.name.to_string()),
+                    output_path: opts.output_path.clone().map(From::from),
+                    inline_sources_content: opts.inline_sources_content,
+                    source_map,
+                    source_map_names: &source_map_names,
+                    orig: orig.as_ref(),
+                    comments: Some(&comments),
+                    emit_source_map_columns: opts.emit_source_map_columns,
+                    preamble: &opts.format.preamble,
+                    codegen_config: swc_ecma_codegen::Config::default()
+                        .with_target(target)
+                        .with_minify(true)
+                        .with_ascii_only(opts.format.ascii_only)
+                        .with_emit_assert_for_import_attributes(
+                            opts.format.emit_assert_for_import_attributes,
+                        ),
+                },
             )
         })
     }
@@ -972,28 +949,31 @@ impl Compiler {
 
             self.print(
                 &program,
-                config.source_file_name.as_deref(),
-                config.output_path,
-                config.inline_sources_content,
-                config.source_maps,
-                &source_map_names,
-                orig,
-                config.comments.as_ref().map(|v| v as _),
-                config.emit_source_map_columns,
-                &config.output.preamble,
-                swc_ecma_codegen::Config::default()
-                    .with_target(config.target)
-                    .with_minify(config.minify)
-                    .with_ascii_only(
-                        config
-                            .output
-                            .charset
-                            .map(|v| matches!(v, OutputCharset::Ascii))
-                            .unwrap_or(false),
-                    )
-                    .with_emit_assert_for_import_attributes(
-                        config.emit_assert_for_import_attributes,
-                    ),
+                PrintArgs {
+                    source_root: config.source_root.as_deref(),
+                    source_file_name: config.source_file_name.as_deref(),
+                    output_path: config.output_path,
+                    inline_sources_content: config.inline_sources_content,
+                    source_map: config.source_maps,
+                    source_map_names: &source_map_names,
+                    orig,
+                    comments: config.comments.as_ref().map(|v| v as _),
+                    emit_source_map_columns: config.emit_source_map_columns,
+                    preamble: &config.output.preamble,
+                    codegen_config: swc_ecma_codegen::Config::default()
+                        .with_target(config.target)
+                        .with_minify(config.minify)
+                        .with_ascii_only(
+                            config
+                                .output
+                                .charset
+                                .map(|v| matches!(v, OutputCharset::Ascii))
+                                .unwrap_or(false),
+                        )
+                        .with_emit_assert_for_import_attributes(
+                            config.emit_assert_for_import_attributes,
+                        ),
+                },
             )
         })
     }

crates/swc/tests/projects.rs

@@ -19,6 +19,7 @@ use swc_common::{
     sync::Lrc,
     BytePos, FileName, Globals, SourceMap, GLOBALS,
 };
+use swc_compiler_base::PrintArgs;
 use swc_ecma_ast::{EsVersion, *};
 use swc_ecma_minifier::option::MangleOptions;
 use swc_ecma_parser::{EsConfig, Syntax, TsConfig};
@@ -740,19 +741,22 @@ fn should_visit() {
 
             Ok(c.print(
                 &program,
-                None,
-                config.output_path,
-                config.inline_sources_content,
-                config.source_maps,
-                &Default::default(),
-                None,
-                // TODO: figure out sourcemaps
-                Some(&comments),
-                config.emit_source_map_columns,
-                Default::default(),
-                swc_ecma_codegen::Config::default()
-                    .with_target(config.target)
-                    .with_minify(config.minify),
+                PrintArgs {
+                    source_root: None,
+                    source_file_name: None,
+                    output_path: config.output_path,
+                    inline_sources_content: config.inline_sources_content,
+                    source_map: config.source_maps,
+                    source_map_names: &Default::default(),
+                    orig: None,
+                    // TODO: figure out sourcemaps
+                    comments: Some(&comments),
+                    emit_source_map_columns: config.emit_source_map_columns,
+                    preamble: Default::default(),
+                    codegen_config: swc_ecma_codegen::Config::default()
+                        .with_target(config.target)
+                        .with_minify(config.minify),
+                },
             )
             .unwrap()
             .code)

crates/swc_compiler_base/Cargo.toml

@@ -13,11 +13,13 @@ version       = "0.5.2"
 node = ["napi", "napi-derive"]
 
 [dependencies]
-anyhow = "1.0.75"
-base64 = "0.21.0"
-pathdiff = "0.2.0"
-serde = { version = "1.0.188", features = ["derive"] }
+anyhow    = "1.0.75"
+base64    = "0.21.0"
+once_cell = "1"
+pathdiff  = "0.2.0"
+serde     = { version = "1.0.188", features = ["derive"] }
 sourcemap = "6.4"
+
 swc_atoms = { version = "0.6.5", path = "../swc_atoms" }
 swc_common = { version = "0.33.15", path = "../swc_common", features = [
   "sourcemap",