jaml-ui 0.24.2 → 0.24.4

package/dist/hooks/useSearch.js

@@ -13,6 +13,7 @@ const SEARCH_WORKER_CODE = `
 let MotelyWasm = null;
 let MotelyWasmEvents = null;
 let activeSearch = null;
+let activeSearchRunId = 0;
 
 self.addEventListener('message', async function(e) {
   const msg = e.data;
@@ -35,21 +36,27 @@ self.addEventListener('message', async function(e) {
     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; }
+    const runId = ++activeSearchRunId;
 
     function cleanup() {
       MotelyWasmEvents.notifyResult = () => {};
       MotelyWasmEvents.notifyProgress = () => {};
       MotelyWasmEvents.notifyComplete = () => {};
-      activeSearch = null;
+      if (runId === activeSearchRunId) {
+        activeSearch = null;
+      }
     }
 
     MotelyWasmEvents.notifyResult = function(seed, score, tallyColumns) {
+      if (runId !== activeSearchRunId) return;
       self.postMessage({ type: 'result', seed, score, tallyColumns: Array.from(tallyColumns) });
     };
     MotelyWasmEvents.notifyProgress = function(searched, matching) {
+      if (runId !== activeSearchRunId) return;
       self.postMessage({ type: 'progress', searched: searched.toString(), matching: matching.toString() });
     };
     MotelyWasmEvents.notifyComplete = function(status, searched, matched) {
+      if (runId !== activeSearchRunId) return;
       cleanup();
       self.postMessage({ type: 'complete', status, searched: searched.toString(), matched: matched.toString() });
     };
@@ -80,6 +87,10 @@ self.addEventListener('message', async function(e) {
   }
 
   if (msg.type === 'stop') {
+    activeSearchRunId++;
+    MotelyWasmEvents.notifyResult = () => {};
+    MotelyWasmEvents.notifyProgress = () => {};
+    MotelyWasmEvents.notifyComplete = () => {};
     if (activeSearch) { activeSearch.cancel(); activeSearch = null; }
     self.postMessage({ type: 'cancelled' });
   }
@@ -150,8 +161,14 @@ export function useSearch(motelyWasmUrl) {
                 speedRef.current = { lastSearched: 0n, lastTime: 0, ema: 0 };
                 setState((s) => ({
                     ...s,
-                    status: msg.status === "Completed" ? "completed" : "error",
-                    error: msg.status !== "Completed" ? msg.status : null,
+                    status: msg.status === "Completed"
+                        ? "completed"
+                        : msg.status === "Cancelled"
+                            ? "cancelled"
+                            : "error",
+                    error: msg.status === "Completed" || msg.status === "Cancelled"
+                        ? null
+                        : msg.status,
                     totalSearched: BigInt(msg.searched),
                     matchingSeeds: BigInt(msg.matched),
                     seedsPerSecond: 0,
@@ -177,6 +194,10 @@ export function useSearch(motelyWasmUrl) {
         const worker = workerRef.current;
         if (!worker)
             return;
+        if (!motelyWasmUrl) {
+            setState((s) => ({ ...s, status: "error", error: "motelyWasmUrl is required to start search" }));
+            return;
+        }
         speedRef.current = { lastSearched: 0n, lastTime: 0, ema: 0 };
         setState({ ...INITIAL_STATE, status: "running", tallyLabels: state.tallyLabels });
         const send = () => worker.postMessage(payload);
@@ -193,7 +214,7 @@ export function useSearch(motelyWasmUrl) {
                 }
             };
         }
-    }, [state.tallyLabels]);
+    }, [motelyWasmUrl, state.tallyLabels]);
     const start = useCallback((jaml, count) => {
         sendStart({ type: "start", mode: "random", jaml, count });
     }, [sendStart]);

package/dist/lib/data/constants.js

@@ -1,17 +1,13 @@
-// UI Options derived from local constants (Blueprint retired)
-export const DECK_OPTIONS = ['Red', 'Blue', 'Yellow', 'Green', 'Black', 'Magic', 'Nebula', 'Ghost', 'Abandoned', 'Checkered', 'Painted', 'Anaglyph', 'Plasma', 'Erratic'];
-export const STAKE_OPTIONS = ['White', 'Red', 'Green', 'Black', 'Blue', 'Purple', 'Orange', 'Gold'];
+import { CLAUSE_TYPE_KEYS, DECK_VALUES, EDITION_VALUES, ENHANCEMENT_VALUES, RANK_VALUES, SEAL_VALUES, SOURCE_KEYS, STAKE_VALUES, SUIT_VALUES, } from '../jaml/jamlSchema.js';
+// UI options derived from the shipped JAML schema wherever possible.
+export const DECK_OPTIONS = [...DECK_VALUES];
+export const STAKE_OPTIONS = [...STAKE_VALUES];
 export const ANTE_OPTIONS = [1, 2, 3, 4, 5, 6, 7, 8];
 export const SLOT_OPTIONS = [1, 2, 3, 4, 5];
-export const RANK_OPTIONS = ['2', '3', '4', '5', '6', '7', '8', '9', '10', 'Jack', 'Queen', 'King', 'Ace'];
-export const SUIT_OPTIONS = ['Spades', 'Hearts', 'Diamonds', 'Clubs'];
-export const ENHANCEMENT_OPTIONS = ['Bonus', 'Mult', 'Wild', 'Glass', 'Steel', 'Lucky', 'Stone', 'Gold'];
-export const EDITION_OPTIONS = ['Foil', 'Holographic', 'Polychrome', 'Negative'];
-export const SEAL_OPTIONS = ['Gold', 'Red', 'Blue', 'Purple'];
-export const CLAUSE_TYPES = [
-    'Joker', 'Tarot', 'Planet', 'Spectral', 'Voucher', 'Tag', 'Boss', 'Standardcard', 'StandardCard'
-];
-export const SOURCE_OPTIONS = [
-    'shop', 'arcana_pack', 'celestial_pack', 'spectral_pack', 'buffoon_pack', 'standard_pack',
-    'uncommon_tag', 'rare_tag', 'top_up_tag', 'emperor', 'vagabond', 'judgement', 'wraith'
-];
+export const RANK_OPTIONS = [...RANK_VALUES];
+export const SUIT_OPTIONS = [...SUIT_VALUES];
+export const ENHANCEMENT_OPTIONS = [...ENHANCEMENT_VALUES];
+export const EDITION_OPTIONS = [...EDITION_VALUES];
+export const SEAL_OPTIONS = [...SEAL_VALUES];
+export const CLAUSE_TYPES = [...CLAUSE_TYPE_KEYS];
+export const SOURCE_OPTIONS = [...SOURCE_KEYS];

package/dist/lib/jaml/jamlData.js

@@ -1,7 +1,5 @@
-export const CLAUSE_TYPES = [
-    'joker', 'soulJoker', 'voucher', 'tarotCard', 'planetCard',
-    'spectralCard', 'standardCard', 'tag', 'boss', 'event'
-];
+import { CLAUSE_TYPE_KEYS } from './jamlSchema.js';
+export const CLAUSE_TYPES = [...CLAUSE_TYPE_KEYS];
 export const ARRAY_KEYS = ['antes', 'tags', 'labels'];
 export const JAML_KEYWORDS = [
     'must', 'should', 'mustNot', 'any', 'Any', ...CLAUSE_TYPES, ...ARRAY_KEYS