@agoric/vow 0.1.1-dev-c19f1b5.0 → 0.1.1-dev-5a03adc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-c19f1b5.0+c19f1b5",
+  "version": "0.1.1-dev-5a03adc.0+5a03adc",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -20,8 +20,8 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-c19f1b5.0+c19f1b5",
-    "@agoric/internal": "0.3.3-dev-c19f1b5.0+c19f1b5",
+    "@agoric/base-zone": "0.1.1-dev-5a03adc.0+5a03adc",
+    "@agoric/internal": "0.3.3-dev-5a03adc.0+5a03adc",
     "@endo/env-options": "^1.1.4",
     "@endo/eventual-send": "^1.2.2",
     "@endo/pass-style": "^1.4.0",
@@ -53,5 +53,5 @@
   "typeCoverage": {
     "atLeast": 89.6
   },
-  "gitHead": "c19f1b5b918e83f8f45c05c0683ee0f97ed0e415"
+  "gitHead": "5a03adce8cbd015d9b10b3c52267dc4fe1a3b8ab"
 }

package/src/tools.d.ts

@@ -2,9 +2,9 @@ export function prepareVowTools(zone: Zone, powers?: {
     isRetryableReason?: ((reason: any) => boolean) | 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> | undefined, watcherContext?: C | undefined) => import("./types.js").Vow<TResult1_1 | TResult2_1>;
+    watch: <T_1 = any, TResult1_1 = T_1, TResult2_1 = never, C = any>(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?: C | undefined) => import("./types.js").Vow<Exclude<TResult1_1, void> | Exclude<TResult2_1, void> extends never ? TResult1_1 : Exclude<TResult1_1, void> | Exclude<TResult2_1, void>>;
     makeVowKit: <T_2>() => import("./types.js").VowKit<T_2>;
-    allVows: (vows: any) => import("./types.js").Vow<any>;
+    allVows: (vows: unknown[]) => import("./types.js").Vow<any[]>;
 };
 import type { Zone } from '@agoric/base-zone';
 //# 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":"AAaO;kCAFa,GAAG,KAAK,OAAO;;sFAEc,CAAC;;;;EAWjD;0BAlBuB,mBAAmB"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAaO;kCAFa,GAAG,KAAK,OAAO;;sFAEc,CAAC;;;oBAWrC,OAAO,EAAE;EAKrB;0BAvBuB,mBAAmB"}

package/src/tools.js

