Fix: Properly cancel pEventIterator when resolutionEvents emits …

…item not matching filter (#43)
sindresorhus · Jun 14, 2023 · 93d16fb · 93d16fb
1 parent 487bc28
commit 93d16fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/index.js b/index.js
@@ -218,6 +218,7 @@ export function pEventIterator(emitter, event, options) {
 
 		// eslint-disable-next-line unicorn/no-array-callback-reference
 		if (options.filter && !options.filter(value)) {
+			cancel();
 			return;
 		}
 

diff --git a/test.js b/test.js
@@ -408,6 +408,18 @@ test('resolve event resolves pending promises and finishes the iterator', async
 	await t.deepEqual(await iterator.next(), {done: true, value: undefined});
 });
 
+test('resolve event resolves pending promises and finishes the iterator - when filter is set', async t => {
+	const emitter = new EventEmitter();
+	const iterator = pEventIterator(emitter, '🦄', {resolutionEvents: ['end'], filter: Boolean});
+
+	(async () => {
+		await delay(200);
+		emitter.emit('end');
+	})();
+
+	await t.deepEqual(await iterator.next(), {done: true, value: undefined});
+});
+
 test('.multiple()', async t => {
 	const emitter = new EventEmitter();