From: Chris Duncan <chris@zoso.dev>
Date: Fri, 19 Jun 2026 06:25:30 +0000 (-0700)
Subject: Consolidate labeled blocks used by esbuild.
X-Git-Tag: v1.0.4~3
X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=5a1314fe3cc30a400e5c6e48ec286e2f33b0b692;p=nano25519.git

Consolidate labeled blocks used by esbuild.
---

diff --git a/src/lib/nano25519.ts b/src/lib/nano25519.ts
index 9df7e5b..4043e76 100644
--- a/src/lib/nano25519.ts
+++ b/src/lib/nano25519.ts
@@ -297,14 +297,18 @@ function isBytes (a: unknown): a is Uint8Array<ArrayBuffer> {
 // Create worker module
 function init (): void {
 	try {
-		BROWSER: url = URL.createObjectURL(new Blob([nano25519_worker], { type: 'text/javascript' }))
-		BROWSER: worker = new Worker(url, { type: 'module' })
-		NODE: worker = new NodeWorker(nano25519_worker, {
-			eval: true,
-			stderr: false,
-			stdout: false
-		})
-		NODE: url = worker.threadId.toString()
+		BROWSER: {
+			url = URL.createObjectURL(new Blob([nano25519_worker], { type: 'text/javascript' }))
+			worker = new Worker(url, { type: 'module' })
+		}
+		NODE: {
+			worker = new NodeWorker(nano25519_worker, {
+				eval: true,
+				stderr: false,
+				stdout: false
+			})
+			url = worker.threadId.toString()
+		}
 		console.log(`nano25519 initialized.`)
 		isWorkerReady = true
 	} catch (err: any) {
@@ -339,18 +343,20 @@ async function start (): Promise<void> {
 					reject()
 				}
 			}
-			//@ts-expect-error
-			BROWSER: worker.onerror = err => reject(err.message)
-			//@ts-expect-error
-			BROWSER: worker.onmessage = onstarted
-			//@ts-expect-error
-			NODE: worker.on('error', err => reject(err.message))
-			//@ts-expect-error
-			NODE: worker.on('message', onstarted)
 			console.log(`starting worker`)
 			const id = crypto.randomUUID()
-			BROWSER: worker.postMessage({ url, id, action: 'start' })
-			NODE: worker.postMessage({ data: { url, id, action: 'start' } })
+			BROWSER: {
+				worker = worker as Worker
+				worker.onerror = reject
+				worker.onmessage = onstarted
+				worker.postMessage({ url, id, action: 'start' })
+			}
+			NODE: {
+				worker = worker as unknown as NodeWorker
+				worker.on('error', reject)
+				worker.on('message', onstarted)
+				worker.postMessage({ data: { url, id, action: 'start' } })
+			}
 		})
 	}
 }
@@ -375,19 +381,21 @@ async function dispatch (data: { [key: string]: string | ArrayBuffer | Uint8Arra
 			}
 			resolve(result)
 		}
-		//@ts-expect-error
-		BROWSER: worker.onerror = reject
-		//@ts-expect-error
-		BROWSER: worker.onmessage = onresult
-		//@ts-expect-error
-		NODE: worker.on('error', reject)
-		//@ts-expect-error
-		NODE: worker.on('message', onresult)
 		console.log(`sending data to worker: `, data)
 		data.url = url
 		data.id = crypto.randomUUID()
-		BROWSER: worker.postMessage(data, transfer)
-		NODE: worker.postMessage({ data }, transfer)
+		BROWSER: {
+			worker = worker as Worker
+			worker.onerror = reject
+			worker.onmessage = onresult
+			worker.postMessage(data, transfer)
+		}
+		NODE: {
+			worker = worker as unknown as NodeWorker
+			worker.on('error', reject)
+			worker.on('message', onresult)
+			worker.postMessage({ data }, transfer)
+		}
 	})
 }
 
@@ -406,18 +414,20 @@ async function stop (): Promise<void> {
 				reject(result)
 			}
 		}
-		//@ts-expect-error
-		BROWSER: worker.onerror = reject
-		//@ts-expect-error
-		BROWSER: worker.onmessage = onstop
-		//@ts-expect-error
-		NODE: worker.on('error', reject)
-		//@ts-expect-error
-		NODE: worker.on('message', onstop)
 		console.log(`stopping worker`)
 		const id = crypto.randomUUID()
-		BROWSER: worker.postMessage({ url, id, action: 'stop' })
-		NODE: worker.postMessage({ data: { url, id, action: 'stop' } })
+		BROWSER: {
+			worker = worker as Worker
+			worker.onerror = reject
+			worker.onmessage = onstop
+			worker.postMessage({ url, id, action: 'stop' })
+		}
+		NODE: {
+			worker = worker as unknown as NodeWorker
+			worker.on('error', reject)
+			worker.on('message', onstop)
+			worker.postMessage({ data: { url, id, action: 'stop' } })
+		}
 	})
 }