Skip to content

Commit

Permalink
feat(reorganize): Move top-level impls under internal directory
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Can no longer deep import top-level types such as `rxjs/Observable`, `rxjs/Subject`, `rxjs/ReplaySubject`, et al. All imports should be done directly from `rxjs`, for example: `import \{ Observable, Subject \} from 'rxjs';`
  • Loading branch information
benlesh committed Jan 12, 2018
1 parent 207976f commit c3bb705
Show file tree
Hide file tree
Showing 399 changed files with 1,151 additions and 1,143 deletions.
2 changes: 1 addition & 1 deletion spec/observables/IteratorObservable-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import { queue } from '../../src/scheduler/queue';
import { queue } from '../../src/internal/scheduler/queue';
import { IteratorObservable } from '../../src/internal/observable/IteratorObservable';

declare const expectObservable;
Expand Down
2 changes: 1 addition & 1 deletion spec/schedulers/VirtualTimeScheduler-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import { VirtualAction } from '../../src/scheduler/VirtualTimeScheduler';
import { VirtualAction } from '../../src/internal/scheduler/VirtualTimeScheduler';

const VirtualTimeScheduler = Rx.VirtualTimeScheduler;

Expand Down
2 changes: 1 addition & 1 deletion spec/util/subscribeToResult-spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import { subscribeToResult } from '../../src/util/subscribeToResult';
import { OuterSubscriber } from '../../src/OuterSubscriber';
import { OuterSubscriber } from '../../src/internal/OuterSubscriber';
import { $$iterator } from '../../src/symbol/iterator';
import $$symbolObservable from 'symbol-observable';

Expand Down
38 changes: 19 additions & 19 deletions src/Rx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Subject imported before Observable to bypass circular dependency issue since
// Subject extends Observable and Observable references Subject in it's
// definition
export {Subject, AnonymousSubject} from './Subject';
export {Subject, AnonymousSubject} from './internal/Subject';
/* tslint:enable:no-unused-variable */
export {Observable} from './Observable';
export {Observable} from './internal/Observable';

// statics
/* tslint:disable:no-use-before-declare */
Expand Down Expand Up @@ -143,15 +143,15 @@ import './add/operator/zip';
import './add/operator/zipAll';

