lib: source maps filter null prefix

Fixes: #42417 PR-URL: #42522 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Apr 6, 2022 · 3306fee · 3306fee
1 parent 0bd9d9e
commit 3306fee
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/lib/internal/source_map/prepare_stack_trace.js b/lib/internal/source_map/prepare_stack_trace.js
@@ -88,8 +88,9 @@ const prepareStackTrace = (globalThis, error, trace) => {
           }
           // Construct call site name based on: v8.dev/docs/stack-trace-api:
           const fnName = t.getFunctionName() ?? t.getMethodName();
-          const originalName = `${t.getTypeName() !== 'global' ?
-            `${t.getTypeName()}.` : ''}${fnName || '<anonymous>'}`;
+          const typeName = t.getTypeName();
+          const namePrefix = typeName !== null && typeName !== 'global' ? `${typeName}.` : '';
+          const originalName = `${namePrefix}${fnName || '<anonymous>'}`;
           // The original call site may have a different symbol name
           // associated with it, use it:
           const prefix = (name && name !== originalName) ?

diff --git a/test/fixtures/source-map/throw-async.mjs b/test/fixtures/source-map/throw-async.mjs
@@ -0,0 +1,11 @@
+const message = 'Message ' + Math.random();
+export async function Throw() {
+    throw new Error(message);
+}
+await Throw();
+// To recreate:
+//
+// npx tsc --module esnext --target es2017 --outDir test/fixtures/source-map --sourceMap test/fixtures/source-map/throw-async.ts
+// + rename js to mjs
+// + rename js to mjs in source map comment in mjs file
+//# sourceMappingURL=throw-async.mjs.map
diff --git a/test/fixtures/source-map/throw-async.mjs.map b/test/fixtures/source-map/throw-async.mjs.map
diff --git a/test/fixtures/source-map/throw-async.ts b/test/fixtures/source-map/throw-async.ts
@@ -0,0 +1,13 @@
+const message = 'Message ' + Math.random();
+
+export async function Throw() {
+  throw new Error(message)
+}
+
+await Throw();
+
+// To recreate:
+//
+// npx tsc --module esnext --target es2017 --outDir test/fixtures/source-map --sourceMap test/fixtures/source-map/throw-async.ts
+// + rename js to mjs
+// + rename js to mjs in source map comment in mjs file
diff --git a/test/parallel/test-source-map-enable.js b/test/parallel/test-source-map-enable.js
@@ -343,6 +343,22 @@ function nextdir() {
   assert.ok(sourceMap);
 }
 
+// Does not include null for async/await with esm
+// Refs: https://github.com/nodejs/node/issues/42417
+{
+  const output = spawnSync(process.execPath, [
+    '--enable-source-maps',
+    require.resolve('../fixtures/source-map/throw-async.mjs'),
+  ]);
+  // Error in original context of source content:
+  assert.match(
+    output.stderr.toString(),
+    /throw new Error\(message\)\r?\n.*\^/
+  );
+  // Rewritten stack trace:
+  assert.match(output.stderr.toString(), /at Throw \([^)]+throw-async\.ts:4:9\)/);
+}
+
 function getSourceMapFromCache(fixtureFile, coverageDirectory) {
   const jsonFiles = fs.readdirSync(coverageDirectory);
   for (const jsonFile of jsonFiles) {