fix(types): More tightly scoping PromiseLike change (#1871 by @kav)

mobxjs · Feb 6, 2022 · 6095151 · 6095151
1 parent 108537f
commit 6095151
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/mobx-state-tree/__tests__/core/async.test.ts b/packages/mobx-state-tree/__tests__/core/async.test.ts
@@ -27,7 +27,7 @@ function testCoffeeTodo(
     done: () => void,
     generator: (
         self: any
-    ) => (str: string) => Generator<PromiseLike<any>, string | void | undefined, undefined>,
+    ) => (str: string) => Generator<Promise<any>, string | void | undefined, undefined>,
     shouldError: boolean,
     resultValue: string | undefined,
     producedCoffees: any[]

diff --git a/packages/mobx-state-tree/src/core/flow.ts b/packages/mobx-state-tree/src/core/flow.ts
@@ -10,7 +10,7 @@ import {
 /**
  * @hidden
  */
-export type FlowReturn<R> = R extends PromiseLike<infer T> ? T : R
+export type FlowReturn<R> = R extends Promise<infer T> ? T : R
 
 /**
  * See [asynchronous actions](concepts/async-actions.md).
@@ -19,7 +19,7 @@ export type FlowReturn<R> = R extends PromiseLike<infer T> ? T : R
  */
 export function flow<R, Args extends any[]>(
     generator: (...args: Args) => Generator<PromiseLike<any>, R, any>
-): (...args: Args) => PromiseLike<FlowReturn<R>> {
+): (...args: Args) => Promise<FlowReturn<R>> {
     return createFlowSpawner(generator.name, generator) as any
 }
 
@@ -56,7 +56,7 @@ export function castFlowReturn<T>(val: T): T {
  * }))
  * ```
  */
-export function toGeneratorFunction<R, Args extends any[]>(p: (...args: Args) => PromiseLike<R>) {
+export function toGeneratorFunction<R, Args extends any[]>(p: (...args: Args) => Promise<R>) {
     return function* (...args: Args) {
         return (yield p(...args)) as R
     }