From 26dcd6400f88d7471e2f60e668ad3419f0b6040d Mon Sep 17 00:00:00 2001
From: Dale Bustad <dale@divmain.com>
Date: Thu, 4 Feb 2016 19:39:19 -0800
Subject: [PATCH] When generating sourcemaps, use per-node source `filename` if
 present.

---
 packages/babel-generator/src/source-map.js |  2 +-
 packages/babel-generator/test/index.js     | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/packages/babel-generator/src/source-map.js b/packages/babel-generator/src/source-map.js
index 942f931b9f..6213873ad7 100644
--- a/packages/babel-generator/src/source-map.js
+++ b/packages/babel-generator/src/source-map.js
@@ -68,7 +68,7 @@ export default class SourceMap {
     }
 
     this.last = {
-      source: this.opts.sourceFileName,
+      source: loc.filename || this.opts.sourceFileName,
       generated: generated,
       original: original
     };
diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js
index e6cfc39827..7ee494b75d 100644
--- a/packages/babel-generator/test/index.js
+++ b/packages/babel-generator/test/index.js
@@ -17,6 +17,44 @@ suite("generation", function () {
       assert.ok(t.VISITOR_KEYS[type], type + " should not exist");
     });
   });
+
+  test("multiple sources", function () {
+    var sources = {
+      "a.js": "function hi (msg) { console.log(msg); }\n",
+      "b.js": "hi('hello');\n"
+    };
+    var parsed = _.keys(sources).reduce(function (_parsed, filename) {
+      _parsed[filename] = parse(sources[filename], { sourceFilename: filename });
+      return _parsed;
+    }, {});
+
+    var combinedAst = {
+      "type": "File",
+      "program": {
+        "type": "Program",
+        "sourceType": "module",
+        "body": [].concat(parsed["a.js"].program.body, parsed["b.js"].program.body)
+      }
+    };
+
+    var generated = generate.default(combinedAst, { sourceMaps: true }, sources);
+
+    chai.expect(generated.map).to.deep.equal({
+      version: 3,
+      sources: [ 'a.js', 'b.js' ],
+      names: [],
+      mappings: 'AAAA,SAAS,EAAT,CAAa,GAAb,EAAkB;AAAE,UAAQ,GAAR,CAAY,GAAZ,EAAF;CAAlB;;GCAG,OAAH',
+      sourcesContent: [
+      'function hi (msg) { console.log(msg); }\n',
+        'hi(\'hello\');\n'
+      ]
+    }, "sourcemap was incorrectly generated");
+
+    chai.expect(generated.code).to.equal(
+      "function hi(msg) {\n  console.log(msg);\n}\n\nhi('hello');",
+      "code was incorrectly generated"
+    );
+  });
 });