Skip to content

Commit

Permalink
Revert events: add hasEventListener util for validate
Browse files Browse the repository at this point in the history
This reverts commit bdb6d12
  • Loading branch information
origranot committed Dec 17, 2024
1 parent c39875a commit a37cb7c
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions lib/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,6 @@ ObjectDefineProperty(EventEmitter, 'defaultMaxListeners', {
},
});

function hasEventListener(self, type) {
if (type === undefined)
return self._events !== undefined;
return self._events !== undefined && self._events[type] !== undefined;
};

ObjectDefineProperties(EventEmitter, {
kMaxEventTargetListeners: {
__proto__: null,
Expand Down Expand Up @@ -675,11 +669,13 @@ EventEmitter.prototype.removeListener =
function removeListener(type, listener) {
checkListener(listener);

if (!hasEventListener(this, type))
const events = this._events;
if (events === undefined)
return this;

const events = this._events;
const list = events[type];
if (list === undefined)
return this;

if (list === listener || list.listener === listener) {
this._eventsCount -= 1;
Expand Down Expand Up @@ -733,9 +729,9 @@ EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
*/
EventEmitter.prototype.removeAllListeners =
function removeAllListeners(type) {
if (!hasEventListener(this))
return this;
const events = this._events;
if (events === undefined)
return this;

// Not listening for removeListener, no need to emit
if (events.removeListener === undefined) {
Expand Down Expand Up @@ -780,10 +776,14 @@ EventEmitter.prototype.removeAllListeners =
};

function _listeners(target, type, unwrap) {
if (!hasEventListener(target, type))
const events = target._events;

if (events === undefined)
return [];

const evlistener = target._events[type];
const evlistener = events[type];
if (evlistener === undefined)
return [];

if (typeof evlistener === 'function')
return unwrap ? [evlistener.listener || evlistener] : [evlistener];
Expand Down

0 comments on commit a37cb7c

Please sign in to comment.