@agoric/async-flow 0.1.1-dev-31a57fc.0 → 0.1.1-dev-ab4941a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/async-flow",
-  "version": "0.1.1-dev-31a57fc.0+31a57fc",
+  "version": "0.1.1-dev-ab4941a.0+ab4941a",
   "description": "Upgrade async functions at await points by replay",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -24,10 +24,10 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-31a57fc.0+31a57fc",
-    "@agoric/internal": "0.3.3-dev-31a57fc.0+31a57fc",
-    "@agoric/store": "0.9.3-dev-31a57fc.0+31a57fc",
-    "@agoric/vow": "0.1.1-dev-31a57fc.0+31a57fc",
+    "@agoric/base-zone": "0.1.1-dev-ab4941a.0+ab4941a",
+    "@agoric/internal": "0.3.3-dev-ab4941a.0+ab4941a",
+    "@agoric/store": "0.9.3-dev-ab4941a.0+ab4941a",
+    "@agoric/vow": "0.1.1-dev-ab4941a.0+ab4941a",
     "@endo/common": "^1.2.2",
     "@endo/errors": "^1.2.2",
     "@endo/eventual-send": "^1.2.2",
@@ -37,8 +37,8 @@
     "@endo/promise-kit": "^1.1.2"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-31a57fc.0+31a57fc",
-    "@agoric/zone": "0.2.3-dev-31a57fc.0+31a57fc",
+    "@agoric/swingset-liveslots": "0.10.3-dev-ab4941a.0+ab4941a",
+    "@agoric/zone": "0.2.3-dev-ab4941a.0+ab4941a",
     "@endo/env-options": "^1.1.4",
     "@endo/ses-ava": "^1.2.2",
     "ava": "^5.3.0",
@@ -61,7 +61,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 76.95
+    "atLeast": 76.94
   },
-  "gitHead": "31a57fcc7ed223d138521e7bf9de090378f29962"
+  "gitHead": "ab4941a38e563ef355fadbf464e1694e02923d54"
 }

package/src/async-flow.d.ts

@@ -29,9 +29,9 @@ export function prepareAsyncFlowTools(outerZone: Zone, outerOptions?: Preparatio
             onRejected(_fulfillment: any): void;
         };
     }>;
-    asyncFlow: (zone: Zone, tag: string, guestFunc: GuestAsyncFunc, options?: {
+    asyncFlow: <F extends GuestAsyncFunc>(zone: Zone, tag: string, guestFunc: F, options?: {
         startEager?: boolean;
-    } | undefined) => HostAsyncFuncWrapper;
+    } | undefined) => HostOf<F>;
     adminAsyncFlow: import("@endo/exo").Guarded<{
         getFailures(): import("@endo/patterns").CopyMap<any, import("@endo/pass-style").Passable>;
         wakeAll(): void;
@@ -71,9 +71,9 @@ export type AsyncFlowTools = ReturnType<(outerZone: Zone, outerOptions?: Prepara
             onRejected(_fulfillment: any): void;
         };
     }>;
