Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion lib/internal/filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ function filterArray(eachfn, arr, iteratee, callback) {

function filterGeneric(eachfn, coll, iteratee, callback) {
var results = [];
eachfn(coll, (x, index, iterCb) => {
var counter = 0;
eachfn(coll, (x, key, iterCb) => {
const index = counter++;
iteratee(x, (err, v) => {
if (err) return iterCb(err);
if (v) {
Expand Down
31 changes: 31 additions & 0 deletions test/filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,3 +300,34 @@ describe("reject", () => {
})
});
});

// Complete predicates out of order without relying on timer scheduling.
describe('filter object ordering', () => {
['filter', 'filterLimit', 'reject', 'rejectLimit'].forEach(method => {
[
{first: 1, second: 2, third: 3},
{'2.5': 1, '1.5': 2, '0.5': 3}
].forEach(collection => {
it(`${method} preserves object enumeration order for ${Object.keys(collection)}`, done => {
const callbacks = [];
const iteratee = (value, callback) => {
callbacks.push(() => callback(null,
method.startsWith('reject') ? value === 2 : value !== 2));
};
const complete = (err, results) => {
expect(err).to.equal(null);
expect(results).to.eql([1, 3]);
done();
};
if (method.endsWith('Limit')) {
async[method](collection, 3, iteratee, complete);
} else {
async[method](collection, iteratee, complete);
}
callbacks[2]();
callbacks[0]();
callbacks[1]();
});
});
});
});