fix: load maps when attaching debugger

feat: allow adding custom wrappers

.github/workflows/tagged-release.yml

@@ -3,7 +3,7 @@ name: "tagged-release"
 on:
   push:
     tags:
-      - "v*"
+      - "*"
 
 jobs:
   tagged-release:

README.md

@@ -23,7 +23,3 @@ engine.run(true);
 // Get our result
 System.out.println(awaitable.await());
 ```
-
-## NOTE:
-
-To setup the typescript bundle in your sources, run `node build.js init-ts`. This will download the latest version of typescript, minify it, and add it to your src folder. If you are going to work with the `node build.js debug|release` command, this is not a necessary step.

gradle.properties

@@ -1,4 +1,4 @@
 project_group = me.topchetoeu
 project_name = jscript
-project_version = 0.9.7-beta
+project_version = 0.9.25-beta
 main_class = me.topchetoeu.jscript.utils.JScriptRepl

src/java/me/topchetoeu/jscript/compilation/control/ForOfStatement.java

@@ -0,0 +1,73 @@
+package me.topchetoeu.jscript.compilation.control;
+
+import me.topchetoeu.jscript.common.Instruction;
+import me.topchetoeu.jscript.common.Location;
+import me.topchetoeu.jscript.common.Instruction.BreakpointType;
+import me.topchetoeu.jscript.compilation.CompileResult;
+import me.topchetoeu.jscript.compilation.Statement;
+
+public class ForOfStatement extends Statement {
+    public final String varName;
+    public final boolean isDeclaration;
+    public final Statement iterable, body;
+    public final String label;
+    public final Location varLocation;
+
+    @Override
+    public void declare(CompileResult target) {
+        body.declare(target);
+        if (isDeclaration) target.scope.define(varName);
+    }
+
+    @Override
+    public void compile(CompileResult target, boolean pollute) {
+        var key = target.scope.getKey(varName);
+
+        if (key instanceof String) target.add(Instruction.makeVar((String)key));
+
+        iterable.compile(target, true, BreakpointType.STEP_OVER);
+        target.add(Instruction.dup());
+        target.add(Instruction.loadVar("Symbol"));
+        target.add(Instruction.pushValue("iterator"));
+        target.add(Instruction.loadMember()).setLocation(iterable.loc());
+        target.add(Instruction.loadMember()).setLocation(iterable.loc());
+        target.add(Instruction.call(0)).setLocation(iterable.loc());
+
+        int start = target.size();
+        target.add(Instruction.dup());
+        target.add(Instruction.dup());
+        target.add(Instruction.pushValue("next"));
+        target.add(Instruction.loadMember()).setLocation(iterable.loc());
+        target.add(Instruction.call(0)).setLocation(iterable.loc());
+        target.add(Instruction.dup());
+        target.add(Instruction.pushValue("done"));
+        target.add(Instruction.loadMember()).setLocation(iterable.loc());
+        int mid = target.temp();
+
+        target.add(Instruction.pushValue("value"));
+        target.add(Instruction.loadMember()).setLocation(varLocation);
+        target.add(Instruction.storeVar(key)).setLocationAndDebug(iterable.loc(), BreakpointType.STEP_OVER);
+
+        body.compile(target, false, BreakpointType.STEP_OVER);
+
+        int end = target.size();
+
+        WhileStatement.replaceBreaks(target, label, mid + 1, end, start, end + 1);
+
+        target.add(Instruction.jmp(start - end));
+        target.add(Instruction.discard());
+        target.add(Instruction.discard());
+        target.set(mid, Instruction.jmpIf(end - mid + 1));
+        if (pollute) target.add(Instruction.pushUndefined());
+    }
+
+    public ForOfStatement(Location loc, Location varLocation, String label, boolean isDecl, String varName, Statement object, Statement body) {
+        super(loc);
+        this.varLocation = varLocation;
+        this.label = label;
+        this.isDeclaration = isDecl;
+        this.varName = varName;
+        this.iterable = object;
+        this.body = body;
+    }
+}

src/java/me/topchetoeu/jscript/compilation/parsing/Parsing.java

@@ -1777,6 +1777,46 @@ public class Parsing {
 
         return ParseRes.res(new ForInStatement(loc, nameLoc, labelRes.result, isDecl, nameRes.result, varVal, objRes.result, bodyRes.result), n);
     }
+    public static ParseRes<ForOfStatement> parseForOf(Filename filename, List<Token> tokens, int i) {
+        var loc = getLoc(filename, tokens, i);
+        int n = 0;
+
+        var labelRes = parseLabel(tokens, i + n);
+        var isDecl = false;
+        n += labelRes.n;
+
+        if (!isIdentifier(tokens, i + n++, "for")) return ParseRes.failed();
+        if (!isOperator(tokens, i + n++, Operator.PAREN_OPEN)) return ParseRes.error(loc, "Expected a open paren after 'for'.");
+
+        if (isIdentifier(tokens, i + n, "var")) {
+            isDecl = true;
+            n++;
+        }
+
+        var nameRes = parseIdentifier(tokens, i + n);
+        if (!nameRes.isSuccess()) return ParseRes.error(loc, "Expected a variable name for 'for' loop.");
+        var nameLoc = getLoc(filename, tokens, i + n);
+        n += nameRes.n;
+
+        if (!isIdentifier(tokens, i + n++, "of")) {
+            if (nameRes.result.equals("const")) return ParseRes.error(loc, "'const' declarations are not supported.");
+            else if (nameRes.result.equals("let")) return ParseRes.error(loc, "'let' declarations are not supported.");
+            else return ParseRes.error(loc, "Expected 'of' keyword after variable declaration.");
+        }
+
+        var objRes = parseValue(filename, tokens, i + n, 0);
+        if (!objRes.isSuccess()) return ParseRes.error(loc, "Expected a value.", objRes);
+        n += objRes.n;
+
+        if (!isOperator(tokens, i + n++, Operator.PAREN_CLOSE)) return ParseRes.error(loc, "Expected a closing paren after for.");
+
+
+        var bodyRes = parseStatement(filename, tokens, i + n);
+        if (!bodyRes.isSuccess()) return ParseRes.error(loc, "Expected a for body.", bodyRes);
+        n += bodyRes.n;
+
+        return ParseRes.res(new ForOfStatement(loc, nameLoc, labelRes.result, isDecl, nameRes.result, objRes.result, bodyRes.result), n);
+    }
     public static ParseRes<TryStatement> parseCatch(Filename filename, List<Token> tokens, int i) {
         var loc = getLoc(filename, tokens, i);
         int n = 0;
@@ -1833,6 +1873,7 @@ public class Parsing {
             parseSwitch(filename, tokens, i),
             parseFor(filename, tokens, i),
             parseForIn(filename, tokens, i),
+            parseForOf(filename, tokens, i),
             parseDoWhile(filename, tokens, i),
             parseCatch(filename, tokens, i),
             parseCompound(filename, tokens, i),

src/java/me/topchetoeu/jscript/lib/AsyncFunctionLib.java

@@ -54,7 +54,7 @@ public class AsyncFunctionLib extends FunctionValue {
                     public void onReject(EngineException err) {
                         next(ctx, Values.NO_RETURN, err);
                     }
-                });
+                }.defer(ctx));
             }
         }
 

src/java/me/topchetoeu/jscript/lib/AsyncGeneratorLib.java

@@ -62,7 +62,7 @@ public class AsyncGeneratorLib {
                 @Override public void onReject(EngineException err) {
                     next(ctx, Values.NO_RETURN, Values.NO_RETURN, err);
                 }
-            });
+            }.defer(ctx));
         }
         else if (state == 2) {
             var obj = new ObjectValue();

src/java/me/topchetoeu/jscript/lib/PromiseLib.java

@@ -53,26 +53,29 @@ public class PromiseLib {
     private Object val;
 
     private void resolveSynchronized(Context ctx, Object val, int newState) {
-        if (!ctx.hasNotNull(EventLoop.KEY)) throw EngineException.ofError("No event loop");
-
-        ctx.get(EventLoop.KEY).pushMsg(() -> {
-            this.val = val;
-            this.state = newState;
-
-            for (var handle : handles) {
-                if (newState == STATE_FULFILLED) handle.onFulfil(val);
-                if (newState == STATE_REJECTED) {
-                    handle.onReject((EngineException)val);
-                    handled = true;
-                }
+        this.val = val;
+        this.state = newState;
+    
+        for (var handle : handles) {
+            if (newState == STATE_FULFILLED) handle.onFulfil(val);
+            if (newState == STATE_REJECTED) {
+                handle.onReject((EngineException)val);
+                handled = true;
             }
+        }
 
-            if (state == STATE_REJECTED && !handled) {
-                Values.printError(((EngineException)val).setCtx(ctx), "(in promise)");
-            }
+        if (state == STATE_REJECTED && !handled) {
+            Values.printError(((EngineException)val).setCtx(ctx), "(in promise)");
+        }
 
-            handles = null;
-        }, true);
+        handles = null;
+
+        // ctx.get(EventLoop.KEY).pushMsg(() -> {
+        //     if (!ctx.hasNotNull(EventLoop.KEY)) throw EngineException.ofError("No event loop");
+
+
+        //     handles = null;
+        // }, true);
         
     }
     private synchronized void resolve(Context ctx, Object val, int newState) {

src/java/me/topchetoeu/jscript/runtime/Engine.java

@@ -2,11 +2,9 @@ package me.topchetoeu.jscript.runtime;
 
 import java.util.concurrent.PriorityBlockingQueue;
 
-import me.topchetoeu.jscript.common.Filename;
 import me.topchetoeu.jscript.common.ResultRunnable;
 import me.topchetoeu.jscript.common.events.DataNotifier;
 import me.topchetoeu.jscript.runtime.exceptions.InterruptException;
-import me.topchetoeu.jscript.runtime.values.FunctionValue;
 
 public class Engine implements EventLoop {
     private static class Task<T> implements Comparable<Task<?>> {
@@ -78,18 +76,6 @@ public class Engine implements EventLoop {
         return this.thread != null;
     }
 
-    public DataNotifier<Object> pushMsg(boolean micro, Environment env, FunctionValue func, Object thisArg, Object ...args) {
-        return pushMsg(() -> {
-            return func.call(new Context(env), thisArg, args);
-        }, micro);
-    }
-    public DataNotifier<Object> pushMsg(boolean micro, Environment env, Filename filename, String raw, Object thisArg, Object ...args) {
-        return pushMsg(() -> {
-            var ctx = new Context(env);
-            return ctx.compile(filename, raw).call(new Context(env), thisArg, args);
-        }, micro);
-    }
-
     public Engine() {
     }
 }

src/java/me/topchetoeu/jscript/runtime/EventLoop.java

@@ -1,8 +1,10 @@
 package me.topchetoeu.jscript.runtime;
 
+import me.topchetoeu.jscript.common.Filename;
 import me.topchetoeu.jscript.common.ResultRunnable;
 import me.topchetoeu.jscript.common.events.DataNotifier;
 import me.topchetoeu.jscript.runtime.exceptions.EngineException;
+import me.topchetoeu.jscript.runtime.values.FunctionValue;
 
 public interface EventLoop {
     public static final Key<EventLoop> KEY = new Key<>();
@@ -20,4 +22,16 @@ public interface EventLoop {
     public default DataNotifier<Void> pushMsg(Runnable runnable, boolean micro) {
         return pushMsg(() -> { runnable.run(); return null; }, micro);
     }
+
+    public default DataNotifier<Object> pushMsg(boolean micro, Environment env, FunctionValue func, Object thisArg, Object ...args) {
+        return pushMsg(() -> {
+            return func.call(new Context(env), thisArg, args);
+        }, micro);
+    }
+    public default DataNotifier<Object> pushMsg(boolean micro, Environment env, Filename filename, String raw, Object thisArg, Object ...args) {
+        return pushMsg(() -> {
+            var ctx = new Context(env);
+            return ctx.compile(filename, raw).call(new Context(env), thisArg, args);
+        }, micro);
+    }
 }

src/java/me/topchetoeu/jscript/runtime/Extensions.java

@@ -1,6 +1,17 @@
 package me.topchetoeu.jscript.runtime;
 
+import java.util.List;
+
 public interface Extensions {
+    public static Extensions EMPTY = new Extensions() {
+        @Override public <T> void add(Key<T> key, T obj) { }
+        @Override public boolean remove(Key<?> key) { return false; }
+
+        @Override public <T> T get(Key<T> key) { return null; }
+        @Override public boolean has(Key<?> key) { return false; }
+        @Override public Iterable<Key<?>> keys() { return List.of(); }
+    };
+
     <T> T get(Key<T> key);
     <T> void add(Key<T> key, T obj);
     Iterable<Key<?>> keys();
@@ -35,4 +46,9 @@ public interface Extensions {
             add((Key<Object>)key, (Object)source.get(key));
         }
     }
+
+    public static Extensions wrap(Extensions ext) {
+        if (ext == null) return EMPTY;
+        else return ext;
+    }
 }

src/java/me/topchetoeu/jscript/runtime/debug/DebugContext.java

@@ -32,10 +32,17 @@ public class DebugContext {
         if (sources != null) {
             for (var source : sources.entrySet()) debugger.onSourceLoad(source.getKey(), source.getValue());
         }
+        if (maps != null) {
+            for (var map : maps.entrySet()) debugger.onFunctionLoad(map.getKey(), map.getValue());
+        }
 
         this.debugger = debugger;
         return true;
     }
+    public boolean detachDebugger(DebugHandler debugger) {
+        if (this.debugger != debugger) return false;
+        return detachDebugger();
+    }
     public boolean detachDebugger() {
         this.debugger = null;
         return true;

src/java/me/topchetoeu/jscript/runtime/values/NativeWrapper.java

@@ -1,15 +1,24 @@
 package me.topchetoeu.jscript.runtime.values;
 
+import java.util.WeakHashMap;
+
 import me.topchetoeu.jscript.runtime.Context;
+import me.topchetoeu.jscript.runtime.Extensions;
+import me.topchetoeu.jscript.runtime.Key;
 
 public class NativeWrapper extends ObjectValue {
+    private static final Key<WeakHashMap<Object, NativeWrapper>> WRAPPERS = new Key<>();
     private static final Object NATIVE_PROTO = new Object();
     public final Object wrapped;
 
     @Override
     public ObjectValue getPrototype(Context ctx) {
-        if (ctx.environment != null && prototype == NATIVE_PROTO) return ctx.environment.wrappers.getProto(wrapped.getClass());
-        else return super.getPrototype(ctx);
+        if (ctx.environment != null && prototype == NATIVE_PROTO) {
+            var clazz = wrapped.getClass();
+            var res = ctx.environment.wrappers.getProto(clazz);
+            if (res != null) return res;
+        }
+        return super.getPrototype(ctx);
     }
 
     @Override
@@ -25,8 +34,20 @@ public class NativeWrapper extends ObjectValue {
         return wrapped.hashCode();
     }
 
-    public NativeWrapper(Object wrapped) {
+    private NativeWrapper(Object wrapped) {
         this.wrapped = wrapped;
         prototype = NATIVE_PROTO;
     }
+
+    public static NativeWrapper of(Extensions exts, Object wrapped) {
+        var wrappers = exts == null ? null : exts.get(WRAPPERS);
+
+        if (wrappers == null) return new NativeWrapper(wrapped);
+        if (wrappers.containsKey(wrapped)) return wrappers.get(wrapped);
+
+        var res = new NativeWrapper(wrapped);
+        wrappers.put(wrapped, res);
+
+        return res;
+    }
 }

src/java/me/topchetoeu/jscript/runtime/values/ObjectValue.java

@@ -153,18 +153,18 @@ public class ObjectValue {
     }
 
     public ObjectValue getPrototype(Context ctx) {
+        if (prototype instanceof ObjectValue || prototype == null) return (ObjectValue)prototype;
+
         try {
-            if (prototype == OBJ_PROTO) return ctx.get(Environment.OBJECT_PROTO);
             if (prototype == ARR_PROTO) return ctx.get(Environment.ARRAY_PROTO);
             if (prototype == FUNC_PROTO) return ctx.get(Environment.FUNCTION_PROTO);
             if (prototype == ERR_PROTO) return ctx.get(Environment.ERROR_PROTO);
             if (prototype == RANGE_ERR_PROTO) return ctx.get(Environment.RANGE_ERR_PROTO);
             if (prototype == SYNTAX_ERR_PROTO) return ctx.get(Environment.SYNTAX_ERR_PROTO);
             if (prototype == TYPE_ERR_PROTO) return ctx.get(Environment.TYPE_ERR_PROTO);
+            return ctx.get(Environment.OBJECT_PROTO);
         }
         catch (NullPointerException e) { return null; }
-
-        return (ObjectValue)prototype;
     }
     public final boolean setPrototype(PlaceholderProto val) {
         if (!extensible()) return false;

src/java/me/topchetoeu/jscript/runtime/values/Values.java

@@ -58,9 +58,8 @@ public class Values {
 
     @SuppressWarnings("unchecked")
     public static <T> T wrapper(Object val, Class<T> clazz) { 
-        if (!isWrapper(val)) val = new NativeWrapper(val);
-        var res = (NativeWrapper)val;
-        if (res != null && clazz.isInstance(res.wrapped)) return (T)res.wrapped;
+        if (isWrapper(val)) val = ((NativeWrapper)val).wrapped;
+        if (val != null && clazz.isInstance(val)) return (T)val;
         else return null;
     }
 
@@ -471,7 +470,7 @@ public class Values {
             else return ctx.environment.wrappers.getConstr((Class<?>)val);
         }
 
-        return new NativeWrapper(val);
+        return NativeWrapper.of(ctx, val);
     }
 
     @SuppressWarnings("unchecked")
@@ -536,7 +535,7 @@ public class Values {
         if (obj == null) return null;
         if (clazz.isInstance(obj)) return (T)obj;
         if (clazz.isAssignableFrom(NativeWrapper.class)) {
-            return (T)new NativeWrapper(obj);
+            return (T)NativeWrapper.of(ctx, obj);
         }
 
         throw new ConvertException(type(obj), clazz.getSimpleName());

src/java/me/topchetoeu/jscript/utils/debug/SimpleDebugger.java

@@ -30,6 +30,7 @@ import me.topchetoeu.jscript.runtime.EventLoop;
 import me.topchetoeu.jscript.runtime.Frame;
 import me.topchetoeu.jscript.runtime.debug.DebugContext;
 import me.topchetoeu.jscript.runtime.exceptions.EngineException;
+import me.topchetoeu.jscript.runtime.exceptions.SyntaxException;
 import me.topchetoeu.jscript.runtime.scope.GlobalScope;
 import me.topchetoeu.jscript.runtime.values.ArrayValue;
 import me.topchetoeu.jscript.runtime.values.FunctionValue;
@@ -41,7 +42,9 @@ import me.topchetoeu.jscript.runtime.values.Values;
 public class SimpleDebugger implements Debugger {
     public static final Set<String> VSCODE_EMPTY = Set.of(
         "function(...runtimeArgs){\n    let t = 1024; let e = null;\n    if(e)try{let r=\"<<default preview>>\",i=e.call(this,r);if(i!==r)return String(i)}catch(r){return`<<indescribable>>${JSON.stringify([String(r),\"object\"])}`}if(typeof this==\"object\"&&this){let r;for(let i of[Symbol.for(\"debug.description\"),Symbol.for(\"nodejs.util.inspect.custom\")])try{r=this[i]();break}catch{}if(!r&&!String(this.toString).includes(\"[native code]\")&&(r=String(this)),r&&!r.startsWith(\"[object \"))return r.length>=t?r.slice(0,t)+\"\\u2026\":r}\n  ;\n\n}",
+        "function(...runtimeArgs){\n    let r = 1024; let e = null;\n    if(e)try{let t=\"<<default preview>>\",n=e.call(this,t);if(n!==t)return String(n)}catch(t){return`<<indescribable>>${JSON.stringify([String(t),\"object\"])}`}if(typeof this==\"object\"&&this){let t;for(let n of[Symbol.for(\"debug.description\"),Symbol.for(\"nodejs.util.inspect.custom\")])if(typeof this[n]==\"function\")try{t=this[n]();break}catch{}if(!t&&!String(this.toString).includes(\"[native code]\")&&(t=String(this)),t&&!t.startsWith(\"[object\"))return t.length>=r?t.slice(0,r)+\"\\u2026\":t};}",
         "function(...runtimeArgs){\n    let t = 1024; let e = null;\n    let r={},i=\"<<default preview>>\";if(typeof this!=\"object\"||!this)return r;for(let[n,s]of Object.entries(this)){if(e)try{let o=e.call(s,i);if(o!==i){r[n]=String(o);continue}}catch(o){r[n]=`<<indescribable>>${JSON.stringify([String(o),n])}`;continue}if(typeof s==\"object\"&&s){let o;for(let a of runtimeArgs[0])try{o=s[a]();break}catch{}!o&&!String(s.toString).includes(\"[native code]\")&&(o=String(s)),o&&!o.startsWith(\"[object \")&&(r[n]=o.length>=t?o.slice(0,t)+\"\\u2026\":o)}}return r\n  ;\n\n}",
+        "function(...runtimeArgs){\n    let r = 1024; let e = null;\n    let t={},n=\"<<default preview>>\";if(typeof this!=\"object\"||!this)return t;for(let[i,o]of Object.entries(this)){if(e)try{let s=e.call(o,n);if(s!==n){t[i]=String(s);continue}}catch(s){t[i]=`<<indescribable>>${JSON.stringify([String(s),i])}`;continue}if(typeof o==\"object\"&&o){let s;for(let a of runtimeArgs[0])if(typeof o[a]==\"function\")try{s=o[a]();break}catch{}!s&&!String(o.toString).includes(\"[native code]\")&&(s=String(o)),s&&!s.startsWith(\"[object \")&&(t[i]=s.length>=r?s.slice(0,r)+\"\\u2026\":s)}}return t\n  ;\n\n}",
         "function(){let t={__proto__:this.__proto__\n},e=Object.getOwnPropertyNames(this);for(let r=0;r<e.length;++r){let i=e[r],n=i>>>0;if(String(n>>>0)===i&&n>>>0!==4294967295)continue;let s=Object.getOwnPropertyDescriptor(this,i);s&&Object.defineProperty(t,i,s)}return t}",
         "function(){return[Symbol.for(\"debug.description\"),Symbol.for(\"nodejs.util.inspect.custom\")]\n}"
     );
@@ -202,6 +205,7 @@ public class SimpleDebugger implements Debugger {
 
     private ObjectValue emptyObject = new ObjectValue();
 
+    private WeakHashMap<DebugContext, DebugContext> contexts = new WeakHashMap<>();
     private WeakHashMap<FunctionBody, FunctionMap> mappings = new WeakHashMap<>();
     private WeakHashMap<FunctionBody, HashMap<Location, Breakpoint>> bpLocs = new WeakHashMap<>();
 
@@ -226,6 +230,8 @@ public class SimpleDebugger implements Debugger {
     private int stepOutPtr = 0;
 
     private boolean compare(String src, String target) {
+        src = src.replaceAll("\\s", "");
+        target = target.replaceAll("\\s", "");
         if (src.length() != target.length()) return false;
         var diff = 0;
         var all = 0;
@@ -333,10 +339,10 @@ public class SimpleDebugger implements Debugger {
     }
     private JSONMap serializeObj(Context ctx, Object val, boolean byValue) {
         val = Values.normalize(null, val);
-        var newCtx = new Context();
-        newCtx.addAll(ctx);
-        newCtx.add(DebugContext.IGNORE);
-        ctx = newCtx;
+        var newEnv = new Environment();
+        newEnv.addAll(ctx);
+        newEnv.add(DebugContext.IGNORE);
+        ctx = newEnv.context();
 
         if (val == Values.NULL) {
             return new JSONMap()
@@ -366,6 +372,7 @@ public class SimpleDebugger implements Debugger {
             if (subtype != null) res.set("subtype", subtype);
             if (className != null) {
                 res.set("className", className);
+                res.set("description", className);
             }
 
             if (obj instanceof ArrayValue) res.set("description", "Array(" + ((ArrayValue)obj).size() + ")");
@@ -381,7 +388,7 @@ public class SimpleDebugger implements Debugger {
                 catch (Exception e) { }
 
                 try { res.set("description", className + (defaultToString ? "" : " { " + Values.toString(ctx, obj) + " }")); }
-                catch (EngineException e) { res.set("description", className); }
+                catch (EngineException e) {  }
             }
 
 
@@ -537,10 +544,12 @@ public class SimpleDebugger implements Debugger {
         var ctx = new Context(env);
         var awaiter = engine.pushMsg(false, ctx.environment, new Filename("jscript", "eval"), code, codeFrame.frame.thisArg, codeFrame.frame.args);
 
-        engine.run(true);
-
-        try { return new RunResult(ctx, awaiter.await(), null); }
+        try {
+            engine.run(true);
+            return new RunResult(ctx, awaiter.await(), null);
+        }
         catch (EngineException e) { return new RunResult(ctx, null, e); }
+        catch (SyntaxException e) { return new RunResult(ctx, null, EngineException.ofSyntax(e.toString())); }
     }
 
     private ObjectValue vscodeAutoSuggest(Context ctx, Object target, String query, boolean variable) {
@@ -634,11 +643,10 @@ public class SimpleDebugger implements Debugger {
         execptionType = CatchType.NONE;
         state = State.RESUMED;
 
-        // idToBptCand.clear();
+        mappings.clear();
+        bpLocs.clear();
 
         idToBreakpoint.clear();
-        // locToBreakpoint.clear();
-        // tmpBreakpts.clear();
 
         filenameToId.clear();
         idToSource.clear();
@@ -656,6 +664,9 @@ public class SimpleDebugger implements Debugger {
         stepOutFrame = currFrame = null;
         stepOutPtr = 0;
 
+        for (var ctx : contexts.keySet()) ctx.detachDebugger(this);
+        contexts.clear();
+
         updateNotifier.next();
     }
 
@@ -1033,6 +1044,7 @@ public class SimpleDebugger implements Debugger {
 
     public SimpleDebugger attach(DebugContext ctx) {
         ctx.attachDebugger(this);
+        contexts.put(ctx, ctx);
         return this;
     }
 

src/java/me/topchetoeu/jscript/utils/interop/NativeWrapperProvider.java

@@ -25,6 +25,7 @@ public class NativeWrapperProvider implements WrapperProvider {
     private final HashMap<Class<?>, FunctionValue> constructors = new HashMap<>();
     private final HashMap<Class<?>, ObjectValue> prototypes = new HashMap<>();
     private final HashMap<Class<?>, ObjectValue> namespaces = new HashMap<>();
+    private final HashSet<Class<?>> ignore = new HashSet<>();
     private final Environment env;
 
     private static Object call(Context ctx, String name, Method method, Object thisArg, Object... args) {
@@ -106,11 +107,12 @@ public class NativeWrapperProvider implements WrapperProvider {
         else return name;
     }
 
-    private static void apply(ObjectValue obj, Environment env, ExposeTarget target, Class<?> clazz) {
+    private static boolean apply(ObjectValue obj, Environment env, ExposeTarget target, Class<?> clazz) {
         var getters = new HashMap<Object, FunctionValue>();
         var setters = new HashMap<Object, FunctionValue>();
         var props = new HashSet<Object>();
         var nonProps = new HashSet<Object>();
+        var any = false;
 
         for (var method : clazz.getDeclaredMethods()) {
             for (var annotation : method.getAnnotationsByType(Expose.class)) {
@@ -120,6 +122,7 @@ public class NativeWrapperProvider implements WrapperProvider {
                 var name = getName(method, annotation.value());
                 var key = getKey(name);
                 var repeat = false;
+                any = true;
 
                 switch (annotation.type()) {
                     case INIT:
@@ -168,6 +171,7 @@ public class NativeWrapperProvider implements WrapperProvider {
                 var name = getName(method, annotation.value());
                 var key = getKey(name);
                 var repeat = false;
+                any = true;
 
                 if (props.contains(key) || nonProps.contains(key)) repeat = true;
                 else {
@@ -191,11 +195,29 @@ public class NativeWrapperProvider implements WrapperProvider {
                 var name = getName(field, annotation.value());
                 var key = getKey(name);
                 var repeat = false;
+                any = true;
 
                 if (props.contains(key) || nonProps.contains(key)) repeat = true;
                 else {
                     try {
-                        obj.defineProperty(null, key, Values.normalize(new Context(env), field.get(null)), true, true, false);
+                        if (Modifier.isStatic(field.getModifiers())) {
+                            obj.defineProperty(null, key, Values.normalize(new Context(env), field.get(null)), true, true, false);
+                        }
+                        else {
+                            obj.defineProperty(
+                                null, key,
+                                new NativeFunction("get " + key, args -> {
+                                    try { return field.get(args.self(clazz)); }
+                                    catch (IllegalAccessException e) { e.printStackTrace(); return null; }
+                                }),
+                                Modifier.isFinal(field.getModifiers()) ? null : new NativeFunction("get " + key, args -> {
+                                    try { field.set(args.self(clazz), args.convert(0, field.getType())); }
+                                    catch (IllegalAccessException e) { e.printStackTrace(); }
+                                    return null;
+                                }),
+                                true, false
+                            );
+                        }
                         nonProps.add(key);
                     }
                     catch (IllegalArgumentException | IllegalAccessException e) { }
@@ -210,6 +232,8 @@ public class NativeWrapperProvider implements WrapperProvider {
         }
 
         for (var key : props) obj.defineProperty(null, key, getters.get(key), setters.get(key), true, false);
+
+        return any;
     }
 
     private static Method getConstructor(Environment env, Class<?> clazz) {
@@ -231,7 +255,7 @@ public class NativeWrapperProvider implements WrapperProvider {
     public static ObjectValue makeProto(Environment env, Class<?> clazz) {
         var res = new ObjectValue();
         res.defineProperty(null, Symbol.get("Symbol.typeName"), getName(clazz));
-        apply(res, env, ExposeTarget.PROTOTYPE, clazz);
+        if (!apply(res, env, ExposeTarget.PROTOTYPE, clazz)) return null;
         return res;
     }
     /**
@@ -260,12 +284,27 @@ public class NativeWrapperProvider implements WrapperProvider {
     public static ObjectValue makeNamespace(Environment ctx, Class<?> clazz) {
         var res = new ObjectValue();
         res.defineProperty(null, Symbol.get("Symbol.typeName"), getName(clazz));
-        apply(res, ctx, ExposeTarget.NAMESPACE, clazz);
+        if (!apply(res, ctx, ExposeTarget.NAMESPACE, clazz)) return null;
         return res;
     }
 
+    private void updateProtoChain(Class<?> clazz, ObjectValue proto, FunctionValue constr) {
+        var parent = clazz;
+
+        while (true) {
+            parent = parent.getSuperclass();
+            if (parent == null) return;
+
+            var parentProto = getProto(parent);
+            var parentConstr = getConstr(parent);
+
+            if (parentProto != null) Values.setPrototype(Context.NULL, proto, parentProto);
+            if (parentConstr != null) Values.setPrototype(Context.NULL, constr, parentConstr);
+        }
+    }
+
     private void initType(Class<?> clazz, FunctionValue constr, ObjectValue proto) {
-        if (constr != null && proto != null) return;
+        if (constr != null && proto != null || ignore.contains(clazz)) return;
         // i vomit
         if (
             clazz == Object.class ||
@@ -284,44 +323,72 @@ public class NativeWrapperProvider implements WrapperProvider {
         if (constr == null) constr = makeConstructor(env, clazz);
         if (proto == null) proto = makeProto(env, clazz);
 
+        if (constr == null || proto == null) return;
+
         proto.defineProperty(null, "constructor", constr, true, false, false);
         constr.defineProperty(null, "prototype", proto, true, false, false);
 
         prototypes.put(clazz, proto);
         constructors.put(clazz, constr);
 
-        var parent = clazz.getSuperclass();
-        if (parent == null) return;
-
-        var parentProto = getProto(parent);
-        var parentConstr = getConstr(parent);
-
-        if (parentProto != null) Values.setPrototype(Context.NULL, proto, parentProto);
-        if (parentConstr != null) Values.setPrototype(Context.NULL, constr, parentConstr);
+        updateProtoChain(clazz, proto, constr);
     }
 
     public ObjectValue getProto(Class<?> clazz) {
         initType(clazz, constructors.get(clazz), prototypes.get(clazz));
-        return prototypes.get(clazz);
+        while (clazz != null) {
+            var res = prototypes.get(clazz);
+            if (res != null) return res;
+            clazz = clazz.getSuperclass();
+        }
+        return null;
     }
     public ObjectValue getNamespace(Class<?> clazz) {
         if (!namespaces.containsKey(clazz)) namespaces.put(clazz, makeNamespace(env, clazz));
-        return namespaces.get(clazz);
+        while (clazz != null) {
+            var res = namespaces.get(clazz);
+            if (res != null) return res;
+            clazz = clazz.getSuperclass();
+        }
+        return null;
     }
     public FunctionValue getConstr(Class<?> clazz) {
         initType(clazz, constructors.get(clazz), prototypes.get(clazz));
-        return constructors.get(clazz);
+        while (clazz != null) {
+            var res = constructors.get(clazz);
+            if (res != null) return res;
+            clazz = clazz.getSuperclass();
+        }
+        return null;
     }
 
     @Override public WrapperProvider fork(Environment env) {
         return new NativeWrapperProvider(env);
     }
 
-    public void setProto(Class<?> clazz, ObjectValue value) {
-        prototypes.put(clazz, value);
+    public void set(Class<?> clazz, Class<?> wrapper) {
+        if (wrapper == null) set(clazz, null, null);
+        else set(clazz, makeProto(env, wrapper), makeConstructor(env, wrapper));
     }
-    public void setConstr(Class<?> clazz, FunctionValue value) {
-        constructors.put(clazz, value);
+    public void set(Class<?> clazz, ObjectValue proto, FunctionValue constructor) {
+        if (proto != null && constructor != null) {
+            prototypes.put(clazz, proto);
+            constructors.put(clazz, constructor);
+            ignore.remove(clazz);
+
+            for (var el : prototypes.keySet()) {
+                if (clazz.isAssignableFrom(el)) {
+                    updateProtoChain(el, getProto(el), getConstr(el));
+                }
+            }
+        }
+        else {
+            prototypes.remove(clazz);
+            constructors.remove(clazz);
+            ignore.remove(clazz);
+
+            initType(clazz, constructor, proto);
+        }
     }
 
     private void initError() {
@@ -337,8 +404,7 @@ public class NativeWrapperProvider implements WrapperProvider {
         proto.defineProperty(null, "constructor", constr, true, false, false);
         constr.defineProperty(null, "prototype", proto, true, false, false);
 
-        setProto(Throwable.class, proto);
-        setConstr(Throwable.class, constr);
+        set(Throwable.class, proto, constr);
     }
 
     public NativeWrapperProvider(Environment env) {