fix(TypeScript): ensure RxJS builds with TS@next as well

Author: benlesh

spec-dtslint/util/pipe-spec.ts

@@ -84,14 +84,29 @@ it('should enforce types for the 9th argument', () => {
 consto=pipe(a('0','1'),a('1','2'),a('2','3'),a('3','4'),a('4','5'),a('5','6'),a('6','7'),a('7','8'),a('#','9'));// $ExpectError
 });
 
-it('should return generic OperatorFunction',()=>{
+it('should return generic OperatorFunction 1',()=>{
+constcustomOperator=<T>(p: T)=>(a: Observable<T>)=>a;
+
+conststaticPipe=pipe(customOperator('infer'));
+consto=of('foo').pipe(staticPipe);// $ExpectType Observable<string>
+});
+
+it('should return generic OperatorFunction 2',()=>{
 constcustomOperator=<T>()=>(a: Observable<T>)=>a;
 
-conststaticPipe=pipe(customOperator());
+conststaticPipe=pipe(customOperator<string>());
 consto=of('foo').pipe(staticPipe);// $ExpectType Observable<string>
 });
 
+it('should return generic OperatorFunction 3',()=>{
+constcustomOperator=<T>()=>(a: Observable<T>)=>a;
+
+// type can't be possibly be inferred here, so it's {} instead of T.
+conststaticPipe=pipe(customOperator());
+consto=of('foo').pipe(staticPipe);// $ExpectType Observable<{}>
+});
+
 it('should return generic function',()=>{
-constfunc=pipe((value: string)=>value);
-constvalue=func("foo");// $ExpectType "foo"
+constfunc=pipe((value: string)=>value,(value: string)=>value+value);
+constvalue=func("foo");// $ExpectType string
 });

spec/operators/zipAll-spec.ts

@@ -35,11 +35,10 @@ describe('zipAll operator', () => {
 it('should take all observables from the source and zip them',(done)=>{
 constexpected=['a1','b2','c3'];
 leti=0;
-of(
+constsource=of(
 of('a','b','c'),
 of(1,2,3)
-)
-.pipe(zipAll((a,b)=>String(a)+String(b)))
+).pipe(zipAll((a: string,b: number)=>a+b))
 .subscribe((x)=>{
 expect(x).to.equal(expected[i++]);
 },null,done);
@@ -378,7 +377,7 @@ describe('zipAll operator', () => {
 of('a','b','c'),
 of(1,2)
 )
-.pipe(zipAll((a,b)=>String(a)+String(b)))
+.pipe(zipAll((a: string,b: number)=>a+b))
 .subscribe((x)=>{
 expect(x).to.equal(expected[i++]);
 },null,done);

src/internal/operators/reduce.ts

@@ -71,8 +71,9 @@ export function reduce<T, R>(accumulator: (acc: R, value: T, index?: number) =>
 };
 }
 returnfunctionreduceOperatorFunction(source: Observable<T>): Observable<R>{
-returnpipe(scan<T,T|R>((acc,value,index)=>{
-returnaccumulator(<R>acc,value,index+1);
-}),takeLast(1))(source)asObservable<R>;
+returnpipe(
+scan((acc: R,value: T,index: number): R=>accumulator(acc,value,index+1)),
+takeLast(1),
+)(source);
 };
 }

src/internal/util/pipe.ts

@@ -1,21 +1,18 @@
 import{noop}from'./noop';
-import{UnaryFunction,MonoTypeOperatorFunction}from'../types';
-import{Observable}from'../Observable';
+import{UnaryFunction}from'../types';
 
 /* tslint:disable:max-line-length */
 exportfunctionpipe<T>(): UnaryFunction<T,T>;
-exportfunctionpipe<T>(...operators: MonoTypeOperatorFunction<T>[]): <RextendsT>(source: Observable<R>)=>Observable<R>;
-exportfunctionpipe<T>(...operators: UnaryFunction<T,T>[]): <RextendsT>(source: R)=>R;
-exportfunctionpipe<T,A>(op1: UnaryFunction<T,A>): UnaryFunction<T,A>;
-exportfunctionpipe<T,A,B>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>): UnaryFunction<T,B>;
-exportfunctionpipe<T,A,B,C>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>): UnaryFunction<T,C>;
-exportfunctionpipe<T,A,B,C,D>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>): UnaryFunction<T,D>;
-exportfunctionpipe<T,A,B,C,D,E>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>,op5: UnaryFunction<D,E>): UnaryFunction<T,E>;
-exportfunctionpipe<T,A,B,C,D,E,F>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>,op5: UnaryFunction<D,E>,op6: UnaryFunction<E,F>): UnaryFunction<T,F>;
-exportfunctionpipe<T,A,B,C,D,E,F,G>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>,op5: UnaryFunction<D,E>,op6: UnaryFunction<E,F>,op7: UnaryFunction<F,G>): UnaryFunction<T,G>;
-exportfunctionpipe<T,A,B,C,D,E,F,G,H>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>,op5: UnaryFunction<D,E>,op6: UnaryFunction<E,F>,op7: UnaryFunction<F,G>,op8: UnaryFunction<G,H>): UnaryFunction<T,H>;
-exportfunctionpipe<T,A,B,C,D,E,F,G,H,I>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>,op5: UnaryFunction<D,E>,op6: UnaryFunction<E,F>,op7: UnaryFunction<F,G>,op8: UnaryFunction<G,H>,op9: UnaryFunction<H,I>): UnaryFunction<T,I>;
-exportfunctionpipe<T,A,B,C,D,E,F,G,H,I>(op1: UnaryFunction<T,A>,op2: UnaryFunction<A,B>,op3: UnaryFunction<B,C>,op4: UnaryFunction<C,D>,op5: UnaryFunction<D,E>,op6: UnaryFunction<E,F>,op7: UnaryFunction<F,G>,op8: UnaryFunction<G,H>,op9: UnaryFunction<H,I>, ...operations: UnaryFunction<any,any>[]): UnaryFunction<T,{}>;
+exportfunctionpipe<T,A>(fn1: UnaryFunction<T,A>): UnaryFunction<T,A>;
+exportfunctionpipe<T,A,B>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>): UnaryFunction<T,B>;
+exportfunctionpipe<T,A,B,C>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>): UnaryFunction<T,C>;
+exportfunctionpipe<T,A,B,C,D>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>): UnaryFunction<T,D>;
+exportfunctionpipe<T,A,B,C,D,E>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>,fn5: UnaryFunction<D,E>): UnaryFunction<T,E>;
+exportfunctionpipe<T,A,B,C,D,E,F>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>,fn5: UnaryFunction<D,E>,fn6: UnaryFunction<E,F>): UnaryFunction<T,F>;
+exportfunctionpipe<T,A,B,C,D,E,F,G>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>,fn5: UnaryFunction<D,E>,fn6: UnaryFunction<E,F>,fn7: UnaryFunction<F,G>): UnaryFunction<T,G>;
+exportfunctionpipe<T,A,B,C,D,E,F,G,H>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>,fn5: UnaryFunction<D,E>,fn6: UnaryFunction<E,F>,fn7: UnaryFunction<F,G>,fn8: UnaryFunction<G,H>): UnaryFunction<T,H>;
+exportfunctionpipe<T,A,B,C,D,E,F,G,H,I>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>,fn5: UnaryFunction<D,E>,fn6: UnaryFunction<E,F>,fn7: UnaryFunction<F,G>,fn8: UnaryFunction<G,H>,fn9: UnaryFunction<H,I>): UnaryFunction<T,I>;
+exportfunctionpipe<T,A,B,C,D,E,F,G,H,I>(fn1: UnaryFunction<T,A>,fn2: UnaryFunction<A,B>,fn3: UnaryFunction<B,C>,fn4: UnaryFunction<C,D>,fn5: UnaryFunction<D,E>,fn6: UnaryFunction<E,F>,fn7: UnaryFunction<F,G>,fn8: UnaryFunction<G,H>,fn9: UnaryFunction<H,I>, ...fns: UnaryFunction<any,any>[]): UnaryFunction<T,{}>;
 /* tslint:enable:max-line-length */
 
 exportfunctionpipe(...fns: Array<UnaryFunction<any,any>>): UnaryFunction<any,any>{