fix: non-blocking async (#26)

lisez · May 28, 2024 · 76eb156 · 76eb156
1 parent 49b60b9
commit 76eb156
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -51,12 +51,16 @@ await emitter.emit("event");
 
 ### Conditional event handlers.
 
-IMPORTANT: conditional handlers not supported to conjoined event.
+IMPORTANT:
+
+- NOT supported in conjoined events.
+- NOT supported any arguments in handlers.
+- It will be executed after the triggered event finished. (Blocking mode.)
 
 ```typescript
 const emitter = new Xevt();
 const result: any[] = [];
-emitter.on("event", (arg: number) => {
+emitter.on("event", async (arg: number) => {
   result.push(arg);
   return arg % 2 === 0;
 });

diff --git a/modules/runners/dual.ts b/modules/runners/dual.ts
@@ -14,9 +14,7 @@ export class DualRunner<N = any> {
    * Create a new instance of the DualRunner.
    * @param handlers The dual handler profile.
    */
-  constructor(
-    private handlers: DualEventHandlerSignature<N>[],
-  ) {
+  constructor(private handlers: DualEventHandlerSignature<N>[]) {
     this.handlers = handlers;
   }
 
@@ -54,6 +52,8 @@ export class DualRunner<N = any> {
    * @param args The arguments to pass to the dual handler.
    */
   exec(result: any) {
-    return new RelayRunner().exec(result, (p) => this.dualExec(p));
+    return new RelayRunner().exec(result, (p) => this.dualExec(p), {
+      async: true,
+    });
   }
 }
diff --git a/modules/runners/step.ts b/modules/runners/step.ts
@@ -51,10 +51,9 @@ export class StepRunner {
     const result = new SingleRunner(handler).exec(args);
 
     const next = (result: any) => {
-      const dualResult = new DualRunner(duals).exec(!!result);
-      return new RelayRunner().exec(
-        dualResult,
-        () => this.execByIndex(handlers, duals, args, idx + 1),
+      const dualResult = new DualRunner(duals).exec(result);
+      return new RelayRunner().exec(dualResult, () =>
+        this.execByIndex(handlers, duals, args, idx + 1),
       );
     };
 
@@ -72,8 +71,9 @@ export class StepRunner {
     for (const p of handlers.filter((e) => !!e.options?.once)) {
       this.remove(step, p);
     }
-    return new SequenceRunner(handlers as GeneralEventHandlerSignature<any>[])
-      .exec(args);
+    return new SequenceRunner(
+      handlers as GeneralEventHandlerSignature<any>[],
+    ).exec(args);
   }
 
   /**
@@ -84,21 +84,24 @@ export class StepRunner {
     handlers: EventHandlerSignature<any>[],
     args?: any[],
   ) {
-    const categories = handlers.reduce((y, x) => {
-      if (x.options?.once) {
-        y.once.push(x);
-      }
-      if (helpers.isDualSignature(x)) {
-        y.duals.push(x);
-      } else {
-        y.handlers.push(x);
-      }
-      return y;
-    }, {
-      handlers: [] as GeneralEventHandlerSignature<any>[],
-      duals: [] as DualEventHandlerSignature<any>[],
-      once: [] as EventHandlerSignature<any>[],
-    });
+    const categories = handlers.reduce(
+      (y, x) => {
+        if (x.options?.once) {
+          y.once.push(x);
+        }
+        if (helpers.isDualSignature(x)) {
+          y.duals.push(x);
+        } else {
+          y.handlers.push(x);
+        }
+        return y;
+      },
+      {
+        handlers: [] as GeneralEventHandlerSignature<any>[],
+        duals: [] as DualEventHandlerSignature<any>[],
+        once: [] as EventHandlerSignature<any>[],
+      },
+    );
     if (!categories.handlers.length) return;
 
     for (const p of categories.once) {

diff --git a/tests/deno/single_event_test.ts b/tests/deno/single_event_test.ts
@@ -183,7 +183,7 @@ describe("Xevt - unscriber", () => {
   });
 });
 
-describe("Xevt - on", () => {
+describe("Xevt - conditional event handlers", () => {
   it('should listen event with "on"', () => {
     const emitter = new Xevt();
     const result: number[] = [];
@@ -206,6 +206,58 @@ describe("Xevt - on", () => {
     assertEquals(result, [1, 99, 2, 100]);
   });
 
+  it("should executed after async function", async () => {
+    const emitter = new Xevt();
+    const result: number[] = [];
+    // deno-lint-ignore require-await
+    emitter.on("event", async (arg: number) => {
+      result.push(arg);
+      return arg % 2 === 0;
+    });
+
+    emitter.on("event", {
+      true: () => {
+        result.push(100);
+      },
+      false: () => {
+        result.push(99);
+      },
+    });
+
+    emitter.emit("event", 1);
+    emitter.emit("event", 2);
+    await delay(0);
+    assertEquals(result, [1, 2, 99, 100]);
+  });
+
+  it("should executed after async function - blocking", async () => {
+    const emitter = new Xevt();
+    const result: number[] = [];
+    emitter.on(
+      "event",
+      // deno-lint-ignore require-await
+      async (arg: number) => {
+        result.push(arg);
+        return arg % 2 === 0;
+      },
+      { async: true },
+    );
+
+    emitter.on("event", {
+      true: () => {
+        result.push(100);
+      },
+      false: () => {
+        result.push(99);
+      },
+    });
+
+    emitter.emit("event", 1);
+    emitter.emit("event", 2);
+    await delay(0);
+    assertEquals(result, [1, 99, 2, 100]);
+  });
+
   it("should listen multiple on events", () => {
     const emitter = new Xevt();
     const result: any[] = [];
@@ -260,14 +312,18 @@ describe("Xevt - on", () => {
       },
     });
 
-    emitter.on("event", {
-      true: () => {
-        result.push(100);
-      },
-      false: () => {
-        result.push(99);
+    emitter.on(
+      "event",
+      {
+        true: () => {
+          result.push(100);
+        },
+        false: () => {
+          result.push(99);
+        },
       },
-    }, { once: true });
+      { once: true },
+    );
 
     emitter.emit("event", 1);
     emitter.emit("event", 2);