Skip to content

Commit 5221857

Browse files
committed
More renames
1 parent 3e3f7ad commit 5221857

40 files changed

+274
-274
lines changed

modern-async.d.ts

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ declare module "Deferred" {
2424
get reject(): (v: any) => void;
2525
}
2626
}
27-
declare module "delayCancellable" {
28-
export default delayCancellable;
29-
function delayCancellable(): [Promise<void>, () => boolean];
27+
declare module "asyncDelayCancellable" {
28+
export default asyncDelayCancellable;
29+
function asyncDelayCancellable(): [Promise<void>, () => boolean];
3030
}
3131
declare module "asyncDelay" {
3232
export default asyncDelay;
@@ -63,9 +63,9 @@ 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 "iterableToArray" {
67-
export default iterableToArray;
68-
function iterableToArray<V>(iterable: Iterable<V> | AsyncIterable<V>): Promise<V[]>;
66+
declare module "asyncIterableToArray" {
67+
export default asyncIterableToArray;
68+
function asyncIterableToArray<V>(iterable: Iterable<V> | AsyncIterable<V>): Promise<V[]>;
6969
}
7070
declare module "asyncGeneratorMap" {
7171
export default asyncGeneratorMap;
@@ -112,9 +112,9 @@ declare module "asyncReduceRight" {
112112
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>;
113113
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
}
115-
declare module "sleepCancellable" {
116-
export default sleepCancellable;
117-
function sleepCancellable(amount: number): [Promise<void>, () => boolean];
115+
declare module "asyncSleepCancellable" {
116+
export default asyncSleepCancellable;
117+
function asyncSleepCancellable(amount: number): [Promise<void>, () => boolean];
118118
}
119119
declare module "Scheduler" {
120120
export default Scheduler;
@@ -133,17 +133,17 @@ declare module "Scheduler" {
133133
stop(): void;
134134
}
135135
}
136-
declare module "sleep" {
137-
export default sleep;
138-
function sleep(amount: number): Promise<void>;
136+
declare module "asyncSleep" {
137+
export default asyncSleep;
138+
function asyncSleep(amount: number): Promise<void>;
139139
}
140-
declare module "sleepPreciseCancellable" {
141-
export default sleepPreciseCancellable;
142-
function sleepPreciseCancellable(amount: number): [Promise<void>, () => boolean];
140+
declare module "asyncSleepPreciseCancellable" {
141+
export default asyncSleepPreciseCancellable;
142+
function asyncSleepPreciseCancellable(amount: number): [Promise<void>, () => boolean];
143143
}
144-
declare module "sleepPrecise" {
145-
export default sleepPrecise;
146-
function sleepPrecise(amount: number): Promise<void>;
144+
declare module "asyncSleepPrecise" {
145+
export default asyncSleepPrecise;
146+
function asyncSleepPrecise(amount: number): Promise<void>;
147147
}
148148
declare module "asyncSome" {
149149
export default asyncSome;
@@ -156,17 +156,17 @@ declare module "TimeoutError" {
156156
constructor(message: string);
157157
}
158158
}
159-
declare module "timeout" {
160-
export default timeout;
161-
function timeout<T>(fct: () => Promise<T> | T, amount: number): Promise<T>;
159+
declare module "asyncTimeout" {
160+
export default asyncTimeout;
161+
function asyncTimeout<T>(fct: () => Promise<T> | T, amount: number): Promise<T>;
162162
}
163-
declare module "timeoutPrecise" {
164-
export default timeoutPrecise;
165-
function timeoutPrecise<T>(fct: () => Promise<T> | T, amount: number): Promise<T>;
163+
declare module "asyncTimeoutPrecise" {
164+
export default asyncTimeoutPrecise;
165+
function asyncTimeoutPrecise<T>(fct: () => Promise<T> | T, amount: number): Promise<T>;
166166
}
167-
declare module "reflectStatus" {
168-
export default reflectStatus;
169-
function reflectStatus<T>(fct: () => Promise<T> | T): Promise<PromiseSettledResult<T>>;
167+
declare module "reflectAsyncStatus" {
168+
export default reflectAsyncStatus;
169+
function reflectAsyncStatus<T>(fct: () => Promise<T> | T): Promise<PromiseSettledResult<T>>;
170170
}
171171
declare module "modern-async" {
172172
export { default as asyncIterableWrap } from "asyncIterableWrap";
@@ -175,7 +175,7 @@ declare module "modern-async" {
175175
export { default as CancelledError } from "CancelledError";
176176
export { default as Deferred } from "Deferred";
177177
export { default as asyncDelay } from "asyncDelay";
178-
export { default as delayCancellable } from "delayCancellable";
178+
export { default as asyncDelayCancellable } from "asyncDelayCancellable";
179179
export { default as Delayer } from "Delayer";
180180
export { default as asyncEvery } from "asyncEvery";
181181
export { default as asyncFilter } from "asyncFilter";
@@ -190,14 +190,14 @@ declare module "modern-async" {
190190
export { default as asyncReduce } from "asyncReduce";
191191
export { default as asyncReduceRight } from "asyncReduceRight";
192192
export { default as Scheduler } from "Scheduler";
193-
export { default as sleep } from "sleep";
194-
export { default as sleepCancellable } from "sleepCancellable";
195-
export { default as sleepPrecise } from "sleepPrecise";
196-
export { default as sleepPreciseCancellable } from "sleepPreciseCancellable";
193+
export { default as asyncSleep } from "asyncSleep";
194+
export { default as asyncSleepCancellable } from "asyncSleepCancellable";
195+
export { default as asyncSleepPrecise } from "asyncSleepPrecise";
196+
export { default as asyncSleepPreciseCancellable } from "asyncSleepPreciseCancellable";
197197
export { default as asyncSome } from "asyncSome";
198-
export { default as timeout } from "timeout";
198+
export { default as asyncTimeout } from "asyncTimeout";
199199
export { default as TimeoutError } from "TimeoutError";
200-
export { default as timeoutPrecise } from "timeoutPrecise";
201-
export { default as iterableToArray } from "iterableToArray";
202-
export { default as reflectStatus } from "reflectStatus";
200+
export { default as asyncTimeoutPrecise } from "asyncTimeoutPrecise";
201+
export { default as asyncIterableToArray } from "asyncIterableToArray";
202+
export { default as reflectAsyncStatus } from "reflectAsyncStatus";
203203
}

src/Deferred.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
* internally and can be useful to code other asynchronous helpers.
77
*
88
* @example
9-
* import { Deferred, sleep } from 'modern-async'
9+
* import { Deferred, asyncSleep } from 'modern-async'
1010
*
1111
* const deferred = new Deferred()
1212
*
13-
* sleep(10).then(() => {
13+
* asyncSleep(10).then(() => {
1414
* deferred.resolve('test')
1515
* })
1616
*

src/Queue.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import queueMicrotask from './queueMicrotask.mjs'
1515
* Once a task is completed, its corresponding promise is terminated accordingly.
1616
*
1717
* @example
18-
* import { Queue, sleep } from 'modern-async'
18+
* import { Queue, asyncSleep } from 'modern-async'
1919
*
2020
* const queue = new Queue(3) // create a queue with concurrency 3
2121
*
@@ -25,7 +25,7 @@ import queueMicrotask from './queueMicrotask.mjs'
2525
* for (const i of array) {
2626
* promises.push(queue.exec(async () => {
2727
* console.log(`Starting task ${i}`)
28-
* await sleep(Math.random() * 10) // waits a random amount of time between 0ms and 10ms
28+
* await asyncSleep(Math.random() * 10) // waits a random amount of time between 0ms and 10ms
2929
* console.log(`Ending task ${i}`)
3030
* return i;
3131
* }))

src/Scheduler.mjs

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

2-
import sleepCancellable from './sleepCancellable.mjs'
2+
import asyncSleepCancellable from './asyncSleepCancellable.mjs'
33
import Queue from './Queue.mjs'
44
import assert from 'nanoassert'
55
import asyncWrap from './asyncWrap.mjs'
@@ -12,22 +12,22 @@ import CancelledError from './CancelledError.mjs'
1212
* tasks. Notably it can limit the concurrency of asynchronous tasks running in parallel.
1313
*
1414
* @example
15-
* import { Scheduler, sleep } from 'modern-async'
15+
* import { Scheduler, asyncSleep } from 'modern-async'
1616
*
1717
* let i = 0
1818
* const scheduler = new Scheduler(async () => {
1919
* const taskNbr = i
2020
* i += 1
2121
* console.log(`Starting task ${taskNbr}`)
22-
* await sleep(10) // waits 10ms
22+
* await asyncSleep(10) // waits 10ms
2323
* console.log(`Ending task ${taskNbr}`)
2424
* }, 100) // a scheduler that triggers every 100ms
2525
* // the default configuration uses a maximum concurrency of 1 and doesn't allow pending
2626
* // tasks, which mean that if a task takes more time to complete than the delay it will be skipped
2727
*
2828
* scheduler.start() // starts the scheduler
2929
*
30-
* await sleep(1000) // waits 1s, during that time the task should trigger ~ 9 times
30+
* await asyncSleep(1000) // waits 1s, during that time the task should trigger ~ 9 times
3131
*
3232
* scheduler.stop() // stops the scheduler
3333
* console.log('Scheduler stopped')
@@ -198,13 +198,13 @@ class Scheduler {
198198
this._nbrTriggering += 1
199199
const nextTime = this._initialTime + (this.delay * this._nbrTriggering)
200200
const currentTime = new Date().getTime()
201-
const [promise, cancel] = sleepCancellable(nextTime - currentTime)
201+
const [promise, cancel] = asyncSleepCancellable(nextTime - currentTime)
202202
this._cancelSleep = cancel
203203
promise.then(() => {
204204
this._triggerTask()
205205
this._scheduleSleep()
206206
}, () => {
207-
// ignore cancelled sleep
207+
// ignore cancelled asyncSleep
208208
})
209209
}
210210

src/Scheduler.test.mjs

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

22
import { expect, test } from '@jest/globals'
3-
import sleepPrecise from './sleepPrecise.mjs'
3+
import asyncSleepPrecise from './asyncSleepPrecise.mjs'
44
import Scheduler, { exceptionHandler } from './Scheduler.mjs'
55
import CancelledError from './CancelledError.mjs'
66
import Deferred from './Deferred.mjs'
@@ -21,7 +21,7 @@ test('Scheduler base', async () => {
2121
scheduler.start()
2222
expect(scheduler.started).toBe(true)
2323
d.resolve()
24-
await sleepPrecise(unit * 1.5 * 3)
24+
await asyncSleepPrecise(unit * 1.5 * 3)
2525
scheduler.stop()
2626
expect(scheduler.started).toBe(false)
2727
expect(callCount).toBeGreaterThanOrEqual(3)
@@ -45,7 +45,7 @@ test('Scheduler multi start stop', async () => {
4545
scheduler.start()
4646
expect(scheduler.started).toBe(true)
4747
d.resolve()
48-
await sleepPrecise(unit * 1.5 * 3)
48+
await asyncSleepPrecise(unit * 1.5 * 3)
4949
scheduler.stop()
5050
expect(scheduler.started).toBe(false)
5151
scheduler.stop()
@@ -71,7 +71,7 @@ test('Scheduler startImmediate', async () => {
7171
scheduler.start()
7272
expect(scheduler.started).toBe(true)
7373
d.resolve()
74-
await sleepPrecise(unit * 1.5 * 3)
74+
await asyncSleepPrecise(unit * 1.5 * 3)
7575
scheduler.stop()
7676
expect(scheduler.started).toBe(false)
7777
expect(callCount).toBeGreaterThanOrEqual(4)
@@ -87,13 +87,13 @@ test('Scheduler concurrency 1', async () => {
8787
expect(scheduler.started).toBe(false)
8888
scheduler.start()
8989
expect(scheduler.started).toBe(true)
90-
await sleepPrecise(100)
90+
await asyncSleepPrecise(100)
9191
d.resolve()
9292
expect(scheduler._queue.pending).toBe(0)
9393
scheduler.stop()
9494
expect(scheduler.started).toBe(false)
9595
expect(callCount).toBe(1)
96-
await sleepPrecise(100)
96+
await asyncSleepPrecise(100)
9797
expect(callCount).toBe(1)
9898
})
9999

@@ -109,14 +109,14 @@ test('Scheduler pending', async () => {
109109
expect(scheduler.started).toBe(false)
110110
scheduler.start()
111111
expect(scheduler.started).toBe(true)
112-
await sleepPrecise(150)
112+
await asyncSleepPrecise(150)
113113
expect(scheduler._queue.pending).toBeGreaterThan(3)
114114
scheduler.stop()
115115
expect(scheduler._queue.pending).toBe(0)
116116
expect(scheduler.started).toBe(false)
117117
expect(callCount).toBe(1)
118118
d.resolve()
119-
await sleepPrecise(150)
119+
await asyncSleepPrecise(150)
120120
expect(callCount).toBe(1)
121121
})
122122

@@ -132,13 +132,13 @@ test('Scheduler concurrency 2', async () => {
132132
expect(scheduler.started).toBe(false)
133133
scheduler.start()
134134
expect(scheduler.started).toBe(true)
135-
await sleepPrecise(150)
135+
await asyncSleepPrecise(150)
136136
expect(scheduler._queue.pending).toBe(0)
137137
scheduler.stop()
138138
expect(scheduler.started).toBe(false)
139139
expect(callCount).toBe(2)
140140
d.resolve()
141-
await sleepPrecise(150)
141+
await asyncSleepPrecise(150)
142142
expect(callCount).toBe(2)
143143
})
144144

src/asyncDelay.mjs

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

2-
import delayCancellable from './delayCancellable.mjs'
2+
import asyncDelayCancellable from './asyncDelayCancellable.mjs'
33

44
/**
55
* A function returning a promise that will be resolved in a later task of the event loop.
@@ -15,7 +15,7 @@ import delayCancellable from './delayCancellable.mjs'
1515
* console.log('this executes in another tick of the event loop')
1616
*/
1717
async function asyncDelay () {
18-
return delayCancellable()[0]
18+
return asyncDelayCancellable()[0]
1919
}
2020

2121
export default asyncDelay

src/delayCancellable.mjs renamed to src/asyncDelayCancellable.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ import clearImmediate from 'core-js-pure/features/clear-immediate.js'
1717
* * The cancel function. It will return a boolean that will be true if the promise was effectively cancelled,
1818
* false otherwise.
1919
* @example
20-
* import { delayCancellable, CancelledError } from 'modern-async'
20+
* import { asyncDelayCancellable, CancelledError } from 'modern-async'
2121
*
22-
* const [promise, cancel] = delayCancellable()
22+
* const [promise, cancel] = asyncDelayCancellable()
2323
* cancel()
2424
* try {
2525
* await promise
2626
* } catch (e) {
2727
* console.log(e instanceof CancelledError) // prints true
2828
* }
2929
*/
30-
function delayCancellable () {
30+
function asyncDelayCancellable () {
3131
const deferred = new Deferred()
3232
const id = setImmediate(deferred.resolve)
3333
let terminated = false
@@ -45,4 +45,4 @@ function delayCancellable () {
4545
}]
4646
}
4747

48-
export default delayCancellable
48+
export default asyncDelayCancellable

src/delayCancellable.test.mjs renamed to src/asyncDelayCancellable.test.mjs

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

22
import { expect, test } from '@jest/globals'
3-
import delayCancellable from './delayCancellable.mjs'
3+
import asyncDelayCancellable from './asyncDelayCancellable.mjs'
44
import CancelledError from './CancelledError.mjs'
55

6-
test('delayCancellable', async () => {
6+
test('asyncDelayCancellable', async () => {
77
const events = []
8-
const p = delayCancellable()[0].then(() => {
8+
const p = asyncDelayCancellable()[0].then(() => {
99
events.push('resolved')
1010
})
1111
Promise.resolve().then(() => {
@@ -16,8 +16,8 @@ test('delayCancellable', async () => {
1616
expect(events).toStrictEqual(['microtask', 'resolved'])
1717
})
1818

19-
test('delayCancellable cancel', async () => {
20-
const [p, cancel] = delayCancellable()
19+
test('asyncDelayCancellable cancel', async () => {
20+
const [p, cancel] = asyncDelayCancellable()
2121
const res = cancel()
2222
expect(res).toBe(true)
2323
try {

src/asyncEvery.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import asyncFindIndex from './asyncFindIndex.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 { asyncEvery, sleep } from 'modern-async'
32+
* import { asyncEvery, asyncSleep } from 'modern-async'
3333
*
3434
* const array = [1, 2, 3]
3535
*
3636
* const result = await asyncEvery(array, async (v) => {
3737
* // these calls will be performed in parallel with a maximum of 2
3838
* // concurrent calls
39-
* await sleep(10) // waits 10ms
39+
* await asyncSleep(10) // waits 10ms
4040
* return v > 0
4141
* }, 2)
4242
* console.log(result) // prints true

0 commit comments

Comments
 (0)