jaml-ui 0.22.4 → 0.22.5

package/dist/hooks/searchWorkerCode.d.ts

@@ -1 +1 @@
-export declare const SEARCH_WORKER_CODE = "\nlet MotelyWasm = null;\nlet MotelyWasmEvents = null;\nlet Filters = null;\nlet activeSearch = null;\n\nself.addEventListener('message', async function(e) {\n  const msg = e.data;\n\n  if (msg.type === 'init') {\n    try {\n      const mod = await import(msg.url);\n      await mod.default.boot();\n      MotelyWasm = mod.MotelyWasm;\n      MotelyWasmEvents = mod.MotelyWasmEvents;\n      Filters = mod.Filters;\n      self.postMessage({ type: 'ready' });\n    } catch (err) {\n      self.postMessage({ type: 'error', message: String(err) });\n    }\n    return;\n  }\n\n  if (msg.type === 'start') {\n    if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }\n    const validation = MotelyWasm.validateJaml(msg.jaml);\n    if (validation !== 'valid') { self.postMessage({ type: 'error', message: validation }); return; }\n\n    let rId, pId, cId;\n    function cleanup() {\n      MotelyWasmEvents.onResult.unsubscribeById(rId);\n      MotelyWasmEvents.onProgress.unsubscribeById(pId);\n      MotelyWasmEvents.onComplete.unsubscribeById(cId);\n      activeSearch = null;\n    }\n\n    rId = MotelyWasmEvents.onResult.subscribe(function(seed, score, tallyColumns) {\n      self.postMessage({ type: 'result', seed, score, tallyColumns: Array.from(tallyColumns) });\n    });\n    pId = MotelyWasmEvents.onProgress.subscribe(function(searched, matching) {\n      self.postMessage({ type: 'progress', searched: searched.toString(), matching: matching.toString() });\n    });\n    cId = MotelyWasmEvents.onComplete.subscribe(function(status, searched, matched) {\n      cleanup();\n      self.postMessage({ type: 'complete', status, searched: searched.toString(), matched: matched.toString() });\n    });\n\n    try {\n      const mode = msg.mode || 'random';\n\n      if (mode === 'random') {\n        activeSearch = MotelyWasm.startRandomSearch(msg.jaml, msg.count);\n      } else if (mode === 'aesthetic') {\n        activeSearch = MotelyWasm.startAestheticSearch(msg.jaml, msg.aesthetic);\n      } else if (mode === 'seedList') {\n        activeSearch = MotelyWasm.startSeedListSearch(msg.jaml, msg.seeds);\n      } else if (mode === 'keyword') {\n        activeSearch = MotelyWasm.startKeywordSearch(msg.jaml, msg.keywords, msg.padding || '');\n      } else if (mode === 'sequential') {\n        activeSearch = MotelyWasm.startSequentialSearch(msg.jaml, msg.batchCharCount, BigInt(msg.startBatch), BigInt(msg.endBatch));\n      } else {\n        self.postMessage({ type: 'error', message: 'Unknown search mode: ' + mode });\n        cleanup();\n        return;\n      }\n    } catch (err) {\n      cleanup();\n      self.postMessage({ type: 'error', message: String(err) });\n    }\n    return;\n  }\n\n  if (msg.type === 'stop') {\n    if (activeSearch) { activeSearch.cancel(); activeSearch = null; }\n    self.postMessage({ type: 'cancelled' });\n  }\n\n  if (msg.type === 'get_tally_labels') {\n    if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }\n    try {\n      const labels = MotelyWasm.getTallyLabels(msg.jaml);\n      self.postMessage({ type: 'tally_labels', labels });\n    } catch (err) {\n      self.postMessage({ type: 'error', message: String(err) });\n    }\n  }\n});\n";
+export declare const SEARCH_WORKER_CODE = "\nlet MotelyWasm = null;\nlet MotelyWasmEvents = null;\nlet activeSearch = null;\n\nself.addEventListener('message', async function(e) {\n  const msg = e.data;\n\n  if (msg.type === 'init') {\n    try {\n      const mod = await import(msg.url);\n      await mod.default.boot();\n      const motely = mod.Motely;\n      MotelyWasm = motely.MotelyWasm;\n      MotelyWasmEvents = motely.MotelyWasmEvents;\n      self.postMessage({ type: 'ready' });\n    } catch (err) {\n      self.postMessage({ type: 'error', message: String(err) });\n    }\n    return;\n  }\n\n  if (msg.type === 'start') {\n    if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }\n    const validation = MotelyWasm.validateJaml(msg.jaml);\n    if (validation !== 'valid') { self.postMessage({ type: 'error', message: validation }); return; }\n\n    function cleanup() {\n      MotelyWasmEvents.notifyResult = () => {};\n      MotelyWasmEvents.notifyProgress = () => {};\n      MotelyWasmEvents.notifyComplete = () => {};\n      activeSearch = null;\n    }\n\n    MotelyWasmEvents.notifyResult = function(seed, score, tallyColumns) {\n      self.postMessage({ type: 'result', seed, score, tallyColumns: Array.from(tallyColumns) });\n    };\n    MotelyWasmEvents.notifyProgress = function(searched, matching) {\n      self.postMessage({ type: 'progress', searched: searched.toString(), matching: matching.toString() });\n    };\n    MotelyWasmEvents.notifyComplete = function(status, searched, matched) {\n      cleanup();\n      self.postMessage({ type: 'complete', status, searched: searched.toString(), matched: matched.toString() });\n    };\n\n    try {\n      const mode = msg.mode || 'random';\n      if (mode === 'random') {\n        activeSearch = MotelyWasm.startRandomSearch(msg.jaml, msg.count);\n      } else if (mode === 'aesthetic') {\n        activeSearch = MotelyWasm.startAestheticSearch(msg.jaml, msg.aesthetic);\n      } else if (mode === 'seedList') {\n        activeSearch = MotelyWasm.startSeedListSearch(msg.jaml, msg.seeds);\n      } else if (mode === 'keyword') {\n        activeSearch = MotelyWasm.startKeywordSearch(msg.jaml, msg.keywords, msg.padding || '');\n      } else if (mode === 'sequential') {\n        activeSearch = MotelyWasm.startSequentialSearch(msg.jaml, msg.batchCharCount, BigInt(msg.startBatch), BigInt(msg.endBatch));\n      } else {\n        self.postMessage({ type: 'error', message: 'Unknown search mode: ' + mode });\n        cleanup();\n        return;\n      }\n    } catch (err) {\n      cleanup();\n      self.postMessage({ type: 'error', message: String(err) });\n    }\n    return;\n  }\n\n  if (msg.type === 'stop') {\n    if (activeSearch) { activeSearch.cancel(); activeSearch = null; }\n    self.postMessage({ type: 'cancelled' });\n  }\n\n  if (msg.type === 'get_tally_labels') {\n    if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }\n    try {\n      const labels = MotelyWasm.getTallyLabels(msg.jaml);\n      self.postMessage({ type: 'tally_labels', labels: Array.from(labels) });\n    } catch (err) {\n      self.postMessage({ type: 'error', message: String(err) });\n    }\n  }\n});\n";

