quickjs-emscripten-sync 1.7.0 → 1.8.1

package/dist/index.d.ts

@@ -169,9 +169,7 @@ export declare class Arena {
      * By default, exposed objects are not synchronized between the host and the VM.
      * If you want to sync an objects, first wrap the object with sync method, and then expose the wrapped object.
      */
-    expose(obj: {
-        [k: string]: any;
-    }): void;
+    expose(obj: Record<string, any>): void;
     /**
      * Enables sync for the object between the host and the VM and returns objects wrapped with proxies.
      *
@@ -203,7 +201,7 @@ export declare class Arena {
     _isMarshalable: (t: unknown) => boolean | "json";
     _marshalFind: (t: unknown) => QuickJSHandle | undefined;
     _marshalPre: (t: unknown, h: QuickJSHandle | QuickJSDeferredPromise, mode: true | "json" | undefined) => Wrapped<QuickJSHandle> | undefined;
-    _marshalPreApply: (target: Function, that: unknown, args: unknown[]) => void;
+    _marshalPreApply: (target: (...args: any[]) => any, that: unknown, args: unknown[]) => void;
     _marshal: (target: any) => [QuickJSHandle, boolean];
     _preUnmarshal: (t: any, h: QuickJSHandle) => Wrapped<any>;
     _unmarshalFind: (h: QuickJSHandle) => unknown;
@@ -231,15 +229,13 @@ export declare function consumeAll<T extends QuickJSHandle[], K>(handles: T, cb:
  */
 export declare const defaultRegisteredObjects: [any, string][];
 
-export declare function eq(ctx: QuickJSContext, a: QuickJSHandle, b: QuickJSHandle): boolean;
-
 export { Intrinsics }
 
 export declare function isES2015Class(cls: any): cls is new (...args: any[]) => any;
 
 export declare function isHandleObject(ctx: QuickJSContext, h: QuickJSHandle): boolean;
 
-export declare function isObject(value: any): value is object | Function;
+export declare function isObject(value: any): value is object | ((...args: any[]) => any);
 
 export declare function json(ctx: QuickJSContext, target: any): QuickJSHandle;
 
@@ -273,7 +269,7 @@ declare type Options_2 = {
     isMarshalable?: (target: unknown) => boolean | "json";
     find: (target: unknown) => QuickJSHandle | undefined;
     pre: (target: unknown, handle: QuickJSHandle | QuickJSDeferredPromise, mode: true | "json" | undefined) => QuickJSHandle | undefined;
-    preApply?: (target: Function, thisArg: unknown, args: unknown[]) => any;
+    preApply?: (target: (...args: any[]) => any, thisArg: unknown, args: unknown[]) => any;
     custom?: Iterable<(obj: unknown, ctx: QuickJSContext) => QuickJSHandle | undefined>;
 };
 

package/dist/{quickjs-emscripten-sync.mjs → quickjs-emscripten-sync.js}

@@ -99,21 +99,18 @@ function y(n, e, t, ...r) {
   }
 }
 function G(n, e, t) {
-  return n.dump(y(n, "Object.is", void 0, e, t));
-}
-function J(n, e, t) {
   return n.dump(y(n, "(a, b) => a instanceof b", void 0, e, t));
 }
