@endo/eventual-send 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@endo/eventual-send",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Extend a Promise class to implement the eventual-send API",
   "type": "module",
   "main": "src/no-shim.js",
@@ -10,8 +10,8 @@
     "test:xs": "exit 0",
     "build": "exit 0",
     "clean": "git clean -f '*.d.ts*'",
-    "build:types": "tsc --build tsconfig.build.json",
-    "clean:types": "git clean -f '*.d.ts*'",
+    "prepack": "tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.ts*'",
     "lint-fix": "yarn lint:eslint --fix && yarn lint:types",
     "lint-check": "yarn lint",
     "lint": "yarn lint:types && yarn lint:eslint",
@@ -36,13 +36,14 @@
   },
   "homepage": "https://github.com/endojs/endo#readme",
   "dependencies": {
-    "@endo/env-options": "^1.1.4"
+    "@endo/env-options": "^1.1.5"
   },
   "devDependencies": {
-    "@endo/lockdown": "^1.0.7",
-    "ava": "^6.1.2",
+    "@endo/lockdown": "^1.0.9",
+    "ava": "^6.1.3",
     "c8": "^7.14.0",
-    "tsd": "^0.30.7"
+    "tsd": "^0.30.7",
+    "typescript": "5.5.2"
   },
   "keywords": [
     "eventual send",
@@ -65,12 +66,13 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },
   "typeCoverage": {
     "atLeast": 77.81
   },
-  "gitHead": "08e59bc0d262565165636c2e3875bbe3dcb91cf8"
+  "gitHead": "444c81ad3ecc1b0a449023a9c65e9be2fa17db21"
 }

package/src/E.d.ts

@@ -1,8 +1,5 @@
 export default makeE;
