[FSSDK-12115] review update

Author: junaed-optimizely

lib/core/notification_center/index.ts

@@ -15,7 +15,7 @@
  */
 import { LogHandler, ErrorHandler } from '../../modules/logging';
 import { objectValues } from '../../utils/fns';
-import { NotificationListener, NotificationPayloadMap } from '../../shared_types';
+import { ListenerPayload, NotificationListener, NotificationPayloadMap } from '../../shared_types';
 
 import {
   LOG_LEVEL,
@@ -80,9 +80,9 @@ export class NotificationCenter {
    * can happen if the first argument is not a valid notification type, or if the same callback
    * function was already added as a listener by a prior call to this function.
    */
-  addNotificationListener<K extends keyof NotificationPayloadMap>(
-    notificationType: K,
-    callback: NotificationListener<NotificationPayloadMap[K]>
+  addNotificationListener<T extends ListenerPayload>(
+    notificationType: string,
+    callback: NotificationListener<T>
   ): number {
     try {
       const notificationTypeValues: string[] = objectValues(NOTIFICATION_TYPES);
@@ -202,9 +202,9 @@ export class NotificationCenter {
    * @param {string} notificationType One of NOTIFICATION_TYPES
    * @param {Object} notificationData Will be passed to callbacks called
    */
-  sendNotifications<K extends keyof NotificationPayloadMap>(
-    notificationType: K,
-    notificationData?: NotificationPayloadMap[K]
+  sendNotifications<T extends ListenerPayload>(
+    notificationType: string,
+    notificationData?: T
   ): void {
     try {
       (this.notificationListeners[notificationType] || []).forEach(

lib/shared_types.ts

@@ -120,13 +120,7 @@ export interface ListenerPayload {
   attributes?: UserAttributes;
 }
 
-export type DecisionNotificationType = 
-  | typeof DECISION_NOTIFICATION_TYPES.AB_TEST
-  | typeof DECISION_NOTIFICATION_TYPES.FEATURE
-  | typeof DECISION_NOTIFICATION_TYPES.FEATURE_TEST
-  | typeof DECISION_NOTIFICATION_TYPES.FEATURE_VARIABLE
-  | typeof DECISION_NOTIFICATION_TYPES.ALL_FEATURE_VARIABLES
-  | typeof DECISION_NOTIFICATION_TYPES.FLAG;
+export type DecisionNotificationType = typeof DECISION_NOTIFICATION_TYPES[keyof typeof DECISION_NOTIFICATION_TYPES];
 
 export type DecisionSource = 
   | typeof DECISION_SOURCES.FEATURE_TEST
@@ -215,11 +209,11 @@ export type NotificationPayloadMap = {
   [NOTIFICATION_TYPES.OPTIMIZELY_CONFIG_UPDATE]: undefined;
 };
 
-export type NotificationListener<T> = (notificationData: T) => void;
+export type NotificationListener<T extends ListenerPayload> = (notificationData: T) => void;
 export interface NotificationCenter {
-  addNotificationListener<K extends keyof NotificationPayloadMap>(
-    notificationType: K,
-    callback: NotificationListener<NotificationPayloadMap[K]>
+  addNotificationListener<T extends ListenerPayload>(
+    notificationType: string,
+    callback: NotificationListener<T>
   ): number;
   removeNotificationListener(listenerId: number): boolean;
   clearAllNotificationListeners(): void;
@@ -478,14 +472,14 @@ export interface Client {
 }
 
 export interface ActivateListenerPayload extends ListenerPayload {
-  experiment?: import('./shared_types').Experiment;
-  variation?: import('./shared_types').Variation;
+  experiment: import('./shared_types').Experiment;
+  variation: import('./shared_types').Variation;
   logEvent: Event;
 }
 
 export interface TrackListenerPayload extends ListenerPayload {
   eventKey: string;
-  eventTags?: EventTags;
+  eventTags: EventTags;
   logEvent: Event;
 }