From 55e71588f7e847d0b0e3b49bff59714c8f0c653f Mon Sep 17 00:00:00 2001
From: Chris Duncan <chris@zoso.dev>
Date: Sun, 12 Jan 2025 14:08:16 -0800
Subject: [PATCH] Use main to define API. Pollute global namespace further with
 new NanoPow encapsulating object. Fix test of validate function.

---
 src/classes/index.ts | 3 +--
 src/global.ts        | 6 ++++--
 src/main.ts          | 8 +++-----
 test.html            | 9 ++++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/classes/index.ts b/src/classes/index.ts
index c3e2a3c..844bc66 100644
--- a/src/classes/index.ts
+++ b/src/classes/index.ts
@@ -24,5 +24,4 @@ const NanoPow = {
 	search: isGpuSupported ? NanoPowGpu.search : isGlSupported ? NanoPowGl.search : null,
 	validate: isGpuSupported ? NanoPowGpu.validate : isGlSupported ? NanoPowGl.validate : null,
 }
-export { NanoPowGl, NanoPowGpu, NanoPow }
-export default NanoPow
+export { NanoPow, NanoPowGl, NanoPowGpu }
diff --git a/src/global.ts b/src/global.ts
index d41eefb..b3d4d1c 100644
--- a/src/global.ts
+++ b/src/global.ts
@@ -1,5 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import * as main from './main.js'
-(globalThis as any).NanoPow ??= main
+import { NanoPow as np, NanoPowGl as gl, NanoPowGpu as gpu} from './main.js';
+(globalThis as any).NanoPow ??= np;
+(globalThis as any).NanoPowGl ??= gl;
+(globalThis as any).NanoPowGpu ??= gpu;
diff --git a/src/main.ts b/src/main.ts
index 1a0d874..695da14 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import { NanoPowGl, NanoPowGpu } from "#classes"
-export {
-	NanoPowGl,
-	NanoPowGpu
-}
+import { NanoPow, NanoPowGl, NanoPowGpu } from "#classes"
+export { NanoPow, NanoPowGl, NanoPowGpu }
+export default NanoPow
diff --git a/test.html b/test.html
index d395eee..4d85bc7 100644
--- a/test.html
+++ b/test.html
@@ -12,7 +12,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 	<!-- <script type="module" src="https://cdn.jsdelivr.net/npm/nano-pow@1.1.0/dist/global.min.js"></script> -->
 	<script type="module" src="https://cdn.jsdelivr.net/npm/nano-webgl-pow@1.1.1/nano-webgl-pow.js"></script>
 	<script type="module">
-		const { NanoPowGl, NanoPowGpu } = NanoPow
 		const COUNT = 0x20
 		let times = []
 
@@ -60,10 +59,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
 		}
 
 		console.log(`%cNanoWebGpu`, 'color:green', 'Testing validation function')
-		const expectBad = await NanoPowGpu.validate('0000000000000000', '0000000000000000000000000000000000000000000000000000000000000000')
-		console.log(`validate() output for bad nonce is ${expectBad === false ? 'incorrect' : 'correct'}`)
-		const expectGood = await NanoPowGpu.validate('47c83266398728cf', '92BA74A7D6DC7557F3EDA95ADC6341D51AC777A0A6FF0688A5C492AB2B2CB40D')
-		console.log(`validate() output for good nonce is ${expectGood === true ? 'correct' : 'incorrect'}`)
+		const expectFalse = await NanoPowGpu.validate('0000000000000000', '0000000000000000000000000000000000000000000000000000000000000000')
+		console.log(`validate() output for bad nonce is ${expectFalse === false ? 'correct' : 'incorrect'}`)
+		const expectTrue = await NanoPowGpu.validate('47c83266398728cf', '92BA74A7D6DC7557F3EDA95ADC6341D51AC777A0A6FF0688A5C492AB2B2CB40D')
+		console.log(`validate() output for good nonce is ${expectTrue === true ? 'correct' : 'incorrect'}`)
 
 		console.log(`%cNanoPowGpu `, 'color:green', `Calculate proof-of-work for ${COUNT} unique send block hashes`)
 		times = []
-- 
2.34.1