feat(loopUntil): 可不传 fn

fjc0k · Jul 13, 2022 · f8fc3b2 · f8fc3b2
1 parent 859b8b4
commit f8fc3b2
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/src/utils/loopUntil.test.ts b/src/utils/loopUntil.test.ts
@@ -44,4 +44,20 @@ describe('loopUntil', () => {
     ).rejects.toBeInstanceOf(LoopUntilRetryLimitExceededError)
     expect(i).toBe(6)
   })
+
+  test('异步正常2', async () => {
+    const i = 0
+    const fn = jest.fn().mockImplementation(
+      () =>
+        // @ts-ignore
+        i === 0,
+    )
+    expect(
+      await loopUntil(fn, {
+        retryDelay: 0,
+        retryLimit: 1,
+      }),
+    ).toBe(undefined)
+    expect(fn).toBeCalled()
+  })
 })
diff --git a/src/utils/loopUntil.ts b/src/utils/loopUntil.ts
@@ -16,6 +16,17 @@ export interface LoopUntilOptions {
 
 export class LoopUntilRetryLimitExceededError extends Error {}
 
+export async function loopUntil<T>(
+  fn: () => AsyncOrSync<T>,
+  condition: (res: T) => AsyncOrSync<boolean>,
+  options: LoopUntilOptions,
+): Promise<T>
+
+export async function loopUntil(
+  condition: () => AsyncOrSync<boolean>,
+  options: LoopUntilOptions,
+): Promise<void>
+
 /**
  * 循环调用某个函数直至达到某个条件后返回调用结果。
  *
@@ -24,14 +35,20 @@ export class LoopUntilRetryLimitExceededError extends Error {}
  * @param options 选项
  */
 export async function loopUntil<T>(
-  fn: () => AsyncOrSync<T>,
-  condition: (res: T) => AsyncOrSync<boolean>,
-  options: LoopUntilOptions,
+  fn: any,
+  condition: any,
+  options?: any,
 ): Promise<T> {
+  if (options == null) {
+    options = condition
+    condition = fn
+    fn = undefined
+  }
+
   let retryCount = 0
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    const res = await fn()
+    const res = fn ? await fn() : undefined
     if (await condition(res)) {
       return res
     }