From 6711fe2469cce42cb23d17ace7dd9acce6d66043 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Tue, 6 Feb 2018 12:44:45 -0800 Subject: [PATCH] feat(rxjs): move rxjs/create into rxjs (#3299) Moves all Observable creation functions under the `rxjs` namespace. BREAKING CHANGE: `rxjs/create` items are now exported from `rxjs` --- spec/create/index-spec.ts | 31 ---------------------- spec/index-spec.ts | 27 +++++++++++++++++++ spec/observables/defer-spec.ts | 2 +- spec/observables/empty-spec.ts | 2 +- spec/observables/from-spec.ts | 2 +- spec/observables/interval-spec.ts | 2 +- spec/observables/never-spec.ts | 2 +- spec/observables/onErrorResumeNext-spec.ts | 2 +- spec/observables/pairs-spec.ts | 2 +- spec/observables/range-spec.ts | 2 +- spec/observables/throwError-spec.ts | 2 +- spec/observables/timer-spec.ts | 2 +- src/create/index.ts | 25 ----------------- src/index.ts | 26 ++++++++++++++++++ tsconfig/tsconfig.base.json | 1 - 15 files changed, 63 insertions(+), 67 deletions(-) delete mode 100644 spec/create/index-spec.ts delete mode 100644 src/create/index.ts diff --git a/spec/create/index-spec.ts b/spec/create/index-spec.ts deleted file mode 100644 index b57ec0ecb0..0000000000 --- a/spec/create/index-spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import * as index from '../../src/create/index'; -import { expect } from 'chai'; - -describe('index', () => { - it('should export static observable creator functions', () => { - expect(index.bindCallback).to.exist; - expect(index.bindNodeCallback).to.exist; - expect(index.combineLatest).to.exist; - expect(index.concat).to.exist; - expect(index.defer).to.exist; - expect(index.empty).to.exist; - expect(index.forkJoin).to.exist; - expect(index.from).to.exist; - expect(index.fromEvent).to.exist; - expect(index.fromEventPattern).to.exist; - expect(index.generate).to.exist; - expect(index.iif).to.exist; - expect(index.interval).to.exist; - expect(index.merge).to.exist; - expect(index.never).to.exist; - expect(index.of).to.exist; - expect(index.onErrorResumeNext).to.exist; - expect(index.pairs).to.exist; - expect(index.race).to.exist; - expect(index.range).to.exist; - expect(index.throwError).to.exist; - expect(index.timer).to.exist; - expect(index.using).to.exist; - expect(index.zip).to.exist; - }); -}); diff --git a/spec/index-spec.ts b/spec/index-spec.ts index df6dcc95a5..14cadfbbf5 100644 --- a/spec/index-spec.ts +++ b/spec/index-spec.ts @@ -36,4 +36,31 @@ describe('index', () => { it('should export constants', () => { expect(index.EMPTY).to.exist; }); + + it('should export static observable creator functions', () => { + expect(index.bindCallback).to.exist; + expect(index.bindNodeCallback).to.exist; + expect(index.combineLatest).to.exist; + expect(index.concat).to.exist; + expect(index.defer).to.exist; + expect(index.empty).to.exist; + expect(index.forkJoin).to.exist; + expect(index.from).to.exist; + expect(index.fromEvent).to.exist; + expect(index.fromEventPattern).to.exist; + expect(index.generate).to.exist; + expect(index.iif).to.exist; + expect(index.interval).to.exist; + expect(index.merge).to.exist; + expect(index.never).to.exist; + expect(index.of).to.exist; + expect(index.onErrorResumeNext).to.exist; + expect(index.pairs).to.exist; + expect(index.race).to.exist; + expect(index.range).to.exist; + expect(index.throwError).to.exist; + expect(index.timer).to.exist; + expect(index.using).to.exist; + expect(index.zip).to.exist; + }); }); diff --git a/spec/observables/defer-spec.ts b/spec/observables/defer-spec.ts index 42e309a3ac..16a3fabc30 100644 --- a/spec/observables/defer-spec.ts +++ b/spec/observables/defer-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports -import { defer } from '../../src/create'; +import { defer } from '../../src/'; import { Observable } from '../../src'; declare const asDiagram: any; diff --git a/spec/observables/empty-spec.ts b/spec/observables/empty-spec.ts index 700f30114c..bd450f631a 100644 --- a/spec/observables/empty-spec.ts +++ b/spec/observables/empty-spec.ts @@ -1,5 +1,5 @@ import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports -import { empty } from '../../src/create'; +import { empty } from '../../src/'; import { EMPTY } from '../../src'; import { expect } from 'chai'; diff --git a/spec/observables/from-spec.ts b/spec/observables/from-spec.ts index 955e809bd5..a4a3eacc2e 100644 --- a/spec/observables/from-spec.ts +++ b/spec/observables/from-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { TestScheduler } from '../../src/testing'; import { Observable, asapScheduler, asyncScheduler, Observer } from '../../src'; -import { of, from } from '../../src/create'; +import { of, from } from '../../src/'; // tslint:disable:no-any declare const asDiagram: any; diff --git a/spec/observables/interval-spec.ts b/spec/observables/interval-spec.ts index 36fbe193db..200f404022 100644 --- a/spec/observables/interval-spec.ts +++ b/spec/observables/interval-spec.ts @@ -3,7 +3,7 @@ import * as sinon from 'sinon'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports import { asapScheduler, Observable, animationFrameScheduler, queueScheduler } from '../../src'; import { TestScheduler } from '../../src/testing'; -import { interval } from '../../src/create'; +import { interval } from '../../src/'; declare const asDiagram: any; declare const expectObservable: typeof marbleTestingSignature.expectObservable; diff --git a/spec/observables/never-spec.ts b/spec/observables/never-spec.ts index 4a4710d38a..ee158b095f 100644 --- a/spec/observables/never-spec.ts +++ b/spec/observables/never-spec.ts @@ -1,4 +1,4 @@ -import { never } from '../../src/create'; +import { never } from '../../src/'; import { expect } from 'chai'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports diff --git a/spec/observables/onErrorResumeNext-spec.ts b/spec/observables/onErrorResumeNext-spec.ts index 3f9c8a9e5d..bee293b857 100644 --- a/spec/observables/onErrorResumeNext-spec.ts +++ b/spec/observables/onErrorResumeNext-spec.ts @@ -1,4 +1,4 @@ -import { onErrorResumeNext } from '../../src/create'; +import { onErrorResumeNext } from '../../src/'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports declare const hot: typeof marbleTestingSignature.hot; diff --git a/spec/observables/pairs-spec.ts b/spec/observables/pairs-spec.ts index a7eb22d50c..e088519406 100644 --- a/spec/observables/pairs-spec.ts +++ b/spec/observables/pairs-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports import { TestScheduler } from '../../src/testing'; -import { pairs } from '../../src/create'; +import { pairs } from '../../src/'; declare const asDiagram: any; declare const expectObservable: typeof marbleTestingSignature.expectObservable; diff --git a/spec/observables/range-spec.ts b/spec/observables/range-spec.ts index 1bcbfd2d40..9a65cb959b 100644 --- a/spec/observables/range-spec.ts +++ b/spec/observables/range-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import { Observable, asapScheduler as asap} from '../../src'; -import { range } from '../../src/create'; +import { range } from '../../src/'; import { TestScheduler } from '../../src/testing'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports import { dispatch } from '../../src/internal/observable/range'; diff --git a/spec/observables/throwError-spec.ts b/spec/observables/throwError-spec.ts index 8df27b47d1..e03a6cebe5 100644 --- a/spec/observables/throwError-spec.ts +++ b/spec/observables/throwError-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as Rx from '../../src/Rx'; -import { throwError } from '../../src/create'; +import { throwError } from '../../src/'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports declare const asDiagram: any; diff --git a/spec/observables/timer-spec.ts b/spec/observables/timer-spec.ts index 1343784397..9cbf25319f 100644 --- a/spec/observables/timer-spec.ts +++ b/spec/observables/timer-spec.ts @@ -1,5 +1,5 @@ import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports -import { timer, never, merge } from '../../src/create'; +import { timer, never, merge } from '../../src/'; import { TestScheduler } from '../../src/testing'; import { mergeMap } from '../../src/operators'; diff --git a/src/create/index.ts b/src/create/index.ts deleted file mode 100644 index c456b5a77d..0000000000 --- a/src/create/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* Static observable creation exports */ -export { bindCallback } from '../internal/observable/bindCallback'; -export { bindNodeCallback } from '../internal/observable/bindNodeCallback'; -export { combineLatest } from '../internal/observable/combineLatest'; -export { concat } from '../internal/observable/concat'; -export { defer } from '../internal/observable/defer'; -export { empty } from '../internal/observable/empty'; -export { forkJoin } from '../internal/observable/forkJoin'; -export { from } from '../internal/observable/from'; -export { fromEvent } from '../internal/observable/fromEvent'; -export { fromEventPattern } from '../internal/observable/fromEventPattern'; -export { generate } from '../internal/observable/generate'; -export { _if as iif } from '../internal/observable/if'; -export { interval } from '../internal/observable/interval'; -export { merge } from '../internal/observable/merge'; -export { never } from '../internal/observable/never'; -export { of } from '../internal/observable/of'; -export { onErrorResumeNext } from '../internal/observable/onErrorResumeNext'; -export { pairs } from '../internal/observable/pairs'; -export { race } from '../internal/observable/race'; -export { range } from '../internal/observable/range'; -export { throwError } from '../internal/observable/throwError'; -export { timer } from '../internal/observable/timer'; -export { using } from '../internal/observable/using'; -export { zip } from '../internal/observable/zip'; diff --git a/src/index.ts b/src/index.ts index f5abc3af28..c7c6c75025 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,6 +23,32 @@ export { pipe } from './internal/util/pipe'; export { noop } from './internal/util/noop'; export { identity } from './internal/util/identity'; +/* Static observable creation exports */ +export { bindCallback } from './internal/observable/bindCallback'; +export { bindNodeCallback } from './internal/observable/bindNodeCallback'; +export { combineLatest } from './internal/observable/combineLatest'; +export { concat } from './internal/observable/concat'; +export { defer } from './internal/observable/defer'; +export { empty } from './internal/observable/empty'; +export { forkJoin } from './internal/observable/forkJoin'; +export { from } from './internal/observable/from'; +export { fromEvent } from './internal/observable/fromEvent'; +export { fromEventPattern } from './internal/observable/fromEventPattern'; +export { generate } from './internal/observable/generate'; +export { _if as iif } from './internal/observable/if'; +export { interval } from './internal/observable/interval'; +export { merge } from './internal/observable/merge'; +export { never } from './internal/observable/never'; +export { of } from './internal/observable/of'; +export { onErrorResumeNext } from './internal/observable/onErrorResumeNext'; +export { pairs } from './internal/observable/pairs'; +export { race } from './internal/observable/race'; +export { range } from './internal/observable/range'; +export { throwError } from './internal/observable/throwError'; +export { timer } from './internal/observable/timer'; +export { using } from './internal/observable/using'; +export { zip } from './internal/observable/zip'; + /* Constants */ export { EMPTY } from './internal/observable/empty'; diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index 3971952f5d..8625042672 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -5,7 +5,6 @@ "../dist/src/add/observable/of.ts", "../dist/src/index.ts", "../dist/src/operators/index.ts", - "../dist/src/create/index.ts", "../dist/src/ajax/index.ts", "../dist/src/websocket/index.ts", "../dist/src/testing/index.ts"