Fix selector requested event emission

Closes #61
yuriyyakym · Dec 18, 2023 · 30be1fc · 30be1fc
1 parent 2e4f866
commit 30be1fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/selector/asyncSelector.ts b/src/selector/asyncSelector.ts
@@ -122,7 +122,17 @@ const asyncSelector = <T extends (ReadableState | ReadableAsyncState)[], U>(
   scenario(
     async () => {
       const abortController = new AbortController();
-      await Promise.race(states.map((state) => state.events.changed.abortable(abortController)));
+      await Promise.race(
+        states.flatMap((state) => {
+          return isReadableAsyncState(state)
+            ? [
+                state.events.requested.abortable(abortController),
+                state.events.rejected.abortable(abortController),
+                state.events.fulfilled.abortable(abortController),
+              ]
+            : state.events.changed.abortable(abortController);
+        }),
+      );
       abortController.abort();
     },
     determineNextVersion,

diff --git a/tests/selector.test.ts b/tests/selector.test.ts
@@ -186,7 +186,8 @@ test('emits `requested` event when one of async dependencies is requested', asyn
     nameState.set(delay(10).then(() => 'Awai'));
   }, 10);
 
-  expect(mergedState.events.requested).resolves.toBeUndefined();
+  await mergedState.events.requested;
+  await delay(5);
   expect(mergedState.events.fulfilled).resolves.toEqual('Hello Awai');
   expect(mergedState.events.changed).resolves.toEqual('Hello Awai');
 });