events: extract listener check as a function

PR-URL: nodejs#24303 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Denys Otrishko <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: James M Snell <[email protected]>
Trott · Nov 19, 2018 · a3d9168 · a3d9168
1 parent 6b91c36
commit a3d9168
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/lib/events.js b/lib/events.js
@@ -48,6 +48,13 @@ function lazyErrors() {
   return errors;
 }
 
+function checkListener(listener) {
+  if (typeof listener !== 'function') {
+    const errors = lazyErrors();
+    throw new errors.ERR_INVALID_ARG_TYPE('listener', 'Function', listener);
+  }
+}
+
 Object.defineProperty(EventEmitter, 'defaultMaxListeners', {
   enumerable: true,
   get: function() {
@@ -195,10 +202,7 @@ function _addListener(target, type, listener, prepend) {
   var events;
   var existing;
 
-  if (typeof listener !== 'function') {
-    const errors = lazyErrors();
-    throw new errors.ERR_INVALID_ARG_TYPE('listener', 'Function', listener);
-  }
+  checkListener(listener);
 
   events = target._events;
   if (events === undefined) {
@@ -283,20 +287,16 @@ function _onceWrap(target, type, listener) {
 }
 
 EventEmitter.prototype.once = function once(type, listener) {
-  if (typeof listener !== 'function') {
-    const errors = lazyErrors();
-    throw new errors.ERR_INVALID_ARG_TYPE('listener', 'Function', listener);
-  }
+  checkListener(listener);
+
   this.on(type, _onceWrap(this, type, listener));
   return this;
 };
 
 EventEmitter.prototype.prependOnceListener =
     function prependOnceListener(type, listener) {
-      if (typeof listener !== 'function') {
-        const errors = lazyErrors();
-        throw new errors.ERR_INVALID_ARG_TYPE('listener', 'Function', listener);
-      }
+      checkListener(listener);
+
       this.prependListener(type, _onceWrap(this, type, listener));
       return this;
     };
@@ -306,10 +306,7 @@ EventEmitter.prototype.removeListener =
     function removeListener(type, listener) {
       var list, events, position, i, originalListener;
 
-      if (typeof listener !== 'function') {
-        const errors = lazyErrors();
-        throw new errors.ERR_INVALID_ARG_TYPE('listener', 'Function', listener);
-      }
+      checkListener(listener);
 
       events = this._events;
       if (events === undefined)