@openfin/fdc3-api 44.100.25 → 44.100.26

package/out/fdc3-api-alpha.d.ts

@@ -4776,20 +4776,11 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     eventNames: () => (string | symbol)[];
     /* Excluded from this release type: emit */
     private hasEmitter;
-    /**
-     * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-     * `once` subscription.
-     *
-     * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-     * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-     * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-     */
-    private cleanUpRemovedListener;
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
     protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
-    protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
+    private deregisterEventListener;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
      *
@@ -4825,7 +4816,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
      * @remarks Caution: Calling this method changes the array indices in the listener array behind the listener.
      */
     removeListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
-    protected deregisterAllListeners(eventType: EmitterEventType): Promise<EventEmitter | void>;
+    private deregisterAllListeners;
     /**
      * Removes all listeners, or those of the specified event.
      *

package/out/fdc3-api-beta.d.ts

@@ -4776,20 +4776,11 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     eventNames: () => (string | symbol)[];
     /* Excluded from this release type: emit */
     private hasEmitter;
-    /**
-     * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-     * `once` subscription.
-     *
-     * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-     * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-     * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-     */
-    private cleanUpRemovedListener;
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
     protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
-    protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
+    private deregisterEventListener;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
      *
@@ -4825,7 +4816,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
      * @remarks Caution: Calling this method changes the array indices in the listener array behind the listener.
      */
     removeListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
-    protected deregisterAllListeners(eventType: EmitterEventType): Promise<EventEmitter | void>;
+    private deregisterAllListeners;
     /**
      * Removes all listeners, or those of the specified event.
      *

package/out/fdc3-api-public.d.ts

@@ -4776,20 +4776,11 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     eventNames: () => (string | symbol)[];
     /* Excluded from this release type: emit */
     private hasEmitter;
-    /**
-     * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-     * `once` subscription.
-     *
-     * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-     * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-     * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-     */
-    private cleanUpRemovedListener;
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
     protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
-    protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
+    private deregisterEventListener;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
      *
@@ -4825,7 +4816,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
      * @remarks Caution: Calling this method changes the array indices in the listener array behind the listener.
      */
     removeListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
-    protected deregisterAllListeners(eventType: EmitterEventType): Promise<EventEmitter | void>;
+    private deregisterAllListeners;
     /**
      * Removes all listeners, or those of the specified event.
      *

package/out/fdc3-api.d.ts

@@ -4840,20 +4840,11 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
         type: EventType;
     }>, ...args: any[]) => boolean;
     private hasEmitter;
-    /**
-     * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-     * `once` subscription.
-     *
-     * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-     * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-     * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-     */
-    private cleanUpRemovedListener;
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
     protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
-    protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
+    private deregisterEventListener;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
      *
@@ -4889,7 +4880,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
      * @remarks Caution: Calling this method changes the array indices in the listener array behind the listener.
      */
     removeListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
-    protected deregisterAllListeners(eventType: EmitterEventType): Promise<EventEmitter | void>;
+    private deregisterAllListeners;
     /**
      * Removes all listeners, or those of the specified event.
      *

package/out/fdc3-api.js

@@ -495,35 +495,6 @@ var InteropClient$1 = {};
 
 var base = {};
 
-var promises = {};
-
-Object.defineProperty(promises, "__esModule", { value: true });
-promises.promiseMapSerial = promises.serial = promises.promiseMap = promises.promisify = void 0;
-function promisify(func) {
-    return (...args) => new Promise((resolve, reject) => {
-        func(...args, (err, val) => (err ? reject(err) : resolve(val)));
-    });
-}
-promises.promisify = promisify;
-async function promiseMap(arr, asyncF) {
-    return Promise.all(arr.map(asyncF));
-}
-promises.promiseMap = promiseMap;
-async function serial(arr) {
-    const ret = [];
-    for (const func of arr) {
-        // eslint-disable-next-line no-await-in-loop
-        const next = await func();
-        ret.push(next);
-    }
-    return ret;
-}
-promises.serial = serial;
-async function promiseMapSerial(arr, func) {
-    return serial(arr.map((value, index, array) => () => func(value, index, array)));
-}
-promises.promiseMapSerial = promiseMapSerial;
-
 var __classPrivateFieldSet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -538,7 +509,6 @@ var __classPrivateFieldGet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateF
 var _EmitterBase_emitterAccessor, _EmitterBase_deregisterOnceListeners;
 Object.defineProperty(base, "__esModule", { value: true });
 base.Reply = base.EmitterBase = base.Base = void 0;
-const promises_1 = promises;
 class Base {
     /**
      * @internal
@@ -616,27 +586,8 @@ class EmitterBase extends Base {
             return this.hasEmitter() ? this.getOrCreateEmitter().emit(eventType, payload, ...args) : false;
         };
         this.hasEmitter = () => this.wire.eventAggregator.has(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
-        /**
-         * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-         * `once` subscription.
-         *
-         * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-         * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-         * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-         */
-        this.cleanUpRemovedListener = (eventType, listener) => {
-            const deregister = __classPrivateFieldGet$3(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
-            if (deregister) {
-                const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
-                emitter.removeListener(eventType, deregister);
-            }
-        };
         this.getOrCreateEmitter = () => {
-            const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
-            if (!emitter.listeners('removeListener').includes(this.cleanUpRemovedListener)) {
-                emitter.on('removeListener', this.cleanUpRemovedListener);
-            }
-            return emitter;
+            return this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
         };
         this.listeners = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(type) : [];
         this.listenerCount = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listenerCount(type) : 0;
@@ -676,7 +627,6 @@ class EmitterBase extends Base {
         };
         __classPrivateFieldSet$3(this, _EmitterBase_emitterAccessor, [topic, ...additionalAccessors], "f");
         __classPrivateFieldSet$3(this, _EmitterBase_deregisterOnceListeners, new WeakMap(), "f");
-        this.listeners = (event) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(event) : [];
     }
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -754,6 +704,10 @@ class EmitterBase extends Base {
         const emitter = await this.deregisterEventListener(eventType, options);
         if (emitter) {
             emitter.removeListener(eventType, listener);
+            const deregister = __classPrivateFieldGet$3(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
+            if (deregister) {
+                emitter.removeListener(eventType, deregister);
+            }
             this.deleteEmitterIfNothingRegistered(emitter);
         }
         return this;
@@ -789,12 +743,13 @@ class EmitterBase extends Base {
         }
         else if (this.hasEmitter()) {
             const events = this.getOrCreateEmitter().eventNames();
-            await (0, promises_1.promiseMap)(events, removeByEvent);
+            await Promise.all(events.map(removeByEvent));
         }
         return this;
     }
     deleteEmitterIfNothingRegistered(emitter) {
-        if (emitter.eventNames().every((type) => type === 'removeListener')) {
+        // TODO: maybe emitterMap should clean up itself..
+        if (emitter.eventNames().length === 0) {
             this.wire.eventAggregator.delete(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/fdc3-api",
-    "version": "44.100.25",
+    "version": "44.100.26",
     "description": "OpenFin fdc3 module utilities and types.",
     "license": "SEE LICENSE IN LICENSE.md",
     "private": false,