@agoric/internal 0.3.3-other-dev-3eb1a1d.0 → 0.3.3-other-dev-fbe72e7.0.fbe72e7

package/src/js-utils.js

@@ -5,6 +5,52 @@
  *   dependent upon a hardened environment.
  */
 
+const { defineProperty } = Object;
+
+/** For overriding TypeScript inferring the type of `true` as boolean. */
+export const TRUE = /** @type {const} */ (true);
+
+/**
+ * @typedef {<O extends Record<string, unknown>>(
+ *   obj: O,
+ * ) => { [K in keyof O]: K extends string ? [K, O[K]] : never }[keyof O][]} TypedEntries
+ */
+export const typedEntries = /** @type {TypedEntries} */ (Object.entries);
+
+/**
+ * @typedef {<
+ *   const Entries extends ReadonlyArray<readonly [PropertyKey, unknown]>,
+ * >(
+ *   entries: Entries,
+ * ) => { [Entry in Entries[number] as Entry[0]]: Entry[1] }} FromTypedEntries
+ */
+export const fromTypedEntries = /** @type {FromTypedEntries} */ (
+  Object.fromEntries
+);
+
+/**
+ * @typedef {<A extends unknown[], V>(
+ *   arr: A,
+ *   mapper: <K extends number>(el: A[K], idx: K, arr: A) => V,
+ * ) => V[]} TypedMap
+ */
+export const typedMap = /** @type {TypedMap} */ (
+  Function.prototype.call.bind(Array.prototype.map)
+);
+
+export const logLevels = /** @type {const} */ ([
+  'debug',
+  'log',
+  'info',
+  'warn',
+  'error',
+]);
+Object.freeze(logLevels);
+
+/** @typedef {(typeof logLevels)[keyof logLevels & number]} LogLevel */
+
+/** @typedef {Pick<Console, LogLevel>} LimitedConsole */
+
 /**
  * Deep-copy a value by round-tripping it through JSON (which drops
  * function/symbol/undefined values and properties that are non-enumerable
@@ -17,11 +63,14 @@
 export const deepCopyJsonable = value => JSON.parse(JSON.stringify(value));
 
 /**
- * @param {any} value
- * @param {string | undefined} name
- * @param {object | undefined} container
- * @param {(value: any, name: string, record: object) => any} mapper
- * @returns {any}
+ * @template {Record<PropertyKey, unknown>} O
+ * @template {string & keyof O} K
+ * @template M
+ * @param {O[K]} value
+ * @param {K | undefined} name
+ * @param {O | undefined} container
+ * @param {(value: O[K], name: string, record: O) => O[K] | M} mapper
+ * @returns {O[K] | M | { [K2 in keyof O[K]]: O[K][K2] | M }}
  */
 const deepMapObjectInternal = (value, name, container, mapper) => {
   if (container && typeof name === 'string') {
@@ -36,18 +85,30 @@ const deepMapObjectInternal = (value, name, container, mapper) => {
   }
 
   let wasMapped = false;
-  const mappedEntries = Object.entries(value).map(([innerName, innerValue]) => {
+  const valueObj = /** @type {Record<string, unknown>} */ (value);
+  /**
+   * @type {<T extends typeof value, K2 extends string & keyof T>(
+   *   entry: [K2, T[K2]],
+   * ) => [K2, T[K2] | M]}
+   */
+  const mapEntry = ([innerName, innerValue]) => {
     const mappedInnerValue = deepMapObjectInternal(
       innerValue,
       innerName,
-      value,
+      valueObj,
       mapper,
     );
     wasMapped ||= mappedInnerValue !== innerValue;
-    return [innerName, mappedInnerValue];
-  });
+    return [innerName, /** @type {any} */ (mappedInnerValue)];
+  };
+  const mappedEntries = typedEntries(valueObj).map(mapEntry);
 
-  return wasMapped ? Object.fromEntries(mappedEntries) : value;
+  if (!wasMapped) {
+    return value;
+  }
+
+  const mappedObj = fromTypedEntries(mappedEntries);
+  return /** @type {any} */ (mappedObj);
 };
 
 /**
@@ -59,12 +120,79 @@ const deepMapObjectInternal = (value, name, container, mapper) => {
  * When the property value is an object, it is sent to the mapper like any other
  * value, and then recursively traversed unless replaced with a distinct value.
  *
- * @param {object} obj
- * @param {(value: any, name: string, record: object) => any} mapper
- * @returns {object}
+ * @template {Record<string, unknown>} O
+ * @template M
+ * @param {O} obj
+ * @param {<T extends Record<string, unknown>, K extends string & keyof T>(
+ *   value: T[K],
+ *   name: K,
+ *   record: T,
+ * ) => T[K] | M} mapper
+ * @returns {O | { [K in keyof O]: K extends string ? O[K] | M : never }}
  */
 export const deepMapObject = (obj, mapper) =>
-  deepMapObjectInternal(obj, undefined, undefined, mapper);
+  /** @type {any} */ (deepMapObjectInternal(obj, undefined, undefined, mapper));
+
+/**
+ * Explicitly set a function's name, supporting use of arrow functions for which
+ * source text doesn't include a name and no initial name is set by
+ * NamedEvaluation
+ * https://tc39.es/ecma262/multipage/syntax-directed-operations.html#sec-runtime-semantics-namedevaluation
+ *
+ * `name` is the first parameter for better readability at call sites (e.g.,
+ * `return defineName('foo', () => { ... })`).
+ *
+ * @template {Function} F
+ * @param {string} name
+ * @param {F} fn
+ * @returns {F}
+ */
+export const defineName = (name, fn) =>
+  defineProperty(fn, 'name', { value: name });
+
+/**
+ * By analogy with how `Array.prototype.map` will map the elements of an array
+ * to transformed elements of an array of the same shape, `objectMapMutable`
+ * will do likewise for the enumerable string-keyed properties of an object.
+ *
+ * Unlike endo's `objectMap`, this function returns a non-hardened object.
+ *
+ * @template {Record<string, unknown>} O
+ * @template M
+ * @param {O} obj
+ * @param {<K extends keyof O>(value: O[K], key: K) => M} mapper
+ * @returns {{ [K in keyof O]: K extends string ? M : never }}
+ */
+export const objectMapMutable = (obj, mapper) => {
+  const oldEntries = typedEntries(obj);
+  /** @type {<K extends keyof O>(entry: [K, O[K]]) => [K, M]} */
+  const mapEntry = ([k, v]) => [k, mapper(v, k)];
+  const newEntries = typedMap(oldEntries, mapEntry);
+  const newObj = fromTypedEntries(newEntries);
+  return /** @type {any} */ (newObj);
+};
+
+/**
+ * Return the value from `map` associated with `key`. If there is not yet such a
+ * value, get one from `makeValue(key)` and update `map` before returning the
+ * new value.
+ *
+ * @template K
+ * @template V
+ * @param {K extends WeakKey ? WeakMap<K, V> : Map<K, V>} map
+ * @param {K} key
+ * @param {(key: K) => V} makeValue
+ * @returns {V}
+ */
+export const provideLazyMap = (map, key, makeValue) => {
+  const found = map.get(key);
+  if (found !== undefined || map.has(key)) {
+    return /** @type {V} */ (found);
+  }
+  const value = makeValue(key);
+  map.set(key, value);
+  return value;
+};
 
 /**
  * Returns a function that uses a millisecond-based current-time capability
@@ -87,3 +215,23 @@ export const makeMeasureSeconds = currentTimeMillisec => {
   };
   return measureSeconds;
 };
+
+/**
+ * Find all of an object's properties whose name starts with a prefix, and
+ * return a new object consisting of those properties without that prefix.
+ * Useful for filtering environment variables relevant to a particular purpose.
+ *
+ * @template {string} P
+ * @template {string} K
+ * @template V
+ * @param {Record<`${P}${K}`, V>} obj
+ * @param {P} prefix
+ */
+export const unprefixedProperties = (obj, prefix) =>
+  /** @type {Record<K, V>} */ (
+    fromTypedEntries(
+      typedEntries(obj)
+        .filter(([key]) => key.startsWith(prefix))
+        .map(([key, value]) => [key.slice(prefix.length), value]),
+    )
+  );

package/src/lib-chainStorage.d.ts

@@ -13,23 +13,12 @@
  */
 export function makeChainStorageRoot(handleStorageMessage: (message: StorageMessage) => any, rootPath: string, rootOptions?: {
     sequence?: boolean | undefined;
-} | undefined): import("@endo/exo").Guarded<{
+}): import("@endo/exo").Guarded<{
     getPath(): string;
-    /**
-     * @deprecated use getPath
-     * @type {() => Promise<VStorageKey>}
-     */
     getStoreKey(): Promise<VStorageKey>;
-    /**
-     * @type {(
-     *   name: string,
-     *   childNodeOptions?: { sequence?: boolean },
-     * ) => StorageNode}
-     */
     makeChildNode(name: string, childNodeOptions?: {
         sequence?: boolean;
     }): StorageNode;
-    /** @type {(value: string) => Promise<void>} */
     setValue(value: string): Promise<void>;
 }>;
 /**
@@ -42,29 +31,41 @@ export function makeChainStorageRoot(handleStorageMessage: (message: StorageMess
  * @returns {Promise<StorageNode>}
  */
 export function makeStorageNodeChild(storageNodeRef: ERef<StorageNode | null>, childName: string): Promise<StorageNode>;
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {PassableCap} from '@endo/marshal';
+ * @import {TypedPattern} from './types.js';
+ */
+/** @typedef {ReturnType<typeof import('@endo/marshal').makeMarshal>} Marshaller */
+/** @typedef {Pick<Marshaller, 'fromCapData'>} Unserializer */
+/**
+ * Defined by vstorageStoreKey in vstorage.go
+ *
+ * @typedef VStorageKey
+ * @property {string} storeName
+ * @property {string} storeSubkey
+ * @property {string} dataPrefixBytes
+ * @property {string} [noDataValue]
+ */
+/**
+ * @template [T=unknown]
+ * @typedef StreamCell
+ * @property {string} blockHeight decimal representation of a natural number
+ * @property {T[]} values
+ */
+/** @type {TypedPattern<StreamCell>} */
+export const StreamCellShape: TypedPattern<StreamCell>;
 export function isStreamCell(cell: any): cell is StreamCell;
