@jsenv/sourcemap 1.3.19 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/sourcemap",
-  "version": "1.3.19",
+  "version": "1.4.1",
   "type": "module",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@jsenv/urls": "2.9.10",
-    "magic-string": "0.30.21",
+    "magic-string": "1.0.0",
     "source-map-js": "1.2.1"
   },
   "publishConfig": {

package/src/sourcemap_composition_v3.js

@@ -6,6 +6,14 @@ import { requireSourcemap } from "./require_sourcemap.js";
 
 const { SourceMapConsumer, SourceMapGenerator } = requireSourcemap();
 
+// "first" maps an intermediate content back to the true original source(s);
+// "second" maps the final content back to that same intermediate content
+// (its "original" positions live in the coordinate space "first" was
+// generated for). Composing them means chaining through "first" for every
+// mapping in "second" — not merging both mapping sets side by side: they
+// don't share a single coordinate space, so naively adding both to the same
+// generator produces mappings that silently collide/override each other
+// wherever "second" happens to cover a position "first" also maps.
 export const composeTwoSourcemaps = (firstSourcemap, secondSourcemap) => {
   if (!firstSourcemap && !secondSourcemap) {
     return null;
@@ -19,28 +27,42 @@ export const composeTwoSourcemaps = (firstSourcemap, secondSourcemap) => {
   const sourcemapGenerator = new SourceMapGenerator();
   const firstSourcemapConsumer = new SourceMapConsumer(firstSourcemap);
   const secondSourcemapConsumer = new SourceMapConsumer(secondSourcemap);
-  const firstMappings = readMappings(firstSourcemapConsumer);
-  firstMappings.forEach((mapping) => {
-    sourcemapGenerator.addMapping(mapping);
-  });
-  const secondMappings = readMappings(secondSourcemapConsumer);
-  secondMappings.forEach((mapping) => {
-    sourcemapGenerator.addMapping(mapping);
-  });
+  secondSourcemapConsumer.eachMapping(
+    ({
+      generatedLine,
+      generatedColumn,
+      originalLine,
+      originalColumn,
+      name,
+    }) => {
+      if (typeof originalColumn !== "number") {
+        // "second" has no original position here (e.g. injected/synthetic
+        // content) — nothing to chain through "first", leave unmapped.
+        return;
+      }
+      const original = firstSourcemapConsumer.originalPositionFor({
+        line: originalLine,
+        column: originalColumn,
+      });
+      if (original.source === null) {
+        // "first" has no mapping covering that intermediate position either
+        // — leave unmapped rather than guessing.
+        return;
+      }
+      sourcemapGenerator.addMapping({
+        generated: { line: generatedLine, column: generatedColumn },
+        original: { line: original.line, column: original.column },
+        source: original.source,
+        name: original.name || name || undefined,
+      });
+    },
+  );
   const sourcemap = sourcemapGenerator.toJSON();
   const sources = [];
   const sourcesContent = [];
   const firstSourcesContent = firstSourcemap.sourcesContent;
-  const secondSourcesContent = secondSourcemap.sourcesContent;
   sourcemap.sources.forEach((source) => {
     sources.push(source);
-    if (secondSourcesContent) {
-      const secondSourceIndex = secondSourcemap.sources.indexOf(source);
-      if (secondSourceIndex > -1) {
-        sourcesContent.push(secondSourcesContent[secondSourceIndex]);
-        return;
-      }
-    }
     if (firstSourcesContent) {
       const firstSourceIndex = firstSourcemap.sources.indexOf(source);
       if (firstSourceIndex > -1) {
@@ -54,34 +76,3 @@ export const composeTwoSourcemaps = (firstSourcemap, secondSourcemap) => {
   sourcemap.sourcesContent = sourcesContent;
   return sourcemap;
 };
-
-const readMappings = (consumer) => {
-  const mappings = [];
-  consumer.eachMapping(
-    ({
-      originalColumn,
-      originalLine,
-      generatedColumn,
-      generatedLine,
-      source,
-      name,
-    }) => {
-      mappings.push({
-        original:
-          typeof originalColumn === "number"
-            ? {
-                column: originalColumn,
-                line: originalLine,
-              }
-            : undefined,
-        generated: {
-          column: generatedColumn,
-          line: generatedLine,
-        },
-        source: typeof originalColumn === "number" ? source : undefined,
-        name,
-      });
-    },
-  );
-  return mappings;
-};