refactor(typings): Updated typings with generation tool

Author: david-driscoll

src/CoreOperators.ts

@@ -1,78 +1,78 @@
-/// <reference path="../typings/operators.d.ts" />
+import * as operators from "./operator-typings";
 export interface CoreOperators<T> {
-  buffer: operator_proto_buffer;
-  bufferCount: operator_proto_bufferCount;
-  bufferTime: operator_proto_bufferTime;
-  bufferToggle: operator_proto_bufferToggle;
-  bufferWhen: operator_proto_bufferWhen;
-  catch: operator_proto_catch;
-  combineAll: operator_proto_combineAll;
-  combineLatest: operator_proto_combineLatest;
-  concat: operator_proto_concat;
-  concatAll: operator_proto_concatAll;
-  concatMap: operator_proto_concatMap;
-  concatMapTo: operator_proto_concatMapTo;
-  count: operator_proto_count;
-  dematerialize: operator_proto_dematerialize;
-  debounce: operator_proto_debounce;
-  debounceTime: operator_proto_debounceTime;
-  defaultIfEmpty: operator_proto_defaultIfEmpty;
-  delay: operator_proto_delay;
-  distinctUntilChanged: operator_proto_distinctUntilChanged;
-  do: operator_proto_do;
-  expand: operator_proto_expand;
-  filter: operator_proto_filter;
-  finally: operator_proto_finally;
-  first: operator_proto_first;
-  flatMap: operator_proto_mergeMap;
-  flatMapTo: operator_proto_mergeMapTo;
-  groupBy: operator_proto_groupBy;
-  ignoreElements: operator_proto_ignoreElements;
-  last: operator_proto_last;
-  every: operator_proto_every;
-  map: operator_proto_map;
-  mapTo: operator_proto_mapTo;
-  materialize: operator_proto_materialize;
-  merge: operator_proto_merge;
-  mergeAll: operator_proto_mergeAll;
-  mergeMap: operator_proto_mergeMap;
-  mergeMapTo: operator_proto_mergeMapTo;
-  multicast: operator_proto_multicast;
-  observeOn: operator_proto_observeOn;
-  partition: operator_proto_partition;
-  publish: operator_proto_publish;
-  publishBehavior: operator_proto_publishBehavior;
-  publishReplay: operator_proto_publishReplay;
-  reduce: operator_proto_reduce;
-  repeat: operator_proto_repeat;
-  retry: operator_proto_retry;
-  retryWhen: operator_proto_retryWhen;
-  sample: operator_proto_sample;
-  sampleTime: operator_proto_sampleTime;
-  scan: operator_proto_scan;
-  share: operator_proto_share;
-  single: operator_proto_single;
-  skip: operator_proto_skip;
-  skipUntil: operator_proto_skipUntil;
-  startWith: operator_proto_startWith;
-  subscribeOn: operator_proto_subscribeOn;
-  switch: operator_proto_switch;
-  switchMap: operator_proto_switchMap;
-  switchMapTo: operator_proto_switchMapTo;
-  take: operator_proto_take;
-  takeUntil: operator_proto_takeUntil;
-  throttle: operator_proto_throttle;
-  throttleTime: operator_proto_throttleTime;
-  timeout: operator_proto_timeout;
-  timeoutWith: operator_proto_timeoutWith;
-  toArray: operator_proto_toArray;
-  toPromise: operator_proto_toPromise;
-  window: operator_proto_window;
-  windowCount: operator_proto_windowCount;
-  windowTime: operator_proto_windowTime;
-  windowToggle: operator_proto_windowToggle;
-  windowWhen: operator_proto_windowWhen;
-  withLatestFrom: operator_proto_withLatestFrom;
-  zip: operator_proto_zip;
-  zipAll: operator_proto_zipAll;
+  buffer: operators.operator_proto_buffer<T>;
+  bufferCount: operators.operator_proto_bufferCount<T>;
+  bufferTime: operators.operator_proto_bufferTime<T>;
+  bufferToggle: operators.operator_proto_bufferToggle<T>;
+  bufferWhen: operators.operator_proto_bufferWhen<T>;
+  catch: operators.operator_proto_catch<T>;
+  combineAll: operators.operator_proto_combineAll<T>;
+  combineLatest: operators.operator_proto_combineLatest<T>;
+  concat: operators.operator_proto_concat<T>;
+  concatAll: operators.operator_proto_concatAll<T>;
+  concatMap: operators.operator_proto_concatMap<T>;
+  concatMapTo: operators.operator_proto_concatMapTo<T>;
+  count: operators.operator_proto_count<T>;
+  dematerialize: operators.operator_proto_dematerialize<T>;
+  debounce: operators.operator_proto_debounce<T>;
+  debounceTime: operators.operator_proto_debounceTime<T>;
+  defaultIfEmpty: operators.operator_proto_defaultIfEmpty<T>;
+  delay: operators.operator_proto_delay<T>;
+  distinctUntilChanged: operators.operator_proto_distinctUntilChanged<T>;
+  do: operators.operator_proto_do<T>;
+  expand: operators.operator_proto_expand<T>;
+  filter: operators.operator_proto_filter<T>;
+  finally: operators.operator_proto_finally<T>;
+  first: operators.operator_proto_first<T>;
+  flatMap: operators.operator_proto_mergeMap<T>;
+  flatMapTo: operators.operator_proto_mergeMapTo<T>;
+  groupBy: operators.operator_proto_groupBy<T>;
+  ignoreElements: operators.operator_proto_ignoreElements<T>;
+  last: operators.operator_proto_last<T>;
+  every: operators.operator_proto_every<T>;
+  map: operators.operator_proto_map<T>;
+  mapTo: operators.operator_proto_mapTo<T>;
+  materialize: operators.operator_proto_materialize<T>;
+  merge: operators.operator_proto_merge<T>;
+  mergeAll: operators.operator_proto_mergeAll<T>;
+  mergeMap: operators.operator_proto_mergeMap<T>;
+  mergeMapTo: operators.operator_proto_mergeMapTo<T>;
+  multicast: operators.operator_proto_multicast<T>;
+  observeOn: operators.operator_proto_observeOn<T>;
+  partition: operators.operator_proto_partition<T>;
+  publish: operators.operator_proto_publish<T>;
+  publishBehavior: operators.operator_proto_publishBehavior<T>;
+  publishReplay: operators.operator_proto_publishReplay<T>;
+  reduce: operators.operator_proto_reduce<T>;
+  repeat: operators.operator_proto_repeat<T>;
+  retry: operators.operator_proto_retry<T>;
+  retryWhen: operators.operator_proto_retryWhen<T>;
+  sample: operators.operator_proto_sample<T>;
+  sampleTime: operators.operator_proto_sampleTime<T>;
+  scan: operators.operator_proto_scan<T>;
+  share: operators.operator_proto_share<T>;
+  single: operators.operator_proto_single<T>;
+  skip: operators.operator_proto_skip<T>;
+  skipUntil: operators.operator_proto_skipUntil<T>;
+  startWith: operators.operator_proto_startWith<T>;
+  subscribeOn: operators.operator_proto_subscribeOn<T>;
+  switch: operators.operator_proto_switch<T>;
+  switchMap: operators.operator_proto_switchMap<T>;
+  switchMapTo: operators.operator_proto_switchMapTo<T>;
+  take: operators.operator_proto_take<T>;
+  takeUntil: operators.operator_proto_takeUntil<T>;
+  throttle: operators.operator_proto_throttle<T>;
+  throttleTime: operators.operator_proto_throttleTime<T>;
+  timeout: operators.operator_proto_timeout<T>;
+  timeoutWith: operators.operator_proto_timeoutWith<T>;
+  toArray: operators.operator_proto_toArray<T>;
+  toPromise: operators.operator_proto_toPromise<T>;
+  window: operators.operator_proto_window<T>;
+  windowCount: operators.operator_proto_windowCount<T>;
+  windowTime: operators.operator_proto_windowTime<T>;
+  windowToggle: operators.operator_proto_windowToggle<T>;
+  windowWhen: operators.operator_proto_windowWhen<T>;
+  withLatestFrom: operators.operator_proto_withLatestFrom<T>;
+  zip: operators.operator_proto_zip<T>;
+  zipAll: operators.operator_proto_zipAll<T>;
 }

