Updated defintions to split up Observable/Promises from Array/Iterables so that TS can resolve them properly

Author: david-driscoll

ts/core/disposables/booleandisposable.ts

@@ -43,9 +43,7 @@ module Rx {
     sad.isDisposed;
     var d = sad.getDisposable();
     sad.setDisposable(d);
-});
-
-(function() {
+    
     var sad: Rx.SerialDisposable = new Rx.SerialDisposable();
     sad.dispose();
     sad.isDisposed;

ts/core/es5.ts

@@ -7,9 +7,6 @@ module Rx {
     // Type alias for arrays and array like objects
     export type ArrayOrIterable<T> = ArrayLike<T>;
 
-    // Type alias for observables, promises or arrays (some methods automatically call .from on an array result)
-    export type ObservableOrPromiseOrIterable<T> = ObservableOrPromise<T> | ArrayOrIterable<T>;
-
     /**
      * Promise A+
      */

ts/core/es6.ts

@@ -9,9 +9,6 @@ module Rx {
     // Type alias for arrays and array like objects
     export type ArrayOrIterable<T> = ArrayLike<T> | Iterable<T>;
 
-    // Type alias for observables, promises or arrays (some methods automatically call .from on an array result)
-    export type ObservableOrPromiseOrIterable<T> = ObservableOrPromise<T> | ArrayOrIterable<T>;
-
     /**
      * Promise A+
      */

ts/core/linq/observable/concatmap.ts

@@ -20,7 +20,7 @@ module Rx {
         * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
         * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
         */
-        concatMap<TResult>(selector: _ValueOrSelector<T, ObservableOrPromiseOrIterable<TResult>>): Observable<TResult>;
+        concatMap<TResult>(selector: _ValueOrSelector<T, ObservableOrPromise<TResult>>): Observable<TResult>;
         /**
         *  One of the Following:
         *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
@@ -40,7 +40,7 @@ module Rx {
         * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
         * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
         */
-        concatMap<TOther, TResult>(selector: _ValueOrSelector<T, ObservableOrPromiseOrIterable<TOther>>, resultSelector: special._FlatMapResultSelector<T, TOther, TResult>, thisArg?: any): Observable<TResult>;
+        concatMap<TResult>(selector: _ValueOrSelector<T, ArrayOrIterable<TResult>>): Observable<TResult>;
         /**
         *  One of the Following:
         *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
@@ -60,7 +60,7 @@ module Rx {
         * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
         * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
         */
-        selectConcat<TResult>(selector: _ValueOrSelector<T, ObservableOrPromiseOrIterable<TResult>>): Observable<TResult>;
+        concatMap<TOther, TResult>(selector: _ValueOrSelector<T, ObservableOrPromise<TOther>>, resultSelector: special._FlatMapResultSelector<T, TOther, TResult>, thisArg?: any): Observable<TResult>;
         /**
         *  One of the Following:
         *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
@@ -80,7 +80,87 @@ module Rx {
         * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
         * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
         */
-        selectConcat<TOther, TResult>(selector: _ValueOrSelector<T, ObservableOrPromiseOrIterable<TOther>>, resultSelector: special._FlatMapResultSelector<T, TOther, TResult>, thisArg?: any): Observable<TResult>;
+        concatMap<TOther, TResult>(selector: _ValueOrSelector<T, ArrayOrIterable<TOther>>, resultSelector: special._FlatMapResultSelector<T, TOther, TResult>, thisArg?: any): Observable<TResult>;
+        /**
+        *  One of the Following:
+        *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        * @example
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); });
+        *  Or:
+        *  Projects each element of an observable sequence to an observable sequence, invokes the result selector for the source element and each of the corresponding inner sequence's elements, and merges the results into one observable sequence.
+        *
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); }, function (x, y) { return x + y; });
+        *  Or:
+        *  Projects each element of the source observable sequence to the other observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        *  var res = source.concatMap(Rx.Observable.fromArray([1,2,3]));
+        * @param {Function} selector A transform function to apply to each element or an observable sequence to project each element from the
+        * source sequence onto which could be either an observable or Promise.
+        * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
+        * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
+        */
+        selectConcat<TResult>(selector: _ValueOrSelector<T, ObservableOrPromise<TResult>>): Observable<TResult>;
+        /**
+        *  One of the Following:
+        *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        * @example
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); });
+        *  Or:
+        *  Projects each element of an observable sequence to an observable sequence, invokes the result selector for the source element and each of the corresponding inner sequence's elements, and merges the results into one observable sequence.
+        *
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); }, function (x, y) { return x + y; });
+        *  Or:
+        *  Projects each element of the source observable sequence to the other observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        *  var res = source.concatMap(Rx.Observable.fromArray([1,2,3]));
+        * @param {Function} selector A transform function to apply to each element or an observable sequence to project each element from the
+        * source sequence onto which could be either an observable or Promise.
+        * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
+        * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
+        */
+        selectConcat<TResult>(selector: _ValueOrSelector<T, ArrayOrIterable<TResult>>): Observable<TResult>;
+        /**
+        *  One of the Following:
+        *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        * @example
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); });
+        *  Or:
+        *  Projects each element of an observable sequence to an observable sequence, invokes the result selector for the source element and each of the corresponding inner sequence's elements, and merges the results into one observable sequence.
+        *
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); }, function (x, y) { return x + y; });
+        *  Or:
+        *  Projects each element of the source observable sequence to the other observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        *  var res = source.concatMap(Rx.Observable.fromArray([1,2,3]));
+        * @param {Function} selector A transform function to apply to each element or an observable sequence to project each element from the
+        * source sequence onto which could be either an observable or Promise.
+        * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
+        * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
+        */
+        selectConcat<TOther, TResult>(selector: _ValueOrSelector<T, ObservableOrPromise<TOther>>, resultSelector: special._FlatMapResultSelector<T, TOther, TResult>, thisArg?: any): Observable<TResult>;
+        /**
+        *  One of the Following:
+        *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        * @example
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); });
+        *  Or:
+        *  Projects each element of an observable sequence to an observable sequence, invokes the result selector for the source element and each of the corresponding inner sequence's elements, and merges the results into one observable sequence.
+        *
+        *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); }, function (x, y) { return x + y; });
+        *  Or:
+        *  Projects each element of the source observable sequence to the other observable sequence and merges the resulting observable sequences into one observable sequence.
+        *
+        *  var res = source.concatMap(Rx.Observable.fromArray([1,2,3]));
+        * @param {Function} selector A transform function to apply to each element or an observable sequence to project each element from the
+        * source sequence onto which could be either an observable or Promise.
+        * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
+        * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
+        */
+        selectConcat<TOther, TResult>(selector: _ValueOrSelector<T, ArrayOrIterable<TOther>>, resultSelector: special._FlatMapResultSelector<T, TOther, TResult>, thisArg?: any): Observable<TResult>;
     }
 }
 
@@ -91,29 +171,29 @@ module Rx {
 
     on = os.concatMap((v, i) => Rx.Observable.range(0, i));
     os = os.concatMap(z => Rx.Observable.just('abc').toPromise());
-    on = os.concatMap(z => [1,2,3]);
+    on = os.concatMap(z => [1, 2, 3]);
 
     os = os.concatMap((v, i) => Rx.Observable.range(0, i), (v1, v2, i) => v2.toString());
     on = os.concatMap(z => Rx.Observable.just('abc').toPromise(), (v1, v2, i) => i);
-    on = os.concatMap(z => [1,2,3], (v1, v2, i) => i);
+    on = os.concatMap(z => [1, 2, 3], (v1, v2, i) => i);
 
     os.concatMap(on);
     os = os.concatMap(Rx.Observable.range(0, 5), (v1, v2, i) => v2.toString());
     on = os.concatMap(Rx.Observable.just('abc').toPromise(), (v1, v2, i) => i);
-    on = os.concatMap([1,2,3], (v1, v2, i) => i);
+    on = os.concatMap([1, 2, 3], (v1, v2, i) => i);
 
     on = os.selectConcat((v, i) => Rx.Observable.range(0, i));
 
     on = os.selectConcat((v, i) => Rx.Observable.range(0, i));
     os = os.selectConcat(z => Rx.Observable.just('abc').toPromise());
-    on = os.selectConcat(z => [1,2,3]);
+    on = os.selectConcat(z => [1, 2, 3]);
 
     os = os.selectConcat((v, i) => Rx.Observable.range(0, i), (v1, v2, i) => v2.toString());
     on = os.selectConcat(z => Rx.Observable.just('abc').toPromise(), (v1, v2, i) => i);
-    on = os.selectConcat(z => [1,2,3], (v1, v2, i) => i);
+    on = os.selectConcat(z => [1, 2, 3], (v1, v2, i) => i);
 
     os.selectConcat(on);
     os = os.selectConcat(Rx.Observable.range(0, 5), (v1, v2, i) => v2.toString());
     on = os.selectConcat(Rx.Observable.just('abc').toPromise(), (v1, v2, i) => i);
-    on = os.selectConcat([1,2,3], (v1, v2, i) => i);
+    on = os.selectConcat([1, 2, 3], (v1, v2, i) => i);
 });