implementPromiseAction supports now iterator and (async) function

teneko · Oct 29, 2021 · 2b6ad05 · 2b6ad05
1 parent 7890293
commit 2b6ad05
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -74,7 +74,7 @@ function rejectPromise<TA extends PayloadActionAndMeta<any, any, any, Resolvable
  *
  * @param executor A function that returns a value or throws a error that get applied on promise.
  */
-export function* implementPromiseAction<TA extends PayloadActionAndMeta<any, any, any, any>>(action: TA, executor: () => ResolveValueFromTriggerAction<TA>) {
+export function* implementPromiseAction<TA extends PayloadActionAndMeta<any, any, any, any>>(action: TA, executor: TriggerExecutor<ResolveValueFromTriggerAction<TA>>) {
   verify(action, "implementPromiseAction");
 
   try {
@@ -107,6 +107,8 @@ function createPromiseActions<T extends string>(type: T) {
   };
 }
 
+type TriggerExecutor<RT> = (() => PromiseLike<RT> | RT | Iterator<any, RT, any>);
+
 function createUpdatedTrigger<V, P, T extends string, TA extends PayloadActionCreator<any, any>>(
   type: T,
   triggerAction: TA,
@@ -129,7 +131,7 @@ function createUpdatedTrigger<V, P, T extends string, TA extends PayloadActionCr
   } = {} as any;
 
   const sagas = {
-    implement: implementPromiseAction as <TA2 extends typeof types["action"]>(action: TA2, executor: () => ResolveValueFromTriggerAction<TA2>) => ReturnType<typeof implementPromiseAction>,
+    implement: implementPromiseAction as <TA2 extends typeof types["action"], RT extends ResolveValueFromTriggerAction<TA2>>(action: TA2, executor: TriggerExecutor<RT>) => ReturnType<typeof implementPromiseAction>,
     resolve: resolvePromiseAction as <TA2 extends typeof types["action"]>(action: TA2, value: ResolveValueFromTriggerAction<TA2>) => ReturnType<typeof resolvePromiseAction>,
     reject: rejectPromiseAction as <TA2 extends typeof types["action"]>(action: TA2, error: any) => ReturnType<typeof rejectPromiseAction>,
   };

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -190,6 +190,13 @@ describe("implementPromiseAction", function () {
     store.dispatch(sagas.controlAction({}));
     expect(caughtMiddlewareError() instanceof ConfigurationError).toBeTruthy();
   });
+
+  it("should correctly infer value type", function () {
+    const promiseAction = promiseActionFactory<string>().simple("test");
+    call(promiseAction.sagas.implement, promiseAction(), async () => Promise.resolve(""));
+    call(promiseAction.sagas.implement, promiseAction(), function* () { yield "dummy"; return ""; });
+    call(promiseAction.sagas.implement, promiseAction(), () => "");
+  });
 });
 
 describe("resolvePromiseAction", function () {
@@ -232,6 +239,12 @@ describe("resolvePromiseAction", function () {
     store.dispatch(sagas.controlAction({}));
     expect(caughtMiddlewareError() instanceof ConfigurationError).toBeTruthy();
   });
+
+  it("should correctly infer value type", function () {
+    const promiseAction = promiseActionFactory<string>().simple("test");
+    call(promiseAction.sagas.resolve, promiseAction(), "");
+    call(promiseAction.sagas.resolve, promiseAction.trigger(), "");
+  });
 });
 
 describe("rejectPromiseAction", function () {