@openfin/node-adapter 34.78.52 → 35.78.1

package/out/node-adapter.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 = BaseEvent_5 & {
+declare type AlertRequestedEvent = BaseWindowEvent & {
     type: 'alert-requested';
     message: string;
     url: string;
@@ -105,15 +105,6 @@ 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
  */
@@ -871,15 +862,19 @@ declare class Application extends EmitterBase<OpenFin.ApplicationEvent> {
 }
 
 /**
- * @deprecated Renamed to {@link ConnectedEvent}.
+ * Generated when an application has authenticated and is connected.
+ * @interface
  */
-declare type ApplicationConnectedEvent = ConnectedEvent_2;
+declare type ApplicationConnectedEvent = IdentityEvent & {
+    topic: 'application';
+    type: 'connected';
+};
 
 /**
  * Generated when an application is created.
  * @interface
  */
-declare type ApplicationCreatedEvent = BaseEvent_8 & BaseEvents.IdentityEvent & {
+declare type ApplicationCreatedEvent = BaseSystemEvent & IdentityEvent & {
     type: 'application-created';
 };
 
@@ -903,15 +898,17 @@ declare type ApplicationCreationOptions = Partial<ApplicationOptions> & {
 };
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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).
  */
-declare type ApplicationEvent = Event_3;
+declare type ApplicationEvent = PropagatedViewEvent<'application'> | PropagatedWindowEvent<'application'> | ApplicationWindowEvent | ApplicationSourcedEvent;
 
 declare type ApplicationEvent_2 = Events.ApplicationEvents.ApplicationEvent;
 
 declare namespace ApplicationEvents {
     export {
-        BaseEvent_3 as BaseEvent,
         BaseApplicationEvent,
         CrashedEvent,
         FileDownloadLocationChangedEvent,
@@ -924,9 +921,7 @@ declare namespace ApplicationEvents {
         WindowRespondingEvent,
         WindowStartLoadEvent,
         ApplicationWindowEvent,
-        ApplicationWindowEventTypes,
         ClosedEvent,
-        ConnectedEvent_2 as ConnectedEvent,
         ApplicationConnectedEvent,
         InitializedEvent,
         ManifestChangedEvent,
@@ -934,23 +929,19 @@ 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_4 as Payload,
-        ByType_3 as ByType
+        Payload_2 as Payload,
+        ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link EventType}.
+ * Union of possible `type` values for a {@link OpenFin.ApplicationEvents.ApplicationEvent}.
  */
-declare type ApplicationEventType = EventType_3;
+declare type ApplicationEventType = ApplicationEvent['type'];
 
 declare type ApplicationIdentity = OpenFin.ApplicationIdentity;
 
@@ -1303,8 +1294,9 @@ 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 | ConnectedEvent_2 | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent_2 | StartedEvent | TrayIconClickedEvent | FileDownloadLocationChangedEvent;
+declare type ApplicationSourcedEvent = ClosedEvent | ApplicationConnectedEvent | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent_2 | StartedEvent | TrayIconClickedEvent | FileDownloadLocationChangedEvent;
 
 declare type ApplicationState = OpenFin.ApplicationState;
 
@@ -1343,11 +1335,6 @@ declare type ApplicationType = {
  */
 declare type ApplicationWindowEvent = WindowAlertRequestedEvent | WindowCreatedEvent | WindowEndLoadEvent | WindowNotRespondingEvent | WindowRespondingEvent | WindowStartLoadEvent;
 
-/**
- * Array of valid `type` values for an {@link ApplicationWindowEvent}.
- */
-declare const ApplicationWindowEventTypes: readonly ["window-alert-requested", "window-created", "window-end-load", "window-not-responding", "window-responding", "window-start-load"];
-
 declare type ApplicationWindowInfo = OpenFin.ApplicationWindowInfo;
 
 /**
@@ -1625,7 +1612,7 @@ declare interface AuthorizationPayload {
  * ```
  * @interface
  */
-declare type AuthRequestedEvent = BaseEvent_5 & {
+declare type AuthRequestedEvent = BaseWindowEvent & {
     type: 'auth-requested';
     authInfo: {
         host: string;
@@ -1693,9 +1680,21 @@ declare class Base {
 }
 
 /**
- * @deprecated Renamed to {@link BaseEvent}.
+ * Base type for events emitting on the `application` topic
+ * @interface
  */
-declare type BaseApplicationEvent = BaseEvent_3;
+declare type BaseApplicationEvent = NamedEvent & {
+    topic: `application`;
+};
+
+/**
+ * A base Channel event.
+ * @interface
+ */
+declare type BaseChannelEvent = NamedEvent & {
+    channelName: string;
+    channelId: string;
+};
 
 /**
  * @interface
@@ -1764,70 +1763,10 @@ declare type BaseEvent = {
     type: string;
 };
 
-/**
- * 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.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 type BaseEvent_2 = Events.BaseEvents.BaseEvent;
 
 declare namespace BaseEvents {
     export {
-        NotCloseRequested,
         PropagatedEventType,
         PropagatedEvent,
         EventHandler,
@@ -1838,14 +1777,21 @@ declare namespace BaseEvents {
 }
 
 /**
- * @deprecated Renamed to {@link BaseEvent}.
+ * Base type for events emitting on the `externalapplication` topic
+ * @interface
  */
-declare type BaseExternalApplicationEvent = BaseEvent_6;
+declare type BaseExternalApplicationEvent = BaseEvent & {
+    topic: 'externalapplication';
+};
 
 /**
- * @deprecated Renamed to {@link BaseEvent}.
+ * The base frame event.
+ * @interface
  */
-declare type BaseFrameEvent = BaseEvent_7;
+declare type BaseFrameEvent = NamedEvent & {
+    entityType: 'iframe';
+    frameName: string;
+};
 
 declare type BaseLoadFailedEvent = NamedEvent & {
     errorCode: number;
@@ -1854,20 +1800,35 @@ 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;
 };
 
 /**
- * @deprecated Renamed to {@link BaseEvent}.
+ * Base type for events emitting on the `view` topic
+ * @interface
  */
-declare type BaseViewEvent = BaseEvent_4;
+declare type BaseViewEvent = NamedEvent & {
+    topic: 'view';
+    target: OpenFin.Identity;
+};
 
 /**
- * @deprecated Renamed to {@link BaseEvent}.
+ * Base type for events emitting on the `window` topic
+ * @interface
  */
-declare type BaseWindowEvent = BaseEvent_5;
+declare type BaseWindowEvent = NamedEvent & {
+    topic: 'window';
+};
 
 /**
  * User decision of whether a Window or specific View should close when trying to prevent an unload.
@@ -1934,7 +1895,7 @@ declare type BoundsChangedEvent = BoundsChangeEvent & {
  * A general bounds change event without event type.
  * @interface
  */
-declare type BoundsChangeEvent = BaseEvent_5 & {
+declare type BoundsChangeEvent = BaseWindowEvent & {
     changeType: 0 | 1 | 2;
     deferred: boolean;
     height: number;
@@ -2006,76 +1967,76 @@ declare interface BrowserWindow {
 }
 
 /**
- * Extracts a single event type matching the given key from the View {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link ApplicationEvent} 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 EventType> = Payload_2<Type>;
+declare type ByType<Type extends ApplicationEventType> = Payload_2<Type>;
 
 /**
- * Extracts a single event type matching the given key from the Window {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link ExternalApplicationEvent} 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 EventType_2> = Payload_3<Type>;
+declare type ByType_2<Type extends ExternalApplicationEventType> = Payload_3<Type>;
 
 /**
- * Extracts a single event type matching the given key from the Application {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link FrameEvent} 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 EventType_3> = Payload_4<Type>;
+declare type ByType_3<Type extends FrameEventType> = Payload_4<Type>;
 
 /**
- * Extracts a single event type matching the given key from the ExternalApplication {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link GlobalHotkeyEvent} 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 EventType_4> = Payload_5<Type>;
+declare type ByType_4<Type extends GlobalHotkeyEventType> = Payload_5<Type>;
 
 /**
- * Extracts a single event type matching the given key from the Frame {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link PlatformEvent} 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 EventType_5> = Payload_6<Type>;
+declare type ByType_5<Type extends PlatformEventType> = Payload_6<Type>;
 
 /**
- * Extracts a single event type matching the given key from the GlobalHotkey {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link SystemEvent} 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 EventType_6> = Payload_7<Type>;
+declare type ByType_6<Type extends SystemEventType> = Payload_7<Type>;
 
 /**
- * Extracts a single event type matching the given key from the Platform {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link ViewEvent} 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 EventType_7> = Payload_8<Type>;
+declare type ByType_7<Type extends ViewEventType> = Payload_8<Type>;
 
 /**
- * Extracts a single event type matching the given key from the System {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link WindowEvent} 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 EventType_8> = Payload_9<Type>;
+declare type ByType_8<Type extends WindowEventType> = Payload_9<Type>;
 
 /**
  * Configuration for page capture.
@@ -2758,6 +2719,14 @@ 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.
  *
@@ -2789,9 +2758,21 @@ declare type ChannelCreateOptions = {
 };
 
 /**
- * @deprecated Renamed to {@link Event}.
+ * Generated when a Channel client has disconnected.
+ * @interface
  */
-declare type ChannelEvent = Event_2;
+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 ChannelMiddleware = OpenFin.ChannelMiddleware;
 
@@ -3329,19 +3310,11 @@ declare type ClipboardSelectionType = 'clipboard' | 'selection';
  * Generated when an application is closed.
  * @interface
  */
-declare type ClosedEvent = BaseEvents.IdentityEvent & {
+declare type ClosedEvent = IdentityEvent & {
     topic: 'application';
     type: 'closed';
 };
 
-/**
- * Generated when a window has closed.
- * @interface
- */
-declare type ClosedEvent_2 = BaseEvent_5 & {
-    type: 'closed';
-};
-
 /**
  * @interface
  */
@@ -3349,15 +3322,6 @@ 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
  */
@@ -3404,14 +3368,6 @@ 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.
  */
@@ -3549,39 +3505,6 @@ export declare function connect(config: ConnectConfig): Promise<Fin<'external co
 
 declare type ConnectConfig = ExistingConnectConfig | NewConnectConfig | ExternalConfig;
 
-/**
- * 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>;
@@ -4323,7 +4246,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 = BaseEvent_5 & {
+declare type ContextChangedEvent = BaseWindowEvent & {
     type: 'context-changed';
     context: any;
 };
@@ -4475,7 +4398,7 @@ declare type CpuInfo = {
  * Generated when an application has crashed.
  * @interface
  */
-declare type CrashedEvent = BaseEvents.IdentityEvent & {
+declare type CrashedEvent = IdentityEvent & {
     topic: 'application';
     type: 'crashed';
     reason: 'normal-termination' | 'abnormal-termination' | 'killed' | 'crashed' | 'still-running' | 'launch-failed' | 'out-of-memory' | 'integrity-failure';
@@ -4526,7 +4449,7 @@ declare type CrashReporterState = CrashReporterOptions & {
  * Generated when a View is created.
  * @interface
  */
-declare type CreatedEvent = BaseEvent_4 & {
+declare type CreatedEvent = BaseViewEvent & {
     type: 'created';
 };
 
@@ -4685,7 +4608,7 @@ declare interface DesktopAgent_2 {
  * Generated when the desktop icon is clicked while it's already running.
  * @interface
  */
-declare type DesktopIconClickedEvent = BaseEvent_8 & {
+declare type DesktopIconClickedEvent = BaseSystemEvent & {
     type: 'desktop-icon-clicked';
 };
 
@@ -4693,7 +4616,7 @@ declare type DesktopIconClickedEvent = BaseEvent_8 & {
  * Generated when a View is destroyed.
  * @interface
  */
-declare type DestroyedEvent = BaseEvent_4 & {
+declare type DestroyedEvent = BaseViewEvent & {
     type: 'destroyed';
 };
 
@@ -4793,30 +4716,6 @@ 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,
@@ -4950,7 +4849,7 @@ declare type DownloadShelfOptions = {
  *
  * @interface
  */
-declare type DownloadShelfVisibilityChangedEvent = BaseEvent_5 & {
+declare type DownloadShelfVisibilityChangedEvent = BaseWindowEvent & {
     type: 'download-shelf-visibility-changed';
     /**
      * True if the download shelf was just opened; false if it was just closed.
@@ -4980,7 +4879,7 @@ declare interface DragSource {}
  * Generated when a window has been embedded.
  * @interface
  */
-declare type EmbeddedEvent = BaseEvent_5 & {
+declare type EmbeddedEvent = BaseWindowEvent & {
     type: 'embedded';
 };
 
@@ -5084,7 +4983,7 @@ declare class EmitterMap {
  * Generated when a window ends loading.
  * @interface
  */
-declare type EndLoadEvent = BaseEvent_5 & {
+declare type EndLoadEvent = BaseWindowEvent & {
     type: 'end-load';
     documentName: string;
     isMain: boolean;
@@ -5201,88 +5100,6 @@ 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'>> | ViewEvents.PropagatedEvent<'system'> | ApplicationEvents.PropagatedEvent<'system'> | ApplicationCreatedEvent | DesktopIconClickedEvent | IdleEvent | MonitorEvent | 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.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;
 }
@@ -5348,46 +5165,6 @@ declare namespace Events {
     }
 }
 
-/**
- * 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 EventType_8 = SystemEvent['type'];
-
 /**
  * @internal
  */
@@ -5401,8 +5178,6 @@ 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;
@@ -5532,43 +5307,46 @@ declare class ExternalApplication extends EmitterBase<OpenFin.ExternalApplicatio
 }
 
 /**
- * @deprecated Renamed to {@link ConnectedEvent}.
+ * Generated when an external application has authenticated and is connected.
+ * @interface
  */
-declare type ExternalApplicationConnectedEvent = ConnectedEvent_3;
+declare type ExternalApplicationConnectedEvent = BaseExternalApplicationEvent & {
+    type: 'connected';
+};
 
 /**
- * @deprecated Renamed to {@link DisconnectedEvent}.
+ * Generated when an external application has disconnected.
+ * @interface
  */
-declare type ExternalApplicationDisconnectedEvent = DisconnectedEvent_2;
+declare type ExternalApplicationDisconnectedEvent = BaseExternalApplicationEvent & {
+    type: 'disconnected';
+};
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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 ExternalApplicationEvent = Event_7;
+declare type ExternalApplicationEvent = ExternalApplicationConnectedEvent | ExternalApplicationDisconnectedEvent;
 
 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_5 as Payload,
-        ByType_4 as ByType
+        Payload_3 as Payload,
+        ByType_2 as ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link Event}.
+ * Union of possible `type` values for a {@link ApplicationEvent}.
  */
-declare type ExternalApplicationEventType = EventType_4;
+declare type ExternalApplicationEventType = ExternalApplicationEvent['type'];
 
 /**
  * @interface
@@ -5633,7 +5411,7 @@ declare type ExternalConnection = {
  * Generated when an external process has exited.
  * @interface
  */
-declare type ExternalProcessExitedEvent = BaseEvent_5 & {
+declare type ExternalProcessExitedEvent = BaseWindowEvent & {
     type: 'external-process-exited';
     processUuid: string;
     exitCode: number;
@@ -5678,15 +5456,19 @@ declare type ExternalProcessRequestType = {
  * Generated when an external process has started.
  * @interface
  */
-declare type ExternalProcessStartedEvent = BaseEvent_5 & {
+declare type ExternalProcessStartedEvent = BaseWindowEvent & {
     type: 'external-process-started';
     processUuid: string;
 };
 
 /**
- * @deprecated, use {@link PageFaviconUpdatedEvent}.
+ * Generated when page receives favicon urls.
+ * @interface
  */
-declare type FaviconUpdatedEvent = PageFaviconUpdatedEvent;
+declare type FaviconUpdatedEvent = NamedEvent & {
+    type: 'page-favicon-updated';
+    favicons: string[];
+};
 
 declare namespace FDC3 {
     export {
@@ -6067,43 +5849,48 @@ declare class _Frame extends EmitterBase<OpenFin.FrameEvent> {
 }
 
 /**
- * @deprecated Renamed to {@link ConnectedEvent}.
+ * Generated when a frame is connected.
+ * @interface
  */
-declare type FrameConnectedEvent = ConnectedEvent_4;
+declare type FrameConnectedEvent = BaseFrameEvent & {
+    type: 'connected';
+};
 
 /**
- * @deprecated Renamed to {@link DisconnectedEvent}.
+ * Generated when a frame has disconnected.
+ * @interface
  */
-declare type FrameDisconnectedEvent = DisconnectedEvent_3;
+declare type FrameDisconnectedEvent = BaseFrameEvent & {
+    type: 'disconnected';
+};
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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 FrameEvent = Event_8;
+declare type FrameEvent = {
+    topic: 'frame';
+} & (FrameConnectedEvent | FrameDisconnectedEvent);
 
 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_6 as Payload,
-        ByType_5 as ByType
+        Payload_4 as Payload,
+        ByType_3 as ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link EventType}.
+ *  Union of possible `type` values for a {@link FrameEvent}.
  */
-declare type FrameEventType = EventType_5;
+declare type FrameEventType = FrameEvent['type'];
 
 /**
  * @interface
@@ -6325,9 +6112,14 @@ declare class GlobalHotkey extends EmitterBase<OpenFin.GlobalHotkeyEvent> {
 }
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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.
  */
-declare type GlobalHotkeyEvent = Event_9;
+declare type GlobalHotkeyEvent = {
+    topic: 'global-hotkey';
+    hotkey: 'string';
+} & (RegisteredEvent | UnregisteredEvent);
 
 declare type GlobalHotkeyEvent_2 = Events.GlobalHotkeyEvents.GlobalHotkeyEvent;
 
@@ -6335,19 +6127,17 @@ declare namespace GlobalHotkeyEvents {
     export {
         RegisteredEvent,
         UnregisteredEvent,
-        Event_9 as Event,
         GlobalHotkeyEvent,
-        EventType_6 as EventType,
         GlobalHotkeyEventType,
-        Payload_7 as Payload,
-        ByType_6 as ByType
+        Payload_5 as Payload,
+        ByType_4 as ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link EventType}.
+ * Union of possible `type` values for a {@link GlobalHotkeyEvent}
  */
-declare type GlobalHotkeyEventType = EventType_6;
+declare type GlobalHotkeyEventType = GlobalHotkeyEvent['type'];
 
 declare namespace GoldenLayout {
     export {
@@ -6649,17 +6439,8 @@ declare interface Header {
  * Generated when a View is hidden.
  * @interface
  */
-declare type HiddenEvent = BaseEvent_4 & {
-    type: 'hidden';
-};
-
-/**
- * Generated when a window has been hidden.
- * @interface
- */
-declare type HiddenEvent_2 = BaseEvent_5 & {
+declare type HiddenEvent = BaseViewEvent & {
     type: 'hidden';
-    reason: 'closing' | 'hide' | 'hide-on-close';
 };
 
 /**
@@ -6667,7 +6448,7 @@ declare type HiddenEvent_2 = BaseEvent_5 & {
  * or because the View has moved to a new window. Only available on Views in a Platform.
  * @interface
  */
-declare type HostContextChangedEvent = BaseEvent_4 & {
+declare type HostContextChangedEvent = BaseViewEvent & {
     type: 'host-context-changed';
     context: any;
     reason: 'reparented' | 'updated';
@@ -6746,16 +6527,7 @@ 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 = 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 & {
+declare type HotkeyEvent = BaseViewEvent & {
     type: 'hotkey';
 };
 
@@ -6818,7 +6590,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 = BaseEvent_8 & {
+declare type IdleEvent = BaseSystemEvent & {
     type: 'idle-state-changed';
     elapsedTime: number;
     isIdle: boolean;
@@ -6903,19 +6675,11 @@ declare type InfoForIntentOptions<MetadataType = IntentMetadata_3> = {
  * Generated when an application has initialized.
  * @interface
  */
-declare type InitializedEvent = BaseEvents.IdentityEvent & {
+declare type InitializedEvent = IdentityEvent & {
     topic: 'application';
     type: 'initialized';
 };
 
-/**
- * Generated when a window is initialized.
- * @interface
- */
-declare type InitializedEvent_2 = BaseEvent_5 & {
-    type: 'initialized';
-};
-
 /**
  * @interface
  */
@@ -9019,7 +8783,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 = BaseEvent_5 & {
+declare type LayoutInitializedEvent = BaseWindowEvent & {
     type: 'layout-initialized';
     ofViews: (OpenFin.Identity & {
         entityType: 'view';
@@ -9556,7 +9320,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 = BaseEvent_5 & {
+declare type LayoutReadyEvent = BaseWindowEvent & {
     type: 'layout-ready';
     views: (OpenFin.Identity & {
         success: boolean;
@@ -9697,7 +9461,7 @@ declare type Manifest = {
  * Generated when the RVM notifies an application that the manifest has changed.
  * @interface
  */
-declare type ManifestChangedEvent = BaseEvents.IdentityEvent & {
+declare type ManifestChangedEvent = IdentityEvent & {
     topic: 'application';
     type: 'manifest-changed';
 };
@@ -9750,7 +9514,7 @@ declare type MatchPattern = string;
  * Generated when a window is maximized.
  * @interface
  */
-declare type MaximizedEvent = BaseEvent_5 & {
+declare type MaximizedEvent = BaseWindowEvent & {
     type: 'maximized';
 };
 
@@ -9860,7 +9624,7 @@ declare type MessagingProtocols = ProtocolOffer['type'];
  * Generated when a window is minimized.
  * @interface
  */
-declare type MinimizedEvent = BaseEvent_5 & {
+declare type MinimizedEvent = BaseWindowEvent & {
     type: 'minimized';
 };
 
@@ -9909,7 +9673,7 @@ declare type MonitorDetails = {
  * The available space of a monitor defines a rectangle that is not occupied by the taskbar
  * @interface
  */
-declare type MonitorEvent = BaseEvent_8 & OpenFin.MonitorInfo & {
+declare type MonitorEvent = BaseSystemEvent & OpenFin.MonitorInfo & {
     type: 'monitor-info-changed';
 };
 
@@ -10341,23 +10105,14 @@ 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 extends String> = EventType extends `${infer U}-requested` ? never : EventType;
+declare type NotRequested<EventType> = EventType extends `${infer U}-requested` ? never : EventType;
 
 /**
  * Generated when an application is not responding.
  * @interface
  */
-declare type NotRespondingEvent = BaseEvents.IdentityEvent & {
+declare type NotRespondingEvent = IdentityEvent & {
     topic: 'application';
     type: 'not-responding';
 };
@@ -10683,7 +10438,7 @@ declare namespace OpenFin {
         AppVersionCompleteEvent,
         AppVersionRuntimeStatusEvent,
         Events,
-        BaseEvent_9 as BaseEvent,
+        BaseEvent_2 as BaseEvent,
         WebContentsEvent_2 as WebContentsEvent,
         SystemEvent_2 as SystemEvent,
         ApplicationEvent_2 as ApplicationEvent,
@@ -10725,32 +10480,12 @@ export default OpenFin;
 
 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.WindowOptions;
-    diff: OpenFin.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.
@@ -10769,74 +10504,74 @@ declare type Payload<Success extends boolean = boolean, Data = any> = {
 };
 
 /**
- * Extracts a single event type matching the given key from the View {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link ApplicationEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_2<Type extends EventType> = Extract<Event_4, {
+declare type Payload_2<Type extends ApplicationEventType> = Extract<ApplicationEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the Window {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link ExternalApplicationEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_3<Type extends EventType_2> = Extract<Event_6, {
+declare type Payload_3<Type extends ExternalApplicationEventType> = Extract<ExternalApplicationEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the Application {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link FrameEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_4<Type extends EventType_3> = Extract<Event_3, {
+declare type Payload_4<Type extends FrameEventType> = Extract<FrameEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the ExternalApplication {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link GlobalHotkeyEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_5<Type extends EventType_4> = Extract<Event_7, {
+declare type Payload_5<Type extends GlobalHotkeyEventType> = Extract<GlobalHotkeyEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the Frame {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link PlatformEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_6<Type extends EventType_5> = Extract<Event_8, {
+declare type Payload_6<Type extends PlatformEventType> = Extract<PlatformEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the GlobalHotkey {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link SystemEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_7<Type extends EventType_6> = Extract<Event_9, {
+declare type Payload_7<Type extends SystemEventType> = Extract<SystemEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the Platform {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link ViewEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_8<Type extends EventType_7> = Extract<Event_10, {
+declare type Payload_8<Type extends ViewEventType> = Extract<ViewEvent, {
     type: Type;
 }>;
 
 /**
- * Extracts a single event type matching the given key from the System {@link Event} union.
+ * Extracts a single event type matching the given key from the {@link WindowEvent} union.
  *
  * @typeParam Type String key specifying the event to extract
  */
-declare type Payload_9<Type extends EventType_8> = Extract<Event_11, {
+declare type Payload_9<Type extends WindowEventType> = Extract<WindowEvent, {
     type: Type;
 }>;
 
@@ -10846,7 +10581,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 & BaseEvent_5 & {
+declare type PerformanceReportEvent = Performance & BaseWindowEvent & {
     type: 'performance-report';
 };
 
@@ -11510,36 +11245,38 @@ declare class Platform extends EmitterBase<OpenFin.PlatformEvent> {
 }
 
 /**
- * @deprecated Renamed to {@link ApiReadyEvent}.
+ * Generated when a new Platform's API becomes responsive.
+ * @interface
  */
-declare type PlatformApiReadyEvent = ApiReadyEvent;
+declare type PlatformApiReadyEvent = BaseEvent & {
+    topic: 'application';
+    type: 'platform-api-ready';
+};
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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.
  */
-declare type PlatformEvent = Event_10;
+declare type PlatformEvent = ApplicationEvent | PlatformApiReadyEvent | PlatformSnapshotAppliedEvent;
 
 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_8 as Payload,
-        ByType_7 as ByType
+        Payload_6 as Payload,
+        ByType_5 as ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link }.
+ * Union of possible `type` values for a {@link PlatformEvent}.
  */
-declare type PlatformEventType = EventType_7;
+declare type PlatformEventType = PlatformEvent['type'];
 
 /**
  * Static namespace for OpenFin API methods that interact with the {@link Platform} class, available under `fin.Platform`.
@@ -11819,14 +11556,11 @@ 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 payload
-     * @param callerIdentity
+     * @param layout
+     * @param target
      * @returns an array of promises
      */
-    createViewsForLayout(payload: {
-        layout: GoldenLayout.Config;
-        target?: OpenFin.Identity;
-    }, callerIdentity: OpenFin.Identity): Promise<OpenFin.View>[];
+    createViewsForLayout(layout: GoldenLayout.Config, target: OpenFin.Identity): Promise<OpenFin.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.
@@ -12267,9 +12001,19 @@ declare interface PlatformProvider {
 }
 
 /**
- * @deprecated Renamed to {@link SnapshotAppliedEvent}.
+ * 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 PlatformSnapshotAppliedEvent = SnapshotAppliedEvent;
+declare type PlatformSnapshotAppliedEvent = BaseEvent & {
+    topic: 'application';
+    type: 'platform-snapshot-applied';
+};
 
 /**
  * @interface
@@ -12537,7 +12281,7 @@ declare type PreloadScriptsStateChangedEvent = PreloadScriptsStateChangeEvent &
  * A general preload scripts state change event without event type.
  * @interface
  */
-declare type PreloadScriptsStateChangeEvent = BaseEvent_5 & {
+declare type PreloadScriptsStateChangeEvent = BaseWindowEvent & {
     preloadScripts: (PreloadScriptInfoRunning & any)[];
 };
 
@@ -12746,43 +12490,51 @@ declare type ProcessLoggingOptions = {
 };
 
 /**
- * @deprecated Renamed to {@link PropagatedEvent}.
+ * 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 PropagatedApplicationEvent<TargetTopic extends string> = PropagatedEvent_4<TargetTopic>;
+declare type PropagatedApplicationEvent<TargetTopic extends string> = PropagatedEvent<'application', TargetTopic, ApplicationSourcedEvent> | ApplicationWindowEvent;
 
 /**
- * @deprecated Renamed to {@link PropagatedEventType}.
+ * Union of possible 'type' values for a {@link OpenFin.ApplicationEvents.PropagatedApplicationEvent}.
  */
-declare type PropagatedApplicationEventType = PropagatedEventType_3;
+declare type PropagatedApplicationEventType = PropagatedApplicationEvent<string>['type'];
 
 /**
- * Modifies an event shape to reflect propagation to a parent topic.  Excludes `close-requested` events, as
- * these do not propagate.
- *
+ * Modifies an event shape to reflect propagation to a parent topic.
  * @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;
-} ? E['type'] extends 'close-requested' ? never : Omit<E, 'type' | 'topic'> & {
+} ? 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 PropagatedEvent_2<TargetTopic extends string> = BaseEvents.PropagatedEvent<'view', TargetTopic, ViewEvent> & {
+declare type PropagatedViewEvent<TargetTopic extends string> = PropagatedEvent<'view', TargetTopic, ViewEvent> & {
     viewIdentity: OpenFin.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
@@ -12791,51 +12543,12 @@ declare type PropagatedEvent_2<TargetTopic extends string> = BaseEvents.Propagat
  *
  * "Requested" events (e.g. {@link AuthRequestedEvent}) do not propagate to `System.`
  */
-declare type PropagatedEvent_3<TargetTopic extends string> = BaseEvents.PropagatedEvent<'window', TargetTopic, WindowSourcedEvent>;
+declare type PropagatedWindowEvent<TargetTopic extends string> = PropagatedEvent<'window', TargetTopic, Exclude<WindowSourcedEvent, WindowCloseRequestedEvent>>;
 
 /**
- * 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 an {@link PropagatedEvent} sourced from an {@link Application}.
- */
-declare type PropagatedEventType_3 = PropagatedEvent_4<string>['type'];
-
-/**
- * @deprecated Renamed to {@link PropagatedEvent}.
+ * Union of possible `type` values for a {@link OpenFin.WindowEvents.PropagatedWindowEvent}.
  */
-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 type PropagatedWindowEventType = PropagatedWindowEvent<string>['type'];
 
 declare interface ProtocolMap extends ProtocolMapBase {
     'request-external-authorization': {
@@ -13253,7 +12966,7 @@ declare type RegistryInfo_2 = {
  * Generated when a window has been reloaded.
  * @interface
  */
-declare type ReloadedEvent = BaseEvent_5 & {
+declare type ReloadedEvent = BaseWindowEvent & {
     type: 'reloaded';
     url: string;
 };
@@ -13389,19 +13102,11 @@ declare type ResourceResponseReceivedEvent = NamedEvent & {
  * Generated when an application is responding.
  * @interface
  */
-declare type RespondingEvent = BaseEvents.IdentityEvent & {
+declare type RespondingEvent = 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';
 
 /**
@@ -13464,7 +13169,7 @@ declare type RunRequestedEvent = OpenFin.ApplicationEvents.RunRequestedEvent;
  * Generated when Application.run() is called for an already running application.
  * @interface
  */
-declare type RunRequestedEvent_2 = BaseEvents.IdentityEvent & {
+declare type RunRequestedEvent_2 = IdentityEvent & {
     topic: 'application';
     type: 'run-requested';
     userAppConfigArgs: Record<string, any>;
@@ -13646,7 +13351,7 @@ declare type ServiceIdentifier = {
  * Generated on changes to a user’s local computer session.
  * @interface
  */
-declare type SessionChangedEvent = BaseEvent_8 & {
+declare type SessionChangedEvent = BaseSystemEvent & {
     type: 'session-changed';
     reason: 'lock' | 'unlock' | 'remote-connect' | 'remote-disconnect' | 'unknown';
 };
@@ -13868,7 +13573,7 @@ declare type ShortcutOverride = Hotkey & {
  *
  * @interface
  */
-declare type ShowAllDownloadsEvent = BaseEvent_5 & {
+declare type ShowAllDownloadsEvent = BaseWindowEvent & {
     type: 'show-all-downloads';
 };
 
@@ -13876,15 +13581,7 @@ declare type ShowAllDownloadsEvent = BaseEvent_5 & {
  * Generated when a View is shown. This event will fire during creation of a View.
  * @interface
  */
-declare type ShownEvent = BaseEvent_4 & {
-    type: 'shown';
-};
-
-/**
- * Generated when a hidden window has been shown.
- * @interface
- */
-declare type ShownEvent_2 = BaseEvent_5 & {
+declare type ShownEvent = BaseViewEvent & {
     type: 'shown';
 };
 
@@ -13913,15 +13610,6 @@ 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.
  *
@@ -13968,21 +13656,6 @@ 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
  */
@@ -14100,7 +13773,7 @@ declare class SnapshotSourceModule extends Base {
  * Generated when an application has started.
  * @interface
  */
-declare type StartedEvent = BaseEvents.IdentityEvent & {
+declare type StartedEvent = IdentityEvent & {
     topic: 'application';
     type: 'started';
 };
@@ -15636,9 +15309,12 @@ declare type SystemChannel = Omit<Channel_3, 'addContextListener' | 'broadcast'
 };
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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 SystemEvent = Event_11;
+declare type SystemEvent = ExcludeRequested<PropagatedWindowEvent<'system'>> | PropagatedViewEvent<'system'> | PropagatedApplicationEvent<'system'> | ApplicationCreatedEvent | DesktopIconClickedEvent | IdleEvent | MonitorEvent | SessionChangedEvent | AppVersionEventWithId | SystemShutdownEvent;
 
 declare type SystemEvent_2 = Events.SystemEvents.SystemEvent;
 
@@ -15646,7 +15322,7 @@ declare namespace SystemEvents {
     export {
         NotRequested,
         ExcludeRequested,
-        BaseEvent_8 as BaseEvent,
+        BaseSystemEvent,
         IdleEvent,
         MonitorEvent,
         SessionChangedEvent,
@@ -15661,19 +15337,17 @@ declare namespace SystemEvents {
         ApplicationCreatedEvent,
         DesktopIconClickedEvent,
         SystemShutdownEvent,
-        Event_11 as Event,
         SystemEvent,
-        EventType_8 as EventType,
         SystemEventType,
-        Payload_9 as Payload,
-        ByType_8 as ByType
+        Payload_7 as Payload,
+        ByType_6 as ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link EventType}.
+ * Union of possible `type` values for a {@link SystemEvent}.
  */
-declare type SystemEventType = EventType_8;
+declare type SystemEventType = SystemEvent['type'];
 
 /**
  * @interface
@@ -15730,7 +15404,7 @@ declare type SystemProcessInfo = {
  * Generated when system shutdown or log off.
  * @internal
  */
-declare type SystemShutdownEvent = BaseEvent_8 & {
+declare type SystemShutdownEvent = BaseSystemEvent & {
     type: 'system-shutdown';
 };
 
@@ -15983,7 +15657,7 @@ declare type TargetApp = string | AppMetadata;
  * In that case, previousTarget identity will be the same as target identity.
  * @interface
  */
-declare type TargetChangedEvent = BaseEvent_4 & {
+declare type TargetChangedEvent = BaseViewEvent & {
     type: 'target-changed';
     previousTarget: OpenFin.Identity;
 };
@@ -16137,7 +15811,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
  * Generated when the tray icon is clicked.
  * @interface
  */
-declare type TrayIconClickedEvent = BaseEvents.IdentityEvent & {
+declare type TrayIconClickedEvent = IdentityEvent & {
     topic: 'application';
     type: 'tray-icon-clicked';
     button: 0 | 1 | 2;
@@ -16227,7 +15901,7 @@ declare type UrlChangedEvent = BaseUrlEvent & ({
  * A general user bounds change event without event type.
  * @interface
  */
-declare type UserBoundsChangeEvent = BaseEvent_5 & {
+declare type UserBoundsChangeEvent = BaseWindowEvent & {
     height: number;
     left: number;
     top: number;
@@ -16239,7 +15913,7 @@ declare type UserBoundsChangeEvent = BaseEvent_5 & {
  * Generated when a window's user movement becomes disabled.
  * @interface
  */
-declare type UserMovementDisabledEvent = BaseEvent_5 & {
+declare type UserMovementDisabledEvent = BaseWindowEvent & {
     type: 'user-movement-disabled';
 };
 
@@ -16247,7 +15921,7 @@ declare type UserMovementDisabledEvent = BaseEvent_5 & {
  * Generated when a window's user movement becomes enabled.
  * @interface
  */
-declare type UserMovementEnabledEvent = BaseEvent_5 & {
+declare type UserMovementEnabledEvent = BaseWindowEvent & {
     type: 'user-movement-enabled';
 };
 
@@ -16934,7 +16608,7 @@ declare class View_2 extends WebContents<OpenFin.ViewEvent> {
  * Generated when a View is attached to a window.
  * @interface
  */
-declare type ViewAttachedEvent = BaseEvent_5 & {
+declare type ViewAttachedEvent = BaseWindowEvent & {
     type: 'view-attached';
     target: OpenFin.Identity;
     viewIdentity: OpenFin.Identity;
@@ -16976,7 +16650,7 @@ declare type ViewCreationOrReference = OpenFin.Identity | OpenFin.PlatformViewCr
  * @remarks Will fire when a view is destroyed in which case `target` will be null.
  * @interface
  */
-declare type ViewDetachedEvent = BaseEvent_5 & {
+declare type ViewDetachedEvent = BaseWindowEvent & {
     type: 'view-detached';
     target: OpenFin.Identity;
     previousTarget: OpenFin.Identity;
@@ -16984,15 +16658,18 @@ declare type ViewDetachedEvent = BaseEvent_5 & {
 };
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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}).
  */
-declare type ViewEvent = Event_4;
+declare type ViewEvent = (WebContentsEvent<'view'> & {
+    target: OpenFin.Identity;
+}) | CreatedEvent | DestroyedEvent | HiddenEvent | HotkeyEvent | ShownEvent | TargetChangedEvent | HostContextChangedEvent;
 
 declare type ViewEvent_2 = Events.ViewEvents.ViewEvent;
 
 declare namespace ViewEvents {
     export {
-        BaseEvent_4 as BaseEvent,
         BaseViewEvent,
         TargetChangedEvent,
         NonPropagatedViewEvent,
@@ -17002,24 +16679,20 @@ 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_2 as Payload,
-        ByType
+        Payload_8 as Payload,
+        ByType_7 as ByType
     }
 }
 
 /**
- * @deprecated Renamed to {@link EventType}.
+ * Union of possible `type` values for a {@link OpenFin.ViewEvents.ViewEvent}.
  */
-declare type ViewEventType = EventType;
+declare type ViewEventType = ViewEvent['type'];
 
 /**
  * @interface
@@ -18158,9 +17831,12 @@ declare class WebContents<T extends BaseEvent> extends EmitterBase<T> {
 }
 
 /**
- * @deprecated Renamed to {@link Event}.
+ *  [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 WebContentsEvent<Topic extends string> = Event_5<Topic>;
+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_2<Topic extends string> = Events.WebContentsEvents.WebContentsEvent<Topic>;
 
@@ -18172,7 +17848,6 @@ declare namespace WebContentsEvents {
         CrashedEvent_2 as CrashedEvent,
         CertificateErrorEvent,
         CertificateSelectionShownEvent,
-        PageFaviconUpdatedEvent,
         FaviconUpdatedEvent,
         NavigationRejectedEvent,
         UrlChangedEvent,
@@ -18191,7 +17866,6 @@ declare namespace WebContentsEvents {
         FileDownloadStartedEvent,
         FileDownloadProgressEvent,
         FileDownloadCompletedEvent,
-        Event_5 as Event,
         WebContentsEvent,
         WillPropagateWebContentsEvent,
         NonPropagatedWebContentsEvent
@@ -18239,7 +17913,7 @@ declare type WillMoveEvent = WillMoveOrResizeEvent & {
  * A general will-move or will-resize event without event type.
  * @interface
  */
-declare type WillMoveOrResizeEvent = BaseEvent_5 & {
+declare type WillMoveOrResizeEvent = BaseWindowEvent & {
     height: number;
     left: number;
     top: number;
@@ -18261,7 +17935,7 @@ declare type WillPropagateViewEvent = ViewEvent;
  *
  * A WebContents event that does propagate to (republish on) parent topics.
  */
-declare type WillPropagateWebContentsEvent = Event_5<string>;
+declare type WillPropagateWebContentsEvent = WebContentsEvent<string>;
 
 /**
  * @DEPRECATED all Window events propagate, so this is redundant - left as a convenience shim to avoid breaking
@@ -18275,7 +17949,7 @@ declare type WillPropagateWindowEvent = WindowSourcedEvent;
  * Generated when window is being redirected as per contentRedirect allowlist/denylist rules.
  * @interface
  */
-declare type WillRedirectEvent = BaseEvent_5 & {
+declare type WillRedirectEvent = BaseWindowEvent & {
     type: 'will-redirect';
     blocked: boolean;
     isInPlace: boolean;
@@ -19914,19 +19588,29 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      };
 
      /**
-      * @deprecated Renamed to {@link ClosedEvent}.
+      * Generated when a window has closed.
+      * @interface
       */
-     declare type WindowClosedEvent = ClosedEvent_2;
+     declare type WindowClosedEvent = BaseWindowEvent & {
+         type: 'closed';
+     };
 
      /**
-      * @deprecated Renamed to {@link CloseRequestedEvent}.
+      * 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 WindowCloseRequestedEvent = CloseRequestedEvent;
+     declare type WindowCloseRequestedEvent = BaseWindowEvent & {
+         type: 'close-requested';
+     };
 
      /**
-      * @deprecated Renamed to {@link ClosingEvent}.
+      * Generated when a window has initiated the closing routine.
+      * @interface
       */
-     declare type WindowClosingEvent = ClosingEvent;
+     declare type WindowClosingEvent = BaseWindowEvent & {
+         type: 'closing';
+     };
 
      /**
       * A rule prescribing content creation in a {@link OpenFin.Window}.
@@ -20010,15 +19694,16 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      };
 
      /**
-      * @deprecated, Renamed to {@link Event}.
+      *  [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}).
       */
-     declare type WindowEvent = Event_6;
+     declare type WindowEvent = WindowSourcedEvent | PropagatedViewEvent<'window'>;
 
      declare type WindowEvent_2 = Events.WindowEvents.WindowEvent;
 
      declare namespace WindowEvents {
          export {
-             BaseEvent_5 as BaseEvent,
              BaseWindowEvent,
              ViewAttachedEvent,
              ViewDetachedEvent,
@@ -20028,11 +19713,9 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
              EndLoadEvent,
              WillRedirectEvent,
              ReloadedEvent,
-             OptionsChangedEvent,
              WindowOptionsChangedEvent_2 as WindowOptionsChangedEvent,
              ExternalProcessExitedEvent,
              ExternalProcessStartedEvent,
-             HiddenEvent_2 as HiddenEvent,
              WindowHiddenEvent,
              PreloadScriptInfoRunning,
              PreloadScriptInfo,
@@ -20047,30 +19730,22 @@ declare class _Window extends WebContents<OpenFin.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,
@@ -20081,32 +19756,37 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
              DownloadShelfVisibilityChangedEvent,
              WindowSourcedEvent,
              WillPropagateWindowEvent,
-             Event_6 as Event,
              WindowEvent,
-             EventType_2 as EventType,
              WindowEventType,
-             PropagatedEvent_3 as PropagatedEvent,
              PropagatedWindowEvent,
              PropagatedWindowEventType,
-             Payload_3 as Payload,
-             ByType_2 as ByType
+             Payload_9 as Payload,
+             ByType_8 as ByType
          }
      }
 
      /**
-      * @deprecated Renamed to {@link EventType}.
+      * Union of possible `type` values for a {@link OpenFin.WindowEvents.WindowEvent}.
       */
      declare type WindowEventType = WindowEvent['type'];
 
      /**
-      * @deprecated Renamed to {@link HiddenEvent}.
+      * Generated when a window has been hidden.
+      * @interface
       */
-     declare type WindowHiddenEvent = HiddenEvent_2;
+     declare type WindowHiddenEvent = BaseWindowEvent & {
+         type: 'hidden';
+         reason: 'closing' | 'hide' | 'hide-on-close';
+     };
 
      /**
-      * @deprecated Renamed to {@link HotkeyEvent}.
+      * 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 WindowHotkeyEvent = HotkeyEvent_2;
+     declare type WindowHotkeyEvent = InputEvent_2 & BaseWindowEvent & {
+         type: 'hotkey';
+     };
 
      /**
       * @interface
@@ -20120,9 +19800,12 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      };
 
      /**
-      * @deprecated Renamed to {@link InitializedEvent}.
+      * Generated when a window is initialized.
+      * @interface
       */
-     declare type WindowInitializedEvent = InitializedEvent_2;
+     declare type WindowInitializedEvent = BaseWindowEvent & {
+         type: 'initialized';
+     };
 
      /**
       * Static namespace for OpenFin API methods that interact with the {@link _Window} class, available under `fin.Window`.
@@ -20241,9 +19924,15 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      declare type WindowOptionsChangedEvent = OpenFin.WindowEvents.WindowOptionsChangedEvent;
 
      /**
-      * @deprecated Renamed to {@link OptionsChangedEvent}.
+      * Generated after window options are changed using the window.updateOptions method.
+      * @remarks Will not fire if the diff object is empty.
+      * @interface
       */
-     declare type WindowOptionsChangedEvent_2 = OptionsChangedEvent;
+     declare type WindowOptionsChangedEvent_2 = BaseWindowEvent & {
+         type: 'options-changed';
+         options: OpenFin.WindowOptions;
+         diff: OpenFin.WindowOptionDiff;
+     };
 
      declare type WindowPrintOptions = PrintOptions | ScreenshotPrintOptions | WindowViewsPrintOptions;
 
@@ -20256,25 +19945,35 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      };
 
      /**
-      * @deprecated Renamed to {@link RestoredEvent}.
+      * Generated when a window is displayed after having been minimized or when a window leaves the maximize state without minimizing.
+      * @interface
       */
-     declare type WindowRestoredEvent = RestoredEvent;
+     declare type WindowRestoredEvent = BaseWindowEvent & {
+         type: 'restored';
+     };
 
      /**
-      * @deprecated Renamed to {@link ShownEvent}.
+      * Generated when a hidden window has been shown.
+      * @interface
       */
-     declare type WindowShownEvent = ShownEvent_2;
+     declare type WindowShownEvent = BaseWindowEvent & {
+         type: 'shown';
+     };
 
      /**
-      * @deprecated Renamed to {@link ShowRequestedEvent}.
+      * 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 WindowShowRequestedEvent = ShowRequestedEvent;
+     declare type WindowShowRequestedEvent = BaseWindowEvent & {
+         type: 'show-requested';
+     };
 
      /**
       * 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 = 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;
+     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;
 
      /**
       * Generated when a child window starts loading.