events: onceWrapper returns target value

himself65 · BethGriggs · commit cb0fc6520acc · 2019-04-16T22:14:34.000+01:00
PR-URL: #25818 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/events.js b/lib/events.js
@@ -274,7 +274,7 @@ function onceWrapper(...args) {
   if (!this.fired) {
     this.target.removeListener(this.type, this.wrapFn);
     this.fired = true;
-    Reflect.apply(this.listener, this.target, args);
+    return Reflect.apply(this.listener, this.target, args);
   }
 }
 
diff --git a/test/parallel/test-event-emitter-listeners.js b/test/parallel/test-event-emitter-listeners.js
@@ -27,6 +27,12 @@ const events = require('events');
 
 function listener() {}
 function listener2() {}
+function listener3() {
+  return 0;
+}
+function listener4() {
+  return 1;
+}
 
 {
   const ee = new events.EventEmitter();
@@ -101,3 +107,15 @@ function listener2() {}
   assert.strictEqual(wrappedListeners.length, 2);
   assert.strictEqual(wrappedListeners[1].listener, listener);
 }
+
+{
+  const ee = new events.EventEmitter();
+  ee.once('foo', listener3);
+  ee.on('foo', listener4);
+  const rawListeners = ee.rawListeners('foo');
+  assert.strictEqual(rawListeners.length, 2);
+  assert.strictEqual(rawListeners[0](), 0);
+  const rawListener = ee.rawListeners('foo');
+  assert.strictEqual(rawListener.length, 1);
+  assert.strictEqual(rawListener[0](), 1);
+}

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ function onceWrapper(...args) {`
`274`	`274`	`if (!this.fired) {`
`275`	`275`	`this.target.removeListener(this.type, this.wrapFn);`
`276`	`276`	`this.fired = true;`
`277`		`- Reflect.apply(this.listener, this.target, args);`
	`277`	`+ return Reflect.apply(this.listener, this.target, args);`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`