Skip to content

Commit 2d5c3f8

Browse files
committed
feat(reorganize): Move observable implementations under internal directory
- Moves all files from `src/observables` to `src/internal/observables` - Updates some tests to reference those internal files, this is temprorary - Adds an `index.ts` file at root that exports the static observable creation functions BREAKING CHANGE: You can no longer import observables from `rxjs/observable/*`, now you must import them from `rxjs` directly, like so: `import { fromEvent, timer } from 'rxjs';` BREAKING CHANGE: You should no longer deep import custom Observable implementations BREAKING CHANGE: `_throw` is now exported as `throwError` BREAKING CHANGE: `if` is now exported as `iif`
1 parent 7342401 commit 2d5c3f8

File tree

120 files changed

+364
-403
lines changed

Some content is hidden

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

120 files changed

+364
-403
lines changed

spec/exports-spec.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
import { expect } from 'chai';
2-
import { bindCallback } from '../src/observable/bindCallback';
3-
import { bindNodeCallback } from '../src/observable/bindNodeCallback';
4-
import { combineLatest } from '../src/observable/combineLatest';
5-
import { concat } from '../src/observable/concat';
6-
import { defer } from '../src/observable/defer';
7-
import { empty } from '../src/observable/empty';
8-
import { forkJoin } from '../src/observable/forkJoin';
9-
import { from } from '../src/observable/from';
10-
import { fromEvent } from '../src/observable/fromEvent';
11-
import { fromEventPattern } from '../src/observable/fromEventPattern';
12-
import { fromPromise } from '../src/observable/fromPromise';
13-
import { _if } from '../src/observable/if';
14-
import { interval } from '../src/observable/interval';
15-
import { merge } from '../src/observable/merge';
16-
import { never } from '../src/observable/never';
17-
import { of } from '../src/observable/of';
18-
import { onErrorResumeNext } from '../src/observable/onErrorResumeNext';
19-
import { pairs } from '../src/observable/pairs';
20-
import { race } from '../src/observable/race';
21-
import { range } from '../src/observable/range';
22-
import { _throw } from '../src/observable/throw';
23-
import { timer } from '../src/observable/timer';
24-
import { using } from '../src/observable/using';
25-
import { zip } from '../src/observable/zip';
2+
import { bindCallback } from '../src/internal/observable/bindCallback';
3+
import { bindNodeCallback } from '../src/internal/observable/bindNodeCallback';
4+
import { combineLatest } from '../src/internal/observable/combineLatest';
5+
import { concat } from '../src/internal/observable/concat';
6+
import { defer } from '../src/internal/observable/defer';
7+
import { empty } from '../src/internal/observable/empty';
8+
import { forkJoin } from '../src/internal/observable/forkJoin';
9+
import { from } from '../src/internal/observable/from';
10+
import { fromEvent } from '../src/internal/observable/fromEvent';
11+
import { fromEventPattern } from '../src/internal/observable/fromEventPattern';
12+
import { fromPromise } from '../src/internal/observable/fromPromise';
13+
import { _if } from '../src/internal/observable/if';
14+
import { interval } from '../src/internal/observable/interval';
15+
import { merge } from '../src/internal/observable/merge';
16+
import { never } from '../src/internal/observable/never';
17+
import { of } from '../src/internal/observable/of';
18+
import { onErrorResumeNext } from '../src/internal/observable/onErrorResumeNext';
19+
import { pairs } from '../src/internal/observable/pairs';
20+
import { race } from '../src/internal/observable/race';
21+
import { range } from '../src/internal/observable/range';
22+
import { _throw } from '../src/internal/observable/throw';
23+
import { timer } from '../src/internal/observable/timer';
24+
import { using } from '../src/internal/observable/using';
25+
import { zip } from '../src/internal/observable/zip';
2626
import * as Rx from '../src/Rx';
2727

2828
describe('exports', () => {
@@ -121,4 +121,4 @@ describe('exports', () => {
121121
it('should have rxjs/observable/zip', () => {
122122
expect(zip).to.equal(Rx.Observable.zip);
123123
});
124-
});
124+
});

