eventservice 1.4.3 → 1.5.0

package/__tests__/EventService.test.ts

@@ -1,109 +1,113 @@
-import EventService from "../src/EventService";
-
-it("on => fire", async () => {
-    (console as any).EventServiceDebug = true;
-    EventService.on("1", async (name: string) => {
-        return `Hello ${name}!`;
-    });
-    
-    const result: string = await EventService.fire<string>("1", "World");
-    expect(result).toEqual("Hello World!");
-    
-    EventService.off("1");
-    (console as any).EventServiceDebug = false;
-});
-
-it("on with throwing an exception => fire", async () => {
-    EventService.on("1", async () => {
-        throw new Error("Some Error");
-    });
-
-    await expect(EventService.fire("1", "World")).rejects.toThrow(Error);
-    EventService.off("1");
-});
-
-it("on => fire => off => fire", async () => {
-    EventService.on("1", async (name: string) => `Hello ${name}!`, "key");
-
-    const result: string = await EventService.fire<string>("1", "World");
-    expect(result).toEqual("Hello World!");
-
-    EventService.off("1", "key");
-
-    expect((EventService as any).subscriptions["1"].length).toEqual(0);
-
-    const anotherResult: string | undefined = await EventService.fire<string>("1", "World");
-    console.info(anotherResult);
-    expect(anotherResult).toBeUndefined();
-});
-
-it("nested subscriptions. on => on => fire", async () => {
-    EventService.on("2", async () => "Hello");
-
-    EventService.on("1", async (name: string) => {
-        const phrase: string = await EventService.fire<string>("2");
-        return `${phrase} ${name}!`;
-    });
-
-    const result: string = await EventService.fire<string>("1", "John");
-    expect(result).toEqual("Hello John!");
-
-    EventService.off("2");
-    EventService.off("1");
-});
-
-it("two subscriptions with the same name. on => on => => fire", async () => {
-    EventService.on("97", async (name: string) => {
-        `Hello ${name}`;
-    });
-
-    EventService.on("97", async (name: string) => {
-        return `${name}!`;
-    });
-
-    const result: string = await EventService.fire<string>("97", "Alex");
-    expect(result).toEqual("Alex!");
-    EventService.off("97");
-});
-
-it("two nested subscriptions with the same name. on => on => => fire", async () => {
-    EventService.on("987", async (name: string) => {
-        return `Hello ${name}`;
-    });
-
-    EventService.on("987", async (name: string) => {
-        return `${name}!`;
-    });
-
-    const result: string = await EventService.fire<string>("987", "Mack");
-    expect(result).toEqual("Hello Mack!");
-    EventService.off("987");
-});
-
-it("fire with no subscriptions", async () => {
-    const result = await EventService.fire("123");
-    expect(result).toBeUndefined();
-});
-
-it("off without subscriptions", () => {
-    EventService.off("1234");
-});
-
-it("clear", async () => {
-    EventService.on("2", async () => "Hello");
-
-    EventService.on("1", async (name: string) => {
-        const phrase: string = await EventService.fire<string>("2");
-        return `${phrase} ${name}!`;
-    });
-
-    const result: string = await EventService.fire<string>("1", "John");
-    expect(result).toEqual("Hello John!");
-
-    EventService.clear();
-    expect((EventService as any).subscriptions["1"]).toBeUndefined();
-    expect((EventService as any).subscriptions["2"]).toBeUndefined();
-
-    const anotherResult: string = await EventService.fire<string>("1", "John");
-    expect(anotherResult).toBeUndefined();
-});
+import EventService from "../src/EventService";
+import { expect, it } from "vitest";
+
+it("on => fire", async () => {
+  (console as any).EventServiceDebug = true;
+  EventService.on("1", async (name: string) => {
+    return `Hello ${name}!`;
+  });
+
+  const result: string = await EventService.fire<string>("1", "World");
+  expect(result).toEqual("Hello World!");
+
+  EventService.off("1");
+  (console as any).EventServiceDebug = false;
+});
+
+it("on with throwing an exception => fire", async () => {
+  EventService.on("1", async () => {
+    throw new Error("Some Error");
+  });
+
+  await expect(EventService.fire("1", "World")).rejects.toThrow(Error);
+  EventService.off("1");
+});
+
+it("on => fire => off => fire", async () => {
+  EventService.on("1", async (name: string) => `Hello ${name}!`, "key");
+
+  const result: string = await EventService.fire<string>("1", "World");
+  expect(result).toEqual("Hello World!");
+
+  EventService.off("1", "key");
+
+  expect((EventService as any).subscriptions["1"].length).toEqual(0);
+
+  const anotherResult: string | undefined = await EventService.fire<string>(
+    "1",
+    "World",
+  );
+  console.info(anotherResult);
+  expect(anotherResult).toBeUndefined();
+});
+
+it("nested subscriptions. on => on => fire", async () => {
+  EventService.on("2", async () => "Hello");
+
+  EventService.on("1", async (name: string) => {
+    const phrase: string = await EventService.fire<string>("2");
+    return `${phrase} ${name}!`;
+  });
+
+  const result: string = await EventService.fire<string>("1", "John");
+  expect(result).toEqual("Hello John!");
+
+  EventService.off("2");
+  EventService.off("1");
+});
+
+it("two subscriptions with the same name. on => on => => fire", async () => {
+  EventService.on("97", async (name: string) => {
+    `Hello ${name}`;
+  });
+
+  EventService.on("97", async (name: string) => {
+    return `${name}!`;
+  });
+
+  const result: string = await EventService.fire<string>("97", "Alex");
+  expect(result).toEqual("Alex!");
+  EventService.off("97");
+});
+
+it("two nested subscriptions with the same name. on => on => => fire", async () => {
+  EventService.on("987", async (name: string) => {
+    return `Hello ${name}`;
+  });
+
+  EventService.on("987", async (name: string) => {
+    return `${name}!`;
+  });
+
+  const result: string = await EventService.fire<string>("987", "Mack");
+  expect(result).toEqual("Hello Mack!");
+  EventService.off("987");
+});
+
+it("fire with no subscriptions", async () => {
+  const result = await EventService.fire("123");
+  expect(result).toBeUndefined();
+});
+
+it("off without subscriptions", () => {
+  EventService.off("1234");
+});
+
+it("clear", async () => {
+  EventService.on("2", async () => "Hello");
+
+  EventService.on("1", async (name: string) => {
+    const phrase: string = await EventService.fire<string>("2");
+    return `${phrase} ${name}!`;
+  });
+
+  const result: string = await EventService.fire<string>("1", "John");
+  expect(result).toEqual("Hello John!");
+
+  EventService.clear();
+  expect((EventService as any).subscriptions["1"]).toBeUndefined();
+  expect((EventService as any).subscriptions["2"]).toBeUndefined();
+
+  const anotherResult: string = await EventService.fire<string>("1", "John");
+  expect(anotherResult).toBeUndefined();
+});

