@agoric/internal 0.3.3-dev-2f90d3f.0.2f90d3f → 0.3.3-dev-12fdf15.0.12fdf15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-2f90d3f.0.2f90d3f",
+  "version": "0.3.3-dev-12fdf15.0.12fdf15",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,7 +20,7 @@
     "lint:types": "yarn run -T tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-2f90d3f.0.2f90d3f",
+    "@agoric/base-zone": "0.1.1-dev-12fdf15.0.12fdf15",
     "@endo/cache-map": "^1.1.0",
     "@endo/common": "^1.2.13",
     "@endo/compartment-mapper": "^1.6.3",
@@ -39,7 +39,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-2f90d3f.0.2f90d3f",
+    "@agoric/cosmic-proto": "0.4.1-dev-12fdf15.0.12fdf15",
     "@endo/exo": "^1.5.12",
     "@endo/init": "^1.1.12",
     "@endo/ses-ava": "^1.3.2",
@@ -66,5 +66,5 @@
   "typeCoverage": {
     "atLeast": 92.84
   },
-  "gitHead": "2f90d3f527a0c3898a3a7376dca2c61147e23272"
+  "gitHead": "12fdf156ed8e9a425cf8bcc9cdd1662bf4cad247"
 }

package/src/lib-nodejs/ava-unhandled-rejection.d.ts

@@ -1,8 +1,10 @@
 /**
- * @import {ExecutionContext, Macro, TestFn} from 'ava';
+ * @import {ExecutionContext, ImplementationFn, Macro, MacroDeclarationOptions,TestFn} from 'ava';
  */
+/** Not an official AVA feature, so prefix with `AGORIC_` */
+export const AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS: "AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS";
+/** Backwards compatibility... */
 export const AVA_EXPECT_UNHANDLED_REJECTIONS: "AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS";
