@openfin/fdc3-api 40.102.1 → 40.102.2

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

@@ -4598,6 +4598,15 @@ 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;

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

@@ -4598,6 +4598,15 @@ 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;

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

@@ -4598,6 +4598,15 @@ 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;

package/out/fdc3-api.d.ts

@@ -4662,6 +4662,15 @@ 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;

package/out/fdc3-api.js

@@ -476,7 +476,7 @@ var __classPrivateFieldGet$1 = (commonjsGlobal && commonjsGlobal.__classPrivateF
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EmitterBase_emitterAccessor;
+var _EmitterBase_emitterAccessor, _EmitterBase_deregisterOnceListeners;
 Object.defineProperty(base, "__esModule", { value: true });
 base.Reply = base.EmitterBase = base.Base = void 0;
 const promises_1 = promises;
@@ -548,6 +548,7 @@ class EmitterBase extends Base {
         super(wire);
         this.topic = topic;
         _EmitterBase_emitterAccessor.set(this, void 0);
+        _EmitterBase_deregisterOnceListeners.set(this, void 0);
         this.eventNames = () => (this.hasEmitter() ? this.getOrCreateEmitter().eventNames() : []);
         /**
          * @internal
@@ -556,7 +557,28 @@ class EmitterBase extends Base {
             return this.hasEmitter() ? this.getOrCreateEmitter().emit(eventType, payload, ...args) : false;
         };
         this.hasEmitter = () => this.wire.eventAggregator.has(__classPrivateFieldGet$1(this, _EmitterBase_emitterAccessor, "f"));
-        this.getOrCreateEmitter = () => this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$1(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$1(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
+            if (deregister) {
+                const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$1(this, _EmitterBase_emitterAccessor, "f"));
+                emitter.removeListener(eventType, deregister);
+            }
+        };
+        this.getOrCreateEmitter = () => {
+            const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$1(this, _EmitterBase_emitterAccessor, "f"));
+            if (!emitter.listeners('removeListener').includes(this.cleanUpRemovedListener)) {
+                emitter.on('removeListener', this.cleanUpRemovedListener);
+            }
+            return emitter;
+        };
         this.listeners = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(type) : [];
         this.listenerCount = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listenerCount(type) : 0;
         this.registerEventListener = async (eventType, options = {}, applySubscription, undoSubscription) => {
@@ -588,13 +610,13 @@ class EmitterBase extends Base {
                     type: eventType
                 };
                 await this.wire.sendAction('unsubscribe-to-desktop-event', runtimeEvent).catch(() => null);
-                const emitter = this.getOrCreateEmitter();
-                return emitter;
+                return this.getOrCreateEmitter();
             }
             // This will only be reached if unsubscribe from event that does not exist but do not want to error here
             return Promise.resolve();
         };
         __classPrivateFieldSet$1(this, _EmitterBase_emitterAccessor, [topic, ...additionalAccessors], "f");
+        __classPrivateFieldSet$1(this, _EmitterBase_deregisterOnceListeners, new WeakMap(), "f");
         this.listeners = (event) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(event) : [];
     }
     /**
@@ -623,6 +645,7 @@ class EmitterBase extends Base {
      */
     async once(eventType, listener, options) {
         const deregister = () => this.deregisterEventListener(eventType);
+        __classPrivateFieldGet$1(this, _EmitterBase_deregisterOnceListeners, "f").set(listener, deregister);
         await this.registerEventListener(eventType, options, (emitter) => {
             emitter.once(eventType, deregister);
             emitter.once(eventType, listener);
@@ -653,6 +676,7 @@ class EmitterBase extends Base {
      */
     async prependOnceListener(eventType, listener, options) {
         const deregister = () => this.deregisterEventListener(eventType);
+        __classPrivateFieldGet$1(this, _EmitterBase_deregisterOnceListeners, "f").set(listener, deregister);
         await this.registerEventListener(eventType, options, (emitter) => {
             emitter.prependOnceListener(eventType, listener);
             emitter.once(eventType, deregister);
@@ -711,13 +735,13 @@ class EmitterBase extends Base {
         return this;
     }
     deleteEmitterIfNothingRegistered(emitter) {
-        if (emitter.eventNames().length === 0) {
+        if (emitter.eventNames().every((type) => type === 'removeListener')) {
             this.wire.eventAggregator.delete(__classPrivateFieldGet$1(this, _EmitterBase_emitterAccessor, "f"));
         }
     }
 }
 base.EmitterBase = EmitterBase;
-_EmitterBase_emitterAccessor = new WeakMap();
+_EmitterBase_emitterAccessor = new WeakMap(), _EmitterBase_deregisterOnceListeners = new WeakMap();
 class Reply {
 }
 base.Reply = Reply;

package/package.json

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