@agoric/vow 0.1.1-dev-5676146.0 → 0.1.1-dev-e7e7c67.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-5676146.0+5676146",
+  "version": "0.1.1-dev-e7e7c67.0+e7e7c67",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -20,7 +20,7 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-5676146.0+5676146",
+    "@agoric/base-zone": "0.1.1-dev-e7e7c67.0+e7e7c67",
     "@endo/env-options": "^1.1.1",
     "@endo/eventual-send": "^1.1.2",
     "@endo/pass-style": "^1.2.0",
@@ -28,7 +28,7 @@
     "@endo/promise-kit": "^1.0.4"
   },
   "devDependencies": {
-    "@agoric/internal": "0.3.3-dev-5676146.0+5676146",
+    "@agoric/internal": "0.3.3-dev-e7e7c67.0+e7e7c67",
     "@endo/far": "^1.0.4",
     "@endo/init": "^1.0.4",
     "ava": "^5.3.0"
@@ -49,5 +49,5 @@
   "typeCoverage": {
     "atLeast": 88.27
   },
-  "gitHead": "5676146464043d40b6e0d2e4411440c595f20f44"
+  "gitHead": "e7e7c678d24b4b141a1b175ee8103770007fc566"
 }

package/src/tools.d.ts

@@ -5,5 +5,6 @@ export function prepareVowTools(zone: import('@agoric/base-zone').Zone, powers?:
     when: <T = any, TResult1 = import("./E.js").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("./E.js").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
     watch: <T_1 = any, TResult1_1 = T_1, TResult2_1 = T_1>(specimenP: import("./types.js").ERef<T_1 | import("./types.js").Vow<T_1>>, watcher?: import("./types.js").Watcher<T_1, TResult1_1, TResult2_1> | undefined, watcherContext?: unknown) => import("./types.js").Vow<TResult1_1 | TResult2_1>;
     makeVowKit: <T_2>() => import("./types.js").VowKit<T_2>;
+    allVows: (vows: any) => import("./types.js").Vow<any>;
 };
 //# sourceMappingURL=tools.d.ts.map

package/src/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAWO,sCALI,OAAO,mBAAmB,EAAE,IAAI;kCAEvB,GAAG,KAAK,OAAO;wBACpB,YAAY,GAAG,CAAC,WAAW,OAAO,oBAAoB,EAAE,cAAc,WAAW,OAAO,EAAE,KAAK,IAAI;;;;;EAQjH"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAYO,sCALI,OAAO,mBAAmB,EAAE,IAAI;kCAEvB,GAAG,KAAK,OAAO;wBACpB,YAAY,GAAG,CAAC,WAAW,OAAO,oBAAoB,EAAE,cAAc,WAAW,OAAO,EAAE,KAAK,IAAI;;;;;;EAajH"}

package/src/tools.js

@@ -2,6 +2,7 @@
 import { makeWhen } from './when.js';
 import { prepareVowKit } from './vow.js';
 import { prepareWatch } from './watch.js';