src/Notification.ts

@@ -47,7 +47,7 @@ export class Notification<T> {
       case 'E':
         return Observable.throw(this.exception);
       case 'C':
-        return Observable.empty();
+        return Observable.empty<T>();
     }
   }
 

src/Observable.ts

@@ -1,5 +1,3 @@
-/// <reference path="../typings/operators.d.ts" />
-
 import {Observer} from './Observer';
 import {Operator} from './Operator';
 import {Scheduler} from './Scheduler';
@@ -16,11 +14,12 @@ import {Notification} from './Notification';
 export type ObservableOrPromise<T> = Observable<T> | PromiseLike<T>;
 export type ArrayOrIterable<T> = IterableShim<T> | ArrayLike<T> | Array<T>;
 export type ObservableOrIterable<T> = ObservableOrPromise<T> | ArrayOrIterable<T>;
+import * as operators from "./operator-typings";
 
 import {combineLatest as combineLatestStatic} from "./operators/combineLatest-static";
 import {concat as concatStatic} from "./operators/concat-static";
 import {merge as mergeStatic} from "./operators/merge-static";
-import {zip as zipStatic} from "./operators/merge-static";
+import {zip as zipStatic} from "./operators/zip-static";
 import {DeferObservable} from './observables/DeferObservable';
 import {EmptyObservable} from './observables/EmptyObservable';
 import {ForkJoinObservable} from './observables/ForkJoinObservable';
