fix: Properly remap source_content to source_index (#87)

Author: DeMoorJasper

parcel_sourcemap/src/lib.rs

@@ -238,15 +238,12 @@ impl SourceMap {
 
     pub fn get_source_index(&self, source: &str) -> Result<Option<u32>, SourceMapError> {
         let normalized_source = make_relative_path(self.project_root.as_str(), source);
-        match self
+        Ok(self
             .inner
             .sources
             .iter()
             .position(|s| normalized_source.eq(s))
-        {
-            Some(i) => Ok(Some(i as u32)),
-            None => Ok(None),
-        }
+            .map(|v| v as u32))
     }
 
     pub fn get_source(&self, index: u32) -> Result<&str, SourceMapError> {
@@ -529,7 +526,9 @@ impl SourceMap {
 
         self.inner.sources_content.reserve(sources_content.len());
         for (i, source_content) in sources_content.iter().enumerate() {
-            self.set_source_content(i, source_content)?;
+            if let Some(source_index) = source_indexes.get(i) {
+                self.set_source_content(*source_index as usize, source_content)?;
+            }
         }
 
         let mut input = input.iter().cloned().peekable();

parcel_sourcemap_node/src/lib.rs

@@ -95,7 +95,6 @@ fn get_source_index(ctx: CallContext) -> Result<JsNumber> {
 
     let source = ctx.get::<JsString>(0)?.into_utf8()?;
     let source_index = source_map_instance.get_source_index(source.as_str()?)?;
-
     match source_index {
         Some(i) => ctx.env.create_uint32(i),
         None => ctx.env.create_int32(-1),

parcel_sourcemap_wasm/src/lib.rs

@@ -173,12 +173,11 @@ impl SourceMap {
     }
 
     pub fn getSourceIndex(&self, source: &str) -> Result<JsValue, JsValue> {
-        Ok(JsValue::from(
-            self.map
-                .get_source_index(source)?
-                .map(|v| i32::try_from(v).unwrap())
-                .unwrap_or(-1),
-        ))
+        let mapped_val: i32 = match self.map.get_source_index(source)? {
+            Some(found_source_index) => i32::try_from(found_source_index).unwrap_or(-1),
+            None => -1,
+        };
+        Ok(JsValue::from(mapped_val))
     }
 
     pub fn addIndexedMappings(&mut self, mappings_arr: &[i32]) {
@@ -258,7 +257,6 @@ impl SourceMap {
 
     pub fn getSourceContentBySource(&self, source: &str) -> Result<JsValue, JsValue> {
         let source_index = self.map.get_source_index(source)?;
-
         match source_index {
             Some(i) => {
                 let source_content = self.map.get_source_content(i)?;

test/basic.test.js

@@ -249,7 +249,7 @@ describe('SourceMap - Basics', () => {
     assert.deepEqual(map.addSources(['test.js', 'execute.js']), [2, 3]);
 
     assert.deepEqual(map.addSource('abc.js'), 4);
-    assert.deepEqual(map.addSource("dist/rörfokus/4784.js"), 5);
+    assert.deepEqual(map.addSource('dist/rörfokus/4784.js'), 5);
   });
 
   it('Should be able to handle absolute url sources', () => {
@@ -409,4 +409,20 @@ describe('SourceMap - Basics', () => {
 
     assert.equal(map.getSourceContent('helloworld.coffee'), 'module.exports = () => "hello world";');
   });
+
+  it('Should deduplicate sources and sourcesContent from a VLQ Map', () => {
+    let map = new SourceMap('/test-root');
+    map.addVLQMap({
+      mappings: SIMPLE_SOURCE_MAP.mappings,
+      sources: ['./index.js', './index.js'],
+      sourcesContent: ['first', 'second'],
+      names: ['a'],
+    });
+
+    const stringifiedMap = map.toVLQ();
+    assert.equal(stringifiedMap.mappings, SIMPLE_SOURCE_MAP.mappings);
+    assert.deepEqual(stringifiedMap.sources, ['index.js']);
+    assert.deepEqual(stringifiedMap.sourcesContent, ['second']);
+    assert.deepEqual(stringifiedMap.names, ['a']);
+  });
 });