saga-toolkit 2.1.2 → 2.2.2

package/dist/index.mjs

@@ -0,0 +1,185 @@
+// src/index.ts
+import { createAsyncThunk } from "@reduxjs/toolkit";
+
+// node_modules/@redux-saga/deferred/dist/redux-saga-deferred.esm.js
+function deferred() {
+  var def = {};
+  def.promise = new Promise(function(resolve, reject) {
+    def.resolve = resolve;
+    def.reject = reject;
+  });
+  return def;
+}
+
+// src/utils.ts
+var requests = {};
+var addRequest = (requestId) => {
+  const deferred2 = deferred();
+  const request = {
+    ...requests[requestId],
+    requestId,
+    deferred: deferred2
+  };
+  if (requests[requestId]) {
+    requests[requestId].deferred = deferred2;
+    if (requests[requestId].onAdd) {
+      requests[requestId].onAdd(request);
+    }
+  } else {
+    requests[requestId] = request;
+  }
+  return deferred2.promise;
+};
+var cleanup = (requestId) => {
+  delete requests[requestId];
+};
+var setRequestAbort = (requestId, abort) => {
+  if (requests[requestId]) {
+    requests[requestId].abort = abort;
+  }
+};
+function* getRequest(requestId) {
+  const request = requests[requestId];
+  if (!request) {
+    const result = yield new Promise((onAdd) => {
+      requests[requestId] = {
+        onAdd: (req) => onAdd(req)
+      };
+    });
+    return result;
+  }
+  return request;
+}
+var wrap = (saga) => function* (action, ...rest) {
+  const { requestId } = action.meta;
+  const request = yield getRequest(requestId);
+  if (!request.deferred) return;
+  const deferred2 = request.deferred;
+  let isFinished = false;
+  try {
+    const result = yield saga(action, ...rest);
+    deferred2.resolve(result);
+    isFinished = true;
+  } catch (error) {
+    deferred2.reject(error);
+    isFinished = true;
+  } finally {
+    if (!isFinished) {
+      deferred2.reject(new Error("Aborted"));
+      const currentRequest = requests[requestId];
+      if (currentRequest && currentRequest.abort) {
+        currentRequest.abort();
+      }
+    }
+    cleanup(requestId);
+  }
+};
+
+// src/effects.ts
+import { put, take, fork, cancel } from "redux-saga/effects";
+import { unwrapResult } from "@reduxjs/toolkit";
+var takeEveryHelper = (patternOrChannel, worker, ...args) => fork(function* () {
+  while (true) {
+    const action = yield take(patternOrChannel);
+    yield fork(worker, ...args.concat(action));
+  }
+});
+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* () {
+    while (true) {
+      const action = yield take(patternOrChannel);
+      const { requestId } = action.meta;
+      tasks[requestId] = deferred();
+      const task = yield fork(saga2, ...args2.concat(action));
+      tasks[requestId].resolve(task);
+    }
+  });
+  return customTakeEvery(pattern, wrapper, ...args);
+}
+function takeAggregateAsync(pattern, saga, ...args) {
+  let deferred2;
+  function* wrapper(action, ...rest) {
+    const { requestId } = action.meta;
+    if (deferred2) {
+      const request = yield getRequest(requestId);
+      if (request.deferred) {
+        const { resolve, reject } = request.deferred;
+        const { promise } = yield deferred2.promise;
+        promise.then(resolve, reject).finally(() => cleanup(requestId)).catch(() => {
+        });
+      }
+    } else {
+      deferred2 = deferred();
+      const request = yield getRequest(requestId);
+      if (request.deferred) {
+        const { promise } = request.deferred;
+        yield wrap(saga)(action, ...rest);
+        if (deferred2) {
+          deferred2.resolve({ promise });
+        }
+        deferred2 = null;
+      }
+    }
+  }
+  return takeEveryHelper(pattern, wrapper, ...args);
+}
+function* putAsync(action) {
+  const promise = yield put(action);
+  const result = yield promise;
+  return unwrapResult(result);
+}
+
+// src/index.ts
+var createSagaAction = (type) => {
+  const thunk = createAsyncThunk(type, (_, { requestId }) => addRequest(requestId));
+  function actionCreator(arg) {
+    const originalActionCreator = thunk(arg);
+    return (dispatch, getState, extra) => {
+      const promise = originalActionCreator(dispatch, getState, extra);
+      if (promise.requestId) {
+        setRequestAbort(promise.requestId, promise.abort);
+      }
+      return promise;
+    };
+  }
+  Object.assign(actionCreator, {
+    pending: thunk.pending,
+    rejected: thunk.rejected,
+    fulfilled: thunk.fulfilled,
+    typePrefix: thunk.typePrefix,
+    type: thunk.pending.type
+  });
+  return actionCreator;
+};
+export {
+  createSagaAction,
+  putAsync,
+  takeAggregateAsync,
+  takeEveryAsync,
+  takeLatestAsync
+};
+//# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -0,0 +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"]}

