From 5eccbc7ac71872866c7de2396399e548b70d8cc0 Mon Sep 17 00:00:00 2001
From: Connor Clark <connor.clark@coursehero.com>
Date: Thu, 9 Aug 2018 12:20:26 -0700
Subject: [PATCH] use original name from source in error trace

---
 source-map-support.js |  2 ++
 test.js               | 44 +++++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/source-map-support.js b/source-map-support.js
index fd3cf7e..b853d1e 100644
--- a/source-map-support.js
+++ b/source-map-support.js
@@ -362,6 +362,8 @@ function wrapCallSite(frame) {
       column: column
     });
     frame = cloneCallSite(frame);
+    var originalFunctionName = frame.getFunctionName;
+    frame.getFunctionName = function() { return position.name || originalFunctionName(); };
     frame.getFileName = function() { return position.source; };
     frame.getLineNumber = function() { return position.line; };
     frame.getColumnNumber = function() { return position.column + 1; };
diff --git a/test.js b/test.js
index 8365c48..f95a0e2 100644
--- a/test.js
+++ b/test.js
@@ -278,7 +278,7 @@ it('throw with empty source map', function() {
     'throw new Error("test");'
   ], [
     'Error: test',
-    /^    at Object\.exports\.test \((?:.*[/\\])?.generated.js:1:34\)$/
+    /^    at Object\.exports\.test \((?:.*[/\\])?\.generated.js:1:34\)$/
   ]);
 });
 
@@ -293,7 +293,7 @@ it('throw in Timeout with empty source map', function(done) {
     '    throw new Error("this is the error")',
     /^          \^$/,
     'Error: this is the error',
-    /^    at ((null)|(Timeout))\._onTimeout \((?:.*[/\\])?.generated.js:3:11\)$/
+    /^    at ((null)|(Timeout))\._onTimeout \((?:.*[/\\])?.generated\.js:3:11\)$/
   ]);
 });
 
@@ -302,7 +302,7 @@ it('throw with source map with gap', function() {
     'throw new Error("test");'
   ], [
     'Error: test',
-    /^    at Object\.exports\.test \((?:.*[/\\])?.generated.js:1:34\)$/
+    /^    at Object\.exports\.test \((?:.*[/\\])?\.generated\.js:1:34\)$/
   ]);
 });
 
@@ -311,7 +311,7 @@ it('sourcesContent with data URL', function() {
     'throw new Error("test");'
   ], [
     'Error: test',
-    /^    at Object\.exports\.test \((?:.*[/\\])?original.js:1001:5\)$/
+    /^    at Object\.exports\.test \((?:.*[/\\])?original\.js:1001:5\)$/
   ]);
 });
 
@@ -321,7 +321,27 @@ it('finds the last sourceMappingURL', function() {
     'throw new Error("test");'
   ], [
     'Error: test',
-    /^    at Object\.exports\.test \((?:.*[/\\])?original.js:1002:5\)$/
+    /^    at Object\.exports\.test \((?:.*[/\\])?original\.js:1002:5\)$/
+  ]);
+});
+
+it('maps original name from source', function() {
+  var sourceMap = createEmptySourceMap();
+  sourceMap.addMapping({
+    generated: { line: 2, column: 8 },
+    original: { line: 1000, column: 10 },
+    source: '.original.js',
+    name: 'myOriginalName'
+  });
+  compareStackTrace(sourceMap, [
+    'function foo() {',
+    '  throw new Error("test");',
+    '}',
+    'foo();'
+  ], [
+    'Error: test',
+    /^    at myOriginalName \((?:.*[/\\])?\.original.js:1000:11\)$/,
+    /^    at Object\.exports\.test \((?:.*[/\\])?\.generated.js:4:1\)$/
   ]);
 });
 
@@ -337,7 +357,7 @@ it('default options', function(done) {
     'this is the original code',
     '^',
     'Error: this is the error',
-    /^    at foo \((?:.*[/\\])?.original\.js:1:1\)$/
+    /^    at foo \((?:.*[/\\])?\.original\.js:1:1\)$/
   ]);
 });
 
@@ -352,7 +372,7 @@ it('handleUncaughtExceptions is true', function(done) {
     'this is the original code',
     '^',
     'Error: this is the error',
-    /^    at foo \((?:.*[/\\])?.original\.js:1:1\)$/
+    /^    at foo \((?:.*[/\\])?\.original\.js:1:1\)$/
   ]);
 });
 
@@ -414,7 +434,7 @@ it('specifically requested error source', function(done) {
     'process.on("uncaughtException", function (e) { console.log("SRC:" + sms.getErrorSource(e)); });',
     'process.nextTick(foo);'
   ], [
-    /^SRC:.*[/\\].original.js:1$/,
+    /^SRC:.*[/\\]\.original\.js:1$/,
     'this is the original code',
     '^'
   ]);
@@ -488,9 +508,9 @@ it('should consult all retrieve source map providers', function(done) {
     'process.nextTick(function() { console.log(count); });',
   ], [
     'Error: this is the error',
-    /^    at foo \((?:.*[/\\])?original.js:1004:5\)$/,
+    /^    at foo \((?:.*[/\\])?original\.js:1004:5\)$/,
     'Error: this is the error',
-    /^    at foo \((?:.*[/\\])?original.js:1004:5\)$/,
+    /^    at foo \((?:.*[/\\])?original\.js:1004:5\)$/,
     '1', // The retrieval should only be attempted once
   ]);
 });
@@ -525,9 +545,9 @@ it('should allow for runtime inline source maps', function(done) {
     'require("./.generated.jss");',
   ], [
     'Error: this is the error',
-    /^    at foo \(.*[/\\]original.js:1004:5\)$/,
+    /^    at foo \(.*[/\\]original\.js:1004:5\)$/,
     'Error: this is the error',
-    /^    at foo \(.*[/\\]original.js:1004:5\)$/,
+    /^    at foo \(.*[/\\]original\.js:1004:5\)$/,
     '0', // The retrieval should only be attempted once
   ]);
 });