update with new api

Author: Jack-Works

src/classic/worker.mjs

@@ -15,7 +15,6 @@ import {
   createTest262Intrinsics,
   importBundledTest262Harness,
   boostTest262Harness,
-  runJobQueue,
 } from '../../lib/engine262.mjs';
 
 postMessage({
@@ -67,36 +66,36 @@ addEventListener('message', ({ data }) => {
 
     const realm = new ManagedRealm({});
 
-    realm.scope(() => {
-      const print = CreateBuiltinFunction((args) => {
+    const pop = realm.pushTopContext();
+    const print = CreateBuiltinFunction((args) => {
+      postMessage({
+        type: 'console',
+        value: {
+          method: 'log',
+          values: args.map((a) => inspect(a)),
+        },
+      });
+      return Value.undefined;
+    }, 1, Value('print'), []);
+    skipDebugger(CreateDataProperty(realm.GlobalObject, Value('print'), print));
+
+    createConsole(realm, {
+      * default(method, args) {
         postMessage({
           type: 'console',
           value: {
-            method: 'log',
-            values: args.map((a) => inspect(a)),
+            method,
+            values: args.map((a, i) => {
+              if (i === 0 && a instanceof JSStringValue) {
+                return a.stringValue();
+              }
+              return inspect(a);
+            }),
           },
         });
-        return Value.undefined;
-      }, 1, Value('print'), []);
-      skipDebugger(CreateDataProperty(realm.GlobalObject, Value('print'), print));
-
-      createConsole(realm, {
-        * default(method, args) {
-          postMessage({
-            type: 'console',
-            value: {
-              method,
-              values: args.map((a, i) => {
-                if (i === 0 && a instanceof JSStringValue) {
-                  return a.stringValue();
-                }
-                return inspect(a);
-              }),
-            },
-          });
-        }
-      })
-    });
+      }
+    })
+    pop?.();
 
     postMessage({
       type: 'console',
@@ -134,11 +133,9 @@ addEventListener('message', ({ data }) => {
       }
     }
     if (state.get('mode') === 'script') {
-      result = realm.evaluateScript(code, { specifier: 'code.js' }, handleResult);
+      realm.evaluateScript(code, { specifier: 'code.js' }, handleResult);
     } else {
-      result = realm.evaluateModule(code, 'code.mjs', handleResult);
+      realm.evaluateModule(code, 'code.mjs', handleResult);
     }
-    if (!result) agent.resumeEvaluate({});
-    runJobQueue();
   }
 });

src/devtools/262_worker.mjs

@@ -4,12 +4,11 @@ import {
   Agent,
   ManagedRealm,
   createTest262Intrinsics,
-  evalQ,
+  X,
   boostTest262Harness,
   Get,
   Set,
   Value,
-  Realm,
   Throw,
   CreateBuiltinFunction,
   JSStringValue,
@@ -76,34 +75,32 @@ function recreateAgent(features, signal) {
     });
     agent.hostDefinedOptions.hostHooks ??= {};
     agent.hostDefinedOptions.hostHooks.HostLoadImportedModule = composeModuleLoaders([builtinLoader])
-    realm.scope(() => {
-      const defineModule = CreateBuiltinFunction(function* defineModule([specifier, source]) {
-        if (!(specifier instanceof JSStringValue)) {
-          return Throw.TypeError('specifier is not a string');
-        }
-        if (!(source instanceof JSStringValue)) {
-          return Throw.TypeError('source is not a string');
-        }
-        if (surroundingAgent.debugger_cannotPreview) {
-          return surroundingAgent.debugger_cannotPreview;
-        }
-        virtualModuleSourceCache.set(specifier.stringValue(), source.stringValue());
-        return Value.undefined;
-      }, 2, 'defineModule', ['SourceText']);
-      /** @type {import('../../lib/engine262.mjs').ECMAScriptFunctionObject} */ (/** @type {any} */ (defineModule)).SourceText = 'function defineModule(specifier, source) { [native code] }';
-      CreateNonEnumerableDataPropertyOrThrow(realm.GlobalObject, Value('defineModule'), defineModule);
-    });
+    const pop = realm.pushTopContext();
+    const defineModule = CreateBuiltinFunction(function* defineModule([specifier, source]) {
+      if (!(specifier instanceof JSStringValue)) {
+        return Throw.TypeError('specifier is not a string');
+      }
+      if (!(source instanceof JSStringValue)) {
+        return Throw.TypeError('source is not a string');
+      }
+      if (surroundingAgent.debugger_cannotPreview) {
+        return surroundingAgent.debugger_cannotPreview;
+      }
+      virtualModuleSourceCache.set(specifier.stringValue(), source.stringValue());
+      return Value.undefined;
+    }, 2, 'defineModule', ['SourceText']);
+    /** @type {import('../../lib/engine262.mjs').ECMAScriptFunctionObject} */ (/** @type {any} */ (defineModule)).SourceText = 'function defineModule(specifier, source) { [native code] }';
+    CreateNonEnumerableDataPropertyOrThrow(realm.GlobalObject, Value('defineModule'), defineModule);
+    pop?.();
   }
 
   if (features.includes('test262-harness')) {
     createTest262Intrinsics(realm, false, console.log);
     importBundledTest262Harness(realm);
-    evalQ((_Q, X) => {
-      realm.scope(() => {
-        const consoleTrace = X(Get(X(Get(realm.GlobalObject, Value('console'))), Value('trace')));
-        X(Set(realm.GlobalObject, Value('__consolePrintHandle__'), consoleTrace, Value.true));
-      });
-    });
+    const pop = realm.pushTopContext();
+    const consoleTrace = X(Get(X(Get(realm.GlobalObject, Value('console'))), Value('trace')));
+    X(Set(realm.GlobalObject, Value('__consolePrintHandle__'), consoleTrace, Value.true));
+    pop?.();
     boostTest262Harness(realm);
   }
 }