package/dist/src/EventService.d.ts

@@ -9,7 +9,7 @@ export default class EventService {
      * @param callback The function callback that will be invoked when event will be fired
      * @param key The optional param. The key of subscription. Used to identify the subscription for method `off`
      */
-    static on<T>(eventName: string, callback: (eventData?: any, prevSubscriptionResult?: any) => Promise<T>, key?: string): void;
+    static on<T>(eventName: string, callback: (eventData?: any, prevSubscriptionResult?: any) => Promise<T>, key?: string | null): void;
     /**
      * Unsubscribe from event
      * @param eventName The name of event
@@ -22,7 +22,7 @@ export default class EventService {
      * @param eventName The name of event
      * @param eventData The data that will be passed to subscriber's callback method
      */
-    static fire<T>(eventName: string, eventData?: any): Promise<T>;
+    static fire<T, TData extends T | undefined>(eventName: string, eventData?: TData): Promise<T | undefined>;
     static clear(): void;
     private static subscriptions;
     private static fireExecute;

package/dist/src/EventService.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -35,12 +35,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var lodash_clone_1 = __importDefault(require("lodash.clone"));
-var lodash_pull_1 = __importDefault(require("lodash.pull"));
 var EventService = /** @class */ (function () {
     function EventService() {
     }
@@ -56,7 +60,7 @@ var EventService = /** @class */ (function () {
             EventService.subscriptions[eventName] = [];
         EventService.subscriptions[eventName].push({
             key: key,
-            action: callback
+            action: callback,
         });
     };
     /**
@@ -84,7 +88,7 @@ var EventService = /** @class */ (function () {
                 EventService.log("Event '".concat(eventName, "' has been executed: ").concat(EventService.subscriptions[eventName] ? EventService.subscriptions[eventName].length : 0), eventData);
                 if (!EventService.subscriptions[eventName])
                     return [2 /*return*/, undefined];
-                return [2 /*return*/, EventService.fireExecute((0, lodash_clone_1.default)(EventService.subscriptions[eventName]), eventData)];
+                return [2 /*return*/, EventService.fireExecute(__spreadArray([], EventService.subscriptions[eventName], true), eventData)];
             });
         });
     };
@@ -93,19 +97,21 @@ var EventService = /** @class */ (function () {
     };
     EventService.fireExecute = function (subscriptions, eventData) {
         return __awaiter(this, void 0, void 0, function () {
-            var subscription, actionResult;
+            var subscription, rest, actionResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        subscription = subscriptions[0];
-                        if (!subscription)
+                        subscription = subscriptions[0], rest = subscriptions.slice(1);
+                        if (!subscription) {
                             return [2 /*return*/, undefined];
+                        }
                         return [4 /*yield*/, subscription.action(eventData)];
                     case 1:
                         actionResult = _a.sent();
-                        if (subscriptions.length <= 1)
+                        if (rest.length === 0) {
                             return [2 /*return*/, actionResult];
-                        return [2 /*return*/, EventService.fireExecute((0, lodash_pull_1.default)(subscriptions, subscription), actionResult === undefined ? eventData : actionResult)];
+                        }
+                        return [2 /*return*/, EventService.fireExecute(rest, actionResult === undefined ? eventData : actionResult)];
                 }
             });
         });

