Skip to content

Commit

Permalink
refactor(Rx.ts): move Rx.ts to internal (#3400)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: importing from `rxjs/Rx` is no longer available. Upcoming backwards compat solution will allow that
  • Loading branch information
benlesh authored Mar 7, 2018
1 parent 6319f3c commit 7ad2119
Show file tree
Hide file tree
Showing 139 changed files with 382 additions and 382 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"compile_dist_cjs": "tsc -p ./tsconfig/tsconfig.cjs.json",
"compile_dist_esm5": "tsc -p ./tsconfig/tsconfig.esm5.json",
"compile_dist_esm2015": "tsc -p ./tsconfig/tsconfig.esm2015.json",
"compile_dist_esm2015_for_docs": "tsc ./dist/src/Rx.ts ./dist/src/add/observable/of.ts ./dist/src/MiscJSDoc.ts -m es2015 --sourceMap --outDir ./dist/es6 --target es2015 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
"compile_dist_esm2015_for_docs": "tsc ./dist/src/internal/Rx.ts ./dist/src/add/observable/of.ts ./dist/src/MiscJSDoc.ts -m es2015 --sourceMap --outDir ./dist/es6 --target es2015 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node",
"compile_dist_esm5_for_rollup": "tsc -p ./tsconfig/tsconfig.esm5.rollup.json",
"copy_sources": "mkdirp dist && shx cp -r ./src/ ./dist/src",
"decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..",
Expand Down
2 changes: 1 addition & 1 deletion spec/Notification-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';
import { expectObservable } from './helpers/marble-testing';

const Notification = Rx.Notification;
Expand Down
2 changes: 1 addition & 1 deletion spec/Observable-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';
import { Observer, TeardownLogic } from '../src/internal/types';
import { cold, expectObservable, expectSubscriptions } from './helpers/marble-testing';
import { map } from '../src/internal/operators/map';
Expand Down
2 changes: 1 addition & 1 deletion spec/Scheduler-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';

const Scheduler = Rx.Scheduler;

Expand Down
2 changes: 1 addition & 1 deletion spec/Subject-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';
import { hot, expectObservable } from './helpers/marble-testing';

const Subject = Rx.Subject;
Expand Down
2 changes: 1 addition & 1 deletion spec/Subscriber-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';

const Subscriber = Rx.Subscriber;

Expand Down
2 changes: 1 addition & 1 deletion spec/Subscription-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';

const Observable = Rx.Observable;
const Subscription = Rx.Subscription;
Expand Down
2 changes: 1 addition & 1 deletion spec/exports-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { throwError } from '../src/internal/observable/throwError';
import { timer } from '../src/internal/observable/timer';
import { using } from '../src/internal/observable/using';
import { zip } from '../src/internal/observable/zip';
import * as Rx from '../src/Rx';
import * as Rx from '../src/internal/Rx';

describe('exports', () => {
it('should have rxjs/observable/bindCallback', () => {
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/test-helper.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
declare const global: any;

import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { ObservableInput } from '../../src/internal/types';
import { root } from '../../src/internal/util/root';
import { $$iterator } from '../../src/internal/symbol/iterator';
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/testScheduler-ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as _ from 'lodash';
import * as chai from 'chai';
import * as sinonChai from 'sinon-chai';

import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import * as marble from './marble-testing';

//tslint:disable:no-var-requires no-require-imports
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/IteratorObservable-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { queue } from '../../src/internal/scheduler/queue';
import { fromIterable } from '../../src/internal/observable/fromIterable';

Expand Down
2 changes: 1 addition & 1 deletion spec/observables/ScalarObservable-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { scalar } from '../../src/internal/observable/scalar';

declare const rxTestScheduler: Rx.TestScheduler;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/SubscribeOnObservable-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { SubscribeOnObservable } from '../../src/internal/observable/SubscribeOnObservable';
import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

Expand Down
2 changes: 1 addition & 1 deletion spec/observables/bindCallback-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';

declare const rxTestScheduler: Rx.TestScheduler;
const Observable = Rx.Observable;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/combineLatest-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare const type: Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/concat-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { lowerCaseO } from '../helpers/test-helper';
import { hot, cold, emptySubs, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

Expand Down
2 changes: 1 addition & 1 deletion spec/observables/dom/ajax-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import * as Rx from '../../../src/Rx';
import * as Rx from '../../../src/internal/Rx';
import { root } from '../../../src/internal/util/root';

declare const global: any;
Expand Down
4 changes: 2 additions & 2 deletions spec/observables/dom/webSocket-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import * as Rx from '../../../src/Rx';
import * as Rx from '../../../src/internal/Rx';

declare const __root__: any;

Expand Down Expand Up @@ -705,4 +705,4 @@ class MockWebSocket {
}
}
}
}
}
2 changes: 1 addition & 1 deletion spec/observables/from-promise-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';

declare const process: any;
const Observable = Rx.Observable;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/generate-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import '../../src/add/observable/generate';
import { TestScheduler } from '../../src/internal/testing/TestScheduler';
import { expect } from 'chai';
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/merge-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { lowerCaseO } from '../helpers/test-helper';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

Expand Down
2 changes: 1 addition & 1 deletion spec/observables/of-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { empty } from '../../src/internal/observable/empty';
import { expectObservable } from '../helpers/marble-testing';
declare const asDiagram: any;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/race-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

const Observable = Rx.Observable;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/using-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';

const Observable = Rx.Observable;
const Subscription = Rx.Subscription;
Expand Down
2 changes: 1 addition & 1 deletion spec/observables/zip-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare const type: Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/audit-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/auditTime-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/buffer-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
4 changes: 2 additions & 2 deletions spec/operators/bufferCount-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { expect } from 'chai';
import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

Expand Down Expand Up @@ -140,4 +140,4 @@ describe('Observable.prototype.bufferCount', () => {
expectObservable(e1.bufferCount(2, 3)).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});
});
});
4 changes: 2 additions & 2 deletions spec/operators/bufferTime-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing';

