@agoric/xsnap 0.14.3-dev-4989f26.0 → 0.14.3-dev-779b73d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/xsnap",
-  "version": "0.14.3-dev-4989f26.0+4989f26",
+  "version": "0.14.3-dev-779b73d.0+779b73d",
   "description": "Description forthcoming.",
   "author": "Agoric",
   "license": "Apache-2.0",
@@ -26,9 +26,9 @@
     "test:xs": "exit 0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-4989f26.0+4989f26",
-    "@agoric/internal": "0.3.3-dev-4989f26.0+4989f26",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-4989f26.0+4989f26",
+    "@agoric/assert": "0.6.1-dev-779b73d.0+779b73d",
+    "@agoric/internal": "0.3.3-dev-779b73d.0+779b73d",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-779b73d.0+779b73d",
     "@endo/bundle-source": "^2.5.1",
     "@endo/eventual-send": "^0.17.2",
     "@endo/init": "^0.5.56",
@@ -59,5 +59,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "4989f26753580251326c40fd6a7a7e3b853aff01"
+  "gitHead": "779b73d11992c1e00cfe99bfe3444081107a34a1"
 }

package/src/avaAssertXS.js

@@ -1,5 +1,4 @@
 /* global globalThis */
-/* eslint-disable no-await-in-loop, @jessie.js/no-nested-await -- test code */
 /** global print */
 
 const { assign, freeze, keys } = Object;