@@ -19,6 +19,11 @@ export const prepareVowTools = (zone, powers = {}) => {
   const makeWatchUtils = prepareWatchUtils(zone, watch, makeVowKit);
   const watchUtils = makeWatchUtils();
 
+  /**
+   * Vow-tolerant implementation of Promise.all.
+   *
+   * @param {unknown[]} vows
+   */
   const allVows = vows => watchUtils.all(vows);
 
   return harden({ when, watch, makeVowKit, allVows });

package/src/types.d.ts

@@ -34,25 +34,19 @@ export type VowKit<T = any> = {
     vow: Vow<T>;
     resolver: VowResolver<T>;
 };
-export type VowPromiseKit<T = any> = {
-    vow: Vow<T>;
-    resolver: VowResolver<T>;
-    promise: Promise<T>;
-};
 export type VowResolver<T = any> = {
     resolve(value?: T | PromiseVow<T> | undefined): void;
     reject(reason?: any): void;
 };
-export type Watcher<T = any, TResult1 = T, TResult2 = T, C = any> = {
+export type Watcher<T = any, TResult1 = T, TResult2 = never, C = any> = {
     onFulfilled?: ((value: T, context?: C) => TResult1 | Vow<TResult1> | PromiseVow<TResult1>) | undefined;
     onRejected?: ((reason: any) => TResult2 | Vow<TResult2> | PromiseVow<TResult2>) | undefined;
 };
-export type Specimen<T = any> = ERef<T | Vow<T>>;
 export type VowTools = {
     when: <T, TResult1 = Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: 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: ERef<T_1 | Vow<T_1>>, watcher?: Watcher<T_1, TResult1_1, TResult2_1> | undefined, watcherContext?: C | undefined) => Vow<TResult1_1 | TResult2_1>;
+    watch: <T_1 = any, TResult1_1 = T_1, TResult2_1 = never, C = any>(specimenP: ERef<T_1 | Vow<T_1>>, watcher?: Watcher<T_1, TResult1_1, TResult2_1> | undefined, watcherContext?: C | undefined) => Vow<Exclude<TResult1_1, void> | Exclude<TResult2_1, void> extends never ? TResult1_1 : Exclude<TResult1_1, void> | Exclude<TResult2_1, void>>;
     makeVowKit: <T_2>() => VowKit<T_2>;
-    allVows: (vows: any) => Vow<any>;
+    allVows: (vows: unknown[]) => Vow<any[]>;
 };
 import type { IsPrimitive } from '@agoric/internal';
 import type { RemotableBrand } from '@endo/eventual-send';

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;;uBAc6B,CAAC,IAAjB,OAAO,CAAS,CAAC,AAAR,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAMH,CAAC,IAAD,CAAC,AAAhB,GAAG,WAAW,CAAC,CAAC,CAAC;;;;;mBAY9B,CAAK;;;;;;;kBAWsB,CAAC;;;;;;;aAAf,MAAM,OAAO,CAAC,CAAC,CAAC;;uBASe,CAAC;;;gBAKJ,CAAC;;;mBAOhB,CAAC,UAFf;IACZ,GAAO,EAAE,GAAG,CACc,CAAC,AADb,CAAC,CAAC;IAChB,QAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC1B;0BAQkB,CAAC,UAHV;IACZ,GAAO,EAAE,GAAG,CAES,CAAC,AAFR,CAAC,CAAC;IAChB,QAAY,EAAE,WAAW,CACJ,CAAC,AADK,CAAC,CAAC;IAC7B,OAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CACpB;wBAK0C,CAAC;oDAAI,IAAI;oBAAkB,GAAG,GAAG,IAAI;;oBAS7D,CAAC,QAAyD,QAAQ,MAClB,QAAQ,MAD3C,CAAC;2BAAd,CAAC,YAAY,CAAC;2BACb,GAAG;;qBAKA,CAAC,UAAd,IAAI,CAAS,CAAC,AAAR,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;;iEAhFuB,CAAA;;;;;iCAPd,kBAAkB;oCAHvB,qBAAqB;qCAEpB,kBAAkB;4BACd,kBAAkB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;;uBAc6B,CAAC,IAAjB,OAAO,CAAS,CAAC,AAAR,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAMH,CAAC,IAAD,CAAC,AAAhB,GAAG,WAAW,CAAC,CAAC,CAAC;;;;;mBAY9B,CAAK;;;;;;;kBAWsB,CAAC;;;;;;;aAAf,MAAM,OAAO,CAAC,CAAC,CAAC;;uBASe,CAAC;;;gBAKJ,CAAC;;;mBAOhB,CAAC,UAFf;IACZ,GAAO,EAAE,GAAG,CACc,CAAC,AADb,CAAC,CAAC;IAChB,QAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC1B;wBAK0C,CAAC;oDAAI,IAAI;oBAAkB,GAAG,GAAG,IAAI;;oBAS7D,CAAC,QAAyD,QAAQ,MAClB,QAAQ,UAD3C,CAAC;2BAAd,CAAC,YAAY,CAAC;2BACb,GAAG;;;iEAlE0B,CAAA;;;oBAehB,SACjC;;iCAvBmC,kBAAkB;oCAHvB,qBAAqB;qCAEpB,kBAAkB;4BACd,kBAAkB"}

package/src/types.js

@@ -66,15 +66,6 @@ export {};
  * }} VowKit
  */
 
-/**
- * @template [T=any]
- * @typedef {{
- *   vow: Vow<T>,
- *   resolver: VowResolver<T>,
- *   promise: Promise<T>
- * }} VowPromiseKit
- */
-
 /**
  * @template [T=any]
  * @typedef {{ resolve(value?: T | PromiseVow<T>): void, reject(reason?: any): void }} VowResolver
@@ -83,16 +74,11 @@ export {};
 /**
  * @template [T=any]
  * @template [TResult1=T]
- * @template [TResult2=T]
+ * @template [TResult2=never]
  * @template [C=any] watcher context
  * @typedef {object} Watcher
  * @property {(value: T, context?: C) => Vow<TResult1> | PromiseVow<TResult1> | TResult1} [onFulfilled]
  * @property {(reason: any) => Vow<TResult2> | PromiseVow<TResult2> | TResult2} [onRejected]
  */
 
-/**
- * @template [T=any]
- * @typedef {ERef<T | Vow<T>>} Specimen
- */
-
 /** @typedef {ReturnType<typeof prepareVowTools>} VowTools */

package/src/watch-utils.d.ts

