@jsenv/sourcemap 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/sourcemap",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "type": "module",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
     "@jridgewell/gen-mapping": "0.3.13",
     "@jridgewell/sourcemap-codec": "1.6.0",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@jsenv/urls": "2.9.10",
+    "@jsenv/urls": "2.9.11",
     "magic-string": "1.2.3",
     "source-map-js": "1.2.1"
   },

package/src/magic_source.js

@@ -28,6 +28,11 @@ export const createMagicSource = (content) => {
       edits.push({ type: "replace", start, end, replacement });
       magicString.overwrite(start, end, replacement);
     },
+    insert: ({ position, text }) => {
+      touched = true;
+      edits.push({ type: "insert", position, text });
+      magicString.appendLeft(position, text);
+    },
     remove: ({ start, end }) => {
       touched = true;
       edits.push({ type: "remove", start, end });

package/src/sourcemap_edits.js

@@ -37,6 +37,14 @@ export const applyContentEditsOnSourcemap = (sourcemap, { content, edits }) => {
       prependText = edit.text + prependText;
       continue;
     }
+    if (edit.type === "insert") {
+      spans.push({
+        start: edit.position,
+        end: edit.position,
+        replacement: edit.text,
+      });
+      continue;
+    }
     spans.push({
       start: edit.start,
       end: edit.end,
@@ -175,6 +183,8 @@ export const applyContentEditsOnSourcemap = (sourcemap, { content, edits }) => {
     );
   };
 
+  // decode() output is owned here: segments are moved (and their column
+  // mutated) into the shifted structure without copies
   const decoded = decode(sourcemap.mappings);
   const decodedShifted = [];
   const pushSegment = (newLine, segment) => {
@@ -184,7 +194,30 @@ export const applyContentEditsOnSourcemap = (sourcemap, { content, edits }) => {
     decodedShifted[newLine].push(segment);
   };
   for (let lineIndex = 0; lineIndex < decoded.length; lineIndex++) {
-    for (const segment of decoded[lineIndex]) {
+    const segments = decoded[lineIndex];
+    // whole-line fast path: no edit starts at or before this line anymore,
+    // and the tail rebase does not apply to it — the line moves as one block
+    if (
+      lineIndex !== tailOldLine &&
+      (recordIndex === records.length ||
+        records[recordIndex].startLine > lineIndex)
+    ) {
+      if (segments.length > 0) {
+        const newLine = lineIndex + lineDelta;
+        while (decodedShifted.length <= newLine) {
+          decodedShifted.push([]);
+        }
+        if (decodedShifted[newLine].length === 0) {
+          decodedShifted[newLine] = segments;
+        } else {
+          for (const segment of segments) {
+            decodedShifted[newLine].push(segment);
+          }
+        }
+      }
+      continue;
+    }
+    for (const segment of segments) {
       const column = segment[0];
       while (
         recordIndex < records.length &&
@@ -199,14 +232,19 @@ export const applyContentEditsOnSourcemap = (sourcemap, { content, edits }) => {
       ) {
         continue;
       }
-      const [newLine, newColumn] = transformPosition(lineIndex, column);
-      if (newColumn === column && newLine === lineIndex) {
-        pushSegment(newLine, segment);
-        continue;
+      let newLine;
+      let newColumn;
+      if (lineIndex === tailOldLine && column >= tailOldColumn) {
+        newLine = tailNewLine;
+        newColumn = tailNewColumn + (column - tailOldColumn);
+      } else {
+        newLine = lineIndex + lineDelta;
+        newColumn = column;
+      }
+      if (newColumn !== column) {
+        segment[0] = newColumn;
       }
-      const segmentShifted = segment.slice();
-      segmentShifted[0] = newColumn;
-      pushSegment(newLine, segmentShifted);
+      pushSegment(newLine, segment);
     }
   }