Skip to content

Commit 4e900dc

Browse files
authored
fix(merge): single array is not an array of sources (#6211)
* test(merge): add failing single-array test * fix(merge): single array is not an array of sources
1 parent e4ba925 commit 4e900dc

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

spec/observables/merge-spec.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,10 @@ describe('merge(...observables, Scheduler, number)', () => {
282282

283283
expect(e1Subscribed).to.be.false;
284284
});
285+
286+
it('should deem a single array argument to be an ObservableInput', () => {
287+
const array = ['foo', 'bar'];
288+
const expected = '(fb|)';
289+
expectObservable(merge(array)).toBe(expected, { f: 'foo', b: 'bar' });
290+
});
285291
});

src/internal/observable/merge.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Observable } from '../Observable';
22
import { ObservableInput, ObservableInputTuple, SchedulerLike } from '../types';
33
import { mergeAll } from '../operators/mergeAll';
44
import { internalFromArray } from './fromArray';
5-
import { argsOrArgArray } from '../util/argsOrArgArray';
65
import { innerFrom } from './from';
76
import { EMPTY } from './empty';
87
import { popNumber, popScheduler } from '../util/args';
@@ -88,7 +87,7 @@ export function merge<A extends readonly unknown[]>(
8887
export function merge(...args: (ObservableInput<unknown> | number | SchedulerLike)[]): Observable<unknown> {
8988
const scheduler = popScheduler(args);
9089
const concurrent = popNumber(args, Infinity);
91-
const sources = argsOrArgArray(args) as ObservableInput<unknown>[];
90+
const sources = args as ObservableInput<unknown>[];
9291
return !sources.length
9392
? // No source provided
9493
EMPTY

0 commit comments

Comments
 (0)