style(typings): Added typings for extended operators

Author: david-driscoll

src/KitchenSinkOperators.ts

@@ -0,0 +1,15 @@
+import * as operators from './operator-typings';
+import {CoreOperators} from './CoreOperators';
+export interface KitchenSinkOperators<T> extends CoreOperators<T> {
+  isEmpty: operators.operator_proto_isEmpty<T>;
+  elementAt: operators.operator_proto_elementAt<T>;
+  distinctUntilKeyChanged: operators.operator_proto_distinctUntilKeyChanged<T>;
+  find: operators.operator_proto_find<T>;
+  findIndex: operators.operator_proto_findIndex<T>;
+  max: operators.operator_proto_max<T>;
+  min: operators.operator_proto_min<T>;
+  timeInterval: operators.operator_proto_timeInterval<T>;
+  mergeScan: operators.operator_proto_mergeScan<T>;
+  switchFirst: operators.operator_proto_switchFirst<T>;
+  switchMapFirst: operators.operator_proto_switchMapFirst<T>;
+}

src/Rx.KitchenSink.ts

@@ -1,22 +1,9 @@
 import {Observable} from './Observable';
 import {CoreOperators} from './CoreOperators';
+import {KitchenSinkOperators} from './KitchenSinkOperators';
 import {Scheduler as IScheduler} from './Scheduler';
 import {_PredicateObservable} from './types';
-
-interface KitchenSinkOperators<T> extends CoreOperators<T> {
-  isEmpty?: () => Observable<boolean>;
-  elementAt?: (index: number, defaultValue?: any) => Observable<T>;
-  distinctUntilKeyChanged?: (key: string, compare?: (x: any, y: any) => boolean, thisArg?: any) => Observable<T>;
-  find?: (predicate: _PredicateObservable<T>, thisArg?: any) => Observable<T>;
-  findIndex?: (predicate: _PredicateObservable<T>, thisArg?: any) => Observable<number>;
-  max?: <T, R>(comparer?: (x: R, y: T) => R) => Observable<R>;
-  min?: <T, R>(comparer?: (x: R, y: T) => R) => Observable<R>;
-  timeInterval?: <T>(scheduler?: IScheduler) => Observable<T>;
-  mergeScan?: <T, R>(project: (acc: R, x: T) => Observable<R>, seed: R) => Observable<R>;
-  switchFirst?: () => Observable<T>;
-  switchMapFirst?: <R>(project: ((x: T, ix: number) => Observable<any>),
-                       projectResult?: (x: T, y: any, ix: number, iy: number) => R) => Observable<R>;
-}
+import * as operators from './operator-typings';
 
 // operators
 /* tslint:disable:no-use-before-declare */
@@ -75,7 +62,7 @@ import {zip as zipStatic} from './operators/zip-static';
 Observable.zip = zipStatic;
 
 // Operators
-const observableProto = (<KitchenSinkOperators<any>>Observable.prototype);
+const observableProto:KitchenSinkOperators<any> = (<any>Observable.prototype);
 
 import {buffer} from './operators/buffer';
 observableProto.buffer = buffer;
@@ -278,10 +265,10 @@ import {switchMapTo} from './operators/switchMapTo';
 observableProto.switchMapTo = switchMapTo;
 
 import {switchFirst} from './operators/switchFirst';
-observableProto.switchFirst = switchFirst;
+observableProto.switchFirst = <any>switchFirst;
 
 import {switchMapFirst} from './operators/switchMapFirst';
-observableProto.switchMapFirst = switchMapFirst;
+observableProto.switchMapFirst = <any>switchMapFirst;
 
 import {take} from './operators/take';
 observableProto.take = take;

src/operator-typings.ts

@@ -6,6 +6,7 @@ import {Subject} from './Subject';
 import {Observer} from './Observer';
 import {GroupedObservable} from './operators/groupBy-support';
 import {GroupByObservable} from './operators/groupBy';
