@openfin/core 30.73.20 → 30.73.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "30.73.20",
+    "version": "30.73.22",
     "license": "Apache-2.0",
     "main": "./src/mock.js",
     "types": "./src/mock.d.ts",

package/src/OpenFin.d.ts

@@ -1,17 +1,27 @@
-export declare type Fin<MeType extends EntityType = 'window' | 'view'> = import('./api/fin').FinApi<MeType>;
-export declare type Application = import('./api/application/index').Application;
-export declare type ExternalApplication = import('./api/external-application/index').ExternalApplication;
-export declare type Frame = import('./api/frame/index')._Frame;
-export declare type ChannelClient = import('./api/interappbus/channel/client').default;
-export declare type ChannelProvider = import('./api/interappbus/channel/provider').ChannelProvider;
-export declare type Platform = import('./api/platform/index').Platform;
-export declare type Layout = import('./api/platform/layout/index').Layout;
-export declare type View = import('./api/view/index').View;
-export declare type Window = import('./api/window/index')._Window;
-export declare type WebContent = View | Window;
-export declare type InteropClient = import('./api/interop/index').InteropClient;
-export declare type InteropBroker = import('./api/interop/index').InteropBroker;
-export declare type SnapshotSource = import('./api/snapshot-source/index').SnapshotSource;
+import type { Application } from './api/application';
+import { ApplicationEvents } from './api/events/application';
+import { ExternalApplicationEvents } from './api/events/externalApplication';
+import { FrameEvents } from './api/events/frame';
+import { GlobalHotkeyEvents } from './api/events/globalHotkey';
+import { PlatformEvents } from './api/events/platform';
+import { SystemEvents } from './api/events/system';
+import { ViewEvents } from './api/events/view';
+import { WindowEvents, WindowOptionsChangedEvent } from './api/events/window';
+import type { ExternalApplication } from './api/external-application';
+import { FinApi } from './api/fin';
+import type { _Frame } from './api/frame';
+import type ChannelClient from './api/interappbus/channel/client';
+import { MessagingProtocols } from './api/interappbus/channel/protocols';
+import type { ChannelProvider } from './api/interappbus/channel/provider';
+import type { InteropBroker, InteropClient } from './api/interop';
+import type { Platform } from './api/platform';
+import type { Layout } from './api/platform/layout';
+import { SnapshotSource } from './api/snapshot-source';
+import type { View } from './api/view';
+import { _Window } from './api/window';
+export declare type Fin<MeType extends EntityType = 'window' | 'view'> = FinApi<MeType>;
+export type { Application, ExternalApplication, _Frame as Frame, ChannelClient, ChannelProvider, Platform, Layout, View, _Window as Window, InteropClient, InteropBroker, SnapshotSource };
+export declare type WebContent = View | _Window;
 export declare type ApplicationIdentity = {
     uuid: string;
 };
@@ -419,6 +429,12 @@ export declare type ConstViewOptions = {
     enableBeforeUnload: boolean;
     accelerator?: Partial<Accelerator>;
 };
