fix(esl-event-listener): fix isEventDescriptor check for incorrect …

…type of event key
exadel-inc · Jan 30, 2023 · 729b486 · 729b486
1 parent af44e49
commit 729b486
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/modules/esl-event-listener/core/descriptors.ts b/src/modules/esl-event-listener/core/descriptors.ts
@@ -27,8 +27,9 @@ function getDescriptorsKeysFor<T extends object>(host: T): (keyof T)[] {
 }
 
 /** Type guard to check if the passed function is typeof {@link ESLListenerDescriptorFn} */
-export function isEventDescriptor(obj: unknown): obj is ESLListenerDescriptorFn {
-  return typeof obj === 'function' && Object.hasOwnProperty.call(obj, 'event');
+export function isEventDescriptor(obj: any): obj is ESLListenerDescriptorFn {
+  if (typeof obj !== 'function' || !Object.hasOwnProperty.call(obj, 'event')) return false;
+  return typeof obj.event === 'string' || typeof obj.event === 'function';
 }
 
 /** Gets {@link ESLListenerDescriptorFn}s of the passed object */

diff --git a/src/modules/esl-event-listener/test/descriptor.test.ts b/src/modules/esl-event-listener/test/descriptor.test.ts
@@ -3,7 +3,10 @@ import {ESLEventUtils} from '../core';
 describe('dom/events: ESLEventUtils: ESLListenerDescriptor Utils', () => {
   describe('ESLEventUtils.isEventDescriptor', () => {
     function fakeDesc() {}
-    descEvent.event = false;
+    fakeDesc.event = false;
+
+    function fakeDesc2() {}
+    fakeDesc2.event = {};
 
     function descEvent() {}
     descEvent.event = 'event';
@@ -19,6 +22,7 @@ describe('dom/events: ESLEventUtils: ESLListenerDescriptor Utils', () => {
       [{event: ''}, false],
       [function noop() {}, false],
       [fakeDesc, false],
+      [fakeDesc2, false],
 
       [descEvent, true],
       [descEventProvider, true]