fix(cli): Make Rust CLI use sourcemap code from the swc crate (#8576)

**Related issue:**

 - Closes #8495

Author: kdy1

crates/swc/tests/fixture/issues-8xxx/8495/input/.swcrc

@@ -0,0 +1,12 @@
+{
+    "$schema": "http://json.schemastore.org/swcrc",
+    "jsc": {
+        "target": "es2022",
+        "parser": {
+            "syntax": "typescript"
+        }
+    },
+    "module": {
+        "type": "commonjs"
+    }
+}

crates/swc/tests/fixture/issues-8xxx/8495/input/1.ts

@@ -0,0 +1,30 @@
+import type {
+    AnimationConfigWithData,
+    AnimationConfigWithPath,
+} from "lottie-web";
+import type { CSSProperties } from "react";
+
+type Without<T, U> = {
+    // For each `K` in the keys of `T` excluding keys of `U`
+    // map `K` to an optional `never` type.
+    //
+    // See: https://www.typescriptlang.org/docs/handbook/2/mapped-types.html
+    [K in Exclude<keyof T, keyof U>]?: never;
+};
+
+// A type that either has one set of properties or another, but not both.
+export type XOR<T, U> = T | U extends object
+    ? (Without<T, U> & U) | (Without<U, T> & T)
+    : T | U;
+
+export type LottieWebParams = XOR<
+    Omit<AnimationConfigWithPath<"svg">, "renderer" | "container">,
+    Omit<AnimationConfigWithData<"svg">, "renderer" | "container">
+>;
+
+export type LottieAnimationProps = {
+    className?: string;
+    style?: CSSProperties;
+    withShadowRoot?: boolean;
+    onAnimationEnd?: () => void;
+} & LottieWebParams;

crates/swc/tests/fixture/issues-8xxx/8495/output/1.ts

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

crates/swc_cli_impl/src/commands/compile.rs

@@ -1,5 +1,4 @@
 use std::{
-    borrow::Cow,
     fs::{self, File},
     io::{self, Read, Write},
     path::{Component, Path, PathBuf},
@@ -213,22 +212,10 @@ fn resolve_output_file_path(
 
 fn emit_output(
     mut output: TransformOutput,
-    source_file_name: &Option<String>,
-    source_root: &Option<String>,
     out_dir: &Option<PathBuf>,
     file_path: &Path,
     file_extension: PathBuf,
 ) -> anyhow::Result<()> {
-    let source_map = if let Some(ref source_map) = &output.map {
-        Some(extend_source_map(
-            source_map.to_owned(),
-            source_file_name,
-            source_root,
-        )?)
-    } else {
-        None
-    };
-
     if let Some(out_dir) = out_dir {
         let output_file_path = resolve_output_file_path(out_dir, file_path, file_extension)?;
         let output_dir = output_file_path
@@ -239,7 +226,7 @@ fn emit_output(
             fs::create_dir_all(output_dir)?;
         }
 
-        if let Some(ref source_map) = source_map {
+        if let Some(ref source_map) = output.map {
             let source_map_path = output_file_path.with_extension("js.map");
 
             output.code.push_str("\n//# sourceMappingURL=");
@@ -252,10 +239,10 @@ fn emit_output(
 
         fs::write(output_file_path, &output.code)?;
     } else {
-        let source_map = if let Some(ref source_map) = source_map {
-            String::from_utf8_lossy(source_map)
+        let source_map = if let Some(ref source_map) = output.map {
+            &**source_map
         } else {
-            Cow::Borrowed("")
+            ""
         };
 
         println!("{}\n{}\n{}", file_path.display(), output.code, source_map,);
@@ -484,17 +471,10 @@ impl CompileOptions {
                         buf_srcmap = Some(File::create(map_out_file)?);
                     }
 
-                    let source_map = extend_source_map(
-                        src_map.to_owned(),
-                        &self.source_file_name,
-                        &self.source_root,
-                    )
-                    .unwrap();
-
                     buf_srcmap
                         .as_ref()
                         .expect("Srcmap buffer should be available")
-                        .write(&source_map)
+                        .write(src_map.as_bytes())
                         .and(Ok(()))?;
                 }
 
@@ -520,14 +500,9 @@ impl CompileOptions {
                     let result = execute(compiler, fm, options);
 
                     match result {
-                        Ok(output) => emit_output(
-                            output,
-                            &self.source_file_name,
-                            &self.source_root,
-                            &self.out_dir,
-                            &file_path,
-                            file_extension,
-                        ),
+                        Ok(output) => {
+                            emit_output(output, &self.out_dir, &file_path, file_extension)
+                        }
                         Err(e) => Err(e),
                     }
                 },
@@ -536,33 +511,6 @@ impl CompileOptions {
     }
 }
 
-// TODO: remove once fixed in core https://github.com/swc-project/swc/issues/1388
-fn extend_source_map(
-    source_map: String,
-    source_file_name: &Option<String>,
-    source_root: &Option<String>,
-) -> anyhow::Result<Vec<u8>> {
-    let mut source_map = sourcemap::SourceMap::from_reader(source_map.as_bytes())
-        .context("failed to encode source map")?;
-
-    if !source_map.get_token_count() != 0 {
-        if let Some(ref source_file_name) = source_file_name {
-            source_map.set_source(0u32, source_file_name);
-        }
-    }
-
-    if source_root.is_some() {
-        source_map.set_source_root(source_root.clone());
-    }
-
-    let mut buf = vec![];
-    source_map
-        .to_writer(&mut buf)
-        .context("failed to decode source map")?;
-
-    Ok(buf)
-}
-
 #[swc_trace]
 impl super::CommandRunner for CompileOptions {
     fn execute(&self) -> anyhow::Result<()> {

crates/swc_cli_impl/tests/fixture-manual/8495/.gitignore

@@ -0,0 +1 @@
+dist/

crates/swc_cli_impl/tests/fixture-manual/8495/.swcrc

@@ -0,0 +1,12 @@
+{
+    "$schema": "http://json.schemastore.org/swcrc",
+    "jsc": {
+        "target": "es2022",
+        "parser": {
+            "syntax": "typescript"
+        }
+    },
+    "module": {
+        "type": "commonjs"
+    }
+}

crates/swc_cli_impl/tests/fixture-manual/8495/src/input.ts

@@ -0,0 +1,30 @@
+import type {
+    AnimationConfigWithData,
+    AnimationConfigWithPath,
+} from "lottie-web";
+import type { CSSProperties } from "react";
+
+type Without<T, U> = {
+    // For each `K` in the keys of `T` excluding keys of `U`
+    // map `K` to an optional `never` type.
+    //
+    // See: https://www.typescriptlang.org/docs/handbook/2/mapped-types.html
+    [K in Exclude<keyof T, keyof U>]?: never;
+};
+
+// A type that either has one set of properties or another, but not both.
+export type XOR<T, U> = T | U extends object
+    ? (Without<T, U> & U) | (Without<U, T> & T)
+    : T | U;
+
+export type LottieWebParams = XOR<
+    Omit<AnimationConfigWithPath<"svg">, "renderer" | "container">,
+    Omit<AnimationConfigWithData<"svg">, "renderer" | "container">
+>;
+
+export type LottieAnimationProps = {
+    className?: string;
+    style?: CSSProperties;
+    withShadowRoot?: boolean;
+    onAnimationEnd?: () => void;
+} & LottieWebParams;

crates/swc_cli_impl/tests/issues.rs

@@ -58,6 +58,29 @@ fn issue_8265_1() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn issue_8495_1() -> Result<()> {
+    let pwd = Path::new("tests/fixture-manual/8495").canonicalize()?;
+
+    let mut cmd = cli()?;
+    cmd.current_dir(&pwd)
+        .arg("compile")
+        .arg("--source-maps")
+        .arg("true")
+        .arg("--source-file-name")
+        .arg("input.ts")
+        .arg("--config-file")
+        .arg(".swcrc")
+        .arg("--out-file")
+        .arg("dist/input.js")
+        .arg("src/input.ts");
+
+    cmd.assert().success();
+
+    fs::read_to_string(pwd.join("dist/input.js"))?;
+    Ok(())
+}
+
 /// ln -s $a $b
 fn symlink(a: &Path, b: &Path) {
     #[cfg(unix)]