quickjs-emscripten-sync 1.1.0 → 1.4.0

package/src/util.ts

@@ -51,3 +51,18 @@ export function walkObject(
 export function complexity(value: any, max?: number): number {
   return walkObject(value, max ? (_, set) => set.size < max : undefined).size;
 }
+
+export function newDeferred<T = unknown>() {
+  let res: (v: T | PromiseLike<T>) => void = () => {};
+  let rej: (v: T | PromiseLike<T>) => void = () => {};
+  const promise = new Promise<T>((resolve, reject) => {
+    res = resolve;
+    rej = reject;
+  });
+
+  return {
+    promise,
+    resolve: res,
+    reject: rej,
+  };
+}

package/src/vmmap.test.ts

@@ -1,29 +1,28 @@
 import { getQuickJS } from "quickjs-emscripten";
+import { expect, test } from "vitest";
+
 import VMMap from "./vmmap";
 import { call } from "./vmutil";
 
 test("init and dispose", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
-
-  const map = new VMMap(vm);
+  const ctx = (await getQuickJS()).newContext();
+  const map = new VMMap(ctx);
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("get and set", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
-  const handle = vm.newObject();
+  const handle = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   expect(map.get(target)).toBe(undefined);
   expect(map.set(target, handle)).toBe(true);
   expect(map.get(target)).toBe(handle);
   // a new handle that points to the same value
-  const handle2 = call(vm, `a => a`, undefined, handle);
+  const handle2 = call(ctx, `a => a`, undefined, handle);
   expect(map.set(target, handle2)).toBe(false);
 
   handle2.dispose();
@@ -31,18 +30,17 @@ test("get and set", async () => {
   expect(map.get(target)).toBe(undefined);
 
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("getByHandle", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   expect(map.getByHandle(handle)).toBe(undefined);
   map.set(target, handle);
   expect(map.getByHandle(handle)).toBe(target);
@@ -52,17 +50,35 @@ test("getByHandle", async () => {
 
   handle2.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
+});
+
+test("keys", async () => {
+  const ctx = (await getQuickJS()).newContext();
+
+  const target = {};
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
+
+  const map = new VMMap(ctx);
+  expect(Array.from(map.keys())).toEqual([]);
+  map.set(target, handle);
+  expect(Array.from(map.keys())).toEqual([target]);
+  handle.dispose();
+  expect(Array.from(map.keys())).toEqual([target]);
+
+  handle2.dispose();
+  map.dispose();
+  ctx.dispose();
 });
 
 test("delete", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
-  const handle = vm.newObject();
+  const handle = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   map.set(target, handle);
   expect(map.get(target)).toBe(handle);
   map.delete({});
@@ -72,17 +88,16 @@ test("delete", async () => {
 
   handle.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("size", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
-  const handle = vm.newObject();
+  const handle = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   expect(map.size).toBe(0);
   map.set(target, handle);
   expect(map.size).toBe(1);
@@ -90,17 +105,16 @@ test("size", async () => {
   expect(map.size).toBe(1);
 
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("clear", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
-  const handle = vm.newObject();
+  const handle = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   map.set(target, handle);
   expect(map.size).toBe(1);
   expect(map.get(target)).toBe(handle);
@@ -110,20 +124,19 @@ test("clear", async () => {
 
   handle.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("merge", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
-  const map2 = new VMMap(vm);
+  const map = new VMMap(ctx);
+  const map2 = new VMMap(ctx);
   map.set(target, handle, target2, handle2);
   expect(map.size).toBe(1);
   expect(map.get(target)).toBe(handle);
@@ -137,19 +150,18 @@ test("merge", async () => {
   map.clear();
   map.dispose();
   map2.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("iterator", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   map.set(target, handle, target2, handle2);
 
   const iter = map[Symbol.iterator]();
@@ -174,20 +186,19 @@ test("iterator", async () => {
   expect(i).toBe(1);
 
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("get and set 2", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
-  const handle3 = call(vm, `a => a`, undefined, handle);
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
+  const handle3 = call(ctx, `a => a`, undefined, handle);
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
 
   map.set(target, handle, target2, handle2);
   expect(map.get(target)).toBe(handle);
@@ -206,19 +217,18 @@ test("get and set 2", async () => {
   expect(map.getByHandle(handle2)).toBe(undefined);
 
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("delete 2", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
 
   map.set(target, handle, target2, handle2);
   expect(map.get(target)).toBe(handle);
@@ -236,19 +246,18 @@ test("delete 2", async () => {
   handle.dispose();
   handle2.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("delete 3", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
 
   map.set(target, handle, target2, handle2);
   expect(map.get(target)).toBe(handle);
@@ -266,19 +275,18 @@ test("delete 3", async () => {
   handle.dispose();
   handle2.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("delete with dispose", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   map.set(target, handle, target2, handle2);
   map.delete(target, true);
 
@@ -286,19 +294,18 @@ test("delete with dispose", async () => {
   expect(handle2.alive).toBe(false);
 
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("deleteByHandle", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   map.set(target, handle, target2, handle2);
 
   expect(map.getByHandle(handle)).toBe(target);
@@ -312,19 +319,18 @@ test("deleteByHandle", async () => {
   handle.dispose();
   handle2.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("deleteByHandle with dispose", async () => {
-  const quickjs = await getQuickJS();
-  const vm = quickjs.createVm();
+  const ctx = (await getQuickJS()).newContext();
 
   const target = {};
   const target2 = {};
-  const handle = vm.newObject();
-  const handle2 = vm.newObject();
+  const handle = ctx.newObject();
+  const handle2 = ctx.newObject();
 
-  const map = new VMMap(vm);
+  const map = new VMMap(ctx);
   map.set(target, handle, target2, handle2);
   map.deleteByHandle(handle, true);
 
@@ -332,5 +338,5 @@ test("deleteByHandle with dispose", async () => {
   expect(handle2.alive).toBe(false);
 
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });

package/src/vmmap.ts

@@ -1,7 +1,7 @@
-import { QuickJSVm, QuickJSHandle } from "quickjs-emscripten";
+import type { QuickJSContext, QuickJSHandle } from "quickjs-emscripten";
 
 export default class VMMap {
-  vm: QuickJSVm;
+  ctx: QuickJSContext;
   _map1: Map<any, number> = new Map();
   _map2: Map<any, number> = new Map();
   _map3: Map<number, QuickJSHandle> = new Map();
@@ -14,12 +14,12 @@ export default class VMMap {
   _mapClear: QuickJSHandle;
   _counter = 0;
 
-  constructor(vm: QuickJSVm) {
-    this.vm = vm;
+  constructor(ctx: QuickJSContext) {
+    this.ctx = ctx;
 
-    const result = vm
+    const result = ctx
       .unwrapResult(
-        vm.evalCode(`() => {
+        ctx.evalCode(`() => {
         const mapSym = new Map();
         let map = new WeakMap();
         let map2 = new WeakMap();
@@ -44,12 +44,12 @@ export default class VMMap {
         };
       }`)
       )
-      .consume(fn => this._call(fn, undefined));
+      .consume((fn) => this._call(fn, undefined));
 
-    this._mapGet = vm.getProp(result, "get");
-    this._mapSet = vm.getProp(result, "set");
-    this._mapDelete = vm.getProp(result, "delete");
-    this._mapClear = vm.getProp(result, "clear");
+    this._mapGet = ctx.getProp(result, "get");
+    this._mapSet = ctx.getProp(result, "set");
+    this._mapDelete = ctx.getProp(result, "delete");
+    this._mapClear = ctx.getProp(result, "clear");
 
     result.dispose();
 
@@ -84,13 +84,13 @@ export default class VMMap {
       }
     }
 
-    this.vm.newNumber(counter).consume(c => {
+    this.ctx.newNumber(counter).consume((c) => {
       this._call(
         this._mapSet,
         undefined,
         handle,
         c,
-        handle2 ?? this.vm.undefined
+        handle2 ?? this.ctx.undefined
       );
     });
 
@@ -132,7 +132,7 @@ export default class VMMap {
       return;
     }
     return this._counterMap.get(
-      this.vm.getNumber(this._call(this._mapGet, undefined, handle))
+      this.ctx.getNumber(this._call(this._mapGet, undefined, handle))
     );
   }
 
@@ -144,6 +144,10 @@ export default class VMMap {
     return typeof this.getByHandle(handle) !== "undefined";
   }
 
+  keys() {
+    return this._map1.keys();
+  }
+
   delete(key: any, dispose?: boolean) {
     const num = this._map1.get(key) ?? this._map2.get(key);
     if (typeof num === "undefined") return;
@@ -263,10 +267,10 @@ export default class VMMap {
     thisArg: QuickJSHandle | undefined,
     ...args: QuickJSHandle[]
   ) {
-    return this.vm.unwrapResult(
-      this.vm.callFunction(
+    return this.ctx.unwrapResult(
+      this.ctx.callFunction(
         fn,
-        typeof thisArg === "undefined" ? this.vm.undefined : thisArg,
+        typeof thisArg === "undefined" ? this.ctx.undefined : thisArg,
         ...args
       )
     );