package/dist/src/EventService.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventService.js","sourceRoot":"","sources":["../../src/EventService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiC;AACjC,4DAA+B;AAO/B;IAoEI;IAAwB,CAAC;IAlEzB;;;;;OAKG;IACW,eAAE,GAAhB,UAAoB,SAAiB,EAAE,QAAuE,EAAE,GAAkB;QAAlB,oBAAA,EAAA,UAAkB;QAC9H,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;YAAE,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACvF,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;YACvC,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,QAAQ;SACnB,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACW,gBAAG,GAAjB,UAAkB,SAAiB,EAAE,GAAyB;QAAzB,oBAAA,EAAA,UAAyB;QAC1D,YAAY,CAAC,GAAG,CAAC,6BAAqB,SAAS,mBAAO,GAAG,QAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;YAAE,OAAO;QACnD,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,KAAK,GAAG,EAAb,CAAa,CAAC,CAAC;QACzG,YAAY,CAAC,GAAG,CAAC,sCAA8B,SAAS,QAAI,EAAE,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;IACzG,CAAC;IAED;;;;;OAKG;IACiB,iBAAI,GAAxB,UAA4B,SAAiB,EAAE,SAAe;;;gBAC1D,YAAY,CAAC,GAAG,CAAC,iBAAU,SAAS,kCAAwB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAE,EAAE,SAAS,CAAC,CAAC;gBACnK,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;oBAAE,sBAAO,SAAS,EAAC;gBAC7D,sBAAO,YAAY,CAAC,WAAW,CAAI,IAAA,sBAAK,EAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,EAAC;;;KAC/F;IAEa,kBAAK,GAAnB;QACI,YAAY,CAAC,aAAa,GAAG,EAAE,CAAC;IACpC,CAAC;IASoB,wBAAW,GAAhC,UACI,aAA6E,EAC7E,SAAY;;;;;;wBACN,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;wBACtC,IAAI,CAAC,YAAY;4BAAE,sBAAO,SAAS,EAAC;wBAEZ,qBAAM,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EAAA;;wBAAtD,YAAY,GAAM,SAAoC;wBAC5D,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC;4BAAE,sBAAO,YAAY,EAAC;wBACnD,sBAAO,YAAY,CAAC,WAAW,CAAI,IAAA,qBAAI,EAAC,aAAa,EAAE,YAAY,CAAC,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,EAAC;;;;KAChI;IAEc,gBAAG,GAAlB,UAAoC,OAAiB,EAAE,IAAY;QAC/D,IAAI,OAAO,IAAK,OAAe,CAAC,iBAAiB,EAAE;YAC/C,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SAC9B;IACL,CAAC;IAtBc,0BAAa,GAKxB,EAAE,CAAC;IAoBX,mBAAC;CAAA,AArED,IAqEC;kBArEoB,YAAY"}
+{"version":3,"file":"EventService.js","sourceRoot":"","sources":["../../src/EventService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA;IAoGE;IAAuB,CAAC;IAnGxB;;;;;OAKG;IACW,eAAE,GAAhB,UACE,SAAiB,EACjB,QAAuE,EACvE,GAAyB;QAAzB,oBAAA,EAAA,UAAyB;QAEzB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;YACxC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QAC7C,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;YACzC,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,QAAQ;SACjB,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACW,gBAAG,GAAjB,UAAkB,SAAiB,EAAE,GAAyB;QAAzB,oBAAA,EAAA,UAAyB;QAC5D,YAAY,CAAC,GAAG,CAAC,6BAAqB,SAAS,mBAAO,GAAG,QAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;YAAE,OAAO;QACnD,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,aAAa,CAChE,SAAS,CACV,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,GAAG,KAAK,GAAG,EAAb,CAAa,CAAC,CAAC;QAC/B,YAAY,CAAC,GAAG,CACd,sCAA8B,SAAS,QAAI,EAC3C,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CACtC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACiB,iBAAI,GAAxB,UACE,SAAiB,EACjB,SAAiB;;;gBAEjB,YAAY,CAAC,GAAG,CACd,iBAAU,SAAS,kCAAwB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAE,EACrI,SAAS,CACV,CAAC;gBACF,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;oBAAE,sBAAO,SAAS,EAAC;gBAC7D,sBAAO,YAAY,CAAC,WAAW,mBACzB,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,SACzC,SAAS,CACV,EAAC;;;KACH;IAEa,kBAAK,GAAnB;QACE,YAAY,CAAC,aAAa,GAAG,EAAE,CAAC;IAClC,CAAC;IASoB,wBAAW,GAAhC,UACE,aAGE,EACF,SAAwB;;;;;;wBAEjB,YAAY,GAAa,aAAa,GAA1B,EAAK,IAAI,GAAI,aAAa,SAAjB,CAAkB;wBAE9C,IAAI,CAAC,YAAY,EAAE,CAAC;4BAClB,sBAAO,SAAS,EAAC;wBACnB,CAAC;wBAEoB,qBAAM,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,EAAA;;wBAAnD,YAAY,GAAG,SAAoC;wBAEzD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACtB,sBAAO,YAAY,EAAC;wBACtB,CAAC;wBAED,sBAAO,YAAY,CAAC,WAAW,CAC7B,IAAI,EACJ,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CACtD,EAAC;;;;KACH;IAEc,gBAAG,GAAlB,UAAoC,OAAiB,EAAE,IAAY;QACjE,IAAI,OAAO,IAAK,OAAe,CAAC,iBAAiB,EAAE,CAAC;YAClD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IApCc,0BAAa,GAKxB,EAAE,CAAC;IAkCT,mBAAC;CAAA,AArGD,IAqGC;kBArGoB,YAAY"}

package/package.json

@@ -1,33 +1,27 @@
-{
-  "name": "eventservice",
-  "description": "The Promise-based simple event bus service",
-  "version": "1.4.3",
-  "main": "./dist/index.js",
-  "scripts": {
-    "build": "tsc",
-    "lint": "tslint index.ts",
-    "pretest": "npm run lint",
-    "test": "jest"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "author": "Alexey Ripenko <alexey@ripenko.ru>",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:ripenko/eventservice.git"
-  },
-  "dependencies": {
-    "lodash.clone": "4.5.0",
-    "lodash.pull": "4.1.0"
-  },
-  "devDependencies": {
-    "@types/lodash.clone": "4.5.7",
-    "@types/lodash.pull": "4.1.7",
-    "@types/jest": "29.5.1",
-    "typescript": "5.0.4",
-    "jest": "29.5.0",
-    "ts-jest": "29.1.0"
-  }
-}
+{
+  "name": "eventservice",
+  "description": "The Promise-based simple event bus service",
+  "version": "1.5.0",
+  "main": "./dist/index.js",
+  "scripts": {
+    "build": "tsc",
+    "lint": "tslint index.ts",
+    "pretest": "npm run lint",
+    "test": "vitest",
+    "test:run": "vitest run"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "author": "Alexey Ripenko <alexey@ripenko.ru>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:ripenko/eventservice.git"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "typescript": "5.9.3",
+    "vitest": "^4.1.0"
+  }
+}

package/src/EventService.ts

@@ -1,78 +1,107 @@
-import clone from "lodash.clone";
-import pull from "lodash.pull";
-
-export declare var environment: {
-    isDev: boolean;
-    isProd: boolean;
-};
-
-export default class EventService {
-
-    /**
-     * Subscribe to event
-     * @param eventName The name of event
-     * @param callback The function callback that will be invoked when event will be fired
-     * @param key The optional param. The key of subscription. Used to identify the subscription for method `off`
-     */
-    public static on<T>(eventName: string, callback: (eventData?: any, prevSubscriptionResult?: any) => Promise<T>, key: string = null): void {
-        if (!EventService.subscriptions[eventName]) EventService.subscriptions[eventName] = [];
-        EventService.subscriptions[eventName].push({
-            key: key,
-            action: callback
-        });
-    }
-
-    /**
-     * Unsubscribe from event
-     * @param eventName The name of event
-     * @param key The key that identify subscription. Use certain key that has been given in method `on`
-     */
-    public static off(eventName: string, key: string | null = null): void {
-        EventService.log(`EventService.off("${eventName}", "${key}")`);
-        if (!EventService.subscriptions[eventName]) return;
-        EventService.subscriptions[eventName] = EventService.subscriptions[eventName].filter(x => x.key !== key);
-        EventService.log(`EventService.subscription["${eventName}"]`, EventService.subscriptions[eventName]);
-    }
-
-    /**
-     * Fire event.
-     * Also this method will wait for subscriber callback.
-     * @param eventName The name of event
-     * @param eventData The data that will be passed to subscriber's callback method
-     */
-    public static async fire<T>(eventName: string, eventData?: any): Promise<T> {
-        EventService.log(`Event '${eventName}' has been executed: ${EventService.subscriptions[eventName] ? EventService.subscriptions[eventName].length : 0}`, eventData);
-        if (!EventService.subscriptions[eventName]) return undefined;
-        return EventService.fireExecute<T>(clone(EventService.subscriptions[eventName]), eventData);
-    }
-
-    public static clear(): void {
-        EventService.subscriptions = {};
-    }
-
-    private static subscriptions: {
-        [name: string]: Array<{
-            key: string;
-            action: (eventData: any) => Promise<any>;
-        }>;
-    } = {};
-
-    private static async fireExecute<T>(
-        subscriptions: Array<{ key: string; action: (eventData: any) => Promise<T> }>,
-        eventData: T): Promise<T> {
-        const subscription = subscriptions[0];
-        if (!subscription) return undefined;
-
-        const actionResult: T = await subscription.action(eventData);
-        if (subscriptions.length <= 1) return actionResult;
-        return EventService.fireExecute<T>(pull(subscriptions, subscription), actionResult === undefined ? eventData : actionResult);
-    }
-
-    private static log<TMessage, TData>(message: TMessage, data?: TData): void {
-        if (console && (console as any).EventServiceDebug) {
-            console.log(message, data);
-        }
-    }
-
-    private constructor() { }
-}
+export declare var environment: {
+  isDev: boolean;
+  isProd: boolean;
+};
+
+export default class EventService {
+  /**
+   * Subscribe to event
+   * @param eventName The name of event
+   * @param callback The function callback that will be invoked when event will be fired
+   * @param key The optional param. The key of subscription. Used to identify the subscription for method `off`
+   */
+  public static on<T>(
+    eventName: string,
+    callback: (eventData?: any, prevSubscriptionResult?: any) => Promise<T>,
+    key: string | null = null,
+  ): void {
+    if (!EventService.subscriptions[eventName])
+      EventService.subscriptions[eventName] = [];
+    EventService.subscriptions[eventName].push({
+      key: key,
+      action: callback,
+    });
+  }
+
+  /**
+   * Unsubscribe from event
+   * @param eventName The name of event
+   * @param key The key that identify subscription. Use certain key that has been given in method `on`
+   */
+  public static off(eventName: string, key: string | null = null): void {
+    EventService.log(`EventService.off("${eventName}", "${key}")`);
+    if (!EventService.subscriptions[eventName]) return;
+    EventService.subscriptions[eventName] = EventService.subscriptions[
+      eventName
+    ].filter((x) => x.key !== key);
+    EventService.log(
+      `EventService.subscription["${eventName}"]`,
+      EventService.subscriptions[eventName],
+    );
+  }
+
+  /**
+   * Fire event.
+   * Also this method will wait for subscriber callback.
+   * @param eventName The name of event
+   * @param eventData The data that will be passed to subscriber's callback method
+   */
+  public static async fire<T, TData extends T | undefined>(
+    eventName: string,
+    eventData?: TData,
+  ): Promise<T | undefined> {
+    EventService.log(
+      `Event '${eventName}' has been executed: ${EventService.subscriptions[eventName] ? EventService.subscriptions[eventName].length : 0}`,
+      eventData,
+    );
+    if (!EventService.subscriptions[eventName]) return undefined;
+    return EventService.fireExecute<T>(
+      [...EventService.subscriptions[eventName]],
+      eventData,
+    );
+  }
+
+  public static clear(): void {
+    EventService.subscriptions = {};
+  }
+
+  private static subscriptions: {
+    [name: string]: Array<{
+      key: string | null;
+      action: (eventData: any) => Promise<any>;
+    }>;
+  } = {};
+
+  private static async fireExecute<T>(
+    subscriptions: Array<{
+      key: string | null;
+      action: (eventData: any) => Promise<T>;
+    }>,
+    eventData: T | undefined,
+  ): Promise<T | undefined> {
+    const [subscription, ...rest] = subscriptions;
+
+    if (!subscription) {
+      return undefined;
+    }
+
+    const actionResult = await subscription.action(eventData);
+
+    if (rest.length === 0) {
+      return actionResult;
+    }
+
+    return EventService.fireExecute<T>(
+      rest,
+      actionResult === undefined ? eventData : actionResult,
+    );
+  }
+
+  private static log<TMessage, TData>(message: TMessage, data?: TData): void {
+    if (console && (console as any).EventServiceDebug) {
+      console.log(message, data);
+    }
+  }
+
+  private constructor() {}
+}

package/tsconfig.json

@@ -1,23 +1,25 @@
-{
-    "compilerOptions": {
-        "outDir": "./dist/",
-        "sourceMap": true,
-        "declaration": true,
-        "noImplicitAny": true,
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "noUnusedLocals": true,
-        "noImplicitReturns": true,
-        "traceResolution": false,
-        "allowSyntheticDefaultImports": true,
-        "target": "es5",
-        "lib": [
-            "dom",
-            "es2015"
-        ]
-    },
-    "include": [
-        "./index.ts"
-    ]
+{
+    "compilerOptions": {
+        "outDir": "./dist/",
+        "sourceMap": true,
+        "declaration": true,
+        "noImplicitAny": true,
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "noUnusedLocals": true,
+        "noImplicitReturns": true,
+        "traceResolution": false,
+        "allowSyntheticDefaultImports": true,
+        "forceConsistentCasingInFileNames": true,
+        "strict": true,
+        "target": "es5",
+        "lib": [
+            "dom",
+            "es2015"
+        ]
+    },
+    "include": [
+        "./index.ts"
+    ]
 }

package/vitest.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    environment: "node",
+    globals: false,
+    include: ["__tests__/**/*.test.ts"],
+    coverage: {
+      provider: "v8",
+      reporter: ["text", "html"],
+      include: ["__tests__/**/*.ts"],
+      exclude: ["__tests__/**/*.test.ts", "__tests__/**/*.spec.ts"],
+    },
+  },
+});