@@ -31,6 +30,7 @@ import {FromEventPatternObservable} from './observables/FromEventPatternObservab
 import {PromiseObservable} from './observables/PromiseObservable';
 import {IntervalObservable} from './observables/IntervalObservable';
 import {InfiniteObservable} from './observables/InfiniteObservable';
+import {TimerObservable} from './observables/TimerObservable';
 import {RangeObservable} from './observables/RangeObservable';
 import {ErrorObservable} from './observables/ErrorObservable';
 
@@ -79,7 +79,7 @@ export class Observable<T> implements CoreOperators<T>  {
    * operator defined as the new observable's operator.
    */
   lift<T, R>(operator: Operator<T, R>): Observable<T> {
-    const observable = new Observable();
+    const observable = new Observable<T>();
     observable.source = this;
     observable.operator = operator;
     return observable;
@@ -177,80 +177,79 @@ export class Observable<T> implements CoreOperators<T>  {
   static zip: typeof zipStatic;
 
   // core operators
-  buffer: operator_proto_buffer;
-  bufferCount: operator_proto_bufferCount;
-  bufferTime: operator_proto_bufferTime;
-  bufferToggle: operator_proto_bufferToggle;
-  bufferWhen: operator_proto_bufferWhen;
-  catch: operator_proto_catch;
-  combineAll: operator_proto_combineAll;
-  combineLatest: operator_proto_combineLatest;
-  concat: operator_proto_concat;
-  concatAll: operator_proto_concatAll;
-  concatMap: operator_proto_concatMap;
-  concatMapTo: operator_proto_concatMapTo;
-  count: operator_proto_count;
-  dematerialize: operator_proto_dematerialize;
-  debounce: operator_proto_debounce;
-  debounceTime: operator_proto_debounceTime;
-  defaultIfEmpty: operator_proto_defaultIfEmpty;
-  delay: operator_proto_delay;
-  distinctUntilChanged: operator_proto_distinctUntilChanged;
-  do: operator_proto_do;
-  expand: operator_proto_expand;
-  filter: operator_proto_filter;
-  finally: operator_proto_finally;
-  first: operator_proto_first;
-  flatMap: operator_proto_mergeMap;
-  flatMapTo: operator_proto_mergeMapTo;
-  groupBy: operator_proto_groupBy;
-  ignoreElements: operator_proto_ignoreElements;
-  last: operator_proto_last;
-  every: operator_proto_every;
-  map: operator_proto_map;
-  mapTo: operator_proto_mapTo;
-  materialize: operator_proto_materialize;
-  merge: operator_proto_merge;
-  mergeAll: operator_proto_mergeAll;
-  mergeMap: operator_proto_mergeMap;
-  mergeMapTo: operator_proto_mergeMapTo;
-  multicast: operator_proto_multicast;
-  observeOn: operator_proto_observeOn;
-  partition: operator_proto_partition;
-  publish: operator_proto_publish;
-  publishBehavior: operator_proto_publishBehavior;
-  publishReplay: operator_proto_publishReplay;
-  reduce: operator_proto_reduce;
-  repeat: operator_proto_repeat;
-  retry: operator_proto_retry;
-  retryWhen: operator_proto_retryWhen;
-  sample: operator_proto_sample;
-  sampleTime: operator_proto_sampleTime;
-  scan: operator_proto_scan;
-  share: operator_proto_share;
-  single: operator_proto_single;
-  skip: operator_proto_skip;
-  skipUntil: operator_proto_skipUntil;
-  startWith: operator_proto_startWith;
-  subscribeOn: operator_proto_subscribeOn;
-  switch: operator_proto_switch;
-  switchMap: operator_proto_switchMap;
-  switchMapTo: operator_proto_switchMapTo;
-  take: operator_proto_take;
-  takeUntil: operator_proto_takeUntil;
-  throttle: operator_proto_throttle;
-  throttleTime: operator_proto_throttleTime;
-  timeout: operator_proto_timeout;
-  timeoutWith: operator_proto_timeoutWith;
-  toArray: operator_proto_toArray;
-  toPromise: operator_proto_toPromise;
-  window: operator_proto_window;
-  windowCount: operator_proto_windowCount;
-  windowTime: operator_proto_windowTime;
-  windowToggle: operator_proto_windowToggle;
-  windowWhen: operator_proto_windowWhen;
-  withLatestFrom: operator_proto_withLatestFrom;
-  zip: operator_proto_zip;
-  zipAll: operator_proto_zipAll;
+  buffer: operators.operator_proto_buffer<T>;
+  bufferCount: operators.operator_proto_bufferCount<T>;
+  bufferTime: operators.operator_proto_bufferTime<T>;
+  bufferToggle: operators.operator_proto_bufferToggle<T>;
+  bufferWhen: operators.operator_proto_bufferWhen<T>;
+  catch: operators.operator_proto_catch<T>;
+  combineAll: operators.operator_proto_combineAll<T>;
+  combineLatest: operators.operator_proto_combineLatest<T>;
+  concat: operators.operator_proto_concat<T>;
+  concatAll: operators.operator_proto_concatAll<T>;
+  concatMap: operators.operator_proto_concatMap<T>;
+  concatMapTo: operators.operator_proto_concatMapTo<T>;
+  count: operators.operator_proto_count<T>;
+  dematerialize: operators.operator_proto_dematerialize<T>;
+  debounce: operators.operator_proto_debounce<T>;
+  debounceTime: operators.operator_proto_debounceTime<T>;
+  defaultIfEmpty: operators.operator_proto_defaultIfEmpty<T>;
+  delay: operators.operator_proto_delay<T>;
+  distinctUntilChanged: operators.operator_proto_distinctUntilChanged<T>;
+  do: operators.operator_proto_do<T>;
+  expand: operators.operator_proto_expand<T>;
+  filter: operators.operator_proto_filter<T>;
+  finally: operators.operator_proto_finally<T>;
+  first: operators.operator_proto_first<T>;
+  flatMap: operators.operator_proto_mergeMap<T>;
+  flatMapTo: operators.operator_proto_mergeMapTo<T>;
+  groupBy: operators.operator_proto_groupBy<T>;
+  ignoreElements: operators.operator_proto_ignoreElements<T>;
+  last: operators.operator_proto_last<T>;
+  every: operators.operator_proto_every<T>;
+  map: operators.operator_proto_map<T>;
+  mapTo: operators.operator_proto_mapTo<T>;
+  materialize: operators.operator_proto_materialize<T>;
+  merge: operators.operator_proto_merge<T>;
+  mergeAll: operators.operator_proto_mergeAll<T>;
+  mergeMap: operators.operator_proto_mergeMap<T>;
+  mergeMapTo: operators.operator_proto_mergeMapTo<T>;
+  multicast: operators.operator_proto_multicast<T>;
+  observeOn: operators.operator_proto_observeOn<T>;
+  partition: operators.operator_proto_partition<T>;
+  publish: operators.operator_proto_publish<T>;
+  publishBehavior: operators.operator_proto_publishBehavior<T>;
+  publishReplay: operators.operator_proto_publishReplay<T>;
+  reduce: operators.operator_proto_reduce<T>;
+  repeat: operators.operator_proto_repeat<T>;
+  retry: operators.operator_proto_retry<T>;
+  retryWhen: operators.operator_proto_retryWhen<T>;
+  sample: operators.operator_proto_sample<T>;
+  sampleTime: operators.operator_proto_sampleTime<T>;
+  scan: operators.operator_proto_scan<T>;
+  share: operators.operator_proto_share<T>;
+  single: operators.operator_proto_single<T>;
+  skip: operators.operator_proto_skip<T>;
+  skipUntil: operators.operator_proto_skipUntil<T>;
+  startWith: operators.operator_proto_startWith<T>;
+  subscribeOn: operators.operator_proto_subscribeOn<T>;
+  switch: operators.operator_proto_switch<T>;
+  switchMap: operators.operator_proto_switchMap<T>;
+  switchMapTo: operators.operator_proto_switchMapTo<T>;
+  take: operators.operator_proto_take<T>;
+  takeUntil: operators.operator_proto_takeUntil<T>;
+  throttle: operators.operator_proto_throttle<T>;
+  throttleTime: operators.operator_proto_throttleTime<T>;
+  timeout: operators.operator_proto_timeout<T>;
+  timeoutWith: operators.operator_proto_timeoutWith<T>;
+  toArray: operators.operator_proto_toArray<T>;
+  toPromise: operators.operator_proto_toPromise<T>;
+  window: operators.operator_proto_window<T>;
+  windowCount: operators.operator_proto_windowCount<T>;
+  windowTime: operators.operator_proto_windowTime<T>;
+  windowToggle: operators.operator_proto_windowToggle<T>;
+  windowWhen: operators.operator_proto_windowWhen<T>;
+  withLatestFrom: operators.operator_proto_withLatestFrom<T>;
+  zip: operators.operator_proto_zip<T>;
+  zipAll: operators.operator_proto_zipAll<T>;
 }
-

src/Rx.KitchenSink.ts

@@ -331,7 +331,7 @@ import {withLatestFrom} from './operators/withLatestFrom';
 observableProto.withLatestFrom = withLatestFrom;
 
 import {zipProto} from './operators/zip';
-observableProto.zip = zipProto;
+observableProto.zip = <any>zipProto;
 
 import {zipAll} from './operators/zipAll';
 observableProto.zipAll = zipAll;

src/Rx.ts

@@ -282,7 +282,7 @@ import {withLatestFrom} from './operators/withLatestFrom';
 observableProto.withLatestFrom = withLatestFrom;
 
 import {zipProto} from './operators/zip';
-observableProto.zip = zipProto;
+observableProto.zip = <any>zipProto;
 
 import {zipAll} from './operators/zipAll';
 observableProto.zipAll = zipAll;

src/Subject.ts

@@ -35,7 +35,7 @@ export class Subject<T> extends Observable<T> implements Observer<T>, Subscripti
   completeSignal: boolean = false;
 
   lift<T, R>(operator: Operator<T, R>): Observable<T> {
-    const subject = new BidirectionalSubject(this, this.destination || this);
+    const subject: Subject<T> = <any>new BidirectionalSubject(this, this.destination || this);
     subject.operator = operator;
     return subject;
   }
@@ -162,7 +162,7 @@ export class Subject<T> extends Observable<T> implements Observer<T>, Subscripti
 }
 
 class BidirectionalSubject<T> extends Subject<T> {
-  constructor(public source: Observable<any>, protected destination: Observer<any>) {
+  constructor(public source: Observable<T>, protected destination: Observer<T>) {
     super();
   }