diff --git a/src/internal/observable/innerFrom.ts b/src/internal/observable/innerFrom.ts index 13e792eee0..c3852c15e4 100644 --- a/src/internal/observable/innerFrom.ts +++ b/src/internal/observable/innerFrom.ts @@ -1,7 +1,7 @@ import { isArrayLike } from '../util/isArrayLike'; import { isPromise } from '../util/isPromise'; import { Observable } from '../Observable'; -import { ObservableInput, ReadableStreamLike } from '../types'; +import { ObservableInput, ObservedValueOf, ReadableStreamLike } from '../types'; import { isInteropObservable } from '../util/isInteropObservable'; import { isAsyncIterable } from '../util/isAsyncIterable'; import { createInvalidObservableTypeError } from '../util/throwUnobservableError'; @@ -12,6 +12,7 @@ import { isFunction } from '../util/isFunction'; import { reportUnhandledError } from '../util/reportUnhandledError'; import { observable as Symbol_observable } from '../symbol/observable'; +export function innerFrom>(input: O): Observable>; export function innerFrom(input: ObservableInput): Observable { if (input instanceof Observable) { return input; diff --git a/src/internal/operators/connect.ts b/src/internal/operators/connect.ts index d422ab5eb3..4a6b3c4c20 100644 --- a/src/internal/operators/connect.ts +++ b/src/internal/operators/connect.ts @@ -1,7 +1,7 @@ import { OperatorFunction, ObservableInput, ObservedValueOf, SubjectLike } from '../types'; import { Observable } from '../Observable'; import { Subject } from '../Subject'; -import { from } from '../observable/from'; +import { innerFrom } from '../observable/innerFrom'; import { operate } from '../util/lift'; import { fromSubscribable } from '../observable/fromSubscribable'; @@ -103,7 +103,7 @@ export function connect>( const { connector } = config; return operate((source, subscriber) => { const subject = connector(); - from(selector(fromSubscribable(subject))).subscribe(subscriber); + innerFrom(selector(fromSubscribable(subject))).subscribe(subscriber); subscriber.add(source.subscribe(subject)); }); } diff --git a/src/internal/operators/onErrorResumeNext.ts b/src/internal/operators/onErrorResumeNext.ts index 50b929837f..e248fb51fa 100644 --- a/src/internal/operators/onErrorResumeNext.ts +++ b/src/internal/operators/onErrorResumeNext.ts @@ -101,7 +101,7 @@ export function onErrorResumeNext( if (remaining.length > 0) { let nextSource: Observable; try { - nextSource = innerFrom(remaining.shift()!); + nextSource = innerFrom(remaining.shift()!); } catch (err) { subscribeNext(); return; diff --git a/src/internal/operators/share.ts b/src/internal/operators/share.ts index 118f0d2035..3c7facbc81 100644 --- a/src/internal/operators/share.ts +++ b/src/internal/operators/share.ts @@ -1,5 +1,5 @@ import { Observable } from '../Observable'; -import { from } from '../observable/from'; +import { innerFrom } from '../observable/innerFrom'; import { take } from '../operators/take'; import { Subject } from '../Subject'; import { SafeSubscriber } from '../Subscriber'; @@ -232,7 +232,7 @@ export function share(options: ShareConfig = {}): MonoTypeOperatorFunction dest.complete(); }, }); - from(source).subscribe(connection); + innerFrom(source).subscribe(connection); } })(wrapperSource); };