Skip to content

Commit c3bb705

Browse files
committed
feat(reorganize): Move top-level impls under internal directory
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';`
1 parent 207976f commit c3bb705

File tree

399 files changed

+1151
-1143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

399 files changed

+1151
-1143
lines changed

spec/observables/IteratorObservable-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect } from 'chai';
22
import * as Rx from '../../src/Rx';
3-
import { queue } from '../../src/scheduler/queue';
3+
import { queue } from '../../src/internal/scheduler/queue';
44
import { IteratorObservable } from '../../src/internal/observable/IteratorObservable';
55

66
declare const expectObservable;

spec/schedulers/VirtualTimeScheduler-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect } from 'chai';
22
import * as Rx from '../../src/Rx';
3-
import { VirtualAction } from '../../src/scheduler/VirtualTimeScheduler';
3+
import { VirtualAction } from '../../src/internal/scheduler/VirtualTimeScheduler';
44

55
const VirtualTimeScheduler = Rx.VirtualTimeScheduler;
66

spec/util/subscribeToResult-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect } from 'chai';
22
import * as Rx from '../../src/Rx';
33
import { subscribeToResult } from '../../src/util/subscribeToResult';
4-
import { OuterSubscriber } from '../../src/OuterSubscriber';
4+
import { OuterSubscriber } from '../../src/internal/OuterSubscriber';
55
import { $$iterator } from '../../src/symbol/iterator';
66
import $$symbolObservable from 'symbol-observable';
77

src/Rx.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Subject imported before Observable to bypass circular dependency issue since
33
// Subject extends Observable and Observable references Subject in it's
44
// definition
5-
export {Subject, AnonymousSubject} from './Subject';
5+
export {Subject, AnonymousSubject} from './internal/Subject';
66
/* tslint:enable:no-unused-variable */
7-
export {Observable} from './Observable';
7+
export {Observable} from './internal/Observable';
88

99
// statics
1010
/* tslint:disable:no-use-before-declare */
@@ -143,15 +143,15 @@ import './add/operator/zip';
143143
import './add/operator/zipAll';
144144

