@mswjs/interceptors 0.19.4 → 0.19.5

package/lib/utils/getUrlByRequestOptions.js

@@ -1,29 +1,13 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUrlByRequestOptions = exports.DEFAULT_PATH = void 0;
-var http_1 = require("http");
-var debug = require('debug')('utils getUrlByRequestOptions');
+const http_1 = require("http");
+const debug = require('debug')('utils getUrlByRequestOptions');
 exports.DEFAULT_PATH = '/';
-var DEFAULT_PROTOCOL = 'http:';
-var DEFAULT_HOST = 'localhost';
-var DEFAULT_PORT = 80;
-var SSL_PORT = 443;
+const DEFAULT_PROTOCOL = 'http:';
+const DEFAULT_HOST = 'localhost';
+const DEFAULT_PORT = 80;
+const SSL_PORT = 443;
 function getAgent(options) {
     return options.agent instanceof http_1.Agent ? options.agent : undefined;
 }
@@ -32,23 +16,23 @@ function getProtocolByRequestOptions(options) {
     if (options.protocol) {
         return options.protocol;
     }
-    var agent = getAgent(options);
-    var agentProtocol = (_a = agent) === null || _a === void 0 ? void 0 : _a.protocol;
+    const agent = getAgent(options);
+    const agentProtocol = (_a = agent) === null || _a === void 0 ? void 0 : _a.protocol;
     if (agentProtocol) {
         return agentProtocol;
     }
-    var port = getPortByRequestOptions(options);
-    var isSecureRequest = options.cert || port === SSL_PORT;
+    const port = getPortByRequestOptions(options);
+    const isSecureRequest = options.cert || port === SSL_PORT;
     return isSecureRequest ? 'https:' : ((_b = options.uri) === null || _b === void 0 ? void 0 : _b.protocol) || DEFAULT_PROTOCOL;
 }
 function getPortByRequestOptions(options) {
     var _a, _b;
-    var agent = getAgent(options);
-    var agentPort = ((_a = agent) === null || _a === void 0 ? void 0 : _a.options.port) ||
+    const agent = getAgent(options);
+    const agentPort = ((_a = agent) === null || _a === void 0 ? void 0 : _a.options.port) ||
         ((_b = agent) === null || _b === void 0 ? void 0 : _b.defaultPort);
-    var optionsPort = options.port;
+    const optionsPort = options.port;
     if (optionsPort || agentPort) {
-        var explicitPort = optionsPort || agentPort || DEFAULT_PORT;
+        const explicitPort = optionsPort || agentPort || DEFAULT_PORT;
         return Number(explicitPort);
     }
 }
