Skip to content

Commit 6e9dbd7

Browse files
authored
Fix promise type for new TypeScript (#350)
* Update typescript * Fix promise types resolve() now expects one input
1 parent d8aa0c7 commit 6e9dbd7

File tree

4 files changed

+101
-112
lines changed

4 files changed

+101
-112
lines changed

package-lock.json

+97-108
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"ts-node": "^9.0.0",
9797
"tslint": "^6.1.3",
9898
"tslint-config-prettier": "^1.18.0",
99-
"typescript": "^4.0.5",
99+
"typescript": "^4.2.3",
100100
"wavy": "^1.0.4",
101101
"webpack": "^4.44.2",
102102
"worker-plugin": "^5.0.0"

src/master/pool.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ class WorkerPool<ThreadType extends Thread> implements Pool<ThreadType> {
266266
return taskFailures
267267
}
268268

269-
await new Promise((resolve, reject) => {
269+
await new Promise<void>((resolve, reject) => {
270270
const subscription = this.eventObservable.subscribe({
271271
next(event) {
272272
if (event.type === PoolEventType.taskQueueDrained) {

src/promise.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const doNothing = () => undefined
77
export function createPromiseWithResolver<T>(): [Promise<T>, (result: T) => void] {
88
let alreadyResolved = false
99
let resolvedTo: T
10-
let resolver: () => void = doNothing
10+
let resolver: (value: T | PromiseLike<T>) => void = doNothing
1111

1212
const promise = new Promise<T>(resolve => {
1313
if (alreadyResolved) {
@@ -19,7 +19,7 @@ export function createPromiseWithResolver<T>(): [Promise<T>, (result: T) => void
1919
const exposedResolver = (value: T) => {
2020
alreadyResolved = true
2121
resolvedTo = value
22-
resolver()
22+
resolver(resolvedTo)
2323
}
2424
return [promise, exposedResolver]
2525
}

0 commit comments

Comments
 (0)