fix: ensure that new trigger awais abort completion

Author: gajus

src/subscribe.test.ts

@@ -390,3 +390,36 @@ it('does not begin the new routine until the interrupted routine has completed',
 
   expect(onChange.callCount).toBe(1);
 });
+
+it('does not begin the new routine until the interrupted routine has completed (multiple-triggers)', async () => {
+  const trigger = {
+    ...defaultTrigger,
+    interruptible: true,
+    persistent: true,
+    retry: {
+      maxTimeout: 100,
+      retries: 1,
+    },
+  };
+
+  const onChange = sinon.stub(trigger, 'onChange');
+
+  onChange.resolves(async () => {
+    await wait(100);
+  });
+
+  const subscription = await subscribe(trigger);
+
+  void subscription.trigger([]);
+
+  await wait(10);
+
+  void subscription.trigger([]);
+  void subscription.trigger([]);
+
+  await wait(10);
+
+  subscription.activeTask?.abortController?.abort();
+
+  expect(onChange.callCount).toBe(1);
+});

src/subscribe.ts

@@ -229,11 +229,12 @@ export const subscribe = (trigger: Trigger): Subscription => {
 
         const abortedTaskPromise = outerActiveTask.promise;
 
-        outerActiveTask = null;
-
         // Do not start a new task until the previous task has been
         // aborted and the shutdown routine has run to completion.
         await abortedTaskPromise;
+
+        // eslint-disable-next-line require-atomic-updates
+        outerActiveTask = null;
       } else {
         if (trigger.persistent) {
           log.warn(