@@ -57,8 +41,8 @@ function getHostByRequestOptions(options) {
 }
 function getAuthByRequestOptions(options) {
     if (options.auth) {
-        var _a = __read(options.auth.split(':'), 2), username = _a[0], password = _a[1];
-        return { username: username, password: password };
+        const [username, password] = options.auth.split(':');
+        return { username, password };
     }
 }
 /**
@@ -66,18 +50,18 @@ function getAuthByRequestOptions(options) {
  */
 function getUrlByRequestOptions(options) {
     debug('request options', options);
-    var protocol = getProtocolByRequestOptions(options);
-    var host = getHostByRequestOptions(options);
-    var port = getPortByRequestOptions(options);
-    var path = options.path || exports.DEFAULT_PATH;
-    var auth = getAuthByRequestOptions(options);
+    const protocol = getProtocolByRequestOptions(options);
+    const host = getHostByRequestOptions(options);
+    const port = getPortByRequestOptions(options);
+    const path = options.path || exports.DEFAULT_PATH;
+    const auth = getAuthByRequestOptions(options);
     debug('protocol', protocol);
     debug('host', host);
     debug('port', port);
     debug('path', path);
-    var baseUrl = protocol + "//" + host;
+    const baseUrl = `${protocol}//${host}`;
     debug('base URL:', baseUrl);
-    var url = options.uri ? new URL(options.uri.href) : new URL(path, baseUrl);
+    const url = options.uri ? new URL(options.uri.href) : new URL(path, baseUrl);
     if (port) {
         debug('detected explicit port', port);
         url.port = port.toString();

package/lib/utils/getUrlByRequestOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUrlByRequestOptions.js","sourceRoot":"","sources":["../../src/utils/getUrlByRequestOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getUrlByRequestOptions.js","sourceRoot":"","sources":["../../src/utils/getUrlByRequestOptions.ts"],"names":[],"mappings":"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"}

package/lib/utils/nextTick.js

@@ -6,8 +6,8 @@ function nextTick(callback) {
 }
 exports.nextTick = nextTick;
 function nextTickAsync(callback) {
-    return new Promise(function (resolve) {
-        setTimeout(function () {
+    return new Promise((resolve) => {
+        setTimeout(() => {
             resolve(callback());
         }, 0);
     });

package/lib/utils/nextTick.js.map

@@ -1 +1 @@
-{"version":3,"file":"nextTick.js","sourceRoot":"","sources":["../../src/utils/nextTick.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ,CAAC,QAAoB;IAC3C,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AACzB,CAAC;AAFD,4BAEC;AAED,SAAgB,aAAa,CAAC,QAAoB;IAChD,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,UAAU,CAAC;YACT,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrB,CAAC,EAAE,CAAC,CAAC,CAAA;IACP,CAAC,CAAC,CAAA;AACJ,CAAC;AAND,sCAMC"}
+{"version":3,"file":"nextTick.js","sourceRoot":"","sources":["../../src/utils/nextTick.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ,CAAC,QAAoB;IAC3C,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AACzB,CAAC;AAFD,4BAEC;AAED,SAAgB,aAAa,CAAC,QAAoB;IAChD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrB,CAAC,EAAE,CAAC,CAAC,CAAA;IACP,CAAC,CAAC,CAAA;AACJ,CAAC;AAND,sCAMC"}

package/lib/utils/parseJson.js

@@ -7,7 +7,7 @@ exports.parseJson = void 0;
  */
 function parseJson(data) {
     try {
-        var json = JSON.parse(data);
+        const json = JSON.parse(data);
         return json;
     }
     catch (_) {

package/lib/utils/parseJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseJson.js","sourceRoot":"","sources":["../../src/utils/parseJson.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,SAAS,CAAC,IAAY;IACpC,IAAI;QACF,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;AACH,CAAC;AAPD,8BAOC"}
+{"version":3,"file":"parseJson.js","sourceRoot":"","sources":["../../src/utils/parseJson.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,SAAS,CAAC,IAAY;IACpC,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;AACH,CAAC;AAPD,8BAOC"}

package/lib/utils/toInteractiveRequest.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toInteractiveRequest = void 0;
-var outvariant_1 = require("outvariant");
-var createLazyCallback_1 = require("./createLazyCallback");
+const outvariant_1 = require("outvariant");
+const createLazyCallback_1 = require("./createLazyCallback");
 function toInteractiveRequest(request) {
     Object.defineProperty(request, 'respondWith', {
         writable: false,
         enumerable: true,
         value: (0, createLazyCallback_1.createLazyCallback)({
             maxCalls: 1,
-            maxCallsCallback: function () {
+            maxCallsCallback() {
                 throw new Error((0, outvariant_1.format)('Failed to respond to "%s %s" request: the "request" event has already been responded to.', request.method, request.url));
             },
         }),

package/lib/utils/toInteractiveRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"toInteractiveRequest.js","sourceRoot":"","sources":["../../src/utils/toInteractiveRequest.ts"],"names":[],"mappings":";;;AAAA,yCAAmC;AACnC,2DAAuE;AAQvE,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE;QAC5C,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,IAAA,uCAAkB,EAAuB;YAC9C,QAAQ,EAAE,CAAC;YACX,gBAAgB;gBACd,MAAM,IAAI,KAAK,CACb,IAAA,mBAAM,EACJ,0FAA0F,EAC1F,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,GAAG,CACZ,CACF,CAAA;YACH,CAAC;SACF,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,OAA6B,CAAA;AACtC,CAAC;AAnBD,oDAmBC"}
+{"version":3,"file":"toInteractiveRequest.js","sourceRoot":"","sources":["../../src/utils/toInteractiveRequest.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AACnC,6DAAuE;AAQvE,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE;QAC5C,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,IAAA,uCAAkB,EAAuB;YAC9C,QAAQ,EAAE,CAAC;YACX,gBAAgB;gBACd,MAAM,IAAI,KAAK,CACb,IAAA,mBAAM,EACJ,0FAA0F,EAC1F,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,GAAG,CACZ,CACF,CAAA;YACH,CAAC;SACF,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,OAA6B,CAAA;AACtC,CAAC;AAnBD,oDAmBC"}

package/lib/utils/uuid.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uuidv4 = void 0;
 function uuidv4() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        var r = (Math.random() * 16) | 0;
-        var v = c == 'x' ? r : (r & 0x3) | 0x8;
+        const r = (Math.random() * 16) | 0;
+        const v = c == 'x' ? r : (r & 0x3) | 0x8;
         return v.toString(16);
     });
 }

package/lib/utils/uuid.js.map

@@ -1 +1 @@
-{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../../src/utils/uuid.ts"],"names":[],"mappings":";;;AAAA,SAAgB,MAAM;IACpB,OAAO,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;QACxE,IAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;QAClC,IAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;QACxC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACJ,CAAC;AAND,wBAMC"}
+{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../../src/utils/uuid.ts"],"names":[],"mappings":";;;AAAA,SAAgB,MAAM;IACpB,OAAO,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;QAClC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;QACxC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACJ,CAAC;AAND,wBAMC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.19.4",
+  "version": "0.19.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "author": "Artem Zakharchenko",
@@ -71,7 +71,7 @@
     "debug": "^4.3.3",
     "headers-polyfill": "^3.1.0",
     "outvariant": "^1.2.1",
-    "strict-event-emitter": "^0.2.4",
+    "strict-event-emitter": "^0.4.6",
     "web-encoding": "^1.1.5"
   },
   "keywords": [

package/src/BatchInterceptor.test.ts

@@ -38,14 +38,14 @@ it('applies child interceptors', () => {
 })
 
 it('proxies event listeners to the interceptors', () => {
-  class PrimaryInterceptor extends Interceptor<{ hello(name: string): void }> {
+  class PrimaryInterceptor extends Interceptor<{ hello: [string] }> {
     constructor() {
       super(Symbol('primary'))
     }
   }
 
   class SecondaryInterceptor extends Interceptor<{
-    goodbye(name: string): void
+    goodbye: [string]
   }> {
     constructor() {
       super(Symbol('secondary'))

package/src/BatchInterceptor.ts

@@ -1,28 +1,29 @@
-import { EventMapType } from 'strict-event-emitter'
+import { EventMap, Listener } from 'strict-event-emitter'
 import { ExtractEventNames, Interceptor } from './Interceptor'
 
 export interface BatchInterceptorOptions<
-  InterceptorList extends Interceptor<any>[]
+  InterceptorList extends Array<Interceptor<any>>
 > {
   name: string
   interceptors: InterceptorList
 }
 
-export type ExtractEventMapType<InterceptorList extends Interceptor<any>[]> =
-  InterceptorList extends Array<infer InterceptorType>
-    ? InterceptorType extends Interceptor<infer EventMap>
-      ? EventMap
-      : never
+export type ExtractEventMapType<
+  InterceptorList extends Array<Interceptor<any>>
+> = InterceptorList extends Array<infer InterceptorType>
+  ? InterceptorType extends Interceptor<infer EventMap>
+    ? EventMap
     : never
+  : never
 
 /**
  * A batch interceptor that exposes a single interface
  * to apply and operate with multiple interceptors at once.
  */
 export class BatchInterceptor<
-  InterceptorList extends Interceptor<any>[],
-  EventMap extends EventMapType = ExtractEventMapType<InterceptorList>
-> extends Interceptor<EventMap> {
+  InterceptorList extends Array<Interceptor<any>>,
+  Events extends EventMap = ExtractEventMapType<InterceptorList>
+> extends Interceptor<Events> {
   static symbol: Symbol
 
   private interceptors: InterceptorList
@@ -47,9 +48,9 @@ export class BatchInterceptor<
     }
   }
 
-  public on<Event extends ExtractEventNames<EventMap>>(
-    event: Event,
-    listener: EventMap[Event]
+  public on<EventName extends ExtractEventNames<Events>>(
+    event: EventName,
+    listener: Listener<Events[EventName]>
   ) {
     // Instead of adding a listener to the batch interceptor,
     // propagate the listener to each of the individual interceptors.

package/src/Interceptor.ts

@@ -1,8 +1,9 @@
 import { Debugger, debug } from 'debug'
+import { Listener } from 'strict-event-emitter'
 import { AsyncEventEmitter } from './utils/AsyncEventEmitter'
 import { nextTick } from './utils/nextTick'
 
-export type InterceptorEventMap = Record<string, (...args: any[]) => void>
+export type InterceptorEventMap = Record<string, any>
 export type InterceptorSubscription = () => void
 
 export function getGlobalSymbol<V>(symbol: Symbol): V | undefined {
@@ -30,12 +31,12 @@ export enum InterceptorReadyState {
   DISPOSED = 'DISPOSED',
 }
 
-export type ExtractEventNames<EventMap extends Record<string, any>> =
-  EventMap extends Record<infer EventName, any> ? EventName : never
+export type ExtractEventNames<Events extends Record<string, any>> =
+  Events extends Record<infer EventName, any> ? EventName : never
 
-export class Interceptor<EventMap extends InterceptorEventMap> {
-  protected emitter: AsyncEventEmitter<EventMap>
-  protected subscriptions: InterceptorSubscription[]
+export class Interceptor<Events extends InterceptorEventMap> {
+  protected emitter: AsyncEventEmitter<Events>
+  protected subscriptions: Array<InterceptorSubscription>
   protected log: Debugger
 
   public readyState: InterceptorReadyState
@@ -144,9 +145,9 @@ export class Interceptor<EventMap extends InterceptorEventMap> {
   /**
    * Listen to the interceptor's public events.
    */
-  public on<Event extends ExtractEventNames<EventMap>>(
-    event: Event,
-    listener: EventMap[Event]
+  public on<EventName extends ExtractEventNames<Events>>(
+    eventName: EventName,
+    listener: Listener<Events[EventName]>
   ): void {
     const log = this.log.extend('on')
 
@@ -158,9 +159,9 @@ export class Interceptor<EventMap extends InterceptorEventMap> {
       return
     }
 
-    log('adding "%s" event listener:', event, listener.name)
+    log('adding "%s" event listener:', eventName, listener.name)
 
-    this.emitter.on(event, listener)
+    this.emitter.on(eventName, listener)
   }
 
   /**

package/src/glossary.ts

@@ -5,10 +5,6 @@ export const IS_PATCHED_MODULE: unique symbol = Symbol('isPatchedModule')
 export type RequestCredentials = 'omit' | 'include' | 'same-origin'
 
 export type HttpRequestEventMap = {
-  request(request: InteractiveRequest, requestId: string): Promise<void> | void
-  response(
-    response: Response,
-    request: Request,
-    requestId: string
-  ): Promise<void> | void
+  request: [request: InteractiveRequest, requestId: string]
+  response: [response: Response, request: Request, requestId: string]
 }

package/src/utils/AsyncEventEmitter.test.ts

@@ -6,7 +6,7 @@ afterEach(() => {
 })
 
 it('emits and listens to events', () => {
-  const emitter = new AsyncEventEmitter<{ hello(name: string): void }>()
+  const emitter = new AsyncEventEmitter<{ hello: [string] }>()
   const listener = jest.fn()
   emitter.on('hello', listener)
   emitter.emit('hello', 'John')
@@ -16,7 +16,7 @@ it('emits and listens to events', () => {
 })
 
 it('resolves "untilIdle" when all the event listeners are done', async () => {
-  const emitter = new AsyncEventEmitter<{ speak(word: string): void }>()
+  const emitter = new AsyncEventEmitter<{ speak: [string] }>()
 
   const results: string[] = []
   const firstListener = jest.fn(() => results.push('first'))
@@ -40,7 +40,7 @@ it('resolves "untilIdle" when all the event listeners are done', async () => {
 })
 
 it('resolves "untilIdle" only for the relevant listeners', async () => {
-  const emitter = new AsyncEventEmitter<{ signal(code: number): void }>()
+  const emitter = new AsyncEventEmitter<{ signal: [number] }>()
 
   const results: number[] = []
   const listener = jest.fn(async (code: number) => {
@@ -69,14 +69,14 @@ it('resolves "untilIdle" only for the relevant listeners', async () => {
 })
 
 it('resolves "untilIdle" immediately if there are no pending listeners', async () => {
-  const emitter = new AsyncEventEmitter<{ ping(): void }>()
+  const emitter = new AsyncEventEmitter<{ ping: never }>()
   emitter.emit('ping')
 
   await expect(emitter.untilIdle('ping')).resolves.toBeUndefined()
 })
 
 it('propagates listener exceptions to "untilIdle" promise', async () => {
-  const emitter = new AsyncEventEmitter<{ ping(): void }>()
+  const emitter = new AsyncEventEmitter<{ ping: never }>()
 
   const error = new Error('oops')
   const listener = jest.fn(() => {
@@ -89,7 +89,7 @@ it('propagates listener exceptions to "untilIdle" promise', async () => {
 })
 
 it('does not emit events once the emitter was deactivated', () => {
-  const emitter = new AsyncEventEmitter<{ ping(): void }>()
+  const emitter = new AsyncEventEmitter<{ ping: never }>()
 
   const listener = jest.fn()
   emitter.on('ping', listener)

package/src/utils/AsyncEventEmitter.ts

@@ -1,8 +1,8 @@
 import { Debugger, debug } from 'debug'
-import { StrictEventEmitter, EventMapType } from 'strict-event-emitter'
+import { Emitter, EventMap, Listener } from 'strict-event-emitter'
 import { nextTick } from './nextTick'
 
-export interface QueueItem<Args extends any[]> {
+export interface QueueItem<Args extends Array<unknown>> {
   args: Args
   done: Promise<void>
 }
@@ -13,15 +13,12 @@ export enum AsyncEventEmitterReadyState {
 }
 
 export class AsyncEventEmitter<
-  EventMap extends EventMapType
-> extends StrictEventEmitter<EventMap> {
+  Events extends EventMap
+> extends Emitter<Events> {
   public readyState: AsyncEventEmitterReadyState
 
   private log: Debugger
-  protected queue: Map<
-    keyof EventMap,
-    QueueItem<Parameters<EventMap[keyof EventMap]>>[]
-  >
+  protected queue: Map<keyof Events, Array<QueueItem<Events[any]>>>
 
   constructor() {
     super()
@@ -32,24 +29,24 @@ export class AsyncEventEmitter<
     this.readyState = AsyncEventEmitterReadyState.ACTIVE
   }
 
-  public on<Event extends keyof EventMap>(
-    event: Event,
-    listener: EventMap[Event]
+  public on<EventName extends keyof Events>(
+    eventName: EventName,
+    listener: Listener<any>
   ) {
     const log = this.log.extend('on')
 
-    log('adding "%s" listener...', event)
+    log('adding "%s" listener...', eventName)
 
     if (this.readyState === AsyncEventEmitterReadyState.DEACTIVATED) {
       log('the emitter is destroyed, skipping!')
       return this
     }
 
-    return super.on(event, (async (...args: Parameters<EventMap[Event]>) => {
+    return super.on(eventName, async (...args) => {
       // Event queue is always established when calling ".emit()".
-      const queue = this.openListenerQueue(event)
+      const queue = this.openListenerQueue(eventName)
 
-      log('awaiting the "%s" listener...', event)
+      log('awaiting the "%s" listener...', eventName)
 
       // Whenever a listener is called, create a new Promise
       // that resolves when that listener function completes its execution.
@@ -62,46 +59,52 @@ export class AsyncEventEmitter<
             await listener(...args)
             resolve()
 
-            log('"%s" listener has resolved!', event)
+            log('"%s" listener has resolved!', eventName)
           } catch (error) {
             log('"%s" listener has rejected!', error)
             reject(error)
           }
         }),
       })
-    }) as EventMap[Event])
+    })
   }
 
-  public emit<Event extends keyof EventMap>(
-    event: Event,
-    ...args: Parameters<EventMap[Event]>
+  public emit<EventName extends keyof Events>(
+    eventName: EventName,
+    ...data: Events[EventName]
   ): boolean {
     const log = this.log.extend('emit')
 
-    log('emitting "%s" event...', event)
+    log('emitting "%s" event...', eventName)
 
     if (this.readyState === AsyncEventEmitterReadyState.DEACTIVATED) {
       log('the emitter is destroyed, skipping!')
       return false
     }
 
+    // Skip establishing event queues for internal listeners.
+    // Those are not meant to be awaited.
+    if (this.isInternalEventName(eventName)) {
+      return super.emit(eventName, ...data)
+    }
+
     // Establish the Promise queue for this particular event.
-    this.openListenerQueue(event)
+    this.openListenerQueue(eventName)
 
-    log('appending a one-time cleanup "%s" listener...', event)
+    log('appending a one-time cleanup "%s" listener...', eventName)
 
     // Append a one-time clean up listener.
-    this.once(event, (() => {
+    this.once(eventName, () => {
       // Clear the Promise queue for this particular event
       // in the next tick so the Promise in "untilIdle" has
-      // time to properly resolve.
+      // the time to properly resolve.
       nextTick(() => {
-        this.queue.delete(event)
-        log('cleaned up "%s" listeners queue!', event)
+        this.queue.delete(eventName)
+        log('cleaned up "%s" listeners queue!', eventName)
       })
-    }) as EventMap[Event])
+    })
 
-    return super.emit(event, ...args)
+    return super.emit(eventName, ...data)
   }
 
   /**
@@ -109,35 +112,32 @@ export class AsyncEventEmitter<
    * has been called. Awaits asynchronous listeners.
    * If the event has no listeners, resolves immediately.
    */
-  public async untilIdle<Event extends keyof EventMap>(
-    event: Event,
-    filter: (item: QueueItem<Parameters<EventMap[Event]>>) => boolean = () =>
-      true
+  public async untilIdle<EventName extends keyof Events>(
+    eventName: EventName,
+    filter: (item: QueueItem<Events[EventName]>) => boolean = () => true
   ): Promise<void> {
-    const listenersQueue = this.queue.get(event) || []
+    const listenersQueue = this.queue.get(eventName) || []
 
     await Promise.all(
       listenersQueue.filter(filter).map(({ done }) => done)
     ).finally(() => {
       // Clear the queue one the promise settles
       // so that different events don't share the same queue.
-      this.queue.delete(event)
+      this.queue.delete(eventName)
     })
   }
 
-  private openListenerQueue<Event extends keyof EventMap>(
-    event: Event
-  ): QueueItem<Parameters<EventMap[Event]>>[] {
+  private openListenerQueue<EventName extends keyof Events>(
+    eventName: EventName
+  ): Array<QueueItem<Events[EventName]>> {
     const log = this.log.extend('openListenerQueue')
+    log('opening "%s" listeners queue...', eventName)
 
-    log('opening "%s" listeners queue...', event)
-
-    const queue = this.queue.get(event)
+    const queue = this.queue.get(eventName)
 
     if (!queue) {
       log('no queue found, creating one...')
-
-      this.queue.set(event, [])
+      this.queue.set(eventName, [])
       return []
     }
 
@@ -145,19 +145,25 @@ export class AsyncEventEmitter<
     return queue
   }
 
-  public removeAllListeners<Event extends keyof EventMap>(event?: Event) {
+  public removeAllListeners<EventName extends keyof Events>(
+    eventName?: EventName
+  ) {
     const log = this.log.extend('removeAllListeners')
-    log('event:', event)
-
-    if (event) {
-      this.queue.delete(event)
-      log('cleared the "%s" listeners queue!', event, this.queue.get(event))
+    log('event:', eventName)
+
+    if (eventName) {
+      this.queue.delete(eventName)
+      log(
+        'cleared the "%s" listeners queue!',
+        eventName,
+        this.queue.get(eventName)
+      )
     } else {
       this.queue.clear()
       log('cleared the listeners queue!', this.queue)
     }
 
-    return super.removeAllListeners(event)
+    return super.removeAllListeners(eventName)
   }
 
   public activate(): void {
@@ -180,4 +186,8 @@ export class AsyncEventEmitter<
     this.readyState = AsyncEventEmitterReadyState.DEACTIVATED
     log('set state to:', this.readyState)
   }
+
+  private isInternalEventName(eventName: string | number | symbol): boolean {
+    return eventName === 'newListener' || eventName === 'removeListener'
+  }
 }