@agoric/vow 0.1.1-dev-24f7f32.0 → 0.1.1-dev-459998d.0

package/README.md

@@ -26,12 +26,12 @@ Here they are: {
 }
 ```
 
-On Agoric, you can use `V` exported from `@agoric/vat-data/vow.js`, which
+On Agoric, you can use `V` exported from `@agoric/vow/vat.js`, which
 converts a chain of promises and vows to a promise for its final
 fulfilment, by unwrapping any intermediate vows:
 
 ```js
-import { V as E } from '@agoric/vat-data/vow.js';
+import { V as E } from '@agoric/vow/vat.js';
 [...]
 const a = await E.when(w1);
 const b = await E(w2).something(...args);
@@ -45,7 +45,7 @@ On Agoric, use the following to create and resolve a vow:
 ```js
 // CAVEAT: `V` uses internal ephemeral promises, so while it is convenient,
 // it cannot be used by upgradable vats.  See "Durability" below:
-import { V as E, makeVowKit } from '@agoric/vat-data/vow.js';
+import { V as E, makeVowKit } from '@agoric/vow/vat.js';
 [...]
 const { resolver, vow } = makeVowKit();
 // Send vow to a potentially different vat.
@@ -56,16 +56,15 @@ resolver.resolve('now you know the answer');
 
 ## Durability
 
-The vow package supports Zones, which are used to integrate Agoric's vat
-upgrade mechanism and `watchPromise`.  To create vow tools that deal with
-durable objects:
+The `@agoric/vow/vat.js` module allows vows to integrate Agoric's vat upgrade
+mechanism.  To create vow tools that deal with durable objects:
 
 ```js
 // NOTE: Cannot use `V` as it has non-durable internal state when unwrapping
 // vows.  Instead, use the default vow-exposing `E` with the `watch`
 // operator.
 import { E } from '@endo/far';
-import { prepareVowTools } from '@agoric/vat-data/vow.js';
+import { prepareVowTools } from '@agoric/vow/vat.js';
 import { makeDurableZone } from '@agoric/zone';
 
 // Only do the following once at the start of a new vat incarnation:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-24f7f32.0+24f7f32",
+  "version": "0.1.1-dev-459998d.0+459998d",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -20,7 +20,8 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-24f7f32.0+24f7f32",
+    "@agoric/base-zone": "0.1.1-dev-459998d.0+459998d",
+    "@agoric/internal": "0.3.3-dev-459998d.0+459998d",
     "@endo/env-options": "^1.1.3",
     "@endo/eventual-send": "^1.2.1",
     "@endo/pass-style": "^1.3.1",
@@ -28,7 +29,6 @@
     "@endo/promise-kit": "^1.1.1"
   },
   "devDependencies": {
-    "@agoric/internal": "0.3.3-dev-24f7f32.0+24f7f32",
     "@endo/far": "^1.1.1",
     "@endo/init": "^1.1.1",
     "ava": "^5.3.0"
@@ -49,5 +49,5 @@
   "typeCoverage": {
     "atLeast": 89.21
   },
-  "gitHead": "24f7f32495a6eda13fd75d18620ab9f7989b5d2e"
+  "gitHead": "459998d3944d5ad9d495de146a6322aedcdd06d0"
 }

package/src/tools.d.ts

