merge conflict resolution

Author: yankeeinlondon

dist/cjs/EventManager.d.ts

@@ -1,5 +1,6 @@
-import { EventEmitter } from "events";
+/// <reference types="node" />
+import * as events from "events";
 import { IEmitter } from "abstracted-firebase";
-export declare class EventManager extends EventEmitter implements IEmitter {
-  public connection(state: boolean): void;
+export declare class EventManager extends events.EventEmitter implements IEmitter {
+    connection(state: boolean): void;
 }

dist/cjs/EventManager.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = require("events");
-// TODO: remove above interface! remove
-class EventManager extends events_1.EventEmitter {
+const events = require("events");
+class EventManager extends events.EventEmitter {
     connection(state) {
         this.emit("connection", state);
     }

dist/cjs/db.js

@@ -93,7 +93,7 @@ class DB extends abstracted_firebase_1.RealTimeDB {
                 }
             }
             this._database = this.app.database();
-            this._eventManager.connection(true);
+            await this.waitForConnection();
         }
         // TODO: relook at debugging func
         if (config.debugging) {

dist/esnext/EventManager.d.ts

@@ -1,10 +1,6 @@
-import { EventEmitter } from "events";
-export interface IEmitter {
-  emit: (event: string | symbol, ...args: any[]) => boolean;
-  on: (event: string, value: any) => void;
-  once: (event: string, value: any) => void;
-}
+/// <reference types="node" />
+import * as events from "events";
 import { IEmitter } from "abstracted-firebase";
-export declare class EventManager extends EventEmitter implements IEmitter {
-  public connection(state: boolean): void;
+export declare class EventManager extends events.EventEmitter implements IEmitter {
+    connection(state: boolean): void;
 }

dist/esnext/EventManager.js

@@ -1,6 +1,5 @@
-import { EventEmitter } from "events";
-// TODO: remove above interface! remove
-export class EventManager extends EventEmitter {
+import * as events from "events";
+export class EventManager extends events.EventEmitter {
     connection(state) {
         this.emit("connection", state);
     }

dist/esnext/db.js

@@ -91,7 +91,7 @@ export class DB extends RealTimeDB {
                 }
             }
             this._database = this.app.database();
-            this._eventManager.connection(true);
+            await this.waitForConnection();
         }
         // TODO: relook at debugging func
         if (config.debugging) {

dist/umd/EventManager.d.ts

@@ -1,10 +1,6 @@
-export interface IEmitter {
-  emit: (event: string | symbol, ...args: any[]) => boolean;
-  on: (event: string, value: any) => void;
-  once: (event: string, value: any) => void;
-}
-import * as EventEmitter from "events";
+/// <reference types="node" />
+import * as events from "events";
 import { IEmitter } from "abstracted-firebase";
-export declare class EventManager extends EventEmitter implements IEmitter {
-  public connection(state: boolean): void;
+export declare class EventManager extends events.EventEmitter implements IEmitter {
+    connection(state: boolean): void;
 }

dist/umd/EventManager.js

@@ -9,9 +9,8 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    const events_1 = require("events");
-    // TODO: remove above interface! remove
-    class EventManager extends events_1.EventEmitter {
+    const events = require("events");
+    class EventManager extends events.EventEmitter {
         connection(state) {
             this.emit("connection", state);
         }

dist/umd/db.js

@@ -103,7 +103,7 @@
                     }
                 }
                 this._database = this.app.database();
-                this._eventManager.connection(true);
+                await this.waitForConnection();
             }
             // TODO: relook at debugging func
             if (config.debugging) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "abstracted-client",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Helpful abstraction on the firebase client API",
   "license": "MIT",
   "repository": "https://github.com/forest-fire/abstracted-admin",