@agoric/vow 0.1.1-dev-4202f3e.0 → 0.1.1-dev-cc2bf0b.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-4202f3e.0+4202f3e",
+  "version": "0.1.1-dev-cc2bf0b.0+cc2bf0b",
   "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-4202f3e.0+4202f3e",
-    "@agoric/internal": "0.3.3-dev-4202f3e.0+4202f3e",
+    "@agoric/base-zone": "0.1.1-dev-cc2bf0b.0+cc2bf0b",
+    "@agoric/internal": "0.3.3-dev-cc2bf0b.0+cc2bf0b",
     "@endo/env-options": "^1.1.4",
     "@endo/eventual-send": "^1.2.2",
     "@endo/pass-style": "^1.4.0",
@@ -54,5 +54,5 @@
   "typeCoverage": {
     "atLeast": 89.6
   },
-  "gitHead": "4202f3e330bdc7b185643d0b74939dd0392af390"
+  "gitHead": "cc2bf0bb431aa64c601628f53cf191fcc84c5750"
 }

package/src/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./tools.js";
 export * from "./types.js";
+export * from "@agoric/internal/src/types.js";
 export { default as makeE } from "./E.js";
 export { VowShape, toPassableCap } from "./vow-utils.js";
 //# sourceMappingURL=index.d.ts.map

package/src/index.js

@@ -5,3 +5,6 @@ export { VowShape, toPassableCap } from './vow-utils.js';
 
 // eslint-disable-next-line import/export
 export * from './types.js';
+
+// XXX re-exporting the Remote type for back-compat
+export * from '@agoric/internal/src/types.js';

package/src/types.d.ts

@@ -1,29 +1,14 @@
-export type Callable = (...args: any[]) => any;
 /**
  * Return type of a function that may
  * return a promise or a vow.
  */
 export type PromiseVow<T> = Promise<T | Vow<T>>;
 export type ERef<T> = T | PromiseLike<T>;
-/**
- * Whether T is a primitive type.
- */
-export type IsPrimitive<T> = (T extends bigint ? true : T extends boolean ? true : T extends null ? true : T extends number ? true : T extends string ? true : T extends symbol ? true : T extends undefined ? true : false);
-/**
- * Recursively extract the non-callable properties of T.
- */
-export type DataOnly<T> = (IsPrimitive<T> extends true ? T : T extends Callable ? never : { [P in keyof T as T[P] extends Callable ? never : P]: DataOnly<T[P]>; });
 /**
  * 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;
-/**
- * A type that
- * doesn't assume its parameter is local, but is satisfied with both local
- * and remote references.
- */
-export type Remote<Primary, Local = DataOnly<Primary>> = Primary | RemotableBrand<Local, Primary>;
 /**
  * The first version of the vow implementation
  * object.  CAVEAT: These methods must never be changed or added to, to provide
@@ -69,6 +54,8 @@ export type VowTools = {
     makeVowKit: <T_2>() => VowKit<T_2>;
     allVows: (vows: any) => 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":"uBAUc,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;;;;;uBAIR,CAAC,IAAjB,OAAO,CAAS,CAAC,AAAR,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAMH,CAAC,IAAD,CAAC,AAAhB,GAAG,WAAW,CAAC,CAAC,CAAC;;;;wBAY9B,CAAK,IAPO,CAOZ,CAAK,AANA,SAAS,MAAM,GAAG,IAAI,GAM3B,CAAK,AALA,SAAS,OAAO,GAAG,IAAI,GAK5B,CAAK,AAJA,SAAS,IAAI,GAAG,IAAI,GAIzB,CAAK,AAHA,SAAS,MAAM,GAAG,IAAI,GAG3B,CAAK,AAFA,SAAS,MAAM,GAAG,IAAI,GAE3B,CAAK,AADA,SAAS,MAAM,GAAG,IAAI,GAC3B,CAAK,SAAS,SAAS,GAAG,IAAI,GAC9B,KAAS,CACN;;;;qBAQiE,CAAC,IAHzD,CACZ,WAAe,CAEqD,CAAC,AAFpD,CAAC,SAAS,IAAI,GAEqC,CAAC,AAFlC,GAEiC,CAAC,AADhE,SAAS,QAAQ,GAAG,KAAK,GAC9B,GAAO,CAAC,IAAI,MAAwD,CAAC,AAAlD,IAAiD,CAAC,AAA7C,CAA8C,CAAC,AAA7C,CAAC,SAAS,QAAQ,GAAG,KAAK,GAAkB,CAAC,AAAf,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CACxE;;;;;mBAYH,CAAK;;;;;;mBASuC,OAAO,EAAd,KAAK;;;;;;;kBAYf,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;;iEAjHqB,CAAC;;;;;oCAVlB,qBAAqB;qCAEpB,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;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"}

package/src/types.js

@@ -5,10 +5,10 @@ export {};
  * @import {RemotableBrand} from '@endo/eventual-send'
  * @import {CopyTagged} from '@endo/pass-style'
  * @import {RemotableObject} from '@endo/pass-style';
- * @import {PromiseVow, Remote} from '@agoric/vow';
+ * @import {IsPrimitive, Remote} from '@agoric/internal';
+ * @import {PromiseVow} from '@agoric/vow';
  * @import {prepareVowTools} from './tools.js'
  */
-/** @typedef {(...args: any[]) => any} Callable */
 
 /**
  * @template T
@@ -21,29 +21,6 @@ export {};
  * @typedef {T | PromiseLike<T>} ERef
  */
 
-/**
- * @template T
- * @typedef {(
- *   T extends bigint ? true :
- *   T extends boolean ? true :
- *   T extends null ? true :
- *   T extends number ? true :
- *   T extends string ? true :
- *   T extends symbol ? true :
- *   T extends undefined ? true :
- *   false
- * )} IsPrimitive Whether T is a primitive type.
- */
-
-/**
- * @template T
- * @typedef {(
- *   IsPrimitive<T> extends true ? T :
- *   T extends Callable ? never :
- *   { [P in keyof T as T[P] extends Callable ? never : P]: DataOnly<T[P]> }
- * )} DataOnly Recursively extract the non-callable properties of 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.
@@ -57,16 +34,6 @@ export {};
  * )} Unwrap
  */
 
-/**
- * A type that accepts both near and marshalled references that were
- * returned from `Remotable` or `Far`.
- * @template Primary The type of the primary reference.
- * @template [Local=DataOnly<Primary>] The local properties of the object.
- * @typedef {Primary | RemotableBrand<Local, Primary>} Remote A type that
- * doesn't assume its parameter is local, but is satisfied with both local
- * and remote references.
- */
-
 /**
  * @template [T=any]
  * @typedef {object} VowV0 The first version of the vow implementation