quickjs-emscripten-sync 1.3.0 → 1.5.1

package/src/vmmap.test.ts

@@ -5,27 +5,24 @@ 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();
@@ -33,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);
@@ -54,18 +50,17 @@ test("getByHandle", async () => {
 
   handle2.dispose();
   map.dispose();
-  vm.dispose();
+  ctx.dispose();
 });
 
 test("keys", 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(Array.from(map.keys())).toEqual([]);
   map.set(target, handle);
   expect(Array.from(map.keys())).toEqual([target]);
@@ -74,17 +69,16 @@ test("keys", async () => {
 
   handle2.dispose();
   map.dispose();
-  vm.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({});
@@ -94,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);
@@ -112,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);
@@ -132,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);
@@ -159,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]();
@@ -196,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);
@@ -228,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);
@@ -258,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);
@@ -288,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);
 
@@ -308,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);
@@ -334,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);
 
@@ -354,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();
@@ -42,14 +42,14 @@ export default class VMMap {
             map2 = new WeakMap();
           }
         };
-      }`)
+      }`),
       )
-      .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();
 
@@ -59,12 +59,7 @@ export default class VMMap {
     this._disposables.add(this._mapClear);
   }
 
-  set(
-    key: any,
-    handle: QuickJSHandle,
-    key2?: any,
-    handle2?: QuickJSHandle
-  ): boolean {
+  set(key: any, handle: QuickJSHandle, key2?: any, handle2?: QuickJSHandle): boolean {
     if (!handle.alive || (handle2 && !handle2.alive)) return false;
 
     const v = this.get(key) ?? this.get(key2);
@@ -84,14 +79,8 @@ export default class VMMap {
       }
     }
 
-    this.vm.newNumber(counter).consume((c) => {
-      this._call(
-        this._mapSet,
-        undefined,
-        handle,
-        c,
-        handle2 ?? this.vm.undefined
-      );
+    this.ctx.newNumber(counter).consume(c => {
+      this._call(this._mapSet, undefined, handle, c, handle2 ?? this.ctx.undefined);
     });
 
     return true;
@@ -103,7 +92,7 @@ export default class VMMap {
           | [any, QuickJSHandle | undefined]
           | [any, QuickJSHandle | undefined, any, QuickJSHandle | undefined]
         >
-      | undefined
+      | undefined,
   ) {
     if (!iteratable) return;
     for (const iter of iteratable) {
@@ -131,9 +120,7 @@ export default class VMMap {
     if (!handle.alive) {
       return;
     }
-    return this._counterMap.get(
-      this.vm.getNumber(this._call(this._mapGet, undefined, handle))
-    );
+    return this._counterMap.get(this.ctx.getNumber(this._call(this._mapGet, undefined, handle)));
   }
 
   has(key: any) {
@@ -157,7 +144,7 @@ export default class VMMap {
     this._call(
       this._mapDelete,
       undefined,
-      ...[handle, handle2].filter((h): h is QuickJSHandle => !!h?.alive)
+      ...[handle, handle2].filter((h): h is QuickJSHandle => !!h?.alive),
     );
 
     this._map1.delete(key);
@@ -235,12 +222,11 @@ export default class VMMap {
     return this._map1.size;
   }
 
-  [Symbol.iterator](): Iterator<
-    [any, QuickJSHandle, any, QuickJSHandle | undefined]
-  > {
+  [Symbol.iterator](): Iterator<[any, QuickJSHandle, any, QuickJSHandle | undefined]> {
     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 };
@@ -262,17 +248,13 @@ export default class VMMap {
     }
   }
 
-  _call(
-    fn: QuickJSHandle,
-    thisArg: QuickJSHandle | undefined,
-    ...args: QuickJSHandle[]
-  ) {
-    return this.vm.unwrapResult(
-      this.vm.callFunction(
+  _call(fn: QuickJSHandle, thisArg: QuickJSHandle | undefined, ...args: QuickJSHandle[]) {
+    return this.ctx.unwrapResult(
+      this.ctx.callFunction(
         fn,
-        typeof thisArg === "undefined" ? this.vm.undefined : thisArg,
-        ...args
-      )
+        typeof thisArg === "undefined" ? this.ctx.undefined : thisArg,
+        ...args,
+      ),
     );
   }
 }