+import { prepareWatchUtils } from './watch-utils.js';
 
 /**
  * @param {import('@agoric/base-zone').Zone} zone
@@ -14,6 +15,11 @@ export const prepareVowTools = (zone, powers = {}) => {
   const makeVowKit = prepareVowKit(zone, watchPromise);
   const when = makeWhen(isRetryableReason);
   const watch = prepareWatch(zone, makeVowKit, watchPromise, isRetryableReason);
-  return harden({ when, watch, makeVowKit });
+  const makeWatchUtils = prepareWatchUtils(zone, watch, makeVowKit);
+  const watchUtils = makeWatchUtils();
+
+  const allVows = vows => watchUtils.all(vows);
+
+  return harden({ when, watch, makeVowKit, allVows });
 };
 harden(prepareVowTools);

package/src/types.d.ts

@@ -41,4 +41,5 @@ export type Watcher<T = any, TResult1 = T, TResult2 = T> = {
     onFulfilled?: ((value: T) => Vow<TResult1> | PromiseVow<TResult1> | TResult1) | undefined;
     onRejected?: ((reason: any) => Vow<TResult2> | PromiseVow<TResult2> | TResult2) | undefined;
 };
+export type Specimen<T = any> = import('./types.js').ERef<T | import('./types.js').Vow<T>>;
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"4BAKa,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;sBAKvB,OAAO,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;;;;;uEASrB,KAAK,KAAK,GAAG,OAAO,qBAAqB,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;;;;;;;;;;;;;;aAUzE,MAAM,QAAQ,CAAC,CAAC;;;WAShB,OAAO,qBAAqB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;;2BAK/C,OAAO,kBAAkB,EAAE,UAAU,CACjD,KAAS,EAAE,WAAW,CAAC,CAAC,CACrB;8BAKS;IACZ,GAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAChB,QAAY,EAAE,YAAY,CAAC,CAAC,CAAC;CAC1B;qCAKS;IACZ,GAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAChB,QAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAC7B,OAAW,EAAE,QAAQ,CAAC,CAAC,CAAA;CACpB;;oBAK2B,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,IAAI;oBAAkB,GAAG,GAAG,IAAI;;;2BAQ7D,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,WAAW,QAAQ,CAAC,GAAG,QAAQ;2BACpD,GAAG,KAAK,IAAI,QAAQ,CAAC,GAAG,WAAW,QAAQ,CAAC,GAAG,QAAQ"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"4BAKa,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;sBAKvB,OAAO,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;;;;;uEASrB,KAAK,KAAK,GAAG,OAAO,qBAAqB,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;;;;;;;;;;;;;;aAUzE,MAAM,QAAQ,CAAC,CAAC;;;WAShB,OAAO,qBAAqB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;;2BAK/C,OAAO,kBAAkB,EAAE,UAAU,CACjD,KAAS,EAAE,WAAW,CAAC,CAAC,CACrB;8BAKS;IACZ,GAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAChB,QAAY,EAAE,YAAY,CAAC,CAAC,CAAC;CAC1B;qCAKS;IACZ,GAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAChB,QAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAC7B,OAAW,EAAE,QAAQ,CAAC,CAAC,CAAA;CACpB;;oBAK2B,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,IAAI;oBAAkB,GAAG,GAAG,IAAI;;;2BAQ7D,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,WAAW,QAAQ,CAAC,GAAG,QAAQ;2BACpD,GAAG,KAAK,IAAI,QAAQ,CAAC,GAAG,WAAW,QAAQ,CAAC,GAAG,QAAQ;;gCAKjE,OAAO,YAAY,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC"}

package/src/types.js

@@ -76,3 +76,8 @@ export {};
  * @property {(value: T) => Vow<TResult1> | PromiseVow<TResult1> | TResult1} [onFulfilled]
  * @property {(reason: any) => Vow<TResult2> | PromiseVow<TResult2> | TResult2} [onRejected]
  */
+
+/**
+ * @template [T=any]
+ * @typedef {import('./types.js').ERef<T | import('./types.js').Vow<T>>} Specimen
+ */

package/src/watch-utils.d.ts

@@ -0,0 +1,8 @@
+export function prepareWatchUtils(zone: import('@agoric/base-zone').Zone, watch: import('./watch.js').Watch, makeVowKit: () => import('./types.js').VowKit<any>): () => import("@endo/exo/src/exo-makers.js").Guarded<{
+    /**
+     * @template [T=any]
+     * @param {import('./types.js').Specimen<T>[]} vows
+     */
+    all<T = any>(vows: import("./types.js").Specimen<T>[]): import("./types.js").Vow<any>;
+}>;
+//# sourceMappingURL=watch-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"watch-utils.d.ts","sourceRoot":"","sources":["watch-utils.js"],"names":[],"mappings":"AAgBO,wCAJI,OAAO,mBAAmB,EAAE,IAAI,SAChC,OAAO,YAAY,EAAE,KAAK,cAC1B,MAAM,OAAO,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC;IAgCzC;;;OAGG;;GA6EV"}

package/src/watch-utils.js

