Skip to content

Commit a4d4dee

Browse files
committed
refactor: undo accidental change to internal isPromise helper
1 parent e375e74 commit a4d4dee

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
import { of } from 'rxjs';
22
import { expect } from 'chai';
3-
import { isThennable } from 'rxjs/internal/Observable';
3+
import { isPromise } from 'rxjs/internal/Observable';
44

55
describe('isPromise', () => {
66
it('should return true for new Promise', () => {
77
const o = new Promise<any>(() => null);
8-
expect(isThennable(o)).to.be.true;
8+
expect(isPromise(o)).to.be.true;
99
});
1010

1111
it('should NOT return true for any Observable', () => {
1212
const o: any = of(null);
1313

14-
expect(isThennable(o)).to.be.false;
14+
expect(isPromise(o)).to.be.false;
1515
});
1616

1717
it('should return false for null', () => {
18-
expect(isThennable(null)).to.be.false;
18+
expect(isPromise(null)).to.be.false;
1919
});
2020

2121
it('should return false for undefined', () => {
22-
expect(isThennable(undefined)).to.be.false;
22+
expect(isPromise(undefined)).to.be.false;
2323
});
2424

2525
it('should return false for a number', () => {
26-
expect(isThennable(1)).to.be.false;
26+
expect(isPromise(1)).to.be.false;
2727
});
2828

2929
it('should return false for a string', () => {
30-
expect(isThennable('1')).to.be.false;
30+
expect(isPromise('1')).to.be.false;
3131
});
3232
});

packages/rxjs/src/internal/Observable.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ export function getObservableInputType(input: unknown): ObservableInputType {
12311231
if (isArrayLike(input)) {
12321232
return ObservableInputType.ArrayLike;
12331233
}
1234-
if (isThennable(input)) {
1234+
if (isPromise(input)) {
12351235
return ObservableInputType.Promise;
12361236
}
12371237
if (isAsyncIterable(input)) {
@@ -1287,7 +1287,7 @@ function isReadableStreamLike<T>(obj: any): obj is ReadableStreamLike<T> {
12871287
* Tests to see if the object is "thennable".
12881288
* @param value the object to test
12891289
*/
1290-
export function isThennable(value: any): value is Thennable<any> {
1290+
export function isPromise(value: any): value is Thennable<any> {
12911291
return isFunction(value?.then);
12921292
}
12931293

packages/rxjs/src/internal/types.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,14 @@ export interface Subscribable<T> {
9191
subscribe(observer: Partial<Observer<T>>): Unsubscribable;
9292
}
9393

94-
export interface Thennable<T> {
95-
then(onresolved: ((value: T) => void) | null | undefined, onrejected?: ((reason: any) => void) | null | undefined): void;
96-
}
97-
9894
/**
9995
* Valid types that can be converted to observables.
10096
*/
10197
export type ObservableInput<T> =
10298
| Observable<T>
10399
| InteropObservable<T>
104100
| AsyncIterable<T>
105-
| Thennable<T>
101+
| PromiseLike<T>
106102
| ArrayLike<T>
107103
| Iterable<T>
108104
| ReadableStreamLike<T>;

0 commit comments

Comments
 (0)