package/jest.config.js

@@ -1,192 +0,0 @@
-// For a detailed explanation regarding each configuration property, visit:
-// https://jestjs.io/docs/en/configuration.html
-
-module.exports = {
-  // All imported modules in your tests should be mocked automatically
-  // automock: false,
-
-  // Stop running tests after `n` failures
-  // bail: 0,
-
-  // Respect "browser" field in package.json when resolving modules
-  // browser: false,
-
-  // The directory where Jest should store its cached dependency information
-  // cacheDirectory: "C:\\Users\\aripenko\\AppData\\Local\\Temp\\jest",
-
-  // Automatically clear mock calls and instances between every test
-  clearMocks: true,
-
-  // Indicates whether the coverage information should be collected while executing the test
-  collectCoverage: true,
-
-  // An array of glob patterns indicating a set of files for which coverage information should be collected
-  // collectCoverageFrom: null,
-
-  // The directory where Jest should output its coverage files
-  coverageDirectory: "coverage",
-
-  // An array of regexp pattern strings used to skip coverage collection
-  // coveragePathIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // A list of reporter names that Jest uses when writing coverage reports
-  // coverageReporters: [
-  //   "json",
-  //   "text",
-  //   "lcov",
-  //   "clover"
-  // ],
-
-  // An object that configures minimum threshold enforcement for coverage results
-  // coverageThreshold: null,
-
-  // A path to a custom dependency extractor
-  // dependencyExtractor: null,
-
-  // Make calling deprecated APIs throw helpful error messages
-  // errorOnDeprecated: false,
-
-  // Force coverage collection from ignored files using an array of glob patterns
-  // forceCoverageMatch: [],
-
-  // A path to a module which exports an async function that is triggered once before all test suites
-  // globalSetup: null,
-
-  // A path to a module which exports an async function that is triggered once after all test suites
-  // globalTeardown: null,
-
-  // A set of global variables that need to be available in all test environments
-  // globals: {
-    
-  // },
-
-  // An array of directory names to be searched recursively up from the requiring module's location
-  moduleDirectories: [
-    "node_modules",
-    "src"
-  ],
-
-  // An array of file extensions your modules use
-  // moduleFileExtensions: [
-  //   "js",
-  //   "json",
-  //   "jsx",
-  //   "ts",
-  //   "tsx",
-  //   "node"
-  // ],
-
-  // A map from regular expressions to module names that allow to stub out resources with a single module
-  moduleNameMapper: {
-    "^src/(.+)$": "<rootDir>/src/$1"
-  },
-
-  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  // modulePathIgnorePatterns: [],
-
-  // Activates notifications for test results
-  // notify: false,
-
-  // An enum that specifies notification mode. Requires { notify: true }
-  // notifyMode: "failure-change",
-
-  // A preset that is used as a base for Jest's configuration
-  // preset: null,
-
-  // Run tests from one or more projects
-  // projects: null,
-
-  // Use this configuration option to add custom reporters to Jest
-  // reporters: undefined,
-
-  // Automatically reset mock state between every test
-  // resetMocks: false,
-
-  // Reset the module registry before running each individual test
-  // resetModules: false,
-
-  // A path to a custom resolver
-  // resolver: null,
-
-  // Automatically restore mock state between every test
-  // restoreMocks: false,
-
-  // The root directory that Jest should scan for tests and modules within
-  // rootDir: null,
-
-  // A list of paths to directories that Jest should use to search for files in
-  roots: [
-    "<rootDir>/__tests__"
-  ],
-
-  // Allows you to use a custom runner instead of Jest's default test runner
-  // runner: "jest-runner",
-
-  // The paths to modules that run some code to configure or set up the testing environment before each test
-  // setupFiles: [],
-
-  // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  // setupFilesAfterEnv: [],
-
-  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
-  // snapshotSerializers: [],
-
-  // The test environment that will be used for testing
-  testEnvironment: "node",
-
-  // Options that will be passed to the testEnvironment
-  // testEnvironmentOptions: {},
-
-  // Adds a location field to test results
-  // testLocationInResults: false,
-
-  // The glob patterns Jest uses to detect test files
-  // testMatch: [
-  //   "**/__tests__/**/*.[jt]s?(x)",
-  //   "**/?(*.)+(spec|test).[tj]s?(x)"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-  // testPathIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // The regexp pattern or array of patterns that Jest uses to detect test files
-  // testRegex: [],
-
-  // This option allows the use of a custom results processor
-  // testResultsProcessor: null,
-
-  // This option allows use of a custom test runner
-  // testRunner: "jasmine2",
-
-  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
-  // testURL: "http://localhost",
-
-  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
-  // timers: "real",
-
-  // A map from regular expressions to paths to transformers
-  transform: {
-    "^.+\\.tsx?$": "ts-jest"
-  },
-
-  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  // transformIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
-  // unmockedModulePathPatterns: undefined,
-
-  // Indicates whether each individual test should be reported during the run
-  // verbose: null,
-
-  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
-  // watchPathIgnorePatterns: [],
-
-  // Whether to use watchman for file crawling
-  // watchman: true,
-};