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

Add support for source mappings #10

Merged
TopchetoEU merged 22 commits from TopchetoEU/mapping into master 2023-12-18 20:42:38 +00:00
Conversation 0 Commits 22 Files Changed 81 +44 -40
3 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 73345062ca - Show all commits

37
src/assets/js/bootstrap.js vendored
View File

@ -1,7 +1,6 @@
(function (_arguments) {
var ts = _arguments[0];
(function (ts, env, libs) {
var src = '', version = 0;
var lib = _arguments[2].concat([
var lib = libs.concat([
'declare const exit: never;',
'declare const go: any;',
'declare function getTsDeclarations(): string[];'
@ -57,6 +56,8 @@
service.getEmitOutput("/lib.d.ts");
log("Loaded libraries!");
var oldCompile = env.compile;
function compile(code, filename, env) {
src = code;
version++;
@ -88,23 +89,19 @@
var result = emit.outputFiles[1].text;
var declaration = emit.outputFiles[2].text;
var compiled = oldCompile(result, filename, env);
return {
source: result,
map: log(JSON.stringify({
version: 3,
sources: [ filename ],
function: function () {
var val = compiled.function.apply(this, arguments);
if (declaration !== '') declSnapshots.push(ts.ScriptSnapshot.fromString(declaration));
return val;
},
mapChain: compiled.mapChain.concat(JSON.stringify({
file: filename,
mappings: map.mappings
})),
runner: function(func) {
return function() {
var val = func.apply(this, arguments);
if (declaration !== '') {
declSnapshots.push(ts.ScriptSnapshot.fromString(declaration));
}
return val;
}
}
sources: [filename],
mappings: map.mappings,
}))
};
}
@ -115,5 +112,5 @@
}
}
apply(_arguments[1]);
})(arguments);
apply(env);
})(arguments[0], arguments[1], arguments[2]);

27
src/me/topchetoeu/jscript/engine/Context.java
View File

@ -9,11 +9,11 @@ import java.util.TreeSet;
import me.topchetoeu.jscript.Filename;
import me.topchetoeu.jscript.Location;
import me.topchetoeu.jscript.engine.frame.CodeFrame;
import me.topchetoeu.jscript.engine.values.ArrayValue;
import me.topchetoeu.jscript.engine.values.FunctionValue;
import me.topchetoeu.jscript.engine.values.ObjectValue;
import me.topchetoeu.jscript.engine.values.Values;
import me.topchetoeu.jscript.exceptions.EngineException;
import me.topchetoeu.jscript.parsing.Parsing;
import me.topchetoeu.jscript.mapping.SourceMap;
public class Context {
private final Stack<Environment> env = new Stack<>();
@ -34,24 +34,17 @@ public class Context {
public FunctionValue compile(Filename filename, String raw) {
var env = environment();
var transpiled = env.compile.call(this, null, raw, filename.toString(), env);
String source = null;
FunctionValue runner = null;
var result = env.compile.call(this, null, raw, filename.toString(), env);
if (transpiled instanceof ObjectValue) {
source = Values.toString(this, Values.getMember(this, transpiled, "source"));
var _runner = Values.getMember(this, transpiled, "runner");
if (_runner instanceof FunctionValue) runner = (FunctionValue)_runner;
}
else source = Values.toString(this, transpiled);
var function = (FunctionValue)Values.getMember(this, result, "function");
var rawMapChain = ((ArrayValue)Values.getMember(this, result, "mapChain")).toArray();
var maps = new SourceMap[rawMapChain.length];
for (var i = 0; i < maps.length; i++) maps[i] = SourceMap.parse((String)rawMapChain[i]);
var map = SourceMap.chain(maps);
var breakpoints = new TreeSet<Location>();
FunctionValue res = Parsing.compile(Engine.functions, breakpoints, env, filename, source);
engine.onSource(filename, source, breakpoints);
engine.onSource(filename, raw, new TreeSet<>(), map);
if (runner != null) res = (FunctionValue)runner.call(this, null, res);
return res;
return function;
}

20
src/me/topchetoeu/jscript/engine/Environment.java
View File

@ -1,18 +1,23 @@
package me.topchetoeu.jscript.engine;
import java.util.HashMap;
import java.util.TreeSet;
import me.topchetoeu.jscript.Filename;
import me.topchetoeu.jscript.engine.scope.GlobalScope;
import me.topchetoeu.jscript.engine.values.ArrayValue;
import me.topchetoeu.jscript.engine.values.FunctionValue;
import me.topchetoeu.jscript.engine.values.NativeFunction;
import me.topchetoeu.jscript.engine.values.ObjectValue;
import me.topchetoeu.jscript.engine.values.Symbol;
import me.topchetoeu.jscript.engine.values.Values;
import me.topchetoeu.jscript.exceptions.EngineException;
import me.topchetoeu.jscript.filesystem.RootFilesystem;
import me.topchetoeu.jscript.interop.Native;
import me.topchetoeu.jscript.interop.NativeGetter;
import me.topchetoeu.jscript.interop.NativeSetter;
import me.topchetoeu.jscript.interop.NativeWrapperProvider;
import me.topchetoeu.jscript.parsing.Parsing;
import me.topchetoeu.jscript.permissions.Permission;
import me.topchetoeu.jscript.permissions.PermissionsProvider;
@ -31,7 +36,17 @@ public class Environment implements PermissionsProvider {
@Native public int id = ++nextId;
@Native public FunctionValue compile;
@Native public FunctionValue compile = new NativeFunction("compile", (ctx, thisArg, args) -> {
var source = Values.toString(ctx, args[0]);
var filename = Values.toString(ctx, args[1]);
var env = Values.wrapper(args[2], Environment.class);
var res = new ObjectValue();
res.defineProperty(ctx, "function", Parsing.compile(Engine.functions, new TreeSet<>(), env, Filename.parse(filename), source));
res.defineProperty(ctx, "mapChain", new ArrayValue());
return res;
});
@Native public FunctionValue regexConstructor = new NativeFunction("RegExp", (ctx, thisArg, args) -> {
throw EngineException.ofError("Regular expressions not supported.").setCtx(ctx.environment(), ctx.engine);
});
@ -89,12 +104,11 @@ public class Environment implements PermissionsProvider {
}
public Environment(FunctionValue compile, WrappersProvider nativeConverter, GlobalScope global) {
if (compile == null) compile = new NativeFunction("compile", (ctx, thisArg, args) -> args.length == 0 ? "" : args[0]);
if (compile != null) this.compile = compile;
if (nativeConverter == null) nativeConverter = new NativeWrapperProvider(this);
if (global == null) global = new GlobalScope();
this.wrappers = nativeConverter;
this.compile = compile;
this.global = global;
}
}