+import {TimeInterval} from './operators/extended/timeInterval';
 import {_Selector, _IndexSelector, _SwitchMapResultSelector, _MergeMapProjector, _Predicate, _PredicateObservable, _Comparer, _Accumulator, _MergeAccumulator} from './types';
 
 export interface operator_proto_buffer<T> {
@@ -269,3 +270,37 @@ export interface operator_proto_zip<T> {
 export interface operator_proto_zipAll<T> {
   <R>(project?: (...values: Array<any>) => R): Observable<R>;
 }
+export interface operator_proto_isEmpty<T> {
+  (): Observable<T>;
+}
+export interface operator_proto_elementAt<T> {
+  (index: number, defaultValue?: T): Observable<T>;
+}
+export interface operator_proto_distinctUntilKeyChanged<T> {
+  (key: string, compare?: _Comparer<T, boolean>, thisArg?: any): Observable<T>;
+}
+export interface operator_proto_find<T> {
+  (predicate: _PredicateObservable<T>, thisArg?: any): Observable<T>;
+}
+export interface operator_proto_findIndex<T> {
+  (predicate: _PredicateObservable<T>, thisArg?: any): Observable<number>;
+}
+export interface operator_proto_max<T> {
+  <R>(comparer?: _Comparer<T, R>): Observable<R>;
+}
+export interface operator_proto_min<T> {
+  <R>(comparer?: _Comparer<T, R>): Observable<R>;
+}
+export interface operator_proto_timeInterval<T> {
+  (scheduler?: Scheduler): Observable<TimeInterval>;
+}
+export interface operator_proto_mergeScan<T> {
+  <R>(project: _MergeAccumulator<T, R>, seed: R): Observable<R>;
+}
+export interface operator_proto_switchFirst<T> {
+  (): Observable<T>;
+}
+export interface operator_proto_switchMapFirst<T> {
+  <R>(project: _MergeMapProjector<T, R>): Observable<R>;
+  <R, R2>(project: _MergeMapProjector<T, R>, resultSelector?: _SwitchMapResultSelector<T, R, R2>): Observable<R2>;
+}

typingsgen.js

@@ -1,8 +1,9 @@
 var fs = require('fs');
-var regex = /export interface CoreOperators<T> \{([\S|\s]*)\}/;
+var regex = /export interface .*?Operators<T> \{([\S|\s]*)\}/;
 
 var content = fs.readFileSync('./src/CoreOperators.ts').toString();
-var contentResult = content.match(regex)[1].trim();
+var content2 = fs.readFileSync('./src/KitchenSinkOperators.ts').toString();
+var contentResult = content.match(regex)[1].trim() + '\n' + content2.match(regex)[1].trim();
 var contents = contentResult.split('\n');
 var extraSpaceRegex = /  /;
 
@@ -15,6 +16,7 @@ import {Subject} from \'./Subject\';\n\
 import {Observer} from \'./Observer\';\n\
 import {GroupedObservable} from \'./operators/groupBy-support\';\n\
 import {GroupByObservable} from \'./operators/groupBy\';\n\
+import {TimeInterval} from \'./operators/extended/timeInterval\';\n\
 import {_Selector, _IndexSelector, _SwitchMapResultSelector, _MergeMapProjector, _Predicate, _PredicateObservable, _Comparer, _Accumulator, _MergeAccumulator} from \'./types\';\n\n\
 ';
 
@@ -28,9 +30,13 @@ for (var i = 0; i < contents.length; i++) {
     }
 
     var property = file[1].trim();
-    var filename = file[2];
-    var fileContent = fs.readFileSync('./src/operators/'+filename+'.ts').toString();
-
+    var filename = file[2].trim();
+	if (fs.existsSync('./src/operators/'+filename+'.ts')) {
+      var fileContent = fs.readFileSync('./src/operators/'+filename+'.ts').toString();
+	} else {
+      var fileContent = fs.readFileSync('./src/operators/extended/'+filename+'.ts').toString();
+	}
+    
     var methods = [];
 
     var r = new RegExp('export function [_]?'+ filename +'([\\s|\\S]*?[\\;\\{])', 'g');