@@ -1,11 +1,9 @@
-export function prepareWatchUtils(zone: Zone, watch: <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> | undefined, watcherContext?: C | undefined) => import("./types.js").Vow<TResult1 | TResult2>, makeVowKit: () => VowKit<any>): () => import("@endo/exo").Guarded<{
+export function prepareWatchUtils(zone: Zone, watch: <T = any, TResult1 = T, TResult2 = never, C = any>(specimenP: import("./types.js").ERef<T | import("./types.js").Vow<T>>, watcher?: import("./types.js").Watcher<T, TResult1, TResult2> | undefined, watcherContext?: C | undefined) => import("./types.js").Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>, makeVowKit: () => VowKit<any>): () => import("@endo/exo").Guarded<{
     /**
-     * @template [T=any]
-     * @param {Specimen<T>[]} vows
+     * @param {unknown[]} vows
      */
-    all<T_1 = any>(vows: Specimen<T_1>[]): import("./types.js").Vow<any>;
+    all(vows: unknown[]): import("./types.js").Vow<any[]>;
 }>;
 import type { Zone } from '@agoric/base-zone';
 import type { VowKit } from './types.js';
-import type { Specimen } from './types.js';
 //# sourceMappingURL=watch-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"watch-utils.d.ts","sourceRoot":"","sources":["watch-utils.js"],"names":[],"mappings":"AAuBO;IA8BC;;;OAGG;QADiB,GAAC;GA8E5B;0BA/HwB,mBAAmB;4BAET,YAAY;8BAAZ,YAAY"}
+{"version":3,"file":"watch-utils.d.ts","sourceRoot":"","sources":["watch-utils.js"],"names":[],"mappings":"AAuBO;IA8BC;;OAEG;cADQ,OAAO,EAAE;GA+E3B;0BA/HwB,mBAAmB;4BAEnB,YAAY"}

package/src/watch-utils.js

@@ -6,7 +6,7 @@ import { M } from '@endo/patterns';
  * @import {MapStore} from '@agoric/store/src/types.js'
  * @import { Zone } from '@agoric/base-zone'
  * @import { Watch } from './watch.js'
- * @import {Specimen, VowKit} from './types.js'
+ * @import {VowKit} from './types.js'
  */
 
 const VowShape = M.tagged(
@@ -52,11 +52,11 @@ export const prepareWatchUtils = (zone, watch, makeVowKit) => {
     {
       utils: {
         /**
-         * @template [T=any]
-         * @param {Specimen<T>[]} vows
+         * @param {unknown[]} vows
          */
         all(vows) {
           const { nextId: id, idToVowState } = this.state;
+          /** @type {VowKit<any[]>} */
           const kit = makeVowKit();
 
           // Preserve the order of the vow results.

package/src/watch.d.ts

@@ -1,4 +1,4 @@
-export function prepareWatch(zone: Zone, makeVowKit: () => VowKit<any>, isRetryableReason?: ((reason: any) => boolean) | undefined): <T = unknown, TResult1 = T, TResult2 = T, C = unknown>(specimenP: ERef<T | Vow<T>>, watcher?: Watcher<T, TResult1, TResult2> | undefined, watcherContext?: C | undefined) => Vow<TResult1 | TResult2>;
+export function prepareWatch(zone: Zone, makeVowKit: () => VowKit<any>, isRetryableReason?: ((reason: any) => boolean) | undefined): <T = any, TResult1 = T, TResult2 = never, C = any>(specimenP: ERef<T | Vow<T>>, watcher?: Watcher<T, TResult1, TResult2> | undefined, watcherContext?: C | undefined) => Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
 export type Watch = ReturnType<typeof prepareWatch>;
 import type { Zone } from '@agoric/base-zone';
 import type { VowKit } from './types.js';

package/src/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AAyHO,sGAFa,GAAG,KAAK,OAAO,iBAmBT,CAAC,oMAwB1B;oBAIa,UAAU,CAAC,OAAO,YAAY,CAAC;0BA/JJ,mBAAmB;4BACA,YAAY;yBAAZ,YAAY;0BAAZ,YAAY;6BAAZ,YAAY"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AAyHO,sGAFa,GAAG,KAAK,OAAO,iBAmBT,CAAC,2SA0B1B;oBAIa,UAAU,CAAC,OAAO,YAAY,CAAC;0BAjKJ,mBAAmB;4BACA,YAAY;yBAAZ,YAAY;0BAAZ,YAAY;6BAAZ,YAAY"}

package/src/watch.js

@@ -132,16 +132,18 @@ export const prepareWatch = (
   );
 
   /**
-   * @template [T=unknown]
+   * @template [T=any]
    * @template [TResult1=T]
-   * @template [TResult2=T]
-   * @template [C=unknown] watcher context
+   * @template [TResult2=never]
+   * @template [C=any] watcher context
    * @param {ERef<T | Vow<T>>} specimenP
    * @param {Watcher<T, TResult1, TResult2>} [watcher]
    * @param {C} [watcherContext]
    */
   const watch = (specimenP, watcher, watcherContext) => {
-    /** @type {VowKit<TResult1 | TResult2>} */
+    /** @typedef {Exclude<TResult1, void> | Exclude<TResult2, void>} Voidless */
+    /** @typedef {Voidless extends never ? TResult1 : Voidless} Narrowest */
+    /** @type {VowKit<Narrowest>} */
     const { resolver, vow } = makeVowKit();
 
     // Create a promise watcher to track vows, retrying upon rejection as