@agoric/internal 0.3.3-upgrade-16-dev-f908f89.0 → 0.3.3-upgrade-16-dev-d492653.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-upgrade-16-dev-f908f89.0+f908f89",
+  "version": "0.3.3-upgrade-16-dev-d492653.0+d492653",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,8 +20,8 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/base-zone": "0.1.1-upgrade-16-dev-f908f89.0+f908f89",
+    "@agoric/assert": "0.6.1-upgrade-16-dev-d492653.0+d492653",
+    "@agoric/base-zone": "0.1.1-upgrade-16-dev-d492653.0+d492653",
     "@endo/common": "^1.2.2",
     "@endo/far": "^1.1.2",
     "@endo/init": "^1.1.2",
@@ -58,5 +58,5 @@
   "typeCoverage": {
     "atLeast": 93.89
   },
-  "gitHead": "f908f89186162df83b540f6aeb1f4c665c3a56b4"
+  "gitHead": "d49265372b3cdd681558791b0c780e1c3062bdcc"
 }

package/src/types.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import type { ERef, RemotableBrand } from '@endo/eventual-send';
+import type { RemotableBrand } from '@endo/eventual-send';
 import type { Primitive } from '@endo/pass-style';
 import type { Callable } from './utils.js';
 
@@ -56,11 +56,3 @@ export type DataOnly<T> =
 export type Remote<Primary, Local = DataOnly<Primary>> =
   | Primary
   | RemotableBrand<Local, Primary>;
-
-// TODO: Add type tests for FarRef and Remote.
-/**
- * Potentially remote promises or settled references.
- */
-export type FarRef<Primary, Local = DataOnly<Primary>> = ERef<
-  Remote<Primary, Local>
->;

package/src/utils.d.ts