+export declare type ViewState = ViewCreationOptions & {
+    backgroundThrottling: boolean;
+    componentName: 'view';
+    initialUrl: string;
+    minWidth?: number;
+};
 export declare type Certificate = {
     data: string;
     fingerprint: string;
@@ -655,7 +671,7 @@ export declare type PlatformProvider = {
      * @param { Identity } [identity] If {@link Platform#createWindow Platform.createWindow} was called, the identity of the caller will be here.
      * If `createWindow` was called as part of applying a snapshot or creating a view without a target window, `identity` will be undefined.
      */
-    createWindow(options: PlatformWindowCreationOptions, identity?: Identity): Promise<Window>;
+    createWindow(options: PlatformWindowCreationOptions, identity?: Identity): Promise<_Window>;
     /**
      * Gets the current state of windows and their views and returns a snapshot object containing that info.
      * @param { undefined } payload Undefined unless you've defined a custom `getSnapshot` protocol.
@@ -663,6 +679,14 @@ export declare type PlatformProvider = {
      * @return { Promise<Snapshot> } Snapshot of current platform state.
      */
     getSnapshot(payload: undefined, identity: Identity): Promise<Snapshot>;
+    /**
+     * Gets the current state of a single view and returns an object with the options needed to restore that view as part of a snapshot.
+     * @param { Identity } payload Identity of the view.
+     * @return { Promise<ViewState> }
+     */
+    getViewSnapshot(payload: {
+        viewIdentity: Identity;
+    }): Promise<ViewState>;
     /**
      * Called when a snapshot is being applied and some windows in that snapshot would be fully or partially off-screen.
      * Returns an array of windows with modified positions, such that any off-screen windows are positioned in the top left
@@ -746,7 +770,7 @@ export declare type PlatformProvider = {
      * The new context will be contained as `payload.diff.customContext.newVal`.
      * @return { Promise<HostContextChangedPayload> } The event that it raised.
      */
-    onWindowContextUpdated(payload: import('./api/events/window').WindowOptionsChangedEvent<'window', 'options-changed'>): Promise<HostContextChangedPayload | undefined>;
+    onWindowContextUpdated(payload: WindowOptionsChangedEvent<'window', 'options-changed'>): Promise<HostContextChangedPayload | undefined>;
     /**
      * Closes a Window.
      * By default it will fire any before unload handler set by a View in the Window.
@@ -939,10 +963,42 @@ export declare type RVMInfo = {
     'version': string;
     'working-dir': string;
 };
+export declare type AppVersionProgress = {
+    manifest: string | null;
+    srcManifest: string;
+};
+export declare type AppVersionError = {
+    error: string;
+    srcManifest: string;
+};
+export declare type AppVersionRuntimeInfo = {
+    version: string | null;
+    exists: boolean | null;
+    writeAccess: boolean | null;
+    reachable: boolean | null;
+    healthCheck: boolean | null;
+    error: string | null;
+};
+export declare type AppVersionProgressEvent = {
+    type: 'app-version-progress';
+} & AppVersionProgress;
+export declare type AppVersionErrorEvent = {
+    type: 'app-version-error';
+} & AppVersionError;
+export declare type AppVersionCompleteEvent = {
+    type: 'app-version-complete';
+} & AppVersionProgress;
+export declare type AppVersionRuntimeStatusEvent = {
+    type: 'runtime-status';
+} & AppVersionRuntimeInfo;
+export declare type AppVersionEvents = AppVersionProgressEvent | AppVersionRuntimeStatusEvent | AppVersionCompleteEvent | AppVersionErrorEvent;
+export declare type AppVersionEventNames = AppVersionEvents['type'];
+export declare type LaunchEmitter = import('./api/events/typedEventEmitter').TypedEventEmitter<AppVersionEvents>;
 export declare type RvmLaunchOptions = {
     noUi?: boolean;
     userAppConfigArgs?: object;
     timeToLive?: number;
+    subscribe?: (launch: LaunchEmitter) => void;
 };
 export declare type ShortCutConfig = {
     desktop?: boolean;
@@ -1211,7 +1267,7 @@ export declare type SessionContextGroup = {
         unsubscribe: () => void;
     }>;
 };
-export declare type MessagingProtocols = import('./api/interappbus/channel/protocols/index').MessagingProtocols;
+export type { MessagingProtocols };
 export declare type ChannelCreateOptions = {
     protocols?: MessagingProtocols[];
 };
@@ -1364,7 +1420,7 @@ export interface PopupOptions {
     resultDispatchBehavior?: PopupResultBehavior;
     hideOnClose?: boolean;
     focus?: boolean;
-    onPopupReady?: (popupWindow: Window) => any;
+    onPopupReady?: (popupWindow: _Window) => any;
     onPopupResult?: (payload: PopupResult) => any;
 }
 export declare type PopupInteraction = 'clicked' | 'dismissed';
@@ -1377,14 +1433,7 @@ export interface PopupResult<T = any> {
     data?: T;
     lastDispatchResult?: PopupResult;
 }
-export declare type SystemEvents = import('./api/events/system').SystemEvents;
-export declare type ApplicationEvents = import('./api/events/application').ApplicationEvents;
-export declare type WindowEvents = import('./api/events/window').WindowEvents;
-export declare type ViewEvents = import('./api/events/view').ViewEvents;
-export declare type GlobalHotkeyEvents = import('./api/events/globalHotkey').GlobalHotkeyEvents;
-export declare type FrameEvents = import('./api/events/frame').FrameEvents;
-export declare type PlatformEvents = import('./api/events/platform').PlatformEvents;
-export declare type ExternalApplicationEvents = import('./api/events/externalApplication').ExternalApplicationEvents;
+export type { SystemEvents, ApplicationEvents, WindowEvents, ViewEvents, GlobalHotkeyEvents, FrameEvents, PlatformEvents, ExternalApplicationEvents };
 export declare type ContextMenuOptions = {
     template?: Array<PrebuiltContextMenuItem>;
     enabled?: boolean;
@@ -1401,4 +1450,3 @@ export interface InteropActionLoggingOption {
 }
 export declare type InteropLoggingActions = 'beforeAction' | 'afterAction';
 export declare type InteropLoggingOptions = Record<InteropLoggingActions, InteropActionLoggingOption>;
-export {};

package/src/OpenFin.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const snapshot_source_1 = require("./api/snapshot-source");
+const window_1 = require("./api/window");

package/src/api/events/system.d.ts

@@ -11,13 +11,28 @@ export declare type MonitorEvent<Topic, Type> = OpenFin.MonitorInfo & BaseEvent<
 export interface SessionChangedEvent<Topic, Type> extends BaseEvent<Topic, Type> {
     reason: 'lock' | 'unlock' | 'remote-connect' | 'remote-disconnect' | 'unknown';
 }
-export interface SystemEventMapping<Topic = string, Type = string> extends BaseEventMap {
+export declare type SystemEventMapping<Topic = string, Type = string> = BaseEventMap & {
     'application-created': ApplicationEvent<Topic, Type>;
     'desktop-icon-clicked': ApplicationEvent<Topic, Type>;
     'idle-state-changed': IdleEvent<Topic, Type>;
     'monitor-info-changed': MonitorEvent<Topic, Type>;
     'session-changed': SessionChangedEvent<Topic, Type>;
-}
+};
+export declare type WithId<T extends AppVersionEventNames> = `${T}.${string}`;
+export declare type WithoutId<T extends string> = T extends WithId<infer U> ? U : never;
+declare type AppVersionEventNames = OpenFin.AppVersionEvents['type'];
+declare type IdEventNames = WithId<AppVersionEventNames>;
+export declare type AppVersionTypeFromIdEvent<T extends IdEventNames> = Extract<OpenFin.AppVersionEvents, {
+    type: WithoutId<T>;
+}>;
+export declare type AppVersionEventsWithId = {
+    [key in IdEventNames]: Omit<AppVersionTypeFromIdEvent<key>, 'type'> & {
+        type: key;
+        topic: 'system';
+        appVersionId: string;
+    };
+};
 export declare type SystemEvents = PropagatedWindowEvents<'system'> & PropagatedApplicationEvents<'system'> & PropagatedViewEvents<'system'> & {
     [Type in keyof SystemEventMapping]: SystemEventMapping<'system', Type>[Type];
-};
+} & AppVersionEventsWithId;
+export {};

package/src/api/events/typedEventEmitter.d.ts

@@ -0,0 +1,13 @@
+export declare type Listener<T extends {
+    type: string;
+}> = (payload: T) => void;
+export interface TypedEventEmitter<Events extends {
+    type: string;
+}> {
+    on<Event extends Events>(event: Event['type'], listener: Listener<Event>): this;
+    once<Event extends Events>(event: Event['type'], listener: Listener<Event>): this;
+    addListener<Event extends Events>(event: Event['type'], listener: Listener<Event>): this;
+    removeListener<Event extends Events>(event: Event['type'], listener: Listener<Event>): this;
+    removeAllListeners<Event extends Events>(event?: Event['type']): this;
+    emit<Event extends Events>(event: Event['type'], payload: Event): boolean;
+}

package/src/api/frame/Instance.d.ts

@@ -1,7 +1,7 @@
 import * as OpenFin from '../../OpenFin';
 import { EmitterBase } from '../base';
 import Transport from '../../transport/transport';
-import FrameEvents = OpenFin.FrameEvents;
+declare type FrameEvents = OpenFin.FrameEvents;
 /**
  * @classdesc
  * An iframe represents an embedded HTML page within a parent HTML page. Because this embedded page
@@ -120,3 +120,4 @@ export declare class _Frame extends EmitterBase<FrameEvents> {
      */
     getParentWindow(): Promise<OpenFin.FrameInfo>;
 }
+export {};

package/src/api/global-hotkey/index.d.ts

@@ -1,7 +1,7 @@
 import * as OpenFin from '../../OpenFin';
 import { EmitterBase } from '../base';
 import Transport from '../../transport/transport';
-import GlobalHotkeyEvents = OpenFin.GlobalHotkeyEvents;
+declare type GlobalHotkeyEvents = OpenFin.GlobalHotkeyEvents;
 /**
  * The GlobalHotkey module can register/unregister a global hotkeys.
  * @namespace
@@ -37,3 +37,4 @@ export default class GlobalHotkey extends EmitterBase<GlobalHotkeyEvents> {
      */
     isRegistered(hotkey: string): Promise<boolean>;
 }
+export {};

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

@@ -1,4 +1,5 @@
-import { FDC3, FDC3v2 } from '../../../fdc3';
+import { TargetApp } from './fdc3/shapes/fdc3v1';
+import { AppIdentifier } from './fdc3/shapes/fdc3v2';
 import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 import type Transport from '../../transport/transport';
@@ -358,23 +359,23 @@ export declare class InteropBroker extends Base {
      * @param { ClientIdentity } clientIdentity Identity of the Client making the request.
      */
     fdc3HandleOpen({ app, context }: {
-        app: FDC3.TargetApp | FDC3v2.AppIdentifier;
+        app: TargetApp | AppIdentifier;
         context: OpenFin.Context;
-    }, clientIdentity: OpenFin.ClientIdentity): Promise<void | FDC3v2.AppIdentifier>;
+    }, clientIdentity: OpenFin.ClientIdentity): Promise<void | AppIdentifier>;
     /**
      * Responsible for resolving the fdc3.findInstances call.
      * Must be overridden
      * @param { AppIdentifier(2) }  app AppIdentifier that was passed to fdc3.findInstances
      * @param { ClientIdentity } clientIdentity Identity of the Client making the request.
      */