-export type EProxy = ReturnType<(HandledPromise: {
-    new <R>(executor: import("./handled-promise.js").HandledExecutor<R>, unfulfilledHandler?: import("./handled-promise.js").Handler<Promise<unknown>> | undefined): Promise<R>;
-    prototype: Promise<unknown>;
-} & PromiseConstructor & import("./handled-promise.js").HandledPromiseStaticMethods) => (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
+export type EProxy = ReturnType<(HandledPromise: import("./types").HandledPromiseConstructor) => (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
     /**
      * 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
@@ -14,7 +11,7 @@ export type EProxy = ReturnType<(HandledPromise: {
      * @returns {EGetters<LocalRecord<T>>} property get proxy
      * @readonly
      */
-    readonly get: <T_1>(x: T_1) => EGetters<LocalRecord<T_1>>;
+    readonly get: <T>(x: T) => EGetters<LocalRecord<T>>;
     /**
      * E.resolve(x) converts x to a handled promise. It is
      * shorthand for HandledPromise.resolve(x)
@@ -26,8 +23,8 @@ export type EProxy = ReturnType<(HandledPromise: {
      */
     readonly resolve: {
         (): Promise<void>;
-        <T_2>(value: T_2): Promise<Awaited<T_2>>;
-        <T_3>(value: T_3 | PromiseLike<T_3>): Promise<Awaited<T_3>>;
+        <T>(value: T): Promise<Awaited<T>>;
+        <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>;
     };
     /**
      * E.sendOnly returns a proxy similar to E, but for which the results
@@ -38,7 +35,7 @@ export type EProxy = ReturnType<(HandledPromise: {
      * @returns {ESendOnlyCallableOrMethods<RemoteFunctions<T>>} method/function call proxy
      * @readonly
      */
-    readonly sendOnly: <T_4>(x: T_4) => ESendOnlyCallableOrMethods<RemoteFunctions<T_4>>;
+    readonly sendOnly: <T>(x: T) => ESendOnlyCallableOrMethods<RemoteFunctions<T>>;
     /**
      * E.when(x, res, rej) is equivalent to
      * HandledPromise.resolve(x).then(res, rej)
@@ -51,26 +48,26 @@ export type EProxy = ReturnType<(HandledPromise: {
      * @returns {Promise<U>}
      * @readonly
      */
-    readonly when: <T_5, U = T_5>(x: T_5 | PromiseLike<T_5>, onfulfilled?: ((value: T_5) => ERef<U>) | undefined, onrejected?: ((reason: any) => ERef<U>) | undefined) => Promise<U>;
+    readonly when: <T, U = T>(x: T | PromiseLike<T>, onfulfilled?: ((value: T) => ERef<U>) | undefined, onrejected?: ((reason: any) => ERef<U>) | undefined) => Promise<U>;
 }>;
 /**
  * Creates a type that accepts both near and marshalled references that were
  * returned from `Remotable` or `Far`, and also promises for such references.
  */
-export type FarRef<Primary, Local = DataOnly<Primary>> = ERef<Local & import('./types').RemotableBrand<Local, Primary>>;
+export type FarRef<Primary, Local = DataOnly<Primary>> = ERef<Local & import("./types").RemotableBrand<Local, Primary>>;
 /**
  * `DataOnly<T>` means to return a record type `T2` consisting only of
  * properties that are *not* functions.
  */
-export type DataOnly<T> = Omit<T, FilteredKeys<T, import('./types').Callable>>;
+export type DataOnly<T> = Omit<T, FilteredKeys<T, import("./types").Callable>>;
 export type ERef<T> = PromiseLike<T> | T;
 export type ECallable<T extends import("./types").Callable> = (ReturnType<T> extends PromiseLike<infer U> ? T : (...args: Parameters<T>) => Promise<Awaited<ReturnType<T>>>);
 export type EMethods<T> = { readonly [P in keyof T]: T[P] extends import("./types").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 ESendOnlyCallable<T extends import("./types").Callable> = (...args: Parameters<T>) => Promise<void>;
 export type ESendOnlyMethods<T> = { readonly [P in keyof T]: T[P] extends import("./types").Callable ? ESendOnlyCallable<T[P]> : never; };
-export type ESendOnlyCallableOrMethods<T> = (T extends import('./types').Callable ? ESendOnlyCallable<T> & ESendOnlyMethods<Required<T>> : ESendOnlyMethods<Required<T>>);
-export type ECallableOrMethods<T> = (T extends import('./types').Callable ? ECallable<T> & EMethods<Required<T>> : EMethods<Required<T>>);
+export type ESendOnlyCallableOrMethods<T> = (T extends import("./types").Callable ? ESendOnlyCallable<T> & ESendOnlyMethods<Required<T>> : ESendOnlyMethods<Required<T>>);
+export type ECallableOrMethods<T> = (T extends import("./types").Callable ? ECallable<T> & EMethods<Required<T>> : EMethods<Required<T>>);
 /**
  * Return a union of property names/symbols/numbers P for which the record element T[P]'s type extends U.
  *
@@ -86,25 +83,25 @@ 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 import('./types').Callable ? (...args: Parameters<T>) => ReturnType<T> : Pick<T, FilteredKeys<T, import('./types').Callable>>);
+export type PickCallable<T> = (T extends import("./types").Callable ? (...args: Parameters<T>) => ReturnType<T> : Pick<T, FilteredKeys<T, import("./types").Callable>>);
 /**
  * `RemoteFunctions<T>` means to return the functions and properties that are remotely callable.
  */
-export type RemoteFunctions<T> = T extends import("./types").RemotableBrand<infer L, infer R> ? PickCallable<R> : Awaited<T> extends import("./types").RemotableBrand<infer L_1, infer R_1> ? PickCallable<R_1> : T extends PromiseLike<infer U> ? Awaited<T> : T;
-export type LocalRecord<T> = T extends import("./types").RemotableBrand<infer L, infer R> ? L : Awaited<T> extends import("./types").RemotableBrand<infer L_1, infer R_1> ? L_1 : T extends PromiseLike<infer U> ? Awaited<T> : T;
+export type RemoteFunctions<T> = (T extends import("./types").RemotableBrand<infer L, infer R> ? PickCallable<R> : Awaited<T> extends import("./types").RemotableBrand<infer L, infer R> ? PickCallable<R> : T extends PromiseLike<infer U> ? Awaited<T> : T);
+export type LocalRecord<T> = (T extends import("./types").RemotableBrand<infer L, infer R> ? L : Awaited<T> extends import("./types").RemotableBrand<infer L, infer R> ? L : T extends PromiseLike<infer U> ? Awaited<T> : T);
 export type EPromiseKit<R = unknown> = {
     promise: Promise<R>;
-    settler: import('./types').Settler<R>;
+    settler: import("./types").Settler<R>;
 };
 /**
  * Type for an object that must only be invoked with E.  It supports a given
  * interface but declares all the functions as asyncable.
  */
-export type EOnly<T> = T extends import("./types").Callable ? (...args: Parameters<T>) => ERef<Awaited<EOnly<ReturnType<T>>>> : T extends Record<PropertyKey, import("./types").Callable> ? { [K in keyof T]: T[K] extends import("./types").Callable ? (...args: Parameters<T[K]>) => ERef<Awaited<EOnly<ReturnType<T[K]>>>> : T[K]; } : T;
+export type EOnly<T> = (T extends import("./types").Callable ? (...args: Parameters<T>) => ERef<Awaited<EOnly<ReturnType<T>>>> : T extends Record<PropertyKey, import("./types").Callable> ? { [K in keyof T]: T[K] extends import("./types").Callable ? (...args: Parameters<T[K]>) => ERef<Awaited<EOnly<ReturnType<T[K]>>>> : T[K]; } : T);
 /**
  * @param {import('./types').HandledPromiseConstructor} HandledPromise
  */
-declare function makeE(HandledPromise: import('./types').HandledPromiseConstructor): (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
+declare function makeE(HandledPromise: import("./types").HandledPromiseConstructor): (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
     /**
      * 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
@@ -116,7 +113,7 @@ declare function makeE(HandledPromise: import('./types').HandledPromiseConstruct
      * @returns {EGetters<LocalRecord<T>>} property get proxy
      * @readonly
      */
-    readonly get: <T_1>(x: T_1) => EGetters<LocalRecord<T_1>>;
+    readonly get: <T>(x: T) => EGetters<LocalRecord<T>>;
     /**
      * E.resolve(x) converts x to a handled promise. It is
      * shorthand for HandledPromise.resolve(x)
@@ -128,8 +125,8 @@ declare function makeE(HandledPromise: import('./types').HandledPromiseConstruct
      */
     readonly resolve: {
         (): Promise<void>;
-        <T_2>(value: T_2): Promise<Awaited<T_2>>;
-        <T_3>(value: T_3 | PromiseLike<T_3>): Promise<Awaited<T_3>>;
+        <T>(value: T): Promise<Awaited<T>>;
+        <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>;
     };
     /**
      * E.sendOnly returns a proxy similar to E, but for which the results
@@ -140,7 +137,7 @@ declare function makeE(HandledPromise: import('./types').HandledPromiseConstruct
      * @returns {ESendOnlyCallableOrMethods<RemoteFunctions<T>>} method/function call proxy
      * @readonly
      */
-    readonly sendOnly: <T_4>(x: T_4) => ESendOnlyCallableOrMethods<RemoteFunctions<T_4>>;
+    readonly sendOnly: <T>(x: T) => ESendOnlyCallableOrMethods<RemoteFunctions<T>>;
     /**
      * E.when(x, res, rej) is equivalent to
      * HandledPromise.resolve(x).then(res, rej)
@@ -153,6 +150,6 @@ declare function makeE(HandledPromise: import('./types').HandledPromiseConstruct
      * @returns {Promise<U>}
      * @readonly
      */
-    readonly when: <T_5, U = T_5>(x: T_5 | PromiseLike<T_5>, onfulfilled?: ((value: T_5) => ERef<U>) | undefined, onrejected?: ((reason: any) => ERef<U>) | undefined) => Promise<U>;
+    readonly when: <T, U = T>(x: T | PromiseLike<T>, onfulfilled?: ((value: T) => ERef<U>) | undefined, onrejected?: ((reason: any) => ERef<U>) | undefined) => Promise<U>;
 };
 //# 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":";qBAoPc,UAAU;;;;IAhEhB;;;;;;;;;;OAUG;;IAMH;;;;;;;;OAQG;;;;;;IAGH;;;;;;;;OAQG;;IAMH;;;;;;;;;;;OAWG;;EAYoB;;;;;mBAQmC,OAAO,EAAd,KAAK,wBAAnD,IAAI,CAA0C,KAAK,AAAzC,GAAG,OAAO,SAAS,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;;;;;qBAQzC,CAAC,IAAtB,IAAI,CAAiB,CAAC,AAAhB,EAAE,YAAY,CAAC,CAAC,EAAE,OAAO,SAAS,EAAE,QAAQ,CAAC,CAAC;iBAMnC,CAAC,IAAlB,WAAW,CAAM,CAAC,AAAL,CAAC,GAAG,CAAC;sBAQiC,CAAC,uCAHpD,CACZ,UAAc,CAEiD,CAAC,AAFhD,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAEiB,CAAC,AADvD,GACD,CAAC,GAAG,IAAI,EAAE,UAAU,CAAmC,CAAC,AAAlC,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAChE;qBAOe,CAAC,gBAAC,CAAC;qBAUG,CAAC,gBAAC,CAAC,6CAFiC,CAAC;8BAQ5B,CAAC,uCAAtB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;6BAO3B,CAAC,gBAAC,CAAC;uCAUK,CAAC,IAHvB,CAGsB,CAAC,AAF9B,SAAS,OAAO,SAAS,EAAE,QAAQ,GAChC,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,OAAO,SAAS,EAAE,QAAQ,GAChC,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,OAAG,CAAC;;;;;yBAWnB,CAAC,IAHlB,CAGiB,CAAC,AAFzB,SAAS,OAAO,SAAS,EAAE,QAAQ,GAChC,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,OAAO,SAAS,EAAE,QAAQ,CAAC,CAAC,CACzD;;;;4BAcK,CAAC,qDAN4C,CAAC,QACjC,CAAC,gFAC4C,GAAC,QAC9C,GAAC,oDACc,CAAC;wBAe7B,CAAC,qDALD,CAAC,QADqD,CAAC,kEAGvD,GAAC,QADkE,GAAC,sCAExC,CAAC;wBAUE,CAAC,cAF5B;IACZ,OAAW,EAAE,OAAO,CACmB,CAAC,AADlB,CAAC,CAAC;IACxB,OAAW,EAAE,OAAO,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CACvC;;;;;kBAcwE,CAAC,qDAJ1D,UAAU,CAI+C,CAAC,AAJ9C,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAIU,CAAC,AAJT,CAAC,CAAC,CAAC,CAAC,kEAIM,CAAC;AA/O/E;;GAEG;AACH,uCAFW,OAAO,SAAS,EAAE,yBAAyB,KAYA,CAAC;IAI/C;;;;;;;;;;OAUG;mBAF+B,GAAC;IAQnC;;;;;;;;OAQG;;;;;;IAGH;;;;;;;;OAQG;wBAFqD,GAAC;IAQzD;;;;;;;;;;;OAWG;oBAJgB,GAAC,EAEC,CAAC,+GADF,GAAG;EAW9B"}
+{"version":3,"file":"E.d.ts","sourceRoot":"","sources":["E.js"],"names":[],"mappings":";qBAoPc,UAAU,kBAhFb,OAAO,SAAS,EAAE,yBAAyB,OAUnC,CAAC,KACH,CAAC,KACC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAIjD;;;;;;;;;;OAUG;mBAJU,CAAC,KACH,CAAC,KACC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAQrC;;;;;;;;OAQG;;;;;;IAGH;;;;;;;;OAQG;wBAJU,CAAC,KACH,CAAC,KACC,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAQ3D;;;;;;;;;;;OAWG;oBAPU,CAAC,EACA,CAAC,SACJ,CAAC,GAAC,WAAW,CAAC,CAAC,CAAC,yBACR,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,sCACZ,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,kBACtB,OAAO,CAAC,CAAC,CAAC;EAcA;;;;;mBAMlB,OAAO,EACN,KAAK,wBACN,IAAI,CAAC,KAAK,GAAG,OAAO,SAAS,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;;;;;qBAO9D,CAAC,IACD,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,OAAO,SAAS,EAAE,QAAQ,CAAC,CAAC;iBAKpD,CAAC,IACD,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;sBAIW,CAAC,SAA9B,OAAQ,SAAS,EAAE,QAAS,IAC5B,CACZ,UAAc,CAAC,CAAC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GACtC,CAAC,GACD,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAChE;qBAIS,CAAC,IACD,EACZ,QAAY,EAAE,CAAY,IAAP,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,OAAO,SAAS,EAAE,QAAQ,GAC5D,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACf,KAAK,GACV;qBAIS,CAAC,IACD,EACZ,QAAY,EAAE,CAAY,IAAP,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GACtD,CAAC,CAAC,CAAC,CAAC,GACJ,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC3B;8BAIsC,CAAC,SAA9B,OAAQ,SAAS,EAAE,QAAS,IAC5B,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;6BAIzC,CAAC,IACD,EACZ,QAAY,EAAE,CAAY,IAAP,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,OAAO,SAAS,EAAE,QAAQ,GAC5D,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvB,KAAK,GACV;uCAIS,CAAC,IACD,CACZ,CAAK,SAAS,OAAO,SAAS,EAAE,QAAQ,GAChC,iBAAiB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GACpD,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAClC;+BAIS,CAAC,IACD,CACZ,CAAK,SAAS,OAAO,SAAS,EAAE,QAAQ,GAChC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GACpC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC1B;;;;;;;;;;;yBAaS,CAAC,EACD,CAAC,IACD,GAAG,CAAY,IAAP,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;;;;;yBAOxD,CAAC,IACD,CACZ,CAAK,SAAS,OAAO,SAAS,EAAE,QAAQ,GAChC,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,GACzC,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,OAAO,SAAS,EAAE,QAAQ,CAAC,CAAC,CACzD;;;;4BAMS,CAAC,IACD,CACZ,CAAK,SAAS,OAAO,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACxD,YAAY,CAAC,CAAC,CAAC,GACf,OAAO,CAAC,CAAC,CAAC,SAAS,OAAO,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACrE,YAAY,CAAC,CAAC,CAAC,GACf,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC9B,OAAO,CAAC,CAAC,CAAC,GACV,CAAC,CACN;wBAIS,CAAC,IACD,CACZ,CAAK,SAAS,OAAO,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACxD,CAAC,GACD,OAAO,CAAC,CAAC,CAAC,SAAS,OAAO,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACrE,CAAC,GACD,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC9B,OAAO,CAAC,CAAC,CAAC,GACV,CAAC,CACN;wBAIU,CAAC,cACF;IACZ,OAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,OAAW,EAAE,OAAO,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CACvC;;;;;kBAOS,CAAC,IACD,CACZ,CAAK,SAAS,OAAO,SAAS,EAAE,QAAQ,GAChC,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC/D,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,OAAO,SAAS,EAAE,QAAQ,CAAC,GACzD,GACG,CAAY,IAAP,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,OAAO,SAAS,EAAE,QAAQ,GACnD,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACrE,CAAC,CAAC,CAAC,CAAC,GACT,GACD,CAAC,CACN;AAnPJ;;GAEG;AACH,uCAFW,OAAO,SAAS,EAAE,yBAAyB,KAUnC,CAAC,KACH,CAAC,KACC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAIjD;;;;;;;;;;OAUG;mBAJU,CAAC,KACH,CAAC,KACC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAQrC;;;;;;;;OAQG;;;;;;IAGH;;;;;;;;OAQG;wBAJU,CAAC,KACH,CAAC,KACC,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAQ3D;;;;;;;;;;;OAWG;oBAPU,CAAC,EACA,CAAC,SACJ,CAAC,GAAC,WAAW,CAAC,CAAC,CAAC,yBACR,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,sCACZ,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,kBACtB,OAAO,CAAC,CAAC,CAAC;EAU9B"}

package/src/E.js

@@ -1,7 +1,7 @@
 import { trackTurns } from './track-turns.js';
 import { makeMessageBreakpointTester } from './message-breakpoints.js';
 
-const { details: X, quote: q, Fail } = assert;
+const { details: X, quote: q, Fail, error: makeError } = assert;
 const { assign, create } = Object;
 
 const onSend = makeMessageBreakpointTester('ENDO_SEND_BREAKPOINTS');
@@ -52,7 +52,7 @@ const makeEProxyHandler = (recipient, HandledPromise) =>
             if (this !== receiver) {
               // Reject the async function call
               return HandledPromise.reject(
-                assert.error(
+                makeError(
                   X`Unexpected receiver for "${q(propertyKey)}" method of E(${q(
                     recipient,
                   )})`,

package/src/handled-promise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handled-promise.d.ts","sourceRoot":"","sources":["handled-promise.js"],"names":[],"mappings":"AAyDO;SAsIyG,CAAC,qDAArC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;eAA0B,OAAO,CAAC,OAAO,CAAC;qDAoY9I;oBAU4B,CAAC,IANjB;IACZ,GAAO,CAAC,CAAC,CAAC,EAKkB,CAAC,AALhB,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACzE,WAAe,CAAC,CAAC,CAAC,EAIU,CAAC,AAJR,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAChD,aAAiB,CAAC,CAAC,CAAC,EAGQ,CAAC,AAHN,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACjF,qBAAyB,CAAC,CAAC,CAAC,EAEA,CAAC,AAFE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACxD,WAAe,CAAC,CAAC,CAAC,EACU,CAAC,AADR,EAAE,IAAI,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC9G,mBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAClF;0CAOyB,CAAC,eAFjB;IACZ,KAAS,CAAC,EAAE;QACZ,OAAa,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAY,EAAE,OAAO,CAAC;QACtB,eAAqB,CAAC,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;KAC7C,CAAC;CACH;4BAM0B,CAAC,cADlB,CACZ,cAAkB,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,IAAI,EACvC,aAAiB,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,EAC7C,mBAAuB,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,6BAA6B,CAAC,EAAE,CAAC,KAAK,MAAM,KACvG,IAAI;oBAMS,CAAC,cADT;IACZ,OAAW,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IAC7B,MAAU,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,mBAAuB,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,6BAA6B,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;CACzG;0CAIS;IACZ,aAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,qBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAClE,WAAe,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnG,mBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACnF,GAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,WAAe,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;CACvD;wCAGU,UAAU,CAAC,OAAO,kBAAkB,CAAC"}
+{"version":3,"file":"handled-promise.d.ts","sourceRoot":"","sources":["handled-promise.js"],"names":[],"mappings":"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"}

package/src/handled-promise.js

@@ -9,7 +9,7 @@ import {
 } from './local.js';
 import { makePostponedHandler } from './postponed.js';
 
-const { Fail, details: X, quote: q } = assert;
+const { Fail, details: X, quote: q, note: annotateError } = assert;
 
 const {
   create,
@@ -337,7 +337,7 @@ export const makeHandledPromise = () => {
         handledResolve(resolvedTarget);
         return resolvedTarget;
       } catch (e) {
-        assert.note(e, X`during resolveWithPresence`);
+        annotateError(e, X`during resolveWithPresence`);
         handledReject(e);
         throw e;
       }

package/src/message-breakpoints.d.ts

@@ -6,14 +6,14 @@ export function makeMessageBreakpointTester(optionName: string): MessageBreakpoi
  * prefix. For objects defined with `Far` this is the first argument,
  * known as the `farName`. For exos, this is the tag.
  */
-export type MatchStringTag = string | '*';
+export type MatchStringTag = string | "*";
 /**
  * A star `'*'` matches any method name. Otherwise, the string is
  * matched against the method name. Currently, this is only an exact match.
  * However, beware that we may introduce a string syntax for
  * symbol method names.
  */
-export type MatchMethodName = string | '*';
+export type MatchMethodName = string | "*";
 /**
  * A star `'*'` will always breakpoint. Otherwise, the string
  * must be a non-negative integer. Once that is zero, always breakpoint.
@@ -21,7 +21,7 @@ export type MatchMethodName = string | '*';
  * In other words, the countdown represents the number of
  * breakpoint occurrences to skip before actually breakpointing.
  */
-export type MatchCountdown = number | '*';
+export type MatchCountdown = number | "*";
 /**
  * This is the external JSON representation, in which
  * - the outer property name is the class-like tag or '*',

package/src/no-shim.d.ts

@@ -1,17 +1,27 @@
-export const E: (<T>(x: T) => import("./E.js").ECallableOrMethods<import("./E.js").RemoteFunctions<T>>) & {
-    readonly get: <T_1>(x: T_1) => import("./E.js").EGetters<import("./E.js").LocalRecord<T_1>>;
+export const E: (<T>(x: T) => ECallableOrMethods<RemoteFunctions<T>>) & {
+    readonly get: <T>(x: T) => EGetters<LocalRecord<T>>;
     readonly resolve: {
         (): Promise<void>;
-        <T_2>(value: T_2): Promise<Awaited<T_2>>;
-        <T_3>(value: T_3 | PromiseLike<T_3>): Promise<Awaited<T_3>>;
+        <T>(value: T): Promise<Awaited<T>>;
+        <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>;
     };
-    readonly sendOnly: <T_4>(x: T_4) => import("./E.js").ESendOnlyCallableOrMethods<import("./E.js").RemoteFunctions<T_4>>;
-    readonly when: <T_5, U = T_5>(x: T_5 | PromiseLike<T_5>, onfulfilled?: ((value: T_5) => import("./E.js").ERef<U>) | undefined, onrejected?: ((reason: any) => import("./E.js").ERef<U>) | undefined) => Promise<U>;
+    readonly sendOnly: <T>(x: T) => ESendOnlyCallableOrMethods<RemoteFunctions<T>>;
+    readonly when: <T, U = T>(x: T | PromiseLike<T>, onfulfilled?: ((value: T) => ERef<U>) | undefined, onrejected?: ((reason: any) => ERef<U>) | undefined) => Promise<U>;
 };
 export { hp as HandledPromise };
 export * from "./exports.js";
+import type { ECallableOrMethods } from './E.js';
+import type { RemoteFunctions } from './E.js';
+import type { EGetters } from './E.js';
+import type { LocalRecord } from './E.js';
+import type { ESendOnlyCallableOrMethods } from './E.js';
+import type { ERef } from './E.js';
+/** @import {Handler, HandledExecutor} from './handled-promise.js' */
+/** @import {ECallableOrMethods, EGetters, ERef, ERemoteFunctions, ESendOnlyCallableOrMethods, LocalRecord, RemoteFunctions} from './E.js' */
 declare const hp: {
-    new <R>(executor: import("./handled-promise.js").HandledExecutor<R>, unfulfilledHandler?: import("./handled-promise.js").Handler<Promise<unknown>> | undefined): Promise<R>;
+    new <R>(executor: HandledExecutor<R>, unfulfilledHandler?: Handler<Promise<unknown>>): Promise<R>;
     prototype: Promise<unknown>;
 } & PromiseConstructor & import("./handled-promise.js").HandledPromiseStaticMethods;
+import type { HandledExecutor } from './handled-promise.js';
+import type { Handler } from './handled-promise.js';
 //# sourceMappingURL=no-shim.d.ts.map

package/src/no-shim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-shim.d.ts","sourceRoot":"","sources":["no-shim.js"],"names":[],"mappings":"AAGA;;;;;;;;;EAA2B;;;AAD3B;;;oFAA0B"}
+{"version":3,"file":"no-shim.d.ts","sourceRoot":"","sources":["no-shim.js"],"names":[],"mappings":"AAOA;;;;;;;;;EAA2B;;;wCAHuG,QAAQ;qCAAR,QAAQ;8BAAR,QAAQ;iCAAR,QAAQ;gDAAR,QAAQ;0BAAR,QAAQ;AAD1I,qEAAqE;AACrE,6IAA6I;AAE7I;;;oFAA0B;qCAHkB,sBAAsB;6BAAtB,sBAAsB"}

package/src/no-shim.js

@@ -1,5 +1,9 @@
 import makeE from './E.js';
 
+// XXX module exports for HandledPromise fail if these aren't in scope
+/** @import {Handler, HandledExecutor} from './handled-promise.js' */
+/** @import {ECallableOrMethods, EGetters, ERef, ERemoteFunctions, ESendOnlyCallableOrMethods, LocalRecord, RemoteFunctions} from './E.js' */
+
 const hp = HandledPromise;
 export const E = makeE(hp);
 export { hp as HandledPromise };

package/src/postponed.d.ts

@@ -1,2 +1,2 @@
-export function makePostponedHandler(HandledPromise: import('./types').HandledPromiseConstructor): [Required<import('./types').Handler<any>>, () => void];
+export function makePostponedHandler(HandledPromise: import("./types").HandledPromiseConstructor): [Required<import("./types").Handler<any>>, () => void];
 //# sourceMappingURL=postponed.d.ts.map

package/src/track-turns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"track-turns.d.ts","sourceRoot":"","sources":["track-turns.js"],"names":[],"mappings":"AAwFO,2BAFM,CAAC,uCAmBb;;;;;4BAMY,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS"}
+{"version":3,"file":"track-turns.d.ts","sourceRoot":"","sources":["track-turns.js"],"names":[],"mappings":"AA2FO,2BAJwB,CAAC,SAAlB,aAAa,EAAG,SACnB,CAAC,GACC,CAAC,CAmBb;;;;;4BAMY,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS"}

package/src/track-turns.js

@@ -5,7 +5,10 @@ import {
 } from '@endo/env-options';
 
 // NOTE: We can't import these because they're not in scope before lockdown.
-// import { assert, details as X, Fail } from '@agoric/assert';
+// We also cannot currently import them because it would create a cyclic
+// dependency, though this is more easily fixed.
+// import { assert, X, Fail } from '@endo/errors';
+// See also https://github.com/Agoric/agoric-sdk/issues/9515
 
 // WARNING: Global Mutable State!
 // This state is communicated to `assert` that makes it available to the
@@ -33,7 +36,7 @@ const ENABLED =
 
 const addRejectionNote = detailsNote => reason => {
   if (reason instanceof Error) {
-    assert.note(reason, detailsNote);
+    globalThis.assert.note(reason, detailsNote);
   }
   if (VERBOSE) {
     console.log('REJECTED at top of event loop', reason);
@@ -52,7 +55,7 @@ const wrapFunction =
         result = func(...args);
       } catch (err) {
         if (err instanceof Error) {
-          assert.note(
+          globalThis.assert.note(
             err,
             X`Thrown from: ${hiddenPriorError}:${hiddenCurrentTurn}.${hiddenCurrentEvent}`,
           );
@@ -90,14 +93,14 @@ export const trackTurns = funcs => {
   if (!ENABLED || typeof globalThis === 'undefined' || !globalThis.assert) {
     return funcs;
   }
-  const { details: X } = assert;
+  const { details: X, note: annotateError } = globalThis.assert;
 
   hiddenCurrentEvent += 1;
   const sendingError = Error(
     `Event: ${hiddenCurrentTurn}.${hiddenCurrentEvent}`,
   );
   if (hiddenPriorError !== undefined) {
-    assert.note(sendingError, X`Caused by: ${hiddenPriorError}`);
+    annotateError(sendingError, X`Caused by: ${hiddenPriorError}`);
   }
 
   return /** @type {T} */ (