@agoric/internal 0.2.2-dev-0f75764.0 → 0.2.2-dev-e3a7775.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.2.2-dev-0f75764.0+0f75764",
+  "version": "0.2.2-dev-e3a7775.0+e3a7775",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0f7576432d93ec83b420ee22ed2346eaaee99f2a"
+  "gitHead": "e3a77757bcef3e2239bd34fd450d7c9500b46571"
 }

package/src/utils.d.ts

@@ -38,10 +38,9 @@ export function PromiseAllOrErrors<T>(values: readonly (T | PromiseLike<T>)[]):
  */ export const aggregateTryFinally: <T>(trier: () => Promise<T>, finalizer: (error?: unknown) => Promise<void>) => Promise<T>;
 export function fsStreamReady(stream: import("fs").ReadStream | import("fs").WriteStream): Promise<void>;
 export function assertAllDefined<T extends Record<string, unknown>>(obj: T): asserts obj is AllDefined<T>;
-/** @type {AsyncIterable<null>} */
-export const forever: AsyncIterable<null>;
-export function whileTrue(boolFunc: () => unknown): AsyncIterable<null>;
-export function untilTrue(boolFunc: () => unknown): AsyncIterable<null>;
+export const forever: AsyncIterable<undefined>;
+export function whileTrue<T>(produce: () => T): AsyncIterable<Awaited<T>>;
+export function untilTrue<T>(produce: () => T): AsyncIterable<Awaited<T>>;
 export type Remotable = import('@endo/marshal/src/types').Remotable;
 export type DeeplyAwaitedObject<T extends {}> = { [K in keyof T]: DeeplyAwaited<T[K]>; };
 /**

package/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AA4BO,0EAcN;AA0CM,gJAIN;AAQM,0CAHI,MAAM,MAAM,GAAG,MAAM,CAAC,cACtB,MAAM,MAAM,GAAG,MAAM,CAAC,uBAKhC;AASM,uCALI,KAAK,SACL,MAAM,GAAC,MAAM,qBACb,gBAAgB,eACd,KAAK,CAYjB;AAUM,uHAsBN;AAgCM,oCAHI,GAAG,GACD,CAAC,MAAM,GAAC,MAAM,CAAC,EAAE,CAqB7B;AA+BM,oCAHI,SAAS,GACP,SAAS,CAiBnB;AAGH;;;GAGG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,gIAGE;AAUK,wDAHI,cAAc,YAAY,EAAE,WAAW,CAAC,GAAG;;cACmB,MAAM;GAW9E;AAMM,2CAHI,KAAK,EAAE,uCAcjB;AAOM,6FAeN;AAED;;;;;GAKG,CAAC,mFAFoB,OAAO,KAAK,QAAQ,IAAI,CAAC,gBAY7C;AAMG,sCAHI,OAAO,IAAI,EAAE,UAAU,GAAG,OAAO,IAAI,EAAE,WAAW,GAChD,QAAQ,IAAI,CAAC,CAgCtB;AAiBG,0GAUN;AAID,kCAAkC;AAClC,sBADW,cAAc,IAAI,CAAC,CACwB;AAS/C,oCANI,MAAM,OAAO,GAIX,cAAc,IAAI,CAAC,CAQ7B;AASI,oCANI,MAAM,OAAO,GAIX,cAAc,IAAI,CAAC,CAQ7B;wBAxbW,OAAO,yBAAyB,EAAE,SAAS;;;;;;;+BA+P5C,CAAC,SAAS,YAAY,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,oBAAoB,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AA4BO,0EAcN;AA0CM,gJAIN;AAQM,0CAHI,MAAM,MAAM,GAAG,MAAM,CAAC,cACtB,MAAM,MAAM,GAAG,MAAM,CAAC,uBAKhC;AASM,uCALI,KAAK,SACL,MAAM,GAAC,MAAM,qBACb,gBAAgB,eACd,KAAK,CAYjB;AAUM,uHAsBN;AAgCM,oCAHI,GAAG,GACD,CAAC,MAAM,GAAC,MAAM,CAAC,EAAE,CAqB7B;AA+BM,oCAHI,SAAS,GACP,SAAS,CAiBnB;AAGH;;;GAGG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,gIAGE;AAUK,wDAHI,cAAc,YAAY,EAAE,WAAW,CAAC,GAAG;;cACmB,MAAM;GAW9E;AAMM,2CAHI,KAAK,EAAE,uCAcjB;AAOM,6FAeN;AAED;;;;;GAKG,CAAC,mFAFoB,OAAO,KAAK,QAAQ,IAAI,CAAC,gBAY7C;AAMG,sCAHI,OAAO,IAAI,EAAE,UAAU,GAAG,OAAO,IAAI,EAAE,WAAW,GAChD,QAAQ,IAAI,CAAC,CAgCtB;AAiBG,0GAUN;AAQD,+CAAoD;AAU7C,0EAUH;AAUG,0EAaH;wBAxcU,OAAO,yBAAyB,EAAE,SAAS;;;;;;;+BA+P5C,CAAC,SAAS,YAAY,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,oBAAoB,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC"}

package/src/utils.js

@@ -411,37 +411,53 @@ export const assertAllDefined = obj => {
   }
 };
 
-const neverDone = harden({ done: false, value: null });
+/** @type {IteratorResult<undefined, never>} */
+const notDone = harden({ done: false, value: undefined });
 
-/** @type {AsyncIterable<null>} */
-export const forever = asyncGenerate(() => neverDone);
+/** @type {IteratorResult<never, void>} */
+const alwaysDone = harden({ done: true, value: undefined });
+
+export const forever = asyncGenerate(() => notDone);
 
 /**
- * @param {() => unknown} boolFunc
- * `boolFunc`'s return value is used for its truthiness vs falsiness.
+ * @template T
+ * @param {() => T} produce
+ * The value of `await produce()` is used for its truthiness vs falsiness.
  * IOW, it is coerced to a boolean so the caller need not bother doing this
  * themselves.
- * @returns {AsyncIterable<null>}
+ * @returns {AsyncIterable<Awaited<T>>}
  */
-export const whileTrue = boolFunc =>
-  asyncGenerate(() =>
-    harden({
-      done: !boolFunc(),
-      value: null,
-    }),
-  );
+export const whileTrue = produce =>
+  asyncGenerate(async () => {
+    const value = await produce();
+    if (!value) {
+      return alwaysDone;
+    }
+    return harden({
+      done: false,
+      value,
+    });
+  });
 
 /**
- * @param {() => unknown} boolFunc
- * `boolFunc`'s return value is used for its truthiness vs falsiness.
+ * @template T
+ * @param {() => T} produce
+ * The value of `await produce()` is used for its truthiness vs falsiness.
  * IOW, it is coerced to a boolean so the caller need not bother doing this
  * themselves.
- * @returns {AsyncIterable<null>}
+ * @returns {AsyncIterable<Awaited<T>>}
  */
-export const untilTrue = boolFunc =>
-  asyncGenerate(() =>
-    harden({
-      done: !!boolFunc(),
-      value: null,
-    }),
-  );
+export const untilTrue = produce =>
+  asyncGenerate(async () => {
+    const value = await produce();
+    if (value) {
+      return harden({
+        done: true,
+        value,
+      });
+    }
+    return harden({
+      done: false,
+      value,
+    });
+  });