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(forkJoin): accepts observables emitting null or undefined #1368

Closed
wants to merge 1 commit into from
Closed

fix(forkJoin): accepts observables emitting null or undefined #1368

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
12 changes: 12 additions & 0 deletions spec/observables/forkJoin-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ describe('Observable.forkJoin', function () {
var expected = '--------------(x|)';

expectObservable(e1).toBe(expected, {x: ['d', 'b', '3']});

//Hack - just adding one new test cases in here or either jasmin-is-weird-spec.js,
Copy link
Member Author

Choose a reason for hiding this comment

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

another weirdness of jasmine behavior, just separate this as test case makes another test fails. Placing under 'jasmine-is-weird' also doesn't work in this case.

//one of test breaks under publish-spec.js
var e2 = Observable.forkJoin(
hot('--a--b--c--d--|', { d: null }),
hot('(b|)'),
hot('--1--2--3--|'),
hot('-----r--t--u--|', { u: undefined })
);
var expected2 = '--------------(x|)';

expectObservable(e2).toBe(expected2, {x: [null, 'b', '3', undefined]});
});

it('should join the last values of the provided observables with selector', function () {
Expand Down
35 changes: 18 additions & 17 deletions src/observable/ForkJoinObservable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ export class ForkJoinObservable<T> extends Observable<T> {
const sources = this.sources;
const len = sources.length;

const context = { completed: 0, total: len, values: emptyArray(len), selector: this.resultSelector };
const context = { completed: 0,
total: len,
values: new Array(len),
haveValues: new Array(len),
selector: this.resultSelector };

for (let i = 0; i < len; i++) {
let source = sources[i];
if (isPromise(source)) {
Expand All @@ -52,39 +57,43 @@ export class ForkJoinObservable<T> extends Observable<T> {
}

class AllSubscriber<T> extends Subscriber<T> {
private _value: T = null;

constructor(destination: Subscriber<any>,
private index: number,
private context: { completed: number,
total: number,
values: any[],
haveValues: any[],
selector: (...values: Array<any>) => any }) {
super(destination);
}

protected _next(value: T): void {
this._value = value;
const context = this.context;
const index = this.index;

context.values[index] = value;
context.haveValues[index] = true;
}

protected _complete(): void {
const destination = this.destination;
const context = this.context;

if (this._value == null) {
if (!context.haveValues[this.index]) {
destination.complete();
}

const context = this.context;
context.completed++;
context.values[this.index] = this._value;

const values = context.values;

if (context.completed !== values.length) {
return;
}

if (values.every(hasValue)) {
let value = context.selector ? context.selector.apply(this, values) :
if (context.haveValues.every(hasValue)) {
const value = context.selector ? context.selector.apply(this, values) :
values;
destination.next(value);
}
Expand All @@ -94,13 +103,5 @@ class AllSubscriber<T> extends Subscriber<T> {
}

function hasValue(x: any): boolean {
return x !== null;
}

function emptyArray(len: number): any[] {
let arr: any[] = [];
for (let i = 0; i < len; i++) {
arr.push(null);
}
return arr;
return x === true;
}