@agoric/internal 0.2.2-dev-0ce9545.0 → 0.2.2-dev-0fc1914.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.2.2-dev-0ce9545.0+0ce9545",
+  "version": "0.2.2-dev-0fc1914.0+0fc1914",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,7 +20,7 @@
     "lint:types": "tsc -p jsconfig.json"
   },
   "dependencies": {
-    "@agoric/zone": "0.1.1-dev-0ce9545.0+0ce9545",
+    "@agoric/zone": "0.1.1-dev-0fc1914.0+0fc1914",
     "@endo/far": "^0.2.18",
     "@endo/marshal": "^0.8.5",
     "@endo/patterns": "^0.2.2",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0ce9545041d41022e605b48da6d2561287591c54"
+  "gitHead": "0fc1914edf1440ceeaa8c7c0ede955a60723e446"
 }

package/src/callback.d.ts

@@ -5,26 +5,18 @@ export function makeFunctionCallback<I extends (...args: unknown[]) => any, T ex
 export function makeSyncMethodCallback<I extends (...args: unknown[]) => any, P extends PropertyKey, T extends { [x in P]: (...args: [...B, ...Parameters<I>]) => ReturnType<I>; } = { [x_1 in P]: I; }, B extends unknown[] = []>(target: T, methodName: P, ...bound: B): import("./types").SyncCallback<I>;
 export function makeMethodCallback<I extends (...args: unknown[]) => any, P extends PropertyKey, T extends import("@endo/far").ERef<{ [x in P]: (...args: [...B, ...Parameters<I>]) => ReturnType<I>; }> = import("@endo/far").ERef<{ [x_1 in P]: I; }>, B extends unknown[] = []>(target: T, methodName: P, ...bound: B): import("./types").Callback<I>;
 export function isCallback(callback: any): callback is import("./types").Callback<any>;
-export function prepareAttenuator<Methods extends {
-    [x: string]: (this: any, ...args: unknown[]) => any;
-    [x: number]: (this: any, ...args: unknown[]) => any;
-    [x: symbol]: (this: any, ...args: unknown[]) => any;
-}>(zone: import('@agoric/zone').Zone, methodNames: (keyof Methods)[], { interfaceGuard, tag }?: {
+export function prepareAttenuator<M extends PropertyKey>(zone: import('@agoric/zone').Zone, methodNames: M[], { interfaceGuard, tag }?: {
     interfaceGuard?: InterfaceGuard | undefined;
     tag?: string | undefined;
 }): (args_0: {
     target?: any;
     isSync?: boolean | undefined;
-    overrides?: { [K in keyof Methods]?: import("./types").Callback<any> | null | undefined; } | undefined;
-}) => Methods & import("@endo/eventual-send").RemotableBrand<{}, Methods>;
-export function prepareGuardedAttenuator<Methods extends {
-    [x: string]: (this: any, ...args: unknown[]) => any;
-    [x: number]: (this: any, ...args: unknown[]) => any;
-    [x: symbol]: (this: any, ...args: unknown[]) => any;
-}>(zone: import('@agoric/zone').Zone, interfaceGuard: InterfaceGuard, opts?: {
+    overrides?: { [K in M]?: import("./types").Callback<any> | null | undefined; } | undefined;
+}) => { [K_1 in M]: (this: any, ...args: unknown[]) => any; } & import("@endo/eventual-send").RemotableBrand<{}, { [K_1 in M]: (this: any, ...args: unknown[]) => any; }>;
+export function prepareGuardedAttenuator(zone: import('@agoric/zone').Zone, interfaceGuard: InterfaceGuard, opts?: {
     tag?: string | undefined;
-} | undefined): AttenuatorMaker<Methods>;
-export type AttenuatorMaker<T> = AttenuatorMaker<T>;
+} | undefined): MakeAttenuator<any>;
+export type MakeAttenuator<T> = MakeAttenuator<T>;
 export type Callback<I extends (...args: unknown[]) => any> = import('./types').Callback<I>;
 export type SyncCallback<I extends (...args: unknown[]) => any> = import('./types').SyncCallback<I>;
 export type Farable<T> = import('@endo/eventual-send').RemotableBrand<{}, T> & T;

package/src/callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["callback.js"],"names":[],"mappings":"AAuDO,6CALiB,OAAO,EAAE,KAAK,GAAG,sFAWxC;AAWM,0CALiB,OAAO,EAAE,KAAK,GAAG,oGAWxC;AAaM,6DAPiB,OAAO,EAAE,KAAK,GAAG,2JAaxC;AAeM,yDATiB,OAAO,EAAE,KAAK,GAAG,2MAexC;AAiBM,2DAXiB,OAAO,EAAE,KAAK,GAAG,iOAoBxC;AAiBM,uDAXiB,OAAO,EAAE,KAAK,GAAG,iRAmBxC;AAOM,qCAHI,GAAG,+CAeb;AAcM;wBARoC,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;SAC/D,OAAO,cAAc,EAAE,IAAI;IAGL,cAAc;IAEtB,GAAG;;aAmEb,GAAG;;;0EAoCjB;AAYM;wBANoC,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;SAC/D,OAAO,cAAc,EAAE,IAAI,kBAC3B,cAAc;;yCAUxB;;yCA7SuB,OAAO,EAAE,KAAK,GAAG,IAC5B,OAAO,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;6CAIlB,OAAO,EAAE,KAAK,GAAG,IAC5B,OAAO,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;yBAGpB,OAAO,qBAAqB,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC"}
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["callback.js"],"names":[],"mappings":"AAuDO,6CALiB,OAAO,EAAE,KAAK,GAAG,sFAWxC;AAWM,0CALiB,OAAO,EAAE,KAAK,GAAG,oGAWxC;AAaM,6DAPiB,OAAO,EAAE,KAAK,GAAG,2JAaxC;AAeM,yDATiB,OAAO,EAAE,KAAK,GAAG,2MAexC;AAiBM,2DAXiB,OAAO,EAAE,KAAK,GAAG,iOAoBxC;AAiBM,uDAXiB,OAAO,EAAE,KAAK,GAAG,iRAmBxC;AAOM,qCAHI,GAAG,+CAeb;AAcM,+DAPI,OAAO,cAAc,EAAE,IAAI;IAGL,cAAc;IAEtB,GAAG;;aAoEb,GAAG;;;2BA1DgB,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG,4EAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG,KA8FhE;AAWM,+CALI,OAAO,cAAc,EAAE,IAAI,kBAC3B,cAAc;;oCAYxB;;yCA/SuB,OAAO,EAAE,KAAK,GAAG,IAC5B,OAAO,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;6CAIlB,OAAO,EAAE,KAAK,GAAG,IAC5B,OAAO,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;yBAGpB,OAAO,qBAAqB,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC"}

