Merge pull request #236 from fitzgen/more-numbers-where-we-should-hav…

…e-strings Ensure that sources and names are non-numeric when consuming source maps
mozilla · May 2, 2016 · 7bc77b0 · 7bc77b0
2 parents 8ff9aaa + 182f445
commit 7bc77b0
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 32 deletions.
diff --git a/dist/source-map.debug.js b/dist/source-map.debug.js
diff --git a/dist/source-map.js b/dist/source-map.js
@@ -171,8 +171,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	      this._validateMapping(generated, original, source, name);
 	    }
 
-	    if (source != null && !this._sources.has(source)) {
-	      this._sources.add(source);
+	    if (source != null) {
+	      source = String(source);
+	      if (!this._sources.has(source)) {
+	        this._sources.add(source);
+	      }
 	    }
 
 	    if (name != null) {
@@ -1616,6 +1619,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 
 	  sources = sources
+	    .map(String)
 	    // Some source maps produce relative source paths like "./foo.js" instead of
 	    // "foo.js".  Normalize these first so that future comparisons will succeed.
 	    // See bugzil.la/1090768.
@@ -1634,7 +1638,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  // are intended to be compressed and deduplicated, the TypeScript compiler
 	  // sometimes generates source maps with duplicates in them. See Github issue
 	  // #72 and bugzil.la/889492.
-	  this._names = ArraySet.fromArray(names, true);
+	  this._names = ArraySet.fromArray(names.map(String), true);
 	  this._sources = ArraySet.fromArray(sources, true);
 
 	  this.sourceRoot = sourceRoot;

diff --git a/dist/source-map.min.js b/dist/source-map.min.js
diff --git a/dist/source-map.min.js.map b/dist/source-map.min.js.map
diff --git a/dist/test/test_api.js b/dist/test/test_api.js
diff --git a/dist/test/test_dog_fooding.js b/dist/test/test_dog_fooding.js
diff --git a/dist/test/test_source_map_consumer.js b/dist/test/test_source_map_consumer.js
diff --git a/dist/test/test_source_map_generator.js b/dist/test/test_source_map_generator.js
diff --git a/dist/test/test_source_node.js b/dist/test/test_source_node.js
diff --git a/lib/source-map-consumer.js b/lib/source-map-consumer.js
@@ -302,6 +302,7 @@ function BasicSourceMapConsumer(aSourceMap) {
   }
 
   sources = sources
+    .map(String)
     // Some source maps produce relative source paths like "./foo.js" instead of
     // "foo.js".  Normalize these first so that future comparisons will succeed.
     // See bugzil.la/1090768.
@@ -320,7 +321,7 @@ function BasicSourceMapConsumer(aSourceMap) {
   // are intended to be compressed and deduplicated, the TypeScript compiler
   // sometimes generates source maps with duplicates in them. See Github issue
   // #72 and bugzil.la/889492.
-  this._names = ArraySet.fromArray(names, true);
+  this._names = ArraySet.fromArray(names.map(String), true);
   this._sources = ArraySet.fromArray(sources, true);
 
   this.sourceRoot = sourceRoot;

diff --git a/lib/source-map-generator.js b/lib/source-map-generator.js
@@ -101,8 +101,11 @@ SourceMapGenerator.prototype.addMapping =
       this._validateMapping(generated, original, source, name);
     }
 
-    if (source != null && !this._sources.has(source)) {
-      this._sources.add(source);
+    if (source != null) {
+      source = String(source);
+      if (!this._sources.has(source)) {
+        this._sources.add(source);
+      }
     }
 
     if (name != null) {

diff --git a/test/test-source-map-consumer.js b/test/test-source-map-consumer.js
@@ -1098,3 +1098,24 @@ exports['test sources where their prefix is the source root and the source root
   consumer.sources.forEach(consumerHasSource);
   testSourceMap.sources.forEach(consumerHasSource);
 };
+
+exports['test consuming names and sources that are numbers'] = function (assert) {
+  var testSourceMap = {
+    "version": 3,
+    "sources": [0],
+    "names": [1],
+    "mappings": "AAAAA",
+  };
+
+  var consumer = new SourceMapConsumer(testSourceMap);
+
+  assert.equal(consumer.sources.length, 1);
+  assert.equal(consumer.sources[0], "0");
+
+  var i = 0;
+  consumer.eachMapping(function (m) {
+    i++;
+    assert.equal(m.name, "1");
+  });
+  assert.equal(i, 1);
+};