Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: share and connect no longer bundle scheduling code by default #6873

Merged
merged 1 commit into from
Apr 19, 2022
Merged

fix: share and connect no longer bundle scheduling code by default #6873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/internal/observable/innerFrom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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<O extends ObservableInput<any>>(input: O): Observable<ObservedValueOf<O>>;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just change the signature instead of adding an overload signature - which will hide the implementation signature anyway?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did that and the guts of the implementation hated me for it. I'll fiddle with it again before I merge it, but I figure it's not super important since it's not a publicly exposed function.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon review. I'm going to do a follow up PR on this, because I think maybe there are some issues with onErrorResumeNext's types.

export function innerFrom<T>(input: ObservableInput<T>): Observable<T> {
if (input instanceof Observable) {
return input;
Expand Down
4 changes: 2 additions & 2 deletions src/internal/operators/connect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -103,7 +103,7 @@ export function connect<T, O extends ObservableInput<unknown>>(
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));
});
}
2 changes: 1 addition & 1 deletion src/internal/operators/onErrorResumeNext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export function onErrorResumeNext<T, A extends readonly unknown[]>(
if (remaining.length > 0) {
let nextSource: Observable<A[number]>;
try {
nextSource = innerFrom<T | A[number]>(remaining.shift()!);
nextSource = innerFrom(remaining.shift()!);
} catch (err) {
subscribeNext();
return;
Expand Down
4 changes: 2 additions & 2 deletions src/internal/operators/share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -232,7 +232,7 @@ export function share<T>(options: ShareConfig<T> = {}): MonoTypeOperatorFunction
dest.complete();
},
});
from(source).subscribe(connection);
innerFrom(source).subscribe(connection);
}
})(wrapperSource);
};
Expand Down