-export function assertCapData(data: unknown): asserts data is import("@endo/marshal").CapData<string>;
 /** @type {(name: string) => void} */
 export const assertPathSegment: (name: string) => void;
 export function prepareChainStorageNode(zone: import("@agoric/base-zone").Zone): (messenger: import("./types.js").Callback<(message: StorageMessage) => any>, path: string, args_2?: {
     sequence?: boolean | undefined;
 } | undefined) => import("@endo/exo").Guarded<{
     getPath(): string;
-    /**
-     * @deprecated use getPath
-     * @type {() => Promise<VStorageKey>}
-     */
     getStoreKey(): Promise<VStorageKey>;
-    /**
-     * @type {(
-     *   name: string,
-     *   childNodeOptions?: { sequence?: boolean },
-     * ) => StorageNode}
-     */
     makeChildNode(name: string, childNodeOptions?: {
         sequence?: boolean;
     }): StorageNode;
-    /** @type {(value: string) => Promise<void>} */
     setValue(value: string): Promise<void>;
 }>;
 export function makeSerializeToStorage(storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller>): (value: PassableCap) => Promise<void>;
@@ -165,5 +166,6 @@ export type StorageMessage = {
     args: StorageUpdateEntriesMessageArgs;
 };
 import type { ERef } from '@endo/far';
