test: fix up tests; add test for enclosing function

nodejs · bcoe · Nov 8, 2020 · Nov 27, 2020 · Nov 27, 2020 · Nov 27, 2020
commit e4695545bc3dcefb9edbdba4e1ec77d1042994c8
diff --git a/lib/internal/source_map/prepare_stack_trace.js b/lib/internal/source_map/prepare_stack_trace.js
@@ -81,7 +81,9 @@ const prepareStackTrace = (globalThis, error, trace) => {
             );
           }
           // Show both original and transpiled stack trace information:
-          const prefix = name ? `\n        -> at ${name}` : '\n        ->';
+          const prefix = (name && name !== t.getFunctionName()) ?
+            `\n        -> at ${name}` :
+            '\n        ->';
           const originalSourceNoScheme =
             StringPrototypeStartsWith(originalSource, 'file://') ?
               fileURLToPath(originalSource) : originalSource;

diff --git a/test/fixtures/source-map/enclosing-call-site-min.js b/test/fixtures/source-map/enclosing-call-site-min.js
@@ -0,0 +1,3 @@
+var functionA=function(){functionB()};function functionB(){functionC()}var functionC=function(){functionD()},functionD=function(){if(0<Math.random())throw Error("an error!");},thrower=functionA;try{functionA()}catch(a){throw a;};
+//# sourceMappingURL=enclosing-call-site.js.map
+
diff --git a/test/fixtures/source-map/enclosing-call-site.js b/test/fixtures/source-map/enclosing-call-site.js
@@ -0,0 +1,27 @@
+const functionA = () => {
+  functionB()
+}
+
+function functionB() {
+  functionC()
+}
+
+const functionC = () => {
+  functionD()
+}
+
+const functionD = () => {
+  (function functionE () {
+    if (Math.random() > 0) {
+      throw new Error('an error!')
+    }
+  })()
+}
+
+const thrower = functionA
+
+try {
+  thrower()
+} catch (err) {
+  throw err
+}
diff --git a/test/fixtures/source-map/enclosing-call-site.js.map b/test/fixtures/source-map/enclosing-call-site.js.map
diff --git a/test/message/source_map_enclosing_function.js b/test/message/source_map_enclosing_function.js
@@ -0,0 +1,5 @@
+// Flags:  --enable-source-maps
+
+'use strict';
+require('../common');
+require('../fixtures/source-map/enclosing-call-site-min.js');
diff --git a/test/message/source_map_enclosing_function.out b/test/message/source_map_enclosing_function.out
@@ -0,0 +1,20 @@
+*enclosing-call-site.js:16
+      throw new Error('an error!')
+                ^
+
+Error: an error!
+    at functionD (*enclosing-call-site-min.js:1:156)
+        -> at functionD (*enclosing-call-site.js:16:17)
+    at functionC (*enclosing-call-site-min.js:1:97)
+        -> at functionC (*enclosing-call-site.js:10:3)
+    at functionB (*enclosing-call-site-min.js:1:60)
+        -> at functionB (*enclosing-call-site.js:6:3)
+    at functionA (*enclosing-call-site-min.js:1:26)
+        -> at functionA (*enclosing-call-site.js:2:3)
+    at Object.<anonymous> (*enclosing-call-site-min.js:1:199)
+        -> (*enclosing-call-site.js:24:3)
+    at Module._compile (node:internal/modules/cjs/loader:*)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
+    at Module.load (node:internal/modules/cjs/loader:*)
+    at Function.Module._load (node:internal/modules/cjs/loader:*)
+    at Module.require (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_reference_error_tabs.out b/test/message/source_map_reference_error_tabs.out
@@ -4,9 +4,9 @@
 
 ReferenceError: alert is not defined
     at Object.<anonymous> (*tabs.coffee:39:5)
-        -> *tabs.coffee:26:2
+        -> *tabs.coffee:26:2*
     at Object.<anonymous> (*tabs.coffee:53:4)
-        -> *tabs.coffee:1:14
+        -> *tabs.coffee:1:14*
     at Module._compile (node:internal/modules/cjs/loader:*
     at Object.Module._extensions..js (node:internal/modules/cjs/loader:*
     at Module.load (node:internal/modules/cjs/loader:*

diff --git a/test/message/source_map_throw_catch.out b/test/message/source_map_throw_catch.out
@@ -4,9 +4,9 @@ reachable
           ^
 Error: an exception
     at branch (*typescript-throw.js:20:15)
-        -> *typescript-throw.ts:18:11
+        -> *typescript-throw.ts:18:11*
     at Object.<anonymous> (*typescript-throw.js:26:1)
-        -> *typescript-throw.ts:24:1
+        -> *typescript-throw.ts:24:1*
     at Module._compile (node:internal/modules/cjs/loader:*)
     at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
     at Module.load (node:internal/modules/cjs/loader:*)

diff --git a/test/message/source_map_throw_first_tick.out b/test/message/source_map_throw_first_tick.out
@@ -4,9 +4,9 @@ reachable
           ^
 Error: an exception
     at branch (*typescript-throw.js:20:15)
-        -> *typescript-throw.ts:18:11
+        -> *typescript-throw.ts:18:11*
     at Object.<anonymous> (*typescript-throw.js:26:1)
-        -> *typescript-throw.ts:24:1
+        -> *typescript-throw.ts:24:1*
     at Module._compile (node:internal/modules/cjs/loader:*)
     at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
     at Module.load (node:internal/modules/cjs/loader:*)

diff --git a/test/message/source_map_throw_icu.out b/test/message/source_map_throw_icu.out
@@ -4,9 +4,9 @@
 
 Error: an error
     at Object.createElement (*icu.js:5:7)
-        -> *icu.jsx:3:23
+        -> *icu.jsx:3:23*
     at Object.<anonymous> (*icu.js:8:82)
-        -> *icu.jsx:9:5
+        -> *icu.jsx:9:5*
     at Module._compile (node:internal/modules/cjs/loader:*
     at Object.Module._extensions..js (node:internal/modules/cjs/loader:*
     at Module.load (node:internal/modules/cjs/loader:*

diff --git a/test/message/source_map_throw_set_immediate.out b/test/message/source_map_throw_set_immediate.out
@@ -4,7 +4,7 @@
 
 Error: goodbye
     at *uglify-throw.js:1:43
-        -> *uglify-throw-original.js:5:9
+        -> at Hello *uglify-throw-original.js:5:9*
     at Immediate.<anonymous> (*uglify-throw.js:1:60)
-        -> *uglify-throw-original.js:9:3
+        -> *uglify-throw-original.js:9:3*
     at processImmediate (node:internal/timers:*)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		var functionA=function(){functionB()};function functionB(){functionC()}var functionC=function(){functionD()},functionD=function(){if(0<Math.random())throw Error("an error!");},thrower=functionA;try{functionA()}catch(a){throw a;};
		//# sourceMappingURL=enclosing-call-site.js.map