@@ -1,6 +1,5 @@
 export function prepareVowTools(zone: import("@agoric/base-zone").Zone, powers?: {
     isRetryableReason?: ((reason: any) => boolean) | undefined;
-    watchPromise?: ((p: PromiseLike<any>, watcher: import("./watch-promise.js").PromiseWatcher, ...args: unknown[]) => void) | undefined;
 } | undefined): {
     when: <T, TResult1 = import("./types.js").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("./types.js").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
     watch: <T_1 = unknown, TResult1_1 = T_1, TResult2_1 = T_1, C = unknown>(specimenP: import("./types.js").ERef<T_1 | import("./types.js").Vow<T_1>>, watcher?: import("./types.js").Watcher<T_1, TResult1_1, TResult2_1, any> | undefined, watcherContext?: C | undefined) => import("./types.js").Vow<TResult1_1 | TResult2_1>;

package/src/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAYO,sCALI,OAAO,mBAAmB,EAAE,IAAI;kCAEvB,GAAG,KAAK,OAAO;wBACpB,WAAW,CAAC,GAAG,CAAC,WAAW,OAAO,oBAAoB,EAAE,cAAc,WAAW,OAAO,EAAE,KAAK,IAAI;;sFAAjE,CAAC,yBAAgD,OAAS,YAAW,EAAE,MAAM,CAAC,CAAC,CAAC;uFAewiG,OAAO,YAAY,EAAE,IAAI,CAAC,GAAC,GAAE,OAAQ,YAAY,EAAE,GAAG,CAAC,GAAC,CAAC,CAAC;;;EAFluG"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAWO,sCAJI,OAAO,mBAAmB,EAAE,IAAI;kCAEvB,GAAG,KAAK,OAAO;;sFAEU,CAAC,yBACR,OAAQ,YAC1C,EAAE,MAAM,CAAC,CAAC,CAAC;uFAWwtG,OAAO,YAAY,EAAE,IAAI,CAAC,GAAC,GAAE,OAAQ,YAAY,EAAE,GAAG,CAAC,GAAC,CAAC,CAAC;;;EAFhyG"}

package/src/tools.js

@@ -8,13 +8,12 @@ import { prepareWatchUtils } from './watch-utils.js';
  * @param {import('@agoric/base-zone').Zone} zone
  * @param {object} [powers]
  * @param {(reason: any) => boolean} [powers.isRetryableReason]
