diff --git a/spec/helpers/test-helper.ts b/spec/helpers/test-helper.ts index 753756a181..661f39a511 100644 --- a/spec/helpers/test-helper.ts +++ b/spec/helpers/test-helper.ts @@ -3,7 +3,7 @@ declare const global: any; import * as Rx from '../../src/Rx'; import { ObservableInput } from '../../src/Observable'; import { root } from '../../src/util/root'; -import { $$iterator } from '../../src/symbol/iterator'; +import { $$iterator } from '../../src/internal/symbol/iterator'; import $$symbolObservable from 'symbol-observable'; export function lowerCaseO(...args: Array): Rx.Observable { diff --git a/spec/symbol/iterator-spec.ts b/spec/symbol/iterator-spec.ts index d1f0bbfaa9..e8cd128fec 100644 --- a/spec/symbol/iterator-spec.ts +++ b/spec/symbol/iterator-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { $$iterator, symbolIteratorPonyfill } from '../../src/symbol/iterator'; +import { $$iterator, symbolIteratorPonyfill } from '../../src/internal/symbol/iterator'; describe('iterator symbol', () => { it('should exist', () => { @@ -97,4 +97,4 @@ describe('symbolIteratorPonyfill', () => { }); }); }); -}); \ No newline at end of file +}); diff --git a/spec/symbol/observable-polyfilled-spec.ts b/spec/symbol/observable-polyfilled-spec.ts index c6dfa7bbf9..79891d3b5f 100644 --- a/spec/symbol/observable-polyfilled-spec.ts +++ b/spec/symbol/observable-polyfilled-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { getSymbolObservable } from '../../src/symbol/observable'; +import { getSymbolObservable } from '../../src/internal/symbol/observable'; describe('observable symbol', () => { it('should exist in the proper form when Symbol does not exist', () => { diff --git a/spec/symbol/observable-spec.ts b/spec/symbol/observable-spec.ts index 6c2d502b77..d9b771e22b 100644 --- a/spec/symbol/observable-spec.ts +++ b/spec/symbol/observable-spec.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import $$symbolObservable from 'symbol-observable'; import { root } from '../../src/util/root'; -import { getSymbolObservable } from '../../src/symbol/observable'; +import { getSymbolObservable } from '../../src/internal/symbol/observable'; describe('observable symbol', () => { it('should exist in the proper form', () => { diff --git a/spec/symbol/rxSubscriber-spec.ts b/spec/symbol/rxSubscriber-spec.ts index b5e793be0d..61fd23122c 100644 --- a/spec/symbol/rxSubscriber-spec.ts +++ b/spec/symbol/rxSubscriber-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { root } from '../../src/util/root'; -import {$$rxSubscriber} from '../../src/symbol/rxSubscriber'; +import {$$rxSubscriber} from '../../src/internal/symbol/rxSubscriber'; describe('rxSubscriber symbol', () => { it('should exist in the proper form', () => { diff --git a/spec/util/subscribeToResult-spec.ts b/spec/util/subscribeToResult-spec.ts index 8bd30b3cff..34d24edafa 100644 --- a/spec/util/subscribeToResult-spec.ts +++ b/spec/util/subscribeToResult-spec.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import * as Rx from '../../src/Rx'; import { subscribeToResult } from '../../src/util/subscribeToResult'; import { OuterSubscriber } from '../../src/internal/OuterSubscriber'; -import { $$iterator } from '../../src/symbol/iterator'; +import { $$iterator } from '../../src/internal/symbol/iterator'; import $$symbolObservable from 'symbol-observable'; describe('subscribeToResult', () => { diff --git a/src/Rx.ts b/src/Rx.ts index 0af5094aa5..ef1b85d8c2 100644 --- a/src/Rx.ts +++ b/src/Rx.ts @@ -172,9 +172,9 @@ import { AsapScheduler } from './internal/scheduler/AsapScheduler'; import { AsyncScheduler } from './internal/scheduler/AsyncScheduler'; import { QueueScheduler } from './internal/scheduler/QueueScheduler'; import { AnimationFrameScheduler } from './internal/scheduler/AnimationFrameScheduler'; -import { rxSubscriber } from './symbol/rxSubscriber'; -import { iterator } from './symbol/iterator'; -import { observable } from './symbol/observable'; +import { rxSubscriber } from './internal/symbol/rxSubscriber'; +import { iterator } from './internal/symbol/iterator'; +import { observable } from './internal/symbol/observable'; import * as _operators from './internal/operators'; diff --git a/src/internal/Observable.ts b/src/internal/Observable.ts index 7b1cf32d0c..a181448450 100644 --- a/src/internal/Observable.ts +++ b/src/internal/Observable.ts @@ -6,7 +6,7 @@ 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 '../symbol/observable'; +import { observable as Symbol_observable } from '../internal/symbol/observable'; import { OperatorFunction } from '../interfaces'; import { pipeFromArray } from '../util/pipe'; diff --git a/src/internal/Subject.ts b/src/internal/Subject.ts index f71f198a78..8e35b55c28 100644 --- a/src/internal/Subject.ts +++ b/src/internal/Subject.ts @@ -5,7 +5,7 @@ import { Subscriber } from './Subscriber'; import { ISubscription, Subscription, TeardownLogic } from './Subscription'; import { ObjectUnsubscribedError } from '../util/ObjectUnsubscribedError'; import { SubjectSubscription } from './SubjectSubscription'; -import { rxSubscriber as rxSubscriberSymbol } from '../symbol/rxSubscriber'; +import { rxSubscriber as rxSubscriberSymbol } from '../internal/symbol/rxSubscriber'; /** * @class SubjectSubscriber diff --git a/src/internal/Subscriber.ts b/src/internal/Subscriber.ts index d6653e9034..4077c1bc2e 100644 --- a/src/internal/Subscriber.ts +++ b/src/internal/Subscriber.ts @@ -1,7 +1,7 @@ import { isFunction } from '../util/isFunction'; import { Observer, PartialObserver, empty as emptyObserver } from './Observer'; import { Subscription } from './Subscription'; -import { rxSubscriber as rxSubscriberSymbol } from '../symbol/rxSubscriber'; +import { rxSubscriber as rxSubscriberSymbol } from '../internal/symbol/rxSubscriber'; /** * Implements the {@link Observer} interface and extends the diff --git a/src/internal/observable/FromObservable.ts b/src/internal/observable/FromObservable.ts index f95f8c4ffd..ea0ff112b9 100644 --- a/src/internal/observable/FromObservable.ts +++ b/src/internal/observable/FromObservable.ts @@ -7,11 +7,11 @@ import { ArrayObservable } from './ArrayObservable'; import { ArrayLikeObservable } from './ArrayLikeObservable'; import { IScheduler } from '../Scheduler'; -import { iterator as Symbol_iterator } from '../../symbol/iterator'; +import { iterator as Symbol_iterator } from '../../internal/symbol/iterator'; import { Observable, ObservableInput } from '../Observable'; import { Subscriber } from '../Subscriber'; import { ObserveOnSubscriber } from '../../internal/operators/observeOn'; -import { observable as Symbol_observable } from '../../symbol/observable'; +import { observable as Symbol_observable } from '../../internal/symbol/observable'; /** * We need this JSDoc comment for affecting ESDoc. diff --git a/src/internal/observable/IteratorObservable.ts b/src/internal/observable/IteratorObservable.ts index cf9b6c213f..08b7283df8 100644 --- a/src/internal/observable/IteratorObservable.ts +++ b/src/internal/observable/IteratorObservable.ts @@ -1,7 +1,7 @@ import { root } from '../../util/root'; import { IScheduler } from '../Scheduler'; import { Observable } from '../Observable'; -import { iterator as Symbol_iterator } from '../../symbol/iterator'; +import { iterator as Symbol_iterator } from '../../internal/symbol/iterator'; import { TeardownLogic } from '../Subscription'; import { Subscriber } from '../Subscriber'; diff --git a/src/internal/observable/zip.ts b/src/internal/observable/zip.ts index 8024a8f254..6605ac302f 100644 --- a/src/internal/observable/zip.ts +++ b/src/internal/observable/zip.ts @@ -7,7 +7,7 @@ import { Subscriber } from '../Subscriber'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; import { subscribeToResult } from '../../util/subscribeToResult'; -import { iterator as Symbol_iterator } from '../../symbol/iterator'; +import { iterator as Symbol_iterator } from '../../internal/symbol/iterator'; /* tslint:disable:max-line-length */ export function zip(v1: ObservableInput, project: (v1: T) => R): Observable; diff --git a/src/symbol/iterator.ts b/src/internal/symbol/iterator.ts similarity index 96% rename from src/symbol/iterator.ts rename to src/internal/symbol/iterator.ts index cdee34a606..be4e1c762f 100644 --- a/src/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/symbol/observable.ts b/src/internal/symbol/observable.ts similarity index 93% rename from src/symbol/observable.ts rename to src/internal/symbol/observable.ts index 06c2bfb556..38ae16f004 100644 --- a/src/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/symbol/rxSubscriber.ts b/src/internal/symbol/rxSubscriber.ts similarity index 87% rename from src/symbol/rxSubscriber.ts rename to src/internal/symbol/rxSubscriber.ts index 693d0a9881..df11d3b93d 100644 --- a/src/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/util/subscribeToResult.ts b/src/util/subscribeToResult.ts index 82635f552d..2b16c36288 100644 --- a/src/util/subscribeToResult.ts +++ b/src/util/subscribeToResult.ts @@ -4,11 +4,11 @@ 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 '../symbol/iterator'; +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 '../symbol/observable'; +import { observable as Symbol_observable } from '../internal/symbol/observable'; export function subscribeToResult(outerSubscriber: OuterSubscriber, result: any, diff --git a/src/util/toSubscriber.ts b/src/util/toSubscriber.ts index 1fef6d2ae0..5a1d0b7c51 100644 --- a/src/util/toSubscriber.ts +++ b/src/util/toSubscriber.ts @@ -1,5 +1,5 @@ import { Subscriber } from '../internal/Subscriber'; -import { rxSubscriber as rxSubscriberSymbol } from '../symbol/rxSubscriber'; +import { rxSubscriber as rxSubscriberSymbol } from '../internal/symbol/rxSubscriber'; import { PartialObserver, empty as emptyObserver } from '../internal/Observer'; export function toSubscriber(