@agoric/internal 0.3.3-dev-581ea13.0.581ea13 → 0.3.3-dev-e208259.0.e208259

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-581ea13.0.581ea13",
+  "version": "0.3.3-dev-e208259.0.e208259",
   "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-581ea13.0.581ea13",
+    "@agoric/base-zone": "0.1.1-dev-e208259.0.e208259",
     "@endo/cache-map": "^1.1.0",
     "@endo/common": "^1.2.13",
     "@endo/compartment-mapper": "^1.6.3",
@@ -38,7 +38,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-581ea13.0.581ea13",
+    "@agoric/cosmic-proto": "0.4.1-dev-e208259.0.e208259",
     "@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": "581ea13fda87ccdeca929a1d88563c15eaee2cf4"
+  "gitHead": "e20825970026246ddb5ae96694ba944748ee23fc"
 }

package/src/marshal/wrap-marshaller.d.ts

@@ -14,7 +14,8 @@ export function wrapRemoteMarshaller<Slot = unknown>(marshaller: ERemote<Pick<EM
  * either a sync or async marshaller, usually through `E` eventual-sends.
  */
 export type EMarshaller<Slot = unknown> = Simplify<EOnly<Marshal<Slot>>>;
-export type SlotWrapper<Slot = unknown> = ReturnType<typeof slotToWrapper<Slot>>;
+export type InterfaceSpec = "Remotable" | `Alleged: ${string}`;
+export type RemotableSlotWrapper<Slot = unknown> = SlotWrapper<Slot> & PassStyled<"remotable", InterfaceSpec>;
 import type { ERemote } from '../types.js';
 import type { MakeMarshalOptions } from '@endo/marshal';
 import type { WeakMapAPI } from '@endo/cache-map';
@@ -22,12 +23,38 @@ import { Far } from '@endo/far';
 import type { Marshal } from '@endo/marshal';
 import type { EOnly } from '@endo/eventual-send';
 import type { Simplify } from '@endo/pass-style';
-declare function slotToWrapper<Slot = unknown>(slot: Slot, iface?: string): {
-    /** @type {Slot} */
-    "__#private@#slot": Slot;
+/**
+ * @import {WeakMapAPI} from '@endo/cache-map';
+ * @import {EOnly} from '@endo/eventual-send';
+ * @import {PassStyled, Simplify} from '@endo/pass-style';
+ * @import {CapData, Passable, Marshal, MakeMarshalOptions} from '@endo/marshal';
+ * @import {ERemote} from '../types.js';
+ */
+/**
+ * A Marshaller which methods may be async. Use this type to indicate accepting
+ * either a sync or async marshaller, usually through `E` eventual-sends.
+ *
+ * @template [Slot=unknown]
+ * @typedef {Simplify<EOnly<Marshal<Slot>>>} EMarshaller
+ */
+/** @typedef {'Remotable' | `Alleged: ${string}`} InterfaceSpec */
+/** @template [Slot=unknown] */
+declare class SlotWrapper<Slot = unknown> {
+    /**
+     * @template [Slot=unknown]
+     * @param {SlotWrapper<Slot>} wrapper
+     * @returns {Slot}
+     */
+    static getSlot<Slot_1 = unknown>(wrapper: SlotWrapper<Slot_1>): Slot_1;
+    /**
+     * @param {Slot} slot
+     * @param {string} [iface]
+     */
+    constructor(slot: Slot, iface?: string);
     /** @type {InterfaceSpec} */
-    [Symbol.toStringTag]: `Alleged: ${string}` | "Remotable";
-} & RemotableObject<`Alleged: ${string}` | "Remotable">;
-import type { RemotableObject } from '@endo/pass-style';
+    [Symbol.toStringTag]: InterfaceSpec;
+    #private;
+}
+import type { PassStyled } from '@endo/pass-style';
 export {};
 //# sourceMappingURL=wrap-marshaller.d.ts.map

package/src/marshal/wrap-marshaller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-marshaller.d.ts","sourceRoot":"","sources":["wrap-marshaller.js"],"names":[],"mappings":"AA4HO,kDATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;AAOM,+CAJO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,GAC3D,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAyBrD;AAxTM,qCATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;;;;;wBAjYa,IAAI,cACL,SAAS,MAAM,QAAQ,IAAI,CAAC,CAAC,CAAC;wBA+D7B,IAAI,cAAoB,UAAU,CAAC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;6BAvElD,aAAa;wCAD0B,eAAe;gCAHnD,iBAAiB;oBAN1B,WAAW;6BASkC,eAAe;2BAFxD,qBAAqB;8BACD,kBAAkB;AA+D3C,+BAJD,IAAI,kBACP,IAAI,UACJ,MAAM,GAGJ;IA9Cb,mBAAmB;;IAGnB,4BAA4B;;IA2CK,mDAA8B,CAE5D;qCAlEqC,kBAAkB"}
+{"version":3,"file":"wrap-marshaller.d.ts","sourceRoot":"","sources":["wrap-marshaller.js"],"names":[],"mappings":"AAqHO,kDATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;AAOM,+CAJO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,GAC3D,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAyBrD;AAxTM,qCATO,IAAI,wBACP,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,kEAC7D,kBAAkB,+CAE1B;IAAiD,SAAS;IACT,SAAS;IACjC,eAAe;CACxC,GAAU,UAAU,CAAC,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CA4RrD;;;;;wBA1Xa,IAAI,cACL,SAAS,MAAM,QAAQ,IAAI,CAAC,CAAC,CAAC;4BAG7B,WAAW,GAAG,YAAY,MAAM,EAAE;iCAyClC,IAAI,cACL,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,WAAW,EAAE,aAAa,CAAC;6BArD7C,aAAa;wCAD0B,eAAe;gCAHnD,iBAAiB;oBAN1B,WAAW;6BASkC,eAAe;2BAFxD,qBAAqB;8BACN,kBAAkB;AAHzD;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH,kEAAkE;AAElE,+BAA+B;AAC/B,0BADe,IAAI;IAsBjB;;;;OAIG;IACH,0CAHW,WAAW,CAAC,MAAI,CAAC,GACf,MAAI,CAIhB;IArBD;;;OAGG;IACH,kBAHW,IAAI,UACJ,MAAM,EAUhB;IAfD,4BAA4B;IAC5B,sBADW,aAAa,CACH;;CAwBtB;gCA7CsC,kBAAkB"}

package/src/marshal/wrap-marshaller.js

@@ -10,7 +10,7 @@ import { makeInaccessibleVal } from './inaccessible-val.js';
 /**
  * @import {WeakMapAPI} from '@endo/cache-map';
  * @import {EOnly} from '@endo/eventual-send';
- * @import {RemotableObject, Simplify} from '@endo/pass-style';
+ * @import {PassStyled, Simplify} from '@endo/pass-style';
  * @import {CapData, Passable, Marshal, MakeMarshalOptions} from '@endo/marshal';
  * @import {ERemote} from '../types.js';
  */
@@ -23,69 +23,62 @@ import { makeInaccessibleVal } from './inaccessible-val.js';
  * @typedef {Simplify<EOnly<Marshal<Slot>>>} EMarshaller
  */
 
-const { slotToWrapper, wrapperToSlot } = (() => {
-  /** @typedef {'Remotable' | `Alleged: ${string}`} InterfaceSpec */
-
-  /** @template [Slot=unknown] */
-  class SlotWrapper {
-    /** @type {Slot} */
-    #slot;
-
-    /** @type {InterfaceSpec} */
-    [Symbol.toStringTag];
-
-    /**
-     * @param {Slot} slot
-     * @param {string} [iface]
-     */
-    constructor(slot, iface) {
-      if (iface == null || iface === 'Remotable') {
-        iface = 'Remotable';
-      } else if (!iface.startsWith('Alleged: ')) {
-        iface = `Alleged: ${iface}`;
-      }
-      this.#slot = slot;
-      this[Symbol.toStringTag] = /** @type {InterfaceSpec} */ (iface);
-    }
+/** @typedef {'Remotable' | `Alleged: ${string}`} InterfaceSpec */
+
+/** @template [Slot=unknown] */
+class SlotWrapper {
+  /** @type {Slot} */
+  #slot;
 
-    /** @param {SlotWrapper} wrapper */
-    static getSlot(wrapper) {
-      return wrapper.#slot;
+  /** @type {InterfaceSpec} */
+  [Symbol.toStringTag];
+
+  /**
+   * @param {Slot} slot
+   * @param {string} [iface]
+   */
+  constructor(slot, iface) {
+    if (iface == null || iface === 'Remotable') {
+      iface = 'Remotable';
+    } else if (!iface.startsWith('Alleged: ')) {
+      iface = `Alleged: ${iface}`;
     }
+    this.#slot = slot;
+    this[Symbol.toStringTag] = /** @type {InterfaceSpec} */ (iface);
   }
-  Object.defineProperties(SlotWrapper.prototype, {
-    [PASS_STYLE]: { value: 'remotable' },
-    [Symbol.toStringTag]: { value: 'Alleged: SlotWrapper' },
-  });
-  Reflect.deleteProperty(SlotWrapper.prototype, 'constructor');
-  harden(SlotWrapper);
 
   /**
-   * @type {<Slot = unknown>(
-   *   wrapper: SlotWrapper<Slot> & RemotableObject<InterfaceSpec>,
-   * ) => Slot}
+   * @template [Slot=unknown]
+   * @param {SlotWrapper<Slot>} wrapper
+   * @returns {Slot}
    */
-  const getSlot = SlotWrapper.getSlot;
-
-  return {
-    /**
-     * @template [Slot=unknown]
-     * @param {Slot} slot
-     * @param {string} [iface]
-     */
-    slotToWrapper: (slot, iface) =>
-      /** @type {SlotWrapper<Slot> & RemotableObject<InterfaceSpec>} */ (
-        harden(new SlotWrapper(slot, iface))
-      ),
-
-    wrapperToSlot: getSlot,
-  };
-})();
+  static getSlot(wrapper) {
+    return wrapper.#slot;
+  }
+}
+Object.defineProperties(SlotWrapper.prototype, {
+  [PASS_STYLE]: { value: 'remotable' },
+  [Symbol.toStringTag]: { value: 'Alleged: SlotWrapper' },
+});
+Reflect.deleteProperty(SlotWrapper.prototype, 'constructor');
+harden(SlotWrapper);
+
+/**
+ * @template [Slot=unknown]
+ * @typedef {SlotWrapper<Slot> & PassStyled<'remotable', InterfaceSpec>} RemotableSlotWrapper
+ */
 
 /**
- * @template [Slot=unknown] @typedef {ReturnType<typeof slotToWrapper<Slot>>}
- *   SlotWrapper
+ * @template [Slot=unknown]
+ * @param {Slot} slot
+ * @param {string} [iface]
  */
+const slotToWrapper = (slot, iface) =>
+  /** @type {RemotableSlotWrapper<Slot>} */ (
+    harden(new SlotWrapper(slot, iface))
+  );
+
+const wrapperToSlot = SlotWrapper.getSlot;
 
 const capacityOfDefaultCache = 50;
 
@@ -160,7 +153,7 @@ export const wrapRemoteMarshallerSendSlotsOnly = (
     marshalOptions,
   );
 
-  /** @type {Map<Slot, SlotWrapper<NonNullable<Slot>>>} */
+  /** @type {Map<Slot, RemotableSlotWrapper<NonNullable<Slot>>>} */
   const currentSlotToWrapper = new Map();
 
   const convertWrapperToSlot = /** @type {typeof wrapperToSlot<Slot>} */ (
@@ -200,13 +193,13 @@ export const wrapRemoteMarshallerSendSlotsOnly = (
    * marshaller to recreate the passable data.
    *
    * @param {Slot[]} slots
-   * @param {(index: number) => SlotWrapper<NonNullable<Slot>>} getWrapper
+   * @param {(index: number) => RemotableSlotWrapper<NonNullable<Slot>>} getWrapper
    * @returns {Promise<(object | null)[]>}
    */
   const mapSlotsToCaps = async (slots, getWrapper) => {
     let hasRemoteCap = false;
     const { length } = slots;
-    /** @type {(SlotWrapper<NonNullable<Slot>> | null | undefined)[]} */
+    /** @type {(RemotableSlotWrapper<NonNullable<Slot>> | null | undefined)[]} */
     const slotWrapperMappedSlots = Array.from({ length });
     /** @type {(object | null | undefined)[]} */
     const locallyResolvedCapSlots = Array.from({ length });
@@ -304,7 +297,7 @@ export const wrapRemoteMarshallerSendSlotsOnly = (
       const remotelyResolvedSlotsCapData =
         await E(marshaller).toCapData(remoteCapsToResolve);
       try {
-        /** @type {(SlotWrapper<Slot> | null | undefined)[]} */
+        /** @type {(RemotableSlotWrapper<Slot> | null | undefined)[]} */
         const slotWrapperMappedSlots = slotWrapperMarshaller.fromCapData(
           remotelyResolvedSlotsCapData,
         );