@@ -300,6 +299,7 @@ function makeTester(htest, out) {
       expectation,
       message = `should reject like ${expectation}`,
     ) {
+      await null;
       try {
         await (typeof thrower === 'function' ? thrower() : thrower);
         assert(false, message);
@@ -310,6 +310,7 @@ function makeTester(htest, out) {
     },
     /** @type {(thrower: () => Promise<unknown>, message?: string) => Promise<void> } */
     async notThrowsAsync(nonThrower, message) {
+      await null;
       try {
         await (typeof nonThrower === 'function' ? nonThrower() : nonThrower);
       } catch (ex) {
@@ -335,6 +336,7 @@ const test = (label, run, htestOpt) => {
   htest.queue(label, async () => {
     const out = tapFormat(htest.send);
     const t = makeTester(htest, out);
+    await null;
     try {
       // out.diagnostic('start', label);
       await run(t);

package/src/avaXS.js

@@ -6,7 +6,6 @@ Usage:
 
 */
 
-/* eslint-disable no-await-in-loop, @jessie.js/no-nested-await -- test code */
 import '@endo/init';
 
 import fs from 'fs';
@@ -129,6 +128,7 @@ async function runTestScript(
       testNames = msg.testNames;
     }
 
+    await null;
     if ('bundleSource' in msg) {
       const [startFilename, ...rest] = msg.bundleSource;
       // see also makeBundleResolve() below
@@ -244,6 +244,7 @@ async function avaConfig(args, options, { glob, readFile }) {
   let debug = false;
   let verbose = false;
   let titleMatch;
+  await null;
   while (args.length > 0) {
     const arg = args.shift();
     assert.typeof(arg, 'string');

package/src/build.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 /* global process */
-/* eslint-disable @jessie.js/no-nested-await -- test/build code */
 import * as childProcessTop from 'child_process';
 import fsTop from 'fs';
 import osTop from 'os';
@@ -176,13 +175,13 @@ async function main(args, { env, stdout, spawn, fs, os }) {
     },
   ];
 
+  await null;
   if (args.includes('--show-env')) {
     for (const submodule of submodules) {
       const { path, envPrefix, commitHash } = submodule;
       if (!commitHash) {
         // We need to glean the commitHash and url from Git.
         const sm = makeSubmodule(path, '?', { git });
-        // eslint-disable-next-line no-await-in-loop
         const [[{ hash }], url] = await Promise.all([
           sm.status(),
           sm.config('url'),
@@ -208,13 +207,10 @@ async function main(args, { env, stdout, spawn, fs, os }) {
         // ignore
       }
       if (!fs.existsSync(submodule.path)) {
-        // eslint-disable-next-line no-await-in-loop
         await submodule.clone();
       }
-      // eslint-disable-next-line no-await-in-loop
       await submodule.checkout(commitHash);
     } else {
-      // eslint-disable-next-line no-await-in-loop
       await submodule.init();
     }
   }
@@ -229,7 +225,6 @@ async function main(args, { env, stdout, spawn, fs, os }) {
 
   const make = makeCLI(platform.make || 'make', { spawn });
   for (const goal of ModdableSDK.buildGoals) {
-    // eslint-disable-next-line no-await-in-loop
     await make.run(
       [
         `MODDABLE=${ModdableSDK.MODDABLE}`,

package/src/replay.js

@@ -227,14 +227,12 @@ export async function replayXSnap(
       const seq = parseInt(digits, 10);
       console.log(folder, seq, kind);
       if (running && !['command', 'reply'].includes(kind)) {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await running;
         running = undefined;
       }
       const file = rd.file(step);
       switch (kind) {
         case 'isReady':
-          // eslint-disable-next-line @jessie.js/no-nested-await
           await it.isReady();
           break;
         case 'evaluate':
@@ -254,7 +252,6 @@ export async function replayXSnap(
             console.log(folder, step, 'ignoring remaining steps from', folder);
             return;
           } else {
-            // eslint-disable-next-line @jessie.js/no-nested-await
             await (async () => {
               const snapshotPath = file.getText();
               const snapFile = await opts.fs.open(snapshotPath, 'w');

package/src/xsnap.js

@@ -119,17 +119,13 @@ export async function xsnap(options) {
     const cleanup = async () => fs.unlink(snapPath);
 
     try {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const tmpSnap = await fs.open(snapPath, 'w');
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await tmpSnap.writeFile(
         // @ts-expect-error incorrect typings, does support AsyncIterable
         snapshotStream,
       );
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await tmpSnap.close();
     } catch (e) {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await cleanup();
       throw e;
     }
@@ -289,7 +285,6 @@ export async function xsnap(options) {
       if (loadSnapshotHandler) {
         const { cleanup } = loadSnapshotHandler;
         loadSnapshotHandler = undefined;
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await cleanup();
       }
       if (iteration.done) {
@@ -328,9 +323,7 @@ export async function xsnap(options) {
           )}`,
         );
       } else if (message[0] === QUERY) {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         const commandResult = await handleCommand(message.subarray(1));
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await messagesToXsnap.next([QUERY_RESPONSE_BUF, commandResult]);
       } else {
         // unrecognized responses also kill the process
@@ -429,6 +422,7 @@ export async function xsnap(options) {
     let snapshotReadSize = 0;
     /** @type {number | undefined} */
     let snapshotSize;
+    await null;
     try {
       /** @type {string} */
       let snapPath;
@@ -444,7 +438,6 @@ export async function xsnap(options) {
 
       if (snapshotUseFs) {
         // TODO: Refactor to use tmpFile rather than tmpName.
-        // eslint-disable-next-line @jessie.js/no-nested-await
         snapPath = await ptmpName({
           template: `make-snapshot-${safeHintFromDescription(
             description,
@@ -461,7 +454,6 @@ export async function xsnap(options) {
         // then wait for the command response to pipe the file stream into the
         // output, causing the file read to begin.
 
-        // eslint-disable-next-line @jessie.js/no-nested-await
         const handle = await fs.open(snapPath, 'w+');
         // @ts-expect-error 'close' event added in Node 15.4
         handle.on('close', () => {
@@ -522,7 +514,6 @@ export async function xsnap(options) {
 
       yield* output;
     } finally {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await done;
       (piped && snapshotReadSize === snapshotSize) ||
         Fail`Snapshot size does not match. saved=${q(snapshotSize)}, read=${q(

package/src/xsrepl.js

@@ -1,6 +1,5 @@
 /* global process */
 /* We make exceptions for test code. This is a test utility. */
-/* eslint-disable @jessie.js/no-nested-await */
 /* eslint no-await-in-loop: ["off"] */
 
 import '@endo/init';