@johnmorrisdotca/kumimoji 1.3.0 → 1.3.1

package/dist/tileWords.js

@@ -51,7 +51,7 @@ export function unpackTileWords(data) {
     }
     const letters = [...Object.keys(TILE_MIX)];
     const assigned = new Map(letters.map((letter) => [letter.toUpperCase(), letter]));
-    const soundOf = (tile) => (tile === "*" ? null : assigned.get(tile) ?? (/^[a-z]$/.test(tile) ? tile : null));
+    const soundOf = (tile) => tile === "*" ? null : (assigned.get(tile) ?? (/^[a-z]$/.test(tile) ? tile : null));
     const isWild = (tile) => tile === "*" || assigned.has(tile);
     return {
         language: "english",
@@ -94,8 +94,12 @@ function unpackJapaneseWords(data) {
             allowed.add([...word].map((tile) => tileFace(tile).glyph).join(""));
     }
     const mix = new Map(Object.entries(JAPANESE_TILE_MIX).map(([face, count]) => [kanaTileCode(face), count]));
-    const isTile = (tile) => tile.length === 1 && tile.codePointAt(0) - KANA_TILE_START >= 0 && tile.codePointAt(0) - KANA_TILE_START < kana.length;
-    const isAssignedWild = (tile) => tile.length === 1 && tile.codePointAt(0) - KANA_WILD_START >= 0 && tile.codePointAt(0) - KANA_WILD_START < kana.length;
+    const isTile = (tile) => tile.length === 1 &&
+        tile.codePointAt(0) - KANA_TILE_START >= 0 &&
+        tile.codePointAt(0) - KANA_TILE_START < kana.length;
+    const isAssignedWild = (tile) => tile.length === 1 &&
+        tile.codePointAt(0) - KANA_WILD_START >= 0 &&
+        tile.codePointAt(0) - KANA_WILD_START < kana.length;
     const isWild = (tile) => tile === "*" || isAssignedWild(tile);
     const soundOf = (tile) => (isTile(tile) || isAssignedWild(tile) ? tileFace(tile).glyph : null);
     const identity = (tile) => (isWild(tile) ? "*" : isTile(tile) ? tileFace(tile).glyph : null);
@@ -196,9 +200,10 @@ export async function loadTileWords(language = "english") {
         return already;
     let words;
     if (typeof window !== "undefined") {
-        words = language === "english"
-            ? unpackTileWords((await import("./words.en.data.js")).TILE_WORDS_EN)
-            : unpackJapaneseWords((await import("./words.ja.data.js")).TILE_WORDS_JA);
+        words =
+            language === "english"
+                ? unpackTileWords((await import("./words.en.data.js")).TILE_WORDS_EN)
+                : unpackJapaneseWords((await import("./words.ja.data.js")).TILE_WORDS_JA);
     }
     else {
         if (fromModule === null)

package/dist/tileWordsModule.d.ts

@@ -1,5 +1,5 @@
-import { type TileWords } from "./tileWords.ts";
 import type { KumimojiLanguage } from "./kumimoji.types.ts";
+import { type TileWords } from "./tileWords.ts";
 /** The list, read from its module: `loadTileWords` for a caller with no browser.
  *
  * @param language - The English or Japanese tile language.

package/dist/tileWordsModule.js

@@ -6,7 +6,9 @@ import { loadTileWords, readTileWordsWith, tileWordsFrom } from "./tileWords.js"
  * page's components never import it, so no page's server function carries the
  * lists for the browser's sake (see `loadTileWords`).
  */
-readTileWordsWith(async (language) => tileWordsFrom(language, language === "english" ? (await import("./words.en.data.js")).TILE_WORDS_EN : (await import("./words.ja.data.js")).TILE_WORDS_JA));
+readTileWordsWith(async (language) => tileWordsFrom(language, language === "english"
+    ? (await import("./words.en.data.js")).TILE_WORDS_EN
+    : (await import("./words.ja.data.js")).TILE_WORDS_JA));
 /** The list, read from its module: `loadTileWords` for a caller with no browser.
  *
  * @param language - The English or Japanese tile language.

package/dist/tiles.constants.js

@@ -21,8 +21,32 @@
  * ```
  */
 export const TILE_MIX = {
-    a: 13, b: 3, c: 3, d: 6, e: 18, f: 3, g: 4, h: 3, i: 12, j: 2, k: 2, l: 5, m: 3,
-    n: 8, o: 11, p: 3, q: 2, r: 9, s: 6, t: 9, u: 6, v: 3, w: 3, x: 2, y: 3, z: 2,
+    a: 13,
+    b: 3,
+    c: 3,
+    d: 6,
+    e: 18,
+    f: 3,
+    g: 4,
+    h: 3,
+    i: 12,
+    j: 2,
+    k: 2,
+    l: 5,
+    m: 3,
+    n: 8,
+    o: 11,
+    p: 3,
+    q: 2,
+    r: 9,
+    s: 6,
+    t: 9,
+    u: 6,
+    v: 3,
+    w: 3,
+    x: 2,
+    y: 3,
+    z: 2,
 };
 /**
  * THE JAPANESE SET: 144 hiragana tiles in 45 kinds (`kana.ts`), as the English
@@ -45,11 +69,51 @@ export const TILE_MIX = {
  * ```
  */
 export const JAPANESE_TILE_MIX = {
-    あ: 2, い: 11, う: 12, え: 1, お: 2, か: 7, き: 6, く: 6, け: 3, こ: 4,
-    さ: 3, し: 10, す: 2, せ: 3, そ: 2, た: 4, ち: 3, つ: 6, て: 2, と: 3,
-    な: 1, に: 1, ぬ: 1, ね: 1, の: 1, は: 2, ひ: 2, ふ: 2, へ: 1, ほ: 1,
-    ま: 2, み: 1, む: 1, め: 1, も: 1, や: 2, ゆ: 4, よ: 6, ら: 1, り: 3,
-    る: 3, れ: 1, ろ: 1, わ: 1, ん: 11,
+    あ: 2,
+    い: 11,
+    う: 12,
+    え: 1,
+    お: 2,
+    か: 7,
+    き: 6,
+    く: 6,
+    け: 3,
+    こ: 4,
+    さ: 3,
+    し: 10,
+    す: 2,
+    せ: 3,
+    そ: 2,
+    た: 4,
+    ち: 3,
+    つ: 6,
+    て: 2,
+    と: 3,
+    な: 1,
+    に: 1,
+    ぬ: 1,
+    ね: 1,
+    の: 1,
+    は: 2,
+    ひ: 2,
+    ふ: 2,
+    へ: 1,
+    ほ: 1,
+    ま: 2,
+    み: 1,
+    む: 1,
+    め: 1,
+    も: 1,
+    や: 2,
+    ゆ: 4,
+    よ: 6,
+    ら: 1,
+    り: 3,
+    る: 3,
+    れ: 1,
+    ろ: 1,
+    わ: 1,
+    ん: 11,
 };
 /** The whole set, counted from the table.
  *
@@ -203,7 +267,7 @@ export const KUMIMOJI_TRADE = { give: 1, take: 3 };
  * console.log(KUMIMOJI_SCORE);
  * ```
  */
-export const KUMIMOJI_SCORE = { tile: 10, slowestMsATile: 30000 };
+export const KUMIMOJI_SCORE = { tile: 10, slowestMsATile: 30_000 };
 /**
  * PASS AND PLAY: up to eight people round one device, each with a hand and a
  * table of their own from one shared bag (`party.ts`). John, 2026-09-28: "pass

package/dist/turn.js

@@ -92,7 +92,12 @@ export function unturnPlace(row, col, turn) {
 export function turnArea(area, turn) {
     const a = turnPlace(area.top, area.left, turn);
     const b = turnPlace(area.top + area.rows - 1, area.left + area.cols - 1, turn);
-    return { top: Math.min(a.row, b.row), left: Math.min(a.col, b.col), rows: Math.abs(a.row - b.row) + 1, cols: Math.abs(a.col - b.col) + 1 };
+    return {
+        top: Math.min(a.row, b.row),
+        left: Math.min(a.col, b.col),
+        rows: Math.abs(a.row - b.row) + 1,
+        cols: Math.abs(a.col - b.col) + 1,
+    };
 }
 /**
  * A view the player zoomed or panned, turned a quarter clockwise with the

package/dist/ui/board.js

@@ -55,8 +55,22 @@ export function boardModel(tiles, verdict, glyphOf = (tile) => tileFace(tile).gl
         for (let col = left; col < left + cols; col += 1) {
             const square = squareAt(row, col);
             const tile = tiles.get(square) ?? null;
-            const mark = tile === null || verdict === null ? null : verdict.misspelt.has(square) ? "misspelt" : verdict.apart.has(square) ? "apart" : "sound";
-            squares.push({ square, row, col, tile, glyph: tile === null ? "" : glyphOf(tile), wild: tile !== null && tileFace(tile).wild, mark });
+            const mark = tile === null || verdict === null
+                ? null
+                : verdict.misspelt.has(square)
+                    ? "misspelt"
+                    : verdict.apart.has(square)
+                        ? "apart"
+                        : "sound";
+            squares.push({
+                square,
+                row,
+                col,
+                tile,
+                glyph: tile === null ? "" : glyphOf(tile),
+                wild: tile !== null && tileFace(tile).wild,
+                mark,
+            });
         }
     }
     return { rows, cols, squares };

package/dist/ui/draw.d.ts

@@ -0,0 +1,62 @@
+import type { GridVerdict } from "../grid.ts";
+import { type TilePlay } from "../play.ts";
+import { type KumimojiLocale, type KumimojiStrings } from "../strings.ts";
+import type { TileWords } from "../tileWords.ts";
+/** What is picked up: a tile in the hand, or one on the table. */
+export type Held = {
+    from: "hand";
+    at: number;
+} | {
+    from: "table";
+    square: string;
+} | null;
+export declare function node<K extends keyof HTMLElementTagNameMap>(name: K, className?: string, text?: string): HTMLElementTagNameMap[K];
+export declare function button(text: string, onClick: () => void, primary?: boolean, testId?: string): HTMLButtonElement;
+/** The game as the drawing reads it, shared with the mount so a move and a redraw see the same table. */
+export type TableSession = {
+    play: TilePlay | null;
+    finishedAt: number | null;
+    started: number;
+    words: TileWords | null;
+    held: Held;
+    onSquare: string | null;
+    onHand: number;
+    say: KumimojiStrings;
+    locale: KumimojiLocale;
+    note: string;
+    destroyed: boolean;
+};
+/** The elements the mount built once; a redraw fills them and never replaces them. */
+export type TableParts = {
+    root: HTMLElement;
+    status: HTMLElement;
+    board: HTMLElement;
+    notes: HTMLElement;
+    hand: HTMLElement;
+    picker: HTMLElement;
+    controls: HTMLElement;
+    keepTitle: HTMLElement;
+    saveJson: HTMLButtonElement;
+    saveText: HTMLButtonElement;
+    load: HTMLButtonElement;
+    keepNote: HTMLElement;
+};
+/** What a button does to the game. The mount owns the rules; the drawing only asks. */
+export type TableActions = {
+    verdictOf: (now: TilePlay) => GridVerdict;
+    change: (next: TilePlay) => void;
+    newGame: () => void;
+};
+/**
+ * Draw the table from the session and the elements the mount built: the status
+ * line, the board, the hand, the wild-tile picker, the play buttons and the
+ * save labels, then put the keyboard focus back on the control it was on.
+ * @param session - The game, the words and what is held, shared with the mount.
+ * @param parts - The elements the drawing fills.
+ * @param actions - How a button changes the game or starts another.
+ * @returns The redraw, and the status line alone for the clock.
+ */
+export declare function tableDrawing(session: TableSession, parts: TableParts, actions: TableActions): {
+    render: () => void;
+    renderStatus: () => void;
+};

package/dist/ui/draw.js

@@ -0,0 +1,229 @@
+import { kumimojiClock } from "../export.js";
+import { assignHandTile, draw, liftAll, mayDraw, mayTrade, sortHand, tilesLeft, trade, } from "../play.js";
+import { kumimojiSay } from "../strings.js";
+import { tileFace } from "../tileFace.js";
+import { boardModel } from "./board.js";
+/** What a wild nobody has given a letter yet shows in the hand. */
+const WILD_MARK = "★";
+export function node(name, className, text) {
+    const made = document.createElement(name);
+    if (className !== undefined)
+        made.className = className;
+    if (text !== undefined)
+        made.textContent = text;
+    return made;
+}
+export function button(text, onClick, primary = false, testId) {
+    const made = node("button", primary ? "km-button km-primary" : "km-button", text);
+    made.type = "button";
+    if (testId !== undefined)
+        made.dataset.testid = testId;
+    made.addEventListener("click", onClick);
+    return made;
+}
+/**
+ * Draw the table from the session and the elements the mount built: the status
+ * line, the board, the hand, the wild-tile picker, the play buttons and the
+ * save labels, then put the keyboard focus back on the control it was on.
+ * @param session - The game, the words and what is held, shared with the mount.
+ * @param parts - The elements the drawing fills.
+ * @param actions - How a button changes the game or starts another.
+ * @returns The redraw, and the status line alone for the clock.
+ */
+export function tableDrawing(session, parts, actions) {
+    function renderStatus() {
+        const now = session.play;
+        parts.root.dataset.state = now === null ? "dealing" : session.finishedAt !== null ? "finished" : "playing";
+        if (now === null) {
+            parts.status.textContent = session.say.dealing;
+            return;
+        }
+        const left = tilesLeft(now);
+        parts.root.dataset.left = String(left);
+        const time = kumimojiClock((session.finishedAt ?? Date.now()) - session.started);
+        parts.status.textContent =
+            session.finishedAt !== null
+                ? kumimojiSay(session.say.finished, { time })
+                : kumimojiSay(left === 1 ? session.say.leftOne : session.say.left, { n: left, time });
+    }
+    function renderBoard(verdict) {
+        const playing = session.play;
+        const words = session.words;
+        const model = boardModel(playing.tiles, playing.tiles.size === 0 ? null : verdict, words.glyphOf);
+        const grid = node("div", "km-grid");
+        grid.style.gridTemplateColumns = `repeat(${model.cols}, var(--km-square))`;
+        grid.setAttribute("role", "group");
+        grid.setAttribute("aria-label", session.say.tableLabel);
+        grid.setAttribute("aria-description", session.say.tableKeys);
+        grid.dataset.cols = String(model.cols);
+        const cells = [];
+        for (const square of model.squares) {
+            const cell = node("button", "km-square");
+            cell.type = "button";
+            cell.dataset.square = square.square;
+            if (square.tile !== null) {
+                cell.classList.add("km-tile");
+                if (square.wild)
+                    cell.classList.add("km-wild");
+                if (square.mark !== null)
+                    cell.classList.add(`km-${square.mark}`);
+                cell.textContent = square.glyph;
+                cell.dataset.tile = square.glyph;
+                cell.setAttribute("aria-label", square.wild ? kumimojiSay(session.say.wildTile, { tile: square.glyph }) : square.glyph);
+            }
+            else {
+                cell.setAttribute("aria-label", session.say.emptySquare);
+            }
+            if (session.held?.from === "table" && session.held.square === square.square)
+                cell.classList.add("km-held");
+            cell.tabIndex = -1;
+            cells.push(cell);
+            grid.append(cell);
+        }
+        // The one Tab lands on: where the keyboard was, else a tile, else the middle.
+        const stop = cells.find((cell) => cell.dataset.square === session.onSquare) ??
+            cells.find((cell) => cell.classList.contains("km-tile")) ??
+            cells[Math.floor(cells.length / 2)];
+        if (stop !== undefined) {
+            stop.tabIndex = 0;
+            session.onSquare = stop.dataset.square ?? null;
+        }
+        parts.board.replaceChildren(grid);
+        parts.notes.textContent =
+            verdict.notWords.length > 0
+                ? kumimojiSay(session.say.notWords, { words: verdict.notWords.join(", ") })
+                : verdict.apart.size > 0
+                    ? session.say.apart
+                    : "";
+    }
+    function renderHand() {
+        const playing = session.play;
+        const words = session.words;
+        parts.hand.replaceChildren();
+        parts.hand.setAttribute("aria-label", session.say.handLabel);
+        playing.hand.forEach((tile, at) => {
+            const face = tileFace(tile);
+            const made = node("button", "km-tile km-in-hand");
+            made.type = "button";
+            made.dataset.hand = String(at);
+            made.textContent = face.blank ? WILD_MARK : words.glyphOf(tile);
+            if (face.wild)
+                made.classList.add("km-wild");
+            if (session.held?.from === "hand" && session.held.at === at)
+                made.classList.add("km-held");
+            made.dataset.tile = face.blank ? "*" : words.glyphOf(tile);
+            made.setAttribute("aria-label", face.blank
+                ? session.say.wildBlank
+                : face.wild
+                    ? kumimojiSay(session.say.wildTile, { tile: words.glyphOf(tile) })
+                    : words.glyphOf(tile));
+            made.tabIndex = at === Math.min(session.onHand, playing.hand.length - 1) ? 0 : -1;
+            parts.hand.append(made);
+        });
+        if (playing.hand.length === 0 && session.finishedAt === null)
+            parts.hand.append(node("span", "km-empty", session.say.noTiles));
+    }
+    function renderPicker() {
+        parts.picker.replaceChildren();
+        if (session.held?.from !== "hand" || session.play === null)
+            return;
+        const at = session.held.at;
+        const tile = session.play.hand[at];
+        if (tile === undefined || !tileFace(tile).wild)
+            return;
+        parts.picker.append(node("span", "km-picker-title", tile === "*" ? session.say.giveWild : session.say.changeWild));
+        const words = session.words;
+        for (const sound of words.wildOptions) {
+            const code = words.wildFor(sound);
+            if (code === null)
+                continue;
+            parts.picker.append(button(sound, () => {
+                session.held = { from: "hand", at };
+                actions.change(assignHandTile(session.play, at, code));
+            }));
+        }
+    }
+    function renderControls(verdict) {
+        parts.controls.replaceChildren();
+        if (session.finishedAt !== null) {
+            parts.controls.append(button(session.say.newGame, () => actions.newGame(), true, "km-new"));
+            return;
+        }
+        const now = session.play;
+        const drawButton = button(session.say.draw, () => {
+            session.held = null;
+            actions.change(draw(now));
+        }, true, "km-draw");
+        drawButton.disabled = !mayDraw(now, verdict);
+        const tradeButton = button(session.say.trade, () => {
+            if (session.held?.from !== "hand")
+                return;
+            const at = session.held.at;
+            session.held = null;
+            actions.change(trade(now, at));
+        }, false, "km-trade");
+        tradeButton.disabled = session.held?.from !== "hand" || !mayTrade(now);
+        parts.controls.append(drawButton, tradeButton, button(session.say.sort, () => actions.change(sortHand(now)), false, "km-sort"), button(session.say.liftAll, () => {
+            session.held = null;
+            actions.change(liftAll(now));
+        }, false, "km-lift"), button(session.say.newGame, () => actions.newGame(), false, "km-new"));
+    }
+    function renderKeep() {
+        parts.keepTitle.textContent = session.say.keep;
+        parts.saveJson.textContent = session.say.saveJson;
+        parts.saveText.textContent = session.say.saveText;
+        parts.load.textContent = session.say.load;
+        parts.saveJson.disabled = session.play === null;
+        parts.saveText.disabled = session.play === null;
+        parts.keepNote.textContent = session.note;
+    }
+    /** Where the keyboard is, so that it can be put back after everything is drawn again: the zone, and which of it. */
+    function keyboardAt() {
+        const on = document.activeElement;
+        if (on === null || !parts.root.contains(on))
+            return null;
+        const mark = (zone, id) => id === undefined ? null : { zone, id };
+        if (parts.board.contains(on))
+            return mark("board", on.dataset.square);
+        if (parts.hand.contains(on))
+            return mark("hand", on.dataset.hand);
+        if (parts.controls.contains(on))
+            return mark("controls", on.dataset.testid);
+        if (parts.picker.contains(on))
+            return mark("picker", String([...parts.picker.querySelectorAll("button")].indexOf(on)));
+        return null;
+    }
+    function keyboardBack(at) {
+        if (at === null)
+            return;
+        const zone = { board: parts.board, hand: parts.hand, controls: parts.controls, picker: parts.picker }[at.zone];
+        const found = at.zone === "board"
+            ? zone.querySelector(`[data-square="${at.id}"]`)
+            : at.zone === "hand"
+                ? zone.querySelector(`[data-hand="${at.id}"]`)
+                : at.zone === "controls"
+                    ? zone.querySelector(`[data-testid="${at.id}"]`)
+                    : zone.querySelectorAll("button")[Number(at.id)];
+        // A button that has become disabled cannot hold the focus; the table keeps it rather than dropping it on the page.
+        if (found !== undefined && found !== null && !found.disabled)
+            found.focus({ preventScroll: true });
+    }
+    function render() {
+        if (session.destroyed)
+            return;
+        const where = keyboardAt();
+        parts.root.lang = session.locale;
+        renderStatus();
+        renderKeep();
+        const now = session.play;
+        if (now === null || session.words === null)
+            return;
+        const verdict = actions.verdictOf(now);
+        renderBoard(verdict);
+        renderPicker();
+        renderHand();
+        renderControls(verdict);
+        keyboardBack(where);
+    }
+    return { render, renderStatus };
+}