+import type { TypedPattern } from './types.js';
 import type { PassableCap } from '@endo/marshal';
 //# sourceMappingURL=lib-chainStorage.d.ts.map

package/src/lib-chainStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib-chainStorage.d.ts","sourceRoot":"","sources":["lib-chainStorage.js"],"names":[],"mappings":"AAyPA;;;;;;;;;;;;GAYG;AACH,2DATW,CAAC,OAAO,EAAE,cAAc,KAAK,GAAG,YAGhC,MAAM;;;;IAhEX;;;OAGG;mBADa,OAAO,CAAC,WAAW,CAAC;IASpC;;;;;OAKG;wBAHQ,MAAM,qBACO;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GACtC,WAAW;IAYnB,+CAA+C;oBAA5B,MAAM,GAAK,OAAO,CAAC,IAAI,CAAC;GAqDhD;AAcD;;;;;;;;GAQG;AACH,qDAJW,KAAK,WAAW,OAAC,CAAC,aAClB,MAAM,GACJ,OAAO,CAAC,WAAW,CAAC,CAMhC;AApOM,mCAHI,GAAG,GACD,IAAI,IAAI,UAAU,CAOa;AASrC,oCAHI,OAAO,GACL,QAAQ,IAAI,IAAI,OAAO,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAQnE;AAmBD,qCAAqC;AACrC,gCADW,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAI/B;AAyCK,8CAFI,OAAO,mBAAmB,EAAE,IAAI,uDAwBxB,cAAc,KAAK,GAAG;;;;IAenC;;;OAGG;mBADa,OAAO,CAAC,WAAW,CAAC;IASpC;;;;;OAKG;wBAHQ,MAAM,qBACO;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GACtC,WAAW;IAYnB,+CAA+C;oBAA5B,MAAM,GAAK,OAAO,CAAC,IAAI,CAAC;GA0BhD;AA+DM,oDAJI,KAAK,WAAW,CAAC,cACjB,KAAK,UAAU,CAAC,GACd,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAQjD;yBA7Sa,UAAU,CAAC,cAAc,eAAe,EAAE,WAAW,CAAC;2BACtD,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;;;;;eAM/B,MAAM;iBACN,MAAM;qBACN,MAAM;;;uBAKN,CAAC;;;;iBAED,MAAM;YACN,CAAC,EAAE;;;;;;;;;;;;;;;;cAcH,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;;aAC/B,MAAM,MAAM;;;;iBAEZ,MAAM,OAAO,CAAC,WAAW,CAAC;mBAC1B,CACT,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,KAC7B,WAAW;;;;;;;aA6CL,MAAM,OAAO,CAAC,MAAM,CAAC;;;;iBAErB,WAAW,CAAC,aAAa,CAAC;;;;;qBAC1B,MAAM,YAAY;;;;;4CAqBnB,KAAK,GACX,aAAa,GACb,KAAK,GACL,UAAU,GACV,SAAS,GACT,QAAQ,GACR,MAAM;;;;gDAGA,KAAK,GAAG,kBAAkB,GAAG,QAAQ;;;;mCAGrC,6BAA6B,GACnC,iCAAiC;;;;0CAG3B,CAAC,IAAI,EAAE,MAAM,CAAC;;;;2BAEd,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;;;;8CAErC,YAAY,EAAE;;;;6BAEd;IACJ,MAAM,EAAE,6BAA6B,CAAC;IACtC,IAAI,EAAE,2BAA2B,CAAC;CACnC,GACD;IACE,MAAM,EAAE,iCAAiC,CAAC;IAC1C,IAAI,EAAE,+BAA+B,CAAC;CACvC;0BA5Ie,WAAW;iCACJ,eAAe"}
+{"version":3,"file":"lib-chainStorage.d.ts","sourceRoot":"","sources":["lib-chainStorage.js"],"names":[],"mappings":"AAiPA;;;;;;;;;;;;GAYG;AACH,2DATW,CAAC,OAAO,EAAE,cAAc,KAAK,GAAG,YAGhC,MAAM,gBAEd;IAA8B,QAAQ;CAGxC;;mBAnEqB,OAAO,CAAC,WAAW,CAAC;wBAWzB,MAAM,qBACO;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GACtC,WAAW;oBAYA,MAAM,GAAK,OAAO,CAAC,IAAI,CAAC;GAqDhD;AAcD;;;;;;;;GAQG;AACH,qDAJW,KAAK,WAAW,OAAC,CAAC,aAClB,MAAM,GACJ,OAAO,CAAC,WAAW,CAAC,CAMhC;AA3RD;;;;GAIG;AAEH,mFAAmF;AACnF,8DAA8D;AAE9D;;;;;;;;GAQG;AAEH;;;;;GAKG;AAEH,uCAAuC;AACvC,8BADW,aAAa,UAAU,CAAC,CAIhC;AAwCI,mCAHI,GAAG,GACD,IAAI,IAAI,UAAU,CAOa;AAmB5C,qCAAqC;AACrC,gCADW,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAI/B;AAyCK,8CAFI,OAAO,mBAAmB,EAAE,IAAI,uDAwBxB,cAAc,KAAK,GAAG;;;;mBAiBnB,OAAO,CAAC,WAAW,CAAC;wBAWzB,MAAM,qBACO;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GACtC,WAAW;oBAYA,MAAM,GAAK,OAAO,CAAC,IAAI,CAAC;GA0BhD;AA+DM,oDAJI,KAAK,WAAW,CAAC,cACjB,KAAK,UAAU,CAAC,GACd,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAQjD;yBApSa,UAAU,CAAC,cAAc,eAAe,EAAE,WAAW,CAAC;2BACtD,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;;;;;eAM/B,MAAM;iBACN,MAAM;qBACN,MAAM;;;uBAKN,CAAC;;;;iBAED,MAAM;YACN,CAAC,EAAE;;;;;;;;;;;;;;;;cAoBH,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;;aAC/B,MAAM,MAAM;;;;iBAEZ,MAAM,OAAO,CAAC,WAAW,CAAC;mBAC1B,CACT,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,KAC7B,WAAW;;;;;;;aA8BL,MAAM,OAAO,CAAC,MAAM,CAAC;;;;iBAErB,WAAW,CAAC,aAAa,CAAC;;;;;qBAC1B,MAAM,YAAY;;;;;4CAqBnB,KAAK,GACX,aAAa,GACb,KAAK,GACL,UAAU,GACV,SAAS,GACT,QAAQ,GACR,MAAM;;;;gDAGA,KAAK,GAAG,kBAAkB,GAAG,QAAQ;;;;mCAGrC,6BAA6B,GACnC,iCAAiC;;;;0CAG3B,CAAC,IAAI,EAAE,MAAM,CAAC;;;;2BAEd,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;;;;8CAErC,YAAY,EAAE;;;;6BAEd;IACJ,MAAM,EAAE,6BAA6B,CAAC;IACtC,IAAI,EAAE,2BAA2B,CAAC;CACnC,GACD;IACE,MAAM,EAAE,iCAAiC,CAAC;IAC1C,IAAI,EAAE,+BAA+B,CAAC;CACvC;0BApIe,WAAW;kCAEH,YAAY;iCADb,eAAe"}

