topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

fix: simplify source map API

Browse Source
This commit is contained in:
TopchetoEU 2023-11-28 21:39:25 +02:00
parent 8defd93855
commit 124341969c
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
2 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/me/topchetoeu/jscript/mapping/LocationMap.java
View File

@ -1,16 +0,0 @@
package me.topchetoeu.jscript.mapping;
import me.topchetoeu.jscript.Location;
public interface LocationMap {
Location srcToDst(Location loc);
Location dstToSrc(Location loc);
default LocationMap chain(LocationMap next) {
var self = this;
return new LocationMap() {
public Location dstToSrc(Location loc) { return self.dstToSrc(next.dstToSrc(loc)); }
public Location srcToDst(Location loc) { return next.srcToDst(self.srcToDst(loc)); }
};
}
}

76
src/me/topchetoeu/jscript/mapping/SourceMap.java
View File

@ -1,5 +1,7 @@
package me.topchetoeu.jscript.mapping; package me.topchetoeu.jscript.mapping;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import me.topchetoeu.jscript.Filename; import me.topchetoeu.jscript.Filename;
@ -7,34 +9,55 @@ import me.topchetoeu.jscript.Location;
import me.topchetoeu.jscript.json.JSON; import me.topchetoeu.jscript.json.JSON;
public class SourceMap implements LocationMap { public class SourceMap implements LocationMap {
private TreeMap<Location, Location> srcToDst = new TreeMap<>(); private final TreeMap<Location, Location> orgToSrc = new TreeMap<>();
private TreeMap<Location, Location> dstToSrc = new TreeMap<>(); private final TreeMap<Location, Location> srcToOrg = new TreeMap<>();
public Location srcToDst(Location loc) { public Location toSource(Location loc) {
if (srcToDst.containsKey(loc)) return loc; return convert(loc, orgToSrc);
var tail = srcToDst.tailMap(loc);
if (tail.isEmpty()) return null;
var key = tail.firstKey();
if (key != null) return srcToDst.get(key);
else return null;
} }
public Location dstToSrc(Location loc) {
if (dstToSrc.containsKey(loc)) return loc;
var tail = dstToSrc.tailMap(loc); public Location toOriginal(Location loc) {
if (tail.isEmpty()) return null; return convert(loc, srcToOrg);
}
var key = tail.firstKey(); public static Location convert(Location loc, TreeMap<Location, Location> map) {
if (key != null) return dstToSrc.get(key); if (map.containsKey(loc)) return loc;
else return null;
var srcA = map.floorKey(loc);
return srcA == null ? loc : srcA;
}
public void chain(LocationMap map) {
for (var key : orgToSrc.keySet()) {
orgToSrc.put(key, map.toSource(key));
}
for (var key : srcToOrg.keySet()) {
srcToOrg.put(map.toOriginal(key), key);
}
}
public SourceMap clone() {
var res = new SourceMap();
res.orgToSrc.putAll(this.orgToSrc);
res.srcToOrg.putAll(this.srcToOrg);
return res;
}
public void split(Map<Filename, TreeMap<Location, Location>> maps) {
for (var el : orgToSrc.entrySet()) {
var map = maps.get(el.getKey().filename());
if (map == null) maps.put(el.getKey().filename(), map = new TreeMap<>());
map.put(el.getKey(), el.getValue());
map = maps.get(el.getValue().filename());
if (map == null) maps.put(el.getValue().filename(), map = new TreeMap<>());
map.put(el.getValue(), el.getKey());
}
} }
public static SourceMap parse(String raw) { public static SourceMap parse(String raw) {
var res = new SourceMap(); var res = new SourceMap();
var json = JSON.parse(null, raw).map(); var json = JSON.parse(null, raw).map();
if (json.number("version") != 3) throw new IllegalArgumentException("Source map version must be 3.");
var sources = json.list("sources").stream().map(v -> v.string()).toArray(String[]::new); var sources = json.list("sources").stream().map(v -> v.string()).toArray(String[]::new);
var dstFilename = Filename.parse(json.string("file")); var dstFilename = Filename.parse(json.string("file"));
var mapping = VLQ.decodeMapping(json.string("mappings")); var mapping = VLQ.decodeMapping(json.string("mappings"));
@ -55,13 +78,20 @@ public class SourceMap implements LocationMap {
var src = new Location(srcRow + 1, srcCol + 1, Filename.parse(sources[srcI])); var src = new Location(srcRow + 1, srcCol + 1, Filename.parse(sources[srcI]));
var dst = new Location(dstRow + 1, dstCol + 1, dstFilename); var dst = new Location(dstRow + 1, dstCol + 1, dstFilename);
System.out.printf("%s -> %s\n", src, dst); res.orgToSrc.put(src, dst);
res.srcToOrg.put(dst, src);
res.srcToDst.put(src, dst);
res.dstToSrc.put(dst, src);
} }
} }
return res; return res;
} }
public static SourceMap chain(SourceMap ...maps) {
if (maps.length == 0) return null;
var res = maps[0];
for (var i = 1; i < maps.length; i++) res.chain(maps[i]);
return res;
}
} }