-function W(n, e) {
+function J(n, e) {
   return n.dump(
     y(n, 'a => typeof a === "object" && a !== null || typeof a === "function"', void 0, e)
   );
 }
-function z(n, e) {
+function W(n, e) {
   const t = JSON.stringify(e);
   return t ? y(n, "JSON.parse", void 0, n.newString(t)) : n.undefined;
 }
-function be(n, e) {
+function _e(n, e) {
   try {
     return e(n);
   } finally {
@@ -121,7 +118,7 @@ function be(n, e) {
       t.alive && t.dispose();
   }
 }
-function $([n, e], t) {
+function z([n, e], t) {
   try {
     return t(n);
   } finally {
@@ -136,20 +133,20 @@ function g(n, e) {
       r && t.dispose();
   }
 }
-function L(n) {
+function $(n) {
   return "handle" in n;
 }
-function q(n) {
-  return L(n) ? n.handle : n;
+function L(n) {
+  return $(n) ? n.handle : n;
 }
-function Q(n, e, t, r) {
+function V(n, e, t, r) {
   var o;
   let s;
   for (const i of r)
     if (s = i(e, n), s) break;
   return s ? (o = t(e, s)) != null ? o : s : void 0;
 }
-function V(n, e) {
+function Q(n, e) {
   return typeof n != "symbol" ? void 0 : y(
     e,
     "d => Symbol(d)",
@@ -157,11 +154,11 @@ function V(n, e) {
     n.description ? e.newString(n.description) : e.undefined
   );
 }
-function X(n, e) {
+function q(n, e) {
   return n instanceof Date ? y(e, "d => new Date(d)", void 0, e.newNumber(n.getTime())) : void 0;
 }
-const Y = [V, X];
-function Z(n) {
+const X = [Q, q];
+function Y(n) {
   return typeof n == "function" && /^class\s/.test(Function.prototype.toString.call(n));
 }
 function v(n) {
@@ -185,10 +182,10 @@ function E(n, e) {
   };
   return r(n), t;
 }
-function ve(n, e) {
+function be(n, e) {
   return E(n, e ? (t, r) => r.size < e : void 0).size;
 }
-function K() {
+function Z() {
   let n = () => {
   }, e = () => {
   };
@@ -212,12 +209,12 @@ function M(n, e, t, r) {
   }, i = Object.getOwnPropertyDescriptors(e);
   Object.entries(i).forEach(([a, u]) => o(a, u)), Object.getOwnPropertySymbols(i).forEach((a) => o(a, i[a])), y(n, "Object.defineProperties", void 0, t, s).dispose(), s.dispose();
 }
-function x(n, e, t, r, s, o) {
+function K(n, e, t, r, s, o) {
   var u;
   if (typeof e != "function") return;
   const i = n.newFunction(e.name, function(...p) {
     const l = r(this), f = p.map((d) => r(d));
-    if (Z(e) && v(l)) {
+    if (Y(e) && v(l)) {
       const d = new e(...f);
       return Object.entries(d).forEach(([m, h]) => {
         n.setProp(this, m, t(h));
@@ -242,18 +239,18 @@ function x(n, e, t, r, s, o) {
   ), a = (u = s(e, i)) != null ? u : i;
   return M(n, e, i, t), a;
 }
-function ee(n, e, t) {
+function x(n, e, t) {
   var o;
-  const r = z(n, e);
+  const r = W(n, e);
   return (o = t(e, r)) != null ? o : r;
 }
-function te(n, e, t, r) {
+function ee(n, e, t, r) {
   var u;
   if (typeof e != "object" || e === null) return;
   const s = Array.isArray(e) ? n.newArray() : n.newObject(), o = (u = r(e, s)) != null ? u : s, i = Object.getPrototypeOf(e), a = i && i !== Object.prototype && i !== Array.prototype ? t(i) : void 0;
   return a && y(n, "Object.setPrototypeOf", void 0, o, a).dispose(), M(n, e, s, t), o;
 }
-function ne(n, e) {
+function te(n, e) {
   switch (typeof e) {
     case "undefined":
       return n.undefined;
@@ -267,7 +264,7 @@ function ne(n, e) {
       return e === null ? n.null : void 0;
   }
 }
-function re(n, e, t, r) {
+function ne(n, e, t, r) {
   var o;
   if (!(e instanceof Promise)) return;
   const s = n.newPromise();
@@ -280,7 +277,7 @@ function R(n, e) {
   var l, f, d, m, h;
   const { ctx: t, unmarshal: r, isMarshalable: s, find: o, pre: i } = e;
   {
-    const _ = ne(t, n);
+    const _ = te(t, n);
     if (_)
       return _;
   }
@@ -293,28 +290,28 @@ function R(n, e) {
     return t.undefined;
   const u = (_, b) => i(_, b, a);
   if (a === "json")
-    return ee(t, n, u);
+    return x(t, n, u);
   const p = (_) => R(_, e);
-  return (h = (m = (d = (f = Q(t, n, u, [...Y, ...(l = e.custom) != null ? l : []])) != null ? f : re(t, n, p, u)) != null ? d : x(t, n, p, r, u, e.preApply)) != null ? m : te(t, n, p, u)) != null ? h : t.undefined;
+  return (h = (m = (d = (f = V(t, n, u, [...X, ...(l = e.custom) != null ? l : []])) != null ? f : ne(t, n, p, u)) != null ? d : K(t, n, p, r, u, e.preApply)) != null ? m : ee(t, n, p, u)) != null ? h : t.undefined;
 }
-function se(n, e, t, r) {
+function re(n, e, t, r) {
   var o;
   let s;
   for (const i of r)
     if (s = i(e, n), s) break;
   return s ? (o = t(s, e)) != null ? o : s : void 0;
 }
-function oe(n, e) {
+function se(n, e) {
   if (e.typeof(n) !== "symbol") return;
   const t = e.getString(e.getProp(n, "description"));
   return Symbol(t);
 }
-function ie(n, e) {
+function oe(n, e) {
   if (!e.dump(y(e, "a => a instanceof Date", void 0, n))) return;
   const t = e.getNumber(y(e, "a => a.getTime()", void 0, n));
   return new Date(t);
 }
-const ue = [oe, ie];
+const ie = [se, oe];
 function k(n, e, t, r) {
   n.newFunction("", (s, o) => {
     const [i] = r(s);
@@ -350,7 +347,7 @@ function k(n, e, t, r) {
     ).dispose();
   });
 }
-function ae(n, e, t, r, s) {
+function ue(n, e, t, r, s) {
   var a;
   if (n.typeof(e) !== "function") return;
   const o = function(...u) {
@@ -370,7 +367,7 @@ function ae(n, e, t, r, s) {
   }, i = (a = s(o, e)) != null ? a : o;
   return k(n, e, o, r), i;
 }
-function pe(n, e, t, r) {
+function ae(n, e, t, r) {
   var a;
   if (n.typeof(e) !== "object" || // null check
   n.unwrapResult(n.evalCode("o => o === null")).consume((u) => n.dump(n.unwrapResult(n.callFunction(u, n.undefined, e)))))
@@ -390,20 +387,20 @@ function pe(n, e, t, r) {
   });
   return typeof i == "object" && Object.setPrototypeOf(o, i), k(n, e, s, t), o;
 }
-function fe(n, e) {
+function pe(n, e) {
   const t = n.typeof(e);
   return t === "undefined" || t === "number" || t === "string" || t === "boolean" ? [n.dump(e), !0] : t === "object" && n.unwrapResult(n.evalCode("a => a === null")).consume((s) => n.dump(n.unwrapResult(n.callFunction(s, n.undefined, e)))) ? [null, !0] : [void 0, !1];
 }
-function ce(n, e, t, r) {
+function fe(n, e, t, r) {
   var p;
-  if (!le(n, e)) return;
-  const s = K(), [o, i] = t(s.resolve), [a, u] = t(s.reject);
+  if (!ce(n, e)) return;
+  const s = Z(), [o, i] = t(s.resolve), [a, u] = t(s.reject);
   return y(n, "(p, res, rej) => { p.then(res, rej); }", void 0, e, o, a), i && o.dispose(), u && a.dispose(), (p = r(s.promise, e)) != null ? p : s.promise;
 }
-function le(n, e) {
-  return e.owner ? n.unwrapResult(n.evalCode("Promise")).consume((t) => e.owner ? J(n, e, t) : !1) : !1;
+function ce(n, e) {
+  return e.owner ? n.unwrapResult(n.evalCode("Promise")).consume((t) => e.owner ? G(n, e, t) : !1) : !1;
 }
-function de(n, e) {
+function le(n, e) {
   const [t] = C(n, e);
   return t;
 }
@@ -411,7 +408,7 @@ function C(n, e) {
   var u, p, l, f;
   const { ctx: t, marshal: r, find: s, pre: o } = e;
   {
-    const [d, m] = fe(t, n);
+    const [d, m] = pe(t, n);
     if (m) return [d, !1];
   }
   {
@@ -420,7 +417,7 @@ function C(n, e) {
       return [d, !0];
   }
   const i = (d) => C(d, e);
-  return [(f = (l = (p = se(t, n, o, [...ue, ...(u = e.custom) != null ? u : []])) != null ? p : ce(t, n, r, o)) != null ? l : ae(t, n, r, i, o)) != null ? f : pe(t, n, i, o), !1];
+  return [(f = (l = (p = re(t, n, o, [...ie, ...(u = e.custom) != null ? u : []])) != null ? p : fe(t, n, r, o)) != null ? l : ue(t, n, r, i, o)) != null ? f : ae(t, n, i, o), !1];
 }
 class O {
   constructor(e) {
@@ -582,10 +579,10 @@ class O {
     );
   }
 }
-function me(n, e, t, r, s, o, i) {
+function de(n, e, t, r, s, o, i) {
   if (!v(e) || e instanceof Promise || e instanceof Date || i && !i(e))
     return;
-  if (ye(e, t)) return e;
+  if (he(e, t)) return e;
   const a = new Proxy(e, {
     get(u, p) {
       return p === t ? u : Reflect.get(u, p);
@@ -616,8 +613,8 @@ function me(n, e, t, r, s, o, i) {
   });
   return a;
 }
-function he(n, e, t, r, s, o, i) {
-  if (!W(n, e) || i && !i(e, n))
+function me(n, e, t, r, s, o, i) {
+  if (!J(n, e) || i && !i(e, n))
     return [void 0, !1];
   if (F(n, e, r)) return [e, !1];
   const a = (l) => {
@@ -634,7 +631,7 @@ function he(n, e, t, r, s, o, i) {
     const d = s(l);
     if (!d) return;
     const m = s(f);
-    delete w(d, t)[m];
+    Reflect.deleteProperty(w(d, t), m);
   };
   return n.newFunction("proxyFuncs", (l, ...f) => {
     switch (n.getNumber(l)) {
@@ -693,7 +690,7 @@ function w(n, e) {
 function j(n, e, t) {
   return F(n, e, t) ? [n.getProp(e, t), !0] : [e, !1];
 }
-function ye(n, e) {
+function he(n, e) {
   return v(n) && !!n[e];
 }
 function F(n, e, t) {
@@ -708,7 +705,7 @@ function F(n, e, t) {
     )
   );
 }
-class we {
+class ve {
   /** Constructs a new Arena instance. It requires a quickjs-emscripten context initialized with `quickjs.newContext()`. */
   constructor(e, t) {
     c(this, "context");
@@ -717,7 +714,7 @@ class we {
     c(this, "_registeredMapDispose", /* @__PURE__ */ new Set());
     c(this, "_sync", /* @__PURE__ */ new Set());
     c(this, "_temporalSync", /* @__PURE__ */ new Set());
-    c(this, "_symbol", Symbol());
+    c(this, "_symbol", /* @__PURE__ */ Symbol());
     c(this, "_symbolHandle");
     c(this, "_options");
     c(this, "_isMarshalable", (e) => {
@@ -733,7 +730,7 @@ class we {
     c(this, "_marshalPre", (e, t, r) => {
       var s;
       if (r !== "json")
-        return (s = this._register(e, q(t), this._map)) == null ? void 0 : s[1];
+        return (s = this._register(e, L(t), this._map)) == null ? void 0 : s[1];
     });
     c(this, "_marshalPreApply", (e, t, r) => {
       const s = v(t) ? this._unwrap(t) : void 0;
@@ -774,7 +771,7 @@ class we {
       if (typeof t != "undefined")
         return t;
       const [r] = this._wrapHandle(e);
-      return de(r != null ? r : e, {
+      return le(r != null ? r : e, {
         ctx: this.context,
         marshal: this._marshal,
         find: this._unmarshalFind,
@@ -948,7 +945,7 @@ class we {
    */
   expose(e) {
     for (const [t, r] of Object.entries(e))
-      $(this._marshal(r), (s) => {
+      z(this._marshal(r), (s) => {
         this.context.setProp(this.context.global, t, s);
       });
   }
@@ -972,7 +969,7 @@ class we {
   register(e, t) {
     if (this._registeredMap.has(e)) return;
     const r = typeof t == "string" ? this._unwrapResult(this.context.evalCode(t)) : t;
-    G(this.context, r, this.context.undefined) || (typeof t == "string" && this._registeredMapDispose.add(e), this._registeredMap.set(e, r));
+    this.context.sameValue(r, this.context.undefined) || (typeof t == "string" && this._registeredMapDispose.add(e), this._registeredMap.set(e, r));
   }
   /**
    * Execute `register` methods for each pair.
@@ -1026,7 +1023,7 @@ class we {
   }
   _wrap(e) {
     var t;
-    return me(
+    return de(
       this.context,
       e,
       this._symbol,
@@ -1041,7 +1038,7 @@ class we {
   }
   _wrapHandle(e) {
     var t;
-    return he(
+    return me(
       this.context,
       e,
       this._symbol,
@@ -1056,18 +1053,17 @@ class we {
   }
 }
 export {
-  we as Arena,
+  ve as Arena,
   O as VMMap,
   y as call,
-  ve as complexity,
-  be as consumeAll,
+  be as complexity,
+  _e as consumeAll,
   I as defaultRegisteredObjects,
-  G as eq,
-  Z as isES2015Class,
-  W as isHandleObject,
+  Y as isES2015Class,
+  J as isHandleObject,
   v as isObject,
-  z as json,
+  W as json,
   R as marshal,
-  de as unmarshal,
+  le as unmarshal,
   E as walkObject
 };

package/dist/{quickjs-emscripten-sync.umd.js → quickjs-emscripten-sync.umd.cjs}

@@ -1,23 +1,23 @@
-(function(m,v){typeof exports=="object"&&typeof module!="undefined"?v(exports):typeof define=="function"&&define.amd?define(["exports"],v):(m=typeof globalThis!="undefined"?globalThis:m||self,v(m.QuickjsEmscriptenSync={}))})(this,(function(m){"use strict";var ve=Object.defineProperty;var we=(m,v,j)=>v in m?ve(m,v,{enumerable:!0,configurable:!0,writable:!0,value:j}):m[v]=j;var c=(m,v,j)=>we(m,typeof v!="symbol"?v+"":v,j);const v=n=>{const e=new j(n);return new Proxy(n,{get(t,r,s){return r in e?e[r]:Reflect.get(t,r,s)}})};class j{constructor(e){c(this,"context");c(this,"fn");c(this,"fnGenerator");c(this,"fnCounter",Number.MIN_SAFE_INTEGER);c(this,"fnMap",new Map);c(this,"newFunction",(e,t)=>{this.fnCounter++;const r=this.fnCounter;return this.fnMap.set(r,t),this.context.unwrapResult(this.context.callFunction(this.fnGenerator,this.context.undefined,this.context.newString(e),this.context.newNumber(t.length),this.context.newNumber(r),this.fn))});this.context=e;const t=this.fnMap;this.fn=this.context.newFunction("",function(r,...s){const o=e.getNumber(r),i=t.get(o);if(!i)throw new Error("function is not registered");return i.call(this,...s)}),this.fnGenerator=e.unwrapResult(e.evalCode(`((name, length, id, f) => {
+(function(m,v){typeof exports=="object"&&typeof module!="undefined"?v(exports):typeof define=="function"&&define.amd?define(["exports"],v):(m=typeof globalThis!="undefined"?globalThis:m||self,v(m.QuickjsEmscriptenSync={}))})(this,(function(m){"use strict";var be=Object.defineProperty;var ve=(m,v,j)=>v in m?be(m,v,{enumerable:!0,configurable:!0,writable:!0,value:j}):m[v]=j;var c=(m,v,j)=>ve(m,typeof v!="symbol"?v+"":v,j);const v=n=>{const e=new j(n);return new Proxy(n,{get(t,r,s){return r in e?e[r]:Reflect.get(t,r,s)}})};class j{constructor(e){c(this,"context");c(this,"fn");c(this,"fnGenerator");c(this,"fnCounter",Number.MIN_SAFE_INTEGER);c(this,"fnMap",new Map);c(this,"newFunction",(e,t)=>{this.fnCounter++;const r=this.fnCounter;return this.fnMap.set(r,t),this.context.unwrapResult(this.context.callFunction(this.fnGenerator,this.context.undefined,this.context.newString(e),this.context.newNumber(t.length),this.context.newNumber(r),this.fn))});this.context=e;const t=this.fnMap;this.fn=this.context.newFunction("",function(r,...s){const o=e.getNumber(r),i=t.get(o);if(!i)throw new Error("function is not registered");return i.call(this,...s)}),this.fnGenerator=e.unwrapResult(e.evalCode(`((name, length, id, f) => {
         const fn = function(...args) {
           return f.call(this, id, ...args);
         };
         fn.name = name;
         fn.length = length;
         return fn;
-      })`))}disposeEx(){this.fnGenerator.dispose(),this.fn.dispose()}}const k=[[Symbol,"Symbol"],[Symbol.prototype,"Symbol.prototype"],[Object,"Object"],[Object.prototype,"Object.prototype"],[Function,"Function"],[Function.prototype,"Function.prototype"],[Boolean,"Boolean"],[Boolean.prototype,"Boolean.prototype"],[Array,"Array"],[Array.prototype,"Array.prototype"],[Error,"Error"],[Error.prototype,"Error.prototype"],[EvalError,"EvalError"],[EvalError.prototype,"EvalError.prototype"],[RangeError,"RangeError"],[RangeError.prototype,"RangeError.prototype"],[ReferenceError,"ReferenceError"],[ReferenceError.prototype,"ReferenceError.prototype"],[SyntaxError,"SyntaxError"],[SyntaxError.prototype,"SyntaxError.prototype"],[TypeError,"TypeError"],[TypeError.prototype,"TypeError.prototype"],[URIError,"URIError"],[URIError.prototype,"URIError.prototype"],...Object.getOwnPropertyNames(Symbol).filter(n=>typeof Symbol[n]=="symbol").map(n=>[Symbol[n],`Symbol.${n}`])];function J(n,e){const t=n.unwrapResult(n.evalCode(e)),r=(o,...i)=>n.unwrapResult(n.callFunction(t,o!=null?o:n.undefined,...i)),s=()=>t.dispose();return r.dispose=s,r[Symbol.dispose]=s,r.alive=!0,Object.defineProperty(r,"alive",{get:()=>t.alive}),r}function _(n,e,t,...r){const s=J(n,e);try{return s(t,...r)}finally{s.dispose()}}function C(n,e,t){return n.dump(_(n,"Object.is",void 0,e,t))}function W(n,e,t){return n.dump(_(n,"(a, b) => a instanceof b",void 0,e,t))}function F(n,e){return n.dump(_(n,'a => typeof a === "object" && a !== null || typeof a === "function"',void 0,e))}function H(n,e){const t=JSON.stringify(e);return t?_(n,"JSON.parse",void 0,n.newString(t)):n.undefined}function z(n,e){try{return e(n)}finally{for(const t of n)t.alive&&t.dispose()}}function $([n,e],t){try{return t(n)}finally{e&&n.dispose()}}function S(n,e){try{return e(...n.map(t=>t[0]))}finally{for(const[t,r]of n)r&&t.dispose()}}function q(n){return"handle"in n}function L(n){return q(n)?n.handle:n}function Q(n,e,t,r){var o;let s;for(const i of r)if(s=i(e,n),s)break;return s?(o=t(e,s))!=null?o:s:void 0}function V(n,e){return typeof n!="symbol"?void 0:_(e,"d => Symbol(d)",void 0,n.description?e.newString(n.description):e.undefined)}function X(n,e){return n instanceof Date?_(e,"d => new Date(d)",void 0,e.newNumber(n.getTime())):void 0}const Y=[V,X];function N(n){return typeof n=="function"&&/^class\s/.test(Function.prototype.toString.call(n))}function g(n){return typeof n=="function"||typeof n=="object"&&n!==null}function O(n,e){const t=new Set,r=s=>{if(!(!g(s)||t.has(s)||(e==null?void 0:e(s,t))===!1)){if(t.add(s),Array.isArray(s)){for(const o of s)r(o);return}if(typeof s=="object"){const o=Object.getPrototypeOf(s);o&&o!==Object.prototype&&r(o)}for(const o of Object.values(Object.getOwnPropertyDescriptors(s)))"value"in o&&r(o.value),"get"in o&&r(o.get),"set"in o&&r(o.set)}};return r(n),t}function Z(n,e){return O(n,e?(t,r)=>r.size<e:void 0).size}function K(){let n=()=>{},e=()=>{};return{promise:new Promise((r,s)=>{n=r,e=s}),resolve:n,reject:e}}function A(n,e,t,r){const s=n.newObject(),o=(a,u)=>{const p=r(a),l=typeof u.value=="undefined"?void 0:r(u.value),f=typeof u.get=="undefined"?void 0:r(u.get),d=typeof u.set=="undefined"?void 0:r(u.set);n.newObject().consume(h=>{Object.entries(u).forEach(([y,b])=>{const w=y==="value"?l:y==="get"?f:y==="set"?d:b?n.true:n.false;w&&n.setProp(h,y,w)}),n.setProp(s,p,h)})},i=Object.getOwnPropertyDescriptors(e);Object.entries(i).forEach(([a,u])=>o(a,u)),Object.getOwnPropertySymbols(i).forEach(a=>o(a,i[a])),_(n,"Object.defineProperties",void 0,t,s).dispose(),s.dispose()}function x(n,e,t,r,s,o){var u;if(typeof e!="function")return;const i=n.newFunction(e.name,function(...p){const l=r(this),f=p.map(d=>r(d));if(N(e)&&g(l)){const d=new e(...f);return Object.entries(d).forEach(([h,y])=>{n.setProp(this,h,t(y))}),this}return t(o?o(e,l,f):e.apply(l,f))}).consume(p=>_(n,`Cls => {
+      })`))}disposeEx(){this.fnGenerator.dispose(),this.fn.dispose()}}const k=[[Symbol,"Symbol"],[Symbol.prototype,"Symbol.prototype"],[Object,"Object"],[Object.prototype,"Object.prototype"],[Function,"Function"],[Function.prototype,"Function.prototype"],[Boolean,"Boolean"],[Boolean.prototype,"Boolean.prototype"],[Array,"Array"],[Array.prototype,"Array.prototype"],[Error,"Error"],[Error.prototype,"Error.prototype"],[EvalError,"EvalError"],[EvalError.prototype,"EvalError.prototype"],[RangeError,"RangeError"],[RangeError.prototype,"RangeError.prototype"],[ReferenceError,"ReferenceError"],[ReferenceError.prototype,"ReferenceError.prototype"],[SyntaxError,"SyntaxError"],[SyntaxError.prototype,"SyntaxError.prototype"],[TypeError,"TypeError"],[TypeError.prototype,"TypeError.prototype"],[URIError,"URIError"],[URIError.prototype,"URIError.prototype"],...Object.getOwnPropertyNames(Symbol).filter(n=>typeof Symbol[n]=="symbol").map(n=>[Symbol[n],`Symbol.${n}`])];function G(n,e){const t=n.unwrapResult(n.evalCode(e)),r=(o,...i)=>n.unwrapResult(n.callFunction(t,o!=null?o:n.undefined,...i)),s=()=>t.dispose();return r.dispose=s,r[Symbol.dispose]=s,r.alive=!0,Object.defineProperty(r,"alive",{get:()=>t.alive}),r}function _(n,e,t,...r){const s=G(n,e);try{return s(t,...r)}finally{s.dispose()}}function J(n,e,t){return n.dump(_(n,"(a, b) => a instanceof b",void 0,e,t))}function C(n,e){return n.dump(_(n,'a => typeof a === "object" && a !== null || typeof a === "function"',void 0,e))}function F(n,e){const t=JSON.stringify(e);return t?_(n,"JSON.parse",void 0,n.newString(t)):n.undefined}function W(n,e){try{return e(n)}finally{for(const t of n)t.alive&&t.dispose()}}function z([n,e],t){try{return t(n)}finally{e&&n.dispose()}}function S(n,e){try{return e(...n.map(t=>t[0]))}finally{for(const[t,r]of n)r&&t.dispose()}}function $(n){return"handle"in n}function V(n){return $(n)?n.handle:n}function L(n,e,t,r){var o;let s;for(const i of r)if(s=i(e,n),s)break;return s?(o=t(e,s))!=null?o:s:void 0}function Q(n,e){return typeof n!="symbol"?void 0:_(e,"d => Symbol(d)",void 0,n.description?e.newString(n.description):e.undefined)}function q(n,e){return n instanceof Date?_(e,"d => new Date(d)",void 0,e.newNumber(n.getTime())):void 0}const X=[Q,q];function H(n){return typeof n=="function"&&/^class\s/.test(Function.prototype.toString.call(n))}function g(n){return typeof n=="function"||typeof n=="object"&&n!==null}function O(n,e){const t=new Set,r=s=>{if(!(!g(s)||t.has(s)||(e==null?void 0:e(s,t))===!1)){if(t.add(s),Array.isArray(s)){for(const o of s)r(o);return}if(typeof s=="object"){const o=Object.getPrototypeOf(s);o&&o!==Object.prototype&&r(o)}for(const o of Object.values(Object.getOwnPropertyDescriptors(s)))"value"in o&&r(o.value),"get"in o&&r(o.get),"set"in o&&r(o.set)}};return r(n),t}function Y(n,e){return O(n,e?(t,r)=>r.size<e:void 0).size}function Z(){let n=()=>{},e=()=>{};return{promise:new Promise((r,s)=>{n=r,e=s}),resolve:n,reject:e}}function N(n,e,t,r){const s=n.newObject(),o=(a,u)=>{const p=r(a),l=typeof u.value=="undefined"?void 0:r(u.value),f=typeof u.get=="undefined"?void 0:r(u.get),d=typeof u.set=="undefined"?void 0:r(u.set);n.newObject().consume(h=>{Object.entries(u).forEach(([y,b])=>{const w=y==="value"?l:y==="get"?f:y==="set"?d:b?n.true:n.false;w&&n.setProp(h,y,w)}),n.setProp(s,p,h)})},i=Object.getOwnPropertyDescriptors(e);Object.entries(i).forEach(([a,u])=>o(a,u)),Object.getOwnPropertySymbols(i).forEach(a=>o(a,i[a])),_(n,"Object.defineProperties",void 0,t,s).dispose(),s.dispose()}function K(n,e,t,r,s,o){var u;if(typeof e!="function")return;const i=n.newFunction(e.name,function(...p){const l=r(this),f=p.map(d=>r(d));if(H(e)&&g(l)){const d=new e(...f);return Object.entries(d).forEach(([h,y])=>{n.setProp(this,h,t(y))}),this}return t(o?o(e,l,f):e.apply(l,f))}).consume(p=>_(n,`Cls => {
           const fn = function(...args) { return Cls.apply(this, args); };
           fn.name = Cls.name;
           fn.length = Cls.length;
           return fn;
-        }`,void 0,p)),a=(u=s(e,i))!=null?u:i;return A(n,e,i,t),a}function ee(n,e,t){var o;const r=H(n,e);return(o=t(e,r))!=null?o:r}function te(n,e,t,r){var u;if(typeof e!="object"||e===null)return;const s=Array.isArray(e)?n.newArray():n.newObject(),o=(u=r(e,s))!=null?u:s,i=Object.getPrototypeOf(e),a=i&&i!==Object.prototype&&i!==Array.prototype?t(i):void 0;return a&&_(n,"Object.setPrototypeOf",void 0,o,a).dispose(),A(n,e,s,t),o}function ne(n,e){switch(typeof e){case"undefined":return n.undefined;case"number":return n.newNumber(e);case"string":return n.newString(e);case"boolean":return e?n.true:n.false;case"object":return e===null?n.null:void 0}}function re(n,e,t,r){var o;if(!(e instanceof Promise))return;const s=n.newPromise();return e.then(i=>s.resolve(t(i)),i=>s.reject(t(i))),(o=r(e,s))!=null?o:s.handle}function E(n,e){var l,f,d,h,y;const{ctx:t,unmarshal:r,isMarshalable:s,find:o,pre:i}=e;{const b=ne(t,n);if(b)return b}{const b=o(n);if(b)return b}const a=s==null?void 0:s(n);if(a===!1)return t.undefined;const u=(b,w)=>i(b,w,a);if(a==="json")return ee(t,n,u);const p=b=>E(b,e);return(y=(h=(d=(f=Q(t,n,u,[...Y,...(l=e.custom)!=null?l:[]]))!=null?f:re(t,n,p,u))!=null?d:x(t,n,p,r,u,e.preApply))!=null?h:te(t,n,p,u))!=null?y:t.undefined}function se(n,e,t,r){var o;let s;for(const i of r)if(s=i(e,n),s)break;return s?(o=t(s,e))!=null?o:s:void 0}function oe(n,e){if(e.typeof(n)!=="symbol")return;const t=e.getString(e.getProp(n,"description"));return Symbol(t)}function ie(n,e){if(!e.dump(_(e,"a => a instanceof Date",void 0,n)))return;const t=e.getNumber(_(e,"a => a.getTime()",void 0,n));return new Date(t)}const ue=[oe,ie];function D(n,e,t,r){n.newFunction("",(s,o)=>{const[i]=r(s);if(typeof i!="string"&&typeof i!="number"&&typeof i!="symbol")return;const a=[["value",!0],["get",!0],["set",!0],["configurable",!1],["enumerable",!1],["writable",!1]].reduce((u,[p,l])=>{const f=n.getProp(o,p),d=n.typeof(f);if(d==="undefined")return u;if(!l&&d==="boolean")return u[p]=n.dump(n.getProp(o,p)),u;const[h,y]=r(f);return y&&f.dispose(),u[p]=h,u},{});Object.defineProperty(t,i,a)}).consume(s=>{_(n,`(o, fn) => {
+        }`,void 0,p)),a=(u=s(e,i))!=null?u:i;return N(n,e,i,t),a}function x(n,e,t){var o;const r=F(n,e);return(o=t(e,r))!=null?o:r}function ee(n,e,t,r){var u;if(typeof e!="object"||e===null)return;const s=Array.isArray(e)?n.newArray():n.newObject(),o=(u=r(e,s))!=null?u:s,i=Object.getPrototypeOf(e),a=i&&i!==Object.prototype&&i!==Array.prototype?t(i):void 0;return a&&_(n,"Object.setPrototypeOf",void 0,o,a).dispose(),N(n,e,s,t),o}function te(n,e){switch(typeof e){case"undefined":return n.undefined;case"number":return n.newNumber(e);case"string":return n.newString(e);case"boolean":return e?n.true:n.false;case"object":return e===null?n.null:void 0}}function ne(n,e,t,r){var o;if(!(e instanceof Promise))return;const s=n.newPromise();return e.then(i=>s.resolve(t(i)),i=>s.reject(t(i))),(o=r(e,s))!=null?o:s.handle}function E(n,e){var l,f,d,h,y;const{ctx:t,unmarshal:r,isMarshalable:s,find:o,pre:i}=e;{const b=te(t,n);if(b)return b}{const b=o(n);if(b)return b}const a=s==null?void 0:s(n);if(a===!1)return t.undefined;const u=(b,w)=>i(b,w,a);if(a==="json")return x(t,n,u);const p=b=>E(b,e);return(y=(h=(d=(f=L(t,n,u,[...X,...(l=e.custom)!=null?l:[]]))!=null?f:ne(t,n,p,u))!=null?d:K(t,n,p,r,u,e.preApply))!=null?h:ee(t,n,p,u))!=null?y:t.undefined}function re(n,e,t,r){var o;let s;for(const i of r)if(s=i(e,n),s)break;return s?(o=t(s,e))!=null?o:s:void 0}function se(n,e){if(e.typeof(n)!=="symbol")return;const t=e.getString(e.getProp(n,"description"));return Symbol(t)}function oe(n,e){if(!e.dump(_(e,"a => a instanceof Date",void 0,n)))return;const t=e.getNumber(_(e,"a => a.getTime()",void 0,n));return new Date(t)}const ie=[se,oe];function A(n,e,t,r){n.newFunction("",(s,o)=>{const[i]=r(s);if(typeof i!="string"&&typeof i!="number"&&typeof i!="symbol")return;const a=[["value",!0],["get",!0],["set",!0],["configurable",!1],["enumerable",!1],["writable",!1]].reduce((u,[p,l])=>{const f=n.getProp(o,p),d=n.typeof(f);if(d==="undefined")return u;if(!l&&d==="boolean")return u[p]=n.dump(n.getProp(o,p)),u;const[h,y]=r(f);return y&&f.dispose(),u[p]=h,u},{});Object.defineProperty(t,i,a)}).consume(s=>{_(n,`(o, fn) => {
         const descs = Object.getOwnPropertyDescriptors(o);
         Object.entries(descs).forEach(([k, v]) => fn(k, v));
         Object.getOwnPropertySymbols(descs).forEach(k => fn(k, descs[k]));
-      }`,void 0,e,s).dispose()})}function ae(n,e,t,r,s){var a;if(n.typeof(e)!=="function")return;const o=function(...u){return S([t(this),...u.map(p=>t(p))],(p,...l)=>{if(new.target){const[y]=r(_(n,"(Cls, ...args) => new Cls(...args)",p,e,...l));return Object.defineProperties(this,Object.getOwnPropertyDescriptors(y)),this}const f=n.unwrapResult(n.callFunction(e,p,...l)),[d,h]=r(f);return h&&f.dispose(),d})},i=(a=s(o,e))!=null?a:o;return D(n,e,o,r),i}function pe(n,e,t,r){var a;if(n.typeof(e)!=="object"||n.unwrapResult(n.evalCode("o => o === null")).consume(u=>n.dump(n.unwrapResult(n.callFunction(u,n.undefined,e)))))return;const s=_(n,"Array.isArray",void 0,e).consume(u=>n.dump(u))?[]:{},o=(a=r(s,e))!=null?a:s,i=_(n,`o => {
+      }`,void 0,e,s).dispose()})}function ue(n,e,t,r,s){var a;if(n.typeof(e)!=="function")return;const o=function(...u){return S([t(this),...u.map(p=>t(p))],(p,...l)=>{if(new.target){const[y]=r(_(n,"(Cls, ...args) => new Cls(...args)",p,e,...l));return Object.defineProperties(this,Object.getOwnPropertyDescriptors(y)),this}const f=n.unwrapResult(n.callFunction(e,p,...l)),[d,h]=r(f);return h&&f.dispose(),d})},i=(a=s(o,e))!=null?a:o;return A(n,e,o,r),i}function ae(n,e,t,r){var a;if(n.typeof(e)!=="object"||n.unwrapResult(n.evalCode("o => o === null")).consume(u=>n.dump(n.unwrapResult(n.callFunction(u,n.undefined,e)))))return;const s=_(n,"Array.isArray",void 0,e).consume(u=>n.dump(u))?[]:{},o=(a=r(s,e))!=null?a:s,i=_(n,`o => {
       const p = Object.getPrototypeOf(o);
       return !p || p === Object.prototype || p === Array.prototype ? undefined : p;
-    }`,void 0,e).consume(u=>{if(n.typeof(u)==="undefined")return;const[p]=t(u);return p});return typeof i=="object"&&Object.setPrototypeOf(o,i),D(n,e,s,t),o}function fe(n,e){const t=n.typeof(e);return t==="undefined"||t==="number"||t==="string"||t==="boolean"?[n.dump(e),!0]:t==="object"&&n.unwrapResult(n.evalCode("a => a === null")).consume(s=>n.dump(n.unwrapResult(n.callFunction(s,n.undefined,e))))?[null,!0]:[void 0,!1]}function ce(n,e,t,r){var p;if(!le(n,e))return;const s=K(),[o,i]=t(s.resolve),[a,u]=t(s.reject);return _(n,"(p, res, rej) => { p.then(res, rej); }",void 0,e,o,a),i&&o.dispose(),u&&a.dispose(),(p=r(s.promise,e))!=null?p:s.promise}function le(n,e){return e.owner?n.unwrapResult(n.evalCode("Promise")).consume(t=>e.owner?W(n,e,t):!1):!1}function B(n,e){const[t]=T(n,e);return t}function T(n,e){var u,p,l,f;const{ctx:t,marshal:r,find:s,pre:o}=e;{const[d,h]=fe(t,n);if(h)return[d,!1]}{const d=s(n);if(d)return[d,!0]}const i=d=>T(d,e);return[(f=(l=(p=se(t,n,o,[...ue,...(u=e.custom)!=null?u:[]]))!=null?p:ce(t,n,r,o))!=null?l:ae(t,n,r,i,o))!=null?f:pe(t,n,i,o),!1]}class M{constructor(e){c(this,"ctx");c(this,"_map1",new Map);c(this,"_map2",new Map);c(this,"_map3",new Map);c(this,"_map4",new Map);c(this,"_counterMap",new Map);c(this,"_disposables",new Set);c(this,"_mapGet");c(this,"_mapSet");c(this,"_mapDelete");c(this,"_mapClear");c(this,"_counter",Number.MIN_SAFE_INTEGER);this.ctx=e;const t=e.unwrapResult(e.evalCode(`() => {
+    }`,void 0,e).consume(u=>{if(n.typeof(u)==="undefined")return;const[p]=t(u);return p});return typeof i=="object"&&Object.setPrototypeOf(o,i),A(n,e,s,t),o}function pe(n,e){const t=n.typeof(e);return t==="undefined"||t==="number"||t==="string"||t==="boolean"?[n.dump(e),!0]:t==="object"&&n.unwrapResult(n.evalCode("a => a === null")).consume(s=>n.dump(n.unwrapResult(n.callFunction(s,n.undefined,e))))?[null,!0]:[void 0,!1]}function fe(n,e,t,r){var p;if(!ce(n,e))return;const s=Z(),[o,i]=t(s.resolve),[a,u]=t(s.reject);return _(n,"(p, res, rej) => { p.then(res, rej); }",void 0,e,o,a),i&&o.dispose(),u&&a.dispose(),(p=r(s.promise,e))!=null?p:s.promise}function ce(n,e){return e.owner?n.unwrapResult(n.evalCode("Promise")).consume(t=>e.owner?J(n,e,t):!1):!1}function D(n,e){const[t]=B(n,e);return t}function B(n,e){var u,p,l,f;const{ctx:t,marshal:r,find:s,pre:o}=e;{const[d,h]=pe(t,n);if(h)return[d,!1]}{const d=s(n);if(d)return[d,!0]}const i=d=>B(d,e);return[(f=(l=(p=re(t,n,o,[...ie,...(u=e.custom)!=null?u:[]]))!=null?p:fe(t,n,r,o))!=null?l:ue(t,n,r,i,o))!=null?f:ae(t,n,i,o),!1]}class M{constructor(e){c(this,"ctx");c(this,"_map1",new Map);c(this,"_map2",new Map);c(this,"_map3",new Map);c(this,"_map4",new Map);c(this,"_counterMap",new Map);c(this,"_disposables",new Set);c(this,"_mapGet");c(this,"_mapSet");c(this,"_mapDelete");c(this,"_mapClear");c(this,"_counter",Number.MIN_SAFE_INTEGER);this.ctx=e;const t=e.unwrapResult(e.evalCode(`() => {
         const mapSym = new Map();
         let map = new WeakMap();
         let map2 = new WeakMap();
@@ -40,7 +40,7 @@
             map2 = new WeakMap();
           }
         };
-      }`)).consume(r=>this._call(r,void 0));this._mapGet=e.getProp(t,"get"),this._mapSet=e.getProp(t,"set"),this._mapDelete=e.getProp(t,"delete"),this._mapClear=e.getProp(t,"clear"),t.dispose(),this._disposables.add(this._mapGet),this._disposables.add(this._mapSet),this._disposables.add(this._mapDelete),this._disposables.add(this._mapClear)}set(e,t,r,s){var a;if(!t.alive||s&&!s.alive)return!1;const o=(a=this.get(e))!=null?a:this.get(r);if(o)return o===t||o===s;const i=this._counter++;return this._map1.set(e,i),this._map3.set(i,t),this._counterMap.set(i,e),r&&(this._map2.set(r,i),s&&this._map4.set(i,s)),this.ctx.newNumber(i).consume(u=>{this._call(this._mapSet,void 0,t,u,s!=null?s:this.ctx.undefined)}),!0}merge(e){if(e)for(const t of e)t&&t[1]&&this.set(t[0],t[1],t[2],t[3])}get(e){var s;const t=(s=this._map1.get(e))!=null?s:this._map2.get(e),r=typeof t=="number"?this._map3.get(t):void 0;if(r){if(!r.alive){this.delete(e);return}return r}}getByHandle(e){if(e.alive)return this._counterMap.get(this.ctx.getNumber(this._call(this._mapGet,void 0,e)))}has(e){return!!this.get(e)}hasHandle(e){return typeof this.getByHandle(e)!="undefined"}keys(){return this._map1.keys()}delete(e,t){var i;const r=(i=this._map1.get(e))!=null?i:this._map2.get(e);if(typeof r=="undefined")return;const s=this._map3.get(r),o=this._map4.get(r);this._call(this._mapDelete,void 0,...[s,o].filter(a=>!!(a!=null&&a.alive))),this._map1.delete(e),this._map2.delete(e),this._map3.delete(r),this._map4.delete(r);for(const[a,u]of this._map1)if(u===r){this._map1.delete(a);break}for(const[a,u]of this._map2)if(u===r){this._map2.delete(a);break}for(const[a,u]of this._counterMap)if(u===e){this._counterMap.delete(a);break}t&&(s!=null&&s.alive&&s.dispose(),o!=null&&o.alive&&o.dispose())}deleteByHandle(e,t){const r=this.getByHandle(e);typeof r!="undefined"&&this.delete(r,t)}clear(){this._counter=0,this._map1.clear(),this._map2.clear(),this._map3.clear(),this._map4.clear(),this._counterMap.clear(),this._mapClear.alive&&this._call(this._mapClear,void 0)}dispose(){for(const e of this._disposables.values())e.alive&&e.dispose();for(const e of this._map3.values())e.alive&&e.dispose();for(const e of this._map4.values())e.alive&&e.dispose();this._disposables.clear(),this.clear()}get size(){return this._map1.size}[Symbol.iterator](){const e=this._map1.keys();return{next:()=>{for(;;){const t=e.next();if(t.done)return{value:void 0,done:!0};const r=this._map1.get(t.value);if(typeof r=="undefined")continue;const s=this._map3.get(r),o=this._map4.get(r);if(!s)continue;const i=this._get2(r);return{value:[t.value,s,i,o],done:!1}}}}}_get2(e){for(const[t,r]of this._map2)if(r===e)return t}_call(e,t,...r){return this.ctx.unwrapResult(this.ctx.callFunction(e,typeof t=="undefined"?this.ctx.undefined:t,...r))}}function de(n,e,t,r,s,o,i){if(!g(e)||e instanceof Promise||e instanceof Date||i&&!i(e))return;if(he(e,t))return e;const a=new Proxy(e,{get(u,p){return p===t?u:Reflect.get(u,p)},set(u,p,l,f){var y;const d=P(l,t),h=(y=o==null?void 0:o(f))!=null?y:"host";return h!=="vm"&&!Reflect.set(u,p,d,f)||h==="host"||!n.alive||S([s(f),s(p),s(d)],(b,w,I)=>{const[G,_e]=R(n,b,r);_e?G.consume(be=>n.setProp(be,w,I)):n.setProp(G,w,I)}),!0},deleteProperty(u,p){var f;const l=(f=o==null?void 0:o(a))!=null?f:"host";return S([s(a),s(p)],(d,h)=>{const[y,b]=R(n,d,r);if(l==="vm"||Reflect.deleteProperty(u,p)){if(l==="host"||!n.alive)return!0;b?y.consume(w=>_(n,"(a, b) => delete a[b]",void 0,w,h)):_(n,"(a, b) => delete a[b]",void 0,y,h)}return!0})}});return a}function me(n,e,t,r,s,o,i){if(!F(n,e)||i&&!i(e,n))return[void 0,!1];if(U(n,e,r))return[e,!1];const a=l=>{const f=o==null?void 0:o(s(l));return typeof f=="string"?n.newString(f):n.undefined},u=(l,f,d)=>{const h=s(l);if(!h)return;const y=s(f);if(y==="__proto__")return;const b=s(d);P(h,t)[y]=b},p=(l,f)=>{const d=s(l);if(!d)return;const h=s(f);delete P(d,t)[h]};return n.newFunction("proxyFuncs",(l,...f)=>{switch(n.getNumber(l)){case 1:return a(f[0]);case 2:return u(f[0],f[1],f[2]);case 3:return p(f[0],f[1])}return n.undefined}).consume(l=>[_(n,`(target, sym, proxyFuncs) => {
+      }`)).consume(r=>this._call(r,void 0));this._mapGet=e.getProp(t,"get"),this._mapSet=e.getProp(t,"set"),this._mapDelete=e.getProp(t,"delete"),this._mapClear=e.getProp(t,"clear"),t.dispose(),this._disposables.add(this._mapGet),this._disposables.add(this._mapSet),this._disposables.add(this._mapDelete),this._disposables.add(this._mapClear)}set(e,t,r,s){var a;if(!t.alive||s&&!s.alive)return!1;const o=(a=this.get(e))!=null?a:this.get(r);if(o)return o===t||o===s;const i=this._counter++;return this._map1.set(e,i),this._map3.set(i,t),this._counterMap.set(i,e),r&&(this._map2.set(r,i),s&&this._map4.set(i,s)),this.ctx.newNumber(i).consume(u=>{this._call(this._mapSet,void 0,t,u,s!=null?s:this.ctx.undefined)}),!0}merge(e){if(e)for(const t of e)t&&t[1]&&this.set(t[0],t[1],t[2],t[3])}get(e){var s;const t=(s=this._map1.get(e))!=null?s:this._map2.get(e),r=typeof t=="number"?this._map3.get(t):void 0;if(r){if(!r.alive){this.delete(e);return}return r}}getByHandle(e){if(e.alive)return this._counterMap.get(this.ctx.getNumber(this._call(this._mapGet,void 0,e)))}has(e){return!!this.get(e)}hasHandle(e){return typeof this.getByHandle(e)!="undefined"}keys(){return this._map1.keys()}delete(e,t){var i;const r=(i=this._map1.get(e))!=null?i:this._map2.get(e);if(typeof r=="undefined")return;const s=this._map3.get(r),o=this._map4.get(r);this._call(this._mapDelete,void 0,...[s,o].filter(a=>!!(a!=null&&a.alive))),this._map1.delete(e),this._map2.delete(e),this._map3.delete(r),this._map4.delete(r);for(const[a,u]of this._map1)if(u===r){this._map1.delete(a);break}for(const[a,u]of this._map2)if(u===r){this._map2.delete(a);break}for(const[a,u]of this._counterMap)if(u===e){this._counterMap.delete(a);break}t&&(s!=null&&s.alive&&s.dispose(),o!=null&&o.alive&&o.dispose())}deleteByHandle(e,t){const r=this.getByHandle(e);typeof r!="undefined"&&this.delete(r,t)}clear(){this._counter=0,this._map1.clear(),this._map2.clear(),this._map3.clear(),this._map4.clear(),this._counterMap.clear(),this._mapClear.alive&&this._call(this._mapClear,void 0)}dispose(){for(const e of this._disposables.values())e.alive&&e.dispose();for(const e of this._map3.values())e.alive&&e.dispose();for(const e of this._map4.values())e.alive&&e.dispose();this._disposables.clear(),this.clear()}get size(){return this._map1.size}[Symbol.iterator](){const e=this._map1.keys();return{next:()=>{for(;;){const t=e.next();if(t.done)return{value:void 0,done:!0};const r=this._map1.get(t.value);if(typeof r=="undefined")continue;const s=this._map3.get(r),o=this._map4.get(r);if(!s)continue;const i=this._get2(r);return{value:[t.value,s,i,o],done:!1}}}}}_get2(e){for(const[t,r]of this._map2)if(r===e)return t}_call(e,t,...r){return this.ctx.unwrapResult(this.ctx.callFunction(e,typeof t=="undefined"?this.ctx.undefined:t,...r))}}function le(n,e,t,r,s,o,i){if(!g(e)||e instanceof Promise||e instanceof Date||i&&!i(e))return;if(me(e,t))return e;const a=new Proxy(e,{get(u,p){return p===t?u:Reflect.get(u,p)},set(u,p,l,f){var y;const d=P(l,t),h=(y=o==null?void 0:o(f))!=null?y:"host";return h!=="vm"&&!Reflect.set(u,p,d,f)||h==="host"||!n.alive||S([s(f),s(p),s(d)],(b,w,U)=>{const[I,ye]=R(n,b,r);ye?I.consume(_e=>n.setProp(_e,w,U)):n.setProp(I,w,U)}),!0},deleteProperty(u,p){var f;const l=(f=o==null?void 0:o(a))!=null?f:"host";return S([s(a),s(p)],(d,h)=>{const[y,b]=R(n,d,r);if(l==="vm"||Reflect.deleteProperty(u,p)){if(l==="host"||!n.alive)return!0;b?y.consume(w=>_(n,"(a, b) => delete a[b]",void 0,w,h)):_(n,"(a, b) => delete a[b]",void 0,y,h)}return!0})}});return a}function de(n,e,t,r,s,o,i){if(!C(n,e)||i&&!i(e,n))return[void 0,!1];if(T(n,e,r))return[e,!1];const a=l=>{const f=o==null?void 0:o(s(l));return typeof f=="string"?n.newString(f):n.undefined},u=(l,f,d)=>{const h=s(l);if(!h)return;const y=s(f);if(y==="__proto__")return;const b=s(d);P(h,t)[y]=b},p=(l,f)=>{const d=s(l);if(!d)return;const h=s(f);Reflect.deleteProperty(P(d,t),h)};return n.newFunction("proxyFuncs",(l,...f)=>{switch(n.getNumber(l)){case 1:return a(f[0]);case 2:return u(f[0],f[1],f[2]);case 3:return p(f[0],f[1])}return n.undefined}).consume(l=>[_(n,`(target, sym, proxyFuncs) => {
           const rec =  new Proxy(target, {
             get(obj, key, receiver) {
               return key === sym ? obj : Reflect.get(obj, key, receiver)
@@ -68,4 +68,4 @@
             },
           });
           return rec;
-        }`,void 0,e,r,l),!0])}function P(n,e){var t;return g(n)&&(t=n[e])!=null?t:n}function R(n,e,t){return U(n,e,t)?[n.getProp(e,t),!0]:[e,!1]}function he(n,e){return g(n)&&!!n[e]}function U(n,e,t){return!!n.dump(_(n,'(a, s) => (a instanceof Promise) || (a instanceof Date) || (typeof a === "object" && a !== null || typeof a === "function") && !!a[s]',void 0,e,t))}class ye{constructor(e,t){c(this,"context");c(this,"_map");c(this,"_registeredMap");c(this,"_registeredMapDispose",new Set);c(this,"_sync",new Set);c(this,"_temporalSync",new Set);c(this,"_symbol",Symbol());c(this,"_symbolHandle");c(this,"_options");c(this,"_isMarshalable",e=>{var r,s;const t=(r=this._options)==null?void 0:r.isMarshalable;return(s=typeof t=="function"?t(this._unwrap(e)):t)!=null?s:"json"});c(this,"_marshalFind",e=>{var s,o,i;const t=this._unwrap(e);return(i=(o=(s=this._registeredMap.get(e))!=null?s:t!==e?this._registeredMap.get(t):void 0)!=null?o:this._map.get(e))!=null?i:t!==e?this._map.get(t):void 0});c(this,"_marshalPre",(e,t,r)=>{var s;if(r!=="json")return(s=this._register(e,L(t),this._map))==null?void 0:s[1]});c(this,"_marshalPreApply",(e,t,r)=>{const s=g(t)?this._unwrap(t):void 0;s&&this._temporalSync.add(s);try{return e.apply(t,r)}finally{s&&this._temporalSync.delete(s)}});c(this,"_marshal",e=>{var s,o;const t=this._registeredMap.get(e);if(t)return[t,!1];const r=E((s=this._wrap(e))!=null?s:e,{ctx:this.context,unmarshal:this._unmarshal,isMarshalable:this._isMarshalable,find:this._marshalFind,pre:this._marshalPre,preApply:this._marshalPreApply,custom:(o=this._options)==null?void 0:o.customMarshaller});return[r,!this._map.hasHandle(r)]});c(this,"_preUnmarshal",(e,t)=>{var r;return(r=this._register(e,t,void 0,!0))==null?void 0:r[0]});c(this,"_unmarshalFind",e=>{var t;return(t=this._registeredMap.getByHandle(e))!=null?t:this._map.getByHandle(e)});c(this,"_unmarshal",e=>{var s;const t=this._registeredMap.getByHandle(e);if(typeof t!="undefined")return t;const[r]=this._wrapHandle(e);return B(r!=null?r:e,{ctx:this.context,marshal:this._marshal,find:this._unmarshalFind,pre:this._preUnmarshal,custom:(s=this._options)==null?void 0:s.customUnmarshaller})});c(this,"_syncMode",e=>{const t=this._unwrap(e);return this._sync.has(t)||this._temporalSync.has(t)?"both":void 0});c(this,"_unwrapIfNotSynced",e=>{const t=this._unwrap(e);return t instanceof Promise||!this._sync.has(t)?t:e});var r;t!=null&&t.compat&&!("runtime"in e)&&(e.runtime={hasPendingJob:()=>e.hasPendingJob(),executePendingJobs:s=>e.executePendingJobs(s)}),this.context=t!=null&&t.experimentalContextEx?v(e):e,this._options=t,this._symbolHandle=e.unwrapResult(e.evalCode("Symbol()")),this._map=new M(e),this._registeredMap=new M(e),this.registerAll((r=t==null?void 0:t.registeredObjects)!=null?r:k)}dispose(){var e,t;this._map.dispose(),this._registeredMap.dispose(),this._symbolHandle.dispose(),(t=(e=this.context).disposeEx)==null||t.call(e)}evalCode(e){const t=this.context.evalCode(e);return this._unwrapResultAndUnmarshal(t)}evalModule(e,t="module.js"){const r=this.context.evalCode(e,t,{type:"module"});return this._unwrapResultAndUnmarshal(r)}executePendingJobs(e){const t=this.context.runtime.executePendingJobs(e);if("value"in t)return t.value;throw this._unwrapIfNotSynced(t.error.consume(this._unmarshal))}setMemoryLimit(e){this.context.runtime.setMemoryLimit(e)}setMaxStackSize(e){this.context.runtime.setMaxStackSize(e)}getMemoryUsage(){const e=this.context.runtime.computeMemoryUsage();try{return this.context.dump(e)}finally{e.dispose()}}dumpMemoryUsage(){return this.context.runtime.dumpMemoryUsage()}expose(e){for(const[t,r]of Object.entries(e))$(this._marshal(r),s=>{this.context.setProp(this.context.global,t,s)})}sync(e){const t=this._wrap(e);return typeof t=="undefined"?e:(O(t,r=>{const s=this._unwrap(r);this._sync.add(s)}),t)}register(e,t){if(this._registeredMap.has(e))return;const r=typeof t=="string"?this._unwrapResult(this.context.evalCode(t)):t;C(this.context,r,this.context.undefined)||(typeof t=="string"&&this._registeredMapDispose.add(e),this._registeredMap.set(e,r))}registerAll(e){for(const[t,r]of e)this.register(t,r)}unregister(e,t){this._registeredMap.delete(e,this._registeredMapDispose.has(e)||t),this._registeredMapDispose.delete(e)}unregisterAll(e,t){for(const r of e)this.unregister(r,t)}startSync(e){if(!g(e))return;const t=this._unwrap(e);this._sync.add(t)}endSync(e){this._sync.delete(this._unwrap(e))}_unwrapResult(e){if("value"in e)return e.value;throw this._unwrapIfNotSynced(e.error.consume(this._unmarshal))}_unwrapResultAndUnmarshal(e){if(e)return this._unwrapIfNotSynced(this._unwrapResult(e).consume(this._unmarshal))}_register(e,t,r=this._map,s){if(this._registeredMap.has(e)||this._registeredMap.hasHandle(t))return;let o=this._wrap(e);const[i]=this._wrapHandle(t),a=e instanceof Promise;if(!i||!o&&!a)return;a&&(o=e);const u=this._unwrap(e),[p,l]=this._unwrapHandle(t);if(r.set(o,i,u,p))s&&this._sync.add(u);else throw l&&p.dispose(),new Error("already registered");return[o,i]}_wrap(e){var t;return de(this.context,e,this._symbol,this._symbolHandle,this._marshal,this._syncMode,(t=this._options)==null?void 0:t.isWrappable)}_unwrap(e){return P(e,this._symbol)}_wrapHandle(e){var t;return me(this.context,e,this._symbol,this._symbolHandle,this._unmarshal,this._syncMode,(t=this._options)==null?void 0:t.isHandleWrappable)}_unwrapHandle(e){return R(this.context,e,this._symbolHandle)}}m.Arena=ye,m.VMMap=M,m.call=_,m.complexity=Z,m.consumeAll=z,m.defaultRegisteredObjects=k,m.eq=C,m.isES2015Class=N,m.isHandleObject=F,m.isObject=g,m.json=H,m.marshal=E,m.unmarshal=B,m.walkObject=O,Object.defineProperty(m,Symbol.toStringTag,{value:"Module"})}));
+        }`,void 0,e,r,l),!0])}function P(n,e){var t;return g(n)&&(t=n[e])!=null?t:n}function R(n,e,t){return T(n,e,t)?[n.getProp(e,t),!0]:[e,!1]}function me(n,e){return g(n)&&!!n[e]}function T(n,e,t){return!!n.dump(_(n,'(a, s) => (a instanceof Promise) || (a instanceof Date) || (typeof a === "object" && a !== null || typeof a === "function") && !!a[s]',void 0,e,t))}class he{constructor(e,t){c(this,"context");c(this,"_map");c(this,"_registeredMap");c(this,"_registeredMapDispose",new Set);c(this,"_sync",new Set);c(this,"_temporalSync",new Set);c(this,"_symbol",Symbol());c(this,"_symbolHandle");c(this,"_options");c(this,"_isMarshalable",e=>{var r,s;const t=(r=this._options)==null?void 0:r.isMarshalable;return(s=typeof t=="function"?t(this._unwrap(e)):t)!=null?s:"json"});c(this,"_marshalFind",e=>{var s,o,i;const t=this._unwrap(e);return(i=(o=(s=this._registeredMap.get(e))!=null?s:t!==e?this._registeredMap.get(t):void 0)!=null?o:this._map.get(e))!=null?i:t!==e?this._map.get(t):void 0});c(this,"_marshalPre",(e,t,r)=>{var s;if(r!=="json")return(s=this._register(e,V(t),this._map))==null?void 0:s[1]});c(this,"_marshalPreApply",(e,t,r)=>{const s=g(t)?this._unwrap(t):void 0;s&&this._temporalSync.add(s);try{return e.apply(t,r)}finally{s&&this._temporalSync.delete(s)}});c(this,"_marshal",e=>{var s,o;const t=this._registeredMap.get(e);if(t)return[t,!1];const r=E((s=this._wrap(e))!=null?s:e,{ctx:this.context,unmarshal:this._unmarshal,isMarshalable:this._isMarshalable,find:this._marshalFind,pre:this._marshalPre,preApply:this._marshalPreApply,custom:(o=this._options)==null?void 0:o.customMarshaller});return[r,!this._map.hasHandle(r)]});c(this,"_preUnmarshal",(e,t)=>{var r;return(r=this._register(e,t,void 0,!0))==null?void 0:r[0]});c(this,"_unmarshalFind",e=>{var t;return(t=this._registeredMap.getByHandle(e))!=null?t:this._map.getByHandle(e)});c(this,"_unmarshal",e=>{var s;const t=this._registeredMap.getByHandle(e);if(typeof t!="undefined")return t;const[r]=this._wrapHandle(e);return D(r!=null?r:e,{ctx:this.context,marshal:this._marshal,find:this._unmarshalFind,pre:this._preUnmarshal,custom:(s=this._options)==null?void 0:s.customUnmarshaller})});c(this,"_syncMode",e=>{const t=this._unwrap(e);return this._sync.has(t)||this._temporalSync.has(t)?"both":void 0});c(this,"_unwrapIfNotSynced",e=>{const t=this._unwrap(e);return t instanceof Promise||!this._sync.has(t)?t:e});var r;t!=null&&t.compat&&!("runtime"in e)&&(e.runtime={hasPendingJob:()=>e.hasPendingJob(),executePendingJobs:s=>e.executePendingJobs(s)}),this.context=t!=null&&t.experimentalContextEx?v(e):e,this._options=t,this._symbolHandle=e.unwrapResult(e.evalCode("Symbol()")),this._map=new M(e),this._registeredMap=new M(e),this.registerAll((r=t==null?void 0:t.registeredObjects)!=null?r:k)}dispose(){var e,t;this._map.dispose(),this._registeredMap.dispose(),this._symbolHandle.dispose(),(t=(e=this.context).disposeEx)==null||t.call(e)}evalCode(e){const t=this.context.evalCode(e);return this._unwrapResultAndUnmarshal(t)}evalModule(e,t="module.js"){const r=this.context.evalCode(e,t,{type:"module"});return this._unwrapResultAndUnmarshal(r)}executePendingJobs(e){const t=this.context.runtime.executePendingJobs(e);if("value"in t)return t.value;throw this._unwrapIfNotSynced(t.error.consume(this._unmarshal))}setMemoryLimit(e){this.context.runtime.setMemoryLimit(e)}setMaxStackSize(e){this.context.runtime.setMaxStackSize(e)}getMemoryUsage(){const e=this.context.runtime.computeMemoryUsage();try{return this.context.dump(e)}finally{e.dispose()}}dumpMemoryUsage(){return this.context.runtime.dumpMemoryUsage()}expose(e){for(const[t,r]of Object.entries(e))z(this._marshal(r),s=>{this.context.setProp(this.context.global,t,s)})}sync(e){const t=this._wrap(e);return typeof t=="undefined"?e:(O(t,r=>{const s=this._unwrap(r);this._sync.add(s)}),t)}register(e,t){if(this._registeredMap.has(e))return;const r=typeof t=="string"?this._unwrapResult(this.context.evalCode(t)):t;this.context.sameValue(r,this.context.undefined)||(typeof t=="string"&&this._registeredMapDispose.add(e),this._registeredMap.set(e,r))}registerAll(e){for(const[t,r]of e)this.register(t,r)}unregister(e,t){this._registeredMap.delete(e,this._registeredMapDispose.has(e)||t),this._registeredMapDispose.delete(e)}unregisterAll(e,t){for(const r of e)this.unregister(r,t)}startSync(e){if(!g(e))return;const t=this._unwrap(e);this._sync.add(t)}endSync(e){this._sync.delete(this._unwrap(e))}_unwrapResult(e){if("value"in e)return e.value;throw this._unwrapIfNotSynced(e.error.consume(this._unmarshal))}_unwrapResultAndUnmarshal(e){if(e)return this._unwrapIfNotSynced(this._unwrapResult(e).consume(this._unmarshal))}_register(e,t,r=this._map,s){if(this._registeredMap.has(e)||this._registeredMap.hasHandle(t))return;let o=this._wrap(e);const[i]=this._wrapHandle(t),a=e instanceof Promise;if(!i||!o&&!a)return;a&&(o=e);const u=this._unwrap(e),[p,l]=this._unwrapHandle(t);if(r.set(o,i,u,p))s&&this._sync.add(u);else throw l&&p.dispose(),new Error("already registered");return[o,i]}_wrap(e){var t;return le(this.context,e,this._symbol,this._symbolHandle,this._marshal,this._syncMode,(t=this._options)==null?void 0:t.isWrappable)}_unwrap(e){return P(e,this._symbol)}_wrapHandle(e){var t;return de(this.context,e,this._symbol,this._symbolHandle,this._unmarshal,this._syncMode,(t=this._options)==null?void 0:t.isHandleWrappable)}_unwrapHandle(e){return R(this.context,e,this._symbolHandle)}}m.Arena=he,m.VMMap=M,m.call=_,m.complexity=Y,m.consumeAll=W,m.defaultRegisteredObjects=k,m.isES2015Class=H,m.isHandleObject=C,m.isObject=g,m.json=F,m.marshal=E,m.unmarshal=D,m.walkObject=O,Object.defineProperty(m,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "quickjs-emscripten-sync",
   "author": "rot1024",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "license": "MIT",
+  "type": "module",
   "source": "./src/index.ts",
   "main": "./dist/quickjs-emscripten-sync.umd.js",
   "module": "./dist/quickjs-emscripten-sync.mjs",
@@ -31,14 +32,14 @@
     "quickjs-emscripten": "*"
   },
   "devDependencies": {
-    "@vitest/coverage-c8": "^0.28.5",
-    "eslint": "^8.57.1",
-    "eslint-config-reearth": "^0.2.1",
-    "prettier": "^2.8.8",
-    "quickjs-emscripten": "^0.29.0",
-    "typescript": "^5.7.2",
-    "vite": "^6.0.3",
+    "@vitest/coverage-v8": "^4.0.18",
+    "eslint": "^9.39.2",
+    "eslint-config-reearth": "^0.3.8",
+    "prettier": "^3.8.1",
+    "quickjs-emscripten": "^0.31.0",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.1",
     "vite-plugin-dts": "^4.3.0",
-    "vitest": "^0.28.5"
+    "vitest": "^4.0.18"
   }
 }

package/src/edge.test.ts

@@ -44,27 +44,31 @@ describe("edge cases", () => {
     // ctx.dispose(); // reports an error
   });
 
-  test("many newFunction", async () => {
-    const rt = (await getQuickJS()).newRuntime();
-    const ctx = rt.newContext();
-    const arena = new Arena(ctx, {
-      isMarshalable: true,
-      // enable this option to solve this problem
-      experimentalContextEx: true,
-    });
+  test(
+    "many newFunction",
+    async () => {
+      const rt = (await getQuickJS()).newRuntime();
+      const ctx = rt.newContext();
+      const arena = new Arena(ctx, {
+        isMarshalable: true,
+        // enable this option to solve this problem
+        experimentalContextEx: true,
+      });
 
-    arena.expose({
-      hoge: () => {},
-    });
-    // should have an object as an arg
-    const fn = arena.evalCode(`() => { hoge([]); }`);
-    // error happens from 3926 times
-    for (let i = 0; i < 10000; i++) {
-      fn();
-    }
+      arena.expose({
+        hoge: () => {},
+      });
+      // should have an object as an arg
+      const fn = arena.evalCode(`() => { hoge([]); }`);
+      // error happens from 3926 times
+      for (let i = 0; i < 10000; i++) {
+        fn();
+      }
 
-    arena.dispose();
-    ctx.dispose();
-    rt.dispose();
-  });
+      arena.dispose();
+      ctx.dispose();
+      rt.dispose();
+    },
+    90000,
+  );
 });

package/src/index.ts

@@ -13,7 +13,7 @@ import marshal from "./marshal";
 import unmarshal from "./unmarshal";
 import { complexity, isES2015Class, isObject, walkObject } from "./util";
 import VMMap from "./vmmap";
-import { call, eq, isHandleObject, json, consumeAll, mayConsume, handleFrom } from "./vmutil";
+import { call, isHandleObject, json, consumeAll, mayConsume, handleFrom } from "./vmutil";
 import { wrap, wrapHandle, unwrap, unwrapHandle, Wrapped } from "./wrapper";
 
 export {
@@ -26,7 +26,6 @@ export {
   isObject,
   walkObject,
   call,
-  eq,
   isHandleObject,
   json,
   consumeAll,
@@ -63,9 +62,9 @@ export class Arena {
   context: QuickJSContextEx;
   _map: VMMap;
   _registeredMap: VMMap;
-  _registeredMapDispose: Set<any> = new Set();
-  _sync: Set<any> = new Set();
-  _temporalSync: Set<any> = new Set();
+  _registeredMapDispose = new Set<any>();
+  _sync = new Set<any>();
+  _temporalSync = new Set<any>();
   _symbol = Symbol();
   _symbolHandle: QuickJSHandle;
   _options?: Options;
@@ -75,7 +74,7 @@ export class Arena {
     if (options?.compat && !("runtime" in ctx)) {
       (ctx as any).runtime = {
         hasPendingJob: () => (ctx as any).hasPendingJob(),
-        executePendingJobs: (maxJobsToExecute?: number | void) =>
+        executePendingJobs: (maxJobsToExecute?: number | undefined) =>
           (ctx as any).executePendingJobs(maxJobsToExecute),
       };
     }
@@ -275,7 +274,7 @@ export class Arena {
    * By default, exposed objects are not synchronized between the host and the VM.
    * If you want to sync an objects, first wrap the object with sync method, and then expose the wrapped object.
    */
-  expose(obj: { [k: string]: any }) {
+  expose(obj: Record<string, any>) {
     for (const [key, value] of Object.entries(obj)) {
       mayConsume(this._marshal(value), handle => {
         this.context.setProp(this.context.global, key, handle);
@@ -309,7 +308,7 @@ export class Arena {
       typeof handleOrCode === "string"
         ? this._unwrapResult(this.context.evalCode(handleOrCode))
         : handleOrCode;
-    if (eq(this.context, handle, this.context.undefined)) return;
+    if (this.context.sameValue(handle, this.context.undefined)) return;
     if (typeof handleOrCode === "string") {
       this._registeredMapDispose.add(target);
     }
@@ -388,7 +387,7 @@ export class Arena {
     return this._register(t, handleFrom(h), this._map)?.[1];
   };
 
-  _marshalPreApply = (target: Function, that: unknown, args: unknown[]): void => {
+  _marshalPreApply = (target: (...args: any[]) => any, that: unknown, args: unknown[]): void => {
     const unwrapped = isObject(that) ? this._unwrap(that) : undefined;
     // override sync mode of this object while calling the function
     if (unwrapped) this._temporalSync.add(unwrapped);

package/src/marshal/function.test.ts

@@ -1,7 +1,7 @@
 import { getQuickJS, QuickJSHandle } from "quickjs-emscripten";
 import { expect, test, vi } from "vitest";
 
-import { json, eq, call } from "../vmutil";
+import { json, call } from "../vmutil";
 
 import marshalFunction from "./function";
 
@@ -9,7 +9,7 @@ test("normal func", async () => {
   const ctx = (await getQuickJS()).newContext();
 
   const marshal = vi.fn(v => json(ctx, v));
-  const unmarshal = vi.fn(v => (eq(ctx, v, ctx.global) ? undefined : ctx.dump(v)));
+  const unmarshal = vi.fn(v => (ctx.sameValue(v, ctx.global) ? undefined : ctx.dump(v)));
   const preMarshal = vi.fn((_, a) => a);
   const innerfn = vi.fn((..._args: any[]) => "hoge");
   const fn = (...args: any[]) => innerfn(...args);
@@ -116,7 +116,7 @@ test("preApply", async () => {
     return ctx.null;
   };
   const unmarshal = (v: QuickJSHandle) => (ctx.typeof(v) === "object" ? that : ctx.dump(v));
-  const preApply = vi.fn((a: Function, b: any, c: any[]) => a.apply(b, c) + "!");
+  const preApply = vi.fn((a: (...args: any[]) => any, b: any, c: any[]) => a.apply(b, c) + "!");
   const that = {};
   const thatHandle = ctx.newObject();
 

package/src/marshal/function.ts

@@ -11,7 +11,7 @@ export default function marshalFunction(
   marshal: (target: unknown) => QuickJSHandle,
   unmarshal: (handle: QuickJSHandle) => unknown,
   preMarshal: (target: unknown, handle: QuickJSHandle) => QuickJSHandle | undefined,
-  preApply?: (target: Function, thisArg: unknown, args: unknown[]) => any,
+  preApply?: (target: (...args: any[]) => any, thisArg: unknown, args: unknown[]) => any,
 ): QuickJSHandle | undefined {
   if (typeof target !== "function") return;
 
@@ -29,7 +29,7 @@ export default function marshalFunction(
         return this;
       }
 
-      return marshal(preApply ? preApply(target, that, args) : target.apply(that, args));
+      return marshal(preApply ? preApply(target as (...args: any[]) => any, that, args) : (target as (...args: any[]) => any).apply(that, args));
     })
     .consume(handle2 =>
       // fucntions created by vm.newFunction are not callable as a class constrcutor

package/src/marshal/index.ts

@@ -17,7 +17,7 @@ export type Options = {
     handle: QuickJSHandle | QuickJSDeferredPromise,
     mode: true | "json" | undefined,
   ) => QuickJSHandle | undefined;
-  preApply?: (target: Function, thisArg: unknown, args: unknown[]) => any;
+  preApply?: (target: (...args: any[]) => any, thisArg: unknown, args: unknown[]) => any;
   custom?: Iterable<(obj: unknown, ctx: QuickJSContext) => QuickJSHandle | undefined>;
 };
 

package/src/marshal/primitive.test.ts

@@ -1,7 +1,6 @@
 import { getQuickJS } from "quickjs-emscripten";
 import { expect, test } from "vitest";
 
-import { eq } from "../vmutil";
 
 import marshalPrimitive from "./primitive";
 
@@ -12,12 +11,11 @@ test("works", async () => {
   expect(marshalPrimitive(ctx, null)).toBe(ctx.null);
   expect(marshalPrimitive(ctx, false)).toBe(ctx.false);
   expect(marshalPrimitive(ctx, true)).toBe(ctx.true);
-  expect(eq(ctx, marshalPrimitive(ctx, 1) ?? ctx.undefined, ctx.newNumber(1))).toBe(true);
-  expect(eq(ctx, marshalPrimitive(ctx, -100) ?? ctx.undefined, ctx.newNumber(-100))).toBe(true);
-  expect(eq(ctx, marshalPrimitive(ctx, "hoge") ?? ctx.undefined, ctx.newString("hoge"))).toBe(true);
+  expect(ctx.sameValue(marshalPrimitive(ctx, 1) ?? ctx.undefined, ctx.newNumber(1))).toBe(true);
+  expect(ctx.sameValue(marshalPrimitive(ctx, -100) ?? ctx.undefined, ctx.newNumber(-100))).toBe(true);
+  expect(ctx.sameValue(marshalPrimitive(ctx, "hoge") ?? ctx.undefined, ctx.newString("hoge"))).toBe(true);
   // expect(
-  //   eq(
-  //     ctx,
+  //   ctx.sameValue(
   //     marshalPrimitive(ctx, BigInt(1)) ?? ctx.undefined,
   //     ctx.unwrapResult(ctx.evalCode("BigInt(1)"))
   //   )

package/src/marshal/properties.ts

@@ -4,7 +4,7 @@ import { call } from "../vmutil";
 
 export default function marshalProperties(
   ctx: QuickJSContext,
-  target: object | Function,
+  target: object | ((...args: any[]) => any),
   handle: QuickJSHandle,
   marshal: (target: unknown) => QuickJSHandle,
 ): void {

package/src/unmarshal/function.ts

@@ -11,7 +11,7 @@ export default function unmarshalFunction(
   marshal: (value: unknown) => [QuickJSHandle, boolean],
   unmarshal: (handle: QuickJSHandle) => [unknown, boolean],
   preUnmarshal: <T>(target: T, handle: QuickJSHandle) => T | undefined,
-): Function | undefined {
+): ((...args: any[]) => any) | undefined {
   if (ctx.typeof(handle) !== "function") return;
 
   const raw = function (this: any, ...args: any[]) {

package/src/unmarshal/promise.test.ts

@@ -31,9 +31,9 @@ const testPromise = (reject: boolean) => async () => {
   expect(ctx.runtime.hasPendingJob()).toBe(true);
   expect(ctx.unwrapResult(ctx.runtime.executePendingJobs())).toBe(1);
   if (reject) {
-    expect(promise).rejects.toThrow("hoge");
+    await expect(promise).rejects.toThrow("hoge");
   } else {
-    expect(promise).resolves.toBe("hoge");
+    await expect(promise).resolves.toBe("hoge");
   }
 
   disposables.forEach(d => d.dispose());

package/src/unmarshal/properties.ts

@@ -5,7 +5,7 @@ import { call } from "../vmutil";
 export default function unmarshalProperties(
   ctx: QuickJSContext,
   handle: QuickJSHandle,
-  target: object | Function,
+  target: object | ((...args: any[]) => any),
   unmarshal: (handle: QuickJSHandle) => [unknown, boolean],
 ) {
   ctx

package/src/util.test.ts

@@ -55,12 +55,12 @@ test("complexity", () => {
   expect(complexity({ a: {} }, 1)).toBe(1);
 });
 
-test("newDeferred", () => {
+test("newDeferred", async () => {
   const deferred = newDeferred();
   deferred.resolve("foo");
-  expect(deferred.promise).resolves.toBe("foo");
+  await expect(deferred.promise).resolves.toBe("foo");
 
   const deferred2 = newDeferred();
   deferred2.reject("bar");
-  expect(deferred2.promise).rejects.toBe("bar");
+  await expect(deferred2.promise).rejects.toBe("bar");
 });

package/src/util.ts

@@ -2,12 +2,13 @@ export function isES2015Class(cls: any): cls is new (...args: any[]) => any {
   return typeof cls === "function" && /^class\s/.test(Function.prototype.toString.call(cls));
 }
 
-export function isObject(value: any): value is object | Function {
+export function isObject(value: any): value is object | ((...args: any[]) => any) {
   return typeof value === "function" || (typeof value === "object" && value !== null);
 }
 
 export function walkObject(
   value: any,
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   callback?: (target: any, set: Set<any>) => boolean | void,
 ): Set<any> {
   const set = new Set<any>();

package/src/vmmap.ts

@@ -2,12 +2,12 @@ import type { QuickJSContext, QuickJSHandle } from "quickjs-emscripten";
 
 export default class VMMap {
   ctx: QuickJSContext;
-  _map1: Map<any, number> = new Map();
-  _map2: Map<any, number> = new Map();
-  _map3: Map<number, QuickJSHandle> = new Map();
-  _map4: Map<number, QuickJSHandle> = new Map();
-  _counterMap: Map<number, any> = new Map();
-  _disposables: Set<QuickJSHandle> = new Set();
+  _map1 = new Map<any, number>();
+  _map2 = new Map<any, number>();
+  _map3 = new Map<number, QuickJSHandle>();
+  _map4 = new Map<number, QuickJSHandle>();
+  _counterMap = new Map<number, any>();
+  _disposables = new Set<QuickJSHandle>();
   _mapGet: QuickJSHandle;
   _mapSet: QuickJSHandle;
   _mapDelete: QuickJSHandle;
@@ -226,7 +226,7 @@ export default class VMMap {
     const keys = this._map1.keys();
     return {
       next: () => {
-        // eslint-disable-next-line no-constant-condition
+         
         while (true) {
           const k1 = keys.next();
           if (k1.done) return { value: undefined, done: true };

package/src/vmutil.test.ts

@@ -5,7 +5,6 @@ import {
   fn,
   call,
   consumeAll,
-  eq,
   instanceOf,
   isHandleObject,
   json,
@@ -57,8 +56,8 @@ test("eq", async () => {
   const math2 = ctx.unwrapResult(ctx.evalCode("Math"));
   const obj = ctx.newObject();
   expect(math1 === math2).toBe(false);
-  expect(eq(ctx, math1, math2)).toBe(true);
-  expect(eq(ctx, math1, obj)).toBe(false);
+  expect(ctx.sameValue(math1, math2)).toBe(true);
+  expect(ctx.sameValue(math1, obj)).toBe(false);
 
   math1.dispose();
   math2.dispose();

package/src/vmutil.ts

@@ -37,10 +37,6 @@ export function call(
   }
 }
 
-export function eq(ctx: QuickJSContext, a: QuickJSHandle, b: QuickJSHandle): boolean {
-  return ctx.dump(call(ctx, "Object.is", undefined, a, b));
-}
-
 export function instanceOf(ctx: QuickJSContext, a: QuickJSHandle, b: QuickJSHandle): boolean {
   return ctx.dump(call(ctx, "(a, b) => a instanceof b", undefined, a, b));
 }

package/src/wrapper.test.ts

@@ -1,7 +1,7 @@
 import { QuickJSHandle, getQuickJS } from "quickjs-emscripten";
 import { expect, test, vi } from "vitest";
 
-import { call, eq, json } from "./vmutil";
+import { call, json } from "./vmutil";
 import {
   wrap,
   unwrap,
@@ -183,7 +183,7 @@ test("wrapHandle, unwrapHandle, isHandleWrapped", async () => {
   const [handle2, unwrapped2] = unwrapHandle(ctx, wrapped, proxyKeySymbolHandle);
   expect(unwrapped2).toBe(true);
   handle2.consume(h => {
-    expect(eq(ctx, handle, h)).toBe(true);
+    expect(ctx.sameValue(handle, h)).toBe(true);
   });
 
   const [wrapped2] = wrapHandle(
@@ -214,7 +214,7 @@ test("wrapHandle without sync", async () => {
   const proxyKeySymbol = Symbol();
   const proxyKeySymbolHandle = ctx.unwrapResult(ctx.evalCode(`Symbol()`));
   const unmarshal = vi.fn((h: QuickJSHandle) =>
-    wrapped && eq(ctx, h, wrapped) ? target : ctx.dump(h),
+    wrapped && ctx.sameValue(h, wrapped) ? target : ctx.dump(h),
   );
   const syncMode = vi.fn();
 
@@ -253,7 +253,7 @@ test("wrapHandle with both sync", async () => {
   const proxyKeySymbol = Symbol();
   const proxyKeySymbolHandle = ctx.unwrapResult(ctx.evalCode(`Symbol()`));
   const unmarshal = vi.fn((h: QuickJSHandle) => {
-    return wrapped && eq(ctx, h, wrapped) ? target : ctx.dump(h);
+    return wrapped && ctx.sameValue(h, wrapped) ? target : ctx.dump(h);
   });
   const syncMode = vi.fn((): SyncMode => "both");
 
@@ -303,7 +303,7 @@ test("wrapHandle with host sync", async () => {
   const proxyKeySymbol = Symbol();
   const proxyKeySymbolHandle = ctx.unwrapResult(ctx.evalCode(`Symbol()`));
   const unmarshal = vi.fn((handle: QuickJSHandle) =>
-    wrapped && eq(ctx, handle, wrapped) ? target : ctx.dump(handle),
+    wrapped && ctx.sameValue(handle, wrapped) ? target : ctx.dump(handle),
   );
   const syncMode = vi.fn((): SyncMode => "host");
 
@@ -352,7 +352,7 @@ test("wrap and wrapHandle", async () => {
     false,
   ]);
   const unmarshal = vi.fn((handle: QuickJSHandle) =>
-    wrappedHandle && eq(ctx, handle, wrappedHandle) ? wrapped : ctx.dump(handle),
+    wrappedHandle && ctx.sameValue(handle, wrappedHandle) ? wrapped : ctx.dump(handle),
   );
   const syncMode = vi.fn((): SyncMode => "both");
 

package/src/wrapper.ts

@@ -105,7 +105,7 @@ export function wrapHandle(
     const target = unmarshal(h);
     if (!target) return;
     const key = unmarshal(keyHandle);
-    delete unwrap(target, proxyKeySymbol)[key];
+    Reflect.deleteProperty(unwrap(target, proxyKeySymbol), key);
   };
 
   return ctx