chore: using oxc sourcemap (#13)

* chore: using oxc sourcemap

* chore: update

* chore: update

Author: underfin

Cargo.toml

@@ -12,11 +12,11 @@ index_vec = { version = "0.1.3" }
 rustc-hash = { version = "1.1.0" }
 # regex = "1.10.2"
 once_cell = "1.18.0"
-sourcemap = { version = "7.1.1", optional = true  }
+oxc = { version = "0.12.5", features = ["sourcemap"] }
 
 [features]
 # Enable source map functionality
-source_map = ["sourcemap"]
+source_map = ["oxc/sourcemap"]
 
 [dev-dependencies]
 glob = "0.3.1"

examples/source_map.rs

@@ -15,13 +15,11 @@ fn main() {
 
     let sm = s.source_map(SourceMapOptions {
         include_content: true,
+        ..Default::default()
     });
 
-    std::fs::write("./demo.map.json",  {
-        let mut buf = vec![];
-        sm.to_writer(&mut buf).unwrap();
-        String::from_utf8(buf).unwrap()
-    }).unwrap();
+    std::fs::write("./demo.map.json", sm.to_json_string().unwrap())
+    .unwrap();
     std::fs::write("./demo.jsx", s.to_string()).unwrap();
 
     println!("{:#?}", s.to_string());

src/magic_string/source_map.rs

@@ -1,22 +1,27 @@
-use crate::{
-    locator::Locator,
-    MagicString,
-    sourcemap_builder::SourcemapBuilder,
-};
+use std::sync::Arc;
 
-#[derive(Debug, Default)]
+use crate::{locator::Locator, sourcemap_builder::SourcemapBuilder, MagicString};
+
+#[derive(Debug)]
 pub struct SourceMapOptions {
     pub include_content: bool,
+    pub source: Arc<str>,
+}
+
+impl Default for SourceMapOptions {
+    fn default() -> Self {
+        Self {
+            include_content: false,
+            source: "".into(),
+        }
+    }
 }
 
 impl<'s> MagicString<'s> {
-    pub fn source_map(&self, opts: SourceMapOptions) -> sourcemap::SourceMap {
+    pub fn source_map(&self, opts: SourceMapOptions) -> oxc::sourcemap::SourceMap {
         let mut source_builder = SourcemapBuilder::new();
 
-        source_builder.set_source("");
-        if opts.include_content {
-            source_builder.set_source_contents(&self.source);
-        }
+        source_builder.set_source_and_content(&opts.source, &self.source);
 
         let locator = Locator::new(&self.source);
 

src/sourcemap_builder.rs

@@ -4,8 +4,8 @@ pub struct SourcemapBuilder {
     generated_code_line: TextSize,
     /// `generated_code_column` is calculated based on utf-16.
     generated_code_column: TextSize,
-    source_id: u32, 
-    source_map_builder: sourcemap::SourceMapBuilder,
+    source_id: u32,
+    source_map_builder: oxc::sourcemap::SourceMapBuilder,
 }
 
 impl SourcemapBuilder {
@@ -14,34 +14,37 @@ impl SourcemapBuilder {
             generated_code_line: 0,
             generated_code_column: 0,
             source_id: 0,
-            source_map_builder: sourcemap::SourceMapBuilder::new(None),
+            source_map_builder: oxc::sourcemap::SourceMapBuilder::default(),
         }
     }
 
-    pub fn into_source_map(self) -> sourcemap::SourceMap {
+    pub fn into_source_map(self) -> oxc::sourcemap::SourceMap {
         self.source_map_builder.into_sourcemap()
     }
 
-    pub fn set_source(&mut self, source: &str)  {
-        self.source_id =  self.source_map_builder.add_source(source);
-    }
-
-    pub fn set_source_contents(&mut self, content: &str) {
-        self.source_map_builder.set_source_contents(self.source_id, Some(content));
+    pub fn set_source_and_content(&mut self, id: &str, content: &str) {
+        self.source_id = self.source_map_builder.set_source_and_content(id, content);
     }
 
     pub fn add_chunk(
         &mut self,
         chunk: &Chunk,
         locator: &Locator,
         source: &str,
-        name: Option<&str>
+        name: Option<&str>,
     ) {
         let name_id = name.map(|name| self.source_map_builder.add_name(name));
         let mut loc = locator.locate(chunk.start());
         if let Some(edited_content) = &chunk.edited_content {
             if !edited_content.is_empty() {
-                self.source_map_builder.add_raw(self.generated_code_line, self.generated_code_column, loc.line, loc.column, Some(self.source_id), name_id);
+                self.source_map_builder.add_token(
+                    self.generated_code_line,
+                    self.generated_code_column,
+                    loc.line,
+                    loc.column,
+                    Some(self.source_id),
+                    name_id,
+                );
             }
             self.advance(edited_content);
         } else {
@@ -57,7 +60,14 @@ impl SourcemapBuilder {
                     _ => {
                         if new_line {
                             new_line = false;
-                            self.source_map_builder.add_raw(self.generated_code_line, self.generated_code_column, loc.line, loc.column, Some(self.source_id), name_id);
+                            self.source_map_builder.add_token(
+                                self.generated_code_line,
+                                self.generated_code_column,
+                                loc.line,
+                                loc.column,
+                                Some(self.source_id),
+                                name_id,
+                            );
                         }
 
                         let char_utf16_len = char.len_utf16() as u32;
@@ -89,4 +99,4 @@ impl SourcemapBuilder {
         self.generated_code_line += 1;
         self.generated_code_column = 0;
     }
-}
+}

tests/magic_string_source_map.rs

@@ -19,27 +19,21 @@ fn basic() {
 
     let sm = s.source_map(SourceMapOptions {
         include_content: true,
+        ..Default::default()
     });
 
     assert_eq!(
-        {
-            let mut buf = vec![];
-            sm.to_writer(&mut buf).unwrap();
-            String::from_utf8(buf).unwrap()
-        },
-        "{\"version\":3,\"sources\":[\"\"],\"sourcesContent\":[\"<div>\\n  hello, world\\n</div>\"],\"names\":[\"d\",\"v\",\"div\"],\"mappings\":\"AAAA,CAACA,CAAC,CAACC,CAAC;AACJ;AACA,EAAEC,EAAG\"}"
+        sm.to_json_string().unwrap(),
+        "{\"version\":3,\"names\":[\"d\",\"v\",\"div\"],\"sources\":[\"\"],\"sourcesContent\":[\"<div>\\n  hello, world\\n</div>\"],\"mappings\":\"AAAA,CAACA,CAAC,CAACC,CAAC;AACJ;AACA,EAAEC,EAAG\"}"
     );
 
     s.prepend("import React from 'react';\n");
     let sm = s.source_map(SourceMapOptions {
         include_content: true,
+        ..Default::default()
     });
     assert_eq!(
-        {
-            let mut buf = vec![];
-            sm.to_writer(&mut buf).unwrap();
-            String::from_utf8(buf).unwrap()
-        },
-        "{\"version\":3,\"sources\":[\"\"],\"sourcesContent\":[\"<div>\\n  hello, world\\n</div>\"],\"names\":[\"d\",\"v\",\"div\"],\"mappings\":\";AAAA,CAACA,CAAC,CAACC,CAAC;AACJ;AACA,EAAEC,EAAG\"}"
+        sm.to_json_string().unwrap(),
+        "{\"version\":3,\"names\":[\"d\",\"v\",\"div\"],\"sources\":[\"\"],\"sourcesContent\":[\"<div>\\n  hello, world\\n</div>\"],\"mappings\":\";AAAA,CAACA,CAAC,CAACC,CAAC;AACJ;AACA,EAAEC,EAAG\"}"
     );
 }