Auto async

README.md

@@ -42,7 +42,7 @@ emitter.emit("event");
 const emitter = new Xevt();
 
 let result = 0;
-emitter.onAsync("event", async () => {
+emitter.on("event", async () => {
   result++;
 });
 await emitter.emit("event");
@@ -73,7 +73,7 @@ const result: number[] = [];
 emitter.on("event", (data) => {
   result.push(data);
 });
-emitter.onAsync(
+emitter.on(
   "event",
   async (data) =>
     new Promise((res) => {
@@ -97,7 +97,7 @@ const result: number[] = [];
 emitter.conjoin(["event1", "event2"], async () => {
   result.push(1);
 });
-emitter.conjoinAsync(["event1", "event2"], async () => {
+emitter.conjoin(["event1", "event2"], async () => {
   result.push(2);
 });
 

modules/conjoin_emitter.ts

@@ -85,22 +85,6 @@ export class ConjoinEmitter extends CoreEmitter<ConjoinEvents>
     return this.conjoin;
   }
 
-  conjoinAsync(
-    events: ConjoinEvents,
-    handler: EventHandler,
-    options?: Partial<EventOptions>,
-  ) {
-    const signature = {
-      name: events,
-      handler,
-      options: {
-        once: options?.once || false,
-        async: true,
-      },
-    };
-    return this.internalConjoinOn(signature);
-  }
-
   error(handler: ErrorHandler) {
     this.errorEmitter.on("error", handler);
   }

modules/core_emitter.ts

@@ -34,14 +34,12 @@ export abstract class CoreEmitter<T> implements XCoreEmitter<T> {
     name: EventName,
     signature: EventHandlerSignature<any>,
   ): EventUnscriber {
-    if (
-      signature.options?.async &&
-      // @ts-ignore TS7053
-      signature.handler[Symbol.toStringTag] !== "AsyncFunction" &&
-      !("then" in signature.handler)
-    ) {
-      throw new Error("Async handler must be a promise or thenable");
-    }
+    // @ts-ignore TS7053
+    const async = signature.handler[Symbol.toStringTag] === "AsyncFunction" ||
+      ("then" in signature.handler);
+
+    signature.options ??= {};
+    signature.options.async = async;
 
     if (this.debug) this.logger.debug("on", name, signature);
 

modules/emitter.ts

@@ -30,22 +30,6 @@ export class Emitter extends CoreEmitter<EventName> implements XevtEmitter {
     return this.on;
   }
 
-  onAsync(
-    event: EventName,
-    handler: EventHandler,
-    options?: Partial<EventOptions>,
-  ) {
-    const signature = {
-      name: event,
-      handler,
-      options: {
-        once: options?.once || false,
-        async: true,
-      },
-    };
-    return this.onBySignature(event, signature);
-  }
-
   error(handler: ErrorHandler) {
     this.on("error", handler);
   }

modules/types.ts

@@ -68,8 +68,7 @@ export type XevtEmitter =
   & XCoreEmitter<EventName>
   & Record<
     | "addEventListener"
-    | Uncapitalize<EventRegisterName>
-    | Uncapitalize<`${EventRegisterName}Async`>,
+    | Uncapitalize<EventRegisterName>,
     EventRegister
   >;
 
@@ -78,8 +77,7 @@ export type XConjoinEmitter =
   & Record<
     | "addEventListener"
     | "on"
-    | Uncapitalize<ConjoinEventsRegisterName>
-    | Uncapitalize<`${ConjoinEventsRegisterName}Async`>,
+    | Uncapitalize<ConjoinEventsRegisterName>,
     ConjoinEventsRegister
   >;
 

modules/xevt.ts

@@ -55,18 +55,10 @@ export class Xevt extends CoreEmitter<XeventName>
     return this.on;
   }
 
-  get onAsync() {
-    return this.emitter.onAsync.bind(this.emitter);
-  }
-
   get conjoin() {
     return this.conjoinEmitter.conjoin.bind(this.conjoinEmitter);
   }
 
-  get conjoinAsync() {
-    return this.conjoinEmitter.conjoinAsync.bind(this.conjoinEmitter);
-  }
-
   error(handler: ErrorHandler) {
     this.emitter.error(handler);
     this.conjoinEmitter.error(handler);

tests/deno/multiple_events_test.ts

@@ -54,10 +54,10 @@ describe("Xevt - multiple events", () => {
   it("should listen multiple async handlers", async () => {
     const emitter = new Xevt();
     const result: number[] = [];
-    emitter.conjoinAsync(["event1", "event2"], async () => {
+    emitter.conjoin(["event1", "event2"], async () => {
       result.push(1);
     });
-    emitter.conjoinAsync(["event1", "event2"], async () => {
+    emitter.conjoin(["event1", "event2"], async () => {
       result.push(2);
     });
     emitter.emit("event1");
@@ -132,7 +132,7 @@ describe("Xevt - multiple events", () => {
   it("should take every async events", async () => {
     const emitter = new Xevt();
     let result: number = 0;
-    emitter.conjoinAsync(["event1", "event2"], async () => {
+    emitter.conjoin(["event1", "event2"], async () => {
       await new Promise((resolve) =>
         setTimeout(() => {
           result++;
@@ -158,7 +158,7 @@ describe("Xevt - multiple events", () => {
     emitter.conjoin(["event1", "event2"], () => {
       result.push(1);
     });
-    emitter.conjoinAsync(["event1", "event2"], async () => {
+    emitter.conjoin(["event1", "event2"], async () => {
       result.push(2);
     });
 

tests/deno/single_event_test.ts

@@ -96,7 +96,7 @@ describe("Xevt - single event", () => {
   it("should listen every async events", async () => {
     const emitter = new Xevt();
     const result: number[] = [];
-    emitter.onAsync("event", async (arg) => {
+    emitter.on("event", async (arg) => {
       await new Promise((resolve) =>
         setTimeout(() => {
           result.push(arg);
@@ -122,7 +122,7 @@ describe("Xevt - single event", () => {
     emitter.on("event", (data) => {
       result.push(data);
     });
-    emitter.onAsync(
+    emitter.on(
       "event",
       async (data) =>
         new Promise((res) => {