-export const SUBTEST_PREFIX: "(unhandled rejection subprocess): ";
 export function countUnhandled(work: () => any | Promise<any>, { gcAndFinalize }: {
     gcAndFinalize: () => Promise<void>;
 }): Promise<{
@@ -10,10 +12,16 @@ export function countUnhandled(work: () => any | Promise<any>, { gcAndFinalize }
     pending: number;
     seenUnhandled: number;
 }>;
-export function makeExpectUnhandledRejection<C>({ test, importMetaUrl }: {
+export function makeExpectUnhandledRejection<C>({ test, sameWorker, importMetaUrl, }: {
     test: TestFn<C>;
+    sameWorker?: boolean | undefined;
     importMetaUrl: string;
 }): (expectedUnhandled: number) => Macro<[name: string, impl: (t: ExecutionContext<C>) => any], C>;
+export function makeExpectUnhandledRejectionMacro<C = unknown>({ test, sameWorker, importMetaUrl, }: {
+    test: TestFn<C>;
+    sameWorker?: boolean | undefined;
+    importMetaUrl: string;
+}): (numUnhandled: number, innerMacro?: Macro<A, C>) => Macro<A, C>;
 import type { TestFn } from 'ava';
 import type { ExecutionContext } from 'ava';
 import type { Macro } from 'ava';

package/src/lib-nodejs/ava-unhandled-rejection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ava-unhandled-rejection.d.ts","sourceRoot":"","sources":["ava-unhandled-rejection.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH,8CACE,wCAAwC,CAAC;AAE3C,6BAA8B,oCAAoC,CAAC;AA2E5D,qCAJI,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,qBAEhC;IAAoC,aAAa,EAAzC,MAAM,OAAO,CAAC,IAAI,CAAC;CAC7B;;;;GA4BA;AAWM,6CARM,CAAC,2BAEX;IAA0B,IAAI,EAAtB,OAAO,CAAC,CAAC;IACM,aAAa,EAA5B,MAAM;CACd,GAAU,CACR,iBAAiB,EAAE,MAAM,KACtB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAqDtE;4BA1KiD,KAAK;sCAAL,KAAK;2BAAL,KAAK"}
+{"version":3,"file":"ava-unhandled-rejection.d.ts","sourceRoot":"","sources":["ava-unhandled-rejection.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH,4DAA4D;AAC5D,qDACE,wCAAwC,CAAC;AAC3C,iCAAiC;AACjC,uFACyC;AA2ElC,qCAJI,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,qBAEhC;IAAoC,aAAa,EAAzC,MAAM,OAAO,CAAC,IAAI,CAAC;CAC7B;;;;GA4BA;AAeM,6CARM,CAAC,wCAEX;IAA0B,IAAI,EAAtB,OAAO,CAAC,CAAC;IACQ,UAAU;IACZ,aAAa,EAA5B,MAAM;CACd,GAAU,CAAE,iBAAiB,EAAE,MAAM,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EACzE,iBAAqB,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAkEpC;AASM,kDANO,CAAC,kDAEZ;IAA0B,IAAI,EAAtB,OAAO,CAAC,CAAC;IACQ,UAAU;IACZ,aAAa,EAA5B,MAAM;CAChB,IAiBS,cAJG,MAIS,EAAE,aAHX,MAAM,CAAC,EAAE,CAAC,CAGW,KAFnB,MAAM,CAAC,EAAE,CAAC,CAAC,CAoCzB;4BAxP2F,KAAK;sCAAL,KAAK;2BAAL,KAAK"}

package/src/lib-nodejs/ava-unhandled-rejection.js

@@ -6,13 +6,15 @@ import engineGC from './engine-gc.js';
 import { makeGcAndFinalize } from './gc-and-finalize.js';
 
 /**
- * @import {ExecutionContext, Macro, TestFn} from 'ava';
+ * @import {ExecutionContext, ImplementationFn, Macro, MacroDeclarationOptions,TestFn} from 'ava';
  */
 
-export const AVA_EXPECT_UNHANDLED_REJECTIONS =
+/** Not an official AVA feature, so prefix with `AGORIC_` */
+export const AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS =
   'AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS';
-
-export const SUBTEST_PREFIX = '(unhandled rejection subprocess): ';
+/** Backwards compatibility... */
+export const AVA_EXPECT_UNHANDLED_REJECTIONS =
+  AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS;
 
 const delayTurn = () => new Promise(resolve => setImmediate(resolve));
 const settleUnhandled = async () => {
@@ -117,51 +119,68 @@ export const countUnhandled = async (work, { gcAndFinalize }) => {
 };
 
 /**
+ * @deprecated Use `makeExpectUnhandledRejectionMacro` instead, which uses the
+ * test's first argument title instead of an explicit `name`, and can
+ * optionally wrap an inner `Macro`.
+ *
  * @template C
  * @param {object} powers
  * @param {TestFn<C>} powers.test
+ * @param {boolean} [powers.sameWorker]
  * @param {string} powers.importMetaUrl
- * @returns {(
- *   expectedUnhandled: number,
- * ) => Macro<[name: string, impl: (t: ExecutionContext<C>) => any], C>}
+ * @returns {( expectedUnhandled: number) => Macro<[name: string, impl: (t:
+ *   ExecutionContext<C>) => any], C>}
  */
-export const makeExpectUnhandledRejection = ({ test, importMetaUrl }) => {
+export const makeExpectUnhandledRejection = ({
+  test,
+  sameWorker = false,
+  importMetaUrl,
+}) => {
   const self = fileURLToPath(importMetaUrl);
   const gcAndFinalize = makeGcAndFinalize(engineGC);
 
-  if (process.env[AVA_EXPECT_UNHANDLED_REJECTIONS]) {
+  if (sameWorker || process.env[AVA_EXPECT_UNHANDLED_REJECTIONS]) {
+    let mutex = Promise.resolve();
     return expectedUnhandled =>
       test.macro({
-        title: (_, name, _impl) => SUBTEST_PREFIX + name,
+        title: (_providedTitle = '', name, _impl) => name,
         exec: async (t, _name, impl) => {
           const rawExpected =
-            process.env[AVA_EXPECT_UNHANDLED_REJECTIONS] ?? expectedUnhandled;
+            (sameWorker
+              ? undefined
+              : process.env[AVA_EXPECT_UNHANDLED_REJECTIONS]) ||
+            expectedUnhandled;
           const expected = Number(rawExpected);
           if (!Number.isSafeInteger(expected) || expected < 0) {
             t.fail(
               `expected unhandled rejection count to be a natural number, got ${rawExpected}`,
             );
           }
-          const { unhandled, pending, seenUnhandled } = await countUnhandled(
-            () => impl(t),
-            { gcAndFinalize },
-          );
-          const totalUnhandled = unhandled + pending;
-          if (totalUnhandled !== expected) {
-            t.fail(
-              `expected ${expected} unhandled promise rejections, got ${totalUnhandled} (of ${seenUnhandled} seen, ${pending} pending finalization)`,
+          const nextP = mutex.then(async () => {
+            const { unhandled, pending, seenUnhandled } = await countUnhandled(
+              () => impl(t),
+              { gcAndFinalize },
             );
-          }
+            const totalUnhandled = unhandled + pending;
+            if (totalUnhandled !== expected) {
+              t.fail(
+                `expected ${expected} unhandled promise rejections, got ${totalUnhandled} (of ${seenUnhandled} seen, ${pending} pending finalization)`,
+              );
+            }
+          });
+          mutex = nextP.catch(() => {}); // don't let a failure block the next test
+          await nextP;
         },
       });
   }
 
   return expectedUnhandled =>
     test.macro({
-      title: (_, name, _impl) => name,
+      title: (_providedTitle = '', name, _impl) =>
+        `${name} (unhandled: ${expectedUnhandled})`,
       exec: async (t, name, _impl) =>
         new Promise((resolve, reject) => {
-          const ps = spawn('ava', [self, '-m', SUBTEST_PREFIX + name], {
+          const ps = spawn('ava', [self, '--match', name], {
             env: {
               ...process.env,
               [AVA_EXPECT_UNHANDLED_REJECTIONS]: `${expectedUnhandled}`,
@@ -177,3 +196,62 @@ export const makeExpectUnhandledRejection = ({ test, importMetaUrl }) => {
         }),
     });
 };
+
+/**
+ * @template [C=unknown]
+ * @param {object} powers
+ * @param {TestFn<C>} powers.test
+ * @param {boolean} [powers.sameWorker] defaults to require in-process execution
+ * @param {string} powers.importMetaUrl
+ */
+export const makeExpectUnhandledRejectionMacro = ({
+  test,
+  sameWorker = true,
+  importMetaUrl,
+}) => {
+  const expectUnhandledRejection = makeExpectUnhandledRejection({
+    test,
+    sameWorker,
+    importMetaUrl,
+  });
+  /**
+   * @template {any[]} [A=[ImplementationFn<any[], any>, ...any[]]]
+   * @param {number} numUnhandled
+   * @param {Macro<A, C>} [innerMacro]
+   * @returns {Macro<A, C>}
+   */
+  return (numUnhandled, innerMacro) => {
+    const expector = expectUnhandledRejection(numUnhandled);
+
+    /**
+     * @param {ExecutionContext<C>} _t
+     * @param {A} args
+     * @returns {(t: ExecutionContext<C>) => any}
+     */
+    const makeImpl = (_t, args) =>
+      innerMacro
+        ? async t => innerMacro.exec(t, ...args)
+        : t => (0, args[0])(t, ...args);
+
+    /** @type {string} */
+    return test.macro(
+      /** @type {MacroDeclarationOptions<A, C>} */ ({
+        title(providedTitle = '', ...args) {
+          let expectorName =
+            innerMacro?.title?.(providedTitle, ...args) ?? providedTitle;
+          const impl = () => {};
+          if (process.env[AVA_EXPECT_UNHANDLED_REJECTIONS]) {
+            expectorName =
+              expector.title?.(expectorName, expectorName, impl) ??
+              expectorName;
+          }
+          return expectorName;
+        },
+        async exec(t, ...args) {
+          const impl = makeImpl(t, args);
+          return expector.exec(t, t.title, impl);
+        },
+      }),
+    );
+  };
+};