package/package.json

@@ -1,11 +1,28 @@
 {
   "name": "saga-toolkit",
-  "version": "2.1.2",
+  "version": "2.2.2",
   "description": "An extension for redux-toolkit that allows sagas to resolve async thunk actions.",
-  "main": "index.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist",
+    "README.md",
+    "src"
+  ],
   "scripts": {
-    "build": "./node_modules/.bin/babel sagaToolkit.js --out-file index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "test": "vitest",
+    "lint": "eslint src/index.ts",
+    "prepublishOnly": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -26,11 +43,22 @@
   },
   "homepage": "https://github.com/janoist1/saga-toolkit#readme",
   "devDependencies": {
-    "@babel/cli": "^7.16.8",
-    "@babel/core": "^7.16.12",
-    "@babel/node": "^7.16.8",
-    "@babel/preset-env": "^7.16.11",
     "@reduxjs/toolkit": "^1.9.5",
-    "redux": "^4.1.2"
+    "@types/node": "^20.0.0",
+    "@types/redux-saga": "^0.10.5",
+    "@typescript-eslint/eslint-plugin": "^8.53.0",
+    "@typescript-eslint/parser": "^8.53.0",
+    "@vitest/coverage-v8": "^1.6.1",
+    "eslint": "^9.39.2",
+    "redux": "^4.1.2",
+    "redux-saga": "^1.2.3",
+    "tsup": "^8.0.0",
+    "typescript": "^5.0.0",
+    "typescript-eslint": "^8.53.0",
+    "vitest": "^1.0.0"
+  },
+  "peerDependencies": {
+    "@reduxjs/toolkit": "^1.9.5",
+    "redux-saga": "^1.0.0"
   }
-}
+}

package/src/effects.ts

