feat(Disposer): API 优化

fjc0k · May 30, 2019 · e083763 · e083763
1 parent 88daef3
commit e083763
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/Disposer.test.ts b/src/Disposer.test.ts
@@ -9,7 +9,13 @@ test('表现正常', async () => {
 
   disposer.add(dispose1)
   disposer.add(dispose1)
-  disposer.add(dispose2, dispose3)
+  disposer.add([dispose2, dispose3, dispose1])
+
+  await disposer.dispose()
+
+  expect(dispose1).toBeCalledTimes(1)
+  expect(dispose2).toBeCalledTimes(1)
+  expect(dispose3).toBeCalledTimes(1)
 
   await disposer.dispose()
 

diff --git a/src/Disposer.ts b/src/Disposer.ts
@@ -1,4 +1,5 @@
-import { isPromiseLike } from './is'
+import { castArray } from './castArray'
+import { parallel } from './parallel'
 
 /**
  * 待释放项目。
@@ -17,10 +18,10 @@ export class Disposer {
   /**
    * 新增待释放项目。
    *
-   * @param items 待释放项目的序列
+   * @param item 待释放项目
    */
-  add(...items: DisposerItem[]) {
-    items.forEach(item => {
+  add(item: DisposerItem | DisposerItem[]) {
+    castArray(item).forEach(item => {
       if (this.jar.indexOf(item) === -1) {
         this.jar.push(item)
       }
@@ -31,20 +32,8 @@ export class Disposer {
    * 释放所有项目。
    */
   dispose() {
-    return (
-      Promise
-        .all(
-          this.jar.map(item => {
-            const result = item()
-            if (isPromiseLike(result)) {
-              return result
-            }
-            return Promise.resolve()
-          }),
-        )
-        .then(() => {
-          this.jar = []
-        })
-    )
+    return parallel(this.jar).then(() => {
+      this.jar = []
+    })
   }
 }