Use maybeAddSegment to declutter mappings

jridgewell · jridgewell · commit 3429b0bf8616 · 2022-04-30T12:34:07.000-04:00
Instead of implementing this in the remapping package, it's done inside the generator package.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "typescript": "4.6.3"
   },
   "dependencies": {
-    "@jridgewell/gen-mapping": "^0.2.0",
+    "@jridgewell/gen-mapping": "^0.3.0",
     "@jridgewell/trace-mapping": "^0.3.9"
   }
 }
diff --git a/src/source-map-tree.ts b/src/source-map-tree.ts
@@ -1,4 +1,4 @@
-import { GenMapping, addSegment, setSourceContent } from '@jridgewell/gen-mapping';
+import { GenMapping, maybeAddSegment, setSourceContent } from '@jridgewell/gen-mapping';
 import { traceSegment, decodedMappings } from '@jridgewell/trace-mapping';
 
 import type { TraceMap } from '@jridgewell/trace-mapping';
@@ -79,6 +79,8 @@ export function OriginalSource(source: string, content: string | null): Original
  * resolving each mapping in terms of the original source files.
  */
 export function traceMappings(tree: MapSource): GenMapping {
+  // TODO: Eventually support sourceRoot, which has to be removed because the sources are already
+  // fully resolved. We'll need to make sources relative to the sourceRoot before adding them.
   const gen = new GenMapping({ file: tree.map.file });
   const { sources: rootSources, map } = tree;
   const rootNames = map.names;
@@ -87,10 +89,6 @@ export function traceMappings(tree: MapSource): GenMapping {
   for (let i = 0; i < rootMappings.length; i++) {
     const segments = rootMappings[i];
 
-    let lastSource = null;
-    let lastSourceLine = null;
-    let lastSourceColumn = null;
-
     for (let j = 0; j < segments.length; j++) {
       const segment = segments[j];
       const genCol = segment[0];
@@ -112,19 +110,11 @@ export function traceMappings(tree: MapSource): GenMapping {
         if (traced == null) continue;
       }
 
-      // So we traced a segment down into its original source file. Now push a
-      // new segment pointing to this location.
       const { column, line, name, content, source } = traced;
-      if (line === lastSourceLine && column === lastSourceColumn && source === lastSource) {
-        continue;
-      }
-      lastSourceLine = line;
-      lastSourceColumn = column;
-      lastSource = source;
 
       // Sigh, TypeScript can't figure out source/line/column are either all null, or all non-null...
-      (addSegment as any)(gen, i, genCol, source, line, column, name);
-      if (content != null) setSourceContent(gen, source, content);
+      (maybeAddSegment as any)(gen, i, genCol, source, line, column, name);
+      if (source && content != null) setSourceContent(gen, source, content);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`"typescript": "4.6.3"`
`58`	`58`	`},`
`59`	`59`	`"dependencies": {`
`60`		`- "@jridgewell/gen-mapping": "^0.2.0",`
	`60`	`+ "@jridgewell/gen-mapping": "^0.3.0",`
`61`	`61`	`"@jridgewell/trace-mapping": "^0.3.9"`
`62`	`62`	`}`
`63`	`63`	`}`