package/dist/hooks/searchWorkerCode.js

@@ -1,7 +1,6 @@
 export const SEARCH_WORKER_CODE = `
 let MotelyWasm = null;
 let MotelyWasmEvents = null;
-let Filters = null;
 let activeSearch = null;
 
 self.addEventListener('message', async function(e) {
@@ -11,9 +10,9 @@ self.addEventListener('message', async function(e) {
     try {
       const mod = await import(msg.url);
       await mod.default.boot();
-      MotelyWasm = mod.MotelyWasm;
-      MotelyWasmEvents = mod.MotelyWasmEvents;
-      Filters = mod.Filters;
+      const motely = mod.Motely;
+      MotelyWasm = motely.MotelyWasm;
+      MotelyWasmEvents = motely.MotelyWasmEvents;
       self.postMessage({ type: 'ready' });
     } catch (err) {
       self.postMessage({ type: 'error', message: String(err) });
@@ -26,28 +25,26 @@ self.addEventListener('message', async function(e) {
     const validation = MotelyWasm.validateJaml(msg.jaml);
     if (validation !== 'valid') { self.postMessage({ type: 'error', message: validation }); return; }
 
-    let rId, pId, cId;
     function cleanup() {
-      MotelyWasmEvents.onResult.unsubscribeById(rId);
-      MotelyWasmEvents.onProgress.unsubscribeById(pId);
-      MotelyWasmEvents.onComplete.unsubscribeById(cId);
+      MotelyWasmEvents.notifyResult = () => {};
+      MotelyWasmEvents.notifyProgress = () => {};
+      MotelyWasmEvents.notifyComplete = () => {};
       activeSearch = null;
     }
 
-    rId = MotelyWasmEvents.onResult.subscribe(function(seed, score, tallyColumns) {
+    MotelyWasmEvents.notifyResult = function(seed, score, tallyColumns) {
       self.postMessage({ type: 'result', seed, score, tallyColumns: Array.from(tallyColumns) });
-    });
-    pId = MotelyWasmEvents.onProgress.subscribe(function(searched, matching) {
+    };
+    MotelyWasmEvents.notifyProgress = function(searched, matching) {
       self.postMessage({ type: 'progress', searched: searched.toString(), matching: matching.toString() });
-    });
-    cId = MotelyWasmEvents.onComplete.subscribe(function(status, searched, matched) {
+    };
+    MotelyWasmEvents.notifyComplete = function(status, searched, matched) {
       cleanup();
       self.postMessage({ type: 'complete', status, searched: searched.toString(), matched: matched.toString() });
-    });
+    };
 
     try {
       const mode = msg.mode || 'random';
-
       if (mode === 'random') {
         activeSearch = MotelyWasm.startRandomSearch(msg.jaml, msg.count);
       } else if (mode === 'aesthetic') {
@@ -79,7 +76,7 @@ self.addEventListener('message', async function(e) {
     if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }
     try {
       const labels = MotelyWasm.getTallyLabels(msg.jaml);
-      self.postMessage({ type: 'tally_labels', labels });
+      self.postMessage({ type: 'tally_labels', labels: Array.from(labels) });
     } catch (err) {
       self.postMessage({ type: 'error', message: String(err) });
     }

package/dist/hooks/useSearch.js

@@ -1,5 +1,6 @@
 "use client";
 import { useState, useCallback, useRef, useEffect } from "react";
+import { SEARCH_WORKER_CODE } from "./searchWorkerCode.js";
 const INITIAL_STATE = {
     results: [],
     totalSearched: 0n,
@@ -9,92 +10,6 @@ const INITIAL_STATE = {
     seedsPerSecond: 0,
     tallyLabels: [],
 };
-const SEARCH_WORKER_CODE = `
-let MotelyWasm = null;
-let MotelyWasmEvents = null;
-let activeSearch = null;
-
-self.addEventListener('message', async function(e) {
-  const msg = e.data;
-
-  if (msg.type === 'init') {
-    try {
-      const mod = await import(msg.url);
-      await mod.default.boot();
-      const motely = mod.Motely;
-      MotelyWasm = motely.MotelyWasm;
-      MotelyWasmEvents = motely.MotelyWasmEvents;
-      self.postMessage({ type: 'ready' });
-    } catch (err) {
-      self.postMessage({ type: 'error', message: String(err) });
-    }
-    return;
-  }
-
-  if (msg.type === 'start') {
-    if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }
-    const validation = MotelyWasm.validateJaml(msg.jaml);
-    if (validation !== 'valid') { self.postMessage({ type: 'error', message: validation }); return; }
-
-    function cleanup() {
-      MotelyWasmEvents.notifyResult = () => {};
-      MotelyWasmEvents.notifyProgress = () => {};
-      MotelyWasmEvents.notifyComplete = () => {};
-      activeSearch = null;
-    }
-
-    MotelyWasmEvents.notifyResult = function(seed, score, tallyColumns) {
-      self.postMessage({ type: 'result', seed, score, tallyColumns: Array.from(tallyColumns) });
-    };
-    MotelyWasmEvents.notifyProgress = function(searched, matching) {
-      self.postMessage({ type: 'progress', searched: searched.toString(), matching: matching.toString() });
-    };
-    MotelyWasmEvents.notifyComplete = function(status, searched, matched) {
-      cleanup();
-      self.postMessage({ type: 'complete', status, searched: searched.toString(), matched: matched.toString() });
-    };
-
-    try {
-      const mode = msg.mode || 'random';
-
-      if (mode === 'random') {
-        activeSearch = MotelyWasm.startRandomSearch(msg.jaml, msg.count);
-      } else if (mode === 'aesthetic') {
-        activeSearch = MotelyWasm.startAestheticSearch(msg.jaml, msg.aesthetic);
-      } else if (mode === 'seedList') {
-        activeSearch = MotelyWasm.startSeedListSearch(msg.jaml, msg.seeds);
-      } else if (mode === 'keyword') {
-        activeSearch = MotelyWasm.startKeywordSearch(msg.jaml, msg.keywords, msg.padding || '');
-      } else if (mode === 'sequential') {
-        activeSearch = MotelyWasm.startSequentialSearch(msg.jaml, msg.batchCharCount, BigInt(msg.startBatch), BigInt(msg.endBatch));
-      } else {
-        self.postMessage({ type: 'error', message: 'Unknown search mode: ' + mode });
-        cleanup();
-        return;
-      }
-    } catch (err) {
-      cleanup();
-      self.postMessage({ type: 'error', message: String(err) });
-    }
-    return;
-  }
-
-  if (msg.type === 'stop') {
-    if (activeSearch) { activeSearch.cancel(); activeSearch = null; }
-    self.postMessage({ type: 'cancelled' });
-  }
-
-  if (msg.type === 'get_tally_labels') {
-    if (!MotelyWasm) { self.postMessage({ type: 'error', message: 'Not initialized' }); return; }
-    try {
-      const labels = MotelyWasm.getTallyLabels(msg.jaml);
-      self.postMessage({ type: 'tally_labels', labels: Array.from(labels) });
-    } catch (err) {
-      self.postMessage({ type: 'error', message: String(err) });
-    }
-  }
-});
-`;
 function createWorker() {
     const blob = new Blob([SEARCH_WORKER_CODE], { type: "application/javascript" });
     return new Worker(URL.createObjectURL(blob), { type: "module" });

package/dist/index.d.ts

@@ -22,6 +22,7 @@ export { extractVisualJamlItems, type JamlPreviewGroups, type JamlPreviewItem, t
 export { useMotelyStream, type StreamItem, type StreamState } from "./hooks/useShopStream.js";
 export { useSearch, type SearchResult, type SearchStatus, type UseSearchState, } from "./hooks/useSearch.js";
 export { useAnalyzer, type AnalyzerStatus, type AnalyzerLive, type MotelyJsRunState, } from "./hooks/useAnalyzer.js";
+export { SEARCH_WORKER_CODE } from "./hooks/searchWorkerCode.js";
 export { setMotelyEnums as setMotelyDisplayEnums } from "./motelyDisplay.js";
 export { setMotelyEnums as setMotelyDecoderEnums } from "./decode/motelyItemDecoder.js";
 export { JamlAestheticSelector, type JamlAestheticSelectorProps, type JamlAestheticOption, } from "./components/JamlAestheticSelector.js";

package/dist/index.js

@@ -23,6 +23,7 @@ export { extractVisualJamlItems, } from "./utils/jamlMapPreview.js";
 export { useMotelyStream } from "./hooks/useShopStream.js";
 export { useSearch, } from "./hooks/useSearch.js";
 export { useAnalyzer, } from "./hooks/useAnalyzer.js";
+export { SEARCH_WORKER_CODE } from "./hooks/searchWorkerCode.js";
 // Setter pattern for motely-wasm runtime enums. Consumers boot motely-wasm
 // and call setMotelyEnums(Motely) once after boot so display/decoder helpers
 // can resolve enum keys without statically importing motely-wasm.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaml-ui",
-  "version": "0.22.4",
+  "version": "0.22.5",
   "description": "Balatro rendering components, sprite metadata, and optional Motely helpers for React apps.",
   "type": "module",
   "main": "./dist/index.js",