@agoric/internal 0.2.2-dev-2788f8d.0 → 0.2.2-dev-0ce9545.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.2.2-dev-2788f8d.0+2788f8d",
+  "version": "0.2.2-dev-0ce9545.0+0ce9545",
   "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-2788f8d.0+2788f8d",
+    "@agoric/zone": "0.1.1-dev-0ce9545.0+0ce9545",
     "@endo/far": "^0.2.18",
     "@endo/marshal": "^0.8.5",
     "@endo/patterns": "^0.2.2",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2788f8d1343b7206b1b6322febdba52f3514e964"
+  "gitHead": "0ce9545041d41022e605b48da6d2561287591c54"
 }

package/src/callback.d.ts

@@ -5,30 +5,26 @@ 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<M extends PropertyKey>(zone: import('@agoric/zone').Zone, methodNames: M[], { interfaceGuard, tag }?: {
+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 }?: {
     interfaceGuard?: InterfaceGuard | undefined;
     tag?: string | undefined;
 }): (args_0: {
     target?: any;
     isSync?: boolean | undefined;
-    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): (args_0: {
-    target?: any;
-    isSync?: boolean | undefined;
-    overrides?: {
-        [x: string]: import("./types").Callback<any> | null | undefined;
-        [x: symbol]: import("./types").Callback<any> | null | undefined;
-    } | undefined;
-}) => {
-    [x: string]: (this: any, ...args: unknown[]) => any;
-    [x: symbol]: (this: any, ...args: unknown[]) => any;
-} & import("@endo/eventual-send").RemotableBrand<{}, {
+    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?: {
+    tag?: string | undefined;
+} | undefined): AttenuatorMaker<Methods>;
+export type AttenuatorMaker<T> = AttenuatorMaker<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":"AAkDO,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;;aAkEb,GAAG;;;2BA1DI,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG,4EAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG,KA8FpD;AAWM,+CALI,OAAO,cAAc,EAAE,IAAI,kBAC3B,cAAc;;;aA3CV,GAAG;;;;;;;wBA1DI,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;wBAA/B,GAAG,WAAW,OAAO,EAAE,KAAK,GAAG;GA6GpD;yCAzSuB,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;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"}

package/src/callback.js

@@ -12,6 +12,11 @@ const ownKeys =
     rawOwnKeys
   );
 
+/**
+ * @template T
+ * @typedef {(...args: Parameters<ReturnType<prepareAttenuator>>) => Farable<T>} AttenuatorMaker
+ */
+
 /**
  * @template {(...args: unknown[]) => any} I
  * @typedef {import('./types').Callback<I>} Callback
@@ -187,9 +192,9 @@ harden(isCallback);
 /**
  * Prepare an attenuator class whose methods can be redirected via callbacks.
  *
- * @template {PropertyKey} M
+ * @template {{ [K in PropertyKey]: (this: any, ...args: unknown[]) => any}} Methods
  * @param {import('@agoric/zone').Zone} zone The zone in which to allocate attenuators.
- * @param {M[]} methodNames Methods to forward.
+ * @param {(keyof Methods)[]} methodNames Methods to forward.
  * @param {object} opts
  * @param {InterfaceGuard} [opts.interfaceGuard] An interface guard for the
  * new attenuator.
@@ -202,43 +207,44 @@ export const prepareAttenuator = (
 ) => {
   /**
    * @typedef {(this: any, ...args: unknown[]) => any} Method
-   * @typedef {{ [K in M]: Method }} Methods
-   * @typedef {{ [K in M]?: Callback<any> | null}} Overrides
+   * @typedef {{ [K in keyof Methods]?: Callback<any> | null}} Overrides
    */
-  const methods = fromEntries(
-    methodNames.map(key => {
-      // Only allow the `PropertyKey` type for the target method key.
-      if (!isPropertyKey(key)) {
-        throw Fail`key ${q(key)} is not a PropertyKey`;
-      }
+  const methods = /** @type {Methods} */ (
+    fromEntries(
+      methodNames.map(key => {
+        // Only allow the `PropertyKey` type for the target method key.
+        if (!isPropertyKey(key)) {
+          throw Fail`key ${q(key)} is not a PropertyKey`;
+        }
 
-      const m = /** @type {Methods} */ ({
-        // Explicitly use concise method syntax to preserve `this` but prevent
-        // constructor behavior.
-        /** @type {Method} */
-        [key](...args) {
-          // Support both synchronous and async callbacks.
-          const cb = this.state.cbs[key];
-          if (!cb) {
-            const err = assert.error(
-              `unimplemented ${q(tag)} method ${q(key)}`,
-            );
-            if (this.state.isSync) {
-              throw err;
+        const m = /** @type {Methods} */ ({
+          // Explicitly use concise method syntax to preserve `this` but prevent
+          // constructor behavior.
+          /** @type {Method} */
+          [key](...args) {
+            // Support both synchronous and async callbacks.
+            const cb = this.state.cbs[key];
+            if (!cb) {
+              const err = assert.error(
+                `unimplemented ${q(tag)} method ${q(key)}`,
+              );
+              if (this.state.isSync) {
+                throw err;
+              }
+              return Promise.reject(err);
+            }
+            if (cb.isSync) {
+              return callSync(cb, ...args);
             }
-            return Promise.reject(err);
-          }
-          if (cb.isSync) {
-            return callSync(cb, ...args);
-          }
-          return callE(cb, ...args);
-        },
-      })[key];
-      return /** @type {const} */ ([key, m]);
-    }),
+            return callE(cb, ...args);
+          },
+        })[key];
+        return /** @type {const} */ ([key, m]);
+      }),
+    )
   );
 
-  const methodKeys = /** @type {M[]} */ (ownKeys(methods));
+  const methodKeys = /** @type {(keyof Methods)[]} */ (ownKeys(methods));
 
   /**
    * Create an exo object whose behavior is composed from a default target
@@ -301,6 +307,7 @@ 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]
@@ -309,6 +316,8 @@ harden(prepareAttenuator);
 export const prepareGuardedAttenuator = (zone, interfaceGuard, opts = {}) => {
   const { methodGuards } = interfaceGuard;
   const methodNames = ownKeys(methodGuards);
-  return prepareAttenuator(zone, methodNames, { ...opts, interfaceGuard });
+  return /** @type {AttenuatorMaker<Methods>} */ (
+    prepareAttenuator(zone, methodNames, { ...opts, interfaceGuard })
+  );
 };
 harden(prepareGuardedAttenuator);