package/src/lib-chainStorage.js

@@ -9,6 +9,7 @@ import * as cb from './callback.js';
 /**
  * @import {ERef} from '@endo/far';
  * @import {PassableCap} from '@endo/marshal';
+ * @import {TypedPattern} from './types.js';
  */
 
 /** @typedef {ReturnType<typeof import('@endo/marshal').makeMarshal>} Marshaller */
@@ -31,6 +32,12 @@ import * as cb from './callback.js';
  * @property {T[]} values
  */
 
+/** @type {TypedPattern<StreamCell>} */
+export const StreamCellShape = harden({
+  blockHeight: M.string(),
+  values: M.array(),
+});
+
 /**
  * This represents a node in an IAVL tree.
  *
@@ -77,21 +84,6 @@ export const isStreamCell = cell =>
   /^0$|^[1-9][0-9]*$/.test(cell.blockHeight);
 harden(isStreamCell);
 
-// TODO: Consolidate with `insistCapData` functions from swingset-liveslots,
-// swingset-xsnap-supervisor, etc.
-/**
- * @param {unknown} data
- * @returns {asserts data is import('@endo/marshal').CapData<string>}
- */
-export const assertCapData = data => {
-  assert.typeof(data, 'object');
-  assert(data);
-  assert.typeof(data.body, 'string');
-  assert(Array.isArray(data.slots));
-  // XXX check that the .slots array elements are actually strings
-};
-harden(assertCapData);
-
 /**
  * @typedef {object} StoredFacet
  * @property {() => Promise<string>} getPath the chain storage path at which the

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

@@ -0,0 +1,13 @@
+/**
+ * @import {ExecutionContext, Macro, TestFn} from 'ava';
+ */
+export const AVA_EXPECT_UNHANDLED_REJECTIONS: "AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS";
+export const SUBTEST_PREFIX: "(unhandled rejection subprocess): ";
+export function makeExpectUnhandledRejection<C>({ test, importMetaUrl }: {
+    test: TestFn<C>;
+    importMetaUrl: string;
+}): (expectedUnhandled: number) => Macro<[name: string, impl: (t: ExecutionContext<C>) => any], C>;
+import type { TestFn } from 'ava';
+import type { ExecutionContext } from 'ava';
+import type { Macro } from 'ava';
+//# sourceMappingURL=ava-unhandled-rejection.d.ts.map

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

