@johnmorrisdotca/jirai 0.0.0-stage → 0.1.0

package/src/shape.test.ts

@@ -0,0 +1,56 @@
+import { describe, expect, it } from "vitest";
+import { activeCell, activeCells } from "./shape.ts";
+import { DEFAULT_SETTINGS, GRIDS } from "./jirai.constants.ts";
+import { neighboursOf, validSettings } from "./grid.ts";
+import { makeBoard, isSolvable } from "./generate.ts";
+import { newGame, play, visibleGame } from "./game.ts";
+import { boardModel } from "./draw.ts";
+import { gameFromProgress, gameProgress } from "./keep.ts";
+import type { Settings } from "./jirai.types.ts";
+
+describe("shaped minefields", () => {
+  for (const shape of ["heart", "star", "hexagon"] as const) for (const grid of [GRIDS.square, GRIDS.hex]) {
+    it(`${shape}/${grid} omits cells and retains reciprocal neighbours and proved deals`, () => {
+      const settings: Settings = { ...DEFAULT_SETTINGS, width: 17, height: 17, mines: 12, shape, grid };
+      for (const outside of [-1, 289, 1.5, NaN]) expect(activeCell(settings, outside)).toBe(false);
+      const cells = activeCells(settings), adjacent = neighboursOf(settings);
+      expect(cells.length).toBeGreaterThan(40); expect(cells.length).toBeLessThan(289);
+      for (const c of cells) for (const n of adjacent[c]!) {
+        expect(activeCell(settings, n)).toBe(true); expect(adjacent[n]).toContain(c);
+      }
+      const first = cells[Math.floor(cells.length / 2)]!;
+      for (let seed = 1; seed <= 12; seed += 1) {
+        const board = makeBoard({ ...settings, seed }, first);
+        expect(board.mines.filter(Boolean)).toHaveLength(12); expect(isSolvable(board)).toBe(true);
+        for (let c = 0; c < 289; c += 1) if (!activeCell(settings, c)) {
+          expect(board.mines[c]).toBe(false); expect(board.clues[c]).toBe(-2); expect(adjacent[c]).toEqual([]);
+        }
+      }
+    });
+  }
+  it("never draws or lets the player act on cut-out cells, and restores the shape", () => {
+    const settings: Settings = { ...DEFAULT_SETTINGS, width: 17, height: 17, shape: "heart", mines: 12 };
+    let game = newGame(settings);
+    const absent = Array.from({ length: 289 }, (_, c) => c).find(c => !activeCell(settings, c))!;
+    expect(play(game, { kind: "reveal", cell: absent })).toBe(game);
+    expect(play(game, { kind: "mark", cell: absent })).toBe(game);
+    expect(visibleGame(game).clues[absent]).toBe(-2);
+    expect(boardModel(game).cells.some(c => c.cell === absent)).toBe(false);
+    game = play(game, { kind: "reveal", cell: activeCells(settings)[50]! });
+    expect(gameFromProgress(gameProgress(game))?.settings.shape).toBe("heart");
+  });
+  it("wins when every active safe cell opens, without requiring absent cells", () => {
+    const settings: Settings = { ...DEFAULT_SETTINGS, width: 9, height: 9, shape: "star", mines: 1, noGuess: false };
+    let game = newGame(settings);
+    const first = activeCells(settings)[10]!;
+    game = play(game, { kind: "reveal", cell: first });
+    for (const c of activeCells(settings)) if (!game.board!.mines[c]) game = play(game, { kind: "reveal", cell: c });
+    expect(game.status).toBe("won");
+  });
+  it("rejects unknown outlines, tiny silhouettes, wrap cut-outs and excess mines", () => {
+    expect(validSettings({ ...DEFAULT_SETTINGS, shape: "toString" })).toBe(false);
+    expect(validSettings({ ...DEFAULT_SETTINGS, width: 5, height: 5, shape: "heart" })).toBe(false);
+    expect(validSettings({ ...DEFAULT_SETTINGS, shape: "heart", grid: "wrap" })).toBe(false);
+    expect(validSettings({ ...DEFAULT_SETTINGS, width: 9, height: 9, shape: "star", mines: 70 })).toBe(false);
+  });
+});