declare const asDiagram: Function;
Expand Down Expand Up @@ -321,4 +321,4 @@ describe('Observable.prototype.bufferTime', () => {

expectObservable(source).toBe(expected, values);
});
});
});
2 changes: 1 addition & 1 deletion spec/operators/bufferToggle-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/bufferWhen-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/catch-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import * as sinon from 'sinon';
import { createObservableInputs } from '../helpers/test-helper';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/combineAll-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/combineLatest-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/concat-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/concatAll-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';
import { throwError } from '../../src/internal/observable/throwError';

Expand Down
2 changes: 1 addition & 1 deletion spec/operators/concatMap-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/concatMapTo-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/count-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/debounce-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare const type;
Expand Down
2 changes: 1 addition & 1 deletion spec/operators/debounceTime-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';
import { VirtualTimeScheduler } from '../../src/internal/scheduler/VirtualTimeScheduler';

Expand Down
2 changes: 1 addition & 1 deletion spec/operators/defaultIfEmpty-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
4 changes: 2 additions & 2 deletions spec/operators/delay-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing';

declare const asDiagram: Function;
Expand Down Expand Up @@ -143,4 +143,4 @@ describe('Observable.prototype.delay', () => {

expectObservable(result).toBe(expected);
});
});
});
4 changes: 2 additions & 2 deletions spec/operators/delayWhen-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';
import { expect } from 'chai';

Expand Down Expand Up @@ -225,4 +225,4 @@ describe('Observable.prototype.delayWhen', () => {
expect(next).to.be.true;
expect(complete).to.be.true;
});
});
});
4 changes: 2 additions & 2 deletions spec/operators/dematerialize-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down Expand Up @@ -162,4 +162,4 @@ describe('Observable.prototype.dematerialize', () => {
expectObservable(e1.dematerialize()).toBe(expected);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});
});
});
4 changes: 2 additions & 2 deletions spec/operators/distinct-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

const Observable = Rx.Observable;
Expand Down Expand Up @@ -212,4 +212,4 @@ describe('Observable.prototype.distinct', () => {
expectSubscriptions(e1.subscriptions).toBe(e1subs);
expectSubscriptions(e2.subscriptions).toBe(e2subs);
});
});
});
2 changes: 1 addition & 1 deletion spec/operators/distinctUntilChanged-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down
4 changes: 2 additions & 2 deletions spec/operators/distinctUntilKeyChanged-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Rx from '../../src/Rx';
import * as Rx from '../../src/internal/Rx';
import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';

declare function asDiagram(arg: string): Function;
Expand Down Expand Up @@ -223,4 +223,4 @@ describe('Observable.prototype.distinctUntilKeyChanged', () => {
expectObservable((<any>e1).distinctUntilKeyChanged('val', selector)).toBe(expected, values);
expectSubscriptions(e1.subscriptions).toBe(e1subs);
});
});
});
Loading

0 comments on commit 7ad2119

Please sign in to comment.