@gnufoo/canaad 0.1.2 → 0.1.3

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@gnufoo/canaad",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "main": "canaad_wasm.js",
   "types": "canaad_wasm.d.ts",
   "exports": {
     ".": "./canaad_wasm.js",
     "./meta": "./meta.js",
-    "./tool": "./tool.js"
+    "./tool": "./tool.js",
+    "./wasm": "./canaad_wasm_bg.wasm"
   },
   "dependencies": {
     "zod": "^3.24.0"

package/tool.d.ts

@@ -1,5 +1,19 @@
-import { meta, CanaadInput, CanaadOutput } from './meta.js';
+import type { meta, CanaadInput, CanaadOutput } from './meta.js';
 
-export declare const toolDefinition: typeof meta & {
+/**
+ * Initialize the WASM module.
+ *
+ * @param wasmSource - Optional WASM source:
+ *   - Browser: omit (fetches automatically)
+ *   - Cloudflare Workers: pass WebAssembly.Module from import
+ */
+export function ensureReady(wasmSource?:
+  | WebAssembly.Module
+  | ArrayBuffer
+  | URL
+  | string
+): Promise<void>;
+
+export const toolDefinition: typeof meta & {
   execute(input: CanaadInput): Promise<CanaadOutput>;
 };

package/tool.js

@@ -1,18 +1,49 @@
 import { meta, inputSchema } from './meta.js';
-import init, { canonicalize, canonicalize_string, hash, validate, AadBuilder } from './canaad_wasm.js';
+import init, { canonicalize, canonicalizeString, hash, validate, AadBuilder } from './canaad_wasm.js';
 
-let ready = false;
-async function ensureReady() {
-  if (!ready) { await init(); ready = true; }
+// --- Initialization state ---
+let initialized = false;
+let initPromise = null;
+
+/**
+ * Initialize the WASM module.
+ *
+ * @param {WebAssembly.Module | ArrayBuffer | URL | string} [wasmSource]
+ *   - Browser: omit or pass URL/string path (uses fetch)
+ *   - Cloudflare Workers: pass the imported WebAssembly.Module
+ *
+ * @example
+ * // Browser (fetch automatically)
+ * await ensureReady();
+ *
+ * @example
+ * // Cloudflare Workers (pre-compiled module)
+ * import wasmModule from '@gnufoo/canaad/wasm';
+ * await ensureReady(wasmModule);
+ */
+export async function ensureReady(wasmSource) {
+  if (initialized) return;
+  if (initPromise) return initPromise;
+
+  initPromise = init(wasmSource).then(() => {
+    initialized = true;
+  });
+
+  return initPromise;
 }
 
+// --- Helpers ---
 const bytesToHex = (bytes) => Array.from(bytes).map(b => b.toString(16).padStart(2, '0')).join('');
 const bytesToBase64 = (bytes) => btoa(String.fromCharCode(...bytes));
 
+// --- Tool Definition ---
 export const toolDefinition = {
   ...meta,
+
   async execute(rawInput) {
+    // Default initialization (browser) - no wasmSource needed
     await ensureReady();
+
     const input = inputSchema.parse(rawInput);
 
     switch (input.action) {
@@ -20,7 +51,7 @@ export const toolDefinition = {
         if (input.outputFormat === 'bytes') {
           return { action: 'canonicalize', output: Array.from(canonicalize(input.input)), outputFormat: 'bytes' };
         }
-        return { action: 'canonicalize', output: canonicalize_string(input.input), outputFormat: 'string' };
+        return { action: 'canonicalize', output: canonicalizeString(input.input), outputFormat: 'string' };
       }
       case 'validate':
         return { action: 'validate', valid: validate(input.input) };
@@ -32,12 +63,12 @@ export const toolDefinition = {
         let b = new AadBuilder().tenant(input.tenant).resource(input.resource).purpose(input.purpose);
         if (input.timestamp !== undefined) b = b.timestamp(input.timestamp);
         for (const ext of input.extensions || []) {
-          b = typeof ext.value === 'string' ? b.extension_string(ext.key, ext.value) : b.extension_int(ext.key, ext.value);
+          b = typeof ext.value === 'string' ? b.extensionString(ext.key, ext.value) : b.extensionInt(ext.key, ext.value);
         }
         if (input.outputFormat === 'bytes') {
           return { action: 'build', output: Array.from(b.build()), outputFormat: 'bytes' };
         }
-        return { action: 'build', output: b.build_string(), outputFormat: 'string' };
+        return { action: 'build', output: b.buildString(), outputFormat: 'string' };
       }
     }
   },