@openfin/node-adapter 34.78.34 → 34.78.38

package/out/node-adapter-beta.d.ts

@@ -57,7 +57,7 @@ declare type AddViewToStackOptions = {
  * Generated when an alert is fired and suppressed due to the customWindowAlert flag being true.
  * @interface
  */
-declare type AlertRequestedEvent = NamedEvent & {
+declare type AlertRequestedEvent = BaseWindowEvent & {
     type: 'alert-requested';
     message: string;
     url: string;
@@ -853,6 +853,7 @@ declare class Application extends EmitterBase<OpenFin.ApplicationEvent> {
  * @interface
  */
 declare type ApplicationConnectedEvent = IdentityEvent & {
+    topic: 'application';
     type: 'connected';
 };
 
@@ -860,7 +861,7 @@ declare type ApplicationConnectedEvent = IdentityEvent & {
  * Generated when an application is created.
  * @interface
  */
-declare type ApplicationCreatedEvent = IdentityEvent & {
+declare type ApplicationCreatedEvent = BaseSystemEvent & IdentityEvent & {
     type: 'application-created';
 };
 
@@ -889,14 +890,13 @@ declare type ApplicationCreationOptions = Partial<ApplicationOptions> & {
  *  under the {@link OpenFin.ApplicationEvents} namespace (payloads inherited from propagated events are defined in the namespace
  *  from which they propagate).
  */
-declare type ApplicationEvent = {
-    topic: 'application';
-} & (PropagatedViewEvent | PropagatedWindowEvent | ApplicationWindowEvent | WillPropagateApplicationEvent);
+declare type ApplicationEvent = PropagatedViewEvent<'application'> | PropagatedWindowEvent<'application'> | ApplicationWindowEvent | ApplicationSourcedEvent;
 
 declare type ApplicationEvent_2 = Events.ApplicationEvents.ApplicationEvent;
 
 declare namespace ApplicationEvents {
     export {
+        BaseApplicationEvent,
         CrashedEvent,
         FileDownloadLocationChangedEvent,
         RunRequestedEvent_2 as RunRequestedEvent,
@@ -915,16 +915,18 @@ declare namespace ApplicationEvents {
         NotRespondingEvent,
         RespondingEvent,
         StartedEvent,
-        WillPropagateApplicationEvent,
+        ApplicationSourcedEvent,
         ApplicationEvent,
         ApplicationEventType,
         PropagatedApplicationEvent,
-        PropagatedApplicationEventType
+        PropagatedApplicationEventType,
+        Payload_2 as Payload,
+        ByType
     }
 }
 
 /**
- * An Application event type.
+ * Union of possible `type` values for a {@link OpenFin.ApplicationEvents.ApplicationEvent}.
  */
 declare type ApplicationEventType = ApplicationEvent['type'];
 
@@ -1275,6 +1277,14 @@ declare type ApplicationPermissions = {
     getFileDownloadLocation: boolean;
 };
 
+/**
+ * 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 ApplicationState = OpenFin.ApplicationState;
 
 /**
@@ -1512,14 +1522,6 @@ declare type AppVersionRuntimeStatusEvent = {
 
 /* Excluded from this release type: AppVersionTypeFromIdEvent */
 
-/**
- * Generated when a View is attached to a window.
- * @interface
- */
-declare type AttachedEvent = BaseViewEvent & {
-    type: 'attached';
-};
-
 declare interface AuthorizationPayload {
     token: string;
     file: string;
@@ -1589,7 +1591,7 @@ declare interface AuthorizationPayload {
  * ```
  * @interface
  */
-declare type AuthRequestedEvent = NamedEvent & {
+declare type AuthRequestedEvent = BaseWindowEvent & {
     type: 'auth-requested';
     authInfo: {
         host: string;
@@ -1650,6 +1652,14 @@ declare class Base {
     protected isBrowserEnvironment: () => boolean;
 }
 
+/**
+ * Base type for events emitting on the `application` topic
+ * @interface
+ */
+declare type BaseApplicationEvent = NamedEvent & {
+    topic: `application`;
+};
+
 /**
  * A base Channel event.
  * @interface
@@ -1722,6 +1732,14 @@ declare namespace BaseEvents {
     }
 }
 
+/**
+ * Base type for events emitting on the `externalapplication` topic
+ * @interface
+ */
+declare type BaseExternalApplicationEvent = BaseEvent & {
+    topic: 'externalapplication';
+};
+
 /**
  * The base frame event.
  * @interface
@@ -1738,18 +1756,34 @@ 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;
 };
 
 /**
- * A base View event.
+ * Base type for events emitting on the `view` topic
  * @interface
  */
 declare type BaseViewEvent = NamedEvent & {
+    topic: 'view';
     target: OpenFin.Identity;
-    viewIdentity: OpenFin.Identity;
+};
+
+/**
+ * Base type for events emitting on the `window` topic
+ * @interface
+ */
+declare type BaseWindowEvent = NamedEvent & {
+    topic: 'window';
 };
 
 /**
@@ -1805,7 +1839,7 @@ declare type BoundsChangedEvent = BoundsChangeEvent & {
  * A general bounds change event without event type.
  * @interface
  */
-declare type BoundsChangeEvent = NamedEvent & {
+declare type BoundsChangeEvent = BaseWindowEvent & {
     changeType: 0 | 1 | 2;
     deferred: boolean;
     height: number;
@@ -1864,6 +1898,78 @@ declare interface BrowserWindow {
     popIn(): void;
 }
 
+/**
+ * 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 ApplicationEventType> = Payload_2<Type>;
+
+/**
+ * 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 ExternalApplicationEventType> = Payload_3<Type>;
+
+/**
+ * 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 FrameEventType> = Payload_4<Type>;
+
+/**
+ * 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 GlobalHotkeyEventType> = Payload_5<Type>;
+
+/**
+ * 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 PlatformEventType> = Payload_6<Type>;
+
+/**
+ * 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 SystemEventType> = Payload_7<Type>;
+
+/**
+ * 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 ViewEventType> = Payload_8<Type>;
+
+/**
+ * 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 WindowEventType> = Payload_9<Type>;
+
 /**
  * Configuration for page capture.
  *
@@ -2575,7 +2681,9 @@ declare type ChannelDisconnectedEvent = BaseChannelEvent & {
 };
 
 /**
- * A Channel 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 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';
@@ -3115,6 +3223,7 @@ declare type ClipboardSelectionType = 'clipboard' | 'selection';
  * @interface
  */
 declare type ClosedEvent = IdentityEvent & {
+    topic: 'application';
     type: 'closed';
 };
 
@@ -4117,7 +4226,22 @@ declare type CpuInfo = {
  * Generated when an application has crashed.
  * @interface
  */
-declare type CrashedEvent = NamedEvent & {
+declare type CrashedEvent = IdentityEvent & {
+    topic: 'application';
+    type: 'crashed';
+    reason: 'normal-termination' | 'abnormal-termination' | 'killed' | 'crashed' | 'still-running' | 'launch-failed' | 'out-of-memory' | 'integrity-failure';
+    exitCode: number;
+    details: {
+        reason: string;
+        exitCode: number;
+    };
+};
+
+/**
+ * Generated when a WebContents has crashed.
+ * @interface
+ */
+declare type CrashedEvent_2 = NamedEvent & {
     type: 'crashed';
     reason: 'normal-termination' | 'abnormal-termination' | 'killed' | 'crashed' | 'still-running' | 'launch-failed' | 'out-of-memory' | 'integrity-failure';
     exitCode: number;
@@ -4263,7 +4387,7 @@ declare interface DesktopAgent_2 {
  * Generated when the desktop icon is clicked while it's already running.
  * @interface
  */
-declare type DesktopIconClickedEvent = BaseEvent & {
+declare type DesktopIconClickedEvent = BaseSystemEvent & {
     type: 'desktop-icon-clicked';
 };
 
@@ -4493,7 +4617,7 @@ declare interface DragSource {}
  * Generated when a window has been embedded.
  * @interface
  */
-declare type EmbeddedEvent = NamedEvent & {
+declare type EmbeddedEvent = BaseWindowEvent & {
     type: 'embedded';
 };
 
@@ -4592,7 +4716,7 @@ declare class EmitterMap {
  * Generated when a window ends loading.
  * @interface
  */
-declare type EndLoadEvent = NamedEvent & {
+declare type EndLoadEvent = BaseWindowEvent & {
     type: 'end-load';
     documentName: string;
     isMain: boolean;
@@ -4898,7 +5022,7 @@ declare class ExternalApplication extends EmitterBase<OpenFin.ExternalApplicatio
  * Generated when an external application has authenticated and is connected.
  * @interface
  */
-declare type ExternalApplicationConnectedEvent = BaseEvent & {
+declare type ExternalApplicationConnectedEvent = BaseExternalApplicationEvent & {
     type: 'connected';
 };
 
@@ -4906,7 +5030,7 @@ declare type ExternalApplicationConnectedEvent = BaseEvent & {
  * Generated when an external application has disconnected.
  * @interface
  */
-declare type ExternalApplicationDisconnectedEvent = BaseEvent & {
+declare type ExternalApplicationDisconnectedEvent = BaseExternalApplicationEvent & {
     type: 'disconnected';
 };
 
@@ -4915,20 +5039,27 @@ declare type ExternalApplicationDisconnectedEvent = BaseEvent & {
  *  discriminated by {@link ExternalApplicationEvent.type | their type}.  Event payloads unique to `ExternalApplication` can be found
  *  under the {@link OpenFin.ExternalApplicationEvents} namespace.
  */
-declare type ExternalApplicationEvent = {
-    topic: 'externalapplication';
-} & (ExternalApplicationConnectedEvent | ExternalApplicationDisconnectedEvent);
+declare type ExternalApplicationEvent = ExternalApplicationConnectedEvent | ExternalApplicationDisconnectedEvent;
 
 declare type ExternalApplicationEvent_2 = Events.ExternalApplicationEvents.ExternalApplicationEvent;
 
 declare namespace ExternalApplicationEvents {
     export {
+        BaseExternalApplicationEvent,
         ExternalApplicationConnectedEvent,
         ExternalApplicationDisconnectedEvent,
-        ExternalApplicationEvent
+        ExternalApplicationEvent,
+        ExternalApplicationEventType,
+        Payload_3 as Payload,
+        ByType_2 as ByType
     }
 }
 
+/**
+ * Union of possible `type` values for a {@link OpenFin.ApplicationEvents.ApplicationEvent}.
+ */
+declare type ExternalApplicationEventType = ExternalApplicationEvent['type'];
+
 /**
  * @interface
  */
@@ -4992,7 +5123,7 @@ declare type ExternalConnection = {
  * Generated when an external process has exited.
  * @interface
  */
-declare type ExternalProcessExitedEvent = NamedEvent & {
+declare type ExternalProcessExitedEvent = BaseWindowEvent & {
     type: 'external-process-exited';
     processUuid: string;
     exitCode: number;
@@ -5037,7 +5168,7 @@ declare type ExternalProcessRequestType = {
  * Generated when an external process has started.
  * @interface
  */
-declare type ExternalProcessStartedEvent = NamedEvent & {
+declare type ExternalProcessStartedEvent = BaseWindowEvent & {
     type: 'external-process-started';
     processUuid: string;
 };
@@ -5136,7 +5267,7 @@ declare type FileDownloadEvent = {
  *
  * @interface
  */
-declare type FileDownloadLocationChangedEvent = NamedEvent & {
+declare type FileDownloadLocationChangedEvent = BaseApplicationEvent & {
     type: 'file-download-location-changed';
 };
 
@@ -5419,7 +5550,9 @@ declare type FrameDisconnectedEvent = BaseFrameEvent & {
 };
 
 /**
- * A Frame 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 = {
     topic: 'frame';
@@ -5433,14 +5566,14 @@ declare namespace FrameEvents {
         FrameConnectedEvent,
         FrameDisconnectedEvent,
         FrameEvent,
-        FrameEventType
+        FrameEventType,
+        Payload_4 as Payload,
+        ByType_3 as ByType
     }
 }
 
 /**
- *  [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.
+ *  Union of possible `type` values for a {@link FrameEvent}.
  */
 declare type FrameEventType = FrameEvent['type'];
 
@@ -5674,10 +5807,18 @@ declare namespace GlobalHotkeyEvents {
     export {
         RegisteredEvent,
         UnregisteredEvent,
-        GlobalHotkeyEvent
+        GlobalHotkeyEvent,
+        GlobalHotkeyEventType,
+        Payload_5 as Payload,
+        ByType_4 as ByType
     }
 }
 
+/**
+ * Union of possible `type` values for a {@link GlobalHotkeyEvent}
+ */
+declare type GlobalHotkeyEventType = GlobalHotkeyEvent['type'];
+
 declare namespace GoldenLayout {
     export {
         GoldenLayout_2 as GoldenLayout,
@@ -6120,7 +6261,7 @@ declare type IdentityEvent = BaseEvent & {
  * A user returns from idle state when the computer is unlocked or keyboard/mouse activity has resumed.
  * @interface
  */
-declare type IdleEvent = {
+declare type IdleEvent = BaseSystemEvent & {
     type: 'idle-state-changed';
     elapsedTime: number;
     isIdle: boolean;
@@ -6206,6 +6347,7 @@ declare type InfoForIntentOptions<MetadataType = IntentMetadata_3> = {
  * @interface
  */
 declare type InitializedEvent = IdentityEvent & {
+    topic: 'application';
     type: 'initialized';
 };
 
@@ -8255,7 +8397,7 @@ declare type LayoutEntityTypes = Exclude<GoldenLayout.ItemType, 'component' | 'r
  * Generated when a window and all of its layout's views have either finished or failed navigation.
  * @interface
  */
-declare type LayoutInitializedEvent = NamedEvent & {
+declare type LayoutInitializedEvent = BaseWindowEvent & {
     type: 'layout-initialized';
     ofViews: (OpenFin.Identity & {
         entityType: 'view';
@@ -8593,7 +8735,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 = NamedEvent & {
+declare type LayoutReadyEvent = BaseWindowEvent & {
     type: 'layout-ready';
     views: (OpenFin.Identity & {
         success: boolean;
@@ -8728,6 +8870,7 @@ declare type Manifest = {
  * @interface
  */
 declare type ManifestChangedEvent = IdentityEvent & {
+    topic: 'application';
     type: 'manifest-changed';
 };
 
@@ -8779,7 +8922,7 @@ declare type MatchPattern = string;
  * Generated when a window is maximized.
  * @interface
  */
-declare type MaximizedEvent = NamedEvent & {
+declare type MaximizedEvent = BaseWindowEvent & {
     type: 'maximized';
 };
 
@@ -8879,7 +9022,7 @@ declare type MessagingProtocols = ProtocolOffer['type'];
  * Generated when a window is minimized.
  * @interface
  */
-declare type MinimizedEvent = NamedEvent & {
+declare type MinimizedEvent = BaseWindowEvent & {
     type: 'minimized';
 };
 
@@ -8928,7 +9071,7 @@ declare type MonitorDetails = {
  * The available space of a monitor defines a rectangle that is not occupied by the taskbar
  * @interface
  */
-declare type MonitorEvent = OpenFin.MonitorInfo & {
+declare type MonitorEvent = BaseSystemEvent & OpenFin.MonitorInfo & {
     type: 'monitor-info-changed';
 };
 
@@ -9330,19 +9473,25 @@ declare type NonAppProcessDetails = ProcessDetails & {
 };
 
 /**
- * A View event that does not propagate to (republish on) parent topics.
+ * @DEPRECATED All view events propagate; this type is erroneous - left as a loudly-breaking shim to alert users
+ *
+ * A view event that does not propagate to (republish on) parent topics.
  */
-declare type NonPropagatedViewEvent = BaseViewEvent & NonPropagatedWebContentsEvent;
+declare type NonPropagatedViewEvent = never;
 
 /**
+ * @DEPRECATED all webcontents events propagate; this type is erroneous - left as a loudly-breaking shim to alert users
+ *
  * A WebContents event that does not propagate to (republish on) parent topics.
  */
-declare type NonPropagatedWebContentsEvent = FoundInPageEvent | CertificateErrorEvent;
+declare type NonPropagatedWebContentsEvent = never;
 
 /**
- * A Window event that does not propagate to (republish on) parent topics.
+ * @DEPRECATED All window events propagate; this type is erroneous - left as a loudly-breaking shim to alert users
+ *
+ * A window event that does not propagate to (republish on) parent topics.
  */
-declare type NonPropagatedWindowEvent = NonPropagatedWebContentsEvent;
+declare type NonPropagatedWindowEvent = never;
 
 /* Excluded from this release type: NotRequested */
 
@@ -9351,6 +9500,7 @@ declare type NonPropagatedWindowEvent = NonPropagatedWebContentsEvent;
  * @interface
  */
 declare type NotRespondingEvent = IdentityEvent & {
+    topic: 'application';
     type: 'not-responding';
 };
 
@@ -9718,13 +9868,85 @@ declare type Payload<Success extends boolean = boolean, Data = any> = {
     error?: Success extends false ? ErrorPlainObject | undefined : never;
 };
 
+/**
+ * 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 ApplicationEventType> = Extract<ApplicationEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 ExternalApplicationEventType> = Extract<ExternalApplicationEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 FrameEventType> = Extract<FrameEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 GlobalHotkeyEventType> = Extract<GlobalHotkeyEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 PlatformEventType> = Extract<PlatformEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 SystemEventType> = Extract<SystemEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 ViewEventType> = Extract<ViewEvent, {
+    type: Type;
+}>;
+
+/**
+ * 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 WindowEventType> = Extract<WindowEvent, {
+    type: Type;
+}>;
+
 declare type PayloadTypeByStrategy<T extends ChannelStrategy<unknown>> = T extends ChannelStrategy<infer U> ? U : never;
 
 /**
  * Generated when window finishes loading. Provides performance and navigation data.
  * @interface
  */
-declare type PerformanceReportEvent = Performance & NamedEvent & {
+declare type PerformanceReportEvent = Performance & BaseWindowEvent & {
     type: 'performance-report';
 };
 
@@ -10381,10 +10603,18 @@ declare namespace PlatformEvents {
     export {
         PlatformApiReadyEvent,
         PlatformSnapshotAppliedEvent,
-        PlatformEvent
+        PlatformEvent,
+        PlatformEventType,
+        Payload_6 as Payload,
+        ByType_5 as ByType
     }
 }
 
+/**
+ * Union of possible `type` values for a {@link PlatformEvent}.
+ */
+declare type PlatformEventType = PlatformEvent['type'];
+
 /**
  * Static namespace for OpenFin API methods that interact with the {@link Platform} class, available under `fin.Platform`.
  */
@@ -11326,7 +11556,7 @@ declare type PreloadScriptsStateChangedEvent = PreloadScriptsStateChangeEvent &
  * A general preload scripts state change event without event type.
  * @interface
  */
-declare type PreloadScriptsStateChangeEvent = NamedEvent & {
+declare type PreloadScriptsStateChangeEvent = BaseWindowEvent & {
     preloadScripts: (PreloadScriptInfoRunning & any)[];
 };
 
@@ -11535,25 +11765,30 @@ declare type ProcessLoggingOptions = {
 };
 
 /**
- * A propagated Application event.
+ * 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 = PropagatedEvent<'application', WillPropagateApplicationEvent> | ApplicationWindowEvent;
+declare type PropagatedApplicationEvent<TargetTopic extends string> = PropagatedEvent<'application', TargetTopic, ApplicationSourcedEvent> | ApplicationWindowEvent;
 
 /**
- * A propagated Application event type.
+ * Union of possible 'type' values for a {@link OpenFin.ApplicationEvents.PropagatedApplicationEvent}.
  */
-declare type PropagatedApplicationEventType = PropagatedApplicationEvent['type'];
+declare type PropagatedApplicationEventType = PropagatedApplicationEvent<string>['type'];
 
 /**
  * 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.
  */
-declare type PropagatedEvent<Topic extends string, Event extends {
+declare type PropagatedEvent<SourceTopic extends string, TargetTopic extends string, Event extends {
     type: string;
 }> = Event extends infer E extends {
     type: string;
-} ? Omit<E, 'type'> & {
-    type: PropagatedEventType<Topic, E['type']>;
+} ? Omit<E, 'type' | 'topic'> & {
+    type: PropagatedEventType<SourceTopic, E['type']>;
+    topic: TargetTopic;
 } : never;
 
 /**
@@ -11562,29 +11797,33 @@ declare type PropagatedEvent<Topic extends string, Event extends {
 declare type PropagatedEventType<Topic extends string, Type extends string> = `${Topic}-${Type}`;
 
 /**
- * A propagated View event that is re-propagated from window.
- */
-declare type PropagatedViewAttachedEvent = PropagatedEvent<'view', AttachedEvent>;
-
-/**
- * A propagated View event.
+ * 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 = PropagatedEvent<'view', WillPropagateViewEvent>;
+declare type PropagatedViewEvent<TargetTopic extends string> = PropagatedEvent<'view', TargetTopic, ViewEvent> & {
+    viewIdentity: OpenFin.Identity;
+};
 
 /**
- * A propagated View event type.
+ * Union of possible `type` values for a {@link OpenFin.ViewEvents.PropagatedViewEvent}.
  */
-declare type PropagatedViewEventType = PropagatedViewEvent['type'];
+declare type PropagatedViewEventType = PropagatedViewEvent<string>['type'];
 
 /**
- * A propagated Window event.
+ * 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 NativeWindowEvent native window events} will propagate
+ * this way; those that have {@link OpenFin.ViewEvents.PropagatedViewEvent propagated} from {@link OpenFin.ViewEvents}
+ * will *not* re-propagate.
+ *
+ * "Requested" events (e.g. {@link AuthRequestedEvent}) do not propagate to `System.`
  */
-declare type PropagatedWindowEvent = PropagatedEvent<'window', Exclude<WillPropagateWindowEvent, WindowCloseRequestedEvent>>;
+declare type PropagatedWindowEvent<TargetTopic extends string> = PropagatedEvent<'window', TargetTopic, Exclude<WindowSourcedEvent, WindowCloseRequestedEvent>>;
 
 /**
- * A propagated Window event type.
+ * Union of possible `type` values for a {@link OpenFin.WindowEvents.PropagatedWindowEvent}.
  */
-declare type PropagatedWindowEventType = PropagatedWindowEvent['type'];
+declare type PropagatedWindowEventType = PropagatedWindowEvent<string>['type'];
 
 declare interface ProtocolMap extends ProtocolMapBase {
     'request-external-authorization': {
@@ -11991,7 +12230,7 @@ declare type RegistryInfo_2 = {
  * Generated when a window has been reloaded.
  * @interface
  */
-declare type ReloadedEvent = NamedEvent & {
+declare type ReloadedEvent = BaseWindowEvent & {
     type: 'reloaded';
     url: string;
 };
@@ -12113,6 +12352,7 @@ declare type ResourceResponseReceivedEvent = NamedEvent & {
  * @interface
  */
 declare type RespondingEvent = IdentityEvent & {
+    topic: 'application';
     type: 'responding';
 };
 
@@ -12179,6 +12419,7 @@ declare type RunRequestedEvent = OpenFin.ApplicationEvents.RunRequestedEvent;
  * @interface
  */
 declare type RunRequestedEvent_2 = IdentityEvent & {
+    topic: 'application';
     type: 'run-requested';
     userAppConfigArgs: Record<string, any>;
     manifest: OpenFin.Manifest;
@@ -12359,7 +12600,7 @@ declare type ServiceIdentifier = {
  * Generated on changes to a user’s local computer session.
  * @interface
  */
-declare type SessionChangedEvent = {
+declare type SessionChangedEvent = BaseSystemEvent & {
     type: 'session-changed';
     reason: 'lock' | 'unlock' | 'remote-connect' | 'remote-disconnect' | 'unknown';
 };
@@ -12767,6 +13008,7 @@ declare type SplitterItem = GoldenLayout.ContentItem & {
  * @interface
  */
 declare type StartedEvent = IdentityEvent & {
+    topic: 'application';
     type: 'started';
 };
 
@@ -14239,9 +14481,7 @@ declare type SystemChannel = Omit<Channel_3, 'addContextListener' | 'broadcast'
  *  under the {@link OpenFin.SystemEvents} namespace (payloads inherited from propagated events are defined in the namespace
  *  from which they propagate).
  */
-declare type SystemEvent = {
-    topic: 'system';
-} & (ExcludeRequested<PropagatedWindowEvent> | PropagatedViewEvent | PropagatedApplicationEvent | ApplicationCreatedEvent | DesktopIconClickedEvent | IdleEvent | MonitorEvent | SessionChangedEvent | AppVersionEventWithId | SystemShutdownEvent);
+declare type SystemEvent = ExcludeRequested<PropagatedWindowEvent<'system'>> | PropagatedViewEvent<'system'> | PropagatedApplicationEvent<'system'> | ApplicationCreatedEvent | DesktopIconClickedEvent | IdleEvent | MonitorEvent | SessionChangedEvent | AppVersionEventWithId | SystemShutdownEvent;
 
 declare type SystemEvent_2 = Events.SystemEvents.SystemEvent;
 
@@ -14249,6 +14489,7 @@ declare namespace SystemEvents {
     export {
         NotRequested,
         ExcludeRequested,
+        BaseSystemEvent,
         IdleEvent,
         MonitorEvent,
         SessionChangedEvent,
@@ -14264,12 +14505,14 @@ declare namespace SystemEvents {
         DesktopIconClickedEvent,
         SystemShutdownEvent,
         SystemEvent,
-        SystemEventType
+        SystemEventType,
+        Payload_7 as Payload,
+        ByType_6 as ByType
     }
 }
 
 /**
- * A system event type.
+ * Union of possible `type` values for a {@link SystemEvent}.
  */
 declare type SystemEventType = SystemEvent['type'];
 
@@ -14716,6 +14959,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
  * @interface
  */
 declare type TrayIconClickedEvent = IdentityEvent & {
+    topic: 'application';
     type: 'tray-icon-clicked';
     button: 0 | 1 | 2;
     bounds: OpenFin.Rectangle;
@@ -14804,7 +15048,7 @@ declare type UrlChangedEvent = BaseUrlEvent & ({
  * A general user bounds change event without event type.
  * @interface
  */
-declare type UserBoundsChangeEvent = NamedEvent & {
+declare type UserBoundsChangeEvent = BaseWindowEvent & {
     height: number;
     left: number;
     top: number;
@@ -14816,7 +15060,7 @@ declare type UserBoundsChangeEvent = NamedEvent & {
  * Generated when a window's user movement becomes disabled.
  * @interface
  */
-declare type UserMovementDisabledEvent = NamedEvent & {
+declare type UserMovementDisabledEvent = BaseWindowEvent & {
     type: 'user-movement-disabled';
 };
 
@@ -14824,7 +15068,7 @@ declare type UserMovementDisabledEvent = NamedEvent & {
  * Generated when a window's user movement becomes enabled.
  * @interface
  */
-declare type UserMovementEnabledEvent = NamedEvent & {
+declare type UserMovementEnabledEvent = BaseWindowEvent & {
     type: 'user-movement-enabled';
 };
 
@@ -15474,6 +15718,16 @@ declare type View_3 = OpenFin.View;
 
 declare type View_4 = OpenFin.View;
 
+/**
+ * Generated when a View is attached to a window.
+ * @interface
+ */
+declare type ViewAttachedEvent = BaseWindowEvent & {
+    type: 'view-attached';
+    target: OpenFin.Identity;
+    viewIdentity: OpenFin.Identity;
+};
+
 declare interface ViewComponent extends GoldenLayout.ContentItem {
     componentState: OpenFin.ViewState;
 }
@@ -15498,9 +15752,11 @@ 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 = NamedEvent & BaseViewEvent & {
+declare type ViewDetachedEvent = BaseWindowEvent & {
     type: 'view-detached';
+    target: OpenFin.Identity;
     previousTarget: OpenFin.Identity;
+    viewIdentity: OpenFin.Identity;
 };
 
 /**
@@ -15508,9 +15764,9 @@ declare type ViewDetachedEvent = NamedEvent & BaseViewEvent & {
  *  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 = {
-    topic: 'view';
-} & (NonPropagatedViewEvent | WillPropagateViewEvent);
+declare type ViewEvent = (WebContentsEvent<'view'> & {
+    target: OpenFin.Identity;
+}) | CreatedEvent | DestroyedEvent | HiddenEvent | HotkeyEvent | ShownEvent | TargetChangedEvent;
 
 declare type ViewEvent_2 = Events.ViewEvents.ViewEvent;
 
@@ -15519,22 +15775,23 @@ declare namespace ViewEvents {
         BaseViewEvent,
         TargetChangedEvent,
         NonPropagatedViewEvent,
-        AttachedEvent,
         CreatedEvent,
         DestroyedEvent,
         HiddenEvent,
         HotkeyEvent,
         ShownEvent,
-        WillPropagateViewEvent,
         ViewEvent,
+        WillPropagateViewEvent,
         ViewEventType,
         PropagatedViewEvent,
-        PropagatedViewEventType
+        PropagatedViewEventType,
+        Payload_8 as Payload,
+        ByType_7 as ByType
     }
 }
 
 /**
- * A View event type.
+ * Union of possible `type` values for a {@link OpenFin.ViewEvents.ViewEvent}.
  */
 declare type ViewEventType = ViewEvent['type'];
 
@@ -16709,17 +16966,21 @@ declare class WebContents<T extends BaseEvent> extends EmitterBase<T> {
 }
 
 /**
- * A WebContents 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 = NonPropagatedWebContentsEvent | WillPropagateWebContentsEvent;
+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 = Events.WebContentsEvents.WebContentsEvent;
+declare type WebContentsEvent_2<Topic extends string> = Events.WebContentsEvents.WebContentsEvent<Topic>;
 
 declare namespace WebContentsEvents {
     export {
         ResourceLoadFailedEvent,
         ResourceResponseReceivedEvent,
         PageTitleUpdatedEvent,
+        CrashedEvent_2 as CrashedEvent,
         CertificateErrorEvent,
         CertificateSelectionShownEvent,
         FaviconUpdatedEvent,
@@ -16740,9 +17001,9 @@ declare namespace WebContentsEvents {
         FileDownloadStartedEvent,
         FileDownloadProgressEvent,
         FileDownloadCompletedEvent,
+        WebContentsEvent,
         WillPropagateWebContentsEvent,
-        NonPropagatedWebContentsEvent,
-        WebContentsEvent
+        NonPropagatedWebContentsEvent
     }
 }
 
@@ -16785,7 +17046,7 @@ declare type WillMoveEvent = WillMoveOrResizeEvent & {
  * A general will-move or will-resize event without event type.
  * @interface
  */
-declare type WillMoveOrResizeEvent = NamedEvent & {
+declare type WillMoveOrResizeEvent = BaseWindowEvent & {
     height: number;
     left: number;
     top: number;
@@ -16794,30 +17055,34 @@ declare type WillMoveOrResizeEvent = NamedEvent & {
 };
 
 /**
- * An Application event that does propagate to (republish on) parent topics.
- */
-declare type WillPropagateApplicationEvent = ClosedEvent | ApplicationConnectedEvent | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent_2 | StartedEvent | TrayIconClickedEvent | FileDownloadLocationChangedEvent;
-
-/**
+ * @DEPRECATED all View events propagate, so this is redundant - left as a convenience shim to avoid breaking
+ * user code
+ *
  * A View event that does propagate to (republish on) parent topics.
  */
-declare type WillPropagateViewEvent = (WillPropagateWebContentsEvent & BaseViewEvent) | AttachedEvent | CreatedEvent | DestroyedEvent | HiddenEvent | HotkeyEvent | ShownEvent | TargetChangedEvent;
+declare type WillPropagateViewEvent = ViewEvent;
 
 /**
+ * @DEPRECATED all webcontents events propagate, so this is redundant - left as a convenience shim to avoid breaking
+ * user code
+ *
  * A WebContents event that does propagate to (republish on) parent topics.
  */
-declare type WillPropagateWebContentsEvent = BlurredEvent | CertificateSelectionShownEvent | CrashedEvent | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | FaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent | ChildWindowCreatedEvent | FileDownloadStartedEvent | FileDownloadProgressEvent | FileDownloadCompletedEvent;
+declare type WillPropagateWebContentsEvent = WebContentsEvent<string>;
 
 /**
+ * @DEPRECATED all Window events propagate, so this is redundant - left as a convenience shim to avoid breaking
+ * user code
+ *
  * A Window event that does propagate to (republish on) parent topics.
  */
-declare type WillPropagateWindowEvent = WillPropagateWebContentsEvent | PropagatedViewAttachedEvent | ViewDetachedEvent | AuthRequestedEvent | BeginUserBoundsChangingEvent | BoundsChangedEvent | BoundsChangingEvent | 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;
+declare type WillPropagateWindowEvent = WindowSourcedEvent;
 
 /**
  * Generated when window is being redirected as per contentRedirect allowlist/denylist rules.
  * @interface
  */
-declare type WillRedirectEvent = NamedEvent & {
+declare type WillRedirectEvent = BaseWindowEvent & {
     type: 'will-redirect';
     blocked: boolean;
     isInPlace: boolean;
@@ -18358,7 +18623,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when an alert is fired and suppressed due to the customWindowAlert flag being true.
       * @interface
       */
-     declare type WindowAlertRequestedEvent = NamedEvent & {
+     declare type WindowAlertRequestedEvent = BaseApplicationEvent & {
          type: 'window-alert-requested';
      };
 
@@ -18375,7 +18640,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a window has closed.
       * @interface
       */
-     declare type WindowClosedEvent = NamedEvent & {
+     declare type WindowClosedEvent = BaseWindowEvent & {
          type: 'closed';
      };
 
@@ -18384,7 +18649,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * @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 = NamedEvent & {
+     declare type WindowCloseRequestedEvent = BaseWindowEvent & {
          type: 'close-requested';
      };
 
@@ -18392,7 +18657,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a window has initiated the closing routine.
       * @interface
       */
-     declare type WindowClosingEvent = NamedEvent & {
+     declare type WindowClosingEvent = BaseWindowEvent & {
          type: 'closing';
      };
 
@@ -18400,7 +18665,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a child window is created.
       * @interface
       */
-     declare type WindowCreatedEvent = NamedEvent & {
+     declare type WindowCreatedEvent = BaseApplicationEvent & {
          type: 'window-created';
      };
 
@@ -18457,7 +18722,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a child window ends loading.
       * @interface
       */
-     declare type WindowEndLoadEvent = NamedEvent & {
+     declare type WindowEndLoadEvent = BaseApplicationEvent & {
          type: 'window-end-load';
      };
 
@@ -18466,14 +18731,16 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       *  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 = {
-         topic: 'window';
-     } & (WillPropagateWindowEvent | NonPropagatedWindowEvent | PropagatedViewEvent);
+     declare type WindowEvent = WindowSourcedEvent | PropagatedViewEvent<'window'>;
 
      declare type WindowEvent_2 = Events.WindowEvents.WindowEvent;
 
      declare namespace WindowEvents {
          export {
+             BaseWindowEvent,
+             ViewAttachedEvent,
+             ViewDetachedEvent,
+             WindowViewEvent,
              AlertRequestedEvent,
              AuthRequestedEvent,
              EndLoadEvent,
@@ -18490,11 +18757,9 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
              BoundsChangeEvent,
              WillMoveOrResizeEvent,
              PerformanceReportEvent,
-             ViewDetachedEvent,
              InputEvent_2 as InputEvent,
              LayoutInitializedEvent,
              LayoutReadyEvent,
-             NonPropagatedWindowEvent,
              BeginUserBoundsChangingEvent,
              BoundsChangedEvent,
              BoundsChangingEvent,
@@ -18518,17 +18783,20 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
              UserMovementDisabledEvent,
              WillMoveEvent,
              WillResizeEvent,
-             PropagatedViewAttachedEvent,
+             NonPropagatedWindowEvent,
+             WindowSourcedEvent,
              WillPropagateWindowEvent,
              WindowEvent,
              WindowEventType,
              PropagatedWindowEvent,
-             PropagatedWindowEventType
+             PropagatedWindowEventType,
+             Payload_9 as Payload,
+             ByType_8 as ByType
          }
      }
 
      /**
-      * A Window event type.
+      * Union of possible `type` values for a {@link OpenFin.WindowEvents.WindowEvent}.
       */
      declare type WindowEventType = WindowEvent['type'];
 
@@ -18536,7 +18804,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a window has been hidden.
       * @interface
       */
-     declare type WindowHiddenEvent = NamedEvent & {
+     declare type WindowHiddenEvent = BaseWindowEvent & {
          type: 'hidden';
          reason: 'closing' | 'hide' | 'hide-on-close';
      };
@@ -18546,7 +18814,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
       * @interface
       */
-     declare type WindowHotkeyEvent = InputEvent_2 & NamedEvent & {
+     declare type WindowHotkeyEvent = InputEvent_2 & BaseWindowEvent & {
          type: 'hotkey';
      };
 
@@ -18565,7 +18833,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a window is initialized.
       * @interface
       */
-     declare type WindowInitializedEvent = NamedEvent & {
+     declare type WindowInitializedEvent = BaseWindowEvent & {
          type: 'initialized';
      };
 
@@ -18664,7 +18932,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a child window is not responding.
       * @interface
       */
-     declare type WindowNotRespondingEvent = NamedEvent & {
+     declare type WindowNotRespondingEvent = BaseApplicationEvent & {
          type: 'window-not-responding';
      };
 
@@ -18690,7 +18958,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * @remarks Will not fire if the diff object is empty.
       * @interface
       */
-     declare type WindowOptionsChangedEvent_2 = NamedEvent & {
+     declare type WindowOptionsChangedEvent_2 = BaseWindowEvent & {
          type: 'options-changed';
          options: OpenFin.WindowOptions;
          diff: OpenFin.WindowOptionDiff;
@@ -18702,7 +18970,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a child window is responding.
       * @interface
       */
-     declare type WindowRespondingEvent = NamedEvent & {
+     declare type WindowRespondingEvent = BaseApplicationEvent & {
          type: 'window-responding';
      };
 
@@ -18710,7 +18978,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a window is displayed after having been minimized or when a window leaves the maximize state without minimizing.
       * @interface
       */
-     declare type WindowRestoredEvent = NamedEvent & {
+     declare type WindowRestoredEvent = BaseWindowEvent & {
          type: 'restored';
      };
 
@@ -18718,7 +18986,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * Generated when a hidden window has been shown.
       * @interface
       */
-     declare type WindowShownEvent = NamedEvent & {
+     declare type WindowShownEvent = BaseWindowEvent & {
          type: 'shown';
      };
 
@@ -18727,15 +18995,21 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       * @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 = NamedEvent & {
+     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 = WebContentsEvent<'window'> | WindowViewEvent | AuthRequestedEvent | BeginUserBoundsChangingEvent | BoundsChangedEvent | BoundsChangingEvent | 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;
+
      /**
       * Generated when a child window starts loading.
       * @interface
       */
-     declare type WindowStartLoadEvent = NamedEvent & {
+     declare type WindowStartLoadEvent = BaseApplicationEvent & {
          type: 'window-start-load';
      };
 
@@ -18744,6 +19018,14 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
       */
      declare type WindowState = 'maximized' | 'minimized' | 'normal';
 
+     /**
+      * A view-related event that fires natively on the `Window` topic.  This means that these events *do* propagate
+      * to the `Application` level, with the name pattern `window-view-eventname`.
+      */
+     declare type WindowViewEvent = {
+         viewIdentity: OpenFin.Identity;
+     } & (ViewAttachedEvent | ViewDetachedEvent);
+
      /**
       * @interface
       */