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
11 changes: 7 additions & 4 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function deferAndCombine<T, U>(
timeout: number,
runNowFn?: (arg: U) => void
): (arg?: U) => Promise<T> {
const requests: {
let requests: {
resolve: (value: T | PromiseLike<T>) => void;
reject: (reason?: unknown) => void;
}[] = [];
Expand All @@ -58,14 +58,17 @@ export function deferAndCombine<T, U>(

setTimeout(() => {
isWaiting = false;
fn(requests.length)
const pendingRequests = requests;
requests = [];

fn(pendingRequests.length)
.then((value) => {
for (const d of requests) {
for (const d of pendingRequests) {
d.resolve(value);
}
})
.catch((error) => {
for (const d of requests) {
for (const d of pendingRequests) {
d.reject(error);
}
});
Expand Down
26 changes: 26 additions & 0 deletions test/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,32 @@ describe('utils', function () {
},
deferTime * 4
);

it(
'should reset requestCount across batches',
async function () {
const requestCounts: number[] = [];
deferredFn = deferAndCombine((requestCount) => {
requestCounts.push(requestCount);
return Promise.resolve(requestCount);
}, deferTime);

const resultsOne = await Promise.all([
deferredFn(),
deferredFn(),
deferredFn(),
]);

await delay(deferTime);

const resultsTwo = await Promise.all([deferredFn(), deferredFn()]);

expect(requestCounts).toEqual([3, 2]);
expect(resultsOne).toEqual([3, 3, 3]);
expect(resultsTwo).toEqual([2, 2]);
},
deferTime * 4
);
});

describe('lookup', function () {
Expand Down