package/src/shape.ts

@@ -0,0 +1,32 @@
+import type { Settings } from "./jirai.types.ts";
+export const SHAPES = ["rectangle", "heart", "star", "hexagon"] as const;
+/** Row-major addresses stay stable; omitted cells have no clue and no neighbours. */
+export function activeCell(settings: Settings, cell: number): boolean {
+  if (!Number.isInteger(cell) || cell < 0 || cell >= settings.width * settings.height) return false;
+  const col = cell % settings.width, row = Math.floor(cell / settings.width);
+  const x = 2 * (col + .5) / settings.width - 1, y = 2 * (row + .5) / settings.height - 1;
+  switch (settings.shape ?? "rectangle") {
+    case "heart": {
+      const hx = x * 1.15, hy = -y * 1.25 + .15;
+      return (hx * hx + hy * hy - 1) ** 3 - hx * hx * hy ** 3 <= 0;
+    }
+    case "star": {
+      // A filled five-point polygon, never a decorative overlay on hidden square cells.
+      const vertices = Array.from({ length: 10 }, (_, i) => {
+        const angle = -Math.PI / 2 + i * Math.PI / 5, radius = i % 2 ? .48 : 1;
+        return [Math.cos(angle) * radius, Math.sin(angle) * radius] as const;
+      });
+      let inside = false;
+      for (let i = 0, j = 9; i < 10; j = i++) {
+        const [xi, yi] = vertices[i]!, [xj, yj] = vertices[j]!;
+        if ((yi > y) !== (yj > y) && x < (xj - xi) * (y - yi) / (yj - yi) + xi) inside = !inside;
+      }
+      return inside;
+    }
+    case "hexagon": return settings.grid === "hex" ? Math.abs(x + y) <= 1 : Math.abs(x) <= 1 - .5 * Math.abs(y);
+    default: return true;
+  }
+}
+export function activeCells(settings: Settings): number[] {
+  return Array.from({ length: settings.width * settings.height }, (_, cell) => cell).filter(cell => activeCell(settings, cell));
+}

package/src/strings.ts

@@ -0,0 +1,18 @@
+import type { Language } from "./jirai.types.ts";
+export const STRINGS = {
+  en: {
+    board: "Minesweeper board", covered: "covered", flag: "flagged", question: "uncertain", empty: "empty", mine: "mine", wrong: "incorrect flag",
+    ready: "Open a cell to begin. Your first cell is safe.", playing: "Read the numbers. Open every safe cell.", won: "Every safe cell is open. Well played.", lost: "A mine. Try the same board again, or start another.",
+    checking: "Finding a board that can be solved without guessing…", restart: "Start over", hint: "Hint", reveal: "Open", mark: "Mark", mines: "Mines left", time: "Time", moves: "Moves", clear: "Cleared", view: "Just the board", close: "Close", hintNone: "No certain move proved. This position may need a guess.", hintSafe: "This cell is safe.", hintMine: "This cell contains a mine.", count: "The neighbouring count settles it.", overlap: "Compare the overlapping clues.", total: "The total mine count settles it.", enumeration: "Every consistent arrangement gives the same answer.",
+    help: "Tap to open; right-click or hold to mark. Use the arrows to move, Enter to open, F or Space to mark. Tap an open number to clear its neighbours when the flags match.",
+    error: "A verified board was not found. Try another seed, an opening elsewhere, or fewer mines.",
+  },
+  ja: {
+    board: "地雷の盤", covered: "未開封", flag: "旗", question: "不明", empty: "空き", mine: "地雷", wrong: "間違った旗",
+    ready: "マスを開けて始めます。最初のマスは安全です。", playing: "数字を手がかりに、安全なマスをすべて開けましょう。", won: "安全なマスがすべて開きました。クリア！", lost: "地雷でした。同じ盤で再挑戦できます。",
+    checking: "推測なしで解ける盤を探しています…", restart: "やり直す", hint: "ヒント", reveal: "開く", mark: "印を付ける", mines: "残りの地雷", time: "時間", moves: "手数", clear: "開いたマス", view: "盤だけ", close: "閉じる", hintNone: "確実な手は見つかりませんでした。推測が必要かもしれません。", hintSafe: "このマスは安全です。", hintMine: "このマスには地雷があります。", count: "周囲の数字から確定できます。", overlap: "重なった手がかりを比べましょう。", total: "地雷の総数から確定できます。", enumeration: "可能な配置すべてで同じ答えになります。",
+    help: "タップで開く、右クリックか長押しで印を付けます。矢印キーで移動、Enterで開く、FかSpaceで印を付けます。旗の数が合う数字をタップすると周囲が開きます。",
+    error: "推測なしで解ける盤が見つかりませんでした。別のシード、別の開始マス、または少ない地雷で試してください。",
+  },
+} as const;
+export function words(language: Language = "en"): typeof STRINGS["en"] | typeof STRINGS["ja"] { return STRINGS[language]; }