@@ -0,0 +1,107 @@
+import { put, take, fork, cancel } from 'redux-saga/effects'
+import type { PutEffect, ActionPattern } from 'redux-saga/effects'
+import type { Task, Channel } from 'redux-saga'
+import type { Action } from 'redux'
+import createDeferred from '@redux-saga/deferred'
+import { AsyncThunkAction, unwrapResult } from '@reduxjs/toolkit'
+import { SagaWorker, Deferred, Request } from './types'
+import { wrap, getRequest, cleanup } from './utils'
+
+// Helper to avoid 'takeEvery' overload issues with spread arguments
+const takeEveryHelper = (patternOrChannel: ActionPattern | Channel<Action>, worker: SagaWorker, ...args: unknown[]) => fork(function* () {
+    while (true) {
+        const action = (yield take(patternOrChannel as unknown as ActionPattern)) as Action
+        yield fork(worker, ...args.concat(action))
+    }
+})
+
+export function takeEveryAsync<A extends Action = Action>(pattern: ActionPattern<A> | Channel<A>, saga: (action: A, ...args: unknown[]) => unknown, ...args: unknown[]) {
+    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrap(saga as unknown as SagaWorker), ...args)
+}
+
+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
+
+    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
+
+            if (request.abort) {
+                request.abort()
+            }
+
+            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)
+        }
+    })
+
+    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[]) {
+    let deferred: Deferred | null
+
+    function* wrapper(action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {
+        const { requestId } = (action as { meta: { requestId: string } }).meta
+
+        if (deferred) {
+            const request = (yield getRequest(requestId)) as Request
+            if (request.deferred) {
+                const { resolve, reject } = request.deferred
+                const { promise } = (yield deferred.promise) as { promise: Promise<unknown> }
+
+                promise
+                    .then(resolve, reject)
+                    .finally(() => cleanup(requestId))
+                    .catch(() => { })
+            }
+        } else {
+            deferred = createDeferred()
+            const request = (yield getRequest(requestId)) as Request
+            if (request.deferred) {
+                const { promise } = request.deferred
+
+                yield wrap(saga as unknown as SagaWorker)(action, ...rest)
+
+                if (deferred) {
+                    deferred.resolve({ promise })
+                }
+                deferred = null
+            }
+        }
+    }
+
+    return takeEveryHelper(pattern as ActionPattern | Channel<Action>, wrapper, ...args)
+}
+
+export function* putAsync(action: Action | PutEffect | AsyncThunkAction<unknown, unknown, object>): Generator<PutEffect | Promise<unknown>, unknown, unknown> {
+    const promise = yield put(action as Action)
+    const result = yield (promise as Promise<unknown>)
+    return unwrapResult(result as { payload: unknown, error?: unknown, meta?: unknown })
+}

package/src/index.ts

@@ -0,0 +1,35 @@
+import { createAsyncThunk } from '@reduxjs/toolkit'
+import type { ThunkDispatch } from '@reduxjs/toolkit'
+import type { Action } from 'redux'
+import { addRequest, setRequestAbort } from './utils'
+import { SagaAction } from './types'
+
+export * from './types'
+export * from './effects'
+
+export const createSagaAction = <Returned, ThunkArg = void>(type: string): SagaAction<Returned, ThunkArg> => {
+    const thunk = createAsyncThunk<Returned, ThunkArg>(type, (_, { requestId }) => addRequest(requestId) as Promise<Returned>)
+
+    function actionCreator(arg: ThunkArg) {
+        const originalActionCreator = thunk(arg)
+
+        return (dispatch: ThunkDispatch<unknown, unknown, Action>, getState: () => unknown, extra: unknown) => {
+            const promise = originalActionCreator(dispatch, getState, extra)
+            if (promise.requestId) {
+                setRequestAbort(promise.requestId, promise.abort)
+            }
+
+            return promise
+        }
+    }
+
+    Object.assign(actionCreator, {
+        pending: thunk.pending,
+        rejected: thunk.rejected,
+        fulfilled: thunk.fulfilled,
+        typePrefix: thunk.typePrefix,
+        type: (thunk.pending as unknown as { type: string }).type,
+    })
+
+    return actionCreator as unknown as SagaAction<Returned, ThunkArg>
+}

package/src/types.ts

@@ -0,0 +1,18 @@
+import { AsyncThunk } from '@reduxjs/toolkit'
+
+export type SagaWorker = (...args: unknown[]) => unknown
+
+export interface Deferred<T = unknown> {
+    resolve: (value: T) => void
+    reject: (error: unknown) => void
+    promise: Promise<T>
+}
+
+export interface Request {
+    requestId?: string
+    deferred?: Deferred
+    onAdd?: (request: Request) => void
+    abort?: () => void
+}
+
+export type SagaAction<Returned, ThunkArg = void> = AsyncThunk<Returned, ThunkArg, object>

package/src/utils.ts

@@ -0,0 +1,77 @@
+import createDeferred from '@redux-saga/deferred'
+import { Request, SagaWorker } from './types'
+
+const requests: Record<string, Request> = {}
+
+export const addRequest = (requestId: string) => {
+    const deferred = createDeferred()
+    const request: Request = {
+        ...requests[requestId],
+        requestId,
+        deferred,
+    }
+
+    if (requests[requestId]) {
+        requests[requestId].deferred = deferred
+        if (requests[requestId].onAdd) {
+            requests[requestId].onAdd(request)
+        }
+    } else {
+        requests[requestId] = request
+    }
+
+    return deferred.promise
+}
+
+export const cleanup = (requestId: string) => {
+    delete requests[requestId]
+}
+
+export const setRequestAbort = (requestId: string, abort: () => void) => {
+    if (requests[requestId]) {
+        requests[requestId].abort = abort
+    }
+}
+
+export function* getRequest(requestId: string): Generator<unknown, Request, unknown> {
+    const request = requests[requestId]
+
+    if (!request) {
+        const result = yield (new Promise(onAdd => {
+            requests[requestId] = {
+                onAdd: (req: Request) => onAdd(req)
+            }
+        }))
+        return result as Request
+    }
+
+    return request
+}
+
+export const wrap = (saga: SagaWorker) => function* (action: unknown, ...rest: unknown[]): Generator<unknown, void, unknown> {
+    const { requestId } = (action as { meta: { requestId: string } }).meta
+    const request = (yield getRequest(requestId)) as Request
+
+    if (!request.deferred) return
+
+    const deferred = request.deferred
+    let isFinished = false
+
+    try {
+        const result = yield saga(action, ...rest)
+        deferred.resolve(result)
+        isFinished = true
+    } catch (error) {
+        deferred.reject(error)
+        isFinished = true
+    } finally {
+        if (!isFinished) {
+            deferred.reject(new Error('Aborted'))
+            const currentRequest = requests[requestId]
+            if (currentRequest && currentRequest.abort) {
+                currentRequest.abort()
+            }
+        }
+        cleanup(requestId)
+    }
+}

package/example/.env

@@ -1 +0,0 @@
-SKIP_PREFLIGHT_CHECK=true

package/example/README.md

@@ -1,70 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `yarn build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)