@openfin/core 35.78.1 → 35.78.5

package/out/mock.d.ts

@@ -64,7 +64,7 @@ declare type AddViewToStackOptions = {
  * Generated when an alert is fired and suppressed due to the customWindowAlert flag being true.
  * @interface
  */
-declare type AlertRequestedEvent = BaseWindowEvent & {
+declare type AlertRequestedEvent = BaseEvent_5 & {
     type: 'alert-requested';
     message: string;
     url: string;
@@ -105,6 +105,15 @@ declare type ApiClient<T extends Record<any, any>> = {
     [key in keyof PickOfType<T, Function>]: (...args: Parameters<T[key]>) => ReturnType<T[key]> extends Promise<any> ? ReturnType<T[key]> : Promise<ReturnType<T[key]>>;
 };
 
+/**
+ * Generated when a new Platform's API becomes responsive.
+ * @interface
+ */
+declare type ApiReadyEvent = BaseEvent & {
+    topic: 'application';
+    type: 'platform-api-ready';
+};
+
 /**
  * @interface
  */
@@ -862,19 +871,15 @@ declare class Application extends EmitterBase<OpenFin_2.ApplicationEvent> {
 }
 
 /**
- * Generated when an application has authenticated and is connected.
- * @interface
+ * @deprecated Renamed to {@link ConnectedEvent}.
  */
-declare type ApplicationConnectedEvent = IdentityEvent & {
-    topic: 'application';
-    type: 'connected';
-};
+declare type ApplicationConnectedEvent = ConnectedEvent_2;
 
 /**
  * Generated when an application is created.
  * @interface
  */
-declare type ApplicationCreatedEvent = BaseSystemEvent & IdentityEvent & {
+declare type ApplicationCreatedEvent = BaseEvent_8 & BaseEvents.IdentityEvent & {
     type: 'application-created';
 };
 
@@ -898,17 +903,15 @@ declare type ApplicationCreationOptions = Partial<ApplicationOptions> & {
 };
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by an {@link Application}.  Events are
- *  discriminated by {@link ApplicationEvent.type | their type}.  Event payloads unique to `Application` can be found
- *  under the {@link OpenFin.ApplicationEvents} namespace (payloads inherited from propagated events are defined in the namespace
- *  from which they propagate).
+ * @deprecated Renamed to {@link Event}.
  */
-declare type ApplicationEvent = PropagatedViewEvent<'application'> | PropagatedWindowEvent<'application'> | ApplicationWindowEvent | ApplicationSourcedEvent;
+declare type ApplicationEvent = Event_3;
 
 declare type ApplicationEvent_2 = Events.ApplicationEvents.ApplicationEvent;
 
 declare namespace ApplicationEvents {
     export {
+        BaseEvent_3 as BaseEvent,
         BaseApplicationEvent,
         CrashedEvent,
         FileDownloadLocationChangedEvent,
@@ -922,6 +925,7 @@ declare namespace ApplicationEvents {
         WindowStartLoadEvent,
         ApplicationWindowEvent,
         ClosedEvent,
+        ConnectedEvent_2 as ConnectedEvent,
         ApplicationConnectedEvent,
         InitializedEvent,
         ManifestChangedEvent,
@@ -929,19 +933,23 @@ declare namespace ApplicationEvents {
         RespondingEvent,
         StartedEvent,
         ApplicationSourcedEvent,
+        Event_3 as Event,
         ApplicationEvent,
+        EventType_3 as EventType,
         ApplicationEventType,
+        PropagatedEvent_4 as PropagatedEvent,
         PropagatedApplicationEvent,
+        PropagatedEventType_3 as PropagatedEventType,
         PropagatedApplicationEventType,
-        Payload_2 as Payload,
-        ByType
+        Payload_4 as Payload,
+        ByType_3 as ByType
     }
 }
 
 /**
- * Union of possible `type` values for a {@link OpenFin.ApplicationEvents.ApplicationEvent}.
+ * @deprecated Renamed to {@link EventType}.
  */
-declare type ApplicationEventType = ApplicationEvent['type'];
+declare type ApplicationEventType = EventType_3;
 
 declare type ApplicationIdentity = OpenFin_2.ApplicationIdentity;
 
@@ -1294,9 +1302,8 @@ declare type ApplicationPermissions = {
  * A union of all events that emit natively on the `Application` topic, i.e. excluding those that propagate
  * from {@link OpenFin.ViewEvents} or {@link OpenFin.WindowEvents}.  Due to details in propagation prefixing rules,
  * does not include {@link ApplicationWindowEvent Application events that are tied to Windows but do not propagate from them}.
- *
  */
-declare type ApplicationSourcedEvent = ClosedEvent | ApplicationConnectedEvent | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent_2 | StartedEvent | TrayIconClickedEvent | FileDownloadLocationChangedEvent;
+declare type ApplicationSourcedEvent = ClosedEvent | ConnectedEvent_2 | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent_2 | StartedEvent | TrayIconClickedEvent | FileDownloadLocationChangedEvent;
 
 declare type ApplicationState = OpenFin_2.ApplicationState;
 
@@ -1612,7 +1619,7 @@ declare interface AuthorizationPayload {
  * ```
  * @interface
  */
-declare type AuthRequestedEvent = BaseWindowEvent & {
+declare type AuthRequestedEvent = BaseEvent_5 & {
     type: 'auth-requested';
     authInfo: {
         host: string;
@@ -1680,21 +1687,9 @@ declare class Base {
 }
 
 /**
- * Base type for events emitting on the `application` topic
- * @interface
+ * @deprecated Renamed to {@link BaseEvent}.
  */
-declare type BaseApplicationEvent = NamedEvent & {
-    topic: `application`;
-};
-
-/**
- * A base Channel event.
- * @interface
- */
-declare type BaseChannelEvent = NamedEvent & {
-    channelName: string;
-    channelId: string;
-};
+declare type BaseApplicationEvent = BaseEvent_3;
 
 /**
  * @interface
@@ -1763,10 +1758,70 @@ declare type BaseEvent = {
     type: string;
 };
 
-declare type BaseEvent_2 = Events.BaseEvents.BaseEvent;
+/**
+ * A base Channel event.
+ * @interface
+ */
+declare type BaseEvent_2 = NamedEvent & {
+    channelName: string;
+    channelId: string;
+};
+
+/**
+ * Base type for events emitting on the `application` topic
+ * @interface
+ */
+declare type BaseEvent_3 = BaseEvents.NamedEvent & {
+    topic: `application`;
+};
+
+/**
+ * Base type for events emitting on the `view` topic
+ * @interface
+ */
+declare type BaseEvent_4 = BaseEvents.NamedEvent & {
+    topic: 'view';
+    target: OpenFin_2.Identity;
+};
+
+/**
+ * Base type for events emitting on the `window` topic
+ * @interface
+ */
+declare type BaseEvent_5 = BaseEvents.NamedEvent & {
+    topic: 'window';
+};
+
+/**
+ * Base type for events emitting on the `externalapplication` topic
+ * @interface
+ */
+declare type BaseEvent_6 = BaseEvents.BaseEvent & {
+    topic: 'externalapplication';
+};
+
+/**
+ * The base frame event.
+ * @interface
+ */
+declare type BaseEvent_7 = NamedEvent & {
+    entityType: 'iframe';
+    frameName: string;
+};
+
+/**
+ * Base type for events emitting on the `system` topic
+ * @interface
+ */
+declare type BaseEvent_8 = BaseEvents.BaseEvent & {
+    topic: 'system';
+};
+
+declare type BaseEvent_9 = Events.BaseEvents.BaseEvent;
 
 declare namespace BaseEvents {
     export {
+        NotCloseRequested,
         PropagatedEventType,
         PropagatedEvent,
         EventHandler,
@@ -1777,21 +1832,14 @@ declare namespace BaseEvents {
 }
 
 /**
- * Base type for events emitting on the `externalapplication` topic
- * @interface
+ * @deprecated Renamed to {@link BaseEvent}.
  */
-declare type BaseExternalApplicationEvent = BaseEvent & {
-    topic: 'externalapplication';
-};
+declare type BaseExternalApplicationEvent = BaseEvent_6;
 
 /**
- * The base frame event.
- * @interface
+ * @deprecated Renamed to {@link BaseEvent}.
  */
-declare type BaseFrameEvent = NamedEvent & {
-    entityType: 'iframe';
-    frameName: string;
-};
+declare type BaseFrameEvent = BaseEvent_7;
 
 declare type BaseLoadFailedEvent = NamedEvent & {
     errorCode: number;
@@ -1800,35 +1848,20 @@ declare type BaseLoadFailedEvent = NamedEvent & {
     isMainFrame: boolean;
 };
 
-/**
- * Base type for events emitting on the `system` topic
- * @interface
- */
-declare type BaseSystemEvent = BaseEvent & {
-    topic: 'system';
-};
-
 declare type BaseUrlEvent = NamedEvent & {
     type: 'url-changed';
     url: string;
 };
 
 /**
- * Base type for events emitting on the `view` topic
- * @interface
+ * @deprecated Renamed to {@link BaseEvent}.
  */
-declare type BaseViewEvent = NamedEvent & {
-    topic: 'view';
-    target: OpenFin_2.Identity;
-};
+declare type BaseViewEvent = BaseEvent_4;
 
 /**
- * Base type for events emitting on the `window` topic
- * @interface
+ * @deprecated Renamed to {@link BaseEvent}.
  */
-declare type BaseWindowEvent = NamedEvent & {
-    topic: 'window';
-};
+declare type BaseWindowEvent = BaseEvent_5;
 
 /**
  * User decision of whether a Window or specific View should close when trying to prevent an unload.
@@ -1895,7 +1928,7 @@ declare type BoundsChangedEvent = BoundsChangeEvent & {
  * A general bounds change event without event type.
  * @interface
  */
-declare type BoundsChangeEvent = BaseWindowEvent & {
+declare type BoundsChangeEvent = BaseEvent_5 & {
     changeType: 0 | 1 | 2;
     deferred: boolean;
     height: number;
@@ -1967,76 +2000,76 @@ declare interface BrowserWindow {
 }
 
 /**
- * Extracts a single event type matching the given key from the {@link ApplicationEvent} union.
+ * Extracts a single event type matching the given key from the View {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType<Type extends ApplicationEventType> = Payload_2<Type>;
+declare type ByType<Type extends EventType> = Payload_2<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link ExternalApplicationEvent} union.
+ * Extracts a single event type matching the given key from the Window {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_2<Type extends ExternalApplicationEventType> = Payload_3<Type>;
+declare type ByType_2<Type extends EventType_2> = Payload_3<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link FrameEvent} union.
+ * Extracts a single event type matching the given key from the Application {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_3<Type extends FrameEventType> = Payload_4<Type>;
+declare type ByType_3<Type extends EventType_3> = Payload_4<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link GlobalHotkeyEvent} union.
+ * Extracts a single event type matching the given key from the ExternalApplication {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_4<Type extends GlobalHotkeyEventType> = Payload_5<Type>;
+declare type ByType_4<Type extends EventType_4> = Payload_5<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link PlatformEvent} union.
+ * Extracts a single event type matching the given key from the Frame {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_5<Type extends PlatformEventType> = Payload_6<Type>;
+declare type ByType_5<Type extends EventType_5> = Payload_6<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link SystemEvent} union.
+ * Extracts a single event type matching the given key from the GlobalHotkey {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_6<Type extends SystemEventType> = Payload_7<Type>;
+declare type ByType_6<Type extends EventType_6> = Payload_7<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link ViewEvent} union.
+ * Extracts a single event type matching the given key from the Platform {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_7<Type extends ViewEventType> = Payload_8<Type>;
+declare type ByType_7<Type extends EventType_7> = Payload_8<Type>;
 
 /**
- * Extracts a single event type matching the given key from the {@link WindowEvent} union.
+ * Extracts a single event type matching the given key from the System {@link Event} union.
  *
  * Alias for {@link Payload}, which may read better in source.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type ByType_8<Type extends WindowEventType> = Payload_9<Type>;
+declare type ByType_8<Type extends EventType_8> = Payload_9<Type>;
 
 /**
  * Configuration for page capture.
@@ -2719,14 +2752,6 @@ declare type ChannelClientConnectionListener = (identity: ClientIdentity, connec
 
 declare type ChannelClientDisconnectionListener = (identity: ClientIdentity) => any;
 
-/**
- * Generated when a Channel client is connected.
- * @interface
- */
-declare type ChannelConnectedEvent = BaseChannelEvent & {
-    type: 'connected';
-};
-
 /**
  * Options provided on a client connection to a channel.
  *
@@ -2758,21 +2783,9 @@ declare type ChannelCreateOptions = {
 };
 
 /**
- * Generated when a Channel client has disconnected.
- * @interface
+ * @deprecated Renamed to {@link Event}.
  */
-declare type ChannelDisconnectedEvent = BaseChannelEvent & {
-    type: 'disconnected';
-};
-
-/**
- * [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Channel}.  Events are
- * discriminated by {@link ChannelEvent.type | their type}.  Event payloads unique to `Channel` can be found
- * under the {@link OpenFin.ChannelEvents} namespace.
- */
-declare type ChannelEvent = {
-    topic: 'channel';
-} & (ChannelConnectedEvent | ChannelDisconnectedEvent);
+declare type ChannelEvent = Event_2;
 
 declare type ChannelMiddleware = OpenFin_2.ChannelMiddleware;
 
@@ -3310,11 +3323,19 @@ declare type ClipboardSelectionType = 'clipboard' | 'selection';
  * Generated when an application is closed.
  * @interface
  */
-declare type ClosedEvent = IdentityEvent & {
+declare type ClosedEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'closed';
 };
 
+/**
+ * Generated when a window has closed.
+ * @interface
+ */
+declare type ClosedEvent_2 = BaseEvent_5 & {
+    type: 'closed';
+};
+
 /**
  * @interface
  */
@@ -3322,6 +3343,15 @@ declare type ClosedMenuResult = {
     result: 'closed';
 };
 
+/**
+ * Generated when a window has been prevented from closing.
+ * @remarks A window will be prevented from closing by default, either through the API or by a user when ‘close-requested’ has been subscribed to and the Window.close(force) flag is false.
+ * @interface
+ */
+declare type CloseRequestedEvent = BaseEvent_5 & {
+    type: 'close-requested';
+};
+
 /**
  * @interface
  */
@@ -3368,6 +3398,14 @@ declare interface CloseWindowPayload {
     };
 }
 
+/**
+ * Generated when a window has initiated the closing routine.
+ * @interface
+ */
+declare type ClosingEvent = BaseEvent_5 & {
+    type: 'closing';
+};
+
 /**
  * A ColumnOrRow is used to manage the state of Column and Rows within an OpenFin Layout.
  */
@@ -3501,6 +3539,39 @@ declare type ConfigWithUuid = BaseConfig & {
     uuid: string;
 };
 
+/**
+ * Generated when a Channel client is connected.
+ * @interface
+ */
+declare type ConnectedEvent = BaseEvent_2 & {
+    type: 'connected';
+};
+
+/**
+ * Generated when an application has authenticated and is connected.
+ * @interface
+ */
+declare type ConnectedEvent_2 = BaseEvents.IdentityEvent & {
+    topic: 'application';
+    type: 'connected';
+};
+
+/**
+ * Generated when an external application has authenticated and is connected.
+ * @interface
+ */
+declare type ConnectedEvent_3 = BaseExternalApplicationEvent & {
+    type: 'connected';
+};
+
+/**
+ * Generated when a frame is connected.
+ * @interface
+ */
+declare type ConnectedEvent_4 = BaseFrameEvent & {
+    type: 'connected';
+};
+
 declare type Constructor<T = {}> = new () => T;
 
 declare type ConstructorOverride<T> = (Base: Constructor<T>) => Constructor<T>;
@@ -4242,7 +4313,7 @@ declare type Context_3 = {
  * Generated when a window's context is updated via {@link Platform#setWindowContext Platform.setWindowContext}. Only available on windows in a Platform.
  * @interface
  */
-declare type ContextChangedEvent = BaseWindowEvent & {
+declare type ContextChangedEvent = BaseEvent_5 & {
     type: 'context-changed';
     context: any;
 };
@@ -4394,7 +4465,7 @@ declare type CpuInfo = {
  * Generated when an application has crashed.
  * @interface
  */
-declare type CrashedEvent = IdentityEvent & {
+declare type CrashedEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'crashed';
     reason: 'normal-termination' | 'abnormal-termination' | 'killed' | 'crashed' | 'still-running' | 'launch-failed' | 'out-of-memory' | 'integrity-failure';
@@ -4445,7 +4516,7 @@ declare type CrashReporterState = CrashReporterOptions & {
  * Generated when a View is created.
  * @interface
  */
-declare type CreatedEvent = BaseViewEvent & {
+declare type CreatedEvent = BaseEvent_4 & {
     type: 'created';
 };
 
@@ -4604,7 +4675,7 @@ declare interface DesktopAgent_2 {
  * Generated when the desktop icon is clicked while it's already running.
  * @interface
  */
-declare type DesktopIconClickedEvent = BaseSystemEvent & {
+declare type DesktopIconClickedEvent = BaseEvent_8 & {
     type: 'desktop-icon-clicked';
 };
 
@@ -4612,7 +4683,7 @@ declare type DesktopIconClickedEvent = BaseSystemEvent & {
  * Generated when a View is destroyed.
  * @interface
  */
-declare type DestroyedEvent = BaseViewEvent & {
+declare type DestroyedEvent = BaseEvent_4 & {
     type: 'destroyed';
 };
 
@@ -4712,6 +4783,30 @@ declare type DisabledMovementBoundsChangingEvent = BoundsChangeEvent & {
     type: 'disabled-movement-bounds-changing';
 };
 
+/**
+ * Generated when a Channel client has disconnected.
+ * @interface
+ */
+declare type DisconnectedEvent = BaseEvent_2 & {
+    type: 'disconnected';
+};
+
+/**
+ * Generated when an external application has disconnected.
+ * @interface
+ */
+declare type DisconnectedEvent_2 = BaseExternalApplicationEvent & {
+    type: 'disconnected';
+};
+
+/**
+ * Generated when a frame has disconnected.
+ * @interface
+ */
+declare type DisconnectedEvent_3 = BaseFrameEvent & {
+    type: 'disconnected';
+};
+
 /**
  * A system channel will be global enough to have a presence across many apps. This gives us some hints
  * to render them in a standard way. It is assumed it may have other properties too, but if it has these,
@@ -4845,7 +4940,7 @@ declare type DownloadShelfOptions = {
  *
  * @interface
  */
-declare type DownloadShelfVisibilityChangedEvent = BaseWindowEvent & {
+declare type DownloadShelfVisibilityChangedEvent = BaseEvent_5 & {
     type: 'download-shelf-visibility-changed';
     /**
      * True if the download shelf was just opened; false if it was just closed.
@@ -4875,7 +4970,7 @@ declare interface DragSource {}
  * Generated when a window has been embedded.
  * @interface
  */
-declare type EmbeddedEvent = BaseWindowEvent & {
+declare type EmbeddedEvent = BaseEvent_5 & {
     type: 'embedded';
 };
 
@@ -4979,7 +5074,7 @@ declare class EmitterMap {
  * Generated when a window ends loading.
  * @interface
  */
-declare type EndLoadEvent = BaseWindowEvent & {
+declare type EndLoadEvent = BaseEvent_5 & {
     type: 'end-load';
     documentName: string;
     isMain: boolean;
@@ -5096,6 +5191,88 @@ declare type ErrorPlainObject = {
     toString(): string;
 };
 
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Platform}.  Events are
+ *  discriminated by {@link Event.type | their type}.  Event payloads unique to `Platform` can be found
+ *  under the {@link OpenFin.PlatformEvents} namespace.
+ */
+declare type Event_10 = ApplicationEvents.Event | ApiReadyEvent | SnapshotAppliedEvent;
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link System}.  Events are
+ *  discriminated by {@link SystemEvent.type | their type}.  Event payloads unique to `System` can be found
+ *  under the {@link OpenFin.SystemEvents} namespace (payloads inherited from propagated events are defined in the namespace
+ *  from which they propagate).
+ */
+declare type Event_11 = ExcludeRequested<WindowEvents.PropagatedEvent<'system'>> | ExcludeRequested<ViewEvents.PropagatedEvent<'system'>> | ExcludeRequested<ApplicationEvents.PropagatedEvent<'system'>> | ApplicationCreatedEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent | AppVersionEventWithId | SystemShutdownEvent;
+
+/**
+ * [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Channel}.  Events are
+ * discriminated by {@link Event.type | their type}.  Event payloads unique to `Channel` can be found
+ * under the {@link OpenFin.ChannelEvents} namespace.
+ */
+declare type Event_2 = {
+    topic: 'channel';
+} & (ConnectedEvent | DisconnectedEvent);
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by an {@link Application}.  Events are
+ *  discriminated by {@link Event.type | their type}.  Event payloads unique to `Application` can be found
+ *  under the {@link OpenFin.ApplicationEvents} namespace (payloads inherited from propagated events are defined in the namespace
+ *  from which they propagate).
+ */
+declare type Event_3 = ViewEvents.PropagatedEvent<'application'> | WindowEvents.PropagatedEvent<'application'> | ApplicationWindowEvent | ApplicationSourcedEvent;
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link View}.  Events are
+ *  discriminated by {@link Event.type | their type}.  Event payloads unique to `View` can be found
+ *  under the {@link OpenFin.ViewEvents} namespace (except for {@link OpenFin.WebContentsEvents | those shared with other WebContents}).
+ */
+declare type Event_4 = (WebContentsEvents.Event<'view'> & {
+    target: OpenFin_2.Identity;
+}) | CreatedEvent | DestroyedEvent | HiddenEvent | HotkeyEvent | ShownEvent | TargetChangedEvent | HostContextChangedEvent;
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing events shared by all WebContents elements
+ *  (i.e. {@link OpenFin.Window} or {@link OpenFin.View}).
+ */
+declare type Event_5<Topic extends string> = {
+    topic: Topic;
+} & (BlurredEvent | CertificateSelectionShownEvent | CrashedEvent_2 | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | PageFaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent | ChildWindowCreatedEvent | FileDownloadStartedEvent | FileDownloadProgressEvent | FileDownloadCompletedEvent | FoundInPageEvent | CertificateErrorEvent);
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Window}.  Events are
+ *  discriminated by {@link Event.type | their type}.  Event payloads unique to `Window` can be found
+ *  under the {@link OpenFin.WindowEvents} namespace (except for {@link OpenFin.WebContentsEvents | those shared with other WebContents}).
+ */
+declare type Event_6 = WindowSourcedEvent | WindowViewEvent | ViewEvents.PropagatedEvent<'window'>;
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by an {@link ExternalApplication}.  Events are
+ *  discriminated by {@link ExternalApplicationEvent.type | their type}.  Event payloads unique to `ExternalApplication` can be found
+ *  under the {@link OpenFin.ExternalApplicationEvents} namespace.
+ */
+declare type Event_7 = ConnectedEvent_3 | DisconnectedEvent_2;
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link _Frame}.  Events are
+ *  discriminated by {@link _Frame.type | their type}.  Event payloads unique to `Frame` can be found
+ *  under the {@link OpenFin.FrameEvents} namespace.
+ */
+declare type Event_8 = {
+    topic: 'frame';
+} & (ConnectedEvent_4 | DisconnectedEvent_3);
+
+/**
+ *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by {@link GlobalHotkey}.  Events are
+ *  discriminated by {@link Event.type | their type}.  Event payloads unique to `GlobalHotkey` can be found
+ *  under the {@link OpenFin.GlobalHotkeyEvents} namespace.
+ */
+declare type Event_9 = {
+    topic: 'global-hotkey';
+    hotkey: 'string';
+} & (RegisteredEvent | UnregisteredEvent);
+
 declare class EventAggregator extends EmitterMap {
     dispatchEvent: (message: Message<any>) => boolean;
 }
@@ -5138,28 +5315,68 @@ declare interface EventEmitter_2 {
 }
 
 /**
- * Handler for an event on an EventEmitter.
- * @remarks Selects the correct type for the event
- * payload from the provided union based on the provided string literal type.
+ * Handler for an event on an EventEmitter.
+ * @remarks Selects the correct type for the event
+ * payload from the provided union based on the provided string literal type.
+ */
+declare type EventHandler<EmitterEvent extends BaseEvent, EventType extends string> = (payload: Extract<EmitterEvent, {
+    type: EventType;
+}>, ...args: any[]) => void;
+
+declare namespace Events {
+    export {
+        ApplicationEvents,
+        BaseEvents,
+        ExternalApplicationEvents,
+        FrameEvents,
+        GlobalHotkeyEvents,
+        PlatformEvents,
+        SystemEvents,
+        ViewEvents,
+        WebContentsEvents,
+        WindowEvents
+    }
+}
+
+/**
+ * Union of possible `type` values for a view {@link Event}.
+ */
+declare type EventType = Event_4['type'];
+
+/**
+ * Union of possible `type` values for a Window {@link Event}.
+ */
+declare type EventType_2 = Event_6['type'];
+
+/**
+ * Union of possible `type` values for an Application {@link Event}.
+ */
+declare type EventType_3 = Event_3['type'];
+
+/**
+ * Union of possible `type` values for an ExternalApplication {@link Event}.
+ */
+declare type EventType_4 = Event_7['type'];
+
+/**
+ *  Union of possible `type` values for a {@link FrameEvent}.
+ */
+declare type EventType_5 = Event_8['type'];
+
+/**
+ * Union of possible `type` values for a {@link GlobalHotkeyEvent}
+ */
+declare type EventType_6 = Event_9['type'];
+
+/**
+ * Union of possible `type` values for a {@link PlatformEvent}.
+ */
+declare type EventType_7 = Event_10['type'];
+
+/**
+ * Union of possible `type` values for a {@link SystemEvent}.
  */
-declare type EventHandler<EmitterEvent extends BaseEvent, EventType extends string> = (payload: Extract<EmitterEvent, {
-    type: EventType;
-}>, ...args: any[]) => void;
-
-declare namespace Events {
-    export {
-        ApplicationEvents,
-        BaseEvents,
-        ExternalApplicationEvents,
-        FrameEvents,
-        GlobalHotkeyEvents,
-        PlatformEvents,
-        SystemEvents,
-        ViewEvents,
-        WebContentsEvents,
-        WindowEvents
-    }
-}
+declare type EventType_8 = SystemEvent['type'];
 
 /**
  * @internal
@@ -5174,6 +5391,8 @@ declare type EventWithId<Event extends AppVersionEvent> = Event extends infer E
 
 /**
  * @internal
+ *
+ * Ensures that an event payload type does not include any `-requested` events.  Distributes over unions.
  */
 declare type ExcludeRequested<Event extends {
     type: string;
@@ -5303,46 +5522,43 @@ declare class ExternalApplication extends EmitterBase<OpenFin_2.ExternalApplicat
 }
 
 /**
- * Generated when an external application has authenticated and is connected.
- * @interface
+ * @deprecated Renamed to {@link ConnectedEvent}.
  */
-declare type ExternalApplicationConnectedEvent = BaseExternalApplicationEvent & {
-    type: 'connected';
-};
+declare type ExternalApplicationConnectedEvent = ConnectedEvent_3;
 
 /**
- * Generated when an external application has disconnected.
- * @interface
+ * @deprecated Renamed to {@link DisconnectedEvent}.
  */
-declare type ExternalApplicationDisconnectedEvent = BaseExternalApplicationEvent & {
-    type: 'disconnected';
-};
+declare type ExternalApplicationDisconnectedEvent = DisconnectedEvent_2;
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by an {@link ExternalApplication}.  Events are
- *  discriminated by {@link ExternalApplicationEvent.type | their type}.  Event payloads unique to `ExternalApplication` can be found
- *  under the {@link OpenFin.ExternalApplicationEvents} namespace.
+ * @deprecated Renamed to {@link Event}.
  */
-declare type ExternalApplicationEvent = ExternalApplicationConnectedEvent | ExternalApplicationDisconnectedEvent;
+declare type ExternalApplicationEvent = Event_7;
 
 declare type ExternalApplicationEvent_2 = Events.ExternalApplicationEvents.ExternalApplicationEvent;
 
 declare namespace ExternalApplicationEvents {
     export {
+        BaseEvent_6 as BaseEvent,
         BaseExternalApplicationEvent,
+        ConnectedEvent_3 as ConnectedEvent,
         ExternalApplicationConnectedEvent,
+        DisconnectedEvent_2 as DisconnectedEvent,
         ExternalApplicationDisconnectedEvent,
+        Event_7 as Event,
         ExternalApplicationEvent,
+        EventType_4 as EventType,
         ExternalApplicationEventType,
-        Payload_3 as Payload,
-        ByType_2 as ByType
+        Payload_5 as Payload,
+        ByType_4 as ByType
     }
 }
 
 /**
- * Union of possible `type` values for a {@link ApplicationEvent}.
+ * @deprecated Renamed to {@link Event}.
  */
-declare type ExternalApplicationEventType = ExternalApplicationEvent['type'];
+declare type ExternalApplicationEventType = EventType_4;
 
 /**
  * @interface
@@ -5403,7 +5619,7 @@ declare type ExternalConnection = {
  * Generated when an external process has exited.
  * @interface
  */
-declare type ExternalProcessExitedEvent = BaseWindowEvent & {
+declare type ExternalProcessExitedEvent = BaseEvent_5 & {
     type: 'external-process-exited';
     processUuid: string;
     exitCode: number;
@@ -5448,19 +5664,15 @@ declare type ExternalProcessRequestType = {
  * Generated when an external process has started.
  * @interface
  */
-declare type ExternalProcessStartedEvent = BaseWindowEvent & {
+declare type ExternalProcessStartedEvent = BaseEvent_5 & {
     type: 'external-process-started';
     processUuid: string;
 };
 
 /**
- * Generated when page receives favicon urls.
- * @interface
+ * @deprecated, use {@link PageFaviconUpdatedEvent}.
  */
-declare type FaviconUpdatedEvent = NamedEvent & {
-    type: 'page-favicon-updated';
-    favicons: string[];
-};
+declare type FaviconUpdatedEvent = PageFaviconUpdatedEvent;
 
 declare namespace FDC3 {
     export {
@@ -5547,7 +5759,7 @@ declare type FileDownloadEvent = {
  *
  * @interface
  */
-declare type FileDownloadLocationChangedEvent = BaseApplicationEvent & {
+declare type FileDownloadLocationChangedEvent = BaseEvent_3 & {
     type: 'file-download-location-changed';
 };
 
@@ -5819,48 +6031,43 @@ declare class _Frame extends EmitterBase<OpenFin_2.FrameEvent> {
 }
 
 /**
- * Generated when a frame is connected.
- * @interface
+ * @deprecated Renamed to {@link ConnectedEvent}.
  */
-declare type FrameConnectedEvent = BaseFrameEvent & {
-    type: 'connected';
-};
+declare type FrameConnectedEvent = ConnectedEvent_4;
 
 /**
- * Generated when a frame has disconnected.
- * @interface
+ * @deprecated Renamed to {@link DisconnectedEvent}.
  */
-declare type FrameDisconnectedEvent = BaseFrameEvent & {
-    type: 'disconnected';
-};
+declare type FrameDisconnectedEvent = DisconnectedEvent_3;
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link _Frame}.  Events are
- *  discriminated by {@link _Frame.type | their type}.  Event payloads unique to `Frame` can be found
- *  under the {@link OpenFin.FrameEvents} namespace.
+ * @deprecated Renamed to {@link Event}.
  */
-declare type FrameEvent = {
-    topic: 'frame';
-} & (FrameConnectedEvent | FrameDisconnectedEvent);
+declare type FrameEvent = Event_8;
 
 declare type FrameEvent_2 = Events.FrameEvents.FrameEvent;
 
 declare namespace FrameEvents {
     export {
+        BaseEvent_7 as BaseEvent,
         BaseFrameEvent,
+        ConnectedEvent_4 as ConnectedEvent,
         FrameConnectedEvent,
+        DisconnectedEvent_3 as DisconnectedEvent,
         FrameDisconnectedEvent,
+        Event_8 as Event,
         FrameEvent,
+        EventType_5 as EventType,
         FrameEventType,
-        Payload_4 as Payload,
-        ByType_3 as ByType
+        Payload_6 as Payload,
+        ByType_5 as ByType
     }
 }
 
 /**
- *  Union of possible `type` values for a {@link FrameEvent}.
+ * @deprecated Renamed to {@link EventType}.
  */
-declare type FrameEventType = FrameEvent['type'];
+declare type FrameEventType = EventType_5;
 
 /**
  * @interface
@@ -6082,14 +6289,9 @@ declare class GlobalHotkey extends EmitterBase<OpenFin_2.GlobalHotkeyEvent> {
 }
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by {@link GlobalHotkey}.  Events are
- *  discriminated by {@link GlobalHotkeyEvent.type | their type}.  Event payloads unique to `GlobalHotkey` can be found
- *  under the {@link OpenFin.GlobalHotkeyEvents} namespace.
+ * @deprecated Renamed to {@link Event}.
  */
-declare type GlobalHotkeyEvent = {
-    topic: 'global-hotkey';
-    hotkey: 'string';
-} & (RegisteredEvent | UnregisteredEvent);
+declare type GlobalHotkeyEvent = Event_9;
 
 declare type GlobalHotkeyEvent_2 = Events.GlobalHotkeyEvents.GlobalHotkeyEvent;
 
@@ -6097,17 +6299,19 @@ declare namespace GlobalHotkeyEvents {
     export {
         RegisteredEvent,
         UnregisteredEvent,
+        Event_9 as Event,
         GlobalHotkeyEvent,
+        EventType_6 as EventType,
         GlobalHotkeyEventType,
-        Payload_5 as Payload,
-        ByType_4 as ByType
+        Payload_7 as Payload,
+        ByType_6 as ByType
     }
 }
 
 /**
- * Union of possible `type` values for a {@link GlobalHotkeyEvent}
+ * @deprecated Renamed to {@link EventType}.
  */
-declare type GlobalHotkeyEventType = GlobalHotkeyEvent['type'];
+declare type GlobalHotkeyEventType = EventType_6;
 
 declare namespace GoldenLayout {
     export {
@@ -6409,8 +6613,17 @@ declare interface Header {
  * Generated when a View is hidden.
  * @interface
  */
-declare type HiddenEvent = BaseViewEvent & {
+declare type HiddenEvent = BaseEvent_4 & {
+    type: 'hidden';
+};
+
+/**
+ * Generated when a window has been hidden.
+ * @interface
+ */
+declare type HiddenEvent_2 = BaseEvent_5 & {
     type: 'hidden';
+    reason: 'closing' | 'hide' | 'hide-on-close';
 };
 
 /**
@@ -6418,7 +6631,7 @@ declare type HiddenEvent = BaseViewEvent & {
  * or because the View has moved to a new window. Only available on Views in a Platform.
  * @interface
  */
-declare type HostContextChangedEvent = BaseViewEvent & {
+declare type HostContextChangedEvent = BaseEvent_4 & {
     type: 'host-context-changed';
     context: any;
     reason: 'reparented' | 'updated';
@@ -6497,7 +6710,16 @@ declare type Hotkey = {
  * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
  * @interface
  */
-declare type HotkeyEvent = BaseViewEvent & {
+declare type HotkeyEvent = BaseEvent_4 & {
+    type: 'hotkey';
+};
+
+/**
+ * Generated when a keyboard shortcut defined in the `hotkeys` array in [Window options](OpenFin.WindowOptions.html) is pressed inside the window.
+ * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
+ * @interface
+ */
+declare type HotkeyEvent_2 = InputEvent_2 & BaseEvent_5 & {
     type: 'hotkey';
 };
 
@@ -6553,6 +6775,11 @@ declare type IdentityEvent = BaseEvent & {
  */
 declare type IdEventType = WithId<AppVersionEventType>;
 
+/**
+ * @deprecated Renamed to {@link IdleStateChangedEvent}.
+ */
+declare type IdleEvent = IdleStateChangedEvent;
+
 /**
  * Generated when a user enters or returns from idle state.
  * @remarks This method is continuously generated every minute while the user is in idle.
@@ -6560,7 +6787,7 @@ declare type IdEventType = WithId<AppVersionEventType>;
  * A user returns from idle state when the computer is unlocked or keyboard/mouse activity has resumed.
  * @interface
  */
-declare type IdleEvent = BaseSystemEvent & {
+declare type IdleStateChangedEvent = BaseEvent_8 & {
     type: 'idle-state-changed';
     elapsedTime: number;
     isIdle: boolean;
@@ -6645,11 +6872,19 @@ declare type InfoForIntentOptions<MetadataType = IntentMetadata_3> = {
  * Generated when an application has initialized.
  * @interface
  */
-declare type InitializedEvent = IdentityEvent & {
+declare type InitializedEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'initialized';
 };
 
+/**
+ * Generated when a window is initialized.
+ * @interface
+ */
+declare type InitializedEvent_2 = BaseEvent_5 & {
+    type: 'initialized';
+};
+
 /**
  * @interface
  */
@@ -8751,7 +8986,7 @@ declare type LayoutIdentity = Identity_5 & {
  * Generated when a window and all of its layout's views have either finished or failed navigation.
  * @interface
  */
-declare type LayoutInitializedEvent = BaseWindowEvent & {
+declare type LayoutInitializedEvent = BaseEvent_5 & {
     type: 'layout-initialized';
     ofViews: (OpenFin_2.Identity & {
         entityType: 'view';
@@ -9288,7 +9523,7 @@ declare type LayoutPresetType = 'columns' | 'grid' | 'rows' | 'tabs';
  * Generated when a window and all of its layout's views have been created and can receive API calls.
  * @interface
  */
-declare type LayoutReadyEvent = BaseWindowEvent & {
+declare type LayoutReadyEvent = BaseEvent_5 & {
     type: 'layout-ready';
     views: (OpenFin_2.Identity & {
         success: boolean;
@@ -9429,7 +9664,7 @@ declare type Manifest = {
  * Generated when the RVM notifies an application that the manifest has changed.
  * @interface
  */
-declare type ManifestChangedEvent = IdentityEvent & {
+declare type ManifestChangedEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'manifest-changed';
 };
@@ -9482,7 +9717,7 @@ declare type MatchPattern = string;
  * Generated when a window is maximized.
  * @interface
  */
-declare type MaximizedEvent = BaseWindowEvent & {
+declare type MaximizedEvent = BaseEvent_5 & {
     type: 'maximized';
 };
 
@@ -9592,7 +9827,7 @@ declare type MessagingProtocols = ProtocolOffer['type'];
  * Generated when a window is minimized.
  * @interface
  */
-declare type MinimizedEvent = BaseWindowEvent & {
+declare type MinimizedEvent = BaseEvent_5 & {
     type: 'minimized';
 };
 
@@ -9636,14 +9871,9 @@ declare type MonitorDetails = {
 };
 
 /**
- * Generated on changes of a monitor's size/location.
- * @remarks A monitor's size changes when the taskbar is resized or relocated.
- * The available space of a monitor defines a rectangle that is not occupied by the taskbar
- * @interface
+ * @deprecated Renamed to {@link MonitorInfoChangedEvent}.
  */
-declare type MonitorEvent = BaseSystemEvent & OpenFin_2.MonitorInfo & {
-    type: 'monitor-info-changed';
-};
+declare type MonitorEvent = MonitorInfoChangedEvent;
 
 /**
  * @interface
@@ -9667,6 +9897,16 @@ declare type MonitorInfo = {
     virtualScreen: DipRect;
 };
 
+/**
+ * Generated on changes of a monitor's size/location.
+ * @remarks A monitor's size changes when the taskbar is resized or relocated.
+ * The available space of a monitor defines a rectangle that is not occupied by the taskbar
+ * @interface
+ */
+declare type MonitorInfoChangedEvent = BaseEvent_8 & OpenFin_2.MonitorInfo & {
+    type: 'monitor-info-changed';
+};
+
 /**
  * @interface
  */
@@ -10073,14 +10313,23 @@ declare type NonPropagatedWindowEvent = never;
 
 /**
  * @internal
+ *
+ * Ensures that an event type key does not include any `close-requested` events.  Distributes over unions.
+ */
+declare type NotCloseRequested<EventType extends string> = Exclude<EventType, 'close-requested'>;
+
+/**
+ * @internal
+ *
+ * Ensures that an event type key doesn't include any `-requested` events.  Distributes over unions.
  */
-declare type NotRequested<EventType> = EventType extends `${infer U}-requested` ? never : EventType;
+declare type NotRequested<EventType extends String> = EventType extends `${infer U}-requested` ? never : EventType;
 
 /**
  * Generated when an application is not responding.
  * @interface
  */
-declare type NotRespondingEvent = IdentityEvent & {
+declare type NotRespondingEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'not-responding';
 };
@@ -10406,7 +10655,7 @@ declare namespace OpenFin_2 {
         AppVersionCompleteEvent,
         AppVersionRuntimeStatusEvent,
         Events,
-        BaseEvent_2 as BaseEvent,
+        BaseEvent_9 as BaseEvent,
         WebContentsEvent_2 as WebContentsEvent,
         SystemEvent_2 as SystemEvent,
         ApplicationEvent_2 as ApplicationEvent,
@@ -10448,12 +10697,32 @@ export default OpenFin_2;
 
 declare type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 
+/**
+ * Generated after window options are changed using the window.updateOptions method.
+ * @remarks Will not fire if the diff object is empty.
+ * @interface
+ */
+declare type OptionsChangedEvent = BaseEvent_5 & {
+    type: 'options-changed';
+    options: OpenFin_2.WindowOptions;
+    diff: OpenFin_2.WindowOptionDiff;
+};
+
 declare type OverlapsOnlyIfMatching<T, U> = {
     [K in Extract<keyof T, keyof U>]: U[K] extends T[K] ? U[K] : T[K] extends U[K] ? T[K] : never;
 };
 
 declare type OverrideCallback<T extends any = PlatformProvider, U extends T = T> = (arg: Constructor<T>) => U | Promise<U>;
 
+/**
+ * Generated when page receives favicon urls.
+ * @interface
+ */
+declare type PageFaviconUpdatedEvent = NamedEvent & {
+    type: 'page-favicon-updated';
+    favicons: string[];
+};
+
 /**
  * Generated when page title is set during navigation.
  * @remarks explicitSet is false when title is synthesized from file url.
@@ -10472,74 +10741,74 @@ declare type Payload<Success extends boolean = boolean, Data = any> = {
 };
 
 /**
- * Extracts a single event type matching the given key from the {@link ApplicationEvent} union.
+ * Extracts a single event type matching the given key from the View {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_2<Type extends ApplicationEventType> = Extract<ApplicationEvent, {
+declare type Payload_2<Type extends EventType> = Extract<Event_4, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link ExternalApplicationEvent} union.
+ * Extracts a single event type matching the given key from the Window {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_3<Type extends ExternalApplicationEventType> = Extract<ExternalApplicationEvent, {
+declare type Payload_3<Type extends EventType_2> = Extract<Event_6, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link FrameEvent} union.
+ * Extracts a single event type matching the given key from the Application {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_4<Type extends FrameEventType> = Extract<FrameEvent, {
+declare type Payload_4<Type extends EventType_3> = Extract<Event_3, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link GlobalHotkeyEvent} union.
+ * Extracts a single event type matching the given key from the ExternalApplication {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_5<Type extends GlobalHotkeyEventType> = Extract<GlobalHotkeyEvent, {
+declare type Payload_5<Type extends EventType_4> = Extract<Event_7, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link PlatformEvent} union.
+ * Extracts a single event type matching the given key from the Frame {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_6<Type extends PlatformEventType> = Extract<PlatformEvent, {
+declare type Payload_6<Type extends EventType_5> = Extract<Event_8, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link SystemEvent} union.
+ * Extracts a single event type matching the given key from the GlobalHotkey {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_7<Type extends SystemEventType> = Extract<SystemEvent, {
+declare type Payload_7<Type extends EventType_6> = Extract<Event_9, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link ViewEvent} union.
+ * Extracts a single event type matching the given key from the Platform {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_8<Type extends ViewEventType> = Extract<ViewEvent, {
+declare type Payload_8<Type extends EventType_7> = Extract<Event_10, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the {@link WindowEvent} union.
+ * Extracts a single event type matching the given key from the System {@link Event} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_9<Type extends WindowEventType> = Extract<WindowEvent, {
+declare type Payload_9<Type extends EventType_8> = Extract<Event_11, {
     type: Type;
 }>;
 
@@ -10549,7 +10818,7 @@ declare type PayloadTypeByStrategy<T extends ChannelStrategy<unknown>> = T exten
  * Generated when window finishes loading. Provides performance and navigation data.
  * @interface
  */
-declare type PerformanceReportEvent = Performance & BaseWindowEvent & {
+declare type PerformanceReportEvent = Performance & BaseEvent_5 & {
     type: 'performance-report';
 };
 
@@ -11213,38 +11482,36 @@ declare class Platform extends EmitterBase<OpenFin_2.PlatformEvent> {
 }
 
 /**
- * Generated when a new Platform's API becomes responsive.
- * @interface
+ * @deprecated Renamed to {@link ApiReadyEvent}.
  */
-declare type PlatformApiReadyEvent = BaseEvent & {
-    topic: 'application';
-    type: 'platform-api-ready';
-};
+declare type PlatformApiReadyEvent = ApiReadyEvent;
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Platform}.  Events are
- *  discriminated by {@link PlatformEvent.type | their type}.  Event payloads unique to `Platform` can be found
- *  under the {@link OpenFin.PlatformEvents} namespace.
+ * @deprecated Renamed to {@link Event}.
  */
-declare type PlatformEvent = ApplicationEvent | PlatformApiReadyEvent | PlatformSnapshotAppliedEvent;
+declare type PlatformEvent = Event_10;
 
 declare type PlatformEvent_2 = Events.PlatformEvents.PlatformEvent;
 
 declare namespace PlatformEvents {
     export {
+        ApiReadyEvent,
         PlatformApiReadyEvent,
+        SnapshotAppliedEvent,
         PlatformSnapshotAppliedEvent,
+        Event_10 as Event,
         PlatformEvent,
+        EventType_7 as EventType,
         PlatformEventType,
-        Payload_6 as Payload,
-        ByType_5 as ByType
+        Payload_8 as Payload,
+        ByType_7 as ByType
     }
 }
 
 /**
- * Union of possible `type` values for a {@link PlatformEvent}.
+ * @deprecated Renamed to {@link }.
  */
-declare type PlatformEventType = PlatformEvent['type'];
+declare type PlatformEventType = EventType_7;
 
 /**
  * Static namespace for OpenFin API methods that interact with the {@link Platform} class, available under `fin.Platform`.
@@ -11524,11 +11791,14 @@ declare interface PlatformProvider {
      * Calls platform.createView for every view in the given layout. Returns an array of promises
      * one promise for each view create call
      *
-     * @param layout
-     * @param target
+     * @param payload
+     * @param callerIdentity
      * @returns an array of promises
      */
-    createViewsForLayout(layout: GoldenLayout.Config, target: OpenFin_2.Identity): Promise<OpenFin_2.View>[];
+    createViewsForLayout(payload: {
+        layout: GoldenLayout.Config;
+        target?: OpenFin_2.Identity;
+    }, callerIdentity: OpenFin_2.Identity): Promise<OpenFin_2.View>[];
     /**
      * **NOTE**: Internal use only. It is not recommended to manage the state of individual views.
      * 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.
@@ -11969,19 +12239,9 @@ declare interface PlatformProvider {
 }
 
 /**
- * Generated when a platform.ApplySnapshot call is resolved.
- * @remarks The call is resolved when the following conditions are met for all windows in the snapshot:
- * 1. The window has been created
- * 2. The window has a responsive API
- * 3. If a window has a layout property, the 'layout-ready' event has fired
- *
- * _Note_ - In the case of using a custom provider, if a window has a layout property but does not call _Layout.init_ this event may not fire.
- * @interface
+ * @deprecated Renamed to {@link SnapshotAppliedEvent}.
  */
-declare type PlatformSnapshotAppliedEvent = BaseEvent & {
-    topic: 'application';
-    type: 'platform-snapshot-applied';
-};
+declare type PlatformSnapshotAppliedEvent = SnapshotAppliedEvent;
 
 /**
  * @interface
@@ -12249,7 +12509,7 @@ declare type PreloadScriptsStateChangedEvent = PreloadScriptsStateChangeEvent &
  * A general preload scripts state change event without event type.
  * @interface
  */
-declare type PreloadScriptsStateChangeEvent = BaseWindowEvent & {
+declare type PreloadScriptsStateChangeEvent = BaseEvent_5 & {
     preloadScripts: (PreloadScriptInfoRunning & any)[];
 };
 
@@ -12458,51 +12718,43 @@ declare type ProcessLoggingOptions = {
 };
 
 /**
- * An Application event that has propagated to {@link OpenFin.SystemEvents System}, type string prefixed with `application-`.
- * {@link OpenFin.ApplicationEvents.ApplicationWindowEvent Application events that are tied to Windows but do not propagate from them}
- * are propagated to `System` without any type string prefixing.
- *
- * "Requested" events (e.g. {@link RunRequestedEvent}) do not propagate.
+ * @deprecated Renamed to {@link PropagatedEvent}.
  */
-declare type PropagatedApplicationEvent<TargetTopic extends string> = PropagatedEvent<'application', TargetTopic, ApplicationSourcedEvent> | ApplicationWindowEvent;
+declare type PropagatedApplicationEvent<TargetTopic extends string> = PropagatedEvent_4<TargetTopic>;
 
 /**
- * Union of possible 'type' values for a {@link OpenFin.ApplicationEvents.PropagatedApplicationEvent}.
+ * @deprecated Renamed to {@link PropagatedEventType}.
  */
-declare type PropagatedApplicationEventType = PropagatedApplicationEvent<string>['type'];
+declare type PropagatedApplicationEventType = PropagatedEventType_3;
 
 /**
- * Modifies an event shape to reflect propagation to a parent topic.
+ * Modifies an event shape to reflect propagation to a parent topic.  Excludes `close-requested` events, as
+ * these do not propagate.
+ *
  * @remarks The 'type' field is prefixed with the original topic, and a new property is added with the original topic's identity.
+ *
+ * @typeParam SourceTopic The topic the event shape is propagating from.
+ * @typeParam TargetTopic The topic the event shape is propagating to.
+ * @typeParam Event The shape of the event being propagated.
  */
 declare type PropagatedEvent<SourceTopic extends string, TargetTopic extends string, Event extends {
     type: string;
 }> = Event extends infer E extends {
     type: string;
-} ? Omit<E, 'type' | 'topic'> & {
+} ? E['type'] extends 'close-requested' ? never : Omit<E, 'type' | 'topic'> & {
     type: PropagatedEventType<SourceTopic, E['type']>;
     topic: TargetTopic;
 } : never;
 
-/**
- * Modifies an event key to reflect propagation by prefixing with the topic.
- */
-declare type PropagatedEventType<Topic extends string, Type extends string> = `${Topic}-${Type}`;
-
 /**
  * A view event that has propagated to a parent {@link OpenFin.WindowEvents Window}, {@link OpenFin.ApplicationEvents Application},
  * or {@link OpenFin.SystemEvents System}), adding a `viewIdentity` property (since the `Identity` property of the propagated event refers to the `Window`) and prefixing the
  * event type key with `'view-'`.
  */
-declare type PropagatedViewEvent<TargetTopic extends string> = PropagatedEvent<'view', TargetTopic, ViewEvent> & {
+declare type PropagatedEvent_2<TargetTopic extends string> = BaseEvents.PropagatedEvent<'view', TargetTopic, ViewEvent> & {
     viewIdentity: OpenFin_2.Identity;
 };
 
-/**
- * Union of possible `type` values for a {@link OpenFin.ViewEvents.PropagatedViewEvent}.
- */
-declare type PropagatedViewEventType = PropagatedViewEvent<string>['type'];
-
 /**
  * A Window event that has propagated to the parent {@link OpenFin.ApplicationEvents Application} and {@link OpenFin.SystemEvents System},
  * prefixing the type string with `'window-'`.  Only {@link WindowSourcedEvent window-sourced events} will propagate
@@ -12511,12 +12763,51 @@ declare type PropagatedViewEventType = PropagatedViewEvent<string>['type'];
  *
  * "Requested" events (e.g. {@link AuthRequestedEvent}) do not propagate to `System.`
  */
-declare type PropagatedWindowEvent<TargetTopic extends string> = PropagatedEvent<'window', TargetTopic, Exclude<WindowSourcedEvent, WindowCloseRequestedEvent>>;
+declare type PropagatedEvent_3<TargetTopic extends string> = BaseEvents.PropagatedEvent<'window', TargetTopic, WindowSourcedEvent>;
+
+/**
+ * An Application event that has propagated to {@link OpenFin.SystemEvents System}, type string prefixed with `application-`.
+ * {@link OpenFin.ApplicationEvents.ApplicationWindowEvent Application events that are tied to Windows but do not propagate from them}
+ * are propagated to `System` without any type string prefixing.
+ *
+ * "Requested" events (e.g. {@link RunRequestedEvent}) do not propagate.
+ */
+declare type PropagatedEvent_4<TargetTopic extends string> = BaseEvents.PropagatedEvent<'application', TargetTopic, ApplicationSourcedEvent> | ApplicationWindowEvent;
+
+/**
+ * Modifies an event type key to reflect propagation by prefixing with the topic.
+ */
+declare type PropagatedEventType<Topic extends string, Type extends string> = `${Topic}-${NotCloseRequested<Type>}`;
+
+/**
+ * Union of possible `type` values for a {@link PropagatedEvent} sourced from a {@link OpenFin.View}.
+ */
+declare type PropagatedEventType_2 = PropagatedEvent_2<string>['type'];
 
 /**
- * Union of possible `type` values for a {@link OpenFin.WindowEvents.PropagatedWindowEvent}.
+ * Union of possible 'type' values for an {@link PropagatedEvent} sourced from an {@link Application}.
  */
-declare type PropagatedWindowEventType = PropagatedWindowEvent<string>['type'];
+declare type PropagatedEventType_3 = PropagatedEvent_4<string>['type'];
+
+/**
+ * @deprecated Renamed to {@link PropagatedEvent}.
+ */
+declare type PropagatedViewEvent<TargetTopic extends string> = PropagatedEvent_2<TargetTopic>;
+
+/**
+ * @deprecated Renamed to {@link PropagatedEventType}.
+ */
+declare type PropagatedViewEventType = PropagatedEventType_2;
+
+/**
+ * @deprecated Renamed to {@link PropagatedEvent}.
+ */
+declare type PropagatedWindowEvent<TargetTopic extends string> = PropagatedEvent_3<TargetTopic>;
+
+/**
+ * Union of possible `type` values for a {@link PropagatedEvent} sourced from a {@link OpenFin.Window}.
+ */
+declare type PropagatedWindowEventType = PropagatedEvent_3<string>['type'];
 
 declare interface ProtocolMap extends ProtocolMapBase {
     'request-external-authorization': {
@@ -12934,7 +13225,7 @@ declare type RegistryInfo_2 = {
  * Generated when a window has been reloaded.
  * @interface
  */
-declare type ReloadedEvent = BaseWindowEvent & {
+declare type ReloadedEvent = BaseEvent_5 & {
     type: 'reloaded';
     url: string;
 };
@@ -13070,11 +13361,19 @@ declare type ResourceResponseReceivedEvent = NamedEvent & {
  * Generated when an application is responding.
  * @interface
  */
-declare type RespondingEvent = IdentityEvent & {
+declare type RespondingEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'responding';
 };
 
+/**
+ * Generated when a window is displayed after having been minimized or when a window leaves the maximize state without minimizing.
+ * @interface
+ */
+declare type RestoredEvent = BaseEvent_5 & {
+    type: 'restored';
+};
+
 declare type ResultBehavior = 'close' | 'hide' | 'none';
 
 /**
@@ -13137,7 +13436,7 @@ declare type RunRequestedEvent = OpenFin_2.ApplicationEvents.RunRequestedEvent;
  * Generated when Application.run() is called for an already running application.
  * @interface
  */
-declare type RunRequestedEvent_2 = IdentityEvent & {
+declare type RunRequestedEvent_2 = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'run-requested';
     userAppConfigArgs: Record<string, any>;
@@ -13319,7 +13618,7 @@ declare type ServiceIdentifier = {
  * Generated on changes to a user’s local computer session.
  * @interface
  */
-declare type SessionChangedEvent = BaseSystemEvent & {
+declare type SessionChangedEvent = BaseEvent_8 & {
     type: 'session-changed';
     reason: 'lock' | 'unlock' | 'remote-connect' | 'remote-disconnect' | 'unknown';
 };
@@ -13541,7 +13840,7 @@ declare type ShortcutOverride = Hotkey & {
  *
  * @interface
  */
-declare type ShowAllDownloadsEvent = BaseWindowEvent & {
+declare type ShowAllDownloadsEvent = BaseEvent_5 & {
     type: 'show-all-downloads';
 };
 
@@ -13549,7 +13848,15 @@ declare type ShowAllDownloadsEvent = BaseWindowEvent & {
  * Generated when a View is shown. This event will fire during creation of a View.
  * @interface
  */
-declare type ShownEvent = BaseViewEvent & {
+declare type ShownEvent = BaseEvent_4 & {
+    type: 'shown';
+};
+
+/**
+ * Generated when a hidden window has been shown.
+ * @interface
+ */
+declare type ShownEvent_2 = BaseEvent_5 & {
     type: 'shown';
 };
 
@@ -13578,6 +13885,15 @@ declare type ShowPopupMenuOptions<Data extends unknown = unknown> = {
     y?: number;
 };
 
+/**
+ * Generated when a window has been prevented from showing.
+ * @remarks A window will be prevented from showing by default, either through the API or by a user when ‘show-requested’ has been subscribed to on the window or 'window-show-requested' on the parent application and the Window.show(force) flag is false.
+ * @interface
+ */
+declare type ShowRequestedEvent = BaseEvent_5 & {
+    type: 'show-requested';
+};
+
 /**
  * _Platform Windows Only_. Enables views to be shown when a Platform Window is being resized by the user.
  *
@@ -13624,6 +13940,21 @@ declare type Snapshot = {
     };
 };
 
+/**
+ * Generated when a platform.ApplySnapshot call is resolved.
+ * @remarks The call is resolved when the following conditions are met for all windows in the snapshot:
+ * 1. The window has been created
+ * 2. The window has a responsive API
+ * 3. If a window has a layout property, the 'layout-ready' event has fired
+ *
+ * _Note_ - In the case of using a custom provider, if a window has a layout property but does not call _Layout.init_ this event may not fire.
+ * @interface
+ */
+declare type SnapshotAppliedEvent = BaseEvent & {
+    topic: 'application';
+    type: 'platform-snapshot-applied';
+};
+
 /**
  * @interface
  */
@@ -13741,7 +14072,7 @@ declare class SnapshotSourceModule extends Base {
  * Generated when an application has started.
  * @interface
  */
-declare type StartedEvent = IdentityEvent & {
+declare type StartedEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'started';
 };
@@ -15277,12 +15608,9 @@ declare type SystemChannel = Omit<Channel_3, 'addContextListener' | 'broadcast'
 };
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link System}.  Events are
- *  discriminated by {@link SystemEvent.type | their type}.  Event payloads unique to `System` can be found
- *  under the {@link OpenFin.SystemEvents} namespace (payloads inherited from propagated events are defined in the namespace
- *  from which they propagate).
+ * @deprecated Renamed to {@link Event}.
  */
-declare type SystemEvent = ExcludeRequested<PropagatedWindowEvent<'system'>> | PropagatedViewEvent<'system'> | PropagatedApplicationEvent<'system'> | ApplicationCreatedEvent | DesktopIconClickedEvent | IdleEvent | MonitorEvent | SessionChangedEvent | AppVersionEventWithId | SystemShutdownEvent;
+declare type SystemEvent = Event_11;
 
 declare type SystemEvent_2 = Events.SystemEvents.SystemEvent;
 
@@ -15290,8 +15618,10 @@ declare namespace SystemEvents {
     export {
         NotRequested,
         ExcludeRequested,
-        BaseSystemEvent,
+        BaseEvent_8 as BaseEvent,
+        IdleStateChangedEvent,
         IdleEvent,
+        MonitorInfoChangedEvent,
         MonitorEvent,
         SessionChangedEvent,
         AppVersionEvent,
@@ -15305,17 +15635,19 @@ declare namespace SystemEvents {
         ApplicationCreatedEvent,
         DesktopIconClickedEvent,
         SystemShutdownEvent,
+        Event_11 as Event,
         SystemEvent,
+        EventType_8 as EventType,
         SystemEventType,
-        Payload_7 as Payload,
-        ByType_6 as ByType
+        Payload_9 as Payload,
+        ByType_8 as ByType
     }
 }
 
 /**
- * Union of possible `type` values for a {@link SystemEvent}.
+ * @deprecated Renamed to {@link EventType}.
  */
-declare type SystemEventType = SystemEvent['type'];
+declare type SystemEventType = EventType_8;
 
 /**
  * @interface
@@ -15372,7 +15704,7 @@ declare type SystemProcessInfo = {
  * Generated when system shutdown or log off.
  * @internal
  */
-declare type SystemShutdownEvent = BaseSystemEvent & {
+declare type SystemShutdownEvent = BaseEvent_8 & {
     type: 'system-shutdown';
 };
 
@@ -15625,7 +15957,7 @@ declare type TargetApp = string | AppMetadata;
  * In that case, previousTarget identity will be the same as target identity.
  * @interface
  */
-declare type TargetChangedEvent = BaseViewEvent & {
+declare type TargetChangedEvent = BaseEvent_4 & {
     type: 'target-changed';
     previousTarget: OpenFin_2.Identity;
 };
@@ -15779,7 +16111,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
  * Generated when the tray icon is clicked.
  * @interface
  */
-declare type TrayIconClickedEvent = IdentityEvent & {
+declare type TrayIconClickedEvent = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'tray-icon-clicked';
     button: 0 | 1 | 2;
@@ -15869,7 +16201,7 @@ declare type UrlChangedEvent = BaseUrlEvent & ({
  * A general user bounds change event without event type.
  * @interface
  */
-declare type UserBoundsChangeEvent = BaseWindowEvent & {
+declare type UserBoundsChangeEvent = BaseEvent_5 & {
     height: number;
     left: number;
     top: number;
@@ -15881,7 +16213,7 @@ declare type UserBoundsChangeEvent = BaseWindowEvent & {
  * Generated when a window's user movement becomes disabled.
  * @interface
  */
-declare type UserMovementDisabledEvent = BaseWindowEvent & {
+declare type UserMovementDisabledEvent = BaseEvent_5 & {
     type: 'user-movement-disabled';
 };
 
@@ -15889,7 +16221,7 @@ declare type UserMovementDisabledEvent = BaseWindowEvent & {
  * Generated when a window's user movement becomes enabled.
  * @interface
  */
-declare type UserMovementEnabledEvent = BaseWindowEvent & {
+declare type UserMovementEnabledEvent = BaseEvent_5 & {
     type: 'user-movement-enabled';
 };
 
@@ -16576,7 +16908,7 @@ declare class View_2 extends WebContents<OpenFin_2.ViewEvent> {
  * Generated when a View is attached to a window.
  * @interface
  */
-declare type ViewAttachedEvent = BaseWindowEvent & {
+declare type ViewAttachedEvent = BaseEvent_5 & {
     type: 'view-attached';
     target: OpenFin_2.Identity;
     viewIdentity: OpenFin_2.Identity;
@@ -16618,7 +16950,7 @@ declare type ViewCreationOrReference = OpenFin_2.Identity | OpenFin_2.PlatformVi
  * @remarks Will fire when a view is destroyed in which case `target` will be null.
  * @interface
  */
-declare type ViewDetachedEvent = BaseWindowEvent & {
+declare type ViewDetachedEvent = BaseEvent_5 & {
     type: 'view-detached';
     target: OpenFin_2.Identity;
     previousTarget: OpenFin_2.Identity;
@@ -16626,18 +16958,15 @@ declare type ViewDetachedEvent = BaseWindowEvent & {
 };
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link View}.  Events are
- *  discriminated by {@link ViewEvent.type | their type}.  Event payloads unique to `View` can be found
- *  under the {@link OpenFin.ViewEvents} namespace (except for {@link OpenFin.WebContentsEvents | those shared with other WebContents}).
+ * @deprecated Renamed to {@link Event}.
  */
-declare type ViewEvent = (WebContentsEvent<'view'> & {
-    target: OpenFin_2.Identity;
-}) | CreatedEvent | DestroyedEvent | HiddenEvent | HotkeyEvent | ShownEvent | TargetChangedEvent | HostContextChangedEvent;
+declare type ViewEvent = Event_4;
 
 declare type ViewEvent_2 = Events.ViewEvents.ViewEvent;
 
 declare namespace ViewEvents {
     export {
+        BaseEvent_4 as BaseEvent,
         BaseViewEvent,
         TargetChangedEvent,
         NonPropagatedViewEvent,
@@ -16647,20 +16976,24 @@ declare namespace ViewEvents {
         HotkeyEvent,
         ShownEvent,
         HostContextChangedEvent,
+        Event_4 as Event,
         ViewEvent,
         WillPropagateViewEvent,
+        EventType,
         ViewEventType,
+        PropagatedEvent_2 as PropagatedEvent,
         PropagatedViewEvent,
+        PropagatedEventType_2 as PropagatedEventType,
         PropagatedViewEventType,
-        Payload_8 as Payload,
-        ByType_7 as ByType
+        Payload_2 as Payload,
+        ByType
     }
 }
 
 /**
- * Union of possible `type` values for a {@link OpenFin.ViewEvents.ViewEvent}.
+ * @deprecated Renamed to {@link EventType}.
  */
-declare type ViewEventType = ViewEvent['type'];
+declare type ViewEventType = EventType;
 
 /**
  * @interface
@@ -17799,12 +18132,9 @@ declare class WebContents<T extends BaseEvent> extends EmitterBase<T> {
 }
 
 /**
- *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing events shared by all WebContents elements
- *  (i.e. {@link OpenFin.Window} or {@link OpenFin.View}).
+ * @deprecated Renamed to {@link Event}.
  */
-declare type WebContentsEvent<Topic extends string> = {
-    topic: Topic;
-} & (BlurredEvent | CertificateSelectionShownEvent | CrashedEvent_2 | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | FaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent | ChildWindowCreatedEvent | FileDownloadStartedEvent | FileDownloadProgressEvent | FileDownloadCompletedEvent | FoundInPageEvent | CertificateErrorEvent);
+declare type WebContentsEvent<Topic extends string> = Event_5<Topic>;
 
 declare type WebContentsEvent_2<Topic extends string> = Events.WebContentsEvents.WebContentsEvent<Topic>;
 
@@ -17816,6 +18146,7 @@ declare namespace WebContentsEvents {
         CrashedEvent_2 as CrashedEvent,
         CertificateErrorEvent,
         CertificateSelectionShownEvent,
+        PageFaviconUpdatedEvent,
         FaviconUpdatedEvent,
         NavigationRejectedEvent,
         UrlChangedEvent,
@@ -17834,6 +18165,7 @@ declare namespace WebContentsEvents {
         FileDownloadStartedEvent,
         FileDownloadProgressEvent,
         FileDownloadCompletedEvent,
+        Event_5 as Event,
         WebContentsEvent,
         WillPropagateWebContentsEvent,
         NonPropagatedWebContentsEvent
@@ -17881,7 +18213,7 @@ declare type WillMoveEvent = WillMoveOrResizeEvent & {
  * A general will-move or will-resize event without event type.
  * @interface
  */
-declare type WillMoveOrResizeEvent = BaseWindowEvent & {
+declare type WillMoveOrResizeEvent = BaseEvent_5 & {
     height: number;
     left: number;
     top: number;
@@ -17903,7 +18235,7 @@ declare type WillPropagateViewEvent = ViewEvent;
  *
  * A WebContents event that does propagate to (republish on) parent topics.
  */
-declare type WillPropagateWebContentsEvent = WebContentsEvent<string>;
+declare type WillPropagateWebContentsEvent = Event_5<string>;
 
 /**
  * @DEPRECATED all Window events propagate, so this is redundant - left as a convenience shim to avoid breaking
@@ -17917,7 +18249,7 @@ declare type WillPropagateWindowEvent = WindowSourcedEvent;
  * Generated when window is being redirected as per contentRedirect allowlist/denylist rules.
  * @interface
  */
-declare type WillRedirectEvent = BaseWindowEvent & {
+declare type WillRedirectEvent = BaseEvent_5 & {
     type: 'will-redirect';
     blocked: boolean;
     isInPlace: boolean;
@@ -19542,7 +19874,7 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
       * Generated when an alert is fired and suppressed due to the customWindowAlert flag being true.
       * @interface
       */
-     declare type WindowAlertRequestedEvent = BaseApplicationEvent & {
+     declare type WindowAlertRequestedEvent = BaseEvent_3 & {
          type: 'window-alert-requested';
      };
 
@@ -19556,29 +19888,19 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
      };
 
      /**
-      * Generated when a window has closed.
-      * @interface
+      * @deprecated Renamed to {@link ClosedEvent}.
       */
-     declare type WindowClosedEvent = BaseWindowEvent & {
-         type: 'closed';
-     };
+     declare type WindowClosedEvent = ClosedEvent_2;
 
      /**
-      * Generated when a window has been prevented from closing.
-      * @remarks A window will be prevented from closing by default, either through the API or by a user when ‘close-requested’ has been subscribed to and the Window.close(force) flag is false.
-      * @interface
+      * @deprecated Renamed to {@link CloseRequestedEvent}.
       */
-     declare type WindowCloseRequestedEvent = BaseWindowEvent & {
-         type: 'close-requested';
-     };
+     declare type WindowCloseRequestedEvent = CloseRequestedEvent;
 
      /**
-      * Generated when a window has initiated the closing routine.
-      * @interface
+      * @deprecated Renamed to {@link ClosingEvent}.
       */
-     declare type WindowClosingEvent = BaseWindowEvent & {
-         type: 'closing';
-     };
+     declare type WindowClosingEvent = ClosingEvent;
 
      /**
       * A rule prescribing content creation in a {@link OpenFin.Window}.
@@ -19600,7 +19922,7 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
       * Generated when a child window is created.
       * @interface
       */
-     declare type WindowCreatedEvent = BaseApplicationEvent & {
+     declare type WindowCreatedEvent = BaseEvent_3 & {
          type: 'window-created';
      };
 
@@ -19657,21 +19979,20 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
       * Generated when a child window ends loading.
       * @interface
       */
-     declare type WindowEndLoadEvent = BaseApplicationEvent & {
+     declare type WindowEndLoadEvent = BaseEvent_3 & {
          type: 'window-end-load';
      };
 
      /**
-      *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Window}.  Events are
-      *  discriminated by {@link WindowEvent.type | their type}.  Event payloads unique to `Window` can be found
-      *  under the {@link OpenFin.WindowEvents} namespace (except for {@link OpenFin.WebContentsEvents | those shared with other WebContents}).
+      * @deprecated, Renamed to {@link Event}.
       */
-     declare type WindowEvent = WindowSourcedEvent | PropagatedViewEvent<'window'>;
+     declare type WindowEvent = Event_6;
 
      declare type WindowEvent_2 = Events.WindowEvents.WindowEvent;
 
      declare namespace WindowEvents {
          export {
+             BaseEvent_5 as BaseEvent,
              BaseWindowEvent,
              ViewAttachedEvent,
              ViewDetachedEvent,
@@ -19681,9 +20002,11 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
              EndLoadEvent,
              WillRedirectEvent,
              ReloadedEvent,
+             OptionsChangedEvent,
              WindowOptionsChangedEvent_2 as WindowOptionsChangedEvent,
              ExternalProcessExitedEvent,
              ExternalProcessStartedEvent,
+             HiddenEvent_2 as HiddenEvent,
              WindowHiddenEvent,
              PreloadScriptInfoRunning,
              PreloadScriptInfo,
@@ -19698,22 +20021,30 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
              BeginUserBoundsChangingEvent,
              BoundsChangedEvent,
              BoundsChangingEvent,
+             CloseRequestedEvent,
              WindowCloseRequestedEvent,
              ContextChangedEvent,
+             ClosedEvent_2 as ClosedEvent,
              WindowClosedEvent,
+             ClosingEvent,
              WindowClosingEvent,
              DisabledMovementBoundsChangedEvent,
              DisabledMovementBoundsChangingEvent,
              EmbeddedEvent,
              EndUserBoundsChangingEvent,
+             HotkeyEvent_2 as HotkeyEvent,
              WindowHotkeyEvent,
+             InitializedEvent_2 as InitializedEvent,
              WindowInitializedEvent,
              MaximizedEvent,
              MinimizedEvent,
              PreloadScriptsStateChangedEvent,
              PreloadScriptsStateChangingEvent,
+             RestoredEvent,
              WindowRestoredEvent,
+             ShowRequestedEvent,
              WindowShowRequestedEvent,
+             ShownEvent_2 as ShownEvent,
              WindowShownEvent,
              UserMovementEnabledEvent,
              UserMovementDisabledEvent,
@@ -19724,37 +20055,32 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
              DownloadShelfVisibilityChangedEvent,
              WindowSourcedEvent,
              WillPropagateWindowEvent,
+             Event_6 as Event,
              WindowEvent,
+             EventType_2 as EventType,
              WindowEventType,
+             PropagatedEvent_3 as PropagatedEvent,
              PropagatedWindowEvent,
              PropagatedWindowEventType,
-             Payload_9 as Payload,
-             ByType_8 as ByType
+             Payload_3 as Payload,
+             ByType_2 as ByType
          }
      }
 
      /**
-      * Union of possible `type` values for a {@link OpenFin.WindowEvents.WindowEvent}.
+      * @deprecated Renamed to {@link EventType}.
       */
      declare type WindowEventType = WindowEvent['type'];
 
      /**
-      * Generated when a window has been hidden.
-      * @interface
+      * @deprecated Renamed to {@link HiddenEvent}.
       */
-     declare type WindowHiddenEvent = BaseWindowEvent & {
-         type: 'hidden';
-         reason: 'closing' | 'hide' | 'hide-on-close';
-     };
+     declare type WindowHiddenEvent = HiddenEvent_2;
 
      /**
-      * Generated when a keyboard shortcut defined in the `hotkeys` array in [Window options](OpenFin.WindowOptions.html) is pressed inside the window.
-      * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
-      * @interface
+      * @deprecated Renamed to {@link HotkeyEvent}.
       */
-     declare type WindowHotkeyEvent = InputEvent_2 & BaseWindowEvent & {
-         type: 'hotkey';
-     };
+     declare type WindowHotkeyEvent = HotkeyEvent_2;
 
      /**
       * @interface
@@ -19768,12 +20094,9 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
      };
 
      /**
-      * Generated when a window is initialized.
-      * @interface
+      * @deprecated Renamed to {@link InitializedEvent}.
       */
-     declare type WindowInitializedEvent = BaseWindowEvent & {
-         type: 'initialized';
-     };
+     declare type WindowInitializedEvent = InitializedEvent_2;
 
      /**
       * Static namespace for OpenFin API methods that interact with the {@link _Window} class, available under `fin.Window`.
@@ -19870,7 +20193,7 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
       * Generated when a child window is not responding.
       * @interface
       */
-     declare type WindowNotRespondingEvent = BaseApplicationEvent & {
+     declare type WindowNotRespondingEvent = BaseEvent_3 & {
          type: 'window-not-responding';
      };
 
@@ -19892,15 +20215,9 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
      declare type WindowOptionsChangedEvent = OpenFin_2.WindowEvents.WindowOptionsChangedEvent;
 
      /**
-      * Generated after window options are changed using the window.updateOptions method.
-      * @remarks Will not fire if the diff object is empty.
-      * @interface
+      * @deprecated Renamed to {@link OptionsChangedEvent}.
       */
-     declare type WindowOptionsChangedEvent_2 = BaseWindowEvent & {
-         type: 'options-changed';
-         options: OpenFin_2.WindowOptions;
-         diff: OpenFin_2.WindowOptionDiff;
-     };
+     declare type WindowOptionsChangedEvent_2 = OptionsChangedEvent;
 
      declare type WindowPrintOptions = PrintOptions | ScreenshotPrintOptions | WindowViewsPrintOptions;
 
@@ -19908,46 +20225,36 @@ declare class _Window extends WebContents<OpenFin_2.WindowEvent> {
       * Generated when a child window is responding.
       * @interface
       */
-     declare type WindowRespondingEvent = BaseApplicationEvent & {
+     declare type WindowRespondingEvent = BaseEvent_3 & {
          type: 'window-responding';
      };
 
      /**
-      * Generated when a window is displayed after having been minimized or when a window leaves the maximize state without minimizing.
-      * @interface
+      * @deprecated Renamed to {@link RestoredEvent}.
       */
-     declare type WindowRestoredEvent = BaseWindowEvent & {
-         type: 'restored';
-     };
+     declare type WindowRestoredEvent = RestoredEvent;
 
      /**
-      * Generated when a hidden window has been shown.
-      * @interface
+      * @deprecated Renamed to {@link ShownEvent}.
       */
-     declare type WindowShownEvent = BaseWindowEvent & {
-         type: 'shown';
-     };
+     declare type WindowShownEvent = ShownEvent_2;
 
      /**
-      * Generated when a window has been prevented from showing.
-      * @remarks A window will be prevented from showing by default, either through the API or by a user when ‘show-requested’ has been subscribed to on the window or 'window-show-requested' on the parent application and the Window.show(force) flag is false.
-      * @interface
+      * @deprecated Renamed to {@link ShowRequestedEvent}.
       */
-     declare type WindowShowRequestedEvent = BaseWindowEvent & {
-         type: 'show-requested';
-     };
+     declare type WindowShowRequestedEvent = ShowRequestedEvent;
 
      /**
       * A union of all events that emit natively on the `Window` topic, i.e. excluding those that propagate
       * from {@link OpenFin.ViewEvents}.
       */
-     declare type WindowSourcedEvent = WebContentsEvent<'window'> | WindowViewEvent | AuthRequestedEvent | BeginUserBoundsChangingEvent | BoundsChangedEvent | BoundsChangingEvent | ContextChangedEvent | WindowCloseRequestedEvent | WindowClosedEvent | WindowClosingEvent | DisabledMovementBoundsChangedEvent | DisabledMovementBoundsChangingEvent | EmbeddedEvent | EndUserBoundsChangingEvent | ExternalProcessExitedEvent | ExternalProcessStartedEvent | WindowHiddenEvent | WindowHotkeyEvent | WindowInitializedEvent | LayoutInitializedEvent | LayoutReadyEvent | MaximizedEvent | MinimizedEvent | WindowOptionsChangedEvent_2 | PerformanceReportEvent | PreloadScriptsStateChangedEvent | PreloadScriptsStateChangingEvent | ReloadedEvent | WindowRestoredEvent | WindowShowRequestedEvent | WindowShownEvent | UserMovementDisabledEvent | UserMovementEnabledEvent | WillMoveEvent | WillRedirectEvent | WillResizeEvent | ShowAllDownloadsEvent | DownloadShelfVisibilityChangedEvent;
+     declare type WindowSourcedEvent = WebContentsEvents.Event<'window'> | WindowViewEvent | AuthRequestedEvent | BeginUserBoundsChangingEvent | BoundsChangedEvent | BoundsChangingEvent | ContextChangedEvent | CloseRequestedEvent | ClosedEvent_2 | ClosingEvent | DisabledMovementBoundsChangedEvent | DisabledMovementBoundsChangingEvent | EmbeddedEvent | EndUserBoundsChangingEvent | ExternalProcessExitedEvent | ExternalProcessStartedEvent | HiddenEvent_2 | HotkeyEvent_2 | InitializedEvent_2 | LayoutInitializedEvent | LayoutReadyEvent | MaximizedEvent | MinimizedEvent | OptionsChangedEvent | PerformanceReportEvent | PreloadScriptsStateChangedEvent | PreloadScriptsStateChangingEvent | ReloadedEvent | RestoredEvent | ShowRequestedEvent | ShownEvent_2 | UserMovementDisabledEvent | UserMovementEnabledEvent | WillMoveEvent | WillRedirectEvent | WillResizeEvent | ShowAllDownloadsEvent | DownloadShelfVisibilityChangedEvent;
 
      /**
       * Generated when a child window starts loading.
       * @interface
       */
-     declare type WindowStartLoadEvent = BaseApplicationEvent & {
+     declare type WindowStartLoadEvent = BaseEvent_3 & {
          type: 'window-start-load';
      };