@agoric/vow 0.1.1-dev-249a5d4.0 → 0.1.1-dev-5856dc0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-249a5d4.0+249a5d4",
+  "version": "0.1.1-dev-5856dc0.0+5856dc0",
   "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-249a5d4.0+249a5d4",
-    "@agoric/internal": "0.3.3-dev-249a5d4.0+249a5d4",
+    "@agoric/base-zone": "0.1.1-dev-5856dc0.0+5856dc0",
+    "@agoric/internal": "0.3.3-dev-5856dc0.0+5856dc0",
     "@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": "249a5d429ebf18be65e8e04ada7acda06e7be02d"
+  "gitHead": "5856dc0a002031bdcc1d22a68a6fcf6fa9be38e0"
 }

package/src/E.d.ts

@@ -1,12 +1,12 @@
 export default makeE;
-export type Callable = (...args: any[]) => any;
-export type EProxy = ReturnType<(<A = {}, U extends (x: any) => Promise<any> = (x: any) => Promise<any>>(HandledPromise: {
+export type Callable = (...args: unknown[]) => any;
+export type EProxy = ReturnType<(<A = {}>(HandledPromise: {
     new <R>(executor: HandledExecutor<R>, unfulfilledHandler?: Handler<Promise<unknown>>): Promise<R>;
     prototype: Promise<unknown>;
-} & PromiseConstructor & import("@endo/eventual-send").HandledPromiseStaticMethods, { additional, unwrap, }?: {
-    unwrap?: U | undefined;
+} & PromiseConstructor & import("@endo/eventual-send").HandledPromiseStaticMethods, powers?: {
+    unwrap?: (<T>(x: T) => Promise<EUnwrap<T>>) | undefined;
     additional?: A | undefined;
-} | undefined) => (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
+} | undefined) => (<T_1>(x: T_1) => ECallableOrMethods<RemoteFunctions<T_1>>) & {
     /**
      * E.get(x) returns a proxy on which you can get arbitrary properties.
      * Each of these properties returns a promise for the property.  The promise
@@ -18,7 +18,7 @@ export type EProxy = ReturnType<(<A = {}, U extends (x: any) => Promise<any> = (
      * @returns {EGetters<LocalRecord<T>>} property get proxy
      * @readonly
      */
-    readonly get: <T_1>(x: T_1) => EGetters<LocalRecord<T_1>>;
+    readonly get: <T_2>(x: T_2) => EGetters<LocalRecord<T_2>>;
     /**
      * E.resolve(x) converts x to a handled promise. It is
      * shorthand for HandledPromise.resolve(x)
@@ -28,7 +28,7 @@ export type EProxy = ReturnType<(<A = {}, U extends (x: any) => Promise<any> = (
      * @returns {Promise<Awaited<T>>} handled promise for x
      * @readonly
      */
-    readonly resolve: <T_2>(x: T_2) => Promise<Awaited<T_2>>;
+    readonly resolve: <T_3>(x: T_3) => Promise<Awaited<T_3>>;
     /**
      * E.sendOnly returns a proxy similar to E, but for which the results
      * are ignored (undefined is returned).
@@ -38,21 +38,21 @@ export type EProxy = ReturnType<(<A = {}, U extends (x: any) => Promise<any> = (
      * @returns {ESendOnlyCallableOrMethods<RemoteFunctions<T>>} method/function call proxy
      * @readonly
      */
-    readonly sendOnly: <T_3>(x: T_3) => ESendOnlyCallableOrMethods<RemoteFunctions<T_3>>;
+    readonly sendOnly: <T_4>(x: T_4) => ESendOnlyCallableOrMethods<RemoteFunctions<T_4>>;
     /**
      * E.when(x, res, rej) is equivalent to
-     * unwrapped(x).then(onfulfilled, onrejected)
+     * unwrap(x).then(onfulfilled, onrejected)
      *
      * @template T
-     * @template [TResult1=Unwrap<T>]
+     * @template [TResult1=EUnwrap<T>]
      * @template [TResult2=never]
      * @param {ERef<T>} x value to convert to a handled promise
-     * @param {(value: Unwrap<T>) => ERef<TResult1>} [onfulfilled]
+     * @param {(value: EUnwrap<T>) => ERef<TResult1>} [onfulfilled]
      * @param {(reason: any) => ERef<TResult2>} [onrejected]
      * @returns {Promise<TResult1 | TResult2>}
      * @readonly
      */
-    readonly when: <T_4, TResult1 = Unwrap<T_4>, TResult2 = never>(x: ERef<T_4>, onfulfilled?: ((value: Unwrap<T_4>) => ERef<TResult1>) | undefined, onrejected?: ((reason: any) => ERef<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
+    readonly when: <T_5, TResult1 = EUnwrap<T_5>, TResult2 = never>(x: ERef<T_5>, onfulfilled?: ((value: EUnwrap<T_5>) => ERef<TResult1>) | undefined, onrejected?: ((reason: any) => ERef<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
 } & A)>;
 /**
  * `DataOnly<T>` means to return a record type `T2` consisting only of
@@ -60,9 +60,9 @@ export type EProxy = ReturnType<(<A = {}, U extends (x: any) => Promise<any> = (
  */
 export type DataOnly<T> = Omit<T, FilteredKeys<T, Callable>>;
 export type ERef<T> = PromiseLike<T> | T;
-export type ECallable<T extends Callable> = (...args: Parameters<T>) => Promise<Unwrap<ReturnType<T>>>;
+export type ECallable<T extends Callable> = ReturnType<T> extends EUnwrap<ReturnType<T>> ? (...args: Parameters<T>) => Promise<ReturnType<T>> : ReturnType<T> extends Promise<EUnwrap<ReturnType<T>>> ? T : (...args: Parameters<T>) => Promise<EUnwrap<ReturnType<T>>>;
 export type EMethods<T> = { readonly [P in keyof T]: T[P] extends Callable ? ECallable<T[P]> : never; };
-export type EGetters<T> = { readonly [P in keyof T]: T[P] extends PromiseLike<infer U> ? T[P] : Promise<Awaited<T[P]>>; };
+export type EGetters<T> = { readonly [P in keyof T]: T[P] extends PromiseLike<any> ? T[P] : Promise<Awaited<T[P]>>; };
 export type ESendOnlyCallable<T extends Callable> = (...args: Parameters<T>) => Promise<void>;
 export type ESendOnlyMethods<T> = { readonly [P in keyof T]: T[P] extends Callable ? ESendOnlyCallable<T[P]> : never; };
 export type ESendOnlyCallableOrMethods<T> = (T extends Callable ? ESendOnlyCallable<T> & ESendOnlyMethods<Required<T>> : ESendOnlyMethods<Required<T>>);
@@ -82,12 +82,12 @@ export type FilteredKeys<T, U> = { [P in keyof T]: T[P] extends U ? P : never; }
  * `PickCallable<T>` means to return a single root callable or a record type
  * consisting only of properties that are functions.
  */
-export type PickCallable<T> = (T extends Callable ? (...args: Parameters<T>) => ReturnType<T> : Pick<T, FilteredKeys<T, Callable>>);
+export type PickCallable<T> = (T extends Callable ? (...args: Parameters<T>) => ReturnType<T> : FilteredKeys<T, Callable> extends never ? never : Pick<T, FilteredKeys<T, Callable>>);
 /**
  * `RemoteFunctions<T>` means to return the functions and properties that are remotely callable.
  */
-export type RemoteFunctions<T> = T extends RemotableBrand<infer L, infer R> ? PickCallable<R> : Awaited<T> extends RemotableBrand<infer L_1, infer R_1> ? PickCallable<R_1> : Awaited<T> extends Vow<infer U> ? RemoteFunctions<U> : T extends PromiseLike<infer U_1> ? Awaited<T> : T;
-export type LocalRecord<T> = T extends RemotableBrand<infer L, infer R> ? L : Awaited<T> extends RemotableBrand<infer L_1, infer R_1> ? L_1 : Awaited<T> extends Vow<infer U> ? LocalRecord<U> : T extends PromiseLike<infer U_1> ? Awaited<T> : T;
+export type RemoteFunctions<T> = EUnwrap<T> extends RemotableBrand<any, infer R> ? PickCallable<R> : PickCallable<EUnwrap<T>>;
+export type LocalRecord<T> = T extends RemotableBrand<infer L, any> ? L : EUnwrap<T>;
 /**
  * Type for an object that must only be invoked with E.  It supports a given
  * interface but declares all the functions as asyncable.
@@ -95,19 +95,18 @@ export type LocalRecord<T> = T extends RemotableBrand<infer L, infer R> ? L : Aw
 export type EOnly<T> = (T extends Callable ? (...args: Parameters<T>) => ERef<Awaited<EOnly<ReturnType<T>>>> : T extends Record<PropertyKey, Callable> ? { [K in keyof T]: T[K] extends Callable ? (...args: Parameters<T[K]>) => ERef<Awaited<EOnly<ReturnType<T[K]>>>> : T[K]; } : T);
 /**
  * @template [A={}]
- * @template {(x: any) => Promise<any>} [U=(x: any) => Promise<any>]
  * @param {HandledPromiseConstructor} HandledPromise
  * @param {object} [powers]
- * @param {U} [powers.unwrap]
+ * @param {<T>(x: T) => Promise<EUnwrap<T>>} [powers.unwrap]
  * @param {A} [powers.additional]
  */
-declare function makeE<A = {}, U extends (x: any) => Promise<any> = (x: any) => Promise<any>>(HandledPromise: {
+declare function makeE<A = {}>(HandledPromise: {
     new <R>(executor: HandledExecutor<R>, unfulfilledHandler?: Handler<Promise<unknown>>): Promise<R>;
     prototype: Promise<unknown>;
-} & PromiseConstructor & import("@endo/eventual-send").HandledPromiseStaticMethods, { additional, unwrap, }?: {
-    unwrap?: U | undefined;
+} & PromiseConstructor & import("@endo/eventual-send").HandledPromiseStaticMethods, powers?: {
+    unwrap?: (<T>(x: T) => Promise<EUnwrap<T>>) | undefined;
     additional?: A | undefined;
-} | undefined): (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
+} | undefined): (<T_1>(x: T_1) => ECallableOrMethods<RemoteFunctions<T_1>>) & {
     /**
      * E.get(x) returns a proxy on which you can get arbitrary properties.
      * Each of these properties returns a promise for the property.  The promise
@@ -119,7 +118,7 @@ declare function makeE<A = {}, U extends (x: any) => Promise<any> = (x: any) =>
      * @returns {EGetters<LocalRecord<T>>} property get proxy
      * @readonly
      */
-    readonly get: <T_1>(x: T_1) => EGetters<LocalRecord<T_1>>;
+    readonly get: <T_2>(x: T_2) => EGetters<LocalRecord<T_2>>;
     /**
      * E.resolve(x) converts x to a handled promise. It is
      * shorthand for HandledPromise.resolve(x)
@@ -129,7 +128,7 @@ declare function makeE<A = {}, U extends (x: any) => Promise<any> = (x: any) =>
      * @returns {Promise<Awaited<T>>} handled promise for x
      * @readonly
      */
-    readonly resolve: <T_2>(x: T_2) => Promise<Awaited<T_2>>;
+    readonly resolve: <T_3>(x: T_3) => Promise<Awaited<T_3>>;
     /**
      * E.sendOnly returns a proxy similar to E, but for which the results
      * are ignored (undefined is returned).
@@ -139,23 +138,22 @@ declare function makeE<A = {}, U extends (x: any) => Promise<any> = (x: any) =>
      * @returns {ESendOnlyCallableOrMethods<RemoteFunctions<T>>} method/function call proxy
      * @readonly
      */
-    readonly sendOnly: <T_3>(x: T_3) => ESendOnlyCallableOrMethods<RemoteFunctions<T_3>>;
+    readonly sendOnly: <T_4>(x: T_4) => ESendOnlyCallableOrMethods<RemoteFunctions<T_4>>;
     /**
      * E.when(x, res, rej) is equivalent to
-     * unwrapped(x).then(onfulfilled, onrejected)
+     * unwrap(x).then(onfulfilled, onrejected)
      *
      * @template T
-     * @template [TResult1=Unwrap<T>]
+     * @template [TResult1=EUnwrap<T>]
      * @template [TResult2=never]
      * @param {ERef<T>} x value to convert to a handled promise
-     * @param {(value: Unwrap<T>) => ERef<TResult1>} [onfulfilled]
+     * @param {(value: EUnwrap<T>) => ERef<TResult1>} [onfulfilled]
      * @param {(reason: any) => ERef<TResult2>} [onrejected]
      * @returns {Promise<TResult1 | TResult2>}
      * @readonly
      */
-    readonly when: <T_4, TResult1 = Unwrap<T_4>, TResult2 = never>(x: ERef<T_4>, onfulfilled?: ((value: Unwrap<T_4>) => ERef<TResult1>) | undefined, onrejected?: ((reason: any) => ERef<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
+    readonly when: <T_5, TResult1 = EUnwrap<T_5>, TResult2 = never>(x: ERef<T_5>, onfulfilled?: ((value: EUnwrap<T_5>) => ERef<TResult1>) | undefined, onrejected?: ((reason: any) => ERef<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
 } & A;
-import type { Unwrap } from './types.js';
+import type { EUnwrap } from './types.js';
 import type { RemotableBrand } from '@endo/eventual-send';
-import type { Vow } from './types.js';
 //# sourceMappingURL=E.d.ts.map

package/src/E.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E.d.ts","sourceRoot":"","sources":["E.js"],"names":[],"mappings":";uBAac,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;qBAyRvB,UAAU,yBA1GN,GAAG,wBAA0B,GAAG;sBA1LjD,gBAAiB,CAAC,CAAC,uBAAsB,QAAS,gBAAgB,CAAC;;;;;oBA+MnD,CAAC,KAAD,CAAC;IAQV;;;;;;;;;;OAUG;mBAHQ,GAAC,KAAD,GAAC;IAYZ;;;;;;;;OAQG;uBAHQ,GAAC,KAAD,GAAC;IAMZ;;;;;;;;OAQG;wBAHQ,GAAC,KAAD,GAAC;IAYZ;;;;;;;;;;;;OAYG;oBAJuB,GAAC,+CADhB,IAAI,CACW,GAAC,AADV,CAAC,6FAEE,GAAG;OAqBA;;;;;qBAOG,CAAC,IAAtB,IAAI,CAAiB,CAAC,AAAhB,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;iBAMjB,CAAC,IAAlB,WAAW,CAAM,CAAC,AAAL,CAAC,GAAG,CAAC;sBAM4B,CAAC,+BAA7C,UAAU,CAAkC,CAAC,AAAjC,CAAC;qBAQT,CAAC,IAFP,EACZ,QAAY,EAAE,CAAC,IAAI,MACD,CAAC,AADO,GACR,CAAC,AADW,CACV,CAAC,AADW,CAAC,SAAS,QAAQ,GAC1C,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACf,KAAK,GACV;qBAQqB,CAAC,IAHb,EACZ,QAAY,EAAE,CAAC,IAAI,MAEK,CAAC,AAFC,GAEF,CAAC,AAFK,CAEJ,CAAC,AAFK,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAEtC,CAAC,AADhB,CACiB,CAAC,AADhB,CAAC,GACJ,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC3B;8BAK8B,CAAC,qBAAtB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;6BAO3B,CAAC,IAFf,EACZ,QAAY,EAAE,CAAC,IAAI,MACO,CAAC,AADD,GACA,CAAC,AADG,CACF,CAAC,AADG,CAAC,SAAS,QAAQ,GAC1C,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvB,KAAK,GACV;uCAQ+B,CAAC,IAHvB,CAGsB,CAAC,AAF9B,SAAS,QAAQ,GACd,iBAAiB,CACS,CAAC,AADR,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CACtB,CAAC,AADuB,CAAC,CAAC,GACpD,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAClC;+BAQuB,CAAC,IAHf,CAGc,CAAC,AAFtB,SAAS,QAAQ,GACd,SAAS,CACS,CAAC,AADR,CAAC,GAAG,QAAQ,CAAC,QAAQ,CACd,CAAC,AADe,CAAC,CAAC,GACpC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC1B;;;;;;;;;;;yBAe+D,CAAC,EAAxB,CAAC,IAAhC,GAAG,CAAC,IAAI,MAA8C,CAAC,AAAxC,GAAuC,CAAC,AAApC,CAAgB,CAAC,AAAf,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;;;;;yBAWvC,CAAC,IAHlB,CAGiB,CAAC,AAFzB,SAAS,QAAQ,GACd,CAAC,GAAG,IAAI,EAAE,UAAU,CACC,CAAC,AADA,CAAC,KAAK,UAAU,CACjB,CAAC,AADkB,CAAC,GACzC,IAAI,CAAiB,CAAC,AAAhB,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CACvC;;;;4BAgBK,CAAC;wBAeD,CAAC;;;;;kBAkBD,CAAC,IATG,CASJ,CAAC,AARJ,SAAS,QAAQ,GACd,CAAC,GAAG,IAAI,EAAE,UAAU,CAOpB,CAAC,AAPqB,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAOzD,CAAC,AAP0D,CAAC,CAAC,CAAC,CAAC,GAO/D,CAAC,AANA,SAAS,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GACvC,GACG,CAAC,IAAI,MAIR,CAAC,AAJc,GAIf,CAAC,AAJkB,CAEX,CAAC,AAFY,CAAC,SAAS,QAAQ,GACjC,CAAC,GAAG,IAAI,EAAE,UAAU,CAG1B,CAAC,AAH2B,CACpB,CAAC,AADqB,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAGlE,CAAC,AAHmE,CAC5D,CAAC,AAD6D,CAAC,CAAC,CAAC,CAAC,CAAC,GAG3E,CAAC,AAFM,CAAC,CAAC,CAAC,GACT,GACD,CAAC,CACN;AA/PJ;;;;;;;GAOG;AACH,6CANkB,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,OAAS,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;sBA1LlE,gBAAiB,CAAC,CAAC,uBAAsB,QAAS,gBAAgB,CAAC;;;;;kBAgNd,CAAC,KAAD,CAAC,AADrC,KACC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAOjD;;;;;;;;;;OAUG;mBAF+B,GAAC,KAAD,GAAC,AADvB,KACC,QAAQ,CAAC,WAAW,CAAC,GAAC,CAAC,CAAC;IAWrC;;;;;;;;OAQG;uBAF0B,GAAC,KAAD,GAAC,AADlB,KACC,OAAO,CAAC,OAAO,CAAC,GAAC,CAAC,CAAC;IAKhC;;;;;;;;OAQG;wBAFqD,GAAC,KAAD,GAAC,AAD7C,KACC,0BAA0B,CAAC,eAAe,CAAC,GAAC,CAAC,CAAC;IAW3D;;;;;;;;;;;;OAYG;oBAJuB,GAAC,EAEN,QAAQ,gBAAG,QAAQ,aAH7B,IAAI,CACW,GAAC,AADV,CAAC,yCACe,IAAI,CAEhB,QAAQ,AAFiB,CAAC,sCAC3B,GAAG,KAAK,IAAI,CACA,QAAQ,AADC,CAAC,kBAC7B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;MAgBhD;4BAvR+B,YAAY;oCADkB,qBAAqB;yBACnD,YAAY"}
+{"version":3,"file":"E.d.ts","sourceRoot":"","sources":["E.js"],"names":[],"mappings":"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"}

package/src/E.js

@@ -1,4 +1,20 @@
 // @ts-check
+/**
+ * @file provides a `makeE` that can be parameterized with an `unwrap` function
+ * and corresponding `import('./types').EUnwrap<T>`.  These will be used to
+ * extract the final settlement from a chain of PromiseLikes and PromiseSteps or
+ * similar non-thenable pseudo-promises.
+ *
+ * `@agoric/vow/vat.js` uses this mechanism to export a `V` function with
+ * similar behaviour as the default `E`, augmented with automatic unwrapping of
+ * recipient Vows as if they were PromiseLikes.
+ */
+
+/*
+ * TODO: Once this implementation has been polished and well-tested, it is
+ * designed to be a drop-in replacement for the version in
+ * `@endo/eventual-send/src/E.js` which contained no concept of "unwrap",
+ */
 import { trackTurns } from './track-turns.js';
 import { makeMessageBreakpointTester } from './message-breakpoints.js';
 
@@ -9,9 +25,9 @@ const onSend = makeMessageBreakpointTester('ENDO_SEND_BREAKPOINTS');
 
 /**
  * @import { HandledPromiseConstructor, RemotableBrand } from '@endo/eventual-send'
- * @import { Unwrap, Vow } from './types.js'
+ * @import { EUnwrap } from './types.js'
  */
-/** @typedef {(...args: any[]) => any} Callable */
+/** @typedef {(...args: unknown[]) => any} Callable */
 
 /** @type {ProxyHandler<any>} */
 const baseFreezableProxyHandler = {
@@ -43,7 +59,7 @@ const baseFreezableProxyHandler = {
  *
  * @param {any} recipient Any value passed to E(x)
  * @param {HandledPromiseConstructor} HandledPromise
- * @param {(x: any) => Promise<any>} unwrap
+ * @param {<T>(x: T) => Promise<EUnwrap<T>>} unwrap
  * @returns {ProxyHandler<any>} the Proxy handler
  */
 const makeEProxyHandler = (recipient, HandledPromise, unwrap) =>
@@ -108,7 +124,7 @@ const makeEProxyHandler = (recipient, HandledPromise, unwrap) =>
  *
  * @param {any} recipient Any value passed to E.sendOnly(x)
  * @param {HandledPromiseConstructor} HandledPromise
- * @param {(x: any) => Promise<any>} unwrap
+ * @param {<T>(x: T) => Promise<EUnwrap<T>>} unwrap
  * @returns {ProxyHandler<any>} the Proxy handler
  */
 const makeESendOnlyProxyHandler = (recipient, HandledPromise, unwrap) =>
@@ -171,7 +187,7 @@ const makeESendOnlyProxyHandler = (recipient, HandledPromise, unwrap) =>
  *
  * @param {any} x Any value passed to E.get(x)
  * @param {HandledPromiseConstructor} HandledPromise
- * @param {(x: any) => Promise<any>} unwrap
+ * @param {<T>(x: T) => Promise<EUnwrap<T>>} unwrap
  * @returns {ProxyHandler<any>} the Proxy handler
  */
 const makeEGetProxyHandler = (x, HandledPromise, unwrap) =>
@@ -186,19 +202,17 @@ const resolve = x => HandledPromise.resolve(x);
 
 /**
  * @template [A={}]
- * @template {(x: any) => Promise<any>} [U=(x: any) => Promise<any>]
  * @param {HandledPromiseConstructor} HandledPromise
  * @param {object} [powers]
- * @param {U} [powers.unwrap]
+ * @param {<T>(x: T) => Promise<EUnwrap<T>>} [powers.unwrap]
  * @param {A} [powers.additional]
  */
-const makeE = (
-  HandledPromise,
-  {
+const makeE = (HandledPromise, powers = {}) => {
+  const {
     additional = /** @type {A} */ ({}),
-    unwrap = /** @type {U} */ (resolve),
-  } = {},
-) => {
+    unwrap = /** @type {NonNullable<typeof powers.unwrap>} */ (resolve),
+  } = powers;
+
   return harden(
     assign(
       /**
@@ -264,13 +278,13 @@ const makeE = (
 
         /**
          * E.when(x, res, rej) is equivalent to
-         * unwrapped(x).then(onfulfilled, onrejected)
+         * unwrap(x).then(onfulfilled, onrejected)
          *
          * @template T
-         * @template [TResult1=Unwrap<T>]
+         * @template [TResult1=EUnwrap<T>]
          * @template [TResult2=never]
          * @param {ERef<T>} x value to convert to a handled promise
-         * @param {(value: Unwrap<T>) => ERef<TResult1>} [onfulfilled]
+         * @param {(value: EUnwrap<T>) => ERef<TResult1>} [onfulfilled]
          * @param {(reason: any) => ERef<TResult2>} [onrejected]
          * @returns {Promise<TResult1 | TResult2>}
          * @readonly
@@ -310,9 +324,11 @@ export default makeE;
 
 /**
  * @template {Callable} T
- * @typedef {(
- *   (...args: Parameters<T>) => Promise<Unwrap<ReturnType<T>>>
- * )} ECallable
+ * @typedef {ReturnType<T> extends EUnwrap<ReturnType<T>>
+ *     ? (...args: Parameters<T>) => Promise<ReturnType<T>>
+ *     : ReturnType<T> extends Promise<EUnwrap<ReturnType<T>>>
+ *       ? T
+ *       : (...args: Parameters<T>) => Promise<EUnwrap<ReturnType<T>>>} ECallable
  */
 
 /**
@@ -327,7 +343,7 @@ export default makeE;
 /**
  * @template T
  * @typedef {{
- *   readonly [P in keyof T]: T[P] extends PromiseLike<infer U>
+ *   readonly [P in keyof T]: T[P] extends PromiseLike<any>
  *     ? T[P]
  *     : Promise<Awaited<T[P]>>;
  * }} EGetters
@@ -387,7 +403,9 @@ export default makeE;
  * @template T
  * @typedef {(
  *   T extends Callable
- *     ? (...args: Parameters<T>) => ReturnType<T>                     // a root callable, no methods
+ *     ? (...args: Parameters<T>) => ReturnType<T>   // a root callable, no methods
+ *     : FilteredKeys<T, Callable> extends never
+ *     ? never
  *     : Pick<T, FilteredKeys<T, Callable>>          // any callable methods
  * )} PickCallable
  */
@@ -397,30 +415,18 @@ export default makeE;
  *
  * @template T
  * @typedef {(
- *   T extends RemotableBrand<infer L, infer R>     // if a given T is some remote interface R
- *     ? PickCallable<R>                                              // then return the callable properties of R
- *     : Awaited<T> extends RemotableBrand<infer L, infer R> // otherwise, if the final resolution of T is some remote interface R
- *     ? PickCallable<R>                                              // then return the callable properties of R
- *     : Awaited<T> extends Vow<infer U>
- *     ? RemoteFunctions<U>                                           // then extract the remotable functions of U
- *     : T extends PromiseLike<infer U>                               // otherwise, if T is a promise
- *     ? Awaited<T>                                                   // then return resolved value T
- *     : T                                                            // otherwise, return T
+ *   EUnwrap<T> extends RemotableBrand<any, infer R>  // if a given T will settle to some remote interface R
+ *     ? PickCallable<R>                         // then return the callable properties of R
+ *     : PickCallable<EUnwrap<T>>                 // otherwise return the callable properties of the settled T
  * )} RemoteFunctions
  */
 
 /**
  * @template T
  * @typedef {(
- *   T extends RemotableBrand<infer L, infer R>
+ *   T extends RemotableBrand<infer L, any>
  *     ? L
- *     : Awaited<T> extends RemotableBrand<infer L, infer R>
- *     ? L
- *     : Awaited<T> extends Vow<infer U>
- *     ? LocalRecord<U>
- *     : T extends PromiseLike<infer U>
- *     ? Awaited<T>
- *     : T
+ *     : EUnwrap<T>
  * )} LocalRecord
  */
 

package/src/tools.d.ts

@@ -1,7 +1,7 @@
 export function prepareVowTools(zone: Zone, powers?: {
     isRetryableReason?: IsRetryableReason | 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>;
+    when: <T, TResult1 = import("./types.js").EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("./types.js").EUnwrap<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 = 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: unknown[]) => import("./types.js").Vow<any[]>;

package/src/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAcO;;;sFACL,CAAF;;;oBAWa,OAAO,EAAE;EAKrB;0BAzBuB,mBAAmB;uCACN,YAAY"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["tools.js"],"names":[],"mappings":"AAcO;;;uFACL,CAAA;;;oBAWW,OAAO,EAAE;EAKrB;0BAzBuB,mBAAmB;uCACN,YAAY"}

package/src/types.d.ts

@@ -12,7 +12,7 @@ export type ERef<T> = T | PromiseLike<T>;
  * Follow the chain of vow shortening to the end, returning the final value.
  * This is used within E, so we must narrow the type to its remote form.
  */
-export type Unwrap<T> = T extends PromiseLike<infer U> ? Unwrap<U> : T extends Vow<infer U_1> ? Unwrap<U_1> : IsPrimitive<T> extends true ? T : T extends RemotableBrand<infer Local, infer Primary> ? Local & T : T;
+export type EUnwrap<T> = (T extends Vow<infer U> ? EUnwrap<U> : T extends PromiseLike<infer U> ? EUnwrap<U> : T);
 /**
  * The first version of the vow implementation
  * object.  CAVEAT: These methods must never be changed or added to, to provide
@@ -39,21 +39,19 @@ export type VowKit<T = any> = {
     resolver: VowResolver<T>;
 };
 export type VowResolver<T = any> = {
-    resolve(value?: T | PromiseVow<T> | undefined): void;
+    resolve(value?: T | PromiseVow<T>): void;
     reject(reason?: any): void;
 };
 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;
+    onFulfilled?: ((value: T, context?: C) => Vow<TResult1> | PromiseVow<TResult1> | TResult1) | undefined;
+    onRejected?: ((reason: any) => Vow<TResult2> | PromiseVow<TResult2> | TResult2) | undefined;
 };
 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>;
+    when: <T, TResult1 = EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: EUnwrap<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 = 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: unknown[]) => Vow<any[]>;
 };
-import type { IsPrimitive } from '@agoric/internal';
-import type { RemotableBrand } from '@endo/eventual-send';
 import type { RemotableObject } from '@endo/pass-style';
 import type { Remote } from '@agoric/internal';
 //# 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":";;;yCAeW,GAAG,mBACH,GAAG,KAED,GAAG;;;;;uBAMa,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;;;iEA1EzB,CAAD;;;oBAcsB,SAAS;;iCAvBO,kBAAkB;oCAHvB,qBAAqB;qCAEpB,kBAAkB;4BACd,kBAAkB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;yCAaW,GAAG,mBACH,GAAG,KAED,GAAG;;;;;uBAMa,CAAC,IAAjB,OAAO,CAAS,CAAC,AAAR,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAMH,CAAC,IAAD,CAAC,AAAhB,GAAG,WAAW,CAAC,CAAC,CAAC;;;;;oBAU9B,CAAK,IAHO,CAGZ,CAAK,AAFA,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAEvC,CAAK,AADA,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAC/C,CAAK,CACF;;;;;;;kBAUwB,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,UAAlC;IAAE,OAAO,CAAC,KAAK,CAAC,EAAiB,CAAC,AAAf,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE;oBAS/D,CAAC,QAAyD,QAAQ,MAClB,QAAQ,UAD3C,CAAC;2BAAd,CAAC,YAAY,CAAC,KAAK,GAAG,CAAoC,QAAQ,AAAnC,CAAC,GAAG,UAAU,CAAa,QAAQ,AAAZ,CAAC,GAAG,QAAQ;2BACjE,GAAG,KAAK,GAAG,CAAoC,QAAQ,AAAnC,CAAC,GAAG,UAAU,CAAa,QAAQ,AAAZ,CAAC,GAAG,QAAQ;;;kEAvE1C,CAAC;;;oBAkB1B,SAAQ;;qCA5Be,kBAAkB;4BAC3B,kBAAkB"}

package/src/types.js

@@ -2,11 +2,9 @@
 export {};
 
 /**
- * @import {RemotableBrand} from '@endo/eventual-send'
  * @import {CopyTagged} from '@endo/pass-style'
  * @import {RemotableObject} from '@endo/pass-style';
- * @import {IsPrimitive, Remote} from '@agoric/internal';
- * @import {PromiseVow} from '@agoric/vow';
+ * @import {Remote} from '@agoric/internal';
  * @import {prepareVowTools} from './tools.js'
  */
 
@@ -36,12 +34,10 @@ export {};
  * This is used within E, so we must narrow the type to its remote form.
  * @template T
  * @typedef {(
- *   T extends PromiseLike<infer U> ? Unwrap<U> :
- *   T extends Vow<infer U> ? Unwrap<U> :
- *   IsPrimitive<T> extends true ? T :
- *   T extends RemotableBrand<infer Local, infer Primary> ? Local & T :
+ *   T extends Vow<infer U> ? EUnwrap<U> :
+ *   T extends PromiseLike<infer U> ? EUnwrap<U> :
  *   T
- * )} Unwrap
+ * )} EUnwrap
  */
 
 /**

package/src/when.d.ts

@@ -1,5 +1,5 @@
-export function makeWhen(isRetryableReason?: IsRetryableReason | undefined): <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>;
+export function makeWhen(isRetryableReason?: IsRetryableReason | undefined): <T, TResult1 = EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: EUnwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
 export type When = ReturnType<typeof makeWhen>;
 import type { IsRetryableReason } from './types.js';
-import type { Unwrap } from './types.js';
+import type { EUnwrap } from './types.js';
 //# sourceMappingURL=when.d.ts.map

package/src/when.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"when.d.ts","sourceRoot":"","sources":["when.js"],"names":[],"mappings":"AAQO,8EAUqB,CAAC,EAEN,QAAQ,cAAG,QAAQ,qBAFd,CAAC,AADf,uCAGS,QAAQ,AAFY,GAAG,WAAW,CAElC,QAAQ,AAFmC,CAAC,sCAC7C,GAAG,KACS,QAAQ,AADJ,GAAG,WAAW,CAClB,QAAQ,AADmB,CAAC,kBAC/C,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,CA2C1C;mBAIa,UAAU,CAAC,OAAO,QAAQ,CAAC;uCAhEM,YAAY;4BAAZ,YAAY"}
+{"version":3,"file":"when.d.ts","sourceRoot":"","sources":["when.js"],"names":[],"mappings":"AAQO,8EAUsB,CAAC,EAEP,QAAQ,eAAG,QAAQ,qBAFb,CAAC,AADhB,wCAGS,QAAQ,AAFa,GAAG,WAAW,CAEnC,QAAQ,AAFoC,CAAC,sCAC9C,GAAG,KACS,QAAQ,AADJ,GAAG,WAAW,CAClB,QAAQ,AADmB,CAAC,kBAC/C,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,CA2C1C;mBAIa,UAAU,CAAC,OAAO,QAAQ,CAAC;uCAhEO,YAAY;6BAAZ,YAAY"}

package/src/when.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { getVowPayload, basicE } from './vow-utils.js';
 
-/** @import { IsRetryableReason, Unwrap } from './types.js' */
+/** @import { IsRetryableReason, EUnwrap } from './types.js' */
 
 /**
  * @param {IsRetryableReason} [isRetryableReason]
@@ -13,10 +13,10 @@ export const makeWhen = (
    * Shorten `specimenP` until we achieve a final result.
    *
    * @template T
-   * @template [TResult1=Unwrap<T>]
+   * @template [TResult1=EUnwrap<T>]
    * @template [TResult2=never]
    * @param {T} specimenP value to unwrap
-   * @param {(value: Unwrap<T>) => TResult1 | PromiseLike<TResult1>} [onFulfilled]
+   * @param {(value: EUnwrap<T>) => TResult1 | PromiseLike<TResult1>} [onFulfilled]
    * @param {(reason: any) => TResult2 | PromiseLike<TResult2>} [onRejected]
    * @returns {Promise<TResult1 | TResult2>}
    */
@@ -50,7 +50,7 @@ export const makeWhen = (
       payload = getVowPayload(result);
     }
 
-    const unwrapped = /** @type {Unwrap<T>} */ (result);
+    const unwrapped = /** @type {EUnwrap<T>} */ (result);
 
     // We've extracted the final result.
     if (onFulfilled == null && onRejected == null) {