Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renames Future.recover -> Future.orElse (#136) #146

Merged
merged 1 commit into from
Jul 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions annotations/source/en/concurrency/future/future/or-else.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@annotate: folktale.concurrency.future._Future.prototype.orElse
category: Recovering From Errors
---

Transforms a failed future into a new future.


## Example::

const { rejected, of } = require('folktale/concurrency/future');

of(1).orElse(x => of(x + 1)).listen({
onResolved: (value) => $ASSERT(value == 1)
});

rejected(1).orElse(x => of(x + 1)).listen({
onResolved: (value) => $ASSERT(value == 2)
});

rejected(1).orElse(x => rejected(x + 1)).listen({
onRejected: (value) => $ASSERT(value == 2)
});
16 changes: 15 additions & 1 deletion packages/base/source/concurrency/future/_future.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const define = require('folktale/helpers/define');
const provideAliases = require('folktale/helpers/provide-fantasy-land-aliases');
const Deferred = require('./_deferred');
const { Pending, Resolved, Rejected } = require('./_execution-state');
const warnDeprecation = require('folktale/helpers/warn-deprecation');



Expand Down Expand Up @@ -133,11 +134,24 @@ class Future {

// ---[ Recovering from errors ]-------------------------------------
/*~
* stability: experimental
* deprecated:
* since: 2.1.0
* replacedBy: .orElse(handler)
*
* type: |
* (Future 'f 's).(('f) => Future 'f2 's2) => Future 'f2 's
*/
recover(handler) {
warnDeprecation('`.recover` was renamed to `.orElse` for consistency, and thus `.recover(handler)` is deprecated. Use `.orElse(handler)` instead.');
return this.orElse(handler);
}

/*~
* stability: experimental
* type: |
* (Future 'f 's).(('f) => Future 'f2 's2) => Future 'f2 's
*/
orElse(handler) {
let deferred = new Deferred(); // eslint-disable-line prefer-const
this.listen({
onCancelled: () => deferred.cancel(),
Expand Down