feat: loosen watcher type guards to support non-passables

Co-authored-by: Michael FIG <[email protected]>
Agoric · Sep 16, 2024 · efaeb1c · efaeb1c
1 parent e67cd91
commit efaeb1c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/packages/vow/src/watch-utils.js b/packages/vow/src/watch-utils.js
@@ -57,8 +57,8 @@ export const prepareWatchUtils = (
         asPromise: M.call(M.raw()).rest(M.raw()).returns(M.promise()),
       }),
       watcher: M.interface('Watcher', {
-        onFulfilled: M.call(M.any()).rest(M.any()).returns(M.any()),
-        onRejected: M.call(M.any()).rest(M.any()).returns(M.any()),
+        onFulfilled: M.call(M.raw()).rest(M.raw()).returns(M.raw()),
+        onRejected: M.call(M.raw()).rest(M.raw()).returns(M.raw()),
       }),
       retryRejectionPromiseWatcher: PromiseWatcherI,
     },

diff --git a/packages/vow/test/watch-utils.test.js b/packages/vow/test/watch-utils.test.js
@@ -252,3 +252,19 @@ test('asPromise handles watcher arguments', async t => {
   t.is(result, 'watcher test');
   t.true(watcherCalled);
 });
+
+test('allVows handles unstorable results', async t => {
+  const zone = makeHeapZone();
+  const { watch, when, allVows } = prepareBasicVowTools(zone);
+
+  const nonPassable = () => 'i am a function';
+
+  const specimenA = Promise.resolve('i am a promise');
+  const specimenB = watch(nonPassable);
+
+  const result = await when(allVows([specimenA, specimenB]));
+  t.is(result.length, 2);
+  t.is(result[0], 'i am a promise');
+  t.is(result[1], nonPassable);
+  t.is(result[1](), 'i am a function');
+});