From 70058cd582937c7a810b6a266e19e5a4e0fc5594 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 11 Jan 2018 21:52:55 -0800 Subject: [PATCH] feat(reorganization): internal utils hidden BREAKING CHANGE: Many internal use utilities like `isArray` are now hidden under `rxjs/internal`, they are implementation details and should not be used. --- spec/helpers/test-helper.ts | 2 +- spec/observables/dom/ajax-spec.ts | 2 +- spec/observables/fromEventPattern-spec.ts | 2 +- spec/symbol/observable-spec.ts | 2 +- spec/symbol/rxSubscriber-spec.ts | 2 +- spec/util/Immediate-spec.ts | 2 +- spec/util/assign-spec.ts | 4 ++-- spec/util/pipe-spec.ts | 2 +- spec/util/subscribeToResult-spec.ts | 2 +- spec/util/toSubscriber-spec.ts | 2 +- src/Rx.ts | 12 ++++++------ src/index.ts | 6 +++--- src/internal/BehaviorSubject.ts | 2 +- src/internal/Observable.ts | 6 +++--- src/internal/ReplaySubject.ts | 2 +- src/internal/Subject.ts | 2 +- src/internal/Subscriber.ts | 2 +- src/internal/Subscription.ts | 12 ++++++------ src/internal/observable/ArrayObservable.ts | 2 +- src/internal/observable/BoundCallbackObservable.ts | 4 ++-- .../observable/BoundNodeCallbackObservable.ts | 4 ++-- src/internal/observable/DeferObservable.ts | 2 +- src/internal/observable/ForkJoinObservable.ts | 4 ++-- src/internal/observable/FromEventObservable.ts | 6 +++--- .../observable/FromEventPatternObservable.ts | 2 +- src/internal/observable/FromObservable.ts | 6 +++--- src/internal/observable/GenerateObservable.ts | 2 +- src/internal/observable/IfObservable.ts | 2 +- src/internal/observable/IntervalObservable.ts | 2 +- src/internal/observable/IteratorObservable.ts | 2 +- src/internal/observable/NeverObservable.ts | 2 +- src/internal/observable/PromiseObservable.ts | 2 +- src/internal/observable/SubscribeOnObservable.ts | 2 +- src/internal/observable/TimerObservable.ts | 6 +++--- src/internal/observable/UsingObservable.ts | 2 +- src/internal/observable/combineLatest.ts | 6 +++--- src/internal/observable/concat.ts | 2 +- src/internal/observable/dom/AjaxObservable.ts | 6 +++--- src/internal/observable/dom/WebSocketSubject.ts | 8 ++++---- src/internal/observable/merge.ts | 2 +- src/internal/observable/onErrorResumeNext.ts | 4 ++-- src/internal/observable/race.ts | 4 ++-- src/internal/observable/zip.ts | 4 ++-- src/internal/operators/audit.ts | 6 +++--- src/internal/operators/buffer.ts | 2 +- src/internal/operators/bufferTime.ts | 2 +- src/internal/operators/bufferToggle.ts | 2 +- src/internal/operators/bufferWhen.ts | 6 +++--- src/internal/operators/catchError.ts | 2 +- src/internal/operators/debounce.ts | 2 +- src/internal/operators/delay.ts | 2 +- src/internal/operators/delayWhen.ts | 2 +- src/internal/operators/distinct.ts | 2 +- src/internal/operators/distinctUntilChanged.ts | 4 ++-- src/internal/operators/elementAt.ts | 2 +- src/internal/operators/exhaust.ts | 2 +- src/internal/operators/exhaustMap.ts | 2 +- src/internal/operators/expand.ts | 6 +++--- src/internal/operators/first.ts | 2 +- src/internal/operators/last.ts | 2 +- src/internal/operators/mergeAll.ts | 2 +- src/internal/operators/mergeMap.ts | 2 +- src/internal/operators/mergeMapTo.ts | 2 +- src/internal/operators/mergeScan.ts | 6 +++--- src/internal/operators/onErrorResumeNext.ts | 4 ++-- src/internal/operators/partition.ts | 2 +- src/internal/operators/race.ts | 2 +- src/internal/operators/reduce.ts | 2 +- src/internal/operators/repeatWhen.ts | 6 +++--- src/internal/operators/retryWhen.ts | 6 +++--- src/internal/operators/sample.ts | 2 +- src/internal/operators/sequenceEqual.ts | 4 ++-- src/internal/operators/single.ts | 2 +- src/internal/operators/skipLast.ts | 2 +- src/internal/operators/skipUntil.ts | 2 +- src/internal/operators/startWith.ts | 2 +- src/internal/operators/switchAll.ts | 2 +- src/internal/operators/switchMap.ts | 2 +- src/internal/operators/switchMapTo.ts | 2 +- src/internal/operators/take.ts | 2 +- src/internal/operators/takeLast.ts | 2 +- src/internal/operators/takeUntil.ts | 2 +- src/internal/operators/tap.ts | 4 ++-- src/internal/operators/throttle.ts | 2 +- src/internal/operators/timeout.ts | 4 ++-- src/internal/operators/timeoutWith.ts | 4 ++-- src/internal/operators/window.ts | 2 +- src/internal/operators/windowTime.ts | 4 ++-- src/internal/operators/windowToggle.ts | 6 +++--- src/internal/operators/windowWhen.ts | 6 +++--- src/internal/operators/withLatestFrom.ts | 2 +- src/internal/patching/operator/bufferTime.ts | 2 +- src/internal/patching/operator/combineLatest.ts | 2 +- src/internal/patching/operator/windowTime.ts | 4 ++-- src/internal/scheduler/AnimationFrameAction.ts | 2 +- src/internal/scheduler/AsapAction.ts | 2 +- src/internal/scheduler/AsyncAction.ts | 2 +- src/internal/symbol/iterator.ts | 2 +- src/internal/symbol/observable.ts | 2 +- src/internal/symbol/rxSubscriber.ts | 2 +- src/internal/testing/ColdObservable.ts | 2 +- src/internal/testing/HotObservable.ts | 2 +- src/{ => internal}/util/AnimationFrame.ts | 0 src/{ => internal}/util/ArgumentOutOfRangeError.ts | 0 src/{ => internal}/util/EmptyError.ts | 0 src/{ => internal}/util/Immediate.ts | 0 src/{ => internal}/util/ObjectUnsubscribedError.ts | 0 src/{ => internal}/util/TimeoutError.ts | 0 src/{ => internal}/util/UnsubscriptionError.ts | 0 src/{ => internal}/util/applyMixins.ts | 0 src/{ => internal}/util/assign.ts | 0 src/{ => internal}/util/errorObject.ts | 0 src/{ => internal}/util/identity.ts | 0 src/{ => internal}/util/isArray.ts | 0 src/{ => internal}/util/isArrayLike.ts | 0 src/{ => internal}/util/isDate.ts | 0 src/{ => internal}/util/isFunction.ts | 0 src/{ => internal}/util/isNumeric.ts | 0 src/{ => internal}/util/isObject.ts | 0 src/{ => internal}/util/isPromise.ts | 0 src/{ => internal}/util/isScheduler.ts | 2 +- src/{ => internal}/util/noop.ts | 0 src/{ => internal}/util/not.ts | 0 src/{ => internal}/util/pipe.ts | 2 +- src/{ => internal}/util/root.ts | 0 src/{ => internal}/util/subscribeToResult.ts | 14 +++++++------- src/{ => internal}/util/toSubscriber.ts | 6 +++--- src/{ => internal}/util/tryCatch.ts | 0 128 files changed, 172 insertions(+), 172 deletions(-) rename src/{ => internal}/util/AnimationFrame.ts (100%) rename src/{ => internal}/util/ArgumentOutOfRangeError.ts (100%) rename src/{ => internal}/util/EmptyError.ts (100%) rename src/{ => internal}/util/Immediate.ts (100%) rename src/{ => internal}/util/ObjectUnsubscribedError.ts (100%) rename src/{ => internal}/util/TimeoutError.ts (100%) rename src/{ => internal}/util/UnsubscriptionError.ts (100%) rename src/{ => internal}/util/applyMixins.ts (100%) rename src/{ => internal}/util/assign.ts (100%) rename src/{ => internal}/util/errorObject.ts (100%) rename src/{ => internal}/util/identity.ts (100%) rename src/{ => internal}/util/isArray.ts (100%) rename src/{ => internal}/util/isArrayLike.ts (100%) rename src/{ => internal}/util/isDate.ts (100%) rename src/{ => internal}/util/isFunction.ts (100%) rename src/{ => internal}/util/isNumeric.ts (100%) rename src/{ => internal}/util/isObject.ts (100%) rename src/{ => internal}/util/isPromise.ts (100%) rename src/{ => internal}/util/isScheduler.ts (71%) rename src/{ => internal}/util/noop.ts (100%) rename src/{ => internal}/util/not.ts (100%) rename src/{ => internal}/util/pipe.ts (97%) rename src/{ => internal}/util/root.ts (100%) rename src/{ => internal}/util/subscribeToResult.ts (85%) rename src/{ => internal}/util/toSubscriber.ts (71%) rename src/{ => internal}/util/tryCatch.ts (100%) diff --git a/spec/helpers/test-helper.ts b/spec/helpers/test-helper.ts index 661f39a511..a1523a50b2 100644 --- a/spec/helpers/test-helper.ts +++ b/spec/helpers/test-helper.ts @@ -2,7 +2,7 @@ declare const global: any; import * as Rx from '../../src/Rx'; import { ObservableInput } from '../../src/Observable'; -import { root } from '../../src/util/root'; +import { root } from '../../src/internal/util/root'; import { $$iterator } from '../../src/internal/symbol/iterator'; import $$symbolObservable from 'symbol-observable'; diff --git a/spec/observables/dom/ajax-spec.ts b/spec/observables/dom/ajax-spec.ts index 8ef53dc638..d865f11453 100644 --- a/spec/observables/dom/ajax-spec.ts +++ b/spec/observables/dom/ajax-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import * as Rx from '../../../src/Rx'; -import { root } from '../../../src/util/root'; +import { root } from '../../../src/internal/util/root'; declare const global: any; diff --git a/spec/observables/fromEventPattern-spec.ts b/spec/observables/fromEventPattern-spec.ts index 2f71e0beea..a0f87d9edd 100644 --- a/spec/observables/fromEventPattern-spec.ts +++ b/spec/observables/fromEventPattern-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import * as Rx from '../../src/Rx'; -import { noop } from '../../src/util/noop'; +import { noop } from '../../src/internal/util/noop'; import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports declare const { asDiagram }; diff --git a/spec/symbol/observable-spec.ts b/spec/symbol/observable-spec.ts index d9b771e22b..62b789be1a 100644 --- a/spec/symbol/observable-spec.ts +++ b/spec/symbol/observable-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import $$symbolObservable from 'symbol-observable'; -import { root } from '../../src/util/root'; +import { root } from '../../src/internal/util/root'; import { getSymbolObservable } from '../../src/internal/symbol/observable'; describe('observable symbol', () => { diff --git a/spec/symbol/rxSubscriber-spec.ts b/spec/symbol/rxSubscriber-spec.ts index 61fd23122c..cf52a04c82 100644 --- a/spec/symbol/rxSubscriber-spec.ts +++ b/spec/symbol/rxSubscriber-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { root } from '../../src/util/root'; +import { root } from '../../src/internal/util/root'; import {$$rxSubscriber} from '../../src/internal/symbol/rxSubscriber'; describe('rxSubscriber symbol', () => { diff --git a/spec/util/Immediate-spec.ts b/spec/util/Immediate-spec.ts index e95200fd04..22cc7bd20a 100644 --- a/spec/util/Immediate-spec.ts +++ b/spec/util/Immediate-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { Immediate } from '../../src/util/Immediate'; +import { Immediate } from '../../src/internal/util/Immediate'; describe('Immediate', () => { it('should schedule on the next microtask', (done) => { diff --git a/spec/util/assign-spec.ts b/spec/util/assign-spec.ts index 34c735f715..833bd9ab89 100644 --- a/spec/util/assign-spec.ts +++ b/spec/util/assign-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { assign, getAssign, assignImpl } from '../../src/util/assign'; +import { assign, getAssign, assignImpl } from '../../src/internal/util/assign'; describe('assign', () => { it('should exist', () => { @@ -46,4 +46,4 @@ describe('getAssign', () => { const result = getAssign({ Object: { assign: FAKE } }); expect(result).to.equal(FAKE); }); -}); \ No newline at end of file +}); diff --git a/spec/util/pipe-spec.ts b/spec/util/pipe-spec.ts index 755ef3c76a..bc2542d1f5 100644 --- a/spec/util/pipe-spec.ts +++ b/spec/util/pipe-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { pipe } from '../../src/util/pipe'; +import { pipe } from '../../src/internal/util/pipe'; describe('pipe', () => { it('should exist', () => { diff --git a/spec/util/subscribeToResult-spec.ts b/spec/util/subscribeToResult-spec.ts index 34d24edafa..5c1bed0268 100644 --- a/spec/util/subscribeToResult-spec.ts +++ b/spec/util/subscribeToResult-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as Rx from '../../src/Rx'; -import { subscribeToResult } from '../../src/util/subscribeToResult'; +import { subscribeToResult } from '../../src/internal/util/subscribeToResult'; import { OuterSubscriber } from '../../src/internal/OuterSubscriber'; import { $$iterator } from '../../src/internal/symbol/iterator'; import $$symbolObservable from 'symbol-observable'; diff --git a/spec/util/toSubscriber-spec.ts b/spec/util/toSubscriber-spec.ts index c285bc56f6..6ce29c3d66 100644 --- a/spec/util/toSubscriber-spec.ts +++ b/spec/util/toSubscriber-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { toSubscriber } from '../../src/util/toSubscriber'; +import { toSubscriber } from '../../src/internal/util/toSubscriber'; describe('toSubscriber', () => { it('should not be closed when other subscriber created with no arguments completes', () => { diff --git a/src/Rx.ts b/src/Rx.ts index bd551e502f..5c128c12ac 100644 --- a/src/Rx.ts +++ b/src/Rx.ts @@ -152,17 +152,17 @@ export {ReplaySubject} from './internal/ReplaySubject'; export {BehaviorSubject} from './internal/BehaviorSubject'; export {ConnectableObservable} from './internal/observable/ConnectableObservable'; export {Notification} from './internal/Notification'; -export {EmptyError} from './util/EmptyError'; -export {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError'; -export {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError'; -export {TimeoutError} from './util/TimeoutError'; -export {UnsubscriptionError} from './util/UnsubscriptionError'; +export {EmptyError} from './internal/util/EmptyError'; +export {ArgumentOutOfRangeError} from './internal/util/ArgumentOutOfRangeError'; +export {ObjectUnsubscribedError} from './internal/util/ObjectUnsubscribedError'; +export {TimeoutError} from './internal/util/TimeoutError'; +export {UnsubscriptionError} from './internal/util/UnsubscriptionError'; export {TimeInterval} from './internal/patching/operator/timeInterval'; export {Timestamp} from './internal/operators/timestamp'; export {TestScheduler} from './internal/testing/TestScheduler'; export {VirtualTimeScheduler} from './internal/scheduler/VirtualTimeScheduler'; export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './internal/observable/dom/AjaxObservable'; -export { pipe } from './util/pipe'; +export { pipe } from './internal/util/pipe'; import { asap } from './internal/scheduler/asap'; import { async } from './internal/scheduler/async'; diff --git a/src/index.ts b/src/index.ts index 5d770537ab..ffabc1e17d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,9 +19,9 @@ export { Subscription } from './internal/Subscription'; export { Notification } from './internal/Notification'; /* Utils */ -export { pipe } from './util/pipe'; -export { noop } from './util/noop'; -export { identity } from './util/identity'; +export { pipe } from './internal/util/pipe'; +export { noop } from './internal/util/noop'; +export { identity } from './internal/util/identity'; /* Types */ export * from './internal/types'; diff --git a/src/internal/BehaviorSubject.ts b/src/internal/BehaviorSubject.ts index a80960af64..3b4a2398fc 100644 --- a/src/internal/BehaviorSubject.ts +++ b/src/internal/BehaviorSubject.ts @@ -1,7 +1,7 @@ import { Subject } from './Subject'; import { Subscriber } from './Subscriber'; import { Subscription, ISubscription } from './Subscription'; -import { ObjectUnsubscribedError } from '../util/ObjectUnsubscribedError'; +import { ObjectUnsubscribedError } from './util/ObjectUnsubscribedError'; /** * @class BehaviorSubject diff --git a/src/internal/Observable.ts b/src/internal/Observable.ts index b19ffacafe..16d2410bcb 100644 --- a/src/internal/Observable.ts +++ b/src/internal/Observable.ts @@ -2,13 +2,13 @@ import { PartialObserver } from './Observer'; import { Operator } from './Operator'; import { Subscriber } from './Subscriber'; import { Subscription, AnonymousSubscription, TeardownLogic } from './Subscription'; -import { root } from '../util/root'; -import { toSubscriber } from '../util/toSubscriber'; +import { root } from './util/root'; +import { toSubscriber } from './util/toSubscriber'; import { IfObservable } from './observable/IfObservable'; import { ErrorObservable } from './observable/ErrorObservable'; import { observable as Symbol_observable } from '../internal/symbol/observable'; import { OperatorFunction } from '../internal/types'; -import { pipeFromArray } from '../util/pipe'; +import { pipeFromArray } from './util/pipe'; export interface Subscribable { subscribe(observerOrNext?: PartialObserver | ((value: T) => void), diff --git a/src/internal/ReplaySubject.ts b/src/internal/ReplaySubject.ts index fee21c8576..862633b392 100644 --- a/src/internal/ReplaySubject.ts +++ b/src/internal/ReplaySubject.ts @@ -4,7 +4,7 @@ import { queue } from './scheduler/queue'; import { Subscriber } from './Subscriber'; import { Subscription } from './Subscription'; import { ObserveOnSubscriber } from './operators/observeOn'; -import { ObjectUnsubscribedError } from '../util/ObjectUnsubscribedError'; +import { ObjectUnsubscribedError } from './util/ObjectUnsubscribedError'; import { SubjectSubscription } from './SubjectSubscription'; /** * @class ReplaySubject diff --git a/src/internal/Subject.ts b/src/internal/Subject.ts index 8e35b55c28..e00a005b94 100644 --- a/src/internal/Subject.ts +++ b/src/internal/Subject.ts @@ -3,7 +3,7 @@ import { Observer } from './Observer'; import { Observable } from './Observable'; import { Subscriber } from './Subscriber'; import { ISubscription, Subscription, TeardownLogic } from './Subscription'; -import { ObjectUnsubscribedError } from '../util/ObjectUnsubscribedError'; +import { ObjectUnsubscribedError } from './util/ObjectUnsubscribedError'; import { SubjectSubscription } from './SubjectSubscription'; import { rxSubscriber as rxSubscriberSymbol } from '../internal/symbol/rxSubscriber'; diff --git a/src/internal/Subscriber.ts b/src/internal/Subscriber.ts index 4077c1bc2e..7c569021ed 100644 --- a/src/internal/Subscriber.ts +++ b/src/internal/Subscriber.ts @@ -1,4 +1,4 @@ -import { isFunction } from '../util/isFunction'; +import { isFunction } from './util/isFunction'; import { Observer, PartialObserver, empty as emptyObserver } from './Observer'; import { Subscription } from './Subscription'; import { rxSubscriber as rxSubscriberSymbol } from '../internal/symbol/rxSubscriber'; diff --git a/src/internal/Subscription.ts b/src/internal/Subscription.ts index 5048962685..6dd7d3258b 100644 --- a/src/internal/Subscription.ts +++ b/src/internal/Subscription.ts @@ -1,9 +1,9 @@ -import { isArray } from '../util/isArray'; -import { isObject } from '../util/isObject'; -import { isFunction } from '../util/isFunction'; -import { tryCatch } from '../util/tryCatch'; -import { errorObject } from '../util/errorObject'; -import { UnsubscriptionError } from '../util/UnsubscriptionError'; +import { isArray } from './util/isArray'; +import { isObject } from './util/isObject'; +import { isFunction } from './util/isFunction'; +import { tryCatch } from './util/tryCatch'; +import { errorObject } from './util/errorObject'; +import { UnsubscriptionError } from './util/UnsubscriptionError'; export interface AnonymousSubscription { unsubscribe(): void; diff --git a/src/internal/observable/ArrayObservable.ts b/src/internal/observable/ArrayObservable.ts index 65a208455b..e2b2f80fd7 100644 --- a/src/internal/observable/ArrayObservable.ts +++ b/src/internal/observable/ArrayObservable.ts @@ -3,7 +3,7 @@ import { Observable } from '../Observable'; import { ScalarObservable } from './ScalarObservable'; import { EmptyObservable } from './EmptyObservable'; import { Subscriber } from '../Subscriber'; -import { isScheduler } from '../../util/isScheduler'; +import { isScheduler } from '..//util/isScheduler'; import { TeardownLogic } from '../Subscription'; /** diff --git a/src/internal/observable/BoundCallbackObservable.ts b/src/internal/observable/BoundCallbackObservable.ts index cafd9853e6..45cd962043 100644 --- a/src/internal/observable/BoundCallbackObservable.ts +++ b/src/internal/observable/BoundCallbackObservable.ts @@ -2,8 +2,8 @@ import { Observable } from '../Observable'; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { IScheduler } from '../Scheduler'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { AsyncSubject } from '../../internal/AsyncSubject'; /** diff --git a/src/internal/observable/BoundNodeCallbackObservable.ts b/src/internal/observable/BoundNodeCallbackObservable.ts index c10e750f72..1d76887762 100644 --- a/src/internal/observable/BoundNodeCallbackObservable.ts +++ b/src/internal/observable/BoundNodeCallbackObservable.ts @@ -3,8 +3,8 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { IScheduler } from '../Scheduler'; import { Action } from '../scheduler/Action'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { AsyncSubject } from '../../internal/AsyncSubject'; /** diff --git a/src/internal/observable/DeferObservable.ts b/src/internal/observable/DeferObservable.ts index 4a0fdae40c..346cacd040 100644 --- a/src/internal/observable/DeferObservable.ts +++ b/src/internal/observable/DeferObservable.ts @@ -2,7 +2,7 @@ import { Observable, SubscribableOrPromise } from '../Observable'; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; /** * We need this JSDoc comment for affecting ESDoc. diff --git a/src/internal/observable/ForkJoinObservable.ts b/src/internal/observable/ForkJoinObservable.ts index 60b56006eb..aaaaa3dde3 100644 --- a/src/internal/observable/ForkJoinObservable.ts +++ b/src/internal/observable/ForkJoinObservable.ts @@ -2,9 +2,9 @@ import { Observable, SubscribableOrPromise } from '../Observable'; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { EmptyObservable } from './EmptyObservable'; -import { isArray } from '../../util/isArray'; +import { isArray } from '..//util/isArray'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; diff --git a/src/internal/observable/FromEventObservable.ts b/src/internal/observable/FromEventObservable.ts index f4a0e2a037..9dc6102c52 100644 --- a/src/internal/observable/FromEventObservable.ts +++ b/src/internal/observable/FromEventObservable.ts @@ -1,7 +1,7 @@ import { Observable } from '../Observable'; -import { tryCatch } from '../../util/tryCatch'; -import { isFunction } from '../../util/isFunction'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { isFunction } from '..//util/isFunction'; +import { errorObject } from '..//util/errorObject'; import { Subscription } from '../Subscription'; import { Subscriber } from '../Subscriber'; diff --git a/src/internal/observable/FromEventPatternObservable.ts b/src/internal/observable/FromEventPatternObservable.ts index d0523f00ce..a2dc826e65 100644 --- a/src/internal/observable/FromEventPatternObservable.ts +++ b/src/internal/observable/FromEventPatternObservable.ts @@ -1,4 +1,4 @@ -import { isFunction } from '../../util/isFunction'; +import { isFunction } from '..//util/isFunction'; import { Observable } from '../Observable'; import { Subscription } from '../Subscription'; import { Subscriber } from '../Subscriber'; diff --git a/src/internal/observable/FromObservable.ts b/src/internal/observable/FromObservable.ts index ea0ff112b9..290673d2e0 100644 --- a/src/internal/observable/FromObservable.ts +++ b/src/internal/observable/FromObservable.ts @@ -1,6 +1,6 @@ -import { isArray } from '../../util/isArray'; -import { isArrayLike } from '../../util/isArrayLike'; -import { isPromise } from '../../util/isPromise'; +import { isArray } from '..//util/isArray'; +import { isArrayLike } from '..//util/isArrayLike'; +import { isPromise } from '..//util/isPromise'; import { PromiseObservable } from './PromiseObservable'; import { IteratorObservable } from './IteratorObservable'; import { ArrayObservable } from './ArrayObservable'; diff --git a/src/internal/observable/GenerateObservable.ts b/src/internal/observable/GenerateObservable.ts index 6ab464bbd7..2aa53d4649 100644 --- a/src/internal/observable/GenerateObservable.ts +++ b/src/internal/observable/GenerateObservable.ts @@ -3,7 +3,7 @@ import { Action } from '../scheduler/Action'; import { Observable } from '../Observable' ; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; -import { isScheduler } from '../../util/isScheduler'; +import { isScheduler } from '..//util/isScheduler'; const selfSelector = (value: T) => value; diff --git a/src/internal/observable/IfObservable.ts b/src/internal/observable/IfObservable.ts index 4708277ffc..c2adc60273 100644 --- a/src/internal/observable/IfObservable.ts +++ b/src/internal/observable/IfObservable.ts @@ -2,7 +2,7 @@ import { Observable, SubscribableOrPromise } from '../Observable'; import { Subscriber } from '../Subscriber'; import { TeardownLogic } from '../Subscription'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; /** * We need this JSDoc comment for affecting ESDoc. diff --git a/src/internal/observable/IntervalObservable.ts b/src/internal/observable/IntervalObservable.ts index a30190921e..b859620520 100644 --- a/src/internal/observable/IntervalObservable.ts +++ b/src/internal/observable/IntervalObservable.ts @@ -1,5 +1,5 @@ import { Subscriber } from '../Subscriber'; -import { isNumeric } from '../../util/isNumeric'; +import { isNumeric } from '..//util/isNumeric'; import { IScheduler } from '../Scheduler'; import { Observable } from '../Observable'; import { async } from '../scheduler/async'; diff --git a/src/internal/observable/IteratorObservable.ts b/src/internal/observable/IteratorObservable.ts index 08b7283df8..11bb57b732 100644 --- a/src/internal/observable/IteratorObservable.ts +++ b/src/internal/observable/IteratorObservable.ts @@ -1,4 +1,4 @@ -import { root } from '../../util/root'; +import { root } from '..//util/root'; import { IScheduler } from '../Scheduler'; import { Observable } from '../Observable'; import { iterator as Symbol_iterator } from '../../internal/symbol/iterator'; diff --git a/src/internal/observable/NeverObservable.ts b/src/internal/observable/NeverObservable.ts index 2edbd32e31..9a4beae2f3 100644 --- a/src/internal/observable/NeverObservable.ts +++ b/src/internal/observable/NeverObservable.ts @@ -1,6 +1,6 @@ import { Observable } from '../Observable'; import { Subscriber } from '../Subscriber'; -import { noop } from '../../util/noop'; +import { noop } from '..//util/noop'; /** * We need this JSDoc comment for affecting ESDoc. diff --git a/src/internal/observable/PromiseObservable.ts b/src/internal/observable/PromiseObservable.ts index 28de6d1be0..59d4a72860 100644 --- a/src/internal/observable/PromiseObservable.ts +++ b/src/internal/observable/PromiseObservable.ts @@ -1,4 +1,4 @@ -import { root } from '../../util/root'; +import { root } from '..//util/root'; import { IScheduler } from '../Scheduler'; import { Observable } from '../Observable'; import { Subscriber } from '../Subscriber'; diff --git a/src/internal/observable/SubscribeOnObservable.ts b/src/internal/observable/SubscribeOnObservable.ts index 773c6e7e99..61b80f2bf8 100644 --- a/src/internal/observable/SubscribeOnObservable.ts +++ b/src/internal/observable/SubscribeOnObservable.ts @@ -4,7 +4,7 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { Observable } from '../Observable'; import { asap } from '../scheduler/asap'; -import { isNumeric } from '../../util/isNumeric'; +import { isNumeric } from '..//util/isNumeric'; export interface DispatchArg { source: Observable; diff --git a/src/internal/observable/TimerObservable.ts b/src/internal/observable/TimerObservable.ts index e6c251d764..6585e90024 100644 --- a/src/internal/observable/TimerObservable.ts +++ b/src/internal/observable/TimerObservable.ts @@ -1,9 +1,9 @@ -import { isNumeric } from '../../util/isNumeric'; +import { isNumeric } from '..//util/isNumeric'; import { IScheduler } from '../Scheduler'; import { Observable } from '../Observable'; import { async } from '../scheduler/async'; -import { isScheduler } from '../../util/isScheduler'; -import { isDate } from '../../util/isDate'; +import { isScheduler } from '..//util/isScheduler'; +import { isDate } from '..//util/isDate'; import { TeardownLogic } from '../Subscription'; import { Subscriber } from '../Subscriber'; diff --git a/src/internal/observable/UsingObservable.ts b/src/internal/observable/UsingObservable.ts index 7b66c23b85..b7ac34c3d0 100644 --- a/src/internal/observable/UsingObservable.ts +++ b/src/internal/observable/UsingObservable.ts @@ -2,7 +2,7 @@ import { Observable, SubscribableOrPromise } from '../Observable'; import { Subscriber } from '../Subscriber'; import { AnonymousSubscription, TeardownLogic } from '../Subscription'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; /** * We need this JSDoc comment for affecting ESDoc. diff --git a/src/internal/observable/combineLatest.ts b/src/internal/observable/combineLatest.ts index 4ef6f374f1..0334c03227 100644 --- a/src/internal/observable/combineLatest.ts +++ b/src/internal/observable/combineLatest.ts @@ -1,13 +1,13 @@ import { Observable, ObservableInput } from '../Observable'; import { IScheduler } from '../Scheduler'; -import { isScheduler } from '../../util/isScheduler'; -import { isArray } from '../../util/isArray'; +import { isScheduler } from '..//util/isScheduler'; +import { isArray } from '..//util/isArray'; import { ArrayObservable } from './ArrayObservable'; import { Subscriber } from '../Subscriber'; import { OuterSubscriber } from '../OuterSubscriber'; import { Operator } from '../Operator'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; const NONE = {}; diff --git a/src/internal/observable/concat.ts b/src/internal/observable/concat.ts index f182f2466d..a11799457e 100644 --- a/src/internal/observable/concat.ts +++ b/src/internal/observable/concat.ts @@ -1,6 +1,6 @@ import { Observable, ObservableInput } from '../Observable'; import { IScheduler } from '../Scheduler'; -import { isScheduler } from '../../util/isScheduler'; +import { isScheduler } from '..//util/isScheduler'; import { of } from './of'; import { from } from './from'; import { concatAll } from '../../internal/operators/concatAll'; diff --git a/src/internal/observable/dom/AjaxObservable.ts b/src/internal/observable/dom/AjaxObservable.ts index 1de5f78f8d..be45791c5a 100644 --- a/src/internal/observable/dom/AjaxObservable.ts +++ b/src/internal/observable/dom/AjaxObservable.ts @@ -1,6 +1,6 @@ -import { root } from '../../../util/root'; -import { tryCatch } from '../../../util/tryCatch'; -import { errorObject } from '../../../util/errorObject'; +import { root } from '../..//util/root'; +import { tryCatch } from '../..//util/tryCatch'; +import { errorObject } from '../..//util/errorObject'; import { Observable } from '../../Observable'; import { Subscriber } from '../../Subscriber'; import { TeardownLogic } from '../../Subscription'; diff --git a/src/internal/observable/dom/WebSocketSubject.ts b/src/internal/observable/dom/WebSocketSubject.ts index c523cb5919..552e4def42 100644 --- a/src/internal/observable/dom/WebSocketSubject.ts +++ b/src/internal/observable/dom/WebSocketSubject.ts @@ -3,12 +3,12 @@ import { Subscriber } from '../../Subscriber'; import { Observable } from '../../Observable'; import { Subscription } from '../../Subscription'; import { Operator } from '../../Operator'; -import { root } from '../../../util/root'; +import { root } from '../..//util/root'; import { ReplaySubject } from '../../ReplaySubject'; import { Observer, NextObserver } from '../../Observer'; -import { tryCatch } from '../../../util/tryCatch'; -import { errorObject } from '../../../util/errorObject'; -import { assign } from '../../../util/assign'; +import { tryCatch } from '../..//util/tryCatch'; +import { errorObject } from '../..//util/errorObject'; +import { assign } from '../..//util/assign'; export interface WebSocketSubjectConfig { url: string; diff --git a/src/internal/observable/merge.ts b/src/internal/observable/merge.ts index 2a50d61c2b..e64f26f3b2 100644 --- a/src/internal/observable/merge.ts +++ b/src/internal/observable/merge.ts @@ -1,6 +1,6 @@ import { Observable, ObservableInput } from '../Observable'; import { IScheduler } from '../Scheduler'; -import { isScheduler } from '../../util/isScheduler'; +import { isScheduler } from '..//util/isScheduler'; import { mergeAll } from '../../internal/operators/mergeAll'; import { ArrayObservable } from './ArrayObservable'; diff --git a/src/internal/observable/onErrorResumeNext.ts b/src/internal/observable/onErrorResumeNext.ts index 010aed8a7f..ff344fbb83 100644 --- a/src/internal/observable/onErrorResumeNext.ts +++ b/src/internal/observable/onErrorResumeNext.ts @@ -2,10 +2,10 @@ import { Observable, ObservableInput } from '../Observable'; import { FromObservable } from '../../internal/observable/FromObservable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { isArray } from '../../util/isArray'; +import { isArray } from '..//util/isArray'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; /* tslint:disable:max-line-length */ export function onErrorResumeNext(v: ObservableInput): Observable; diff --git a/src/internal/observable/race.ts b/src/internal/observable/race.ts index 263b56c6d1..a6fa8db675 100644 --- a/src/internal/observable/race.ts +++ b/src/internal/observable/race.ts @@ -1,12 +1,12 @@ import { Observable } from '../Observable'; -import { isArray } from '../../util/isArray'; +import { isArray } from '..//util/isArray'; import { ArrayObservable } from '../../internal/observable/ArrayObservable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; import { Subscription, TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; /** * Returns an Observable that mirrors the first source Observable to emit an item. diff --git a/src/internal/observable/zip.ts b/src/internal/observable/zip.ts index 6605ac302f..0da19b47ae 100644 --- a/src/internal/observable/zip.ts +++ b/src/internal/observable/zip.ts @@ -1,12 +1,12 @@ import { Observable, ObservableInput } from '../Observable'; import { ArrayObservable } from '../../internal/observable/ArrayObservable'; -import { isArray } from '../../util/isArray'; +import { isArray } from '..//util/isArray'; import { Operator } from '../Operator'; import { PartialObserver } from '../Observer'; import { Subscriber } from '../Subscriber'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { iterator as Symbol_iterator } from '../../internal/symbol/iterator'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/audit.ts b/src/internal/operators/audit.ts index c8f528df1a..6308d0e67d 100644 --- a/src/internal/operators/audit.ts +++ b/src/internal/operators/audit.ts @@ -3,10 +3,10 @@ import { Subscriber } from '../Subscriber'; import { Observable, SubscribableOrPromise } from '../Observable'; import { Subscription, TeardownLogic } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OuterSubscriber } from '../OuterSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/buffer.ts b/src/internal/operators/buffer.ts index f3eaea366e..f496266b3d 100644 --- a/src/internal/operators/buffer.ts +++ b/src/internal/operators/buffer.ts @@ -3,7 +3,7 @@ import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/bufferTime.ts b/src/internal/operators/bufferTime.ts index 712488a6c0..673cf4d91f 100644 --- a/src/internal/operators/bufferTime.ts +++ b/src/internal/operators/bufferTime.ts @@ -5,7 +5,7 @@ import { async } from '../scheduler/async'; import { Observable } from '../Observable'; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; -import { isScheduler } from '../../util/isScheduler'; +import { isScheduler } from '..//util/isScheduler'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/bufferToggle.ts b/src/internal/operators/bufferToggle.ts index 7607f1de22..54e5f59b23 100644 --- a/src/internal/operators/bufferToggle.ts +++ b/src/internal/operators/bufferToggle.ts @@ -2,7 +2,7 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; import { Observable, SubscribableOrPromise } from '../Observable'; import { Subscription } from '../Subscription'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; import { OperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/bufferWhen.ts b/src/internal/operators/bufferWhen.ts index 53ad3ff046..f5e39bfaed 100644 --- a/src/internal/operators/bufferWhen.ts +++ b/src/internal/operators/bufferWhen.ts @@ -2,11 +2,11 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { Subscription } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/catchError.ts b/src/internal/operators/catchError.ts index 4cdd40deb8..4d82ee2703 100644 --- a/src/internal/operators/catchError.ts +++ b/src/internal/operators/catchError.ts @@ -3,7 +3,7 @@ import { Subscriber } from '../Subscriber'; import { Observable, ObservableInput } from '../Observable'; import { OuterSubscriber } from '../OuterSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/debounce.ts b/src/internal/operators/debounce.ts index 91f94ab2ba..127948784d 100644 --- a/src/internal/operators/debounce.ts +++ b/src/internal/operators/debounce.ts @@ -5,7 +5,7 @@ import { Subscription, TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/delay.ts b/src/internal/operators/delay.ts index 6634cd692a..c67978425b 100644 --- a/src/internal/operators/delay.ts +++ b/src/internal/operators/delay.ts @@ -1,5 +1,5 @@ import { async } from '../scheduler/async'; -import { isDate } from '../../util/isDate'; +import { isDate } from '..//util/isDate'; import { Operator } from '../Operator'; import { IScheduler } from '../Scheduler'; import { Subscriber } from '../Subscriber'; diff --git a/src/internal/operators/delayWhen.ts b/src/internal/operators/delayWhen.ts index 3240fbfe2f..1bef9ace12 100644 --- a/src/internal/operators/delayWhen.ts +++ b/src/internal/operators/delayWhen.ts @@ -4,7 +4,7 @@ import { Observable } from '../Observable'; import { Subscription, TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/distinct.ts b/src/internal/operators/distinct.ts index 3363af32c9..46d5c1f8f9 100644 --- a/src/internal/operators/distinct.ts +++ b/src/internal/operators/distinct.ts @@ -4,7 +4,7 @@ import { Subscriber } from '../Subscriber'; import { TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; if (!Set) { diff --git a/src/internal/operators/distinctUntilChanged.ts b/src/internal/operators/distinctUntilChanged.ts index cf77ffad28..9e19e7d206 100644 --- a/src/internal/operators/distinctUntilChanged.ts +++ b/src/internal/operators/distinctUntilChanged.ts @@ -1,7 +1,7 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/elementAt.ts b/src/internal/operators/elementAt.ts index 74631f3df1..c2eac5afcf 100644 --- a/src/internal/operators/elementAt.ts +++ b/src/internal/operators/elementAt.ts @@ -1,6 +1,6 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { ArgumentOutOfRangeError } from '../../util/ArgumentOutOfRangeError'; +import { ArgumentOutOfRangeError } from '..//util/ArgumentOutOfRangeError'; import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/exhaust.ts b/src/internal/operators/exhaust.ts index af40f6739d..101726b8a3 100644 --- a/src/internal/operators/exhaust.ts +++ b/src/internal/operators/exhaust.ts @@ -3,7 +3,7 @@ import { Observable } from '../Observable'; import { Subscriber } from '../Subscriber'; import { Subscription, TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/exhaustMap.ts b/src/internal/operators/exhaustMap.ts index eebe1de74c..06aa697610 100644 --- a/src/internal/operators/exhaustMap.ts +++ b/src/internal/operators/exhaustMap.ts @@ -4,7 +4,7 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/expand.ts b/src/internal/operators/expand.ts index aeb52d7494..7b0663867c 100644 --- a/src/internal/operators/expand.ts +++ b/src/internal/operators/expand.ts @@ -2,12 +2,12 @@ import { Observable } from '../Observable'; import { IScheduler } from '../Scheduler'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { Subscription } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction, OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/first.ts b/src/internal/operators/first.ts index 9b1bb4f3b7..354b9ec959 100644 --- a/src/internal/operators/first.ts +++ b/src/internal/operators/first.ts @@ -1,7 +1,7 @@ import { Observable } from '../Observable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { EmptyError } from '../../util/EmptyError'; +import { EmptyError } from '..//util/EmptyError'; import { OperatorFunction, MonoTypeOperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ export function first(predicate: (value: T, index: number, source: Observable) => value is S): OperatorFunction; diff --git a/src/internal/operators/last.ts b/src/internal/operators/last.ts index 7d232f2847..b62079326c 100644 --- a/src/internal/operators/last.ts +++ b/src/internal/operators/last.ts @@ -1,7 +1,7 @@ import { Observable } from '../Observable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { EmptyError } from '../../util/EmptyError'; +import { EmptyError } from '..//util/EmptyError'; import { OperatorFunction, MonoTypeOperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/mergeAll.ts b/src/internal/operators/mergeAll.ts index 586f8e7bab..9761ca6308 100644 --- a/src/internal/operators/mergeAll.ts +++ b/src/internal/operators/mergeAll.ts @@ -1,7 +1,7 @@ import { ObservableInput } from '../Observable'; import { mergeMap } from './mergeMap'; -import { identity } from '../../util/identity'; +import { identity } from '..//util/identity'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/mergeMap.ts b/src/internal/operators/mergeMap.ts index ea37d433f7..a4f1cddbcf 100644 --- a/src/internal/operators/mergeMap.ts +++ b/src/internal/operators/mergeMap.ts @@ -2,7 +2,7 @@ import { Observable, ObservableInput } from '../Observable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; import { OperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/mergeMapTo.ts b/src/internal/operators/mergeMapTo.ts index a13be4a98c..af65bacbbd 100644 --- a/src/internal/operators/mergeMapTo.ts +++ b/src/internal/operators/mergeMapTo.ts @@ -5,7 +5,7 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/mergeScan.ts b/src/internal/operators/mergeScan.ts index b35bcf3819..1451c9a0cc 100644 --- a/src/internal/operators/mergeScan.ts +++ b/src/internal/operators/mergeScan.ts @@ -2,9 +2,9 @@ import { Operator } from '../Operator'; import { Observable, ObservableInput } from '../Observable'; import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; import { OperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/onErrorResumeNext.ts b/src/internal/operators/onErrorResumeNext.ts index db8f2c5a76..3a97ccb663 100644 --- a/src/internal/operators/onErrorResumeNext.ts +++ b/src/internal/operators/onErrorResumeNext.ts @@ -2,10 +2,10 @@ import { Observable, ObservableInput } from '../Observable'; import { FromObservable } from '../observable/FromObservable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { isArray } from '../../util/isArray'; +import { isArray } from '..//util/isArray'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/partition.ts b/src/internal/operators/partition.ts index 30768b02cd..d10e171043 100644 --- a/src/internal/operators/partition.ts +++ b/src/internal/operators/partition.ts @@ -1,4 +1,4 @@ -import { not } from '../../util/not'; +import { not } from '..//util/not'; import { filter } from './filter'; import { Observable } from '../Observable'; import { UnaryFunction } from '../../internal/types'; diff --git a/src/internal/operators/race.ts b/src/internal/operators/race.ts index 87435a5e54..f98d5dc99a 100644 --- a/src/internal/operators/race.ts +++ b/src/internal/operators/race.ts @@ -1,5 +1,5 @@ import { Observable } from '../Observable'; -import { isArray } from '../../util/isArray'; +import { isArray } from '..//util/isArray'; import { MonoTypeOperatorFunction, OperatorFunction } from '../../internal/types'; import { race as raceStatic } from '../observable/race'; diff --git a/src/internal/operators/reduce.ts b/src/internal/operators/reduce.ts index 0a63bfbc39..4c483711cc 100644 --- a/src/internal/operators/reduce.ts +++ b/src/internal/operators/reduce.ts @@ -3,7 +3,7 @@ import { scan } from './scan'; import { takeLast } from './takeLast'; import { defaultIfEmpty } from './defaultIfEmpty'; import { OperatorFunction, MonoTypeOperatorFunction } from '../../internal/types'; -import { pipe } from '../../util/pipe'; +import { pipe } from '..//util/pipe'; /* tslint:disable:max-line-length */ export function reduce(accumulator: (acc: T, value: T, index: number) => T, seed?: T): MonoTypeOperatorFunction; diff --git a/src/internal/operators/repeatWhen.ts b/src/internal/operators/repeatWhen.ts index a15000732d..f66a41e8e9 100644 --- a/src/internal/operators/repeatWhen.ts +++ b/src/internal/operators/repeatWhen.ts @@ -3,12 +3,12 @@ import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { Subject } from '../Subject'; import { Subscription, TeardownLogic } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/retryWhen.ts b/src/internal/operators/retryWhen.ts index 392341c57c..46169fcbba 100644 --- a/src/internal/operators/retryWhen.ts +++ b/src/internal/operators/retryWhen.ts @@ -3,12 +3,12 @@ import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { Subject } from '../Subject'; import { Subscription, TeardownLogic } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/sample.ts b/src/internal/operators/sample.ts index d4c317e2b6..8f08062673 100644 --- a/src/internal/operators/sample.ts +++ b/src/internal/operators/sample.ts @@ -4,7 +4,7 @@ import { Subscriber } from '../Subscriber'; import { TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/sequenceEqual.ts b/src/internal/operators/sequenceEqual.ts index 6020e56b29..72b166eb10 100644 --- a/src/internal/operators/sequenceEqual.ts +++ b/src/internal/operators/sequenceEqual.ts @@ -2,8 +2,8 @@ import { Operator } from '../Operator'; import { Observer } from '../Observer'; import { Observable } from '../Observable'; import { Subscriber } from '../Subscriber'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/single.ts b/src/internal/operators/single.ts index 3e54cffa39..121191803c 100644 --- a/src/internal/operators/single.ts +++ b/src/internal/operators/single.ts @@ -2,7 +2,7 @@ import { Observable } from '../Observable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; import { Observer } from '../Observer'; -import { EmptyError } from '../../util/EmptyError'; +import { EmptyError } from '..//util/EmptyError'; import { TeardownLogic } from '../Subscription'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/skipLast.ts b/src/internal/operators/skipLast.ts index a239f6b329..f749d84689 100644 --- a/src/internal/operators/skipLast.ts +++ b/src/internal/operators/skipLast.ts @@ -1,6 +1,6 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { ArgumentOutOfRangeError } from '../../util/ArgumentOutOfRangeError'; +import { ArgumentOutOfRangeError } from '..//util/ArgumentOutOfRangeError'; import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/skipUntil.ts b/src/internal/operators/skipUntil.ts index ece0774305..34d433f82c 100644 --- a/src/internal/operators/skipUntil.ts +++ b/src/internal/operators/skipUntil.ts @@ -4,7 +4,7 @@ import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/startWith.ts b/src/internal/operators/startWith.ts index ec14c3e567..58f1624657 100644 --- a/src/internal/operators/startWith.ts +++ b/src/internal/operators/startWith.ts @@ -4,7 +4,7 @@ import { ArrayObservable } from '../observable/ArrayObservable'; import { ScalarObservable } from '../observable/ScalarObservable'; import { EmptyObservable } from '../observable/EmptyObservable'; import { concat as concatStatic } from '../observable/concat'; -import { isScheduler } from '../../util/isScheduler'; +import { isScheduler } from '..//util/isScheduler'; import { MonoTypeOperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/switchAll.ts b/src/internal/operators/switchAll.ts index 94918afe59..d2ce3864fd 100644 --- a/src/internal/operators/switchAll.ts +++ b/src/internal/operators/switchAll.ts @@ -1,7 +1,7 @@ import { OperatorFunction } from '../../internal/types'; import { Observable } from '../Observable'; import { switchMap } from './switchMap'; -import { identity } from '../../util/identity'; +import { identity } from '..//util/identity'; export function switchAll(): OperatorFunction, T> { return switchMap(identity); diff --git a/src/internal/operators/switchMap.ts b/src/internal/operators/switchMap.ts index 923968847d..7b5a33a520 100644 --- a/src/internal/operators/switchMap.ts +++ b/src/internal/operators/switchMap.ts @@ -4,7 +4,7 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/switchMapTo.ts b/src/internal/operators/switchMapTo.ts index 8fb32a1982..94c85fd45a 100644 --- a/src/internal/operators/switchMapTo.ts +++ b/src/internal/operators/switchMapTo.ts @@ -4,7 +4,7 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/take.ts b/src/internal/operators/take.ts index 0c5fde9617..1ea17daa8b 100644 --- a/src/internal/operators/take.ts +++ b/src/internal/operators/take.ts @@ -1,6 +1,6 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { ArgumentOutOfRangeError } from '../../util/ArgumentOutOfRangeError'; +import { ArgumentOutOfRangeError } from '..//util/ArgumentOutOfRangeError'; import { EmptyObservable } from '../observable/EmptyObservable'; import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; diff --git a/src/internal/operators/takeLast.ts b/src/internal/operators/takeLast.ts index 984c7954b3..bd64067483 100644 --- a/src/internal/operators/takeLast.ts +++ b/src/internal/operators/takeLast.ts @@ -1,6 +1,6 @@ import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { ArgumentOutOfRangeError } from '../../util/ArgumentOutOfRangeError'; +import { ArgumentOutOfRangeError } from '..//util/ArgumentOutOfRangeError'; import { EmptyObservable } from '../observable/EmptyObservable'; import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; diff --git a/src/internal/operators/takeUntil.ts b/src/internal/operators/takeUntil.ts index 0919900395..0066238344 100644 --- a/src/internal/operators/takeUntil.ts +++ b/src/internal/operators/takeUntil.ts @@ -5,7 +5,7 @@ import { TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/tap.ts b/src/internal/operators/tap.ts index b2dcb6df76..491e37f8e9 100644 --- a/src/internal/operators/tap.ts +++ b/src/internal/operators/tap.ts @@ -4,8 +4,8 @@ import { Observable } from '../Observable'; import { PartialObserver } from '../Observer'; import { TeardownLogic } from '../Subscription'; import { MonoTypeOperatorFunction } from '../../internal/types'; -import { noop } from '../../util/noop'; -import { isFunction } from '../../util/isFunction'; +import { noop } from '..//util/noop'; +import { isFunction } from '..//util/isFunction'; /* tslint:disable:max-line-length */ export function tap(next?: (x: T) => void, error?: (e: any) => void, complete?: () => void): MonoTypeOperatorFunction; diff --git a/src/internal/operators/throttle.ts b/src/internal/operators/throttle.ts index 1fdba292ae..640323a13a 100644 --- a/src/internal/operators/throttle.ts +++ b/src/internal/operators/throttle.ts @@ -5,7 +5,7 @@ import { Subscription, TeardownLogic } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { MonoTypeOperatorFunction } from '../../internal/types'; diff --git a/src/internal/operators/timeout.ts b/src/internal/operators/timeout.ts index 110dc8471b..54dfd5fc8a 100644 --- a/src/internal/operators/timeout.ts +++ b/src/internal/operators/timeout.ts @@ -1,12 +1,12 @@ import { Action } from '../scheduler/Action'; import { async } from '../scheduler/async'; -import { isDate } from '../../util/isDate'; +import { isDate } from '..//util/isDate'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; import { IScheduler } from '../Scheduler'; import { Observable } from '../Observable'; import { TeardownLogic } from '../Subscription'; -import { TimeoutError } from '../../util/TimeoutError'; +import { TimeoutError } from '..//util/TimeoutError'; import { MonoTypeOperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/timeoutWith.ts b/src/internal/operators/timeoutWith.ts index 1ee003f47d..8660f73270 100644 --- a/src/internal/operators/timeoutWith.ts +++ b/src/internal/operators/timeoutWith.ts @@ -5,9 +5,9 @@ import { IScheduler } from '../Scheduler'; import { async } from '../scheduler/async'; import { TeardownLogic } from '../Subscription'; import { Observable, ObservableInput } from '../Observable'; -import { isDate } from '../../util/isDate'; +import { isDate } from '..//util/isDate'; import { OuterSubscriber } from '../OuterSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction, MonoTypeOperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/operators/window.ts b/src/internal/operators/window.ts index a4af75b1a2..0cb6887df3 100644 --- a/src/internal/operators/window.ts +++ b/src/internal/operators/window.ts @@ -4,7 +4,7 @@ import { Subject } from '../Subject'; import { Subscriber } from '../Subscriber'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { Operator } from '../Operator'; /** diff --git a/src/internal/operators/windowTime.ts b/src/internal/operators/windowTime.ts index 149d8125da..c458b95001 100644 --- a/src/internal/operators/windowTime.ts +++ b/src/internal/operators/windowTime.ts @@ -6,8 +6,8 @@ import { async } from '../scheduler/async'; import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { Subscription } from '../Subscription'; -import { isNumeric } from '../../util/isNumeric'; -import { isScheduler } from '../../util/isScheduler'; +import { isNumeric } from '..//util/isNumeric'; +import { isScheduler } from '..//util/isScheduler'; import { OperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/windowToggle.ts b/src/internal/operators/windowToggle.ts index 3f8d3ff3ef..d84a47b4d7 100644 --- a/src/internal/operators/windowToggle.ts +++ b/src/internal/operators/windowToggle.ts @@ -3,11 +3,11 @@ import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { Subject } from '../Subject'; import { Subscription } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/windowWhen.ts b/src/internal/operators/windowWhen.ts index f862b6dc1c..eb44b883bf 100644 --- a/src/internal/operators/windowWhen.ts +++ b/src/internal/operators/windowWhen.ts @@ -3,11 +3,11 @@ import { Subscriber } from '../Subscriber'; import { Observable } from '../Observable'; import { Subject } from '../Subject'; import { Subscription } from '../Subscription'; -import { tryCatch } from '../../util/tryCatch'; -import { errorObject } from '../../util/errorObject'; +import { tryCatch } from '..//util/tryCatch'; +import { errorObject } from '..//util/errorObject'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /** diff --git a/src/internal/operators/withLatestFrom.ts b/src/internal/operators/withLatestFrom.ts index 2666c683ed..0f857c7de9 100644 --- a/src/internal/operators/withLatestFrom.ts +++ b/src/internal/operators/withLatestFrom.ts @@ -3,7 +3,7 @@ import { Subscriber } from '../Subscriber'; import { Observable, ObservableInput } from '../Observable'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { subscribeToResult } from '../../util/subscribeToResult'; +import { subscribeToResult } from '..//util/subscribeToResult'; import { OperatorFunction } from '../../internal/types'; /* tslint:disable:max-line-length */ diff --git a/src/internal/patching/operator/bufferTime.ts b/src/internal/patching/operator/bufferTime.ts index edfcbda797..796828d7d2 100644 --- a/src/internal/patching/operator/bufferTime.ts +++ b/src/internal/patching/operator/bufferTime.ts @@ -1,7 +1,7 @@ import { IScheduler } from '../../Scheduler'; import { async } from '../../scheduler/async'; import { Observable } from '../../Observable'; -import { isScheduler } from '../../../util/isScheduler'; +import { isScheduler } from '../..//util/isScheduler'; import { bufferTime as higherOrder } from '../../operators/bufferTime'; /* tslint:disable:max-line-length */ diff --git a/src/internal/patching/operator/combineLatest.ts b/src/internal/patching/operator/combineLatest.ts index 3b5a08ca78..298e0f325e 100644 --- a/src/internal/patching/operator/combineLatest.ts +++ b/src/internal/patching/operator/combineLatest.ts @@ -1,7 +1,7 @@ import { Observable, ObservableInput } from '../../Observable'; import { CombineLatestOperator } from '../../observable/combineLatest'; import { ArrayObservable } from '../../observable/ArrayObservable'; -import { isArray } from '../../../util/isArray'; +import { isArray } from '../..//util/isArray'; /* tslint:disable:max-line-length */ export function combineLatest(this: Observable, project: (v1: T) => R): Observable; diff --git a/src/internal/patching/operator/windowTime.ts b/src/internal/patching/operator/windowTime.ts index 1db43ff752..db334429d5 100644 --- a/src/internal/patching/operator/windowTime.ts +++ b/src/internal/patching/operator/windowTime.ts @@ -1,8 +1,8 @@ import { IScheduler } from '../../Scheduler'; import { async } from '../../scheduler/async'; import { Observable } from '../../Observable'; -import { isNumeric } from '../../../util/isNumeric'; -import { isScheduler } from '../../../util/isScheduler'; +import { isNumeric } from '../..//util/isNumeric'; +import { isScheduler } from '../..//util/isScheduler'; import { windowTime as higherOrder } from '../../operators/windowTime'; /** diff --git a/src/internal/scheduler/AnimationFrameAction.ts b/src/internal/scheduler/AnimationFrameAction.ts index 9c29b08f71..16cbb9aa34 100644 --- a/src/internal/scheduler/AnimationFrameAction.ts +++ b/src/internal/scheduler/AnimationFrameAction.ts @@ -1,5 +1,5 @@ import { AsyncAction } from './AsyncAction'; -import { AnimationFrame } from '../../util/AnimationFrame'; +import { AnimationFrame } from '..//util/AnimationFrame'; import { AnimationFrameScheduler } from './AnimationFrameScheduler'; /** diff --git a/src/internal/scheduler/AsapAction.ts b/src/internal/scheduler/AsapAction.ts index 8744e85ac4..b1c43e7ce7 100644 --- a/src/internal/scheduler/AsapAction.ts +++ b/src/internal/scheduler/AsapAction.ts @@ -1,4 +1,4 @@ -import { Immediate } from '../../util/Immediate'; +import { Immediate } from '..//util/Immediate'; import { AsyncAction } from './AsyncAction'; import { AsapScheduler } from './AsapScheduler'; diff --git a/src/internal/scheduler/AsyncAction.ts b/src/internal/scheduler/AsyncAction.ts index c7b4fb7388..4655393714 100644 --- a/src/internal/scheduler/AsyncAction.ts +++ b/src/internal/scheduler/AsyncAction.ts @@ -1,4 +1,4 @@ -import { root } from '../../util/root'; +import { root } from '..//util/root'; import { Action } from './Action'; import { Subscription } from '../Subscription'; import { AsyncScheduler } from './AsyncScheduler'; diff --git a/src/internal/symbol/iterator.ts b/src/internal/symbol/iterator.ts index be4e1c762f..1c9001c267 100644 --- a/src/internal/symbol/iterator.ts +++ b/src/internal/symbol/iterator.ts @@ -1,4 +1,4 @@ -import { root } from '../../util/root'; +import { root } from '..//util/root'; export function symbolIteratorPonyfill(root: any) { const Symbol: any = root.Symbol; diff --git a/src/internal/symbol/observable.ts b/src/internal/symbol/observable.ts index 38ae16f004..375f5f9ab4 100644 --- a/src/internal/symbol/observable.ts +++ b/src/internal/symbol/observable.ts @@ -1,4 +1,4 @@ -import { root } from '../../util/root'; +import { root } from '..//util/root'; export function getSymbolObservable(context: any) { let $$observable: any; diff --git a/src/internal/symbol/rxSubscriber.ts b/src/internal/symbol/rxSubscriber.ts index df11d3b93d..62a9467274 100644 --- a/src/internal/symbol/rxSubscriber.ts +++ b/src/internal/symbol/rxSubscriber.ts @@ -1,4 +1,4 @@ -import { root } from '../../util/root'; +import { root } from '..//util/root'; const Symbol: any = root.Symbol; diff --git a/src/internal/testing/ColdObservable.ts b/src/internal/testing/ColdObservable.ts index 9a0eae52fe..6a3309caea 100644 --- a/src/internal/testing/ColdObservable.ts +++ b/src/internal/testing/ColdObservable.ts @@ -4,7 +4,7 @@ import { Scheduler } from '../Scheduler'; import { TestMessage } from './TestMessage'; import { SubscriptionLog } from './SubscriptionLog'; import { SubscriptionLoggable } from './SubscriptionLoggable'; -import { applyMixins } from '../../util/applyMixins'; +import { applyMixins } from '..//util/applyMixins'; import { Subscriber } from '../Subscriber'; /** diff --git a/src/internal/testing/HotObservable.ts b/src/internal/testing/HotObservable.ts index f83c6515f9..a49d8609a9 100644 --- a/src/internal/testing/HotObservable.ts +++ b/src/internal/testing/HotObservable.ts @@ -5,7 +5,7 @@ import { Scheduler } from '../Scheduler'; import { TestMessage } from './TestMessage'; import { SubscriptionLog } from './SubscriptionLog'; import { SubscriptionLoggable } from './SubscriptionLoggable'; -import { applyMixins } from '../../util/applyMixins'; +import { applyMixins } from '..//util/applyMixins'; /** * We need this JSDoc comment for affecting ESDoc. diff --git a/src/util/AnimationFrame.ts b/src/internal/util/AnimationFrame.ts similarity index 100% rename from src/util/AnimationFrame.ts rename to src/internal/util/AnimationFrame.ts diff --git a/src/util/ArgumentOutOfRangeError.ts b/src/internal/util/ArgumentOutOfRangeError.ts similarity index 100% rename from src/util/ArgumentOutOfRangeError.ts rename to src/internal/util/ArgumentOutOfRangeError.ts diff --git a/src/util/EmptyError.ts b/src/internal/util/EmptyError.ts similarity index 100% rename from src/util/EmptyError.ts rename to src/internal/util/EmptyError.ts diff --git a/src/util/Immediate.ts b/src/internal/util/Immediate.ts similarity index 100% rename from src/util/Immediate.ts rename to src/internal/util/Immediate.ts diff --git a/src/util/ObjectUnsubscribedError.ts b/src/internal/util/ObjectUnsubscribedError.ts similarity index 100% rename from src/util/ObjectUnsubscribedError.ts rename to src/internal/util/ObjectUnsubscribedError.ts diff --git a/src/util/TimeoutError.ts b/src/internal/util/TimeoutError.ts similarity index 100% rename from src/util/TimeoutError.ts rename to src/internal/util/TimeoutError.ts diff --git a/src/util/UnsubscriptionError.ts b/src/internal/util/UnsubscriptionError.ts similarity index 100% rename from src/util/UnsubscriptionError.ts rename to src/internal/util/UnsubscriptionError.ts diff --git a/src/util/applyMixins.ts b/src/internal/util/applyMixins.ts similarity index 100% rename from src/util/applyMixins.ts rename to src/internal/util/applyMixins.ts diff --git a/src/util/assign.ts b/src/internal/util/assign.ts similarity index 100% rename from src/util/assign.ts rename to src/internal/util/assign.ts diff --git a/src/util/errorObject.ts b/src/internal/util/errorObject.ts similarity index 100% rename from src/util/errorObject.ts rename to src/internal/util/errorObject.ts diff --git a/src/util/identity.ts b/src/internal/util/identity.ts similarity index 100% rename from src/util/identity.ts rename to src/internal/util/identity.ts diff --git a/src/util/isArray.ts b/src/internal/util/isArray.ts similarity index 100% rename from src/util/isArray.ts rename to src/internal/util/isArray.ts diff --git a/src/util/isArrayLike.ts b/src/internal/util/isArrayLike.ts similarity index 100% rename from src/util/isArrayLike.ts rename to src/internal/util/isArrayLike.ts diff --git a/src/util/isDate.ts b/src/internal/util/isDate.ts similarity index 100% rename from src/util/isDate.ts rename to src/internal/util/isDate.ts diff --git a/src/util/isFunction.ts b/src/internal/util/isFunction.ts similarity index 100% rename from src/util/isFunction.ts rename to src/internal/util/isFunction.ts diff --git a/src/util/isNumeric.ts b/src/internal/util/isNumeric.ts similarity index 100% rename from src/util/isNumeric.ts rename to src/internal/util/isNumeric.ts diff --git a/src/util/isObject.ts b/src/internal/util/isObject.ts similarity index 100% rename from src/util/isObject.ts rename to src/internal/util/isObject.ts diff --git a/src/util/isPromise.ts b/src/internal/util/isPromise.ts similarity index 100% rename from src/util/isPromise.ts rename to src/internal/util/isPromise.ts diff --git a/src/util/isScheduler.ts b/src/internal/util/isScheduler.ts similarity index 71% rename from src/util/isScheduler.ts rename to src/internal/util/isScheduler.ts index ced2afbf66..6a05b57b38 100644 --- a/src/util/isScheduler.ts +++ b/src/internal/util/isScheduler.ts @@ -1,4 +1,4 @@ -import { Scheduler } from '../internal/Scheduler'; +import { Scheduler } from '../Scheduler'; export function isScheduler(value: any): value is Scheduler { return value && typeof (value).schedule === 'function'; } diff --git a/src/util/noop.ts b/src/internal/util/noop.ts similarity index 100% rename from src/util/noop.ts rename to src/internal/util/noop.ts diff --git a/src/util/not.ts b/src/internal/util/not.ts similarity index 100% rename from src/util/not.ts rename to src/internal/util/not.ts diff --git a/src/util/pipe.ts b/src/internal/util/pipe.ts similarity index 97% rename from src/util/pipe.ts rename to src/internal/util/pipe.ts index c2a59a4266..d5e7cfd2ce 100644 --- a/src/util/pipe.ts +++ b/src/internal/util/pipe.ts @@ -1,5 +1,5 @@ import { noop } from './noop'; -import { UnaryFunction } from '../internal/types'; +import { UnaryFunction } from '../types'; /* tslint:disable:max-line-length */ export function pipe(): UnaryFunction; diff --git a/src/util/root.ts b/src/internal/util/root.ts similarity index 100% rename from src/util/root.ts rename to src/internal/util/root.ts diff --git a/src/util/subscribeToResult.ts b/src/internal/util/subscribeToResult.ts similarity index 85% rename from src/util/subscribeToResult.ts rename to src/internal/util/subscribeToResult.ts index 2b16c36288..ae19fe5795 100644 --- a/src/util/subscribeToResult.ts +++ b/src/internal/util/subscribeToResult.ts @@ -2,13 +2,13 @@ import { root } from './root'; import { isArrayLike } from './isArrayLike'; import { isPromise } from './isPromise'; import { isObject } from './isObject'; -import { Subscriber } from '../internal/Subscriber'; -import { Observable, ObservableInput } from '../internal/Observable'; -import { iterator as Symbol_iterator } from '../internal/symbol/iterator'; -import { Subscription } from '../internal/Subscription'; -import { InnerSubscriber } from '../internal/InnerSubscriber'; -import { OuterSubscriber } from '../internal/OuterSubscriber'; -import { observable as Symbol_observable } from '../internal/symbol/observable'; +import { Subscriber } from '../Subscriber'; +import { Observable, ObservableInput } from '../Observable'; +import { iterator as Symbol_iterator } from '../symbol/iterator'; +import { Subscription } from '../Subscription'; +import { InnerSubscriber } from '../InnerSubscriber'; +import { OuterSubscriber } from '../OuterSubscriber'; +import { observable as Symbol_observable } from '../symbol/observable'; export function subscribeToResult(outerSubscriber: OuterSubscriber, result: any, diff --git a/src/util/toSubscriber.ts b/src/internal/util/toSubscriber.ts similarity index 71% rename from src/util/toSubscriber.ts rename to src/internal/util/toSubscriber.ts index 5a1d0b7c51..134fa56b17 100644 --- a/src/util/toSubscriber.ts +++ b/src/internal/util/toSubscriber.ts @@ -1,6 +1,6 @@ -import { Subscriber } from '../internal/Subscriber'; -import { rxSubscriber as rxSubscriberSymbol } from '../internal/symbol/rxSubscriber'; -import { PartialObserver, empty as emptyObserver } from '../internal/Observer'; +import { Subscriber } from '../Subscriber'; +import { rxSubscriber as rxSubscriberSymbol } from '../symbol/rxSubscriber'; +import { PartialObserver, empty as emptyObserver } from '../Observer'; export function toSubscriber( nextOrObserver?: PartialObserver | ((value: T) => void), diff --git a/src/util/tryCatch.ts b/src/internal/util/tryCatch.ts similarity index 100% rename from src/util/tryCatch.ts rename to src/internal/util/tryCatch.ts