style(typings): Updated typings for multicast and publish to return a ConnectableObservable

Author: david-driscoll

src/operator-typings.ts

@@ -1,5 +1,6 @@
 /* tslint:disable:class-name */ /* tslint:disable:no-unused-variable */ /* tslint:disable:max-line-length */
 import {Observable, ObservableOrPromise, ArrayOrIterator} from './Observable';
+import {ConnectableObservable} from './observables/ConnectableObservable';
 import {Scheduler} from './Scheduler';
 import {Notification} from './Notification';
 import {Subject} from './Subject';
@@ -163,7 +164,7 @@ export interface operator_proto_mergeAll<T> {
   <R>(concurrent: number): Observable<R>;
 }
 export interface operator_proto_multicast<T> {
-  (subjectOrSubjectFactory: Subject<T> | (() => Subject<T>)): Observable<T>;
+  (subjectOrSubjectFactory: Subject<T> | (() => Subject<T>)): ConnectableObservable<T>;
 }
 export interface operator_proto_observeOn<T> {
   (scheduler: Scheduler, delay?: number): Observable<T>;
@@ -172,13 +173,13 @@ export interface operator_proto_partition<T> {
   (predicate: _Predicate<T>, thisArg?: any): Observable<[T, T]>;
 }
 export interface operator_proto_publish<T> {
-  (): Observable<T>;
+  (): ConnectableObservable<T>;
 }
 export interface operator_proto_publishBehavior<T> {
-  (value: T): Observable<T>;
+  (value: T): ConnectableObservable<T>;
 }
 export interface operator_proto_publishReplay<T> {
-  (bufferSize?: number, windowTime?: number, scheduler?: Scheduler): Observable<T>;
+  (bufferSize?: number, windowTime?: number, scheduler?: Scheduler): ConnectableObservable<T>;
 }
 export interface operator_proto_reduce<T> {
   <R>(project: _Accumulator<T, R>, seed?: R): Observable<R>;

src/operators/multicast.ts

@@ -1,8 +1,7 @@
-import {Observable} from '../Observable';
 import {Subject} from '../Subject';
 import {ConnectableObservable} from '../observables/ConnectableObservable';
 
-export function multicast<T>(subjectOrSubjectFactory: Subject<T> | (() => Subject<T>)): Observable<T> {
+export function multicast<T>(subjectOrSubjectFactory: Subject<T> | (() => Subject<T>)): ConnectableObservable<T> {
   let subjectFactory: () => Subject<T>;
   if (typeof subjectOrSubjectFactory === 'function') {
     subjectFactory = <() => Subject<T>>subjectOrSubjectFactory;

src/operators/publish.ts

@@ -1,7 +1,7 @@
-import {Observable} from '../Observable';
+import {ConnectableObservable} from '../observables/ConnectableObservable';
 import {Subject} from '../Subject';
 import {multicast} from './multicast';
 
-export function publish<T>(): Observable<T> {
+export function publish<T>(): ConnectableObservable<T> {
   return multicast.call(this, new Subject());
 }

src/operators/publishBehavior.ts

@@ -1,7 +1,7 @@
-import {Observable} from '../Observable';
+import {ConnectableObservable} from '../observables/ConnectableObservable';
 import {BehaviorSubject} from '../subjects/BehaviorSubject';
 import {multicast} from './multicast';
 
-export function publishBehavior<T>(value: T): Observable<T> {
+export function publishBehavior<T>(value: T): ConnectableObservable<T> {
   return multicast.call(this, new BehaviorSubject(value));
 }

src/operators/publishReplay.ts

@@ -1,11 +1,11 @@
-import {Observable} from '../Observable';
+import {ConnectableObservable} from '../observables/ConnectableObservable';
 import {ReplaySubject} from '../subjects/ReplaySubject';
 import {Scheduler} from '../Scheduler';
 import {multicast} from './multicast';
 
-export function publishReplay<T>(bufferSize?: number, windowTime?: number, scheduler?: Scheduler): Observable<T>;
+export function publishReplay<T>(bufferSize?: number, windowTime?: number, scheduler?: Scheduler): ConnectableObservable<T>;
 export function publishReplay<T>(bufferSize: number = Number.POSITIVE_INFINITY,
                                  windowTime: number = Number.POSITIVE_INFINITY,
-                                 scheduler?: Scheduler): Observable<T> {
+                                 scheduler?: Scheduler): ConnectableObservable<T> {
   return multicast.call(this, new ReplaySubject(bufferSize, windowTime, scheduler));
 }

typingsgen.js

@@ -10,6 +10,7 @@ var extraSpaceRegex = /  /;
 var operators = {};
 var fileResult = '/* tslint:disable:class-name */ /* tslint:disable:no-unused-variable */ /* tslint:disable:max-line-length */\n\
 import {Observable, ObservableOrPromise, ArrayOrIterator} from \'./Observable\';\n\
+import {ConnectableObservable} from \'./observables/ConnectableObservable\';\n\
 import {Scheduler} from \'./Scheduler\';\n\
 import {Notification} from \'./Notification\';\n\
 import {Subject} from \'./Subject\';\n\
@@ -36,7 +37,7 @@ for (var i = 0; i < contents.length; i++) {
 	} else {
       var fileContent = fs.readFileSync('./src/operators/extended/'+filename+'.ts').toString();
 	}
-    
+
     var methods = [];
 
     var r = new RegExp('export function [_]?'+ filename +'([\\s|\\S]*?[\\;\\{])', 'g');