Skip to content

Commit 232f23d

Browse files
committed
Partial rename to async
1 parent cb6e02b commit 232f23d

File tree

6 files changed

+66
-66
lines changed

6 files changed

+66
-66
lines changed

modern-async.d.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ declare module "Queue" {
5858
cancelAllPending(): number;
5959
}
6060
}
61-
declare module "every" {
62-
export default every;
63-
function every<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number): Promise<boolean>;
61+
declare module "asyncEvery" {
62+
export default asyncEvery;
63+
function asyncEvery<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number): Promise<boolean>;
6464
import Queue from "Queue";
6565
}
6666
declare module "toArray" {
@@ -77,9 +77,9 @@ declare module "filterGenerator" {
7777
function filterGenerator<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number, ordered?: boolean): AsyncIterable<V>;
7878
import Queue from "Queue";
7979
}
80-
declare module "filter" {
81-
export default filter;
82-
function filter<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number): Promise<V[]>;
80+
declare module "asyncFilter" {
81+
export default asyncFilter;
82+
function asyncFilter<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number): Promise<V[]>;
8383
import Queue from "Queue";
8484
}
8585
declare module "find" {
@@ -177,8 +177,8 @@ declare module "modern-async" {
177177
export { default as delay } from "delay";
178178
export { default as delayCancellable } from "delayCancellable";
179179
export { default as Delayer } from "Delayer";
180-
export { default as every } from "every";
181-
export { default as filter } from "filter";
180+
export { default as asyncEvery } from "asyncEvery";
181+
export { default as asyncFilter } from "asyncFilter";
182182
export { default as filterGenerator } from "filterGenerator";
183183
export { default as find } from "find";
184184
export { default as findIndex } from "findIndex";

src/every.mjs renamed to src/asyncEvery.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import findIndex from './findIndex.mjs'
2929
* if a least one of them doesn't pass it. That promise will be rejected if one of the truth test throws
3030
* an exception.
3131
* @example
32-
* import { every, sleep } from 'modern-async'
32+
* import { asyncEvery, sleep } from 'modern-async'
3333
*
3434
* const array = [1, 2, 3]
3535
*
36-
* const result = await every(array, async (v) => {
36+
* const result = await asyncEvery(array, async (v) => {
3737
* // these calls will be performed in parallel with a maximum of 2
3838
* // concurrent calls
3939
* await sleep(10) // waits 10ms
@@ -42,7 +42,7 @@ import findIndex from './findIndex.mjs'
4242
* console.log(result) // prints true
4343
* // total processing time should be ~ 20ms
4444
*/
45-
async function every (iterable, iteratee, queueOrConcurrency = 1) {
45+
async function asyncEvery (iterable, iteratee, queueOrConcurrency = 1) {
4646
assert(typeof iteratee === 'function', 'iteratee must be a function')
4747
iteratee = asyncWrap(iteratee)
4848
const index = await findIndex(iterable, async (value, index, iterable) => {
@@ -52,4 +52,4 @@ async function every (iterable, iteratee, queueOrConcurrency = 1) {
5252
return result
5353
}
5454

55-
export default every
55+
export default asyncEvery

src/every.test.mjs renamed to src/asyncEvery.test.mjs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
11

22
import { expect, test } from '@jest/globals'
3-
import every from './every.mjs'
3+
import asyncEvery from './asyncEvery.mjs'
44
import Deferred from './Deferred.mjs'
55
import { range } from 'itertools'
66
import delay from './delay.mjs'
77

88
// eslint-disable-next-line require-jsdoc
99
class TestError extends Error {}
1010

11-
test('every compatibility', async () => {
11+
test('asyncEvery compatibility', async () => {
1212
let d = new Deferred()
13-
let p = every([...range(3)], async (v) => {
13+
let p = asyncEvery([...range(3)], async (v) => {
1414
await d.promise
1515
return true
1616
}, 1)
1717
d.resolve()
1818
expect(await p).toBe([...range(3)].every((v) => true))
1919

2020
d = new Deferred()
21-
p = every([...range(3)], async (v) => {
21+
p = asyncEvery([...range(3)], async (v) => {
2222
await d.promise
2323
return v !== 2
2424
}, 1)
2525
d.resolve()
2626
expect(await p).toBe([...range(3)].every((v) => v !== 2))
2727

2828
d = new Deferred()
29-
p = every([...range(3)], async (v) => {
29+
p = asyncEvery([...range(3)], async (v) => {
3030
await d.promise
3131
return false
3232
}, 1)
3333
d.resolve()
3434
expect(await p).toBe([...range(3)].every((v) => false))
3535

3636
d = new Deferred()
37-
p = every([], async (v) => {
37+
p = asyncEvery([], async (v) => {
3838
await d.promise
3939
return false
4040
}, 1)
4141
d.resolve()
4242
expect(await p).toBe([].every((v) => false))
4343

4444
d = new Deferred()
45-
p = every([], async (v) => {
45+
p = asyncEvery([], async (v) => {
4646
await d.promise
4747
return true
4848
}, 1)
4949
d.resolve()
5050
expect(await p).toBe([].every((v) => true))
5151
})
5252

53-
test('every parallel', async () => {
53+
test('asyncEvery parallel', async () => {
5454
let d = new Deferred()
55-
let p = every([...range(3)], async (v) => {
55+
let p = asyncEvery([...range(3)], async (v) => {
5656
await d.promise
5757
return true
5858
}, 10)
5959
d.resolve()
6060
expect(await p).toBe([...range(3)].every((v) => true))
6161

6262
d = new Deferred()
63-
p = every([...range(3)], async (v) => {
63+
p = asyncEvery([...range(3)], async (v) => {
6464
await d.promise
6565
return v !== 2
6666
}, 10)
6767
d.resolve()
6868
expect(await p).toBe([...range(3)].every((v) => v !== 2))
6969

7070
d = new Deferred()
71-
p = every([...range(3)], async (v) => {
71+
p = asyncEvery([...range(3)], async (v) => {
7272
await d.promise
7373
return false
7474
}, 10)
7575
d.resolve()
7676
expect(await p).toBe([...range(3)].every((v) => false))
7777

7878
d = new Deferred()
79-
p = every([], async (v) => {
79+
p = asyncEvery([], async (v) => {
8080
await d.promise
8181
return false
8282
}, 10)
8383
d.resolve()
8484
expect(await p).toBe([].every((v) => false))
8585

8686
d = new Deferred()
87-
p = every([], async (v) => {
87+
p = asyncEvery([], async (v) => {
8888
await d.promise
8989
return true
9090
}, 10)
9191
d.resolve()
9292
expect(await p).toBe([].every((v) => true))
9393
})
9494

95-
test('every first in time', async () => {
95+
test('asyncEvery first in time', async () => {
9696
const ds = [...range(3)].map(() => new Deferred())
97-
const p = every(range(3), async (v, i) => {
97+
const p = asyncEvery(range(3), async (v, i) => {
9898
await ds[i]
9999
return false
100100
}, 3)
@@ -103,9 +103,9 @@ test('every first in time', async () => {
103103
expect(res).toBe(false)
104104
})
105105

106-
test('every error', async () => {
106+
test('asyncEvery error', async () => {
107107
const callList = [...range(3)].map(() => 0)
108-
const p = every([...range(3)], async (v, i) => {
108+
const p = asyncEvery([...range(3)], async (v, i) => {
109109
callList[i] += 1
110110
if (i === 1) {
111111
throw new TestError()
@@ -124,12 +124,12 @@ test('every error', async () => {
124124
expect(callList[2]).toStrictEqual(0)
125125
})
126126

127-
test('every infinite concurrency all pass', async () => {
127+
test('asyncEvery infinite concurrency all pass', async () => {
128128
const callCount = {}
129129
;[...range(3)].forEach((i) => { callCount[i] = 0 })
130130
const d = new Deferred()
131131
const ds = [...range(3)].map(() => new Deferred())
132-
const p = every([...range(3)], async (v, i) => {
132+
const p = asyncEvery([...range(3)], async (v, i) => {
133133
callCount[i] += 1
134134
ds[i].resolve()
135135
await d.promise
@@ -147,12 +147,12 @@ test('every infinite concurrency all pass', async () => {
147147
expect(callCount[2]).toBe(1)
148148
})
149149

150-
test('every infinite concurrency no all pass', async () => {
150+
test('asyncEvery infinite concurrency no all pass', async () => {
151151
const callCount = {}
152152
;[...range(3)].forEach((i) => { callCount[i] = 0 })
153153
const d = new Deferred()
154154
const ds = [...range(3)].map(() => new Deferred())
155-
const p = every([...range(3)], async (v, i) => {
155+
const p = asyncEvery([...range(3)], async (v, i) => {
156156
callCount[i] += 1
157157
ds[i].resolve()
158158
await d.promise
@@ -174,8 +174,8 @@ test('every infinite concurrency no all pass', async () => {
174174
expect(callCount[2]).toBe(1)
175175
})
176176

177-
test('every infinite concurrency error', async () => {
178-
const p = every([...range(3)], async (v, i) => {
177+
test('asyncEvery infinite concurrency error', async () => {
178+
const p = asyncEvery([...range(3)], async (v, i) => {
179179
if (i === 1) {
180180
throw new TestError()
181181
}
@@ -191,12 +191,12 @@ test('every infinite concurrency error', async () => {
191191
await delay()
192192
})
193193

194-
test('every concurrency 1 all pass', async () => {
194+
test('asyncEvery concurrency 1 all pass', async () => {
195195
const callCount = {}
196196
;[...range(3)].forEach((i) => { callCount[i] = 0 })
197197
const d = new Deferred()
198198
const ds = [...range(3)].map(() => new Deferred())
199-
const p = every([...range(3)], async (v, i) => {
199+
const p = asyncEvery([...range(3)], async (v, i) => {
200200
callCount[i] += 1
201201
ds[i].resolve()
202202
await d.promise
@@ -214,12 +214,12 @@ test('every concurrency 1 all pass', async () => {
214214
expect(callCount[2]).toBe(1)
215215
})
216216

217-
test('every concurrency 1 no all pass', async () => {
217+
test('asyncEvery concurrency 1 no all pass', async () => {
218218
const callCount = {}
219219
;[...range(3)].forEach((i) => { callCount[i] = 0 })
220220
const d = new Deferred()
221221
const ds = [...range(3)].map(() => new Deferred())
222-
const p = every([...range(3)], async (v, i) => {
222+
const p = asyncEvery([...range(3)], async (v, i) => {
223223
callCount[i] += 1
224224
ds[i].resolve()
225225
await d.promise
@@ -241,9 +241,9 @@ test('every concurrency 1 no all pass', async () => {
241241
expect(callCount[2]).toBe(0)
242242
})
243243

244-
test('every concurrency 1 error', async () => {
244+
test('asyncEvery concurrency 1 error', async () => {
245245
const callList = [...range(3)].map(() => 0)
246-
const p = every([...range(3)], async (v, i) => {
246+
const p = asyncEvery([...range(3)], async (v, i) => {
247247
callList[i] += 1
248248
if (i === 1) {
249249
throw new TestError()

src/filter.mjs renamed to src/asyncFilter.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import filterGenerator from './filterGenerator.mjs'
2424
* @returns {Promise<any[]>} A promise that will be resolved with an array containing all the values that passed
2525
* the truth test. This promise will be rejected if any of the `iteratee` calls throws an exception.
2626
* @example
27-
* import { filter, sleep } from 'modern-async'
27+
* import { asyncFilter, sleep } from 'modern-async'
2828
*
2929
* const array = [1, 2, 3]
30-
* const result = await filter(array, async (v) => {
30+
* const result = await asyncFilter(array, async (v) => {
3131
* // these calls will be performed in parallel with a maximum of 2
3232
* // concurrent calls
3333
* await sleep(10) // waits 10ms
@@ -36,8 +36,8 @@ import filterGenerator from './filterGenerator.mjs'
3636
* console.log(result) // prints [1, 3]
3737
* // total processing time should be ~ 20ms
3838
*/
39-
async function filter (iterable, iteratee, queueOrConcurrency = 1) {
39+
async function asyncFilter (iterable, iteratee, queueOrConcurrency = 1) {
4040
return await toArray(filterGenerator(iterable, iteratee, queueOrConcurrency))
4141
}
4242

43-
export default filter
43+
export default asyncFilter

0 commit comments

Comments
 (0)