Skip to content
This repository has been archived by the owner on Apr 20, 2018. It is now read-only.

Fixes in rebuild-ts grunt task. #961

Merged
merged 1 commit into from
Oct 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2619,7 +2619,9 @@ module.exports = function (grunt) {
}

if (!(concatKey === 'all' || concatKey === 'main' || concatKey === 'lite' || concatKey === 'core')) {
if (allLoadedFiles['lite'][tsFile] || allLoadedFiles['core'][tsFile]) {
if ((concatKey.indexOf('lite') === 0 && allLoadedFiles['lite'][tsFile])
|| (concatKey.indexOf('lite') !== 0 && allLoadedFiles['main'][tsFile])
|| allLoadedFiles['core'][tsFile]) {
loadedFiles[tsFile] = true;
return;
}
Expand Down Expand Up @@ -2655,7 +2657,7 @@ module.exports = function (grunt) {
continue;
}

if (key === 'lite' || key === 'core') {
if (key === 'lite' || key === 'main' || key === 'core') {
items.unshift(key);
} else {
items.push(key);
Expand Down Expand Up @@ -2717,7 +2719,7 @@ module.exports = function (grunt) {
if (concatKey === 'all' || concatKey === 'main' || concatKey === 'lite' || concatKey === 'core') {
outputString += '\ndeclare module "rx" { export = Rx; }\n';
}
if (dist && concatKey !== 'core') {
if (dist && concatKey !== 'core' && concatKey !== 'main') {
outputString += 'declare module "'+dist+'" { export = Rx; }';
}

Expand Down
215 changes: 215 additions & 0 deletions ts/rx.async.d.ts

Large diffs are not rendered by default.

215 changes: 215 additions & 0 deletions ts/rx.async.es6.d.ts

Large diffs are not rendered by default.

72 changes: 72 additions & 0 deletions ts/rx.backpressure.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
declare module Rx {

/**
* Used to pause and resume streams.
*/
export interface Pauser {
/**
* Pauses the underlying sequence.
*/
pause(): void;

/**
* Resumes the underlying sequence.
*/
resume(): void;
}

export interface Observable<T> {
/**
* Pauses the underlying observable sequence based upon the observable sequence which yields true/false.
* @example
* var pauser = new Rx.Subject();
* var source = Rx.Observable.interval(100).pausable(pauser);
* @param {Observable} pauser The observable sequence used to pause the underlying sequence.
* @returns {Observable} The observable sequence which is paused based upon the pauser.
*/
pausable(pauser?: Observable<boolean>): PausableObservable<T>;
}

export interface PausableObservable<T> extends Observable<T> {
pause(): void;
resume(): void;
}

export interface Observable<T> {
/**
* Pauses the underlying observable sequence based upon the observable sequence which yields true/false,
* and yields the values that were buffered while paused.
* @example
* var pauser = new Rx.Subject();
* var source = Rx.Observable.interval(100).pausableBuffered(pauser);
* @param {Observable} pauser The observable sequence used to pause the underlying sequence.
* @returns {Observable} The observable sequence which is paused based upon the pauser.
*/
pausableBuffered(pauser?: Observable<boolean>): PausableObservable<T>;
}

export interface Observable<T> {
/**
* Attaches a controller to the observable sequence with the ability to queue.
* @example
* var source = Rx.Observable.interval(100).controlled();
* source.request(3); // Reads 3 values
* @param {bool} enableQueue truthy value to determine if values should be queued pending the next request
* @param {Scheduler} scheduler determines how the requests will be scheduled
* @returns {Observable} The observable sequence which only propagates values on request.
*/
controlled(enableQueue?: boolean, scheduler?: IScheduler): ControlledObservable<T>;
}

export interface ControlledObservable<T> extends Observable<T> {
request(numberOfItems?: number): IDisposable;
}

export interface ControlledObservable<T> {
/**
* Attaches a stop and wait observable to the current observable.
Expand All @@ -17,5 +79,15 @@ declare module Rx {
windowed(windowSize: number): Observable<T>;
}

export interface Observable<T> {
/**
* Pipes the existing Observable sequence into a Node.js Stream.
* @param {Stream} dest The destination Node.js stream.
* @returns {Stream} The destination stream.
*/
pipe<TDest>(dest: TDest): TDest;
// TODO: Add link to node.d.ts some where
}

}
declare module "rx.backpressure" { export = Rx; }
72 changes: 72 additions & 0 deletions ts/rx.backpressure.es6.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
declare module Rx {

/**
* Used to pause and resume streams.
*/
export interface Pauser {
/**
* Pauses the underlying sequence.
*/
pause(): void;

/**
* Resumes the underlying sequence.
*/
resume(): void;
}

export interface Observable<T> {
/**
* Pauses the underlying observable sequence based upon the observable sequence which yields true/false.
* @example
* var pauser = new Rx.Subject();
* var source = Rx.Observable.interval(100).pausable(pauser);
* @param {Observable} pauser The observable sequence used to pause the underlying sequence.
* @returns {Observable} The observable sequence which is paused based upon the pauser.
*/
pausable(pauser?: Observable<boolean>): PausableObservable<T>;
}

export interface PausableObservable<T> extends Observable<T> {
pause(): void;
resume(): void;
}

export interface Observable<T> {
/**
* Pauses the underlying observable sequence based upon the observable sequence which yields true/false,
* and yields the values that were buffered while paused.
* @example
* var pauser = new Rx.Subject();
* var source = Rx.Observable.interval(100).pausableBuffered(pauser);
* @param {Observable} pauser The observable sequence used to pause the underlying sequence.
* @returns {Observable} The observable sequence which is paused based upon the pauser.
*/
pausableBuffered(pauser?: Observable<boolean>): PausableObservable<T>;
}

export interface Observable<T> {
/**
* Attaches a controller to the observable sequence with the ability to queue.
* @example
* var source = Rx.Observable.interval(100).controlled();
* source.request(3); // Reads 3 values
* @param {bool} enableQueue truthy value to determine if values should be queued pending the next request
* @param {Scheduler} scheduler determines how the requests will be scheduled
* @returns {Observable} The observable sequence which only propagates values on request.
*/
controlled(enableQueue?: boolean, scheduler?: IScheduler): ControlledObservable<T>;
}

export interface ControlledObservable<T> extends Observable<T> {
request(numberOfItems?: number): IDisposable;
}

export interface ControlledObservable<T> {
/**
* Attaches a stop and wait observable to the current observable.
Expand All @@ -17,5 +79,15 @@ declare module Rx {
windowed(windowSize: number): Observable<T>;
}

export interface Observable<T> {
/**
* Pipes the existing Observable sequence into a Node.js Stream.
* @param {Stream} dest The destination Node.js stream.
* @returns {Stream} The destination stream.
*/
pipe<TDest>(dest: TDest): TDest;
// TODO: Add link to node.d.ts some where
}

}
declare module "rx.backpressure" { export = Rx; }
Loading