@volar/source-map 2.2.4 → 2.3.0-alpha.0

package/lib/sourceMap.d.ts

@@ -4,6 +4,7 @@ export interface Mapping<T = any> {
     sourceOffsets: number[];
     generatedOffsets: number[];
     lengths: number[];
+    generatedLengths?: number[];
     data: T;
 }
 export declare class SourceMap<Data = any> {

package/lib/sourceMap.js

@@ -36,7 +36,7 @@ class SourceMap {
                     continue;
                 }
                 skip.add(mapping);
-                const mapped = (0, translateOffset_1.translateOffset)(offset, mapping[fromRange], mapping[toRange], mapping.lengths);
+                const mapped = (0, translateOffset_1.translateOffset)(offset, mapping[fromRange], mapping[toRange], getLengths(mapping, fromRange), getLengths(mapping, toRange));
                 if (mapped !== undefined) {
                     yield [mapped, mapping];
                 }
@@ -53,7 +53,7 @@ class SourceMap {
         for (const mapping of this.mappings) {
             for (let i = 0; i < mapping[key].length; i++) {
                 offsetsSet.add(mapping[key][i]);
-                offsetsSet.add(mapping[key][i] + mapping.lengths[i]);
+                offsetsSet.add(mapping[key][i] + getLengths(mapping, key)[i]);
             }
         }
         const offsets = [...offsetsSet].sort((a, b) => a - b);
@@ -61,7 +61,7 @@ class SourceMap {
         for (const mapping of this.mappings) {
             for (let i = 0; i < mapping[key].length; i++) {
                 const startIndex = (0, binarySearch_1.binarySearch)(offsets, mapping[key][i]).match;
-                const endIndex = (0, binarySearch_1.binarySearch)(offsets, mapping[key][i] + mapping.lengths[i]).match;
+                const endIndex = (0, binarySearch_1.binarySearch)(offsets, mapping[key][i] + getLengths(mapping, key)[i]).match;
                 for (let i = startIndex; i <= endIndex; i++) {
                     mappings[i].add(mapping);
                 }
@@ -71,4 +71,7 @@ class SourceMap {
     }
 }
 exports.SourceMap = SourceMap;
+function getLengths(mapping, key) {
+    return key == "sourceOffsets" ? mapping.lengths : mapping.generatedLengths ?? mapping.lengths;
+}
 //# sourceMappingURL=sourceMap.js.map

package/lib/translateOffset.d.ts

@@ -1 +1 @@
-export declare function translateOffset(start: number, fromOffsets: number[], toOffsets: number[], lengths: number[]): number | undefined;
+export declare function translateOffset(start: number, fromOffsets: number[], toOffsets: number[], fromLengths: number[], toLengths?: number[]): number | undefined;

package/lib/translateOffset.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translateOffset = void 0;
-function translateOffset(start, fromOffsets, toOffsets, lengths) {
+function translateOffset(start, fromOffsets, toOffsets, fromLengths, toLengths = fromLengths) {
     for (let i = 0; i < fromOffsets.length; i++) {
         const fromOffset = fromOffsets[i];
-        const toOffset = toOffsets[i];
-        const length = lengths[i];
-        if (start >= fromOffset && start <= fromOffset + length) {
-            return toOffset + start - fromOffset;
+        const fromLength = fromLengths[i];
+        if (start >= fromOffset && start <= fromOffset + fromLength) {
+            const toLength = toLengths[i];
+            const toOffset = toOffsets[i];
+            let rangeOffset = Math.min(start - fromOffset, toLength);
+            return toOffset + rangeOffset;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/source-map",
-	"version": "2.2.4",
+	"version": "2.3.0-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,5 +14,5 @@
 	"dependencies": {
 		"muggle-string": "^0.4.0"
 	},
-	"gitHead": "71a58c8b9c3a3e420b95df9ffb4a50be37cb31bc"
+	"gitHead": "f17c19f712651acde33cc2171a112e64db0b460e"
 }