@@ -0,0 +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;AAW5D,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,CA0CtE;4BAzDiD,KAAK;sCAAL,KAAK;2BAAL,KAAK"}

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

@@ -0,0 +1,66 @@
+// @ts-check
+import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
+
+import engineGC from './engine-gc.js';
+import { makeGcAndFinalize } from './gc-and-finalize.js';
+
+/**
+ * @import {ExecutionContext, Macro, TestFn} from 'ava';
+ */
+
+export const AVA_EXPECT_UNHANDLED_REJECTIONS =
+  'AGORIC_AVA_EXPECT_UNHANDLED_REJECTIONS';
+
+export const SUBTEST_PREFIX = '(unhandled rejection subprocess): ';
+
+/**
+ * @template C
+ * @param {object} powers
+ * @param {TestFn<C>} powers.test
+ * @param {string} powers.importMetaUrl
+ * @returns {(
+ *   expectedUnhandled: number,
+ * ) => Macro<[name: string, impl: (t: ExecutionContext<C>) => any], C>}
+ */
+export const makeExpectUnhandledRejection = ({ test, importMetaUrl }) => {
+  const self = fileURLToPath(importMetaUrl);
+  const gcAndFinalize = makeGcAndFinalize(engineGC);
+
+  if (process.env[AVA_EXPECT_UNHANDLED_REJECTIONS]) {
+    return _expectedUnhandled =>
+      test.macro({
+        title: (_, name, _impl) => SUBTEST_PREFIX + name,
+        exec: async (t, _name, impl) => {
+          await null;
+          try {
+            const result = await impl(t);
+            return result;
+          } finally {
+            await gcAndFinalize();
+          }
+        },
+      });
+  }
+
+  return expectedUnhandled =>
+    test.macro({
+      title: (_, name, _impl) => name,
+      exec: async (t, name, _impl) =>
+        new Promise((resolve, reject) => {
+          const ps = spawn('ava', [self, '-m', SUBTEST_PREFIX + name], {
+            env: {
+              ...process.env,
+              [AVA_EXPECT_UNHANDLED_REJECTIONS]: `${expectedUnhandled}`,
+            },
+            stdio: ['ignore', 'inherit', 'inherit', 'ignore'],
+          });
+
+          ps.on('close', code => {
+            t.is(code, 0, `got exit code ${code}, expected 0 for ${name}`);
+            resolve();
+          });
+          ps.on('error', reject);
+        }),
+    });
+};