@@ -0,0 +1,129 @@
+// @ts-check
+
+import { M } from '@endo/patterns';
+
+const VowShape = M.tagged(
+  'Vow',
+  harden({
+    vowV0: M.remotable('VowV0'),
+  }),
+);
+
+/**
+ * @param {import('@agoric/base-zone').Zone} zone
+ * @param {import('./watch.js').Watch} watch
+ * @param {() => import('./types.js').VowKit<any>} makeVowKit
+ */
+export const prepareWatchUtils = (zone, watch, makeVowKit) => {
+  const detached = zone.detached();
+  const makeWatchUtilsKit = zone.exoClassKit(
+    'WatchUtils',
+    {
+      utils: M.interface('Utils', {
+        all: M.call(M.arrayOf(M.any())).returns(VowShape),
+      }),
+      watcher: M.interface('Watcher', {
+        onFulfilled: M.call(M.any()).rest(M.any()).returns(M.any()),
+        onRejected: M.call(M.any()).rest(M.any()).returns(M.any()),
+      }),
+    },
+    () => {
+      /**
+       * @typedef {object} VowState
+       * @property {number} remaining
+       * @property {MapStore<number, any>} resultsMap
+       * @property {import('./types.js').VowKit['resolver']} resolver
+       */
+      /** @type {MapStore<bigint, VowState>} */
+      const idToVowState = detached.mapStore('idToVowState');
+
+      return {
+        nextId: 0n,
+        idToVowState,
+      };
+    },
+    {
+      utils: {
+        /**
+         * @template [T=any]
+         * @param {import('./types.js').Specimen<T>[]} vows
+         */
+        all(vows) {
+          const { nextId: id, idToVowState } = this.state;
+          const kit = makeVowKit();
+
+          // Preserve the order of the vow results.
+          let index = 0;
+          for (const vow of vows) {
+            watch(vow, this.facets.watcher, { id, index });
+            index += 1;
+          }
+
+          if (index > 0) {
+            // Save the state until rejection or all fulfilled.
+            this.state.nextId += 1n;
+            idToVowState.init(
+              id,
+              harden({
+                resolver: kit.resolver,
+                remaining: index,
+                resultsMap: detached.mapStore('resultsMap'),
+              }),
+            );
+          } else {
+            // Base case: nothing to wait for.
+            kit.resolver.resolve(harden([]));
+          }
+          return kit.vow;
+        },
+      },
+      watcher: {
+        onFulfilled(value, { id, index }) {
+          const { idToVowState } = this.state;
+          if (!idToVowState.has(id)) {
+            // Resolution of the returned vow happened already.
+            return;
+          }
+          const { remaining, resultsMap, resolver } = idToVowState.get(id);
+          // Capture the fulfilled value.
+          resultsMap.init(index, value);
+          const vowState = harden({
+            remaining: remaining - 1,
+            resultsMap,
+            resolver,
+          });
+          if (vowState.remaining > 0) {
+            idToVowState.set(id, vowState);
+            return;
+          }
+          // We're done!  Extract the array.
+          idToVowState.delete(id);
+          const results = new Array(resultsMap.getSize());
+          for (const [i, val] of resultsMap.entries()) {
+            results[i] = val;
+          }
+          resolver.resolve(harden(results));
+        },
+        onRejected(value, { id }) {
+          const { idToVowState } = this.state;
+          if (!idToVowState.has(id)) {
+            // First rejection wins.
+            return;
+          }
+          const { resolver } = idToVowState.get(id);
+          idToVowState.delete(id);
+          resolver.reject(value);
+        },
+      },
+    },
+  );
+
+  const makeWatchUtil = () => {
+    const { utils } = makeWatchUtilsKit();
+    return harden(utils);
+  };
+
+  return makeWatchUtil;
+};
+
+harden(prepareWatchUtils);

package/src/watch.js

@@ -77,7 +77,7 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
         vow: /** @type {unknown} */ (undefined),
         resolver,
         watcher,
-        watcherContext,
+        watcherContext: harden(watcherContext),
       };
       return /** @type {Partial<typeof state>} */ (state);
     },