package/src/callback.js

@@ -14,7 +14,7 @@ const ownKeys =
 
 /**
  * @template T
- * @typedef {(...args: Parameters<ReturnType<prepareAttenuator>>) => Farable<T>} AttenuatorMaker
+ * @typedef {(...args: Parameters<ReturnType<prepareAttenuator>>) => Farable<T>} MakeAttenuator
  */
 
 /**
@@ -192,9 +192,9 @@ harden(isCallback);
 /**
  * Prepare an attenuator class whose methods can be redirected via callbacks.
  *
- * @template {{ [K in PropertyKey]: (this: any, ...args: unknown[]) => any}} Methods
+ * @template {PropertyKey} M
  * @param {import('@agoric/zone').Zone} zone The zone in which to allocate attenuators.
- * @param {(keyof Methods)[]} methodNames Methods to forward.
+ * @param {M[]} methodNames Methods to forward.
  * @param {object} opts
  * @param {InterfaceGuard} [opts.interfaceGuard] An interface guard for the
  * new attenuator.
@@ -207,7 +207,8 @@ export const prepareAttenuator = (
 ) => {
   /**
    * @typedef {(this: any, ...args: unknown[]) => any} Method
-   * @typedef {{ [K in keyof Methods]?: Callback<any> | null}} Overrides
+   * @typedef {{ [K in M]?: Callback<any> | null}} Overrides
+   * @typedef {{ [K in M]: (this: any, ...args: unknown[]) => any }} Methods
    */
   const methods = /** @type {Methods} */ (
     fromEntries(
@@ -307,7 +308,6 @@ harden(prepareAttenuator);
 /**
  * Prepare an attenuator whose methodNames are derived from the interfaceGuard.
  *
- * @template {{ [K in PropertyKey]: (this: any, ...args: unknown[]) => any}} Methods
  * @param {import('@agoric/zone').Zone} zone
  * @param {InterfaceGuard} interfaceGuard
  * @param {object} [opts]
@@ -316,8 +316,10 @@ harden(prepareAttenuator);
 export const prepareGuardedAttenuator = (zone, interfaceGuard, opts = {}) => {
   const { methodGuards } = interfaceGuard;
   const methodNames = ownKeys(methodGuards);
-  return /** @type {AttenuatorMaker<Methods>} */ (
-    prepareAttenuator(zone, methodNames, { ...opts, interfaceGuard })
-  );
+  const makeAttenuator = prepareAttenuator(zone, methodNames, {
+    ...opts,
+    interfaceGuard,
+  });
+  return /** @type {MakeAttenuator<any>} */ (makeAttenuator);
 };
 harden(prepareGuardedAttenuator);

package/src/storage-test-utils.d.ts

@@ -38,9 +38,9 @@ export function makeFakeStorageKit(rootPath: string, rootOptions?: [handleStorag
 export function makeMockChainStorageRoot(): {
     /**
      * Defaults to deserializing slot references into plain Remotable
-     * objects, but if supplied with a different marshaller, it could
-     * produce Remotables with e.g. the slot string embedded in the
-     * iface.
+     * objects having the specified interface name (as from `Far(iface)`),
+     * but can accept a different marshaller for producing Remotables
+     * that e.g. embed the slot string in their iface name.
      *
      * @param {string} path
      * @param {import('./lib-chainStorage.js').Marshaller} marshaller
@@ -57,9 +57,9 @@ export function makeMockChainStorageRoot(): {
 } & import("@endo/eventual-send").RemotableBrand<{}, {
     /**
      * Defaults to deserializing slot references into plain Remotable
-     * objects, but if supplied with a different marshaller, it could
-     * produce Remotables with e.g. the slot string embedded in the
-     * iface.
+     * objects having the specified interface name (as from `Far(iface)`),
+     * but can accept a different marshaller for producing Remotables
+     * that e.g. embed the slot string in their iface name.
      *
      * @param {string} path
      * @param {import('./lib-chainStorage.js').Marshaller} marshaller

package/src/storage-test-utils.js

@@ -140,9 +140,9 @@ export const makeMockChainStorageRoot = () => {
     ...bindAllMethods(rootNode),
     /**
      * Defaults to deserializing slot references into plain Remotable
-     * objects, but if supplied with a different marshaller, it could
-     * produce Remotables with e.g. the slot string embedded in the
-     * iface.
+     * objects having the specified interface name (as from `Far(iface)`),
+     * but can accept a different marshaller for producing Remotables
+     * that e.g. embed the slot string in their iface name.
      *
      * @param {string} path
      * @param {import('./lib-chainStorage.js').Marshaller} marshaller