-    fdc3HandleFindInstances(app: FDC3v2.AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
+    fdc3HandleFindInstances(app: AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
     /**
      * Responsible for resolving the fdc3.getAppMetadata call.
      * Must be overridden
      * @param { AppIdentifier(2) } app AppIdentifier that was passed to fdc3.getAppMetadata
      * @param { ClientIdentity } clientIdentity Identity of the Client making the request.
      */
-    fdc3HandleGetAppMetadata(app: FDC3v2.AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
+    fdc3HandleGetAppMetadata(app: AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
     /**
      * This function is called by the Interop Broker whenever a Context handler would fire.
      * For FDC3 2.0 you would need to override this function and add the contextMetadata as

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

@@ -1,19 +1,19 @@
-import { FDC3v2 } from '../../../../fdc3';
 import * 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/fdc3-1.2.d.ts

@@ -1,5 +1,4 @@
-import { FDC3 } from '../../../../fdc3';
-import * as OpenFin from '../../../OpenFin';
+import * as FDC3v1 from './shapes/fdc3v1';
 import { Base } from '../../base';
 /**
  * @typedef { object } Listener
@@ -90,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.
@@ -99,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.
@@ -107,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.
@@ -143,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.
@@ -153,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
@@ -167,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
@@ -182,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
@@ -203,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-2.0.d.ts

@@ -1,5 +1,5 @@
-import { FDC3, FDC3v2 } from '../../../../fdc3';
-import * as OpenFin from '../../../OpenFin';
+import * as FDC3v1 from './shapes/fdc3v1';
+import * as FDC3v2 from './shapes/fdc3v2';
 import { Base } from '../../base';
 import Transport from '../../../transport/transport';
 /**
@@ -166,19 +166,19 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * @returns { Promise<AppIdentifier> }
      * @tutorial fdc3.open
      */
-    open(app: FDC3v2.AppIdentifier | FDC3.TargetApp, context?: OpenFin.Context): Promise<FDC3v2.AppIdentifier>;
+    open(app: FDC3v2.AppIdentifier | FDC3v1.TargetApp, context?: FDC3v2.Context): Promise<FDC3v2.AppIdentifier>;
     /**
      * Find all the available instances for a particular application.
      * @param { AppIdentifier } app
      * @returns { Promise<Array<AppIdentifier>> }
-     * @tutorial fdc3v2.findInstances
+     * @tutorial findInstances
      */
     findInstances(app: FDC3v2.AppIdentifier): Promise<Array<FDC3v2.AppIdentifier>>;
     /**
      * Retrieves the AppMetadata for an AppIdentifier, which provides additional metadata (such as icons, a title and description) from the App Directory record for the application, that may be used for display purposes.
      * @param { AppIdentifier } app
      * @returns { Promise<AppMetadata(2)> }
-     * @tutorial fdc3v2.getAppMetadata
+     * @tutorial getAppMetadata
      */
     getAppMetadata(app: FDC3v2.AppIdentifier): Promise<FDC3v2.AppMetadata>;
     /**
@@ -187,7 +187,7 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * @returns { Promise<void> }
      * @tutorial fdc3.broadcast
      */
-    broadcast(context: OpenFin.Context): Promise<void>;
+    broadcast(context: FDC3v2.Context): Promise<void>;
     /**
      * 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
@@ -195,7 +195,7 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * @returns { Listener }
      * @tutorial fdc3.addContextListener
      */
-    addContextListener(contextType: string | null, handler: FDC3v2.ContextHandler): Promise<FDC3.Listener>;
+    addContextListener(contextType: string | null, handler: FDC3v2.ContextHandler): Promise<FDC3v2.Listener>;
     /**
      * Find out more information about a particular intent by passing its name, and optionally its context and resultType.
      * @param { string } intent Name of the Intent
@@ -204,32 +204,32 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * @returns { Promise<AppIntent(2)> }
      * @tutorial fdc3.findIntent
      */
-    findIntent(intent: string, context?: OpenFin.Context, resultType?: string): Promise<FDC3v2.AppIntent>;
+    findIntent(intent: string, context?: FDC3v2.Context, resultType?: string): Promise<FDC3v2.AppIntent>;
     /**
      * Find all the available intents for a particular context.
      * @param { Context } context
      * @param { string } [resultType] The type of result returned for any intent specified during resolution.
      * @returns { Promise<Array<AppIntent(2)>> }
-     * @tutorial fdc3v2.findIntentsByContext
+     * @tutorial findIntentsByContext
      */
-    findIntentsByContext(context: OpenFin.Context, resultType?: string): Promise<Array<FDC3v2.AppIntent>>;
+    findIntentsByContext(context: FDC3v2.Context, resultType?: string): Promise<Array<FDC3v2.AppIntent>>;
     /**
      * Raises a specific intent for resolution against apps registered with the desktop agent.
      * @param { string } intent Name of the Intent
      * @param { Context } context Context associated with the Intent
      * @param { AppIdentifier | TargetApp } [app]
      * @returns { Promise<IntentResolution(2)> }
-     * @tutorial fdc3v2.raiseIntent
+     * @tutorial raiseIntent
      */
-    raiseIntent(intent: string, context: OpenFin.Context, app?: FDC3v2.AppIdentifier | FDC3.TargetApp): Promise<FDC3v2.IntentResolution>;
+    raiseIntent(intent: string, context: FDC3v2.Context, app?: FDC3v2.AppIdentifier | FDC3v1.TargetApp): Promise<FDC3v2.IntentResolution>;
     /**
      * Finds and raises an intent against apps registered with the desktop agent based purely on the type of the context data.
      * @param { Context } context Context associated with the Intent
      * @param { AppIdentifier | TargetApp } [app]
      * @returns { Promise<IntentResolution(2)> }
-     * @tutorial fdc3v2.raiseIntentForContext
+     * @tutorial raiseIntentForContext
      */
-    raiseIntentForContext(context: OpenFin.Context, app?: FDC3v2.AppIdentifier | FDC3.TargetApp): Promise<FDC3v2.IntentResolution>;
+    raiseIntentForContext(context: FDC3v2.Context, app?: FDC3v2.AppIdentifier | FDC3v1.TargetApp): Promise<FDC3v2.IntentResolution>;
     /**
      * Adds a listener for incoming intents.
      * @param { string } intent  Name of the Intent
@@ -237,38 +237,38 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * @returns { Promise<Listener> }
      * @tutorial fdc3.addIntentListener
      */
-    addIntentListener(intent: string, handler: FDC3v2.IntentHandler): Promise<FDC3.Listener>;
+    addIntentListener(intent: string, handler: FDC3v2.IntentHandler): Promise<FDC3v1.Listener>;
     /**
      * 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 a Channel with an auto-generated identity that is intended for private communication between applications. Primarily used to create channels that will be returned to other applications via an IntentResolution for a raised intent.
      * @returns { Promise<PrivateChannel> }
-     * @tutorial fdc3v2.createPrivateChannel
+     * @tutorial createPrivateChannel
      */
     createPrivateChannel(): Promise<FDC3v2.PrivateChannel>;
     /**
      * Retrieves a list of the User Channels available for the app to join.
      * @returns { Promise<Channel[]>}
-     * @tutorial fdc3v2.getUserChannels
+     * @tutorial getUserChannels
      */
-    getUserChannels(): Promise<Array<OpenFin.ContextGroupInfo>>;
+    getUserChannels(): Promise<Array<FDC3v1.SystemChannel>>;
     /**
      * Retrieves a list of the User Channels available for the app to join.
      * @returns { Promise<Channel[]>}
      * @deprecated Please use {@link fdc3.getUserChannels fdc3.getUserChannels} instead
      * @tutorial fdc3.getSystemChannels
      */
-    getSystemChannels(): Promise<Array<OpenFin.ContextGroupInfo>>;
+    getSystemChannels(): Promise<Array<FDC3v1.SystemChannel>>;
     /**
      * Join an app to a specified User channel.
      * @param { string } channelId Channel name
      * @returns { Promise<void> }
-     * @tutorial fdc3v2.joinUserChannel
+     * @tutorial joinUserChannel
      */
     joinUserChannel(channelId: string): Promise<void>;
     /**
@@ -283,7 +283,7 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * Returns the Channel object for the current User channel membership
      * @returns { Promise<FDC3.Channel | null> }
      */
-    getCurrentChannel(): Promise<FDC3.Channel | null>;
+    getCurrentChannel(): Promise<FDC3v1.Channel | null>;
     /**
      * Removes the app from any User channel membership.
      * @returns { Promise<void> }
@@ -294,7 +294,7 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * Retrieves information about the FDC3 implementation, including the supported version of the FDC3 specification, the name of the provider of the implementation, its own version number, details of whether optional API features are implemented and the metadata of the calling application according to the desktop agent.
      * fdc3HandleGetInfo must be overridden in the InteropBroker so that the ImplementationMetadata will have the appMetadata info.
      * @returns { Promise<ImplementationMetadata(2)> }
-     * @tutorial fdc3v2.getInfo
+     * @tutorial getInfo
      */
     getInfo(): Promise<FDC3v2.ImplementationMetadata>;
 }