- * @param {(p: PromiseLike<any>, watcher: import('./watch-promise.js').PromiseWatcher, ...args: unknown[]) => void} [powers.watchPromise]
  */
 export const prepareVowTools = (zone, powers = {}) => {
-  const { isRetryableReason = () => false, watchPromise } = powers;
-  const makeVowKit = prepareVowKit(zone, watchPromise);
+  const { isRetryableReason = () => false } = powers;
+  const makeVowKit = prepareVowKit(zone);
   const when = makeWhen(isRetryableReason);
-  const watch = prepareWatch(zone, makeVowKit, watchPromise, isRetryableReason);
+  const watch = prepareWatch(zone, makeVowKit, isRetryableReason);
   const makeWatchUtils = prepareWatchUtils(zone, watch, makeVowKit);
   const watchUtils = makeWatchUtils();
 

package/src/types.d.ts

@@ -62,7 +62,6 @@ export type Watcher<T = any, TResult1 = T, TResult2 = T, C = any> = {
 export type Specimen<T = any> = import("./types.js").ERef<T | import("./types.js").Vow<T>>;
 export type VowTools = ReturnType<(zone: import("@agoric/base-zone").Zone, powers?: {
     isRetryableReason?: ((reason: any) => boolean) | undefined;
-    watchPromise?: ((p: PromiseLike<any>, watcher: import("./watch-promise.js").PromiseWatcher, ...args: unknown[]) => void) | undefined;
 } | undefined) => {
     when: <T, TResult1 = Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("./types").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
     watch: <T_1 = unknown, TResult1_1 = T_1, TResult2_1 = T_1, C = unknown>(specimenP: import("./types").ERef<T_1 | import("./types").Vow<T_1>>, watcher?: Watcher<T_1, TResult1_1, TResult2_1, any> | undefined, watcherContext?: C | undefined) => Vow<TResult1_1 | TResult2_1>;

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}

package/src/vow.d.ts

@@ -1,3 +1,3 @@
-export function prepareVowKit(zone: import("@agoric/base-zone").Zone, watchPromise?: ((p: Promise<any>, watcher: PromiseWatcher, ...watcherArgs: unknown[]) => void) | undefined): <T>() => import("./types.js").VowKit<T>;
+export function prepareVowKit(zone: import("@agoric/base-zone").Zone): <T>() => import("./types.js").VowKit<T>;
 export type VowEphemera = Partial<import("@endo/promise-kit").PromiseKit<any>> & Pick<import("@endo/promise-kit").PromiseKit<any>, "promise">;
 //# sourceMappingURL=vow.d.ts.map

package/src/vow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vow.d.ts","sourceRoot":"","sources":["vow.js"],"names":[],"mappings":"AAkBO,oCAHI,OAAO,mBAAmB,EAAE,IAAI,sBAyBU,YAElD,WAAe,cAAc,qDAoFW,CAAC,OAA7B,OAAO,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAS5C;0BA7HY,OAAO,CAAC,OAAO,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,GAChE,IAAQ,CAAC,OAAO,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC"}
+{"version":3,"file":"vow.d.ts","sourceRoot":"","sources":["vow.js"],"names":[],"mappings":"AAiBO,oCAFI,OAAO,mBAAmB,EAAE,IAAI,IA8GA,CAAC,OAA7B,OAAO,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAS5C;0BA5HY,OAAO,CAAC,OAAO,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,GAChE,IAAQ,CAAC,OAAO,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC"}

package/src/vow.js

@@ -2,7 +2,7 @@
 import { makePromiseKit } from '@endo/promise-kit';
 import { M } from '@endo/patterns';
 import { makeTagged } from '@endo/pass-style';
-import { PromiseWatcherI, watchPromiseShim } from './watch-promise.js';
+import { PromiseWatcherI } from '@agoric/base-zone';
 
 const sink = () => {};
 harden(sink);
@@ -14,9 +14,8 @@ harden(sink);
 
 /**
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {typeof watchPromiseShim} [watchPromise]
  */
-export const prepareVowKit = (zone, watchPromise = watchPromiseShim) => {
+export const prepareVowKit = zone => {
   /** @type {WeakMap<import('./types.js').VowResolver, VowEphemera>} */
   const resolverToEphemera = new WeakMap();
 
@@ -94,7 +93,7 @@ export const prepareVowKit = (zone, watchPromise = watchPromiseShim) => {
           const { promise, resolve } = getPromiseKitForResolution(resolver);
           if (resolve) {
             resolve(value);
-            watchPromise(promise, this.facets.watchNextStep);
+            zone.watchPromise(promise, this.facets.watchNextStep);
           }
         },
         /**

package/src/watch.d.ts

@@ -1,3 +1,3 @@
-export function prepareWatch(zone: import("@agoric/base-zone").Zone, makeVowKit: () => import("./types.js").VowKit<any>, watchPromise?: ((p: Promise<any>, watcher: PromiseWatcher, ...watcherArgs: unknown[]) => void) | undefined, isRetryableReason?: ((reason: any) => boolean) | undefined): <T = unknown, TResult1 = T, TResult2 = T, C = unknown>(specimenP: import("./types.js").ERef<T | import("./types.js").Vow<T>>, watcher?: import("./types.js").Watcher<T, TResult1, TResult2, any> | undefined, watcherContext?: C | undefined) => import("./types.js").Vow<TResult1 | TResult2>;
+export function prepareWatch(zone: import("@agoric/base-zone").Zone, makeVowKit: () => import("./types.js").VowKit<any>, isRetryableReason?: ((reason: any) => boolean) | undefined): <T = unknown, TResult1 = T, TResult2 = T, C = unknown>(specimenP: import("./types.js").ERef<T | import("./types.js").Vow<T>>, watcher?: import("./types.js").Watcher<T, TResult1, TResult2, any> | undefined, watcherContext?: C | undefined) => import("./types.js").Vow<TResult1 | TResult2>;
 export type Watch = ReturnType<typeof prepareWatch>;
 //# sourceMappingURL=watch.d.ts.map

package/src/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AAqHO,mCALI,OAAO,mBAAmB,EAAE,IAAI,cAChC,MAAM,OAAO,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,sBA5EP,YAAY,WACpD,cACK,iFA4Ea,GAAG,KAAK,OAAO,iBAoBiC,CAAC,gEAAxD,OAAO,YAAY,EAAE,IAAI,CAA8B,CAAC,AAA7B,GAAG,OAAO,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,mKAwBtE;oBAIa,UAAU,CAAC,OAAO,YAAY,CAAC"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AAoHO,mCAJI,OAAO,mBAAmB,EAAE,IAAI,cAChC,MAAM,OAAO,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,gCAC7B,GAAG,KAAK,OAAO,iBAmBiC,CAAC,gEAAxD,OAAO,YAAY,EAAE,IAAI,CAA8B,CAAC,AAA7B,GAAG,OAAO,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,mKAwBtE;oBAIa,UAAU,CAAC,OAAO,YAAY,CAAC"}

package/src/watch.js

@@ -1,21 +1,21 @@
 // @ts-check
+import { PromiseWatcherI } from '@agoric/base-zone';
 import { getVowPayload, basicE } from './vow-utils.js';
-import { PromiseWatcherI, watchPromiseShim } from './watch-promise.js';
 
 const { apply } = Reflect;
 
 /**
- * @param {typeof watchPromiseShim} watchPromise
+ * @param {import('@agoric/base-zone').Zone} zone
  */
 const makeWatchNextStep =
-  watchPromise =>
+  zone =>
   /**
    * If the specimen is a vow, obtain a fresh shortened promise from it,
    * otherwise coerce the non-vow specimen to a promise.  Then, associate a
    * (usually durable) watcher object with the promise.
    *
    * @param {any} specimen
-   * @param {import('./watch-promise.js').PromiseWatcher} promiseWatcher
+   * @param {import('@agoric/base-zone').PromiseWatcher} promiseWatcher
    */
   (specimen, promiseWatcher) => {
     let promise;
@@ -25,7 +25,7 @@ const makeWatchNextStep =
     } else {
       promise = basicE.resolve(specimen);
     }
-    watchPromise(promise, promiseWatcher);
+    zone.watchPromise(promise, promiseWatcher);
   };
 
 /**
@@ -82,7 +82,7 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
       return /** @type {Partial<typeof state>} */ (state);
     },
     {
-      /** @type {Required<import('./watch-promise.js').PromiseWatcher>['onFulfilled']} */
+      /** @type {Required<import('@agoric/base-zone').PromiseWatcher>['onFulfilled']} */
       onFulfilled(value) {
         const { watcher, watcherContext, resolver } = this.state;
         if (getVowPayload(value)) {
@@ -95,7 +95,7 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
         this.state.resolver = undefined;
         settle(resolver, watcher, 'onFulfilled', value, watcherContext);
       },
-      /** @type {Required<import('./watch-promise.js').PromiseWatcher>['onRejected']} */
+      /** @type {Required<import('@agoric/base-zone').PromiseWatcher>['onRejected']} */
       onRejected(reason) {
         const { vow, watcher, watcherContext, resolver } = this.state;
         if (vow && isRetryableReason(reason)) {
@@ -112,16 +112,14 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
 /**
  * @param {import('@agoric/base-zone').Zone} zone
  * @param {() => import('./types.js').VowKit<any>} makeVowKit
- * @param {typeof watchPromiseShim} [watchPromise]
  * @param {(reason: any) => boolean} [isRetryableReason]
  */
 export const prepareWatch = (
   zone,
   makeVowKit,
-  watchPromise = watchPromiseShim,
   isRetryableReason = _reason => false,
 ) => {
-  const watchNextStep = makeWatchNextStep(watchPromise);
+  const watchNextStep = makeWatchNextStep(zone);
   const makePromiseWatcher = preparePromiseWatcher(
     zone,
     isRetryableReason,
@@ -150,7 +148,7 @@ export const prepareWatch = (
     );
 
     // Coerce the specimen to a promise, and start the watcher cycle.
-    watchPromise(basicE.resolve(specimenP), promiseWatcher);
+    zone.watchPromise(basicE.resolve(specimenP), promiseWatcher);
 
     return vow;
   };

package/src/watch-promise.d.ts

@@ -1,10 +0,0 @@
-export const PromiseWatcherI: import("@endo/patterns").InterfaceGuard<{
-    onFulfilled: import("@endo/patterns").MethodGuard;
-    onRejected: import("@endo/patterns").MethodGuard;
-}>;
-export function watchPromiseShim(p: Promise<any>, watcher: PromiseWatcher, ...watcherArgs: unknown[]): void;
-export type PromiseWatcher = {
-    onFulfilled?: ((fulfilment: unknown, ...args: unknown[]) => void) | undefined;
-    onRejected?: ((reason: unknown, ...args: unknown[]) => void) | undefined;
-};
-//# sourceMappingURL=watch-promise.d.ts.map

package/src/watch-promise.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"watch-promise.d.ts","sourceRoot":"","sources":["watch-promise.js"],"names":[],"mappings":"AASA;;;GAGG;AAuCI,oCALI,OAAO,CAAC,GAAG,CAAC,WACZ,cAAc,kBACX,OAAO,KACR,IAAI,CAUhB;;gCA3C0B,OAAO,WAAW,OAAO,EAAE,KAAK,IAAI;2BACxC,OAAO,WAAW,OAAO,EAAE,KAAK,IAAI"}

package/src/watch-promise.js

@@ -1,61 +0,0 @@
-// @ts-check
-import { M } from '@endo/patterns';
-
-import { basicE } from './vow-utils.js';
-
-const { Fail } = assert;
-
-const { apply } = Reflect;
-
-export const PromiseWatcherI = M.interface('PromiseWatcher', {
-  onFulfilled: M.call(M.any()).rest(M.any()).returns(),
-  onRejected: M.call(M.any()).rest(M.any()).returns(),
-});
-
-/**
- * @typedef {object} PromiseWatcher
- * @property {(fulfilment: unknown, ...args: unknown[]) => void} [onFulfilled]
- * @property {(reason: unknown, ...args: unknown[]) => void} [onRejected]
- */
-
-/**
- * Adapt a promise watcher method to E.when.
- * @param {Record<PropertyKey, (...args: unknown[]) => unknown>} that
- * @param {PropertyKey} prop
- * @param {unknown[]} postArgs
- */
-const callMeMaybe = (that, prop, postArgs) => {
-  const fn = that[prop];
-  if (!fn) {
-    return undefined;
-  }
-  assert.typeof(fn, 'function');
-  /**
-   * @param {unknown} arg value or reason
-   */
-  const wrapped = arg => {
-    // Don't return a value, to prevent E.when from subscribing to a resulting
-    // promise.
-    apply(fn, that, [arg, ...postArgs]);
-  };
-  return wrapped;
-};
-
-/**
- * Shim the promise watcher behaviour when VatData.watchPromise is not available.
- *
- * @param {Promise<any>} p
- * @param {PromiseWatcher} watcher
- * @param {...unknown} watcherArgs
- * @returns {void}
- */
-export const watchPromiseShim = (p, watcher, ...watcherArgs) => {
-  Promise.resolve(p) === p || Fail`watchPromise only watches promises`;
-  const onFulfilled = callMeMaybe(watcher, 'onFulfilled', watcherArgs);
-  const onRejected = callMeMaybe(watcher, 'onRejected', watcherArgs);
-  onFulfilled ||
-    onRejected ||
-    Fail`promise watcher must implement at least one handler method`;
-  void basicE.when(p, onFulfilled, onRejected);
-};
-harden(watchPromiseShim);