145145
/* tslint:disable:no-unused-variable */
146-
export {Operator} from './Operator';
147-
export {Observer} from './Observer';
148-
export {Subscription} from './Subscription';
149-
export {Subscriber} from './Subscriber';
150-
export {AsyncSubject} from './AsyncSubject';
151-
export {ReplaySubject} from './ReplaySubject';
152-
export {BehaviorSubject} from './BehaviorSubject';
146+
export {Operator} from './internal/Operator';
147+
export {Observer} from './internal/Observer';
148+
export {Subscription} from './internal/Subscription';
149+
export {Subscriber} from './internal/Subscriber';
150+
export {AsyncSubject} from './internal/AsyncSubject';
151+
export {ReplaySubject} from './internal/ReplaySubject';
152+
export {BehaviorSubject} from './internal/BehaviorSubject';
153153
export {ConnectableObservable} from './internal/observable/ConnectableObservable';
154-
export {Notification} from './Notification';
154+
export {Notification} from './internal/Notification';
155155
export {EmptyError} from './util/EmptyError';
156156
export {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
157157
export {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
@@ -160,18 +160,18 @@ export {UnsubscriptionError} from './util/UnsubscriptionError';
160160
export {TimeInterval} from './internal/patching/operator/timeInterval';
161161
export {Timestamp} from './internal/operators/timestamp';
162162
export {TestScheduler} from './testing/TestScheduler';
163-
export {VirtualTimeScheduler} from './scheduler/VirtualTimeScheduler';
163+
export {VirtualTimeScheduler} from './internal/scheduler/VirtualTimeScheduler';
164164
export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './internal/observable/dom/AjaxObservable';
165165
export { pipe } from './util/pipe';
166166

167-
import { asap } from './scheduler/asap';
168-
import { async } from './scheduler/async';
169-
import { queue } from './scheduler/queue';
170-
import { animationFrame } from './scheduler/animationFrame';
171-
import { AsapScheduler } from './scheduler/AsapScheduler';
172-
import { AsyncScheduler } from './scheduler/AsyncScheduler';
173-
import { QueueScheduler } from './scheduler/QueueScheduler';
174-
import { AnimationFrameScheduler } from './scheduler/AnimationFrameScheduler';
167+
import { asap } from './internal/scheduler/asap';
168+
import { async } from './internal/scheduler/async';
169+
import { queue } from './internal/scheduler/queue';
170+
import { animationFrame } from './internal/scheduler/animationFrame';
171+
import { AsapScheduler } from './internal/scheduler/AsapScheduler';
172+
import { AsyncScheduler } from './internal/scheduler/AsyncScheduler';
173+
import { QueueScheduler } from './internal/scheduler/QueueScheduler';
174+
import { AnimationFrameScheduler } from './internal/scheduler/AnimationFrameScheduler';
175175
import { rxSubscriber } from './symbol/rxSubscriber';
176176
import { iterator } from './symbol/iterator';
177177
import { observable } from './symbol/observable';

src/add/observable/bindCallback.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Observable } from '../../Observable';
1+
import { Observable } from '../../internal/Observable';
22
import { bindCallback as staticBindCallback } from '../../internal/observable/bindCallback';
33

44
Observable.bindCallback = staticBindCallback;
55

6-
declare module '../../Observable' {
6+
declare module '../../internal/Observable' {
77
namespace Observable {
88
export let bindCallback: typeof staticBindCallback;
99
}

src/add/observable/bindNodeCallback.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Observable } from '../../Observable';
1+
import { Observable } from '../../internal/Observable';
22
import { bindNodeCallback as staticBindNodeCallback } from '../../internal/observable/bindNodeCallback';
33

44
Observable.bindNodeCallback = staticBindNodeCallback;
55

6-
declare module '../../Observable' {
6+
declare module '../../internal/Observable' {
77
namespace Observable {
88
export let bindNodeCallback: typeof staticBindNodeCallback;
99
}

src/add/observable/combineLatest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Observable } from '../../Observable';
1+
import { Observable } from '../../internal/Observable';
22
import { combineLatest as combineLatestStatic } from '../../internal/observable/combineLatest';
33

44
Observable.combineLatest = combineLatestStatic;
55

6-
declare module '../../Observable' {
6+
declare module '../../internal/Observable' {
77
namespace Observable {
88
export let combineLatest: typeof combineLatestStatic;
99
}

src/add/observable/concat.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Observable } from '../../Observable';
1+
import { Observable } from '../../internal/Observable';
22
import { concat as concatStatic } from '../../internal/observable/concat';
33

44
Observable.concat = concatStatic;
55

6-
declare module '../../Observable' {
6+
declare module '../../internal/Observable' {
77
namespace Observable {
88
export let concat: typeof concatStatic;
99
}

src/add/observable/defer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Observable } from '../../Observable';
1+
import { Observable } from '../../internal/Observable';
22
import { defer as staticDefer } from '../../internal/observable/defer';
33

44
Observable.defer = staticDefer;
55

6-
declare module '../../Observable' {
6+
declare module '../../internal/Observable' {
77
namespace Observable {
88
export let defer: typeof staticDefer;
99
}

src/add/observable/dom/ajax.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Observable } from '../../../Observable';
1+
import { Observable } from '../../../internal/Observable';
22
import { ajax as staticAjax } from '../../../internal/observable/dom/ajax';
33
import { AjaxCreationMethod } from '../../../internal/observable/dom/AjaxObservable';
44

55
Observable.ajax = staticAjax;
66

7-
declare module '../../../Observable' {
7+
declare module '../../../internal/Observable' {
88
namespace Observable {
99
export let ajax: AjaxCreationMethod;
1010
}

0 commit comments

Comments
 (0)