diff --git a/rx.js/rx.js.aggregates.d.ts b/rx.js/rx.js.aggregates.d.ts
index 7c10866a6..16426a96e 100644
--- a/rx.js/rx.js.aggregates.d.ts
+++ b/rx.js/rx.js.aggregates.d.ts
@@ -1,16 +1,19 @@
+///
+
// Type definitions for RxJS "Aggregates"
// Project: http://rx.codeplex.com/
// Definitions by: Carl de Billy
// Definitions: https://github.com/borisyankov/DefinitelyTyped
-///
-
declare module Rx {
- interface Observable {
- all(predicate?: (any) => bool): IObservable;
- min(predicate?: (any) => bool): IObservable;
- max(predicate?: (any) => bool): IObservable;
- count(predicate?: (any) => bool): IObservable;
- sum(keySelector?: (any) => any): IObservable;
+ interface IObservable {
+ all(predicate?: (value: T) => bool): IObservable;
+ min(comparer?: (value1: T, value2: T) => number): IObservable;
+ max(comparer?: (value1: T, value2: T) => number): IObservable;
+ count(predicate?: (item: T) => bool): IObservable;
+ sum(keySelector?: (item: T) => number): IObservable;
+ isEmpty(predicate?: (value: T) => bool): IObservable;
+ contains(value: T, comparer?: (value1: T, value2: T) => bool): IObservable;
+ average(keySelector?: (item: T) => number): IObservable;
}
}
\ No newline at end of file
diff --git a/rx.js/rx.js.d.ts b/rx.js/rx.js.d.ts
index 543fb703d..1cce070dc 100644
--- a/rx.js/rx.js.d.ts
+++ b/rx.js/rx.js.d.ts
@@ -8,7 +8,7 @@ declare module Rx {
export module Internals {
function inherits(child: Function, parent: Function): Function;
function addProperties(obj: Object, ...sourcces: Object[]): void;
- function addRef(xs: IObservable, r: { getDisposable(): _IDisposable; }): IObservable;
+ function addRef(xs: IObservable, r: { getDisposable(): _IDisposable; }): IObservable;
}
//Collections
@@ -192,81 +192,81 @@ declare module Rx {
interface ICatchScheduler extends IScheduler { }
// Notifications
- interface INotification {
- accept(observer: IObserver): void;
- accept(onNext: (value: any) =>void , onError?: (exception: any) =>void , onCompleted?: () =>void ): void;
+ interface INotification {
+ accept(observer: IObserver): void;
+ accept(onNext: (value: T) =>void , onError?: (exception: any) =>void , onCompleted?: () =>void ): void;
toObservable(scheduler?: IScheduler): IObservable;
hasValue: bool;
- equals(other: INotification): bool;
+ equals(other: INotification): bool;
kind: string;
- value?: any;
+ value?: T;
exception?: any;
}
export interface Notification {
//abstract
//function new (): INotification;
- createOnNext(value: any): INotification;//ON
- createOnError(exception): INotification;//OE
- createOnCompleted(): INotification;//OC
+ createOnNext(value: T): INotification;//ON
+ createOnError(exception): INotification;//OE
+ createOnCompleted(): INotification;//OC
}
var Notification: Notification;
export module Internals {
// Enumerator
- interface IEnumerator {
+ interface IEnumerator {
moveNext(): bool;
- getCurrent(): any;
+ getCurrent(): T;
dispose(): void;
}
- export interface Enumerator {
- (moveNext: () =>bool, getCurrent: () => any, dispose: () =>void ): IEnumerator;
+ export interface Enumerator {
+ (moveNext: () =>bool, getCurrent: () => T, dispose: () =>void ): IEnumerator;
- create(moveNext: () =>bool, getCurrent: () =>any, dispose?: () =>void ): IEnumerator;
+ create(moveNext: () =>bool, getCurrent: () => T, dispose?: () =>void ): IEnumerator;
}
// Enumerable
- interface IEnumerable {
- getEnumerator(): IEnumerator;
+ interface IEnumerable {
+ getEnumerator(): IEnumerator;
- concat(): IObservable;
- catchException(): IObservable;
+ concat(): IObservable;
+ catchException(): IObservable;
}
- export interface Enumerable {
- (getEnumerator: () =>IEnumerator): IEnumerable;
+ export interface Enumerable {
+ (getEnumerator: () =>IEnumerator): IEnumerable;
- repeat(value: any, repeatCount?: number): IEnumerable;
- forEach(source: any[], selector?: (element: any, index: number) =>any): IEnumerable;
- forEach(source: { length: number;[index: number]: any; }, selector?: (element: any, index: number) =>any): IEnumerable;
+ repeat(value: T, repeatCount?: number): IEnumerable;
+ forEach(source: T[], selector?: (element: T, index: number) => T2): IEnumerable;
+ forEach(source: { length: number; [index: number]: T; }, selector?: (element: T, index: number) => T2): IEnumerable;
}
}
// Observer
- interface IObserver {
- onNext(value: any): void;
+ interface IObserver {
+ onNext(value: T): void;
onError(exception: any): void;
onCompleted(): void;
- toNotifier(): (notification: INotification) =>void;
- asObserver(): IObserver;
+ toNotifier(): (notification: INotification) =>void;
+ asObserver(): IObserver;
checked(): ICheckedObserver;
}
export module Observer {
//abstract
//function new (): IObserver;
- function create(onNext: (value: any) =>void , onError?: (exception: any) =>void , onCompleted?: () =>void ): IObserver;
- function fromNotifier(handler: (notification: INotification) =>void ): IObserver;
+ function create(onNext: (value: T) =>void , onError?: (exception: any) =>void , onCompleted?: () =>void ): IObserver;
+ function fromNotifier(handler: (notification: INotification) =>void ): IObserver;
}
export module Internals {
// Abstract Observer
- interface IAbstractObserver extends IObserver {
+ interface IAbstractObserver extends IObserver {
isStopped: bool;
dispose(): void;
- next(value: any): void;
+ next(value: T): void;
error(exception: any): void;
completed(): void;
fail(): bool;
@@ -277,20 +277,20 @@ declare module Rx {
//}
}
- export class AnonymousObserver {
- constructor(onNext: (value: any) => void , onError: (exception: any) => void , onCompleted: () => void);
+ export class AnonymousObserver {
+ constructor(onNext: (value: T) => void , onError: (exception: any) => void , onCompleted: () => void);
}
- interface ICheckedObserver extends IObserver {
- _observer: IObserver;
+ interface ICheckedObserver extends IObserver {
+ _observer: IObserver;
_state: number; // 0 - idle, 1 - busy, 2 - done
checkAccess(): void;
}
export module Internals {
- interface IScheduledObserver extends IAbstractObserver {
+ interface IScheduledObserver extends IAbstractObserver {
scheduler: IScheduler;
- observer: IObserver;
+ observer: IObserver;
isAcquired: bool;
hasFaulted: bool;
//queue: { (value: any): void; (exception: any): void; (): void; }[];
@@ -298,163 +298,164 @@ declare module Rx {
ensureActive(): void;
}
- export interface ScheduledObserver {
- (scheduler: IScheduler, observer: IObserver): IScheduledObserver;
+ export interface ScheduledObserver {
+ (scheduler: IScheduler, observer: IObserver): IScheduledObserver;
}
}
+ interface IObservable {
+ _subscribe: (observer: IObserver) =>_IDisposable;
- interface IObservable {
- _subscribe: (observer: IObserver) =>_IDisposable;
+ subscribe(observer: IObserver): _IDisposable;
- subscribe(observer: IObserver): _IDisposable;
+ finalValue(): IObservable;
+ subscribe(onNext?: (value: T) =>void , onError?: (exception: any) =>void , onCompleted?: () =>void ): _IDisposable;
+ toArray(): IObservable;
- finalValue(): IObservable;
- subscribe(onNext?: (value: any) =>void , onError?: (exception: any) =>void , onCompleted?: () =>void ): _IDisposable;
- toArray(): IObservable;
-
- observeOn(scheduler: IScheduler): IObservable;
- subscribeOn(scheduler: IScheduler): IObservable;
- amb(rightSource: IObservable): IObservable;
- catchException(handler: (exception: any) =>IObservable): IObservable;
- catchException(second: IObservable): IObservable;
- combineLatest(second: IObservable, resultSelector: (v1: any, v2: any) =>any): IObservable;
- combineLatest(second: IObservable, third: IObservable, resultSelector: (v1: any, v2: any, v3: any) =>any): IObservable;
- combineLatest(second: IObservable, third: IObservable, fourth: IObservable, resultSelector: (v1: any, v2: any, v3: any, v4: any) =>any): IObservable;
- combineLatest(second: IObservable, third: IObservable, fourth: IObservable, fifth, IObservable, resultSelector: (v1: any, v2: any, v3: any, v4: any, v5: any) =>any): IObservable;
- combineLatest(...soucesAndResultSelector: any[]): IObservable;
- concat(...sources: IObservable[]): IObservable;
- concat(sources: IObservable[]): IObservable;
- concatIObservable(): IObservable;
- merge(maxConcurrent: number): IObservable;
- merge(other: IObservable): IObservable;
- mergeIObservable(): IObservable;
- onErrorResumeNext(second: IObservable): IObservable;
- skipUntil(other: IObservable): IObservable;
- switchLatest(): IObservable;
- takeUntil(other: IObservable): IObservable;
- zip(second: IObservable, resultSelector: (v1: any, v2: any) =>any): IObservable;
- zip(second: IObservable, third: IObservable, resultSelector: (v1: any, v2: any, v3: any) =>any): IObservable;
- zip(second: IObservable, third: IObservable, fourth: IObservable, resultSelector: (v1: any, v2: any, v3: any, v4: any) =>any): IObservable;
- zip(second: IObservable, third: IObservable, fourth: IObservable, fifth, IObservable, resultSelector: (v1: any, v2: any, v3: any, v4: any, v5: any) =>any): IObservable;
- zip(...soucesAndResultSelector: any[]): IObservable;
- zip(second: any[], resultSelector: (left: any, right: any) =>any): IObservable;
+ observeOn(scheduler: IScheduler): IObservable;
+ subscribeOn(scheduler: IScheduler): IObservable;
+ amb(rightSource: IObservable): IObservable;
+ catchException(handler: (exception: any) =>IObservable): IObservable;
+ catchException(second: IObservable): IObservable;
+ combineLatest(second: IObservable, resultSelector: (v1: T, v2: T2) =>TResult): IObservable;
+ combineLatest(second: IObservable, third: IObservable, resultSelector: (v1: T, v2: T2, v3: T3) =>TResult): IObservable;
+ combineLatest(second: IObservable, third: IObservable, fourth: IObservable, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) =>TResult): IObservable;
+ combineLatest(second: IObservable, third: IObservable, fourth: IObservable, fifth: IObservable, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) =>TResult): IObservable;
+ combineLatest(...soucesAndResultSelector: any[]): IObservable;
+ concat(...sources: IObservable[]): IObservable;
+ concat(sources: IObservable[]): IObservable;
+ //concatIObservable(): IObservable;
+ merge(maxConcurrent: number): IObservable;
+ merge(other: IObservable): IObservable;
+ //mergeIObservable(): IObservable;
+ onErrorResumeNext(second: IObservable): IObservable;
+ skipUntil(other: IObservable): IObservable;
+ switchLatest(): IObservable;
+ takeUntil(other: IObservable): IObservable;
+ zip(second: IObservable, resultSelector: (v1: T, v2: T2) =>TResult): IObservable;
+ zip(second: IObservable, third: IObservable, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): IObservable;
+ zip(second: IObservable, third: IObservable, fourth: IObservable, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): IObservable;
+ zip(second: IObservable, third: IObservable, fourth: IObservable, fifth: IObservable, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => TResult): IObservable;
+ zip(...soucesAndResultSelector: any[]): IObservable;
+ zip(second: any[], resultSelector: (left: T, right: any) => TResult): IObservable;
asIObservable(): IObservable;
- bufferWithCount(count: number, skip?: number): IObservable;
- dematerialize(): IObservable;
- distinctUntilChanged(keySelector?: (value: any) =>any, comparer?: (x: any, y: any) =>bool): IObservable;
- doAction(observer: IObserver): IObservable;
- doAction(onNext: (value: any) => void , onError?: (exception: any) =>void , onCompleted?: () =>void ): IObservable;
- finallyAction(action: () =>void ): IObservable;
- ignoreElements(): IObservable;
- materialize(): IObservable;
- repeat(repeatCount?: number): IObservable;
- retry(retryCount?: number): IObservable;
- scan(seed: any, accumulator: (acc: any, value: any) =>any): IObservable;
- scan(accumulator: (acc: any, value: any) =>any): IObservable;
- skipLast(count: number): IObservable;
- startWith(...values: any[]): IObservable;
- startWith(scheduler: IScheduler, ...values: any[]): IObservable;
- takeLast(count: number, scheduler?: IScheduler): IObservable;
- takeLastBuffer(count: number): IObservable;
- windowWithCount(count: number, skip?: number): IObservable;
- defaultIfEmpty(defaultValue?: any): IObservable;
- distinct(keySelector?: (value: any) =>any, keySerializer?: (key: any) =>string): IObservable;
- groupBy(keySelector: (value: any) =>any, elementSelector?: (value: any) =>any, keySerializer?: (key: any) =>string): IGroupedObservable;
- groupByUntil(keySelector: (value: any) =>any, elementSelector: (value: any) =>any, durationSelector: (gloup: IGroupedObservable) =>IObservable, keySerializer?: (key: any) =>string): IGroupedObservable;
- select(selector: (value: any, index: number) =>any): IObservable;
- selectMany(selector: (value: any) =>IObservable, resultSelector?: (x: any, y: any) =>any): IObservable;
- selectMany(other: IObservable): IObservable;
- skip(count: number): IObservable;
- skipWhile(predicate: (value: any, index?: number) =>bool): IObservable;
- take(count: number, scheduler?: IScheduler): IObservable;
- takeWhile(predicate: (value: any, index?: number) =>bool): IObservable;
- where(predicate: (value: any, index?: number) => bool): IObservable;
+ bufferWithCount(count: number, skip?: number): IObservable;
+ dematerialize(): IObservable;
+ distinctUntilChanged(keySelector?: (value: T) => TValue, comparer?: (x: TValue, y: TValue) =>bool): IObservable;
+ doAction(observer: IObserver): IObservable;
+ doAction(onNext: (value: T) => void , onError?: (exception: any) =>void , onCompleted?: () =>void ): IObservable;
+ finallyAction(action: () =>void): IObservable;
+ ignoreElements(): IObservable;
+ materialize(): IObservable>; // IObservable> not supported by TypeScript 0.9.0 !!
+ repeat(repeatCount?: number): IObservable;
+ retry(retryCount?: number): IObservable;
+ scan(seed: TAcc, accumulator: (acc: TAcc, value: T) => TAcc): IObservable;
+ scan(accumulator: (acc: TAcc, value: T) => TAcc): IObservable;
+ skipLast(count: number): IObservable;
+ startWith(...values: T[]): IObservable;
+ startWith(scheduler: IScheduler, ...values: T[]): IObservable;
+ takeLast(count: number, scheduler?: IScheduler): IObservable;
+ takeLastBuffer(count: number): IObservable;
+ windowWithCount(count: number, skip?: number): IObservable;
+ defaultIfEmpty(defaultValue?: any): IObservable;
+ distinct(keySelector?: (value: T) => TKey, keySerializer?: (key: TKey) =>string): IObservable;
+ groupBy(keySelector: (value: T) => TKey, elementSelector?: (value: T) => TElement, keySerializer?: (key: TKey) => string): IGroupedObservable;
+ groupByUntil(keySelector: (value: T) => TKey, elementSelector: (value: T) => TElement, durationSelector: (group: IGroupedObservable) => IObservable, keySerializer?: (key: TKey) => string): IGroupedObservable;
+ select(selector: (value: T, index: number) =>T2): IObservable;
+ selectMany(selector: (value: T) =>IObservable, resultSelector?: (x: any, y: any) =>any): IObservable;
+ selectMany(other: IObservable): IObservable;
+ skip(count: number): IObservable;
+ skipWhile(predicate: (value: T, index?: number) =>bool): IObservable;
+ take(count: number, scheduler?: IScheduler): IObservable;
+ takeWhile(predicate: (value: T, index?: number) =>bool): IObservable;
+ where(predicate: (value: T, index?: number) => bool): IObservable;
// time
- delay(dueTime: number, scheduler?: IScheduler): IObservable;
- throttle(dueTime: number, scheduler?: IScheduler): IObservable;
- windowWithTime(dueTime: number, timeShiftOrScheduler?: any, scheduler?: IScheduler): IObservable;
- timeInterval(scheduler: IScheduler): IObservable;
- sample(interval: number, scheduler?: IScheduler): IObservable;
- sample(sampler: IObservable, scheduler?: IScheduler): IObservable;
- timeout(dueTime: number, other?: IObservable, scheduler?: IScheduler): IObservable;
- delaySubscription(dueTime: number, scheduler?: IScheduler): IObservable;
+ delay(dueTime: number, scheduler?: IScheduler): IObservable;
+ throttle(dueTime: number, scheduler?: IScheduler): IObservable;
+ windowWithTime(dueTime: number, timeShiftOrScheduler?: any, scheduler?: IScheduler): IObservable;
+ timeInterval(scheduler: IScheduler): IObservable;
+ sample(interval: number, scheduler?: IScheduler): IObservable;
+ sample(sampler: IObservable, scheduler?: IScheduler): IObservable;
+ timeout(dueTime: number, other?: IObservable, scheduler?: IScheduler): IObservable;
+ delaySubscription(dueTime: number, scheduler?: IScheduler): IObservable;
}
- interface Observable {
- (subscribe: (observer: IObserver) =>_IDisposable): IObservable;
- start(func: () =>any, scheduler?: IScheduler, context?: any): IObservable;
- toAsync(func: Function, scheduler?: IScheduler, context?: any): (...arguments: any[]) => IObservable;
- create(subscribe: (Observer) => void ): IObservable;
- create(subscribe: (Observer) => () => void ): IObservable;
- createWithDisposable(subscribe: (Observer) =>_IDisposable): IObservable;
- defer(observableFactory: () =>IObservable): IObservable;
- empty(scheduler?: IScheduler): IObservable;
- fromArray(array: any[], scheduler?: IScheduler): IObservable;
- fromArray(array: { length: number;[index: number]: any; }, scheduler?: IScheduler): IObservable;
- generate(initialState: any, condition: (state: any) =>bool, iterate: (state: any) =>any, resultSelector: (state: any) =>any, scheduler?: IScheduler): IObservable;
- never(): IObservable;
- range(start: number, count: number, scheduler?: IScheduler): IObservable;
- repeat(value: any, repeatCount?: number, scheduler?: IScheduler): IObservable;
- returnValue(value: any, scheduler?: IScheduler): IObservable;
- throwException(exception: any, scheduler?: IScheduler): IObservable;
- using(resourceFactory: () =>any, observableFactory: (resource: any) =>IObservable): IObservable;
- amb(...sources: IObservable[]): IObservable;
- catchException(sources: IObservable[]): IObservable;
- catchException(...sources: IObservable[]): IObservable;
- concat(...sources: IObservable[]): IObservable;
- concat(sources: IObservable[]): IObservable;
- merge(...sources: IObservable[]): IObservable;
- merge(sources: IObservable[]): IObservable;
- merge(scheduler: IScheduler, ...sources: IObservable[]): IObservable;
- merge(scheduler: IScheduler, sources: IObservable[]): IObservable;
- onErrorResumeNext(...sources: IObservable[]): IObservable;
- onErrorResumeNext(sources: IObservable[]): IObservable;
+ interface Observable {
+ (subscribe: (observer: IObserver) =>_IDisposable): IObservable;
+
+ start(func: () =>T, scheduler?: IScheduler, context?: any): IObservable;
+ toAsync(func: Function, scheduler?: IScheduler, context?: any): (...arguments: any[]) => IObservable;
+ create(subscribe: (observer: IObserver) => void ): IObservable;
+ create(subscribe: (observer: IObserver) => () => void ): IObservable;
+ createWithDisposable(subscribe: (observer: IObserver) =>_IDisposable): IObservable;
+ defer(observableFactory: () =>IObservable): IObservable;
+ empty(scheduler?: IScheduler): IObservable;
+ fromArray(array: T[], scheduler?: IScheduler): IObservable;
+ fromArray(array: { length: number;[index: number]: T; }, scheduler?: IScheduler): IObservable;
+ generate(initialState: TState, condition: (state: TState) => bool, iterate: (state: TState) => TState, resultSelector: (state: TState) => TResult, scheduler?: IScheduler): IObservable;
+ never(): IObservable;
+ range(start: number, count: number, scheduler?: IScheduler): IObservable;
+ repeat(value: T, repeatCount?: number, scheduler?: IScheduler): IObservable;
+ returnValue(value: T, scheduler?: IScheduler): IObservable;
+ throwException(exception: any, scheduler?: IScheduler): IObservable;
+ using(resourceFactory: () => TResource, observableFactory: (resource: TResource) => IObservable): IObservable;
+ amb(...sources: IObservable[]): IObservable;
+ catchException(sources: IObservable[]): IObservable;
+ catchException(...sources: IObservable[]): IObservable;
+ concat(...sources: IObservable[]): IObservable;
+ concat(sources: IObservable[]): IObservable;
+ merge(...sources: IObservable[]): IObservable;
+ merge(sources: IObservable[]): IObservable;
+ merge(scheduler: IScheduler, ...sources: IObservable[]): IObservable;
+ merge(scheduler: IScheduler, sources: IObservable[]): IObservable;
+ onErrorResumeNext(...sources: IObservable[]): IObservable;
+ onErrorResumeNext(sources: IObservable[]): IObservable;
}
var Observable: Observable;
export module Internals {
- interface IAnonymousObservable extends IObservable { }
- export interface AnonymousObservable {
- (subscribe: (observer: IObserver) =>_IDisposable): IAnonymousObservable;
+ interface IAnonymousObservable