feat: 🎸 Allow custom type for payload and option

manhhailua · Jun 25, 2019 · 0cb054f · 0cb054f
1 parent b488d80
commit 0cb054f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 38 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "printWidth": 80,
+  "printWidth": 120,
   "tabWidth": 2,
   "useTabs": false,
   "semi": true,

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -2,18 +2,14 @@
 import { AnyAction } from 'redux';
 import { SagaIterator } from 'redux-saga';
 
-export interface UnfoldSagaActionType extends AnyAction {
+export interface UnfoldSagaActionType<PayloadType = any, OptionType = any> extends AnyAction {
   callbacks: UnfoldSagaCallbacksType;
-  options: any;
-  payload: any;
+  options: OptionType;
+  payload: PayloadType;
 }
 
-export interface UnfoldSagaActionExecutionType {
-  (
-    payload?: any,
-    callbacks?: UnfoldSagaCallbacksType,
-    options?: any,
-  ): UnfoldSagaActionType;
+export interface UnfoldSagaActionExecutionType<PayloadType = any, OptionType = any> {
+  (payload?: PayloadType, callbacks?: UnfoldSagaCallbacksType, options?: OptionType): UnfoldSagaActionType;
 }
 
 export interface UnfoldSagaCallbacksType {
@@ -38,7 +34,4 @@ export function createActionTypeOnSuccess(key: string): string;
 
 export function createAction(type: string): UnfoldSagaActionExecutionType;
 
-export function unfoldSaga(
-  type: UnfoldSagaHandlerType,
-  callback: UnfoldSagaCallbacksType,
-): SagaIterator;
+export function unfoldSaga(type: UnfoldSagaHandlerType, callback: UnfoldSagaCallbacksType): SagaIterator;
diff --git a/src/index.js b/src/index.js
@@ -150,12 +150,7 @@ export function createAction(type: string): Function {
  */
 export function* unfoldSaga(
   { handler, key }: UnfoldSagaHandlerType,
-  {
-    onBeginning = noop,
-    onFailure = noop,
-    onFinish = noop,
-    onSuccess = noop,
-  }: UnfoldSagaCallbacksType = {},
+  { onBeginning = noop, onFailure = noop, onFinish = noop, onSuccess = noop }: UnfoldSagaCallbacksType = {},
 ): Saga<void> {
   try {
     yield put({ type: createActionTypeOnBeginning(key) });

diff --git a/test/unfoldSaga.test.js b/test/unfoldSaga.test.js
@@ -28,9 +28,7 @@ describe('unfoldSaga', () => {
 
     test('should PUT onBeginning action', () => {
       expect(result.done).toBe(false);
-      expect(result.value).toEqual(
-        put({ type: createActionTypeOnBeginning(key) }),
-      );
+      expect(result.value).toEqual(put({ type: createActionTypeOnBeginning(key) }));
     });
 
     test('should CALL onBeginning callback', () => {
@@ -46,9 +44,7 @@ describe('unfoldSaga', () => {
 
     test('should PUT onSuccess action', () => {
       expect(result.done).toBe(false);
-      expect(result.value).toEqual(
-        put({ type: createActionTypeOnSuccess(key) }),
-      );
+      expect(result.value).toEqual(put({ type: createActionTypeOnSuccess(key) }));
     });
 
     test('should CALL onSuccess callback', () => {
@@ -57,9 +53,7 @@ describe('unfoldSaga', () => {
 
     test('should PUT onFinish action', () => {
       expect(result.done).toBe(false);
-      expect(result.value).toEqual(
-        put({ type: createActionTypeOnFinish(key) }),
-      );
+      expect(result.value).toEqual(put({ type: createActionTypeOnFinish(key) }));
     });
 
     test('should CALL onFinish callback', () => {
@@ -88,9 +82,7 @@ describe('unfoldSaga', () => {
     test('should PUT onBeginning action', () => {
       result = generator.next();
       expect(result.done).toBe(false);
-      expect(result.value).toEqual(
-        put({ type: createActionTypeOnBeginning(key) }),
-      );
+      expect(result.value).toEqual(put({ type: createActionTypeOnBeginning(key) }));
     });
 
     test('should CALL onBeginning callback', () => {
@@ -106,9 +98,7 @@ describe('unfoldSaga', () => {
     test('should PUT onFailure action', () => {
       result = generator.throw(fakeError);
       expect(result.done).toBe(false);
-      expect(result.value).toEqual(
-        put({ type: createActionTypeOnFailure(key), payload: fakeError }),
-      );
+      expect(result.value).toEqual(put({ type: createActionTypeOnFailure(key), payload: fakeError }));
     });
 
     test('should CALL onFailure callback', () => {
@@ -119,9 +109,7 @@ describe('unfoldSaga', () => {
     test('should PUT onFinish action', () => {
       result = generator.next();
       expect(result.done).toBe(false);
-      expect(result.value).toEqual(
-        put({ type: createActionTypeOnFinish(key) }),
-      );
+      expect(result.value).toEqual(put({ type: createActionTypeOnFinish(key) }));
     });
 
     test('should CALL onFinish callback', () => {