package/src/style.ts

@@ -0,0 +1,22 @@
+/** Scoped to one mounted board. Its host supplies the font and may override every colour. */
+export const JIRAI_STYLE = `
+.jr-root{--jr-ground:#a98954;--jr-cover:#fbf8f1;--jr-open:#efe8d8;--jr-line:#cfc6b2;--jr-ink:#1f2320;--jr-accent:#2f7a4f;color:var(--jr-ui-ink,var(--jr-ink));font:inherit;position:relative}
+.jr-root[data-material=wood]{--jr-ground:#ae804a;--jr-cover:#e0bb7e;--jr-open:#c69d63;--jr-line:#936e40;--jr-ink:#352c20;background-image:repeating-linear-gradient(4deg,transparent 0 8px,#4b2b0c08 9px 10px)}
+.jr-root[data-material=slate]{--jr-ground:#252e32;--jr-cover:#455359;--jr-open:#303c41;--jr-line:#62747a;--jr-ink:#f3f0e5;--jr-accent:#b7d298}
+.jr-scroll{overflow:auto;padding:12px;border:1px solid var(--jr-line);border-radius:14px;background:var(--jr-ground);overscroll-behavior:contain}
+.jr-board{position:relative;width:100%;min-width:240px;margin:auto;isolation:isolate}
+.jr-cell{position:absolute;box-sizing:border-box;display:flex;align-items:center;justify-content:center;border:1px solid var(--jr-line);border-radius:4px;background:var(--jr-cover);color:var(--jr-ink);font:700 clamp(12px,2vw,22px)/1 ui-monospace,monospace;box-shadow:inset 0 2px 1px #fff7,inset 0 -2px 1px #0001;cursor:pointer;user-select:none;-webkit-user-select:none;touch-action:manipulation;padding:0}
+.jr-root[data-grid=hex] .jr-cell{clip-path:polygon(50% 0,100% 25%,100% 75%,50% 100%,0 75%,0 25%);border-radius:0}
+.jr-cell[data-kind=open]{background:var(--jr-open);box-shadow:none}
+.jr-cell[data-number="1"]{color:#326ca0}.jr-cell[data-number="2"]{color:#3d763c}.jr-cell[data-number="3"]{color:#a34438}.jr-cell[data-number="4"]{color:#704b97}.jr-cell[data-number="5"]{color:#8c542f}.jr-cell[data-number="6"]{color:#1c777b}
+.jr-root[data-material=slate] .jr-cell[data-kind=open]{color:#e8e6bd}
+.jr-cell[data-kind=flag]{color:var(--jr-accent)}.jr-cell[data-kind=question]{color:#8a702d}
+.jr-cell[data-kind=mine],.jr-cell[data-kind=wrong]{background:#ead4c5;color:#873e32}.jr-cell[data-kind=exploded]{background:#a34d3c;color:white}
+.jr-cell[data-hint=true]{background:#d4e5bc!important;color:#243d24!important;box-shadow:inset 0 0 0 3px #577b3f}
+.jr-cell:focus-visible{outline:none;box-shadow:inset 0 0 0 3px #c0802e;z-index:2}.jr-cell:hover{filter:brightness(.97)}
+.jr-stats{display:flex;gap:18px;flex-wrap:wrap;font-variant-numeric:tabular-nums;margin:0 0 14px}.jr-stat{display:flex;gap:7px;align-items:baseline}.jr-stat small{opacity:.7;font-size:12px}.jr-stat strong{font-size:20px;font-weight:500}
+.jr-status{font-size:14px;line-height:1.5;min-height:1.5em;margin:12px 0}.jr-help{font-size:12px;line-height:1.65;opacity:.7}
+.jr-controls{display:flex;flex-wrap:wrap;gap:8px}.jr-button{font:inherit;font-size:13px;border:1px solid var(--jr-line);border-radius:999px;min-height:44px;padding:0 14px;background:var(--jr-ui-surface,var(--jr-cover));color:var(--jr-ui-ink,var(--jr-ink));border-color:var(--jr-ui-line,var(--jr-line));cursor:pointer}.jr-button:disabled{opacity:.5;cursor:wait}.jr-button[aria-pressed=true]{background:var(--jr-accent);color:white}.jr-button:focus-visible{outline:2px solid var(--jr-accent);outline-offset:3px}
+.jr-dialog{border:0;border-radius:20px;padding:24px;max-width:min(96vw,1000px);width:850px;background:var(--surface,#fbf8f1);color:var(--ink,#1f2320);--jr-ui-ink:var(--ink,#1f2320);--jr-ui-surface:var(--surface,#fbf8f1);--jr-ui-line:var(--rule,#ddd6c6);box-sizing:border-box}.jr-dialog::backdrop{background:#172019bb}.jr-dialog .jr-board{max-height:75vh}.jr-close{float:right;margin-bottom:10px}
+@media(prefers-reduced-motion:no-preference){.jr-cell{transition:background .12s}}
+`;