spec/index-spec.ts

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import * as index from '../src/index';
2+
import { expect } from 'chai';
3+
4+
describe('index', () => {
5+
it('should export static observable creator functions', () => {
6+
expect(index.bindCallback).to.exist;
7+
expect(index.bindNodeCallback).to.exist;
8+
expect(index.combineLatest).to.exist;
9+
expect(index.concat).to.exist;
10+
expect(index.defer).to.exist;
11+
expect(index.empty).to.exist;
12+
expect(index.forkJoin).to.exist;
13+
expect(index.from).to.exist;
14+
expect(index.fromEvent).to.exist;
15+
expect(index.fromEventPattern).to.exist;
16+
expect(index.generate).to.exist;
17+
expect(index.iif).to.exist;
18+
expect(index.interval).to.exist;
19+
expect(index.merge).to.exist;
20+
expect(index.never).to.exist;
21+
expect(index.of).to.exist;
22+
expect(index.onErrorResumeNext).to.exist;
23+
expect(index.pairs).to.exist;
24+
expect(index.race).to.exist;
25+
expect(index.range).to.exist;
26+
expect(index.throwError).to.exist;
27+
expect(index.timer).to.exist;
28+
expect(index.using).to.exist;
29+
expect(index.zip).to.exist;
30+
});
31+
});

spec/observables/IteratorObservable-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 { queue } from '../../src/scheduler/queue';
4-
import { IteratorObservable } from '../../src/observable/IteratorObservable';
4+
import { IteratorObservable } from '../../src/internal/observable/IteratorObservable';
55

66
declare const expectObservable;
77
declare const rxTestScheduler: Rx.TestScheduler;

spec/observables/ScalarObservable-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 { ScalarObservable } from '../../src/observable/ScalarObservable';
3+
import { ScalarObservable } from '../../src/internal/observable/ScalarObservable';
44

55
declare const rxTestScheduler: Rx.TestScheduler;
66

spec/observables/SubscribeOnObservable-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 sinon from 'sinon';
33
import * as Rx from '../../src/Rx';
4-
import { SubscribeOnObservable } from '../../src/observable/SubscribeOnObservable';
4+
import { SubscribeOnObservable } from '../../src/internal/observable/SubscribeOnObservable';
55
import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
66

77
declare const hot: typeof marbleTestingSignature.hot;

spec/observables/of-spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { expect } from 'chai';
22
import * as Rx from '../../src/Rx';
3-
import { ArrayObservable } from '../../src/observable/ArrayObservable';
4-
import { ScalarObservable } from '../../src/observable/ScalarObservable';
5-
import { EmptyObservable } from '../../src/observable/EmptyObservable';
3+
import { ArrayObservable } from '../../src/internal/observable/ArrayObservable';
4+
import { ScalarObservable } from '../../src/internal/observable/ScalarObservable';
5+
import { EmptyObservable } from '../../src/internal/observable/EmptyObservable';
66
import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
77

88
declare const { asDiagram };

spec/observables/range-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 sinon from 'sinon';
33
import * as Rx from '../../src/Rx';
4-
import { RangeObservable } from '../../src/observable/RangeObservable';
4+
import { RangeObservable } from '../../src/internal/observable/RangeObservable';
55
import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
66

77
declare const { asDiagram };

spec/observables/throw-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 { ErrorObservable } from '../../src/observable/ErrorObservable';
3+
import { ErrorObservable } from '../../src/internal/observable/ErrorObservable';
44
import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
55

66
declare const { asDiagram };

src/MiscJSDoc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
import { TeardownLogic } from './Subscription';
99
import { Observable } from './Observable';
10-
import './observable/dom/MiscJSDoc';
10+
import './internal/observable/dom/MiscJSDoc';
1111
import { Observer } from './Observer';
1212

1313
/**

src/Notification.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { PartialObserver } from './Observer';
22
import { Observable } from './Observable';
3+
import { empty } from './internal/observable/empty';
4+
import { of } from './internal/observable/of';
5+
import { _throw } from './internal/observable/throw';
36

47
/**
58
* Represents a push-based event or value that an {@link Observable} can emit.
@@ -84,11 +87,11 @@ export class Notification<T> {
8487
const kind = this.kind;
8588
switch (kind) {
8689
case 'N':
87-
return Observable.of(this.value);
90+
return of(this.value);
8891
case 'E':
89-
return Observable.throw(this.error);
92+
return _throw(this.error);
9093
case 'C':
91-
return Observable.empty<T>();
94+
return empty<T>();
9295
}
9396
throw new Error('unexpected notification kind value');
9497
}

0 commit comments

Comments
 (0)