Skip to content

Commit 3e3f7ad

Browse files
committed
More renames
1 parent 232f23d commit 3e3f7ad

33 files changed

+400
-400
lines changed

modern-async.d.ts

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ declare module "delayCancellable" {
2828
export default delayCancellable;
2929
function delayCancellable(): [Promise<void>, () => boolean];
3030
}
31-
declare module "delay" {
32-
export default delay;
33-
function delay(): Promise<void>;
31+
declare module "asyncDelay" {
32+
export default asyncDelay;
33+
function asyncDelay(): Promise<void>;
3434
}
3535
declare module "Delayer" {
3636
export default Delayer;
@@ -63,54 +63,54 @@ declare module "asyncEvery" {
6363
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
}
66-
declare module "toArray" {
67-
export default toArray;
68-
function toArray<V>(iterable: Iterable<V> | AsyncIterable<V>): Promise<V[]>;
66+
declare module "iterableToArray" {
67+
export default iterableToArray;
68+
function iterableToArray<V>(iterable: Iterable<V> | AsyncIterable<V>): Promise<V[]>;
6969
}
70-
declare module "mapGenerator" {
71-
export default mapGenerator;
72-
function mapGenerator<V, M>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<M> | M, queueOrConcurrency?: Queue | number, ordered?: boolean): AsyncIterable<M>;
70+
declare module "asyncGeneratorMap" {
71+
export default asyncGeneratorMap;
72+
function asyncGeneratorMap<V, M>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<M> | M, queueOrConcurrency?: Queue | number, ordered?: boolean): AsyncIterable<M>;
7373
import Queue from "Queue";
7474
}
75-
declare module "filterGenerator" {
76-
export default filterGenerator;
77-
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>;
75+
declare module "asyncGeneratorFilter" {
76+
export default asyncGeneratorFilter;
77+
function asyncGeneratorFilter<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
}
8080
declare module "asyncFilter" {
8181
export default asyncFilter;
8282
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
}
85-
declare module "find" {
86-
export default find;
87-
function find<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number, ordered?: boolean): Promise<V>;
85+
declare module "asyncFind" {
86+
export default asyncFind;
87+
function asyncFind<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number, ordered?: boolean): Promise<V>;
8888
import Queue from "Queue";
8989
}
90-
declare module "findIndex" {
91-
export default findIndex;
92-
function findIndex<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number, ordered?: boolean): Promise<number>;
90+
declare module "asyncFindIndex" {
91+
export default asyncFindIndex;
92+
function asyncFindIndex<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number, ordered?: boolean): Promise<number>;
9393
import Queue from "Queue";
9494
}
95-
declare module "forEach" {
96-
export default forEach;
97-
function forEach<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<void> | void, queueOrConcurrency?: Queue | number): Promise<void>;
95+
declare module "asyncForEach" {
96+
export default asyncForEach;
97+
function asyncForEach<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<void> | void, queueOrConcurrency?: Queue | number): Promise<void>;
9898
import Queue from "Queue";
9999
}
100-
declare module "map" {
101-
export default map;
102-
function map<V, M>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<M> | M, queueOrConcurrency?: Queue | number): Promise<M[]>;
100+
declare module "asyncMap" {
101+
export default asyncMap;
102+
function asyncMap<V, M>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<M> | M, queueOrConcurrency?: Queue | number): Promise<M[]>;
103103
import Queue from "Queue";
104104
}
105-
declare module "reduce" {
106-
export default reduce;
107-
function reduce<V, A>(iterable: Iterable<V> | AsyncIterable<V>,reducer: (accumulator: A, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<A> | A, initial: A): Promise<A>;
108-
function reduce<V>(iterable: Iterable<V> | AsyncIterable<V>, reducer: (accumulator: V, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<V> | V): Promise<V>;
105+
declare module "asyncReduce" {
106+
export default asyncReduce;
107+
function asyncReduce<V, A>(iterable: Iterable<V> | AsyncIterable<V>,reducer: (accumulator: A, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<A> | A, initial: A): Promise<A>;
108+
function asyncReduce<V>(iterable: Iterable<V> | AsyncIterable<V>, reducer: (accumulator: V, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<V> | V): Promise<V>;
109109
}
110-
declare module "reduceRight" {
111-
export default reduceRight;
112-
function reduceRight<V, A>(iterable: Iterable<V> | AsyncIterable<V>,reducer: (accumulator: A, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<A> | A, initial: A): Promise<A>;
113-
function reduceRight<V>(iterable: Iterable<V> | AsyncIterable<V>, reducer: (accumulator: V, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<V> | V): Promise<V>;
110+
declare module "asyncReduceRight" {
111+
export default asyncReduceRight;
112+
function asyncReduceRight<V, A>(iterable: Iterable<V> | AsyncIterable<V>,reducer: (accumulator: A, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<A> | A, initial: A): Promise<A>;
113+
function asyncReduceRight<V>(iterable: Iterable<V> | AsyncIterable<V>, reducer: (accumulator: V, value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<V> | V): Promise<V>;
114114
}
115115
declare module "sleepCancellable" {
116116
export default sleepCancellable;
@@ -145,9 +145,9 @@ declare module "sleepPrecise" {
145145
export default sleepPrecise;
146146
function sleepPrecise(amount: number): Promise<void>;
147147
}
148-
declare module "some" {
149-
export default some;
150-
function some<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number): Promise<boolean>;
148+
declare module "asyncSome" {
149+
export default asyncSome;
150+
function asyncSome<V>(iterable: Iterable<V> | AsyncIterable<V>, iteratee: (value: V, index: number, iterable: Iterable<V> | AsyncIterable<V>) => Promise<boolean> | boolean, queueOrConcurrency?: Queue | number): Promise<boolean>;
151151
import Queue from "Queue";
152152
}
153153
declare module "TimeoutError" {
@@ -174,30 +174,30 @@ declare module "modern-async" {
174174
export { default as asyncWrap } from "asyncWrap";
175175
export { default as CancelledError } from "CancelledError";
176176
export { default as Deferred } from "Deferred";
177-
export { default as delay } from "delay";
177+
export { default as asyncDelay } from "asyncDelay";
178178
export { default as delayCancellable } from "delayCancellable";
179179
export { default as Delayer } from "Delayer";
180180
export { default as asyncEvery } from "asyncEvery";
181181
export { default as asyncFilter } from "asyncFilter";
182-
export { default as filterGenerator } from "filterGenerator";
183-
export { default as find } from "find";
184-
export { default as findIndex } from "findIndex";
185-
export { default as forEach } from "forEach";
186-
export { default as map } from "map";
187-
export { default as mapGenerator } from "mapGenerator";
182+
export { default as asyncGeneratorFilter } from "asyncGeneratorFilter";
183+
export { default as asyncFind } from "asyncFind";
184+
export { default as asyncFindIndex } from "asyncFindIndex";
185+
export { default as asyncForEach } from "asyncForEach";
186+
export { default as asyncMap } from "asyncMap";
187+
export { default as asyncGeneratorMap } from "asyncGeneratorMap";
188188
export { default as Queue } from "Queue";
189189
export { default as queueMicrotask } from "queueMicrotask";
190-
export { default as reduce } from "reduce";
191-
export { default as reduceRight } from "reduceRight";
190+
export { default as asyncReduce } from "asyncReduce";
191+
export { default as asyncReduceRight } from "asyncReduceRight";
192192
export { default as Scheduler } from "Scheduler";
193193
export { default as sleep } from "sleep";
194194
export { default as sleepCancellable } from "sleepCancellable";
195195
export { default as sleepPrecise } from "sleepPrecise";
196196
export { default as sleepPreciseCancellable } from "sleepPreciseCancellable";
197-
export { default as some } from "some";
197+
export { default as asyncSome } from "asyncSome";
198198
export { default as timeout } from "timeout";
199199
export { default as TimeoutError } from "TimeoutError";
200200
export { default as timeoutPrecise } from "timeoutPrecise";
201-
export { default as toArray } from "toArray";
201+
export { default as iterableToArray } from "iterableToArray";
202202
export { default as reflectStatus } from "reflectStatus";
203203
}

src/Delayer.mjs

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

2-
import delay from './delay.mjs'
2+
import asyncDelay from './asyncDelay.mjs'
33
import assert from 'nanoassert'
44

55
/**
@@ -15,7 +15,7 @@ import assert from 'nanoassert'
1515
* at the end of every loop. `checkDelay()` will check the amount of time that ellasped since the last time
1616
* it triggered a new task in the event loop. If the amount of time is below the trigger time it returns
1717
* an already resolved promise and the remaining computation will be able to continue processing in a
18-
* microtask. If not it will call the `delay()` function that will retrigger the operation in a later task
18+
* microtask. If not it will call the `asyncDelay()` function that will retrigger the operation in a later task
1919
* of the event loop.
2020
*
2121
* @example
@@ -69,14 +69,14 @@ class Delayer {
6969

7070
/**
7171
* Checks if a delay must be applied according to the internal timer. If that's the case this method
72-
* will call `delay()` and return `true`. If not it will do nothing and return `false`.
72+
* will call `asyncDelay()` and return `true`. If not it will do nothing and return `false`.
7373
*
7474
* @returns {boolean} `true` if a new task was scheduled in the event loop, `false` otherwise.
7575
*/
7676
async checkDelay () {
7777
const current = new Date().getTime()
7878
if (current - this._last >= this.triggerTime) {
79-
await delay()
79+
await asyncDelay()
8080
this.reset()
8181
return true
8282
} else {

src/Queue.test.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Queue from './Queue.mjs'
44
import Deferred from './Deferred.mjs'
55
import CancelledError from './CancelledError.mjs'
66
import { range } from 'itertools'
7-
import delay from './delay.mjs'
7+
import asyncDelay from './asyncDelay.mjs'
88

99
test('Queue base 1', async () => {
1010
const queue = new Queue(1)
@@ -565,7 +565,7 @@ test('Queue concurrency 1 priority', async () => {
565565
})
566566

567567
test('Queue all resolve in micro tasks', async () => {
568-
const del = delay()
568+
const del = asyncDelay()
569569
const queue = new Queue(1)
570570
const ps = []
571571
ps.push(queue.exec(async () => {}))
@@ -580,7 +580,7 @@ test('Queue all resolve in micro tasks', async () => {
580580
})
581581

582582
test('Queue infinity all resolve in micro tasks', async () => {
583-
const del = delay()
583+
const del = asyncDelay()
584584
const queue = new Queue(Number.POSITIVE_INFINITY)
585585
const ps = []
586586
ps.push(queue.exec(async () => {}))

src/delay.mjs renamed to src/asyncDelay.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import delayCancellable from './delayCancellable.mjs'
88
*
99
* @returns {Promise<void>} A promise that will be resolved on a later tick of the event loop.
1010
* @example
11-
* import { delay } from 'modern-async'
11+
* import { asyncDelay } from 'modern-async'
1212
*
1313
* console.log('this executes in a tick of the event loop')
14-
* await delay()
14+
* await asyncDelay()
1515
* console.log('this executes in another tick of the event loop')
1616
*/
17-
async function delay () {
17+
async function asyncDelay () {
1818
return delayCancellable()[0]
1919
}
2020

21-
export default delay
21+
export default asyncDelay

src/delay.test.mjs renamed to src/asyncDelay.test.mjs

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

22
import { test, expect } from '@jest/globals'
3-
import delay from './delay.mjs'
3+
import asyncDelay from './asyncDelay.mjs'
44

5-
test('delay', async () => {
5+
test('asyncDelay', async () => {
66
const events = []
7-
const p = delay().then(() => {
7+
const p = asyncDelay().then(() => {
88
events.push('resolved')
99
})
1010
Promise.resolve().then(() => {

src/asyncEvery.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import Queue from './Queue.mjs'
33
import asyncWrap from './asyncWrap.mjs'
44
import assert from 'nanoassert'
5-
import findIndex from './findIndex.mjs'
5+
import asyncFindIndex from './asyncFindIndex.mjs'
66

77
/**
88
* Returns `true` if all elements of an iterable pass a truth test and `false` otherwise.
@@ -45,7 +45,7 @@ import findIndex from './findIndex.mjs'
4545
async function asyncEvery (iterable, iteratee, queueOrConcurrency = 1) {
4646
assert(typeof iteratee === 'function', 'iteratee must be a function')
4747
iteratee = asyncWrap(iteratee)
48-
const index = await findIndex(iterable, async (value, index, iterable) => {
48+
const index = await asyncFindIndex(iterable, async (value, index, iterable) => {
4949
return !(await iteratee(value, index, iterable))
5050
}, queueOrConcurrency, false)
5151
const result = index === -1

src/asyncEvery.test.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { expect, test } from '@jest/globals'
33
import asyncEvery from './asyncEvery.mjs'
44
import Deferred from './Deferred.mjs'
55
import { range } from 'itertools'
6-
import delay from './delay.mjs'
6+
import asyncDelay from './asyncDelay.mjs'
77

88
// eslint-disable-next-line require-jsdoc
99
class TestError extends Error {}
@@ -118,7 +118,7 @@ test('asyncEvery error', async () => {
118118
} catch (e) {
119119
expect(e).toBeInstanceOf(TestError)
120120
}
121-
await delay()
121+
await asyncDelay()
122122
expect(callList[0]).toStrictEqual(1)
123123
expect(callList[1]).toStrictEqual(1)
124124
expect(callList[2]).toStrictEqual(0)
@@ -188,7 +188,7 @@ test('asyncEvery infinite concurrency error', async () => {
188188
} catch (e) {
189189
expect(e).toBeInstanceOf(TestError)
190190
}
191-
await delay()
191+
await asyncDelay()
192192
})
193193

194194
test('asyncEvery concurrency 1 all pass', async () => {
@@ -256,7 +256,7 @@ test('asyncEvery concurrency 1 error', async () => {
256256
} catch (e) {
257257
expect(e).toBeInstanceOf(TestError)
258258
}
259-
await delay()
259+
await asyncDelay()
260260
expect(callList[0]).toStrictEqual(1)
261261
expect(callList[1]).toStrictEqual(1)
262262
expect(callList[2]).toStrictEqual(0)

src/asyncFilter.mjs

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

22
import Queue from './Queue.mjs'
3-
import toArray from './toArray.mjs'
4-
import filterGenerator from './filterGenerator.mjs'
3+
import iterableToArray from './iterableToArray.mjs'
4+
import asyncGeneratorFilter from './asyncGeneratorFilter.mjs'
55

66
/**
77
* Returns an array of all the values in `iterable` which pass an asynchronous truth test.
@@ -37,7 +37,7 @@ import filterGenerator from './filterGenerator.mjs'
3737
* // total processing time should be ~ 20ms
3838
*/
3939
async function asyncFilter (iterable, iteratee, queueOrConcurrency = 1) {
40-
return await toArray(filterGenerator(iterable, iteratee, queueOrConcurrency))
40+
return await iterableToArray(asyncGeneratorFilter(iterable, iteratee, queueOrConcurrency))
4141
}
4242

4343
export default asyncFilter

src/find.mjs renamed to src/asyncFind.mjs

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

2-
import findInternal from './findInternal.mjs'
2+
import asyncFindInternal from './asyncFindInternal.mjs'
33
import Queue from './Queue.mjs'
44

55
/**
@@ -27,20 +27,20 @@ import Queue from './Queue.mjs'
2727
* @returns {Promise<any | undefined>} A promise that will be resolved with the first found value or rejected if one of the
2828
* `iteratee` calls throws an exception before finding a value. If no value is found it will return `undefined`.
2929
* @example
30-
* import { find, sleep } from 'modern-async'
30+
* import { asyncFind, sleep } from 'modern-async'
3131
*
3232
* const array = [1, 2, 3, 4, 5]
33-
* const result = await find(array, async (v) => {
33+
* const result = await asyncFind(array, async (v) => {
3434
* // these calls will be performed in parallel with a maximum of 3
3535
* // concurrent calls
3636
* await sleep(Math.random() * 10) // waits a random amount of time between 0ms and 10ms
3737
* return v % 2 === 1
3838
* }, 3)
3939
* console.log(result) // prints 1
4040
*/
41-
async function find (iterable, iteratee, queueOrConcurrency = 1, ordered = false) {
42-
const result = (await findInternal(iterable, iteratee, queueOrConcurrency, ordered))[1]
41+
async function asyncFind (iterable, iteratee, queueOrConcurrency = 1, ordered = false) {
42+
const result = (await asyncFindInternal(iterable, iteratee, queueOrConcurrency, ordered))[1]
4343
return result
4444
}
4545

46-
export default find
46+
export default asyncFind

0 commit comments

Comments
 (0)