fixup! lib: cache source maps in vm sources

Author: legendecas

test/common/assertSnapshot.js

@@ -33,8 +33,20 @@ function replaceWindowsPaths(str) {
   return common.isWindows ? str.replaceAll(path.win32.sep, path.posix.sep) : str;
 }
 
-function replaceFullPaths(str) {
-  return str.replaceAll(process.cwd(), '');
+function replaceWindowsDriveLetter(str) {
+  if (!common.isWindows) {
+    return str;
+  }
+  const currentDriveLetter = path.parse(process.cwd()).root.substring(0, 1).toLowerCase();
+  const regex = new RegExp(`${currentDriveLetter}:`, 'gi');
+  return str.replaceAll(regex, '');
+}
+
+function transformCwd(replacement = '') {
+  const cwd = process.cwd();
+  return (str) => {
+    return str.replaceAll(cwd, replacement);
+  }
 }
 
 function transform(...args) {
@@ -97,12 +109,13 @@ module.exports = {
   assertSnapshot,
   getSnapshotPath,
   replaceExperimentalWarning,
-  replaceFullPaths,
   replaceNodeVersion,
   replaceStackTrace,
   replaceInternalStackTrace,
   replaceWindowsLineEndings,
   replaceWindowsPaths,
+  replaceWindowsDriveLetter,
   spawnAndAssert,
   transform,
+  transformCwd,
 };

test/parallel/test-node-output-sourcemaps.mjs

@@ -1,28 +1,18 @@
-import * as common from '../common/index.mjs';
+import '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import * as snapshot from '../common/assertSnapshot.js';
-import * as path from 'node:path';
 import { describe, it } from 'node:test';
 
 describe('sourcemaps output', { concurrency: true }, () => {
-  function normalize(str) {
-    const result = str
-      .replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '*');
-
-    if (common.isWindows) {
-      const currentDeviceLetter = path.parse(process.cwd()).root.substring(0, 1).toLowerCase();
-      const regex = new RegExp(`${currentDeviceLetter}:/?`, 'gi');
-      return result.replaceAll(regex, '');
-    }
-    return result;
-  }
   const defaultTransform = snapshot
     .transform(
       snapshot.replaceWindowsLineEndings,
+      snapshot.transformCwd('*'),
       snapshot.replaceWindowsPaths,
+      // Remove drive letters from synthethized paths (i.e. not cwd).
+      snapshot.replaceWindowsDriveLetter,
       snapshot.replaceInternalStackTrace,
       snapshot.replaceExperimentalWarning,
-      normalize,
       snapshot.replaceNodeVersion
     );
 

test/parallel/test-runner-output.mjs

@@ -61,7 +61,7 @@ const defaultTransform = snapshot.transform(
   snapshot.replaceWindowsLineEndings,
   snapshot.replaceStackTrace,
   removeWindowsPathEscaping,
-  snapshot.replaceFullPaths,
+  snapshot.transformCwd(),
   snapshot.replaceWindowsPaths,
   replaceTestDuration,
   replaceTestLocationLine,
@@ -79,7 +79,7 @@ const junitTransform = snapshot.transform(
 const lcovTransform = snapshot.transform(
   snapshot.replaceWindowsLineEndings,
   snapshot.replaceStackTrace,
-  snapshot.replaceFullPaths,
+  snapshot.transformCwd(),
   snapshot.replaceWindowsPaths,
   pickTestFileFromLcov
 );