-    asyncFlow: (zone: Zone, tag: string, guestFunc: GuestAsyncFunc, options?: {
+    asyncFlow: <F extends GuestAsyncFunc>(zone: Zone, tag: string, guestFunc: F, options?: {
         startEager?: boolean;
-    } | undefined) => HostAsyncFuncWrapper;
+    } | undefined) => HostOf<F>;
     adminAsyncFlow: import("@endo/exo").Guarded<{
         getFailures(): import("@endo/patterns").CopyMap<any, import("@endo/pass-style").Passable>;
         wakeAll(): void;
@@ -90,5 +90,5 @@ import type { Zone } from '@agoric/base-zone';
 import type { PreparationOptions } from '../src/types.js';
 import type { GuestAsyncFunc } from '../src/types.js';
 import type { FlowState } from '../src/types.js';
-import type { HostAsyncFuncWrapper } from '../src/types.js';
+import type { HostOf } from '../src/types.js';
 //# sourceMappingURL=async-flow.d.ts.map

package/src/async-flow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async-flow.d.ts","sourceRoot":"","sources":["async-flow.js"],"names":[],"mappings":"AAgDO,iDAHI,IAAI;gCA6CF,IAAI,OACJ,MAAM,kBACN,cAAc;qBACC,OAAO;;;YA4BzB;;eAEG;4BADU,SAAS;YAkCtB;;;;;eAKG;;;;;;;;;;;;;;;;;sBAmRA,IAAI,OACJ,MAAM,aACN,cAAc;qBACC,OAAO;sBACpB,oBAAoB;;;;;;;;EAmDlC;6BAIY,UAAU,aAlcZ,IAAI;gCA6CF,IAAI,OACJ,MAAM,kBACN,cAAc;qBACC,OAAO;;;YA4BzB;;eAEG;4BADU,SAAS;YAkCtB;;;;;eAKG;;;;;;;;;;;;;;;;;sBAmRA,IAAI,OACJ,MAAM,aACN,cAAc;qBACC,OAAO;sBACpB,oBAAoB;;;;;;;;EAuDW;6BAIjC,cAAc,CAAC,gBAAgB,CAAC;+BAIhC,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;2BAIjD,UAAU,CAAC,gBAAgB,CAAC;wBAI5B,YAAY,CAAC,MAAM,CAAC;0BAjfV,mBAAmB;wCAC4C,iBAAiB;oCAAjB,iBAAiB;+BAAjB,iBAAiB;0CAAjB,iBAAiB"}
+{"version":3,"file":"async-flow.d.ts","sourceRoot":"","sources":["async-flow.js"],"names":[],"mappings":"AAgDO,iDAHI,IAAI;gCA6CF,IAAI,OACJ,MAAM,kBACN,cAAc;qBACC,OAAO;;;YA4BzB;;eAEG;4BADU,SAAS;YAkCtB;;;;;eAKG;;;;;;;;;;;;;;;;;gBAmRmB,CAAC,SAAlB,cAAgB,QAClB,IAAI,OACJ,MAAM,aACN,CAAC;qBACc,OAAO;sBACpB,OAAO,CAAC,CAAC;;;;;;;;EAsDvB;6BAIY,UAAU,aAtcZ,IAAI;gCA6CF,IAAI,OACJ,MAAM,kBACN,cAAc;qBACC,OAAO;;;YA4BzB;;eAEG;4BADU,SAAS;YAkCtB;;;;;eAKG;;;;;;;;;;;;;;;;;gBAmRmB,CAAC,SAAlB,cAAgB,QAClB,IAAI,OACJ,MAAM,aACN,CAAC;qBACc,OAAO;sBACpB,OAAO,CAAC,CAAC;;;;;;;;EA0DsB;6BAIjC,cAAc,CAAC,gBAAgB,CAAC;+BAIhC,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;2BAIjD,UAAU,CAAC,gBAAgB,CAAC;wBAI5B,YAAY,CAAC,MAAM,CAAC;0BArfV,mBAAmB;wCACoD,iBAAiB;oCAAjB,iBAAiB;+BAAjB,iBAAiB;4BAAjB,iBAAiB"}

package/src/async-flow.js

@@ -13,7 +13,7 @@ import { LogEntryShape, FlowStateShape } from './type-guards.js';
 /**
  * @import {WeakMapStore} from '@agoric/store'
  * @import {Zone} from '@agoric/base-zone'
- * @import {FlowState, GuestAsyncFunc, HostAsyncFuncWrapper, PreparationOptions} from '../src/types.js'
+ * @import {FlowState, GuestAsyncFunc, HostAsyncFuncWrapper, HostOf, PreparationOptions} from '../src/types.js'
  * @import {ReplayMembrane} from '../src/replay-membrane.js'
  */
 
@@ -434,21 +434,25 @@ export const prepareAsyncFlowTools = (outerZone, outerOptions = {}) => {
   };
 
   /**
+   * @template {GuestAsyncFunc} F
    * @param {Zone} zone
    * @param {string} tag
-   * @param {GuestAsyncFunc} guestFunc
+   * @param {F} guestFunc
    * @param {{ startEager?: boolean }} [options]
-   * @returns {HostAsyncFuncWrapper}
+   * @returns {HostOf<F>}
    */
   const asyncFlow = (zone, tag, guestFunc, options = undefined) => {
     const makeAsyncFlowKit = prepareAsyncFlowKit(zone, tag, guestFunc, options);
     const hostFuncName = `${tag}_hostFlow`;
-    const wrapperFunc = {
-      [hostFuncName](...args) {
-        const { flow } = makeAsyncFlowKit(args);
-        return flow.getOutcome();
-      },
-    }[hostFuncName];
+
+    const wrapperFunc = /** @type {HostOf<F>} */ (
+      {
+        [hostFuncName](...args) {
+          const { flow } = makeAsyncFlowKit(args);
+          return flow.getOutcome();
+        },
+      }[hostFuncName]
+    );
     defineProperties(wrapperFunc, {
       length: { value: guestFunc.length },
     });

package/src/types.d.ts

@@ -51,6 +51,13 @@ type HostInterface<T> = {
   [K in keyof T]: HostOf<T[K]>;
 };
 
+/**
+ * Convert an entire Host interface into what the Guest will receive.
+ */
+type GuestInterface<T> = {
+  [K in keyof T]: GuestOf<T[K]>;
+};
+
 /**
  * The function the host must provide to match an interface the guest expects.
  *
@@ -60,6 +67,8 @@ export type HostOf<F> = F extends (...args: infer A) => Promise<infer R>
   ? (...args: A) => Vow<R extends Passable ? R : HostInterface<R>>
   : F;
 
+export type HostArgs<GA extends any[]> = { [K in keyof GA]: HostOf<GA[K]> };
+
 export type PreparationOptions = {
   vowTools?: VowTools;
   makeLogStore?: (() => LogStore) | undefined;