@@ -35,6 +35,14 @@ export function makeMeasureSeconds(currentTimeMillisec: typeof import("perf_hook
     result: T;
     duration: number;
 }>;
+export function PromiseAllOrErrors<T>(items: readonly (T | PromiseLike<T>)[]): Promise<T[]>;
+/**
+ * @type {<T>(
+ *   trier: () => Promise<T>,
+ *   finalizer: (error?: unknown) => Promise<void>,
+ * ) => Promise<T>}
+ */
+export const aggregateTryFinally: <T>(trier: () => Promise<T>, finalizer: (error?: unknown) => Promise<void>) => Promise<T>;
 export function assertAllDefined<T extends Record<string, unknown>>(obj: T): asserts obj is AllDefined<T>;
 export const forever: AsyncIterable<undefined>;
 export function whileTrue<T>(produce: () => T): AsyncIterable<Awaited<T>>;

package/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAYA,kCAAoC;AAEpC,sCAAsC;AAEtC;;;;;GAKG;AAEH;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,oCAFU,CAAC,CAAC,SAAS,EAAE,EAAE,gBAAgB,EAA8B,CAAC,AAA5B,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAKxE;AAYK,wDALI,cAAc,YAAY,EAAE,WAAW,CAAC,GAAG,GACzC,CAAC,CAAC,EACd,EAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACjB,OAAO,CAAC;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAW/C;AAgBM,iCAHgC,CAAC,uCAAD,CAAC,AAD5B,GACC,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAaxC;AAQD,+CAAoD;AAS7C,0BAF4B,CAAC,WAHzB,MAGwB,CAAC,AAHlB,GAGL,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAYlC;AASG,0BAF4B,CAAC,WAHzB,MAGwB,CAAC,AAHlB,GAGL,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAelC;AAEJ,mDAAmD;AACnD,kBADW,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAoB,CAAC,AAAlB,EAAE,EAAE,EAAE,EAAc,CAAC,AAAZ,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CACsB;AAErE;;;;GAIG;AACH,yBAF0C,CAAC,mCAAD,CAAC,AADhC,KACH,OAAO,CAAC,GAAG,CAAC,IAAI,MAAkB,CAAC,AAAZ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CAAC,CAMhD;AAWK,gCAHkB,CAAC,0BAAf,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAC5B,MAAM,mCAwGhB;;;;;;qBAlQoC,CAAC,IAAzB,GAAG,OAAO,IAAI,MAAU,CAAC,AAAJ,GAAG,CAAC,CAAC,OAAO,CAAC,GAAE,GAAG,EAAE;uBAMzC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;gCAM8B,CAAC,eADtD,GACP,CAAC,IAAI,MAAuD,CAAC,AAAjD,GAAgD,CAAC,AAA7C,CAA8C,CAAC,AAA7C,CAAC,SAAS,QAAQ,GAAwB,CAAC,AAArB,CAAsB,CAAC,AAArB,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACnE;0BASe,CAAC,IAAD,CAAC,AAJN,SAAS,WAAW,CAAC,GAAG,CAAC,GAC9B,OAAO,CAGG,CAAC,AAHF,CAAC,GAGA,CAAC,AAFV,SAAS,EAAE,GACV,QAAQ,CAAC,mBAAmB,CACpB,CAAC,AADqB,CAAC,CAAC,GAChC,OAAO,CAAC,CAAC,CAAC;uBAsCkB,CAAC,oCAA3B,GAAG,CAAC,IAAI,MAAkB,CAAC,AAAZ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAYA,kCAAoC;AAEpC,sCAAsC;AAEtC;;;;;GAKG;AAEH;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,oCAFU,CAAC,CAAC,SAAS,EAAE,EAAE,gBAAgB,EAA8B,CAAC,AAA5B,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAKxE;AAYK,wDALI,cAAc,YAAY,EAAE,WAAW,CAAC,GAAG,GACzC,CAAC,CAAC,EACd,EAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACjB,OAAO,CAAC;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAW/C;AAOM,mCAFc,CAAC,SADX,SAAS,CACC,CAAC,AADA,GAAG,WAAW,CACf,CAAC,AADgB,CAAC,CAAC,EAAE,GAC7B,OAAO,CAAC,CAAC,EAAE,CAAC,CAiBxB;AAED;;;;;GAKG;AACH,kCALU,CAAC,CAAC,EACX,KAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,SAAa,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,KAC1C,OAAO,CAAC,CAAC,CAAC,CAYd;AAgBG,iCAHgC,CAAC,uCAAD,CAAC,AAD5B,GACC,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAaxC;AAQD,+CAAoD;AAS7C,0BAF4B,CAAC,WAHzB,MAGwB,CAAC,AAHlB,GAGL,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAYlC;AASG,0BAF4B,CAAC,WAHzB,MAGwB,CAAC,AAHlB,GAGL,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAelC;AAEJ,mDAAmD;AACnD,kBADW,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAoB,CAAC,AAAlB,EAAE,EAAE,EAAE,EAAc,CAAC,AAAZ,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CACsB;AAErE;;;;GAIG;AACH,yBAF0C,CAAC,mCAAD,CAAC,AADhC,KACH,OAAO,CAAC,GAAG,CAAC,IAAI,MAAkB,CAAC,AAAZ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CAAC,CAMhD;AAWK,gCAHkB,CAAC,0BAAf,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAC5B,MAAM,mCAwGhB;;;;;;qBA1SoC,CAAC,IAAzB,GAAG,OAAO,IAAI,MAAU,CAAC,AAAJ,GAAG,CAAC,CAAC,OAAO,CAAC,GAAE,GAAG,EAAE;uBAMzC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;gCAM8B,CAAC,eADtD,GACP,CAAC,IAAI,MAAuD,CAAC,AAAjD,GAAgD,CAAC,AAA7C,CAA8C,CAAC,AAA7C,CAAC,SAAS,QAAQ,GAAwB,CAAC,AAArB,CAAsB,CAAC,AAArB,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACnE;0BASe,CAAC,IAAD,CAAC,AAJN,SAAS,WAAW,CAAC,GAAG,CAAC,GAC9B,OAAO,CAGG,CAAC,AAHF,CAAC,GAGA,CAAC,AAFV,SAAS,EAAE,GACV,QAAQ,CAAC,mBAAmB,CACpB,CAAC,AADqB,CAAC,CAAC,GAChC,OAAO,CAAC,CAAC,CAAC;uBA8EkB,CAAC,oCAA3B,GAAG,CAAC,IAAI,MAAkB,CAAC,AAAZ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAE"}

package/src/utils.js

@@ -74,6 +74,46 @@ export const makeMeasureSeconds = currentTimeMillisec => {
   return measureSeconds;
 };
 
+/**
+ * @template T
+ * @param {readonly (T | PromiseLike<T>)[]} items
+ * @returns {Promise<T[]>}
+ */
+export const PromiseAllOrErrors = async items => {
+  return Promise.allSettled(items).then(results => {
+    const errors = /** @type {PromiseRejectedResult[]} */ (
+      results.filter(({ status }) => status === 'rejected')
+    ).map(result => result.reason);
+    if (!errors.length) {
+      return /** @type {PromiseFulfilledResult<T>[]} */ (results).map(
+        result => result.value,
+      );
+    } else if (errors.length === 1) {
+      throw errors[0];
+    } else {
+      throw AggregateError(errors);
+    }
+  });
+};
+
+/**
+ * @type {<T>(
+ *   trier: () => Promise<T>,
+ *   finalizer: (error?: unknown) => Promise<void>,
+ * ) => Promise<T>}
+ */
+export const aggregateTryFinally = async (trier, finalizer) =>
+  trier().then(
+    async result => finalizer().then(() => result),
+    async tryError =>
+      finalizer(tryError)
+        .then(
+          () => tryError,
+          finalizeError => AggregateError([tryError, finalizeError]),
+        )
+        .then(error => Promise.reject(error)),
+  );
+
 /**
  * @template {Record<string, unknown>} T
  * @typedef {{ [P in keyof T]: Exclude<T[P], undefined> }} AllDefined

package/src/node/utils.d.ts

@@ -1,9 +0,0 @@
-export function PromiseAllOrErrors<T>(items: readonly (T | PromiseLike<T>)[]): Promise<T[]>;
-/**
- * @type {<T>(
- *   trier: () => Promise<T>,
- *   finalizer: (error?: unknown) => Promise<void>,
- * ) => Promise<T>}
- */
-export const aggregateTryFinally: <T>(trier: () => Promise<T>, finalizer: (error?: unknown) => Promise<void>) => Promise<T>;
-//# sourceMappingURL=utils.d.ts.map

package/src/node/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAYO,mCAFc,CAAC,SADX,SAAS,CACC,CAAC,AADA,GAAG,WAAW,CACf,CAAC,AADgB,CAAC,CAAC,EAAE,GAC7B,OAAO,CAAC,CAAC,EAAE,CAAC,CAiBxB;AAED;;;;;GAKG;AACH,kCALU,CAAC,CAAC,EACX,KAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,SAAa,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,KAC1C,OAAO,CAAC,CAAC,CAAC,CAYd"}

package/src/node/utils.js

@@ -1,46 +0,0 @@
-// @ts-check
-// @jessie-check
-
-// These tools seem cross platform, but they rely on AggregateError in the error
-// handling path, which is currently not available in xsnap
-import 'node:process';
-
-/**
- * @template T
- * @param {readonly (T | PromiseLike<T>)[]} items
- * @returns {Promise<T[]>}
- */
-export const PromiseAllOrErrors = async items => {
-  return Promise.allSettled(items).then(results => {
-    const errors = /** @type {PromiseRejectedResult[]} */ (
-      results.filter(({ status }) => status === 'rejected')
-    ).map(result => result.reason);
-    if (!errors.length) {
-      return /** @type {PromiseFulfilledResult<T>[]} */ (results).map(
-        result => result.value,
-      );
-    } else if (errors.length === 1) {
-      throw errors[0];
-    } else {
-      throw AggregateError(errors);
-    }
-  });
-};
-
-/**
- * @type {<T>(
- *   trier: () => Promise<T>,
- *   finalizer: (error?: unknown) => Promise<void>,
- * ) => Promise<T>}
- */
-export const aggregateTryFinally = async (trier, finalizer) =>
-  trier().then(
-    async result => finalizer().then(() => result),
-    async tryError =>
-      finalizer(tryError)
-        .then(
-          () => tryError,
-          finalizeError => AggregateError([tryError, finalizeError]),
-        )
-        .then(error => Promise.reject(error)),
-  );