/* tslint:disable:no-unused-variable */
export {Operator} from './Operator';
export {Observer} from './Observer';
export {Subscription} from './Subscription';
export {Subscriber} from './Subscriber';
export {AsyncSubject} from './AsyncSubject';
export {ReplaySubject} from './ReplaySubject';
export {BehaviorSubject} from './BehaviorSubject';
export {Operator} from './internal/Operator';
export {Observer} from './internal/Observer';
export {Subscription} from './internal/Subscription';
export {Subscriber} from './internal/Subscriber';
export {AsyncSubject} from './internal/AsyncSubject';
export {ReplaySubject} from './internal/ReplaySubject';
export {BehaviorSubject} from './internal/BehaviorSubject';
export {ConnectableObservable} from './internal/observable/ConnectableObservable';
export {Notification} from './Notification';
export {Notification} from './internal/Notification';
export {EmptyError} from './util/EmptyError';
export {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
export {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
Expand All @@ -160,18 +160,18 @@ export {UnsubscriptionError} from './util/UnsubscriptionError';
export {TimeInterval} from './internal/patching/operator/timeInterval';
export {Timestamp} from './internal/operators/timestamp';
export {TestScheduler} from './testing/TestScheduler';
export {VirtualTimeScheduler} from './scheduler/VirtualTimeScheduler';
export {VirtualTimeScheduler} from './internal/scheduler/VirtualTimeScheduler';
export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './internal/observable/dom/AjaxObservable';
export { pipe } from './util/pipe';

import { asap } from './scheduler/asap';
import { async } from './scheduler/async';
import { queue } from './scheduler/queue';
import { animationFrame } from './scheduler/animationFrame';
import { AsapScheduler } from './scheduler/AsapScheduler';
import { AsyncScheduler } from './scheduler/AsyncScheduler';
import { QueueScheduler } from './scheduler/QueueScheduler';
import { AnimationFrameScheduler } from './scheduler/AnimationFrameScheduler';
import { asap } from './internal/scheduler/asap';
import { async } from './internal/scheduler/async';
import { queue } from './internal/scheduler/queue';
import { animationFrame } from './internal/scheduler/animationFrame';
import { AsapScheduler } from './internal/scheduler/AsapScheduler';
import { AsyncScheduler } from './internal/scheduler/AsyncScheduler';
import { QueueScheduler } from './internal/scheduler/QueueScheduler';
import { AnimationFrameScheduler } from './internal/scheduler/AnimationFrameScheduler';
import { rxSubscriber } from './symbol/rxSubscriber';
import { iterator } from './symbol/iterator';
import { observable } from './symbol/observable';
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/bindCallback.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { bindCallback as staticBindCallback } from '../../internal/observable/bindCallback';

Observable.bindCallback = staticBindCallback;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let bindCallback: typeof staticBindCallback;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/bindNodeCallback.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { bindNodeCallback as staticBindNodeCallback } from '../../internal/observable/bindNodeCallback';

Observable.bindNodeCallback = staticBindNodeCallback;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let bindNodeCallback: typeof staticBindNodeCallback;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/combineLatest.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { combineLatest as combineLatestStatic } from '../../internal/observable/combineLatest';

Observable.combineLatest = combineLatestStatic;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let combineLatest: typeof combineLatestStatic;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/concat.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { concat as concatStatic } from '../../internal/observable/concat';

Observable.concat = concatStatic;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let concat: typeof concatStatic;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/defer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { defer as staticDefer } from '../../internal/observable/defer';

Observable.defer = staticDefer;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let defer: typeof staticDefer;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/dom/ajax.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Observable } from '../../../Observable';
import { Observable } from '../../../internal/Observable';
import { ajax as staticAjax } from '../../../internal/observable/dom/ajax';
import { AjaxCreationMethod } from '../../../internal/observable/dom/AjaxObservable';

Observable.ajax = staticAjax;

declare module '../../../Observable' {
declare module '../../../internal/Observable' {
namespace Observable {
export let ajax: AjaxCreationMethod;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/dom/webSocket.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../../Observable';
import { Observable } from '../../../internal/Observable';
import { webSocket as staticWebSocket } from '../../../internal/observable/dom/webSocket';

Observable.webSocket = staticWebSocket;

declare module '../../../Observable' {
declare module '../../../internal/Observable' {
namespace Observable {
export let webSocket: typeof staticWebSocket;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/empty.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { empty as staticEmpty } from '../../internal/observable/empty';

Observable.empty = staticEmpty;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let empty: typeof staticEmpty;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/forkJoin.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { forkJoin as staticForkJoin } from '../../internal/observable/forkJoin';

Observable.forkJoin = staticForkJoin;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let forkJoin: typeof staticForkJoin;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/from.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { from as staticFrom } from '../../internal/observable/from';

Observable.from = staticFrom;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let from: typeof staticFrom;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/fromEvent.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { fromEvent as staticFromEvent } from '../../internal/observable/fromEvent';

Observable.fromEvent = staticFromEvent;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let fromEvent: typeof staticFromEvent;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/fromEventPattern.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { fromEventPattern as staticFromEventPattern } from '../../internal/observable/fromEventPattern';

Observable.fromEventPattern = staticFromEventPattern;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let fromEventPattern: typeof staticFromEventPattern;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/fromPromise.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { fromPromise as staticFromPromise } from '../../internal/observable/fromPromise';

Observable.fromPromise = staticFromPromise;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let fromPromise: typeof staticFromPromise;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/generate.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { generate as staticGenerate } from '../../internal/observable/generate';

Observable.generate = staticGenerate;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let generate: typeof staticGenerate;
}
Expand Down
2 changes: 1 addition & 1 deletion src/add/observable/if.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { _if } from '../../internal/observable/if';

Observable.if = _if;
4 changes: 2 additions & 2 deletions src/add/observable/interval.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { interval as staticInterval } from '../../internal/observable/interval';

Observable.interval = staticInterval;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let interval: typeof staticInterval;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/merge.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { merge as mergeStatic } from '../../internal/observable/merge';

Observable.merge = mergeStatic;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let merge: typeof mergeStatic;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/never.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { never as staticNever } from '../../internal/observable/never';

Observable.never = staticNever;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let never: typeof staticNever;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/of.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { of as staticOf } from '../../internal/observable/of';

Observable.of = staticOf;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let of: typeof staticOf; //formOf an iceberg!
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/onErrorResumeNext.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { onErrorResumeNext as staticOnErrorResumeNext } from '../../internal/observable/onErrorResumeNext';

Observable.onErrorResumeNext = staticOnErrorResumeNext;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let onErrorResumeNext: typeof staticOnErrorResumeNext;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/pairs.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { pairs as staticPairs } from '../../internal/observable/pairs';

Observable.pairs = staticPairs;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let pairs: typeof staticPairs;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/race.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { race as staticRace } from '../../internal/observable/race';

Observable.race = staticRace;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let race: typeof staticRace;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/range.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { range as staticRange } from '../../internal/observable/range';

Observable.range = staticRange;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let range: typeof staticRange;
}
Expand Down
2 changes: 1 addition & 1 deletion src/add/observable/throw.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { _throw } from '../../internal/observable/throw';

Observable.throw = _throw;
4 changes: 2 additions & 2 deletions src/add/observable/timer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { timer as staticTimer } from '../../internal/observable/timer';

Observable.timer = staticTimer;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let timer: typeof staticTimer;
}
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/using.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Observable } from '../../Observable';
import { Observable } from '../../internal/Observable';
import { using as staticUsing } from '../../internal/observable/using';

Observable.using = staticUsing;

declare module '../../Observable' {
declare module '../../internal/Observable' {
namespace Observable {
export let using: typeof staticUsing;
}
Expand Down
Loading

0 comments on commit c3bb705

Please sign in to comment.