package/src/ui.types.ts

@@ -0,0 +1,22 @@
+import type { Game, Language, Material, Pieces, Settings } from "./jirai.types.ts";
+export type DrawOptions = { material?: Material; pieces?: Pieces; language?: Language; hint?: number | null };
+export type CellModel = { cell: number; x: number; y: number; width: number; height: number; label: string; text: string; kind: string; hint: boolean };
+export type BoardModel = { width: number; height: number; cells: CellModel[] };
+export type MountOptions = DrawOptions & {
+  settings?: Settings;
+  progress?: string;
+  controls?: boolean;
+  onChange?: (game: Game) => void;
+  onFinish?: (game: Game) => void;
+  onError?: (error: Error) => void;
+};
+export type JiraiMount = {
+  game: () => Game;
+  progress: () => string;
+  play: (cell: number, mark?: boolean) => void;
+  hint: () => void;
+  restart: () => void;
+  load: (settings: Settings, progress?: string) => void;
+  set: (options: DrawOptions) => void;
+  destroy: () => void;
+};

package/src/worker.ts

@@ -0,0 +1,7 @@
+import { makeBoard } from "./generate.ts";
+import type { Settings } from "./jirai.types.ts";
+// A separate entry: importing the engine or renderer never creates a worker.
+self.addEventListener("message", (event: MessageEvent<{ settings: Settings; first: number }>) => {
+  try { self.postMessage({ board: makeBoard(event.data.settings, event.data.first) }); }
+  catch (error) { self.postMessage({ error: error instanceof Error ? error.message : String(error) }); }
+});