v0.7.0

jklmli · Jan 1, 2017 · afb7168 · afb7168
1 parent e8f3fd7
commit afb7168
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/dist/monapt.d.ts b/dist/monapt.d.ts
@@ -144,11 +144,11 @@ declare module 'monapt' {
         onComplete(callback: ICompleteFunction<T>): void;
         onSuccess(callback: (value: T) => void): void;
         onFailure(callback: (error: Error) => void): void;
-        map<U>(f: (value: T, promise: IFuturePromiseLike<U>) => void): Future<U>;
+        map<U>(f: (value: T) => U): Future<U>;
         flatMap<U>(f: (value: T) => Future<U>): Future<U>;
         filter(predicate: (value: T) => boolean): Future<T>;
         reject(predicate: (value: T) => boolean): Future<T>;
-        recover(fn: (e: Error, promise: IFuturePromiseLike<T>) => void): Future<T>;
+        recover(fn: (e: Error) => T): Future<T>;
         recoverWith(fn: (e: Error) => Future<T>): Future<T>;
     }
     class Promise<T> extends Future<T> {

diff --git a/dist/monapt.js b/dist/monapt.js
@@ -370,7 +370,15 @@ var monapt;
             this.onComplete(function (r) {
                 r.match({
                     Failure: function (e) { return promise.failure(e); },
-                    Success: function (v) { return f(v, F(promise)); }
+                    Success: function (v) {
+                        try {
+                            var result = f(v);
+                            promise.success(result);
+                        }
+                        catch (e) {
+                            promise.failure(e);
+                        }
+                    }
                 });
             });
             return promise.future();
@@ -423,7 +431,7 @@ var monapt;
                 r.match({
                     Failure: function (error) {
                         try {
-                            fn(error, F(promise));
+                            promise.success(fn(error));
                         }
                         catch (e) {
                             promise.failure(e);