@agoric/vow 0.1.1-dev-0006934.0 → 0.1.1-dev-12ce494.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-0006934.0+0006934",
+  "version": "0.1.1-dev-12ce494.0+12ce494",
   "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-0006934.0+0006934",
-    "@agoric/internal": "0.3.3-dev-0006934.0+0006934",
+    "@agoric/base-zone": "0.1.1-dev-12ce494.0+12ce494",
+    "@agoric/internal": "0.3.3-dev-12ce494.0+12ce494",
     "@endo/env-options": "^1.1.4",
     "@endo/errors": "^1.2.2",
     "@endo/eventual-send": "^1.2.2",
@@ -55,5 +55,5 @@
   "typeCoverage": {
     "atLeast": 89.6
   },
-  "gitHead": "000693442f821c1fcea007a2df740733b1f75ebe"
+  "gitHead": "12ce49423c9afe6eb2396e7cac79b7f2f003cbb0"
 }

package/src/tools.d.ts

@@ -5,15 +5,22 @@ export function prepareVowTools(zone: Zone, powers?: {
     watch: <T = any, TResult1 = T, TResult2 = never, C extends any[] = any[]>(specimenP: EVow<T>, watcher?: import("./types.js").Watcher<T, TResult1, TResult2, C> | undefined, ...watcherArgs: C) => Vow<Exclude<TResult1, void> | Exclude<TResult2, void> extends never ? TResult1 : Exclude<TResult1, void> | Exclude<TResult2, void>>;
     makeVowKit: <T>() => import("./types.js").VowKit<T>;
     allVows: (maybeVows: EVow<unknown>[]) => Vow<any[]>;
-    asVow: <T extends unknown>(fn: (...args: any[]) => Vow<Awaited<T>> | Awaited<T> | import("./types.js").PromiseVow<T>) => Vow<Awaited<T>>;
+    asVow: <T extends unknown>(fn: (
+    /** @typedef {ReturnType<typeof prepareVowTools>} VowTools */
+    ...args: any[]) => Vow<Awaited<T>> | Awaited<T> | import("./types.js").PromiseVow<T>) => Vow<Awaited<T>>;
     asPromise: AsPromiseFunction;
-    retriable: <T>(fnZone: Zone, name: string, fn: (...args: unknown[]) => ERef<T>) => (...args: unknown[]) => Vow<T>;
+    retriable: <F extends (...args: any[]) => any>(fnZone: Zone, name: string, fn: F) => PromiseToVow<F>;
 };
+/**
+ * Converts a function type that returns a Promise to a function type that
+ * returns a Vow. If the input is not a function returning a Promise, it
+ * preserves the original type.
+ */
+export type PromiseToVow<T> = T extends (...args: infer Args) => Promise<infer R> ? (...args: Args) => Vow<R> : T extends (...args: infer Args) => infer R ? (...args: Args) => R : T;
 export type VowTools = ReturnType<typeof prepareVowTools>;
 import type { Zone } from '@agoric/base-zone';
 import type { IsRetryableReason } from './types.js';
 import type { EVow } from './types.js';
 import type { Vow } from './types.js';
 import type { AsPromiseFunction } from './types.js';
-import type { ERef } from './types.js';
 //# 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":"AAoBO,sCAJI,IAAI;;;;;;yBAyCF,KAAK,OAAO,CAAC,EAAE;oCAqBuZ,GAAG;;gBApCva,CAAC,UACH,IAAI,QACJ,MAAM,MACN,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,KAAK,CAAC,CAAC,KAC7B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC;EA4B5C;uBAGa,UAAU,CAAC,OAAO,eAAe,CAAC;0BArEzB,mBAAmB;uCAC8B,YAAY;0BAAZ,YAAY;yBAAZ,YAAY;uCAAZ,YAAY;0BAAZ,YAAY"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAoCO,sCAJI,IAAI;;;;;;yBA0CF,KAAK,OAAO,CAAC,EAAE;;IAoB5B,6DAA6D;IAC7D,GADE;;gBApCuC,CAAC,SAA3B,CAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAI,UAC3B,IAAI,QACJ,MAAM,MACN,CAAC,KACC,YAAY,CAAC,CAAC,CAAC;EA6B7B;;;;;;yBAzEY,CAAC,IACD,CAAC,SAAS,CACtB,GAAK,IAAI,EAAE,MAAM,IAAI,KACd,OAAO,CAAC,MAAM,CAAC,CAAC,GACnB,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC,GACzB,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,IAAI,KAAK,MAAM,CAAC,GAC1C,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,GACpB,CAAC;uBAqEQ,UAAU,CAAC,OAAO,eAAe,CAAC;0BAtFzB,mBAAmB;uCAC8B,YAAY;0BAAZ,YAAY;yBAAZ,YAAY;uCAAZ,YAAY"}

package/src/tools.js

@@ -10,6 +10,22 @@ import { makeWhen } from './when.js';
  * @import {IsRetryableReason, AsPromiseFunction, EVow, Vow, ERef} from './types.js';
  */
 
+// TODO find a good home, DRY with orchestration package.
+/**
+ * Converts a function type that returns a Promise to a function type that
+ * returns a Vow. If the input is not a function returning a Promise, it
+ * preserves the original type.
+ *
+ * @template T - The type to transform
+ * @typedef {T extends (
+ * ...args: infer Args
+ * ) => Promise<infer R>
+ * ? (...args: Args) => Vow<R>
+ * : T extends (...args: infer Args) => infer R
+ * ? (...args: Args) => R
+ * : T} PromiseToVow
+ */
+
 /**
  * NB: Not to be used in a Vat. It doesn't know what an upgrade is. For that you
  * need `prepareVowTools` from `vat.js`.
@@ -40,14 +56,15 @@ export const prepareVowTools = (zone, powers = {}) => {
    *
    * The internal functions
    *
-   * @template T
+   * @template {(...args: any[]) => any} F
    * @param {Zone} fnZone - the zone for the named function
    * @param {string} name
-   * @param {(...args: unknown[]) => ERef<T>} fn
-   * @returns {(...args: unknown[]) => Vow<T>}
+   * @param {F} fn
+   * @returns {PromiseToVow<F>}
    */
   const retriable =
     (fnZone, name, fn) =>
+    // @ts-expect-error cast
     (...args) => {
       return watch(fn(...args));
     };