jaml-ui 0.13.1 → 0.14.1

package/dist/hooks/useSearch.js

@@ -8,16 +8,20 @@ function createWorker(motelyWasmUrl) {
     worker.postMessage({ type: "init", url: motelyWasmUrl });
     return worker;
 }
+const INITIAL_STATE = {
+    results: [],
+    totalSearched: 0n,
+    matchingSeeds: 0n,
+    status: "idle",
+    error: null,
+    seedsPerSecond: 0,
+    tallyLabels: [],
+};
 export function useSearch(motelyWasmUrl) {
-    const [state, setState] = useState({
-        results: [],
-        totalSearched: 0n,
-        matchingSeeds: 0n,
-        status: "idle",
-        error: null,
-    });
+    const [state, setState] = useState(INITIAL_STATE);
     const workerRef = useRef(null);
     const readyRef = useRef(false);
+    const speedRef = useRef({ lastSearched: 0n, lastTime: 0, ema: 0 });
     useEffect(() => {
         setState((s) => ({ ...s, status: "booting" }));
         const worker = createWorker(motelyWasmUrl);
@@ -30,16 +34,51 @@ export function useSearch(motelyWasmUrl) {
                 setState((s) => s.status === "booting" ? { ...s, status: "idle" } : s);
             }
             else if (msg.type === "result") {
-                setState((s) => ({ ...s, results: [...s.results, { seed: msg.seed, score: msg.score }] }));
+                setState((s) => ({
+                    ...s,
+                    results: [...s.results, {
+                            seed: msg.seed,
+                            score: msg.score,
+                            tallyColumns: msg.tallyColumns,
+                        }],
+                }));
             }
             else if (msg.type === "progress") {
-                setState((s) => ({ ...s, totalSearched: BigInt(msg.searched), matchingSeeds: BigInt(msg.matching) }));
+                const searched = BigInt(msg.searched);
+                const matching = BigInt(msg.matching);
+                const now = performance.now();
+                const ref = speedRef.current;
+                let sps = ref.ema;
+                if (ref.lastTime > 0) {
+                    const dtMs = now - ref.lastTime;
+                    if (dtMs > 0) {
+                        const delta = Number(searched - ref.lastSearched);
+                        const instantSps = delta / (dtMs / 1000);
+                        sps = ref.ema === 0 ? instantSps : ref.ema * 0.7 + instantSps * 0.3;
+                    }
+                }
+                ref.lastSearched = searched;
+                ref.lastTime = now;
+                ref.ema = sps;
+                setState((s) => ({ ...s, totalSearched: searched, matchingSeeds: matching, seedsPerSecond: Math.round(sps) }));
             }
             else if (msg.type === "complete") {
-                setState((s) => ({ ...s, status: msg.status === "Completed" ? "completed" : "error", error: msg.status !== "Completed" ? msg.status : null, totalSearched: BigInt(msg.searched), matchingSeeds: BigInt(msg.matched) }));
+                speedRef.current = { lastSearched: 0n, lastTime: 0, ema: 0 };
+                setState((s) => ({
+                    ...s,
+                    status: msg.status === "Completed" ? "completed" : "error",
+                    error: msg.status !== "Completed" ? msg.status : null,
+                    totalSearched: BigInt(msg.searched),
+                    matchingSeeds: BigInt(msg.matched),
+                    seedsPerSecond: 0,
+                }));
             }
             else if (msg.type === "cancelled") {
-                setState((s) => ({ ...s, status: "cancelled" }));
+                speedRef.current = { lastSearched: 0n, lastTime: 0, ema: 0 };
+                setState((s) => ({ ...s, status: "cancelled", seedsPerSecond: 0 }));
+            }
+            else if (msg.type === "tally_labels") {
+                setState((s) => ({ ...s, tallyLabels: msg.labels }));
             }
             else if (msg.type === "error") {
                 setState((s) => ({ ...s, status: "error", error: msg.message }));
@@ -50,13 +89,15 @@ export function useSearch(motelyWasmUrl) {
             workerRef.current = null;
         };
     }, [motelyWasmUrl]);
-    const start = useCallback((jaml, count) => {
+    const sendStart = useCallback((payload) => {
         const worker = workerRef.current;
         if (!worker)
             return;
-        setState({ results: [], totalSearched: 0n, matchingSeeds: 0n, status: "running", error: null });
+        speedRef.current = { lastSearched: 0n, lastTime: 0, ema: 0 };
+        setState({ ...INITIAL_STATE, status: "running", tallyLabels: state.tallyLabels });
+        const send = () => worker.postMessage(payload);
         if (readyRef.current) {
-            worker.postMessage({ type: "start", jaml, count });
+            send();
         }
         else {
             const orig = worker.onmessage;
@@ -64,16 +105,31 @@ export function useSearch(motelyWasmUrl) {
                 orig?.call(worker, e);
                 if (e.data.type === "ready") {
                     worker.onmessage = orig;
-                    worker.postMessage({ type: "start", jaml, count });
+                    send();
                 }
             };
         }
-    }, []);
+    }, [state.tallyLabels]);
+    const start = useCallback((jaml, count) => {
+        sendStart({ type: "start", mode: "random", jaml, count });
+    }, [sendStart]);
+    const startAesthetic = useCallback((jaml, aesthetic) => {
+        sendStart({ type: "start", mode: "aesthetic", jaml, aesthetic });
+    }, [sendStart]);
+    const startSeedList = useCallback((jaml, seeds) => {
+        sendStart({ type: "start", mode: "seedList", jaml, seeds });
+    }, [sendStart]);
+    const startKeyword = useCallback((jaml, keywords, padding) => {
+        sendStart({ type: "start", mode: "keyword", jaml, keywords, padding });
+    }, [sendStart]);
     const cancel = useCallback(() => {
         workerRef.current?.postMessage({ type: "stop" });
     }, []);
     const clearError = useCallback(() => {
         setState((s) => (s.error || s.status === "error" ? { ...s, error: null, status: "idle" } : s));
     }, []);
-    return { ...state, start, cancel, clearError };
+    const fetchTallyLabels = useCallback((jaml) => {
+        workerRef.current?.postMessage({ type: "get_tally_labels", jaml });
+    }, []);
+    return { ...state, start, startAesthetic, startSeedList, startKeyword, cancel, clearError, fetchTallyLabels };
 }

package/dist/index.d.ts

@@ -18,10 +18,14 @@ export { JimboTooltip, type JimboTooltipProps, type JimboTooltipMode, type Jimbo
 export { JamlIdeToolbar, type JamlIdeMode, type JamlIdeToolbarProps, } from "./components/JamlIdeToolbar.js";
 export { CardList, type CardListProps } from "./components/CardList.js";
 export { CardFan, type CardFanProps } from "./components/CardFan.js";
-export { RealPlayingCard, type CardSuit, type CardRank, type CardEnhancement, type CardSeal, type CardEdition, } from "./components/PlayingCard.js";
+export { RealStandardcard, type CardSuit, type CardRank, type CardEnhancement, type CardSeal, type CardEdition, } from "./components/Standardcard.js";
 export { DeckSprite, DECK_SPRITE_POS, STAKE_SPRITE_POS, type DeckSpriteProps, } from "./components/DeckSprite.js";
 export { MotelyVersionBadge, type MotelyVersionBadgeProps, type MotelyCapabilities, } from "./components/MotelyVersionBadge.js";
 export { extractVisualJamlItems, type JamlPreviewGroups, type JamlPreviewItem, type JamlPreviewSection, type JamlPreviewVisualType, } from "./utils/jamlMapPreview.js";
 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 { JamlSpeedometer, type JamlSpeedometerProps, } from "./components/JamlSpeedometer.js";
+export { JamlAestheticSelector, type JamlAestheticSelectorProps, type JamlAestheticOption, } from "./components/JamlAestheticSelector.js";
+export { JamlSeedInput, type JamlSeedInputProps, } from "./components/JamlSeedInput.js";
+export { initJamlFileSystem } from "./utils/fileSystem.js";

package/dist/index.js

@@ -19,10 +19,14 @@ export { JimboTooltip, } from "./ui/jimboTooltip.js";
 export { JamlIdeToolbar, } from "./components/JamlIdeToolbar.js";
 export { CardList } from "./components/CardList.js";
 export { CardFan } from "./components/CardFan.js";
-export { RealPlayingCard, } from "./components/PlayingCard.js";
+export { RealStandardcard, } from "./components/Standardcard.js";
 export { DeckSprite, DECK_SPRITE_POS, STAKE_SPRITE_POS, } from "./components/DeckSprite.js";
 export { MotelyVersionBadge, } from "./components/MotelyVersionBadge.js";
 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 { JamlSpeedometer, } from "./components/JamlSpeedometer.js";
+export { JamlAestheticSelector, } from "./components/JamlAestheticSelector.js";
+export { JamlSeedInput, } from "./components/JamlSeedInput.js";
+export { initJamlFileSystem } from "./utils/fileSystem.js";

package/dist/motely.d.ts

@@ -1,2 +1,2 @@
-export { decodeMotelyItem, decodeMotelyItemToJamlCard, motelyItemTypeName, motelyItemCategory, motelyItemDisplayName, motelyItemRenderCategory, motelyItemEditionName, motelyItemSealName, motelyItemEnhancementName, motelyPlayingCardRankName, motelyPlayingCardSuitName, decodeMotelyItemName, resolveMotelyItemType, warmMotelyItemCache, motelyItemCacheSize, type DecodedMotelyItem, type MotelyItemInput, type MotelyJamlCard, type MotelyRenderableCategory, type MotelyRuntimeItem, } from "./decode/motelyItemDecoder.js";
+export { decodeMotelyItem, decodeMotelyItemToJamlCard, motelyItemTypeName, motelyItemCategory, motelyItemDisplayName, motelyItemRenderCategory, motelyItemEditionName, motelyItemSealName, motelyItemEnhancementName, motelyStandardcardRankName, motelyStandardcardSuitName, decodeMotelyItemName, resolveMotelyItemType, warmMotelyItemCache, motelyItemCacheSize, type DecodedMotelyItem, type MotelyItemInput, type MotelyJamlCard, type MotelyRenderableCategory, type MotelyRuntimeItem, } from "./decode/motelyItemDecoder.js";
 export { MOTELY_DISPLAY_SCHEMA, motelyBossDisplayName, motelyBossDisplayNameFromKey, motelyBossKeyFromDisplayName, motelyBoosterPackDisplayName, motelyBoosterPackDisplayNameFromKey, motelyBoosterPackKeyFromDisplayName, motelyItemDisplayNameFromKey, motelyItemDisplayNameFromValue, motelyTagDisplayName, motelyTagDisplayNameFromKey, motelyTagKeyFromDisplayName, motelyVoucherDisplayName, motelyVoucherDisplayNameFromKey, motelyVoucherKeyFromDisplayName, type MotelyBoosterPackKey, type MotelyBossKey, type MotelyDisplaySchema, type MotelyTagKey, type MotelyVoucherKey, } from "./motelyDisplay.js";

package/dist/motely.js

@@ -1,3 +1,3 @@
 "use client";
-export { decodeMotelyItem, decodeMotelyItemToJamlCard, motelyItemTypeName, motelyItemCategory, motelyItemDisplayName, motelyItemRenderCategory, motelyItemEditionName, motelyItemSealName, motelyItemEnhancementName, motelyPlayingCardRankName, motelyPlayingCardSuitName, decodeMotelyItemName, resolveMotelyItemType, warmMotelyItemCache, motelyItemCacheSize, } from "./decode/motelyItemDecoder.js";
+export { decodeMotelyItem, decodeMotelyItemToJamlCard, motelyItemTypeName, motelyItemCategory, motelyItemDisplayName, motelyItemRenderCategory, motelyItemEditionName, motelyItemSealName, motelyItemEnhancementName, motelyStandardcardRankName, motelyStandardcardSuitName, decodeMotelyItemName, resolveMotelyItemType, warmMotelyItemCache, motelyItemCacheSize, } from "./decode/motelyItemDecoder.js";
 export { MOTELY_DISPLAY_SCHEMA, motelyBossDisplayName, motelyBossDisplayNameFromKey, motelyBossKeyFromDisplayName, motelyBoosterPackDisplayName, motelyBoosterPackDisplayNameFromKey, motelyBoosterPackKeyFromDisplayName, motelyItemDisplayNameFromKey, motelyItemDisplayNameFromValue, motelyTagDisplayName, motelyTagDisplayNameFromKey, motelyTagKeyFromDisplayName, motelyVoucherDisplayName, motelyVoucherDisplayNameFromKey, motelyVoucherKeyFromDisplayName, } from "./motelyDisplay.js";

package/dist/ui/jimboTabs.js

@@ -9,7 +9,7 @@ import { JimboText } from './jimboText.js';
  * button and animates only on the active one.
  */
 export function JimboTabs({ tabs, activeTab, onTabChange, className = '', style }) {
-    return (_jsxs(_Fragment, { children: [_jsx("div", { className: className, style: { display: 'flex', gap: 8, alignItems: 'flex-end', ...style }, children: tabs.map((tab) => (_jsx(TabButton, { label: tab.label, active: activeTab === tab.id, onClick: () => onTabChange(tab.id) }, tab.id))) }), _jsx("style", { children: JIMBO_BOUNCE_KEYFRAMES })] }));
+    return (_jsxs(_Fragment, { children: [_jsx("div", { className: className, style: { display: 'flex', gap: 8, alignItems: 'flex-end', flexWrap: 'wrap', ...style }, children: tabs.map((tab) => (_jsx(TabButton, { label: tab.label, active: activeTab === tab.id, onClick: () => onTabChange(tab.id) }, tab.id))) }), _jsx("style", { children: JIMBO_BOUNCE_KEYFRAMES })] }));
 }
 const JIMBO_BOUNCE_KEYFRAMES = `
   @keyframes jimbo-bounce {

package/dist/utils/fileSystem.d.ts

@@ -0,0 +1 @@
+export declare function initJamlFileSystem(): boolean;

package/dist/utils/fileSystem.js

@@ -0,0 +1,23 @@
+import { init } from "@rewaffle/bootsharp-file-system";
+// Assuming motely-wasm exposes Bootsharp APIs
+// We need to pass the FileMounter export generated by Bootsharp
+import * as motelyWasm from "motely-wasm";
+export function initJamlFileSystem() {
+    if (motelyWasm && motelyWasm.Bootsharp && motelyWasm.Bootsharp.FileSystem) {
+        const fileMounter = motelyWasm.Bootsharp.FileSystem.FileMounter;
+        if (fileMounter) {
+            init(fileMounter);
+            return true;
+        }
+    }
+    // Also try lowercase namespaces depending on how bootsharp generates it
+    if (motelyWasm && motelyWasm.bootsharp && motelyWasm.bootsharp.fileSystem) {
+        const fileMounter = motelyWasm.bootsharp.fileSystem.fileMounter;
+        if (fileMounter) {
+            init(fileMounter);
+            return true;
+        }
+    }
+    console.warn("Could not initialize Jaml File System: Bootsharp.FileSystem.FileMounter not found in motely-wasm.");
+    return false;
+}

package/dist/utils/itemUtils.d.ts

@@ -7,5 +7,5 @@ export declare const CATEGORY_COLORS: Record<CardCategory, {
     border: string;
     text: string;
 }>;
-/** Suit color for playing cards */
+/** Suit color for standard cards */
 export declare function getSuitColor(enumKey: string): string;

package/dist/utils/itemUtils.js

@@ -17,7 +17,7 @@ export function getItemDisplayName(enumKey) {
     };
     if (specials[enumKey])
         return specials[enumKey];
-    // Playing cards: C2 = 2 of Clubs, D10 = 10 of Diamonds, etc.
+    // Standard cards: C2 = 2 of Clubs, D10 = 10 of Diamonds, etc.
     const suitMap = { C: "♣", D: "♦", H: "♥", S: "♠" };
     const cardMatch = enumKey.match(/^([CDHS])([2-9JQKA]|10)$/);
     if (cardMatch) {
@@ -52,7 +52,7 @@ export function getItemCategory(enumKey) {
         return "planet";
     if (SPECTRAL_NAMES.has(enumKey))
         return "spectral";
-    // Everything else between the playing cards and Invalid is a joker
+    // Everything else between the standard cards and Invalid is a joker
     return "joker";
 }
 export const CATEGORY_COLORS = {
@@ -63,7 +63,7 @@ export const CATEGORY_COLORS = {
     playing: { bg: "bg-neutral-100 dark:bg-neutral-800", border: "border-neutral-300 dark:border-neutral-600", text: "text-neutral-900 dark:text-neutral-100" },
     unknown: { bg: "bg-neutral-900/30", border: "border-neutral-500/50", text: "text-neutral-300" },
 };
-/** Suit color for playing cards */
+/** Suit color for standard cards */
 export function getSuitColor(enumKey) {
     if (enumKey.startsWith("H") || enumKey.startsWith("D"))
         return "text-red-500";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaml-ui",
-  "version": "0.13.1",
+  "version": "0.14.1",
   "description": "Balatro rendering components, sprite metadata, and optional Motely helpers for React apps.",
   "type": "module",
   "main": "./dist/index.js",
@@ -76,7 +76,7 @@
     "@react-spring/three": ">=9.0.0",
     "@react-three/fiber": ">=8.0.0",
     "monaco-editor": ">=0.50.0",
-    "motely-wasm": "^10.2.0 || ^11.0.0 || ^12.0.0 || ^13.0.0",
+    "motely-wasm": "^10.2.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0",
     "react-icons": ">=5.0.0",
@@ -108,7 +108,8 @@
     "@types/three": "^0.184.0",
     "@vitejs/plugin-react": "^5.0.4",
     "monaco-editor": "^0.55.1",
-    "motely-wasm": "^13.0.1",
+    "motely-wasm": "link:../JammySeedFinder/src/MotelyJAML/Motely.Wasm/bin/motely-wasm",
+    "@rewaffle/bootsharp-file-system": "link:D:/extra/bootsharp/dist/packages/file-system",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "react-icons": "^5.6.0",