@openfin/core 30.73.6 → 30.73.7

package/src/api/interop/InteropClient.js

@@ -1,30 +1,30 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
+var __classPrivateFieldSet = (this && this.__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");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _clientPromise, _sessionContextGroups;
+var _InteropClient_clientPromise, _InteropClient_sessionContextGroups;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InteropClient = void 0;
 const base_1 = require("../base");
 const SessionContextGroupClient_1 = require("./SessionContextGroupClient");
 const utils_1 = require("./utils");
 /**
+ * @PORTED
  * @typedef { object } Intent
  * @summary The combination of an action and a context that is passed to an application for resolution.
  * @property { string } name Name of the intent.
  * @property { Context } context Data associated with the intent
  */
 /**
+ * @REMOVED
  * @typedef { object } Subscription
  * @summary Object returned when subscribing a handler.
  * @property { function } unsubscribe Function to unsubscribe the handler.
@@ -38,6 +38,7 @@ const utils_1 = require("./utils");
  * @summary Subscription function for registerIntentHandler
  */
 /**
+ * @PORTED
  * @typedef { object } ClientIdentity
  * @summary The Identity for a Channel Client. Includes endpointId to differentiate between different connections for an entity.
  * @property {string} uuid GUID of an application.
@@ -45,12 +46,14 @@ const utils_1 = require("./utils");
  * @property {string} endpointId Unique differentiator for different Channel connections for an entity.
  */
 /**
+ * @PORTED
  * @typedef { object } ContextGroupInfo
  * @summary Information for a Context Group. Contains metadata for displaying the group properly.
  * @property {string} id Name of the context group
  * @property {DisplayMetadata} displayMetadata Metadata for the Context Group. Contains the group's human-readable name, color, and an image, as defined by the Interop Broker.
  */
 /**
+ * @PORTED
  * @typedef { object } DisplayMetadata
  * @summary The display data for a Context Group.
  * @property {string} name A user-readable name for this context group, e.g: `"Red"`
@@ -58,6 +61,7 @@ const utils_1 = require("./utils");
  * @property {string} [glyph] A URL of an image that can be used to display this context group
  */
 /**
+ * @PORTED
  * @typedef { object } Context
  * @summary Data passed between entities and applications.
  * @property {object} [id] An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
@@ -65,6 +69,7 @@ const utils_1 = require("./utils");
  * @property {string} type Conserved type for the context (e.g. `instrument` or `country`)
  */
 /**
+ * @REMOVED
  * @typedef { object } ContextForIntent
  * @summary Data passed between entities and applications, including an optional metadata.
  * @property {object} [id] An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
@@ -73,6 +78,7 @@ const utils_1 = require("./utils");
  * @property {any} [metadata]
  */
 /**
+ * @REMOVED
  * @typedef { object } SessionContextGroup
  * @summary An instance of a SessionContextGroup
  * @property {string} id The SessionContextGroup's id.
@@ -157,14 +163,14 @@ const utils_1 = require("./utils");
 class InteropClient extends base_1.Base {
     constructor(wire, name, interopConfig = {}) {
         super(wire);
-        _clientPromise.set(this, void 0);
-        _sessionContextGroups.set(this, void 0);
-        __classPrivateFieldSet(this, _sessionContextGroups, new Map());
-        __classPrivateFieldSet(this, _clientPromise, this.wire.environment.whenReady().then(() => {
+        _InteropClient_clientPromise.set(this, void 0);
+        _InteropClient_sessionContextGroups.set(this, void 0);
+        __classPrivateFieldSet(this, _InteropClient_sessionContextGroups, new Map(), "f");
+        __classPrivateFieldSet(this, _InteropClient_clientPromise, this.wire.environment.whenReady().then(() => {
             return this.fin.InterApplicationBus.Channel.connect(`interop-broker-${name}`, {
                 payload: interopConfig
             });
-        }));
+        }), "f");
     }
     /*
     Client APIs
@@ -179,7 +185,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-set-context').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('setContext', { context });
     }
     /**
@@ -196,16 +202,16 @@ class InteropClient extends base_1.Base {
         if (typeof handler !== 'function') {
             throw new Error("Non-function argument passed to the first parameter 'handler'. Be aware that the argument order does not match the FDC3 standard.");
         }
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         let handlerId;
         if (contextType) {
-            handlerId = `invokeContextHandler-${contextType}-${utils_1.generateId()}`;
+            handlerId = `invokeContextHandler-${contextType}-${(0, utils_1.generateId)()}`;
             console.warn(`Warning: By providing a contextType (${contextType}), you are using the experimental addContextHandler. To avoid issues, make sure you are adding your context handlers at the top level in your application.`);
         }
         else {
             handlerId = 'invokeContextHandler';
         }
-        const wrappedHandler = utils_1.wrapContextHandler(handler, handlerId);
+        const wrappedHandler = (0, utils_1.wrapContextHandler)(handler, handlerId);
         client.register(handlerId, wrappedHandler);
         await client.dispatch('contextHandlerRegistered', { handlerId, contextType });
         return {
@@ -228,7 +234,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-get-context-groups').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('getContextGroups');
     }
     /**
@@ -247,7 +253,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-join-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         if (!contextGroupId) {
             throw new Error('No contextGroupId specified for joinContextGroup.');
         }
@@ -265,7 +271,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-remove-from-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('removeFromContextGroup', { target });
     }
     /**
@@ -279,7 +285,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-get-all-clients-in-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         if (!contextGroupId) {
             throw new Error('No contextGroupId specified for getAllClientsInContextGroup.');
         }
@@ -296,7 +302,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-get-info-for-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         if (!contextGroupId) {
             throw new Error('No contextGroupId specified for getInfoForContextGroup.');
         }
@@ -313,7 +319,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-fire-intent').catch((e) => {
             // don't expose, this is only for api analytics purposes
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('fireIntent', intent);
     }
     /**
@@ -328,9 +334,9 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-register-intent-handler').catch((e) => {
             // don't expose, this is only for api analytics purposes
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         const handlerId = `intent-handler-${intentName}`;
-        const wrappedHandler = utils_1.wrapIntentHandler(handler, handlerId);
+        const wrappedHandler = (0, utils_1.wrapIntentHandler)(handler, handlerId);
         try {
             await client.register(handlerId, wrappedHandler);
             await client.dispatch('intentHandlerRegistered', { handlerId, ...options });
@@ -356,7 +362,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-get-current-context').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('getCurrentContext', { contextType });
     }
     /**
@@ -370,7 +376,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-get-info-for-intent').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('getInfoForIntent', options);
     }
     /**
@@ -384,7 +390,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-get-info-for-intents-by-context').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('getInfoForIntentsByContext', context);
     }
     /**
@@ -399,7 +405,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-fire-intent-for-context').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.dispatch('fireIntentForContext', context);
     }
     /**
@@ -413,19 +419,19 @@ class InteropClient extends base_1.Base {
      */
     async joinSessionContextGroup(sessionContextGroupId) {
         try {
-            const currentSessionContextGroup = __classPrivateFieldGet(this, _sessionContextGroups).get(sessionContextGroupId);
+            const currentSessionContextGroup = __classPrivateFieldGet(this, _InteropClient_sessionContextGroups, "f").get(sessionContextGroupId);
             if (currentSessionContextGroup) {
                 return currentSessionContextGroup.getUserInstance();
             }
-            const client = await __classPrivateFieldGet(this, _clientPromise);
+            const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
             const { hasConflict } = await client.dispatch('sessionContextGroup:createIfNeeded', {
                 sessionContextGroupId
             });
             if (hasConflict) {
                 console.warn(`A (non-session) context group with the name "${sessionContextGroupId}" already exists. If you are trying to join a Context Group, call joinContextGroup instead.`);
             }
-            const newSessionContextGroup = new SessionContextGroupClient_1.default(this.wire, __classPrivateFieldGet(this, _clientPromise), sessionContextGroupId);
-            __classPrivateFieldGet(this, _sessionContextGroups).set(sessionContextGroupId, newSessionContextGroup);
+            const newSessionContextGroup = new SessionContextGroupClient_1.default(this.wire, __classPrivateFieldGet(this, _InteropClient_clientPromise, "f"), sessionContextGroupId);
+            __classPrivateFieldGet(this, _InteropClient_sessionContextGroups, "f").set(sessionContextGroupId, newSessionContextGroup);
             return newSessionContextGroup.getUserInstance();
         }
         catch (error) {
@@ -444,7 +450,7 @@ class InteropClient extends base_1.Base {
         this.wire.sendAction('interop-client-add-ondisconnection-listener').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _InteropClient_clientPromise, "f");
         return client.onDisconnection((event) => {
             const { uuid } = event;
             listener({ type: 'interop-broker', topic: 'disconnected', brokerName: uuid });
@@ -452,9 +458,9 @@ class InteropClient extends base_1.Base {
     }
     // used to ferry fdc3-only calls from the fdc3 shim to the Interop Broker
     static async ferryFdc3Call(interopClient, action, payload) {
-        const client = await __classPrivateFieldGet(interopClient, _clientPromise);
+        const client = await __classPrivateFieldGet(interopClient, _InteropClient_clientPromise, "f");
         return client.dispatch(action, payload || null);
     }
 }
 exports.InteropClient = InteropClient;
-_clientPromise = new WeakMap(), _sessionContextGroups = new WeakMap();
+_InteropClient_clientPromise = new WeakMap(), _InteropClient_sessionContextGroups = new WeakMap();

package/src/api/interop/SessionContextGroupBroker.d.ts

@@ -1,3 +1,4 @@
+import type * as OpenFin from '../../OpenFin';
 import type { ChannelProvider } from '../interappbus/channel/provider';
 export default class SessionContextGroupBroker {
     id: string;

package/src/api/interop/SessionContextGroupClient.d.ts

@@ -1,3 +1,4 @@
+import type * as OpenFin from '../../OpenFin';
 import Transport from '../../transport/transport';
 import { Base } from '../base';
 export default class SessionContextGroupClient extends Base {

package/src/api/interop/SessionContextGroupClient.js

@@ -1,27 +1,25 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
+var __classPrivateFieldSet = (this && this.__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");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _clientPromise;
+var _SessionContextGroupClient_clientPromise;
 Object.defineProperty(exports, "__esModule", { value: true });
 const base_1 = require("../base");
 const utils_1 = require("./utils");
 class SessionContextGroupClient extends base_1.Base {
     constructor(wire, client, id) {
         super(wire);
-        _clientPromise.set(this, void 0);
+        _SessionContextGroupClient_clientPromise.set(this, void 0);
         this.id = id;
-        __classPrivateFieldSet(this, _clientPromise, client);
+        __classPrivateFieldSet(this, _SessionContextGroupClient_clientPromise, client, "f");
     }
     /**
      * Sets a context for the session context group.
@@ -33,7 +31,7 @@ class SessionContextGroupClient extends base_1.Base {
         this.wire.sendAction('interop-session-context-group-set-context').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _SessionContextGroupClient_clientPromise, "f");
         return client.dispatch(`sessionContextGroup:setContext-${this.id}`, {
             sessionContextGroupId: this.id,
             context
@@ -43,7 +41,7 @@ class SessionContextGroupClient extends base_1.Base {
         this.wire.sendAction('interop-session-context-group-get-context').catch((e) => {
             // don't expose, analytics-only call
         });
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _SessionContextGroupClient_clientPromise, "f");
         return client.dispatch(`sessionContextGroup:getContext-${this.id}`, {
             sessionContextGroupId: this.id,
             type
@@ -56,20 +54,20 @@ class SessionContextGroupClient extends base_1.Base {
         if (typeof contextHandler !== 'function') {
             throw new Error("Non-function argument passed to the first parameter 'handler'. Be aware that the argument order does not match the FDC3 standard.");
         }
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _SessionContextGroupClient_clientPromise, "f");
         let handlerId;
         if (contextType) {
-            handlerId = `sessionContextHandler:invoke-${this.id}-${contextType}-${utils_1.generateId()}`;
+            handlerId = `sessionContextHandler:invoke-${this.id}-${contextType}-${(0, utils_1.generateId)()}`;
         }
         else {
             handlerId = `sessionContextHandler:invoke-${this.id}`;
         }
-        client.register(handlerId, utils_1.wrapContextHandler(contextHandler, handlerId));
+        client.register(handlerId, (0, utils_1.wrapContextHandler)(contextHandler, handlerId));
         client.dispatch(`sessionContextGroup:handlerAdded-${this.id}`, { handlerId, contextType });
         return { unsubscribe: await this.createUnsubscribeCb(handlerId) };
     }
     async createUnsubscribeCb(handlerId) {
-        const client = await __classPrivateFieldGet(this, _clientPromise);
+        const client = await __classPrivateFieldGet(this, _SessionContextGroupClient_clientPromise, "f");
         return async () => {
             client.remove(handlerId);
             await client.dispatch(`sessionContextGroup:handlerRemoved-${this.id}`, { handlerId });
@@ -78,11 +76,11 @@ class SessionContextGroupClient extends base_1.Base {
     getUserInstance() {
         return {
             id: this.id,
-            setContext: utils_1.wrapInTryCatch(this.setContext.bind(this), 'Failed to set context: '),
-            getCurrentContext: utils_1.wrapInTryCatch(this.getCurrentContext.bind(this), 'Failed to get context: '),
-            addContextHandler: utils_1.wrapInTryCatch(this.addContextHandler.bind(this), 'Failed to add context handler: ')
+            setContext: (0, utils_1.wrapInTryCatch)(this.setContext.bind(this), 'Failed to set context: '),
+            getCurrentContext: (0, utils_1.wrapInTryCatch)(this.getCurrentContext.bind(this), 'Failed to get context: '),
+            addContextHandler: (0, utils_1.wrapInTryCatch)(this.addContextHandler.bind(this), 'Failed to add context handler: ')
         };
     }
 }
 exports.default = SessionContextGroupClient;
-_clientPromise = new WeakMap();
+_SessionContextGroupClient_clientPromise = new WeakMap();

package/src/api/interop/fdc3/PrivateChannelClient.d.ts

@@ -1,17 +1,19 @@
+import type * as OpenFin from '../../../OpenFin';
+import type { Listener, Context, ContextHandler } from './shapes/fdc3v2';
 declare type HandlerId = string;
 export declare class PrivateChannelClient {
     id: string;
     client: OpenFin.ChannelClient;
-    listeners: Map<HandlerId, FDC3v2.Listener>;
+    listeners: Map<HandlerId, Listener>;
     constructor(client: OpenFin.ChannelClient, id: string);
-    broadcast(context: OpenFin.Context): Promise<void>;
-    getCurrentContext(contextType?: string): Promise<OpenFin.Context | null>;
-    addContextListener(contextType: string | null, handler: OpenFin.ContextHandler): Promise<FDC3v2.Listener>;
+    broadcast(context: Context): Promise<void>;
+    getCurrentContext(contextType?: string): Promise<Context | null>;
+    addContextListener(contextType: string | null, handler: ContextHandler): Promise<Listener>;
     private createNonStandardUnsubscribeCb;
     private createContextUnsubscribeCb;
-    onAddContextListener(handler: (contextType?: string) => void): FDC3v2.Listener;
-    onDisconnect(handler: () => void): FDC3v2.Listener;
-    onUnsubscribe(handler: (contextType?: string) => void): FDC3v2.Listener;
+    onAddContextListener(handler: (contextType?: string) => void): Listener;
+    onDisconnect(handler: () => void): Listener;
+    onUnsubscribe(handler: (contextType?: string) => void): Listener;
     disconnect(): Promise<void>;
 }
 export {};

package/src/api/interop/fdc3/PrivateChannelClient.js

@@ -20,12 +20,12 @@ class PrivateChannelClient {
         }
         let handlerId;
         if (contextType) {
-            handlerId = `contextHandler:invoke-${this.id}-${contextType}-${utils_1.generateId()}`;
+            handlerId = `contextHandler:invoke-${this.id}-${contextType}-${(0, utils_1.generateId)()}`;
         }
         else {
-            handlerId = `contextHandler:invoke-${this.id}-${utils_1.generateId()}`;
+            handlerId = `contextHandler:invoke-${this.id}-${(0, utils_1.generateId)()}`;
         }
-        this.client.register(handlerId, utils_1.wrapContextHandler(handler, handlerId));
+        this.client.register(handlerId, (0, utils_1.wrapContextHandler)(handler, handlerId));
         const listener = { unsubscribe: await this.createContextUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
         await this.client.dispatch(`contextHandlerAdded`, { handlerId, contextType });
@@ -46,7 +46,7 @@ class PrivateChannelClient {
         };
     }
     onAddContextListener(handler) {
-        const handlerId = `onContextHandlerAdded:invoke-${this.id}-${utils_1.generateId()}`;
+        const handlerId = `onContextHandlerAdded:invoke-${this.id}-${(0, utils_1.generateId)()}`;
         this.client.register(handlerId, handler);
         const listener = { unsubscribe: this.createNonStandardUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
@@ -54,7 +54,7 @@ class PrivateChannelClient {
         return listener;
     }
     onDisconnect(handler) {
-        const handlerId = `onDisconnect:invoke-${this.id}-${utils_1.generateId()}`;
+        const handlerId = `onDisconnect:invoke-${this.id}-${(0, utils_1.generateId)()}`;
         this.client.register(handlerId, handler);
         const listener = { unsubscribe: this.createNonStandardUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
@@ -62,7 +62,7 @@ class PrivateChannelClient {
         return listener;
     }
     onUnsubscribe(handler) {
-        const handlerId = `onUnsubscribe:invoke-${this.id}-${utils_1.generateId()}`;
+        const handlerId = `onUnsubscribe:invoke-${this.id}-${(0, utils_1.generateId)()}`;
         this.client.register(handlerId, handler);
         const listener = { unsubscribe: this.createNonStandardUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);

package/src/api/interop/fdc3/PrivateChannelProvider.d.ts

@@ -1,3 +1,4 @@
+import type * as OpenFin from '../../../OpenFin';
 import { ChannelProvider } from '../../interappbus/channel/provider';
 declare type HandlerId = string;
 export declare class PrivateChannelProvider {

package/src/api/interop/fdc3/fdc3-1.2.d.ts

@@ -1,3 +1,4 @@
+import type * as FDC3v1 from './shapes/fdc3v1';
 import { Base } from '../../base';
 /**
  * @typedef { object } Listener
@@ -88,7 +89,7 @@ import { Base } from '../../base';
  * }
  * ```
  */
-export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
+export default class Fdc3Module extends Base implements FDC3v1.DesktopAgent {
     /**
      * Add a context handler for incoming context. If an entity is part of a context group, and then sets its context handler, it will receive all of its declared contexts. If you wish to listen for all incoming contexts, pass `null` for the contextType argument.
      * @param { string | null } contextType - The type of context you wish to handle.
@@ -97,7 +98,7 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @tutorial fdc3.addContextListener
      * @static
      */
-    addContextListener(contextType: string | null, handler: OpenFin.ContextHandler): FDC3.Listener & Promise<FDC3.Listener>;
+    addContextListener(contextType: string | null, handler: FDC3v1.ContextHandler): FDC3v1.Listener & Promise<FDC3v1.Listener>;
     /**
      * Broadcasts a context for the channel of the current entity.
      * @param { Context } context - New context to set.
@@ -105,14 +106,14 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @tutorial fdc3.broadcast
      * @static
      */
-    broadcast(context: OpenFin.Context): Promise<void>;
+    broadcast(context: FDC3v1.Context): Promise<void>;
     /**
      * Returns the Interop-Broker-defined context groups available for an entity to join.
      * @returns { Promise<Channel[]>}
      * @tutorial fdc3.getSystemChannels
      * @static
      */
-    getSystemChannels(): Promise<OpenFin.ContextGroupInfo[]>;
+    getSystemChannels(): Promise<FDC3v1.SystemChannel[]>;
     /**
      * Join all Interop Clients at the given identity to context group `contextGroupId`.
      * If no target is specified, it adds the sender to the context group.
@@ -141,7 +142,7 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @tutorial fdc3.addIntentListener
      * @static
      */
-    addIntentListener(intent: string, handler: OpenFin.ContextHandler): FDC3.Listener & Promise<FDC3.Listener>;
+    addIntentListener(intent: string, handler: FDC3v1.ContextHandler): FDC3v1.Listener & Promise<FDC3v1.Listener>;
     /**
      * Raises a specific intent.
      * @param { string } intent Name of the Intent.
@@ -151,13 +152,13 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @tutorial fdc3.raiseIntent
      * @static
      */
-    raiseIntent(intent: string, context: OpenFin.Context, app?: FDC3.TargetApp): Promise<FDC3.IntentResolution>;
+    raiseIntent(intent: string, context: FDC3v1.Context, app?: FDC3v1.TargetApp): Promise<FDC3v1.IntentResolution>;
     /**
      * Returns the Channel that the entity is subscribed to. Returns null if not joined to a channel.
      * @returns { Channel | null }
      * @tutorial fdc3.getCurrentChannel
      */
-    getCurrentChannel(): Promise<FDC3.Channel | null>;
+    getCurrentChannel(): Promise<FDC3v1.Channel | null>;
     /**
      * Find out more information about a particular intent by passing its name, and optionally its context.
      * @param { string } intent Name of the Intent
@@ -165,14 +166,14 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @return { Promise<AppIntent> }
      * @tutorial fdc3.findIntent
      */
-    findIntent(intent: string, context?: OpenFin.Context): Promise<FDC3.AppIntent>;
+    findIntent(intent: string, context?: FDC3v1.Context): Promise<FDC3v1.AppIntent>;
     /**
      * Find all the available intents for a particular context.
      * @param { Context } context
      * @return { Promise<Array<AppIntent>> }
      * @tutorial fdc3.findIntentsByContext
      */
-    findIntentsByContext(context: OpenFin.Context): Promise<Array<FDC3.AppIntent>>;
+    findIntentsByContext(context: FDC3v1.Context): Promise<Array<FDC3v1.AppIntent>>;
     /**
      * Finds and raises an intent against a target app based purely on context data.
      * @param { Context } context
@@ -180,20 +181,20 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @return { Promise<IntentResolution> }
      * @tutorial fdc3.raiseIntentForContext
      */
-    raiseIntentForContext(context: OpenFin.Context, app?: FDC3.TargetApp): Promise<FDC3.IntentResolution>;
+    raiseIntentForContext(context: FDC3v1.Context, app?: FDC3v1.TargetApp): Promise<FDC3v1.IntentResolution>;
     /**
      * Returns a Channel object for the specified channel, creating it as an App Channel if it does not exist.
      * @param channelId
      * @returns { Promise<Channel> }
      * @tutorial fdc3.getOrCreateChannel
      */
-    getOrCreateChannel(channelId: string): Promise<FDC3.Channel>;
+    getOrCreateChannel(channelId: string): Promise<FDC3v1.Channel>;
     /**
      * Returns metadata relating to the FDC3 object and its provider, including the supported version of the FDC3 specification and the name of the provider of the implementation.
      * @return { Promise<ImplementationMetadata> }
      * @tutorial fdc3.getInfo
      */
-    getInfo(): FDC3.ImplementationMetadata;
+    getInfo(): FDC3v1.ImplementationMetadata;
     /**
      * Launches an app with target information, which can either be a string or an AppMetadata object.
      * @param { TargetApp } app
@@ -201,7 +202,7 @@ export default class Fdc3Module extends Base implements FDC3.DesktopAgent {
      * @return { Promise<void> }
      * @tutorial fdc3.open
      */
-    open(app: FDC3.TargetApp, context?: OpenFin.Context): Promise<void>;
+    open(app: FDC3v1.TargetApp, context?: FDC3v1.Context): Promise<void>;
     private getCurrentContextGroupInfo;
     private buildChannelObject;
 }

package/src/api/interop/fdc3/fdc3-1.2.js

@@ -143,21 +143,10 @@ class Fdc3Module extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         const channels = await this.fin.me.interop.getContextGroups();
-        const unsupportedChannelApis = {
-            addContextListener: () => {
-                throw new utils_1.UnsupportedChannelApiError('Channel.addContextListener');
-            },
-            broadcast: () => {
-                throw new utils_1.UnsupportedChannelApiError('Channel.broadcast');
-            },
-            getCurrentChannel: () => {
-                throw new utils_1.UnsupportedChannelApiError('Channel.getCurrentChannel');
-            }
-        };
         // fdc3 implementation of getSystemChannels returns on array of channels, have to decorate over
         // this so people know that these APIs are not supported
         return channels.map((channel) => {
-            return { ...channel, type: 'system', ...unsupportedChannelApis };
+            return { ...channel, type: 'system', ...(0, utils_1.getUnsupportedChannelApis)() };
         });
     }
     /**
@@ -329,7 +318,7 @@ class Fdc3Module extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         const sessionContextGroup = await this.fin.me.interop.joinSessionContextGroup(channelId);
-        return utils_1.buildAppChannelObject(sessionContextGroup);
+        return (0, utils_1.buildAppChannelObject)(sessionContextGroup);
     }
     /**
      * Returns metadata relating to the FDC3 object and its provider, including the supported version of the FDC3 specification and the name of the provider of the implementation.
@@ -362,7 +351,7 @@ class Fdc3Module extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         try {
-            return await InteropClient_1.InteropClient.ferryFdc3Call(fin.me.interop, 'fdc3Open', { app, context });
+            return await InteropClient_1.InteropClient.ferryFdc3Call(this.fin.me.interop, 'fdc3Open', { app, context });
         }
         catch (error) {
             const errorToThrow = error.message === utils_2.BROKER_ERRORS.fdc3Open ? 'ResolverUnavailable' : error;