cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(facade): Make PromiseWrapper#all semantics equivalent

Browse Source 
The semantics between ES6 `Promise#all` and Dart's `Future#wait` are
different for values that are not `Promise`/`Future`s. In ES6,
non-`Promise` values are immediately completed to their current value.
In Dart, non-`Future` values cause an error.

Updated Dart's `PromiseWrapper#all` implementation to conform to the ES6
spec.
This commit is contained in:
Tim Blasi
2015-05-29 17:09:59 -07:00
parent cd52d8a3be
commit 22f5925202
3 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/angular2/src/facade/async.dart
View File

@ -9,9 +9,12 @@ class PromiseWrapper {
static Future reject(obj, stackTrace) => new Future.error(obj,
stackTrace != null ? stackTrace : obj is Error ? obj.stackTrace : null);
static Future<List> all(List<Future> promises) => Future.wait(promises);
static Future<List> all(List<dynamic> promises) {
return Future
.wait(promises.map((p) => p is Future ? p : new Future.value(p)));
}
static Future then(Future promise, success(value), Function onError) {
static Future then(Future promise, success(value), [Function onError]) {
if (success == null) return promise.catchError(onError);
return promise.then(success, onError: onError);
}

4
modules/angular2/src/facade/async.ts
View File

@ -18,13 +18,13 @@ export class PromiseWrapper {
return promise.catch(onError);
}
static all(promises: List<Promise<any>>): Promise<any> {
static all(promises: List<any>): Promise<any> {
if (promises.length == 0) return Promise.resolve([]);
return Promise.all(promises);
}
static then<T>(promise: Promise<T>, success: (value: any) => T | Thenable<T>,
rejection: (error: any, stack?: any) => T | Thenable<T>): Promise<T> {
rejection?: (error: any, stack?: any) => T | Thenable<T>): Promise<T> {
return promise.then(success, rejection);
}