Merge pull request mozilla#251 from dmurat/emptyMappingsFix

Empty mappings fix implemented.

Author: tromey

.gitignore

@@ -1 +1,4 @@
+*.iml
+*.log
+.idea
 node_modules/*

lib/source-map-generator.js

@@ -72,6 +72,15 @@ SourceMapGenerator.fromSourceMap =
       generator.addMapping(newMapping);
     });
     aSourceMapConsumer.sources.forEach(function (sourceFile) {
+      var sourceRelative = sourceFile;
+      if (sourceRoot !== null) {
+        sourceRelative = util.relative(sourceRoot, sourceFile);
+      }
+
+      if (!generator._sources.has(sourceRelative)) {
+        generator._sources.add(sourceRelative);
+      }
+
       var content = aSourceMapConsumer.sourceContentFor(sourceFile);
       if (content != null) {
         generator.setSourceContent(sourceFile, content);

test/test-source-map-generator.js

@@ -252,6 +252,30 @@ exports['test .fromSourceMap with sourcesContent'] = function (assert) {
   util.assertEqualMaps(assert, map.toJSON(), util.testMapWithSourcesContent);
 };
 
+exports['test .fromSourceMap with single source'] = function (assert) {
+  var map = SourceMapGenerator.fromSourceMap(
+      new SourceMapConsumer(util.testMapSingleSource));
+  util.assertEqualMaps(assert, map.toJSON(), util.testMapSingleSource);
+};
+
+exports['test .fromSourceMap with empty mappings'] = function (assert) {
+  var map = SourceMapGenerator.fromSourceMap(
+    new SourceMapConsumer(util.testMapEmptyMappings));
+  util.assertEqualMaps(assert, map.toJSON(), util.testMapEmptyMappings);
+};
+
+exports['test .fromSourceMap with empty mappings and relative sources'] = function (assert) {
+  var map = SourceMapGenerator.fromSourceMap(
+    new SourceMapConsumer(util.testMapEmptyMappingsRelativeSources));
+  util.assertEqualMaps(assert, map.toJSON(), util.testMapEmptyMappingsRelativeSources_generatedExpected);
+};
+
+exports['test .fromSourceMap with multiple sources where mappings refers only to single source'] = function (assert) {
+    var map = SourceMapGenerator.fromSourceMap(
+        new SourceMapConsumer(util.testMapMultiSourcesMappingRefersSingleSourceOnly));
+    util.assertEqualMaps(assert, map.toJSON(), util.testMapMultiSourcesMappingRefersSingleSourceOnly);
+};
+
 exports['test applySourceMap'] = function (assert) {
   var node = new SourceNode(null, null, null, [
     new SourceNode(2, 0, 'fileX', 'lineX2\n'),

test/util.js

@@ -51,6 +51,58 @@ exports.testMapEmptySourceRoot = {
   sourceRoot: '',
   mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID;CCDb,IAAI,IAAM,SAAUE,GAClB,OAAOA'
 };
+exports.testMapSingleSource = {
+  version: 3,
+  file: 'min.js',
+  names: ['bar', 'baz'],
+  sources: ['one.js'],
+  sourceRoot: '',
+  mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID'
+};
+exports.testMapEmptyMappings = {
+  version: 3,
+  file: 'min.js',
+  names: [],
+  sources: ['one.js', 'two.js'],
+  sourcesContent: [
+    ' ONE.foo = 1;',
+    ' TWO.inc = 2;'
+  ],
+  sourceRoot: '',
+  mappings: ''
+};
+exports.testMapEmptyMappingsRelativeSources = {
+  version: 3,
+  file: 'min.js',
+  names: [],
+  sources: ['./one.js', './two.js'],
+  sourcesContent: [
+    ' ONE.foo = 1;',
+    ' TWO.inc = 2;'
+  ],
+  sourceRoot: '/the/root',
+  mappings: ''
+};
+exports.testMapEmptyMappingsRelativeSources_generatedExpected = {
+  version: 3,
+  file: 'min.js',
+  names: [],
+  sources: ['one.js', 'two.js'],
+  sourcesContent: [
+    ' ONE.foo = 1;',
+    ' TWO.inc = 2;'
+  ],
+  sourceRoot: '/the/root',
+  mappings: ''
+};
+exports.testMapMultiSourcesMappingRefersSingleSourceOnly = {
+    version: 3,
+    file: 'min.js',
+    names: ['bar', 'baz'],
+    sources: ['one.js', 'withoutMappings.js'],
+    sourceRoot: '',
+    mappings: 'CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOC,IAAID'
+};
 // This mapping is identical to above, but uses the indexed format instead.
 exports.indexedTestMap = {
   version: 3,