saga-toolkit 2.2.3 → 2.2.5

package/README.md

@@ -48,40 +48,32 @@ yarn add saga-toolkit
 
 ### 1. Create a "Saga Action"
 
-Instead of `createAsyncThunk` or standard standard action creators, use `createSagaAction`. This creates a thunk that returns a promise which your Saga will resolve or reject.
+Instead of `createAsyncThunk` or standard action creators, use `createSagaAction`. This creates an Async Thunk that returns a promise which your Saga will resolve or reject.
 
-```javascript
-/* slice.js */
-import { createSlice } from '@reduxjs/toolkit'
+```typescript
+/* slice.ts */
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { createSagaAction } from 'saga-toolkit'
 
+interface User {
+  id: string
+  name: string
+}
+
 const name = 'users'
 
-// Define the action
-export const fetchUser = createSagaAction(`${name}/fetchUser`)
-
-const initialState = {
-  data: null,
-  loading: false,
-  error: null,
-}
+// Define the action: <Returned, ThunkArg>
+export const fetchUser = createSagaAction<User, string>(`${name}/fetchUser`)
 
 const slice = createSlice({
   name,
-  initialState,
+  initialState: { data: null as User | null, loading: false },
   extraReducers: (builder) => {
     builder
-      .addCase(fetchUser.pending, (state) => {
-        state.loading = true
-        state.error = null
-      })
-      .addCase(fetchUser.fulfilled, (state, { payload }) => {
+      .addCase(fetchUser.pending, (state) => { state.loading = true })
+      .addCase(fetchUser.fulfilled, (state, action: PayloadAction<User>) => {
         state.loading = false
-        state.data = payload
-      })
-      .addCase(fetchUser.rejected, (state, { error }) => {
-        state.loading = false
-        state.error = error
+        state.data = action.payload
       })
   },
 })
@@ -91,18 +83,17 @@ export default slice.reducer
 
 ### 2. Connect to a Saga
 
-Use `takeEveryAsync` (or `takeLatestAsync`, etc.) to listen for the action. The return value of your saga becomes the `fulfilled` payload. Throwing an error becomes the `rejected` payload.
+Use `takeEveryAsync` (or `takeLatestAsync`, etc.) to listen for the action. Use the `SagaActionFromCreator` helper to type your worker sagas perfectly.
 
-```javascript
-/* sagas.js */
+```typescript
+/* sagas.ts */
 import { call } from 'redux-saga/effects'
-import { takeEveryAsync } from 'saga-toolkit'
+import { takeEveryAsync, SagaActionFromCreator } from 'saga-toolkit'
 import { fetchUser } from './slice'
-import API from './api'
 
-function* fetchUserSaga({ meta }) {
-  // meta.arg contains the argument passed to the dispatch
-  const userId = meta.arg
+// helper for clean typing
+function* fetchUserSaga(action: SagaActionFromCreator<typeof fetchUser>) {
+  const userId = action.meta.arg
   
   // The return value here resolves the promise!
   const user = yield call(API.getUser, userId)
@@ -110,27 +101,32 @@ function* fetchUserSaga({ meta }) {
 }
 
 export default function* rootSaga() {
-  yield takeEveryAsync(fetchUser.type, fetchUserSaga)
+  yield takeEveryAsync(fetchUser.pending.type, fetchUserSaga)
 }
 ```
 
 ### 3. Dispatch and Await in Component
 
-Now you can treat the Saga logic as if it were a simple async function.
+#### [Pro Tip] Use `bindActionCreators`
+To keep your component code clean and avoid passing `dispatch` everywhere, we recommend using `bindActionCreators`.
 
-```javascript
-/* UserComponent.jsx */
+```tsx
+/* UserComponent.tsx */
+import { useMemo } from 'react'
 import { useDispatch } from 'react-redux'
-import { useEffect } from 'react'
+import { bindActionCreators } from 'redux'
 import { fetchUser } from './slice'
 
-const UserComponent = ({ id }) => {
+const UserComponent = ({ id }: { id: string }) => {
   const dispatch = useDispatch()
+  
+  // Bind actions once
+  const actions = useMemo(() => bindActionCreators({ fetchUser }, dispatch), [dispatch])
 
   const handleFetch = async () => {
     try {
-      // This waits for the Saga to finish!
-      const user = await dispatch(fetchUser(id)).unwrap() 
+      // Clean awaitable call!
+      const user = await actions.fetchUser(id).unwrap() 
       console.log('Got user:', user)
     } catch (error) {
       console.error('Failed to fetch:', error)
@@ -143,27 +139,28 @@ const UserComponent = ({ id }) => {
 
 ## API Reference
 
-### `createSagaAction(typePrefix)`
-Creates a Redux Toolkit Async Thunk that is specially designed to work with the effects below.
+### `createSagaAction<Returned, ThunkArg>(typePrefix)`
+Creates a Redux Toolkit Async Thunk bridge.
 - **Returns**: An enhanced thunk action creator.
 
 ### `takeEveryAsync(pattern, saga, ...args)`
-Spawns a `saga` on each action dispatched to the Store that matches `pattern`.
-- Automatically resolves the promise associated with the action when the saga returns.
-- Automatically rejects the promise if the saga errors.
+Spawns a `saga` on each action.
+- Automatically resolves/rejects the promise associated with the action.
 
 ### `takeLatestAsync(pattern, saga, ...args)`
-Same as `takeEveryAsync`, but cancels any previous running task if a new matching action is dispatched.
-- **Note**: Cancelled tasks will reject the promise with an "Aborted" error (or similar).
+Same as `takeEveryAsync`, but cancels previous running task on new actions.
+- Propagates cancellation to the saga and rejets the promise with "Aborted".
 
 ### `takeAggregateAsync(pattern, saga, ...args)`
-Wait for the saga to finish for the first action. If subsequent actions with the same pattern are dispatched *while only one is running*, they will all share the **same promise result** as the first one.
-- Useful for de-duplicating identical requests (e.g., multiple components requesting "load config" simultaneously).
+Wait for the saga to finish. Subsequent identical actions dispatched while it's running will all share the **same promise result**.
+- Perfect for de-duplicating rapid "Refresh" calls.
 
 ### `putAsync(action)`
-Dispatches an action to the store and waits for the result.
-- Useful when you want to call another saga-action from within a saga and wait for it (composition).
-- **Example**: `const result = yield putAsync(otherAction())`
+Dispatches an action and waits for its Saga to finish.
+- `const result = yield putAsync(otherAction())`
+
+### `SagaActionFromCreator<typeof actionCreator>`
+TypeScript helper to extract the correct action type for your Saga worker.
 
 ## License
 

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { AsyncThunk, AsyncThunkAction } from '@reduxjs/toolkit';
 import * as redux_saga_effects from 'redux-saga/effects';
 import { ActionPattern, PutEffect } from 'redux-saga/effects';
-import { Channel } from 'redux-saga';
+import { Channel, Task } from 'redux-saga';
 import { Action } from 'redux';
 
 type SagaWorker = (...args: unknown[]) => unknown;
@@ -13,16 +13,23 @@ interface Deferred<T = unknown> {
 interface Request {
     requestId?: string;
     deferred?: Deferred;
-    onAdd?: (request: Request) => void;
     abort?: () => void;
+    task?: any;
+    onAdd?: (request: Request) => void;
+    handled?: boolean;
 }
 type SagaAction<Returned, ThunkArg = void> = AsyncThunk<Returned, ThunkArg, object>;
+type SagaActionFromCreator<T extends (...args: any[]) => any> = ReturnType<ReturnType<T>['pending']>;
 
 declare function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<never>;
-declare function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<Generator<unknown, void, unknown>>;
+declare function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<Generator<Generator<unknown, Request, unknown> | redux_saga_effects.TakeEffect | redux_saga_effects.ForkEffect<unknown> | redux_saga_effects.CancelEffect, never, {
+    meta: {
+        requestId: string;
+    };
+} & Request & Task<any>>>;
 declare function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<never>;
 declare function putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown>;
 
 declare const createSagaAction: <Returned, ThunkArg = void>(type: string) => SagaAction<Returned, ThunkArg>;
 
-export { type Deferred, type Request, type SagaAction, type SagaWorker, createSagaAction, putAsync, takeAggregateAsync, takeEveryAsync, takeLatestAsync };
+export { type Deferred, type Request, type SagaAction, type SagaActionFromCreator, type SagaWorker, createSagaAction, putAsync, takeAggregateAsync, takeEveryAsync, takeLatestAsync };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { AsyncThunk, AsyncThunkAction } from '@reduxjs/toolkit';
 import * as redux_saga_effects from 'redux-saga/effects';
 import { ActionPattern, PutEffect } from 'redux-saga/effects';
-import { Channel } from 'redux-saga';
+import { Channel, Task } from 'redux-saga';
 import { Action } from 'redux';
 
 type SagaWorker = (...args: unknown[]) => unknown;
@@ -13,16 +13,23 @@ interface Deferred<T = unknown> {
 interface Request {
     requestId?: string;
     deferred?: Deferred;
-    onAdd?: (request: Request) => void;
     abort?: () => void;
+    task?: any;
+    onAdd?: (request: Request) => void;
+    handled?: boolean;
 }
 type SagaAction<Returned, ThunkArg = void> = AsyncThunk<Returned, ThunkArg, object>;
+type SagaActionFromCreator<T extends (...args: any[]) => any> = ReturnType<ReturnType<T>['pending']>;
 
 declare function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<never>;
-declare function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<Generator<unknown, void, unknown>>;
+declare function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<Generator<Generator<unknown, Request, unknown> | redux_saga_effects.TakeEffect | redux_saga_effects.ForkEffect<unknown> | redux_saga_effects.CancelEffect, never, {
+    meta: {
+        requestId: string;
+    };
+} & Request & Task<any>>>;
 declare function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]): redux_saga_effects.ForkEffect<never>;
 declare function putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown>;
 
 declare const createSagaAction: <Returned, ThunkArg = void>(type: string) => SagaAction<Returned, ThunkArg>;
 
-export { type Deferred, type Request, type SagaAction, type SagaWorker, createSagaAction, putAsync, takeAggregateAsync, takeEveryAsync, takeLatestAsync };
+export { type Deferred, type Request, type SagaAction, type SagaActionFromCreator, type SagaWorker, createSagaAction, putAsync, takeAggregateAsync, takeEveryAsync, takeLatestAsync };

package/dist/index.js

@@ -46,7 +46,8 @@ var addRequest = (requestId) => {
   const request = {
     ...requests[requestId],
     requestId,
-    deferred: deferred2
+    deferred: deferred2,
+    handled: false
   };
   if (requests[requestId]) {
     requests[requestId].deferred = deferred2;
@@ -56,6 +57,11 @@ var addRequest = (requestId) => {
   } else {
     requests[requestId] = request;
   }
+  setTimeout(() => {
+    if (requests[requestId] && !requests[requestId].handled) {
+      delete requests[requestId];
+    }
+  }, 3e4);
   return deferred2.promise;
 };
 var cleanup = (requestId) => {
@@ -68,10 +74,14 @@ var setRequestAbort = (requestId, abort) => {
 };
 function* getRequest(requestId) {
   const request = requests[requestId];
+  if (request) {
+    request.handled = true;
+  }
   if (!request) {
     const result = yield new Promise((onAdd) => {
       requests[requestId] = {
-        onAdd: (req) => onAdd(req)
+        onAdd: (req) => onAdd(req),
+        handled: true
       };
     });
     return result;
@@ -116,37 +126,26 @@ function takeEveryAsync(pattern, saga, ...args) {
   return takeEveryHelper(pattern, wrap(saga), ...args);
 }
 function takeLatestAsync(pattern, saga, ...args) {
-  const tasks = {};
-  let deferred2;
-  function* wrapper(action, ...rest) {
-    if (deferred2) {
-      const lastRequestId = yield deferred2.promise;
-      const request = yield getRequest(lastRequestId);
-      if (request.abort) {
-        request.abort();
-      }
-      const task = yield tasks[lastRequestId].promise;
-      yield (0, import_effects.cancel)(task);
-    }
-    deferred2 = deferred();
-    const { requestId } = action.meta;
-    yield getRequest(requestId);
-    if (deferred2) {
-      deferred2.resolve(requestId);
-    }
-    yield wrap(saga)(action, ...rest);
-    deferred2 = null;
-  }
-  const customTakeEvery = (patternOrChannel, saga2, ...args2) => (0, import_effects.fork)(function* () {
+  return (0, import_effects.fork)(function* () {
+    let lastTask = null;
+    let lastRequestId = null;
     while (true) {
-      const action = yield (0, import_effects.take)(patternOrChannel);
+      const action = yield (0, import_effects.take)(pattern);
       const { requestId } = action.meta;
-      tasks[requestId] = deferred();
-      const task = yield (0, import_effects.fork)(saga2, ...args2.concat(action));
-      tasks[requestId].resolve(task);
+      if (lastTask) {
+        if (lastRequestId) {
+          const lastRequest = yield getRequest(lastRequestId);
+          if (lastRequest.abort) {
+            lastRequest.abort();
+          }
+        }
+        yield (0, import_effects.cancel)(lastTask);
+      }
+      lastRequestId = requestId;
+      const worker = wrap(saga);
+      lastTask = yield (0, import_effects.fork)(worker, ...args.concat(action));
     }
   });
-  return customTakeEvery(pattern, wrapper, ...args);
 }
 function takeAggregateAsync(pattern, saga, ...args) {
   let deferred2;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../node_modules/@redux-saga/deferred/dist/redux-saga-deferred.esm.js","../src/utils.ts","../src/effects.ts"],"sourcesContent":["import { createAsyncThunk } from '@reduxjs/toolkit'\nimport type { ThunkDispatch } from '@reduxjs/toolkit'\nimport type { Action } from 'redux'\nimport { addRequest, setRequestAbort } from './utils'\nimport { SagaAction } from './types'\n\nexport * from './types'\nexport * from './effects'\n\nexport const createSagaAction = <Returned, ThunkArg = void>(type: string): SagaAction<Returned, ThunkArg> => {\n    const thunk = createAsyncThunk<Returned, ThunkArg>(type, (_, { requestId }) => addRequest(requestId) as Promise<Returned>)\n\n    function actionCreator(arg: ThunkArg) {\n        const originalActionCreator = thunk(arg)\n\n        return (dispatch: ThunkDispatch<unknown, unknown, Action>, getState: () => unknown, extra: unknown) => {\n            const promise = originalActionCreator(dispatch, getState, extra)\n            if (promise.requestId) {\n                setRequestAbort(promise.requestId, promise.abort)\n            }\n\n            return promise\n        }\n    }\n\n    Object.assign(actionCreator, {\n        pending: thunk.pending,\n        rejected: thunk.rejected,\n        fulfilled: thunk.fulfilled,\n        typePrefix: thunk.typePrefix,\n        type: (thunk.pending as unknown as { type: string }).type,\n    })\n\n    return actionCreator as unknown as SagaAction<Returned, ThunkArg>\n}\n","function deferred() {\n  var def = {};\n  def.promise = new Promise(function (resolve, reject) {\n    def.resolve = resolve;\n    def.reject = reject;\n  });\n  return def;\n}\nfunction arrayOfDeferred(length) {\n  var arr = [];\n  for (var i = 0; i < length; i++) {\n    arr.push(deferred());\n  }\n  return arr;\n}\n\nexport { arrayOfDeferred, deferred as default };\n","import createDeferred from '@redux-saga/deferred'\nimport { Request, SagaWorker } from './types'\n\nconst requests: Record<string, Request> = {}\n\nexport const addRequest = (requestId: string) => {\n    const deferred = createDeferred()\n    const request: Request = {\n        ...requests[requestId],\n        requestId,\n        deferred,\n    }\n\n    if (requests[requestId]) {\n        requests[requestId].deferred = deferred\n        if (requests[requestId].onAdd) {\n            requests[requestId].onAdd(request)\n        }\n    } else {\n        requests[requestId] = request\n    }\n\n    return deferred.promise\n}\n\nexport const cleanup = (requestId: string) => {\n    delete requests[requestId]\n}\n\nexport const setRequestAbort = (requestId: string, abort: () => void) => {\n    if (requests[requestId]) {\n        requests[requestId].abort = abort\n    }\n}\n\nexport function* getRequest(requestId: string): Generator<unknown, Request, unknown> {\n    const request = requests[requestId]\n\n    if (!request) {\n        const result = yield (new Promise(onAdd => {\n            requests[requestId] = {\n                onAdd: (req: Request) => onAdd(req)\n            }\n        }))\n        return result as Request\n    }\n\n    return request\n}\n\nexport const wrap = (saga: SagaWorker) => function* (action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n    const { requestId } = (action as { meta: { requestId: string } }).meta\n    const request = (yield getRequest(requestId)) as Request\n\n    if (!request.deferred) return\n\n    const deferred = request.deferred\n    let isFinished = false\n\n    try {\n        const result = yield saga(action, ...rest)\n        deferred.resolve(result)\n        isFinished = true\n    } catch (error) {\n        deferred.reject(error)\n        isFinished = true\n    } finally {\n        if (!isFinished) {\n            deferred.reject(new Error('Aborted'))\n            const currentRequest = requests[requestId]\n            if (currentRequest && currentRequest.abort) {\n                currentRequest.abort()\n            }\n        }\n        cleanup(requestId)\n    }\n}\n","import { put, take, fork, cancel } from 'redux-saga/effects'\nimport type { PutEffect, ActionPattern } from 'redux-saga/effects'\nimport type { Task, Channel } from 'redux-saga'\nimport type { Action } from 'redux'\nimport createDeferred from '@redux-saga/deferred'\nimport { AsyncThunkAction, unwrapResult } from '@reduxjs/toolkit'\nimport { SagaWorker, Deferred, Request } from './types'\nimport { wrap, getRequest, cleanup } from './utils'\n\n// Helper to avoid 'takeEvery' overload issues with spread arguments\nconst takeEveryHelper = (patternOrChannel: ActionPattern | Channel<Action>, worker: SagaWorker, ...args: unknown[]) => fork(function* () {\n    while (true) {\n        const action = (yield take(patternOrChannel as unknown as ActionPattern)) as Action\n        yield fork(worker, ...args.concat(action))\n    }\n})\n\nexport function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrap(saga as unknown as SagaWorker), ...args)\n}\n\nexport function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    const tasks: Record<string, Deferred> = {}\n    let deferred: Deferred | null\n\n    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n        if (deferred) {\n            const lastRequestId = (yield deferred.promise) as string\n            const request = (yield getRequest(lastRequestId)) as Request\n\n            if (request.abort) {\n                request.abort()\n            }\n\n            const task = (yield tasks[lastRequestId].promise) as Task\n\n            yield cancel(task)\n        }\n\n        deferred = createDeferred()\n        const { requestId } = (action as { meta: { requestId: string } }).meta\n\n        yield getRequest(requestId) // Ensure request is registered/ready if needed\n\n        if (deferred) {\n            deferred.resolve(requestId)\n        }\n\n        yield wrap(saga as unknown as SagaWorker)(action, ...rest)\n\n        deferred = null\n    }\n\n    const customTakeEvery = (patternOrChannel: ActionPattern | Channel<Action>, saga: SagaWorker, ...args: unknown[]) => fork(function* (): Generator<unknown, void, unknown> {\n        while (true) {\n            const action = (yield take(patternOrChannel as unknown as ActionPattern)) as { meta: { requestId: string } }\n            const { requestId } = action.meta\n            tasks[requestId] = createDeferred()\n            const task = (yield fork(saga, ...args.concat(action))) as Task\n            tasks[requestId].resolve(task)\n        }\n    })\n\n    return customTakeEvery(pattern as ActionPattern | Channel<Action>, wrapper, ...args)\n}\n\nexport function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    let deferred: Deferred | null\n\n    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n        const { requestId } = (action as { meta: { requestId: string } }).meta\n\n        if (deferred) {\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { resolve, reject } = request.deferred\n                const { promise } = (yield deferred.promise) as { promise: Promise<unknown> }\n\n                promise\n                    .then(resolve, reject)\n                    .finally(() => cleanup(requestId))\n                    .catch(() => { })\n            }\n        } else {\n            deferred = createDeferred()\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { promise } = request.deferred\n\n                yield wrap(saga as unknown as SagaWorker)(action, ...rest)\n\n                if (deferred) {\n                    deferred.resolve({ promise })\n                }\n                deferred = null\n            }\n        }\n    }\n\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrapper, ...args)\n}\n\nexport function* putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown> {\n    const promise = yield put(action as Action)\n    const result = yield (promise as Promise<unknown>)\n    return unwrapResult(result as { payload: unknown, error?: unknown, meta?: unknown })\n}\n"],"mappings":"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","names":["import_toolkit","deferred","deferred","saga","args"]}
+{"version":3,"sources":["../src/index.ts","../node_modules/@redux-saga/deferred/dist/redux-saga-deferred.esm.js","../src/utils.ts","../src/effects.ts"],"sourcesContent":["import { createAsyncThunk } from '@reduxjs/toolkit'\nimport type { ThunkDispatch } from '@reduxjs/toolkit'\nimport type { Action } from 'redux'\nimport { addRequest, setRequestAbort } from './utils'\nimport { SagaAction } from './types'\n\nexport * from './types'\nexport * from './effects'\n\nexport const createSagaAction = <Returned, ThunkArg = void>(type: string): SagaAction<Returned, ThunkArg> => {\n    const thunk = createAsyncThunk<Returned, ThunkArg>(type, (_, { requestId }) => addRequest(requestId) as Promise<Returned>)\n\n    function actionCreator(arg: ThunkArg) {\n        const originalActionCreator = thunk(arg)\n\n        return (dispatch: ThunkDispatch<unknown, unknown, Action>, getState: () => unknown, extra: unknown) => {\n            const promise = originalActionCreator(dispatch, getState, extra)\n            if (promise.requestId) {\n                setRequestAbort(promise.requestId, promise.abort)\n            }\n\n            return promise\n        }\n    }\n\n    Object.assign(actionCreator, {\n        pending: thunk.pending,\n        rejected: thunk.rejected,\n        fulfilled: thunk.fulfilled,\n        typePrefix: thunk.typePrefix,\n        type: (thunk.pending as unknown as { type: string }).type,\n    })\n\n    return actionCreator as unknown as SagaAction<Returned, ThunkArg>\n}\n","function deferred() {\n  var def = {};\n  def.promise = new Promise(function (resolve, reject) {\n    def.resolve = resolve;\n    def.reject = reject;\n  });\n  return def;\n}\nfunction arrayOfDeferred(length) {\n  var arr = [];\n  for (var i = 0; i < length; i++) {\n    arr.push(deferred());\n  }\n  return arr;\n}\n\nexport { arrayOfDeferred, deferred as default };\n","import createDeferred from '@redux-saga/deferred'\nimport { Request, SagaWorker } from './types'\n\nconst requests: Record<string, Request> = {}\n\nexport const addRequest = (requestId: string) => {\n    const deferred = createDeferred()\n    const request: Request = {\n        ...requests[requestId],\n        requestId,\n        deferred,\n        handled: false\n    }\n\n    if (requests[requestId]) {\n        requests[requestId].deferred = deferred\n        if (requests[requestId].onAdd) {\n            requests[requestId].onAdd(request)\n        }\n    } else {\n        requests[requestId] = request\n    }\n\n    // Auto-cleanup if not picked up by a saga within 30 seconds\n    setTimeout(() => {\n        if (requests[requestId] && !requests[requestId].handled) {\n            delete requests[requestId]\n        }\n    }, 30000)\n\n    return deferred.promise\n}\n\nexport const cleanup = (requestId: string) => {\n    delete requests[requestId]\n}\n\n/** @internal */\nexport const _clearInternalState = () => {\n    for (const key in requests) {\n        delete requests[key]\n    }\n}\n\nexport const setRequestAbort = (requestId: string, abort: () => void) => {\n    if (requests[requestId]) {\n        requests[requestId].abort = abort\n    }\n}\n\nexport function* getRequest(requestId: string): Generator<unknown, Request, unknown> {\n    const request = requests[requestId]\n\n    if (request) {\n        request.handled = true\n    }\n\n    if (!request) {\n        const result = yield (new Promise(onAdd => {\n            requests[requestId] = {\n                onAdd: (req: Request) => onAdd(req),\n                handled: true\n            }\n        }))\n        return result as Request\n    }\n\n    return request\n}\n\nexport const wrap = (saga: SagaWorker) => function* (action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n    const { requestId } = (action as { meta: { requestId: string } }).meta\n    const request = (yield getRequest(requestId)) as Request\n\n    if (!request.deferred) return\n\n    const deferred = request.deferred\n    let isFinished = false\n\n    try {\n        const result = yield saga(action, ...rest)\n        deferred.resolve(result)\n        isFinished = true\n    } catch (error) {\n        deferred.reject(error)\n        isFinished = true\n    } finally {\n        if (!isFinished) {\n            deferred.reject(new Error('Aborted'))\n            const currentRequest = requests[requestId]\n            if (currentRequest && currentRequest.abort) {\n                currentRequest.abort()\n            }\n        }\n        cleanup(requestId)\n    }\n}\n\n/** @internal */\nexport const _getInternalState = () => ({\n    requests,\n    size: Object.keys(requests).length\n})\n","import { put, take, fork, cancel } from 'redux-saga/effects'\nimport type { PutEffect, ActionPattern } from 'redux-saga/effects'\nimport type { Task, Channel } from 'redux-saga'\nimport type { Action } from 'redux'\nimport createDeferred from '@redux-saga/deferred'\nimport { AsyncThunkAction, unwrapResult } from '@reduxjs/toolkit'\nimport { SagaWorker, Deferred, Request } from './types'\nimport { wrap, getRequest, cleanup } from './utils'\n\n// Helper to avoid 'takeEvery' overload issues with spread arguments\nconst takeEveryHelper = (patternOrChannel: ActionPattern | Channel<Action>, worker: SagaWorker, ...args: unknown[]) => fork(function* () {\n    while (true) {\n        const action = (yield take(patternOrChannel as unknown as ActionPattern)) as Action\n        yield fork(worker, ...args.concat(action))\n    }\n})\n\nexport function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrap(saga as unknown as SagaWorker), ...args)\n}\n\nexport function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    return fork(function* () {\n        let lastTask: Task | null = null\n        let lastRequestId: string | null = null\n\n        while (true) {\n            const action = (yield take(pattern as unknown as ActionPattern)) as { meta: { requestId: string } }\n            const { requestId } = action.meta\n\n            if (lastTask) {\n                if (lastRequestId) {\n                    const lastRequest = (yield getRequest(lastRequestId)) as Request\n                    if (lastRequest.abort) {\n                        lastRequest.abort()\n                    }\n                }\n                yield cancel(lastTask)\n            }\n\n            lastRequestId = requestId\n            const worker = wrap(saga as unknown as SagaWorker)\n            lastTask = (yield fork(worker as any, ...args.concat(action))) as Task\n        }\n    })\n}\n\nexport function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    let deferred: Deferred | null\n\n    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n        const { requestId } = (action as { meta: { requestId: string } }).meta\n\n        if (deferred) {\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { resolve, reject } = request.deferred\n                const { promise } = (yield deferred.promise) as { promise: Promise<unknown> }\n\n                promise\n                    .then(resolve, reject)\n                    .finally(() => cleanup(requestId))\n                    .catch(() => { })\n            }\n        } else {\n            deferred = createDeferred()\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { promise } = request.deferred\n\n                yield wrap(saga as unknown as SagaWorker)(action, ...rest)\n\n                if (deferred) {\n                    deferred.resolve({ promise })\n                }\n                deferred = null\n            }\n        }\n    }\n\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrapper, ...args)\n}\n\nexport function* putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown> {\n    const promise = yield put(action as Action)\n    const result = yield (promise as Promise<unknown>)\n    return unwrapResult(result as { payload: unknown, error?: unknown, meta?: unknown })\n}\n"],"mappings":"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","names":["import_toolkit","deferred","deferred","deferred"]}

package/dist/index.mjs

@@ -18,7 +18,8 @@ var addRequest = (requestId) => {
   const request = {
     ...requests[requestId],
     requestId,
-    deferred: deferred2
+    deferred: deferred2,
+    handled: false
   };
   if (requests[requestId]) {
     requests[requestId].deferred = deferred2;
@@ -28,6 +29,11 @@ var addRequest = (requestId) => {
   } else {
     requests[requestId] = request;
   }
+  setTimeout(() => {
+    if (requests[requestId] && !requests[requestId].handled) {
+      delete requests[requestId];
+    }
+  }, 3e4);
   return deferred2.promise;
 };
 var cleanup = (requestId) => {
@@ -40,10 +46,14 @@ var setRequestAbort = (requestId, abort) => {
 };
 function* getRequest(requestId) {
   const request = requests[requestId];
+  if (request) {
+    request.handled = true;
+  }
   if (!request) {
     const result = yield new Promise((onAdd) => {
       requests[requestId] = {
-        onAdd: (req) => onAdd(req)
+        onAdd: (req) => onAdd(req),
+        handled: true
       };
     });
     return result;
@@ -88,37 +98,26 @@ function takeEveryAsync(pattern, saga, ...args) {
   return takeEveryHelper(pattern, wrap(saga), ...args);
 }
 function takeLatestAsync(pattern, saga, ...args) {
-  const tasks = {};
-  let deferred2;
-  function* wrapper(action, ...rest) {
-    if (deferred2) {
-      const lastRequestId = yield deferred2.promise;
-      const request = yield getRequest(lastRequestId);
-      if (request.abort) {
-        request.abort();
-      }
-      const task = yield tasks[lastRequestId].promise;
-      yield cancel(task);
-    }
-    deferred2 = deferred();
-    const { requestId } = action.meta;
-    yield getRequest(requestId);
-    if (deferred2) {
-      deferred2.resolve(requestId);
-    }
-    yield wrap(saga)(action, ...rest);
-    deferred2 = null;
-  }
-  const customTakeEvery = (patternOrChannel, saga2, ...args2) => fork(function* () {
+  return fork(function* () {
+    let lastTask = null;
+    let lastRequestId = null;
     while (true) {
-      const action = yield take(patternOrChannel);
+      const action = yield take(pattern);
       const { requestId } = action.meta;
-      tasks[requestId] = deferred();
-      const task = yield fork(saga2, ...args2.concat(action));
-      tasks[requestId].resolve(task);
+      if (lastTask) {
+        if (lastRequestId) {
+          const lastRequest = yield getRequest(lastRequestId);
+          if (lastRequest.abort) {
+            lastRequest.abort();
+          }
+        }
+        yield cancel(lastTask);
+      }
+      lastRequestId = requestId;
+      const worker = wrap(saga);
+      lastTask = yield fork(worker, ...args.concat(action));
     }
   });
-  return customTakeEvery(pattern, wrapper, ...args);
 }
 function takeAggregateAsync(pattern, saga, ...args) {
   let deferred2;

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../node_modules/@redux-saga/deferred/dist/redux-saga-deferred.esm.js","../src/utils.ts","../src/effects.ts"],"sourcesContent":["import { createAsyncThunk } from '@reduxjs/toolkit'\nimport type { ThunkDispatch } from '@reduxjs/toolkit'\nimport type { Action } from 'redux'\nimport { addRequest, setRequestAbort } from './utils'\nimport { SagaAction } from './types'\n\nexport * from './types'\nexport * from './effects'\n\nexport const createSagaAction = <Returned, ThunkArg = void>(type: string): SagaAction<Returned, ThunkArg> => {\n    const thunk = createAsyncThunk<Returned, ThunkArg>(type, (_, { requestId }) => addRequest(requestId) as Promise<Returned>)\n\n    function actionCreator(arg: ThunkArg) {\n        const originalActionCreator = thunk(arg)\n\n        return (dispatch: ThunkDispatch<unknown, unknown, Action>, getState: () => unknown, extra: unknown) => {\n            const promise = originalActionCreator(dispatch, getState, extra)\n            if (promise.requestId) {\n                setRequestAbort(promise.requestId, promise.abort)\n            }\n\n            return promise\n        }\n    }\n\n    Object.assign(actionCreator, {\n        pending: thunk.pending,\n        rejected: thunk.rejected,\n        fulfilled: thunk.fulfilled,\n        typePrefix: thunk.typePrefix,\n        type: (thunk.pending as unknown as { type: string }).type,\n    })\n\n    return actionCreator as unknown as SagaAction<Returned, ThunkArg>\n}\n","function deferred() {\n  var def = {};\n  def.promise = new Promise(function (resolve, reject) {\n    def.resolve = resolve;\n    def.reject = reject;\n  });\n  return def;\n}\nfunction arrayOfDeferred(length) {\n  var arr = [];\n  for (var i = 0; i < length; i++) {\n    arr.push(deferred());\n  }\n  return arr;\n}\n\nexport { arrayOfDeferred, deferred as default };\n","import createDeferred from '@redux-saga/deferred'\nimport { Request, SagaWorker } from './types'\n\nconst requests: Record<string, Request> = {}\n\nexport const addRequest = (requestId: string) => {\n    const deferred = createDeferred()\n    const request: Request = {\n        ...requests[requestId],\n        requestId,\n        deferred,\n    }\n\n    if (requests[requestId]) {\n        requests[requestId].deferred = deferred\n        if (requests[requestId].onAdd) {\n            requests[requestId].onAdd(request)\n        }\n    } else {\n        requests[requestId] = request\n    }\n\n    return deferred.promise\n}\n\nexport const cleanup = (requestId: string) => {\n    delete requests[requestId]\n}\n\nexport const setRequestAbort = (requestId: string, abort: () => void) => {\n    if (requests[requestId]) {\n        requests[requestId].abort = abort\n    }\n}\n\nexport function* getRequest(requestId: string): Generator<unknown, Request, unknown> {\n    const request = requests[requestId]\n\n    if (!request) {\n        const result = yield (new Promise(onAdd => {\n            requests[requestId] = {\n                onAdd: (req: Request) => onAdd(req)\n            }\n        }))\n        return result as Request\n    }\n\n    return request\n}\n\nexport const wrap = (saga: SagaWorker) => function* (action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n    const { requestId } = (action as { meta: { requestId: string } }).meta\n    const request = (yield getRequest(requestId)) as Request\n\n    if (!request.deferred) return\n\n    const deferred = request.deferred\n    let isFinished = false\n\n    try {\n        const result = yield saga(action, ...rest)\n        deferred.resolve(result)\n        isFinished = true\n    } catch (error) {\n        deferred.reject(error)\n        isFinished = true\n    } finally {\n        if (!isFinished) {\n            deferred.reject(new Error('Aborted'))\n            const currentRequest = requests[requestId]\n            if (currentRequest && currentRequest.abort) {\n                currentRequest.abort()\n            }\n        }\n        cleanup(requestId)\n    }\n}\n","import { put, take, fork, cancel } from 'redux-saga/effects'\nimport type { PutEffect, ActionPattern } from 'redux-saga/effects'\nimport type { Task, Channel } from 'redux-saga'\nimport type { Action } from 'redux'\nimport createDeferred from '@redux-saga/deferred'\nimport { AsyncThunkAction, unwrapResult } from '@reduxjs/toolkit'\nimport { SagaWorker, Deferred, Request } from './types'\nimport { wrap, getRequest, cleanup } from './utils'\n\n// Helper to avoid 'takeEvery' overload issues with spread arguments\nconst takeEveryHelper = (patternOrChannel: ActionPattern | Channel<Action>, worker: SagaWorker, ...args: unknown[]) => fork(function* () {\n    while (true) {\n        const action = (yield take(patternOrChannel as unknown as ActionPattern)) as Action\n        yield fork(worker, ...args.concat(action))\n    }\n})\n\nexport function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrap(saga as unknown as SagaWorker), ...args)\n}\n\nexport function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    const tasks: Record<string, Deferred> = {}\n    let deferred: Deferred | null\n\n    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n        if (deferred) {\n            const lastRequestId = (yield deferred.promise) as string\n            const request = (yield getRequest(lastRequestId)) as Request\n\n            if (request.abort) {\n                request.abort()\n            }\n\n            const task = (yield tasks[lastRequestId].promise) as Task\n\n            yield cancel(task)\n        }\n\n        deferred = createDeferred()\n        const { requestId } = (action as { meta: { requestId: string } }).meta\n\n        yield getRequest(requestId) // Ensure request is registered/ready if needed\n\n        if (deferred) {\n            deferred.resolve(requestId)\n        }\n\n        yield wrap(saga as unknown as SagaWorker)(action, ...rest)\n\n        deferred = null\n    }\n\n    const customTakeEvery = (patternOrChannel: ActionPattern | Channel<Action>, saga: SagaWorker, ...args: unknown[]) => fork(function* (): Generator<unknown, void, unknown> {\n        while (true) {\n            const action = (yield take(patternOrChannel as unknown as ActionPattern)) as { meta: { requestId: string } }\n            const { requestId } = action.meta\n            tasks[requestId] = createDeferred()\n            const task = (yield fork(saga, ...args.concat(action))) as Task\n            tasks[requestId].resolve(task)\n        }\n    })\n\n    return customTakeEvery(pattern as ActionPattern | Channel<Action>, wrapper, ...args)\n}\n\nexport function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    let deferred: Deferred | null\n\n    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n        const { requestId } = (action as { meta: { requestId: string } }).meta\n\n        if (deferred) {\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { resolve, reject } = request.deferred\n                const { promise } = (yield deferred.promise) as { promise: Promise<unknown> }\n\n                promise\n                    .then(resolve, reject)\n                    .finally(() => cleanup(requestId))\n                    .catch(() => { })\n            }\n        } else {\n            deferred = createDeferred()\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { promise } = request.deferred\n\n                yield wrap(saga as unknown as SagaWorker)(action, ...rest)\n\n                if (deferred) {\n                    deferred.resolve({ promise })\n                }\n                deferred = null\n            }\n        }\n    }\n\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrapper, ...args)\n}\n\nexport function* putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown> {\n    const promise = yield put(action as Action)\n    const result = yield (promise as Promise<unknown>)\n    return unwrapResult(result as { payload: unknown, error?: unknown, meta?: unknown })\n}\n"],"mappings":"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","names":["deferred","deferred","saga","args"]}
+{"version":3,"sources":["../src/index.ts","../node_modules/@redux-saga/deferred/dist/redux-saga-deferred.esm.js","../src/utils.ts","../src/effects.ts"],"sourcesContent":["import { createAsyncThunk } from '@reduxjs/toolkit'\nimport type { ThunkDispatch } from '@reduxjs/toolkit'\nimport type { Action } from 'redux'\nimport { addRequest, setRequestAbort } from './utils'\nimport { SagaAction } from './types'\n\nexport * from './types'\nexport * from './effects'\n\nexport const createSagaAction = <Returned, ThunkArg = void>(type: string): SagaAction<Returned, ThunkArg> => {\n    const thunk = createAsyncThunk<Returned, ThunkArg>(type, (_, { requestId }) => addRequest(requestId) as Promise<Returned>)\n\n    function actionCreator(arg: ThunkArg) {\n        const originalActionCreator = thunk(arg)\n\n        return (dispatch: ThunkDispatch<unknown, unknown, Action>, getState: () => unknown, extra: unknown) => {\n            const promise = originalActionCreator(dispatch, getState, extra)\n            if (promise.requestId) {\n                setRequestAbort(promise.requestId, promise.abort)\n            }\n\n            return promise\n        }\n    }\n\n    Object.assign(actionCreator, {\n        pending: thunk.pending,\n        rejected: thunk.rejected,\n        fulfilled: thunk.fulfilled,\n        typePrefix: thunk.typePrefix,\n        type: (thunk.pending as unknown as { type: string }).type,\n    })\n\n    return actionCreator as unknown as SagaAction<Returned, ThunkArg>\n}\n","function deferred() {\n  var def = {};\n  def.promise = new Promise(function (resolve, reject) {\n    def.resolve = resolve;\n    def.reject = reject;\n  });\n  return def;\n}\nfunction arrayOfDeferred(length) {\n  var arr = [];\n  for (var i = 0; i < length; i++) {\n    arr.push(deferred());\n  }\n  return arr;\n}\n\nexport { arrayOfDeferred, deferred as default };\n","import createDeferred from '@redux-saga/deferred'\nimport { Request, SagaWorker } from './types'\n\nconst requests: Record<string, Request> = {}\n\nexport const addRequest = (requestId: string) => {\n    const deferred = createDeferred()\n    const request: Request = {\n        ...requests[requestId],\n        requestId,\n        deferred,\n        handled: false\n    }\n\n    if (requests[requestId]) {\n        requests[requestId].deferred = deferred\n        if (requests[requestId].onAdd) {\n            requests[requestId].onAdd(request)\n        }\n    } else {\n        requests[requestId] = request\n    }\n\n    // Auto-cleanup if not picked up by a saga within 30 seconds\n    setTimeout(() => {\n        if (requests[requestId] && !requests[requestId].handled) {\n            delete requests[requestId]\n        }\n    }, 30000)\n\n    return deferred.promise\n}\n\nexport const cleanup = (requestId: string) => {\n    delete requests[requestId]\n}\n\n/** @internal */\nexport const _clearInternalState = () => {\n    for (const key in requests) {\n        delete requests[key]\n    }\n}\n\nexport const setRequestAbort = (requestId: string, abort: () => void) => {\n    if (requests[requestId]) {\n        requests[requestId].abort = abort\n    }\n}\n\nexport function* getRequest(requestId: string): Generator<unknown, Request, unknown> {\n    const request = requests[requestId]\n\n    if (request) {\n        request.handled = true\n    }\n\n    if (!request) {\n        const result = yield (new Promise(onAdd => {\n            requests[requestId] = {\n                onAdd: (req: Request) => onAdd(req),\n                handled: true\n            }\n        }))\n        return result as Request\n    }\n\n    return request\n}\n\nexport const wrap = (saga: SagaWorker) => function* (action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n    const { requestId } = (action as { meta: { requestId: string } }).meta\n    const request = (yield getRequest(requestId)) as Request\n\n    if (!request.deferred) return\n\n    const deferred = request.deferred\n    let isFinished = false\n\n    try {\n        const result = yield saga(action, ...rest)\n        deferred.resolve(result)\n        isFinished = true\n    } catch (error) {\n        deferred.reject(error)\n        isFinished = true\n    } finally {\n        if (!isFinished) {\n            deferred.reject(new Error('Aborted'))\n            const currentRequest = requests[requestId]\n            if (currentRequest && currentRequest.abort) {\n                currentRequest.abort()\n            }\n        }\n        cleanup(requestId)\n    }\n}\n\n/** @internal */\nexport const _getInternalState = () => ({\n    requests,\n    size: Object.keys(requests).length\n})\n","import { put, take, fork, cancel } from 'redux-saga/effects'\nimport type { PutEffect, ActionPattern } from 'redux-saga/effects'\nimport type { Task, Channel } from 'redux-saga'\nimport type { Action } from 'redux'\nimport createDeferred from '@redux-saga/deferred'\nimport { AsyncThunkAction, unwrapResult } from '@reduxjs/toolkit'\nimport { SagaWorker, Deferred, Request } from './types'\nimport { wrap, getRequest, cleanup } from './utils'\n\n// Helper to avoid 'takeEvery' overload issues with spread arguments\nconst takeEveryHelper = (patternOrChannel: ActionPattern | Channel<Action>, worker: SagaWorker, ...args: unknown[]) => fork(function* () {\n    while (true) {\n        const action = (yield take(patternOrChannel as unknown as ActionPattern)) as Action\n        yield fork(worker, ...args.concat(action))\n    }\n})\n\nexport function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrap(saga as unknown as SagaWorker), ...args)\n}\n\nexport function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    return fork(function* () {\n        let lastTask: Task | null = null\n        let lastRequestId: string | null = null\n\n        while (true) {\n            const action = (yield take(pattern as unknown as ActionPattern)) as { meta: { requestId: string } }\n            const { requestId } = action.meta\n\n            if (lastTask) {\n                if (lastRequestId) {\n                    const lastRequest = (yield getRequest(lastRequestId)) as Request\n                    if (lastRequest.abort) {\n                        lastRequest.abort()\n                    }\n                }\n                yield cancel(lastTask)\n            }\n\n            lastRequestId = requestId\n            const worker = wrap(saga as unknown as SagaWorker)\n            lastTask = (yield fork(worker as any, ...args.concat(action))) as Task\n        }\n    })\n}\n\nexport function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {\n    let deferred: Deferred | null\n\n    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {\n        const { requestId } = (action as { meta: { requestId: string } }).meta\n\n        if (deferred) {\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { resolve, reject } = request.deferred\n                const { promise } = (yield deferred.promise) as { promise: Promise<unknown> }\n\n                promise\n                    .then(resolve, reject)\n                    .finally(() => cleanup(requestId))\n                    .catch(() => { })\n            }\n        } else {\n            deferred = createDeferred()\n            const request = (yield getRequest(requestId)) as Request\n            if (request.deferred) {\n                const { promise } = request.deferred\n\n                yield wrap(saga as unknown as SagaWorker)(action, ...rest)\n\n                if (deferred) {\n                    deferred.resolve({ promise })\n                }\n                deferred = null\n            }\n        }\n    }\n\n    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrapper, ...args)\n}\n\nexport function* putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown> {\n    const promise = yield put(action as Action)\n    const result = yield (promise as Promise<unknown>)\n    return unwrapResult(result as { payload: unknown, error?: unknown, meta?: unknown })\n}\n"],"mappings":"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","names":["deferred","deferred","deferred"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saga-toolkit",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "An extension for redux-toolkit that allows sagas to resolve async thunk actions.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/effects.ts

@@ -20,48 +20,29 @@ export function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern
 }
 
 export function takeLatestAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {
-    const tasks: Record<string, Deferred> = {}
-    let deferred: Deferred | null
+    return fork(function* () {
+        let lastTask: Task | null = null
+        let lastRequestId: string | null = null
 
-    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {
-        if (deferred) {
-            const lastRequestId = (yield deferred.promise) as string
-            const request = (yield getRequest(lastRequestId)) as Request
+        while (true) {
+            const action = (yield take(pattern as unknown as ActionPattern)) as { meta: { requestId: string } }
+            const { requestId } = action.meta
 
-            if (request.abort) {
-                request.abort()
+            if (lastTask) {
+                if (lastRequestId) {
+                    const lastRequest = (yield getRequest(lastRequestId)) as Request
+                    if (lastRequest.abort) {
+                        lastRequest.abort()
+                    }
+                }
+                yield cancel(lastTask)
             }
 
-            const task = (yield tasks[lastRequestId].promise) as Task
-
-            yield cancel(task)
-        }
-
-        deferred = createDeferred()
-        const { requestId } = (action as { meta: { requestId: string } }).meta
-
-        yield getRequest(requestId) // Ensure request is registered/ready if needed
-
-        if (deferred) {
-            deferred.resolve(requestId)
-        }
-
-        yield wrap(saga as unknown as SagaWorker)(action, ...rest)
-
-        deferred = null
-    }
-
-    const customTakeEvery = (patternOrChannel: ActionPattern | Channel<Action>, saga: SagaWorker, ...args: unknown[]) => fork(function* (): Generator<unknown, void, unknown> {
-        while (true) {
-            const action = (yield take(patternOrChannel as unknown as ActionPattern)) as { meta: { requestId: string } }
-            const { requestId } = action.meta
-            tasks[requestId] = createDeferred()
-            const task = (yield fork(saga, ...args.concat(action))) as Task
-            tasks[requestId].resolve(task)
+            lastRequestId = requestId
+            const worker = wrap(saga as unknown as SagaWorker)
+            lastTask = (yield fork(worker as any, ...args.concat(action))) as Task
         }
     })
-
-    return customTakeEvery(pattern as ActionPattern | Channel<Action>, wrapper, ...args)
 }
 
 export function takeAggregateAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {

package/src/types.ts

@@ -11,8 +11,12 @@ export interface Deferred<T = unknown> {
 export interface Request {
     requestId?: string
     deferred?: Deferred
-    onAdd?: (request: Request) => void
     abort?: () => void
+    task?: any // Using any to avoid circular dependency with Task from redux-saga
+    onAdd?: (request: Request) => void
+    handled?: boolean
 }
 
 export type SagaAction<Returned, ThunkArg = void> = AsyncThunk<Returned, ThunkArg, object>
+
+export type SagaActionFromCreator<T extends (...args: any[]) => any> = ReturnType<ReturnType<T>['pending']>

package/src/utils.ts

@@ -9,6 +9,7 @@ export const addRequest = (requestId: string) => {
         ...requests[requestId],
         requestId,
         deferred,
+        handled: false
     }
 
     if (requests[requestId]) {
@@ -20,6 +21,13 @@ export const addRequest = (requestId: string) => {
         requests[requestId] = request
     }
 
+    // Auto-cleanup if not picked up by a saga within 30 seconds
+    setTimeout(() => {
+        if (requests[requestId] && !requests[requestId].handled) {
+            delete requests[requestId]
+        }
+    }, 30000)
+
     return deferred.promise
 }
 
@@ -27,6 +35,13 @@ export const cleanup = (requestId: string) => {
     delete requests[requestId]
 }
 
+/** @internal */
+export const _clearInternalState = () => {
+    for (const key in requests) {
+        delete requests[key]
+    }
+}
+
 export const setRequestAbort = (requestId: string, abort: () => void) => {
     if (requests[requestId]) {
         requests[requestId].abort = abort
@@ -36,10 +51,15 @@ export const setRequestAbort = (requestId: string, abort: () => void) => {
 export function* getRequest(requestId: string): Generator<unknown, Request, unknown> {
     const request = requests[requestId]
 
+    if (request) {
+        request.handled = true
+    }
+
     if (!request) {
         const result = yield (new Promise(onAdd => {
             requests[requestId] = {
-                onAdd: (req: Request) => onAdd(req)
+                onAdd: (req: Request) => onAdd(req),
+                handled: true
             }
         }))
         return result as Request
@@ -75,3 +95,9 @@ export const wrap = (saga: SagaWorker) => function* (action: unknown, ...rest: u
         cleanup(requestId)
     }
 }
+
+/** @internal */
+export const _getInternalState = () => ({
+    requests,
+    size: Object.keys(requests).length
+})