Fix emmiter return type for trigger

commit_hash:00ea7605601adec011af5e598e643f46ee2bfedf
yandex · Nov 6, 2024 · cf3652a · cf3652a
1 parent c4d4590
commit cf3652a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/utils/events/emitter.ts b/src/utils/events/emitter.ts
@@ -6,7 +6,7 @@ import { Observer, observer, Listener } from './observer';
 export type Emitter<T, U> = {
     on: (a: string[], listener: Listener<T, U>) => Emitter<T, U>;
     off: (a: string[], listener: Listener<T, U>) => Emitter<T, U>;
-    trigger: (a: string, d?: any) => any[];
+    trigger: (a: string, d?: T) => U[];
 };
 
 export const emitter = <T, U>(ctx: Window): Emitter<T, U> => {
@@ -34,6 +34,7 @@ export const emitter = <T, U>(ctx: Window): Emitter<T, U> => {
                       ctx,
                       `e.${eventName}`,
                       observers[eventName].trigger,
+                      [],
                   )(event)
                 : [],
     };

diff --git a/src/utils/iframeConnector/iframeConnector.ts b/src/utils/iframeConnector/iframeConnector.ts
@@ -40,6 +40,7 @@ import {
     MessageHandler,
     MessageMeta,
     IframeConnector,
+    MessageData,
 } from './types';
 
 import {
@@ -246,7 +247,7 @@ export const handleInputMessage = (
             ]);
             const normResp = cMap(
                 pipe(firstArg, ctxMix(counterInfo)),
-                resp.concat([{}]),
+                resp.concat([undefined]),
             );
             const data = serialize(
                 [dateInfo, key, message[IFRAME_MESSAGE_COUNTER_ID]!],
@@ -273,10 +274,7 @@ export const handleInputMessage = (
         }
     }
 };
-const safeHandleInputMessage: typeof handleInputMessage = ctxErrorLogger(
-    's.fh',
-    handleInputMessage,
-);
+const safeHandleInputMessage = ctxErrorLogger('s.fh', handleInputMessage);
 
 export const iframeConnector = (
     ctx: Window,
@@ -330,7 +328,10 @@ export const iframeConnector = (
                 type: INIT_MESSAGE_CHILD,
             },
             (e, data) => {
-                emitterObj.trigger(INIT_MESSAGE_PARENT, [e, data]);
+                emitterObj.trigger(INIT_MESSAGE_PARENT, [
+                    e,
+                    data as MessageData,
+                ]);
             },
         );
     }, iframeList);
@@ -342,7 +343,7 @@ export const iframeConnector = (
                 type: INIT_MESSAGE_PARENT,
             },
             (e, data) => {
-                emitterObj.trigger(INIT_MESSAGE, [e, data]);
+                emitterObj.trigger(INIT_MESSAGE, [e, data as MessageData]);
             },
         );
     }

diff --git a/src/utils/iframeConnector/types.ts b/src/utils/iframeConnector/types.ts
@@ -34,7 +34,10 @@ export type Message = {
     string: string;
 };
 
-export type MessageHandler = (e: Event, ...data: Record<string, any>[]) => void;
+export type MessageHandler = (
+    e: MessageEvent,
+    ...data: Record<string, unknown>[]
+) => void;
 
 export type EventInfo = [MessageEvent, MessageData];