Drop events in Collector

PR-URL: #222

README.md

@@ -81,7 +81,6 @@ const result = await ac;
 - `exact: boolean`
 - `timeout: number`
 - `constructor(keys: Array<string>, options?: CollectorOptions)`
-- `on(name: string, callback: Function)`
 - `set(key: string, value: unknown)`
 - `wait(key: string, fn: AsyncFunction, ...args?: Array<unknown>)`
 - `take(key: string, fn: Function, ...args?: Array<unknown>)`

lib/collector.js

@@ -7,8 +7,6 @@ class Collector {
   count = 0;
   exact = true;
   timeout = 0;
-  #done = null;
-  #error = null;
   #fulfill = null;
   #reject = null;
   #timer = null;
@@ -31,15 +29,6 @@ class Collector {
     this.#timer = setTimeout(handler, msec);
   }
 
-  on(name, callback) {
-    if (name === 'done') this.#done = callback;
-    else if (name === 'error') this.#error = callback;
-    if (this.done) {
-      if (name === 'error' && this.#cause) callback(this.#cause);
-      else if (name === 'done') callback(this.data);
-    }
-  }
-
   set(key, value) {
     if (this.done) return;
     const has = this.data[key] !== undefined;
@@ -53,7 +42,6 @@ class Collector {
     if (this.count === this.keys.length) {
       this.done = true;
       this.#timeout(0);
-      if (this.#done) this.#done(this.data);
       if (this.#fulfill) this.#fulfill(this.data);
     }
   }
@@ -86,7 +74,6 @@ class Collector {
     this.#timeout(0);
     const err = error || new Error('Collector cancelled');
     this.#cause = err;
-    if (this.#error) this.#error(err);
     if (this.#reject) this.#reject(err);
   }
 

metautil.d.ts

@@ -241,7 +241,6 @@ export class Collector {
   exact: boolean;
   timeout: number;
   constructor(keys: Array<string>, options?: CollectorOptions);
-  on(name: string, callback: Function): void;
   set(key: string, value: unknown): void;
   wait(key: string, fn: AsyncFunction, ...args: Array<unknown>): void;
   take(key: string, fn: Function, ...args: Array<unknown>): void;

test/collector.js

@@ -9,13 +9,12 @@ metatests.test('Collector: keys', async (test) => {
 
   setTimeout(() => {
     dc.set('key1', 1);
+  }, 50);
+
+  setTimeout(() => {
     dc.set('key2', 2);
   }, 100);
 
-  dc.on('done', (result) => {
-    test.strictSame(result, expectedResult);
-  });
-
   const result = await dc;
   test.strictSame(result, expectedResult);
   test.end();
@@ -25,13 +24,8 @@ metatests.test('Collector: exact', async (test) => {
   const dc = collect(['key1', 'key2']);
 
   setTimeout(() => {
-    dc.set('key1', 1);
     dc.set('wrongKey', 'someVal');
-  }, 100);
-
-  dc.on('fail', (error) => {
-    test.strictSame(error.message, 'Unexpected key: wrongKey');
-  });
+  }, 50);
 
   try {
     await dc;
@@ -47,7 +41,13 @@ metatests.test('Collector: not exact', async (test) => {
 
   setTimeout(() => {
     dc.set('key1', 1);
+  }, 50);
+
+  setTimeout(() => {
     dc.set('wrongKey', 'someVal');
+  }, 75);
+
+  setTimeout(() => {
     dc.set('key2', 2);
   }, 100);
 
@@ -66,14 +66,19 @@ metatests.test('Collector: set after done', async (test) => {
 
   setTimeout(() => {
     dc.set('key1', 1);
-  }, 100);
+  }, 50);
 
   setTimeout(() => {
     dc.set('key2', 2);
-  }, 200);
+  }, 75);
 
   const result = await dc;
   test.strictSame(result, expectedResult);
+
+  setTimeout(() => {
+    dc.set('key3', 3);
+  }, 100);
+
   test.end();
 });
 
@@ -169,10 +174,6 @@ metatests.test('Collector: after done', async (test) => {
   dc.set('key1', 1);
   dc.set('key2', 2);
 
-  dc.on('done', (result) => {
-    test.strictSame(result, expectedResult);
-  });
-
   const result = await dc;
   test.strictSame(result, expectedResult);
   test.end();