package/src/marshal.d.ts

@@ -3,13 +3,24 @@ export function makeBoardRemote({ boardId, iface }: {
     iface?: string;
 }): BoardRemote;
 export function slotToBoardRemote(boardId: string, iface: string): BoardRemote;
-export function boardSlottingMarshaller(slotToVal?: ((slot: string, iface: string) => any) | undefined): Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+export function boardSlottingMarshaller(slotToVal?: (slot: string, iface: string) => any): Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+/**
+ * @type {TypedPattern<CapData<any>>}
+ */
+export const CapDataShape: TypedPattern<CapData<any>>;
+export function assertCapData(data: unknown): asserts data is CapData<unknown>;
 export function unmarshalFromVstorage(data: Map<string, string>, key: string, fromCapData: ReturnType<typeof import("@endo/marshal").makeMarshal>["fromCapData"], index: number): any;
-export function makeHistoryReviver(entries: [string, string][], slotToVal?: ((slot: string, iface?: string) => any) | undefined): {
+export function makeHistoryReviver(entries: [string, string][], slotToVal?: (slot: string, iface?: string) => any): {
     getItem: (key: string) => any;
     children: (prefix: string) => string[];
     has: (k: string) => boolean;
 };
+export const pureDataMarshaller: {
+    toCapData: import("@endo/marshal").ToCapData<CapData<unknown>>;
+    fromCapData: import("@endo/marshal").FromCapData<CapData<unknown>>;
+    serialize: import("@endo/marshal").ToCapData<CapData<unknown>>;
+    unserialize: import("@endo/marshal").FromCapData<CapData<unknown>>;
+};
 /**
  * Should be a union with Remotable, but that's `any`, making this type
  * meaningless
@@ -17,4 +28,6 @@ export function makeHistoryReviver(entries: [string, string][], slotToVal?: ((sl
 export type BoardRemote = {
     getBoardId: () => string | null;
 };
+import type { CapData } from '@endo/marshal';
+import type { TypedPattern } from './types.js';
 //# sourceMappingURL=marshal.d.ts.map

package/src/marshal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marshal.d.ts","sourceRoot":"","sources":["marshal.js"],"names":[],"mappings":"AAiBO,oDAHI;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,WAAW,CAKvB;AAMM,2CAHI,MAAM,SACN,MAAM,eAGoB;AAqB9B,4DANW,MAAM,SAAS,MAAM,KAAK,GAAG,gBAClC,IAAI,CAChB,OAAW,eAAe,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAClD,WAAe,GAAG,aAAa,CAC5B,CAMH;AA6BM,4CATI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OACnB,MAAM,eACN,UAAU,CACpB,cAAkB,eAAe,EAAE,WAAW,CAC3C,CAAC,aAAa,CAAC,SACR,MAAM,GAEJ,GAAG,CAwBf;AASM,4CAHI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBACX,MAAM,UAAU,MAAM,KAAK,GAAG;mBAQlC,MAAM;uBAEN,MAAM;aAYN,MAAM;EAInB;;;;;0BA9HY;IAAE,UAAU,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;CAAE"}
+{"version":3,"file":"marshal.d.ts","sourceRoot":"","sources":["marshal.js"],"names":[],"mappings":"AAuBO,oDAHI;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,WAAW,CAKvB;AAMM,2CAHI,MAAM,SACN,MAAM,eAGoB;AAqB9B,oDANI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,GAAG,GAClC,IAAI,CAChB,OAAW,eAAe,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAClD,WAAe,GAAG,aAAa,CAC5B,CAMH;AAGD;;GAEG;AACH,2BAFU,aAAa,QAAQ,GAAG,CAAC,CAAC,CAE+B;AAS5D,oCAHI,OAAO,GACL,QAAQ,IAAI,IAAI,QAAQ,OAAO,CAAC,CAO5C;AAeM,4CATI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OACnB,MAAM,eACN,UAAU,CACpB,cAAkB,eAAe,EAAE,WAAW,CAC3C,CAAC,aAAa,CAAC,SACR,MAAM,GAEJ,GAAG,CAwBf;AASM,4CAHI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,cAClB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,GAAG;mBAQlC,MAAM;uBAEN,MAAM;aAYN,MAAM;EAInB;AAID;;;;;EAEG;;;;;0BA1IU;IAAE,UAAU,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;CAAE;6BARtB,eAAe;kCACV,YAAY"}

package/src/marshal.js

@@ -2,8 +2,14 @@
 import { Fail } from '@endo/errors';
 import { Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
+import { M } from '@endo/patterns';
 import { isStreamCell } from './lib-chainStorage.js';
 
+/**
+ * @import {CapData} from '@endo/marshal';
+ * @import {TypedPattern} from './types.js';
+ */
+
 /**
  * Should be a union with Remotable, but that's `any`, making this type
  * meaningless
@@ -52,18 +58,24 @@ export const boardSlottingMarshaller = (slotToVal = undefined) => {
   });
 };
 
-// TODO: Consolidate with `insistCapData` functions from swingset-liveslots,
-// swingset-xsnap-supervisor, etc.
+// TODO move CapDataShape to Endo
+/**
+ * @type {TypedPattern<CapData<any>>}
+ */
+export const CapDataShape = { body: M.string(), slots: M.array() };
+harden(CapDataShape);
+
 /**
+ * Assert that this is CapData
+ *
  * @param {unknown} data
- * @returns {asserts data is import('@endo/marshal').CapData<string>}
+ * @returns {asserts data is CapData<unknown>}
  */
-const assertCapData = data => {
+export const assertCapData = data => {
   assert.typeof(data, 'object');
   assert(data);
-  assert.typeof(data.body, 'string');
-  assert(Array.isArray(data.slots));
-  // XXX check that the .slots array elements are actually strings
+  typeof data.body === 'string' || Fail`data has non-string .body ${data.body}`;
+  Array.isArray(data.slots) || Fail`data has non-Array slots ${data.slots}`;
 };
 harden(assertCapData);
 
@@ -135,3 +147,10 @@ export const makeHistoryReviver = (entries, slotToVal = undefined) => {
 
   return harden({ getItem, children, has });
 };
+
+/** @param {import('@endo/marshal').CapData<unknown>} cap */
+const rejectOCap = cap => Fail`${cap} is not pure data`;
+export const pureDataMarshaller = makeMarshal(rejectOCap, rejectOCap, {
+  serializeBodyFormat: 'smallcaps',
+});
+harden(pureDataMarshaller);

package/src/method-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-tools.d.ts","sourceRoot":"","sources":["method-tools.js"],"names":[],"mappings":"AA0CO,+BAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,CAAC,EAAE,CAsBf;AAUM,qCAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,MAAM,EAAE,CAKlB;AA+BI,+BAJiC,CAAC,SAA3B,MAAM,CAAC,WAAW,EAAE,GAAG,CAAE,OAC5B,CAAC,GACC,CAAC,CAiBX"}
+{"version":3,"file":"method-tools.d.ts","sourceRoot":"","sources":["method-tools.js"],"names":[],"mappings":"AAmBO,+BAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,CAAC,EAAE,CAG8B;AAUvC,qCAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,MAAM,EAAE,CAKlB;AA+BI,+BAJiC,CAAC,SAA3B,MAAM,CAAC,WAAW,EAAE,GAAG,CAAE,OAC5B,CAAC,GACC,CAAC,CAiBX"}

package/src/method-tools.js

@@ -1,66 +1,24 @@
 // @ts-check
-import { isObject } from '@endo/marshal';
+import { getMethodNames as realGetMethodNames } from '@endo/eventual-send/utils.js';
 
 /**
  * @file method-tools use dynamic property lookup, which is not
  *   Jessie-compatible
  */
 
-const { getPrototypeOf, create, fromEntries, getOwnPropertyDescriptors } =
-  Object;
-const { ownKeys, apply } = Reflect;
-
-/**
- * Prioritize symbols as earlier than strings.
- *
- * @param {string | symbol} a
- * @param {string | symbol} b
- * @returns {-1 | 0 | 1}
- */
-const compareStringified = (a, b) => {
-  if (typeof a === typeof b) {
-    const left = String(a);
-    const right = String(b);
-    // eslint-disable-next-line no-nested-ternary
-    return left < right ? -1 : left > right ? 1 : 0;
-  }
-  if (typeof a === 'symbol') {
-    assert(typeof b === 'string');
-    return -1;
-  }
-  assert(typeof a === 'string');
-  assert(typeof b === 'symbol');
-  return 1;
-};
+const { create, fromEntries } = Object;
+const { apply } = Reflect;
 
 /**
  * TODO Consolidate with the `getMethodNames` in `@endo/eventual-send`
  *
+ * @deprecated Use `getMethodNames` from `@endo/eventual-send/utils.js` instead.
  * @template {PropertyKey} K
  * @param {Record<K, any>} val
  * @returns {K[]}
  */
-export const getMethodNames = val => {
-  let layer = val;
-  const names = new Set(); // Set to deduplicate
-  while (layer !== null && layer !== Object.prototype) {
-    // be tolerant of non-objects
-    const descs = getOwnPropertyDescriptors(layer);
-    const ownNames = /** @type {K[]} */ (ownKeys(descs));
-    for (const name of ownNames) {
-      // In case a method is overridden by a non-method,
-      // test `val[name]` rather than `layer[name]`
-      if (typeof val[name] === 'function') {
-        names.add(name);
-      }
-    }
-    if (!isObject(val)) {
-      break;
-    }
-    layer = getPrototypeOf(layer);
-  }
-  return harden([...names].sort(compareStringified));
-};
+export const getMethodNames = val =>
+  /** @type {K[]} */ (realGetMethodNames(val));
 harden(getMethodNames);
 
 /**
@@ -72,7 +30,7 @@ harden(getMethodNames);
  */
 export const getStringMethodNames = val =>
   /** @type {string[]} */ (
-    getMethodNames(val).filter(name => typeof name === 'string')
+    realGetMethodNames(val).filter(name => typeof name === 'string')
   );
 
 /**
@@ -109,7 +67,7 @@ export const bindAllMethods = obj =>
     create(
       obj,
       fromEntries(
-        getMethodNames(obj).map(name => [
+        realGetMethodNames(obj).map(name => [
           name,
           {
             value: (/** @type {unknown[]} */ ...args) =>