@logic-pad/core 0.7.0 → 0.9.0

package/assets/logic-core.global.d.ts

@@ -86,6 +86,7 @@ declare global {
     None = 'none',
     Wrap = 'wrap',
     WrapReverse = 'wrap-reverse',
+    ReflectReverse = 'reflect-reverse',
   }
   export declare const WRAPPINGS: readonly Wrapping[];
   export declare enum Direction {
@@ -567,7 +568,7 @@ declare global {
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
     get searchVariants(): SearchVariant[];
-    validateGrid(grid: GridData): RuleState;
+    validateGrid(_grid: GridData): RuleState;
     onSetGrid(
       _oldGrid: GridData,
       newGrid: GridData,
@@ -650,9 +651,7 @@ declare global {
     readonly vertical: Wrapping;
     private static readonly EXAMPLE_GRID_NONE;
     private static readonly EXAMPLE_GRID_HORIZONTAL;
-    private static readonly EXAMPLE_GRID_HORIZONTAL_REVERSE;
     private static readonly EXAMPLE_GRID_VERTICAL;
-    private static readonly EXAMPLE_GRID_VERTICAL_REVERSE;
     private static readonly SEARCH_VARIANTS;
     private static readonly CONFIGS;
     /**
@@ -2034,9 +2033,6 @@ declare global {
     stringifyPuzzle(puzzle: Puzzle): string;
     parsePuzzle(input: string): Puzzle;
   }
-  export interface CancelRef {
-    cancel?: () => void;
-  }
   /**
    * Base class that all solvers must extend.
    */
@@ -2047,10 +2043,18 @@ declare global {
      * This is also displayed to the user when selecting a solver.
      */
     abstract get id(): string;
+    /**
+     * The author(s) of the solver.
+     */
+    abstract get author(): string;
     /**
      * A short paragraph describing when the user should use this solver.
      */
     abstract get description(): string;
+    /**
+     * Whether the solver supports cancellation. If `true`, the solver must respond to the abort signal if it is provided.
+     */
+    abstract get supportsCancellation(): boolean;
     /**
      * Solve the given grid. The implementation should delegate long-running tasks to a worker thread and yield solutions
      * asynchronously.
@@ -2066,12 +2070,12 @@ declare global {
      *
      * @param grid The grid to solve. The provided grid is guaranteed to be supported by the solver. Some tiles in the
      * grid may already be filled by the user. It is up to the solver to decide whether to respect these tiles or not.
-     * @param cancelRef A reference to a function that can be called to cancel the solver. If cancellation is supported,
-     * the solver can assign a function to `cancelRef.cancel` that will stop the solver when called.
+     * @param abortSignal An optional signal that the solver should subscribe to in order to cancel the operation. If the
+     * solver does not support cancellation, it should ignore this parameter.
      */
     abstract solve(
       grid: GridData,
-      cancelRef: CancelRef
+      abortSignal?: AbortSignal
     ): AsyncGenerator<GridData | null>;
     /**
      * Check if the solver supports the current browser environment. This method is called once when the user first clicks
@@ -2104,15 +2108,17 @@ declare global {
   }
   export declare const allSolvers: Map<string, Solver>;
   export declare abstract class EventIteratingSolver extends Solver {
+    readonly supportsCancellation = true;
     protected abstract createWorker(): Worker;
     solve(
       grid: GridData,
-      cancelRef: CancelRef
+      abortSignal?: AbortSignal
     ): AsyncGenerator<GridData | null>;
   }
   export declare class BacktrackSolver extends EventIteratingSolver {
     private static readonly supportedInstrs;
     readonly id = 'backtrack';
+    readonly author = 'ALaggyDev';
     readonly description =
       'Solves puzzles using backtracking with optimizations (blazingly fast). Support most rules and symbols (including underclued).';
     protected createWorker(): Worker;
@@ -2357,6 +2363,43 @@ declare global {
       y: number
     ): Position$1 | null;
   }
+  export declare class FocusSymbol extends NumberSymbol {
+    private static readonly CONFIGS;
+    private static readonly EXAMPLE_GRID;
+    /**
+     * **Focus Numbers count directly adjacent cells of the same color**
+     * @param x - The x-coordinate of the symbol.
+     * @param y - The y-coordinate of the symbol.
+     * @param number - The focus number.
+     */
+    constructor(x: number, y: number, number: number);
+    get id(): string;
+    get placementStep(): number;
+    get explanation(): string;
+    get configs(): readonly AnyConfig[] | null;
+    createExampleGrid(): GridData;
+    countTiles(grid: GridData): {
+      completed: number;
+      possible: number;
+    };
+    copyWith({
+      x,
+      y,
+      number,
+    }: {
+      x?: number;
+      y?: number;
+      number?: number;
+    }): this;
+    withNumber(number: number): this;
+  }
+  export declare class FocusBTModule extends BTModule {
+    instr: FocusSymbol;
+    private cachedCheckResult?;
+    constructor(instr: FocusSymbol);
+    checkGlobal(grid: BTGridData): CheckResult | false;
+    private buildCheckAndRating;
+  }
   export declare class GalaxySymbol extends DirectionLinkerSymbol {
     readonly x: number;
     readonly y: number;
@@ -2464,7 +2507,7 @@ declare global {
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
     /**
-     * **Minesweeper numbers count opposite cells in 8 adjacent spaces**
+     * **Minesweeper Numbers count opposite cells in 8 adjacent spaces**
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
@@ -2588,6 +2631,7 @@ declare global {
   }
   export declare class UniversalSolver extends EventIteratingSolver {
     readonly id = 'universal';
+    readonly author = 'romain22222, Lysine';
     readonly description =
       'A backtracking solver that supports all rules and symbols (including underclued) but is less optimized.';
     protected createWorker(): Worker;
@@ -2678,8 +2722,10 @@ declare global {
   ): import('grilops').Direction;
   export declare class Z3Solver extends Solver {
     readonly id = 'z3';
+    readonly author = 'Lysine';
     readonly description =
       'Good for confirming that a solution is unique, especially for larger puzzles. It is otherwise slower than most solvers in small to medium-sized puzzles.';
+    readonly supportsCancellation = false;
     isEnvironmentSupported(): Promise<boolean>;
     solve(grid: GridData): AsyncGenerator<GridData | null>;
     isInstructionSupported(instructionId: string): boolean;

package/dist/data/grid.js

@@ -204,6 +204,7 @@ export default class GridData {
         const tiles = this.tiles.map(row => [...row]);
         const newTile = typeof tile === 'function' ? tile(tiles[y][x]) : tile;
         changing.forEach(({ x, y }) => {
+            ({ x, y } = this.toArrayCoordinates(x, y));
             tiles[y][x] = tiles[y][x].withColor(newTile.color);
         });
         tiles[y][x] = newTile;

package/dist/data/primitives.d.ts

@@ -67,7 +67,8 @@ export declare const COMPARISONS: readonly Comparison[];
 export declare enum Wrapping {
     None = "none",
     Wrap = "wrap",
-    WrapReverse = "wrap-reverse"
+    WrapReverse = "wrap-reverse",
+    ReflectReverse = "reflect-reverse"
 }
 export declare const WRAPPINGS: readonly Wrapping[];
 export declare enum Direction {

package/dist/data/primitives.js

@@ -56,11 +56,13 @@ export var Wrapping;
     Wrapping["None"] = "none";
     Wrapping["Wrap"] = "wrap";
     Wrapping["WrapReverse"] = "wrap-reverse";
+    Wrapping["ReflectReverse"] = "reflect-reverse";
 })(Wrapping || (Wrapping = {}));
 export const WRAPPINGS = [
     Wrapping.None,
     Wrapping.Wrap,
     Wrapping.WrapReverse,
+    Wrapping.ReflectReverse,
 ];
 export var Direction;
 (function (Direction) {

package/dist/data/rules/banPatternRule.js

@@ -74,7 +74,15 @@ class BanPatternRule extends Rule {
             for (let y = 0; y <= grid.height - 1; y++) {
                 for (let x = 0; x <= grid.width - 1; x++) {
                     let match = true;
+                    const visited = [];
                     for (const tile of pattern.elements) {
+                        const pos = grid.toArrayCoordinates(x + tile.x, y + tile.y);
+                        if (grid.wrapAround.value && // optimization: not need to check visited if wrapAround is disabled
+                            visited.some(p => p.x === pos.x && p.y === pos.y)) {
+                            match = false;
+                            break;
+                        }
+                        visited.push(pos);
                         const t = grid.getTile(x + tile.x, y + tile.y);
                         if (!t.exists || t.color !== tile.color) {
                             match = false;

package/dist/data/rules/musicGridRule.d.ts

@@ -25,7 +25,7 @@ export default class MusicGridRule extends Rule implements GridChangeHandler, Se
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
     get searchVariants(): SearchVariant[];
-    validateGrid(grid: GridData): RuleState;
+    validateGrid(_grid: GridData): RuleState;
     onSetGrid(_oldGrid: GridData, newGrid: GridData, _solution: GridData | null): GridData;
     onGridChange(newGrid: GridData): this;
     onGridResize(_grid: GridData, mode: 'insert' | 'remove', direction: 'row' | 'column', index: number): this | null;

package/dist/data/rules/musicGridRule.js

@@ -61,13 +61,8 @@ class MusicGridRule extends Rule {
     get searchVariants() {
         return MusicGridRule.SEARCH_VARIANTS;
     }
-    validateGrid(grid) {
-        if (grid.getTileCount(true, false, Color.Gray) > 0) {
-            return { state: State.Incomplete };
-        }
-        else {
-            return { state: State.Satisfied };
-        }
+    validateGrid(_grid) {
+        return { state: State.Incomplete };
     }
     onSetGrid(_oldGrid, newGrid, _solution) {
         if (newGrid.getTileCount(true, undefined, Color.Gray) === 0)

package/dist/data/rules/wrapAroundRule.d.ts

@@ -8,9 +8,7 @@ export default class WrapAroundRule extends Rule implements GetTileHandler {
     readonly vertical: Wrapping;
     private static readonly EXAMPLE_GRID_NONE;
     private static readonly EXAMPLE_GRID_HORIZONTAL;
-    private static readonly EXAMPLE_GRID_HORIZONTAL_REVERSE;
     private static readonly EXAMPLE_GRID_VERTICAL;
-    private static readonly EXAMPLE_GRID_VERTICAL_REVERSE;
     private static readonly SEARCH_VARIANTS;
     private static readonly CONFIGS;
     /**

package/dist/data/rules/wrapAroundRule.js

@@ -1,8 +1,9 @@
 import { ConfigType } from '../config.js';
 import { array } from '../dataHelper.js';
 import GridData from '../grid.js';
-import { Color, MajorRule, State, Wrapping, } from '../primitives.js';
+import { Color, MajorRule, Orientation, State, Wrapping, orientationToggle, } from '../primitives.js';
 import LetterSymbol from '../symbols/letterSymbol.js';
+import MyopiaSymbol from '../symbols/myopiaSymbol.js';
 import Rule from './rule.js';
 class WrapAroundRule extends Rule {
     /**
@@ -29,19 +30,32 @@ class WrapAroundRule extends Rule {
         this.vertical = vertical;
     }
     onGetTile(x, y, grid) {
+        if (grid.width === 0 || grid.height === 0) {
+            return { x, y };
+        }
         if (this.horizontal !== Wrapping.None) {
             const idx = Math.abs(Math.floor(x / grid.width));
             x = ((x % grid.width) + grid.width) % grid.width;
-            if (this.horizontal === Wrapping.WrapReverse && idx % 2 === 1) {
+            if ((this.horizontal === Wrapping.WrapReverse ||
+                this.horizontal === Wrapping.ReflectReverse) &&
+                idx % 2 === 1) {
                 y = grid.height - 1 - y;
             }
+            if (this.horizontal === Wrapping.ReflectReverse && idx % 2 === 1) {
+                x = grid.width - 1 - x;
+            }
         }
         if (this.vertical !== Wrapping.None) {
             const idx = Math.abs(Math.floor(y / grid.height));
             y = ((y % grid.height) + grid.height) % grid.height;
-            if (this.vertical === Wrapping.WrapReverse && idx % 2 === 1) {
+            if ((this.vertical === Wrapping.WrapReverse ||
+                this.vertical === Wrapping.ReflectReverse) &&
+                idx % 2 === 1) {
                 x = grid.width - 1 - x;
             }
+            if (this.vertical === Wrapping.ReflectReverse && idx % 2 === 1) {
+                y = grid.height - 1 - y;
+            }
         }
         return { x, y };
     }
@@ -52,37 +66,48 @@ class WrapAroundRule extends Rule {
         if (this.horizontal === Wrapping.None && this.vertical === Wrapping.None) {
             return `No edges are connected.`;
         }
-        else if (this.horizontal === Wrapping.None) {
-            return `The top and bottom edges are connected${this.vertical === Wrapping.WrapReverse ? ' in reverse' : ''}.`;
+        const horizontal = this.horizontal === Wrapping.None
+            ? null
+            : this.horizontal === Wrapping.Wrap ||
+                this.horizontal === Wrapping.WrapReverse
+                ? 'connected'
+                : 'reflective';
+        const vertical = this.vertical === Wrapping.None
+            ? null
+            : this.vertical === Wrapping.Wrap ||
+                this.vertical === Wrapping.WrapReverse
+                ? 'connected'
+                : 'reflective';
+        const horizontalReverse = this.horizontal === Wrapping.WrapReverse ||
+            this.horizontal === Wrapping.ReflectReverse
+            ? ' in reverse'
+            : '';
+        const verticalReverse = this.vertical === Wrapping.WrapReverse ||
+            this.vertical === Wrapping.ReflectReverse
+            ? ' in reverse'
+            : '';
+        if (this.horizontal === this.vertical) {
+            return `All four edges are ${horizontal}${horizontalReverse}.`;
         }
-        else if (this.vertical === Wrapping.None) {
-            return `The left and right edges are connected${this.horizontal === Wrapping.WrapReverse ? ' in reverse' : ''}.`;
+        if (this.horizontal === Wrapping.None) {
+            return `The top and bottom edges are ${vertical}${verticalReverse}.`;
         }
-        else if (this.horizontal === Wrapping.Wrap &&
-            this.vertical === Wrapping.Wrap) {
-            return `All four edges are connected.`;
+        if (this.vertical === Wrapping.None) {
+            return `The left and right edges are ${horizontal}${horizontalReverse}.`;
         }
-        else if (this.horizontal === Wrapping.Wrap) {
-            return `All four edges are connected, with the top and bottom edges in reverse.`;
-        }
-        else if (this.vertical === Wrapping.Wrap) {
-            return `All four edges are connected, with the left and right edges in reverse.`;
-        }
-        else {
-            return `All four edges are connected in reverse.`;
+        if (horizontal === vertical) {
+            if (horizontalReverse !== '') {
+                return `All four edges are ${horizontal}, with the left and right edges${horizontalReverse}.`;
+            }
+            else {
+                return `All four edges are ${horizontal}, with the top and bottom edges${verticalReverse}.`;
+            }
         }
+        return `The left and right edges are ${horizontal}${horizontalReverse}. The top and bottom edges are ${vertical}${verticalReverse}.`;
     }
     createExampleGrid() {
-        const horizontal = this.horizontal === Wrapping.Wrap
-            ? WrapAroundRule.EXAMPLE_GRID_HORIZONTAL
-            : this.horizontal === Wrapping.WrapReverse
-                ? WrapAroundRule.EXAMPLE_GRID_HORIZONTAL_REVERSE
-                : WrapAroundRule.EXAMPLE_GRID_NONE;
-        const vertical = this.vertical === Wrapping.Wrap
-            ? WrapAroundRule.EXAMPLE_GRID_VERTICAL
-            : this.vertical === Wrapping.WrapReverse
-                ? WrapAroundRule.EXAMPLE_GRID_VERTICAL_REVERSE
-                : WrapAroundRule.EXAMPLE_GRID_NONE;
+        const horizontal = WrapAroundRule.EXAMPLE_GRID_HORIZONTAL[this.horizontal];
+        const vertical = WrapAroundRule.EXAMPLE_GRID_VERTICAL[this.vertical];
         if (horizontal === WrapAroundRule.EXAMPLE_GRID_NONE) {
             return vertical;
         }
@@ -134,41 +159,79 @@ Object.defineProperty(WrapAroundRule, "EXAMPLE_GRID_HORIZONTAL", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: Object.freeze(GridData.create(['wwwww', 'bwwwb', 'wwwww', 'bwwwb', 'wwwww'])
-        .addSymbol(new LetterSymbol(0, 1, 'A'))
-        .addSymbol(new LetterSymbol(4, 1, 'A'))
-        .addSymbol(new LetterSymbol(0, 3, 'B'))
-        .addSymbol(new LetterSymbol(4, 3, 'B')))
-});
-Object.defineProperty(WrapAroundRule, "EXAMPLE_GRID_HORIZONTAL_REVERSE", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: Object.freeze(GridData.create(['wwwww', 'bwwwb', 'wwwww', 'bwwwb', 'wwwww'])
-        .addSymbol(new LetterSymbol(0, 1, 'A'))
-        .addSymbol(new LetterSymbol(4, 1, 'B'))
-        .addSymbol(new LetterSymbol(0, 3, 'B'))
-        .addSymbol(new LetterSymbol(4, 3, 'A')))
+    value: Object.freeze({
+        [Wrapping.None]: WrapAroundRule.EXAMPLE_GRID_NONE,
+        [Wrapping.Wrap]: GridData.create([
+            'wwwww',
+            'bwwwb',
+            'wwwww',
+            'bwwwb',
+            'wwwww',
+        ])
+            .addSymbol(new LetterSymbol(0, 1, 'A'))
+            .addSymbol(new LetterSymbol(4, 1, 'A'))
+            .addSymbol(new LetterSymbol(0, 3, 'B'))
+            .addSymbol(new LetterSymbol(4, 3, 'B')),
+        [Wrapping.WrapReverse]: GridData.create([
+            'wwwww',
+            'bwwwb',
+            'wwwww',
+            'bwwwb',
+            'wwwww',
+        ])
+            .addSymbol(new LetterSymbol(0, 1, 'A'))
+            .addSymbol(new LetterSymbol(4, 1, 'B'))
+            .addSymbol(new LetterSymbol(0, 3, 'B'))
+            .addSymbol(new LetterSymbol(4, 3, 'A')),
+        [Wrapping.ReflectReverse]: GridData.create([
+            'wwwww',
+            'bwwww',
+            'wwwww',
+            'wwwwb',
+            'wwwww',
+        ])
+            .addSymbol(new MyopiaSymbol(0, 3, false, orientationToggle(Orientation.Left)))
+            .addSymbol(new MyopiaSymbol(4, 1, false, orientationToggle(Orientation.Right))),
+    })
 });
 Object.defineProperty(WrapAroundRule, "EXAMPLE_GRID_VERTICAL", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: Object.freeze(GridData.create(['wbwbw', 'wwwww', 'wwwww', 'wwwww', 'wbwbw'])
-        .addSymbol(new LetterSymbol(1, 0, 'C'))
-        .addSymbol(new LetterSymbol(3, 0, 'D'))
-        .addSymbol(new LetterSymbol(1, 4, 'C'))
-        .addSymbol(new LetterSymbol(3, 4, 'D')))
-});
-Object.defineProperty(WrapAroundRule, "EXAMPLE_GRID_VERTICAL_REVERSE", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: Object.freeze(GridData.create(['wbwbw', 'wwwww', 'wwwww', 'wwwww', 'wbwbw'])
-        .addSymbol(new LetterSymbol(1, 0, 'C'))
-        .addSymbol(new LetterSymbol(3, 0, 'D'))
-        .addSymbol(new LetterSymbol(1, 4, 'D'))
-        .addSymbol(new LetterSymbol(3, 4, 'C')))
+    value: Object.freeze({
+        [Wrapping.None]: WrapAroundRule.EXAMPLE_GRID_NONE,
+        [Wrapping.Wrap]: GridData.create([
+            'wbwbw',
+            'wwwww',
+            'wwwww',
+            'wwwww',
+            'wbwbw',
+        ])
+            .addSymbol(new LetterSymbol(1, 0, 'C'))
+            .addSymbol(new LetterSymbol(3, 0, 'D'))
+            .addSymbol(new LetterSymbol(1, 4, 'C'))
+            .addSymbol(new LetterSymbol(3, 4, 'D')),
+        [Wrapping.WrapReverse]: GridData.create([
+            'wbwbw',
+            'wwwww',
+            'wwwww',
+            'wwwww',
+            'wbwbw',
+        ])
+            .addSymbol(new LetterSymbol(1, 0, 'C'))
+            .addSymbol(new LetterSymbol(3, 0, 'D'))
+            .addSymbol(new LetterSymbol(1, 4, 'D'))
+            .addSymbol(new LetterSymbol(3, 4, 'C')),
+        [Wrapping.ReflectReverse]: GridData.create([
+            'wbwww',
+            'wwwww',
+            'wwwww',
+            'wwwww',
+            'wwwbw',
+        ])
+            .addSymbol(new MyopiaSymbol(3, 0, false, orientationToggle(Orientation.Up)))
+            .addSymbol(new MyopiaSymbol(1, 4, false, orientationToggle(Orientation.Down))),
+    })
 });
 Object.defineProperty(WrapAroundRule, "SEARCH_VARIANTS", {
     enumerable: true,
@@ -178,6 +241,9 @@ Object.defineProperty(WrapAroundRule, "SEARCH_VARIANTS", {
         new WrapAroundRule(Wrapping.Wrap, Wrapping.None).searchVariant(),
         new WrapAroundRule(Wrapping.None, Wrapping.Wrap).searchVariant(),
         new WrapAroundRule(Wrapping.Wrap, Wrapping.Wrap).searchVariant(),
+        new WrapAroundRule(Wrapping.ReflectReverse, Wrapping.None).searchVariant(),
+        new WrapAroundRule(Wrapping.None, Wrapping.ReflectReverse).searchVariant(),
+        new WrapAroundRule(Wrapping.ReflectReverse, Wrapping.ReflectReverse).searchVariant(),
     ]
 });
 Object.defineProperty(WrapAroundRule, "CONFIGS", {

package/dist/data/solver/backtrack/backtrackSolver.d.ts

@@ -2,6 +2,7 @@ import EventIteratingSolver from '../eventIteratingSolver.js';
 export default class BacktrackSolver extends EventIteratingSolver {
     private static readonly supportedInstrs;
     readonly id = "backtrack";
+    readonly author = "ALaggyDev";
     readonly description = "Solves puzzles using backtracking with optimizations (blazingly fast). Support most rules and symbols (including underclued).";
     protected createWorker(): Worker;
     isInstructionSupported(instructionId: string): boolean;

package/dist/data/solver/backtrack/backtrackSolver.js

@@ -11,6 +11,7 @@ import { instance as galaxyInstance } from '../../symbols/galaxySymbol.js';
 import { instance as letterInstance } from '../../symbols/letterSymbol.js';
 import { instance as lotusInstance } from '../../symbols/lotusSymbol.js';
 import { instance as minesweeperInstance } from '../../symbols/minesweeperSymbol.js';
+import { instance as focusInstance } from '../../symbols/focusSymbol.js';
 import { instance as myopiaInstance } from '../../symbols/myopiaSymbol.js';
 import { instance as viewpointInstance } from '../../symbols/viewpointSymbol.js';
 import { instance as connectAllInstance } from '../z3/modules/connectAllModule.js';
@@ -24,6 +25,12 @@ class BacktrackSolver extends EventIteratingSolver {
             writable: true,
             value: 'backtrack'
         });
+        Object.defineProperty(this, "author", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'ALaggyDev'
+        });
         Object.defineProperty(this, "description", {
             enumerable: true,
             configurable: true,
@@ -52,6 +59,7 @@ Object.defineProperty(BacktrackSolver, "supportedInstrs", {
         lotusInstance.id,
         myopiaInstance.id,
         minesweeperInstance.id,
+        focusInstance.id,
         letterInstance.id,
         undercluedInstance.id,
         connectAllInstance.id,

package/dist/data/solver/backtrack/backtrackWorker.js

@@ -14,6 +14,7 @@ import { instance as galaxyInstance, } from '../../symbols/galaxySymbol.js';
 import { instance as letterInstance, } from '../../symbols/letterSymbol.js';
 import { instance as lotusInstance, } from '../../symbols/lotusSymbol.js';
 import { instance as minesweeperInstance, } from '../../symbols/minesweeperSymbol.js';
+import { instance as focusInstance, } from '../../symbols/focusSymbol.js';
 import { instance as myopiaInstance, } from '../../symbols/myopiaSymbol.js';
 import { instance as viewpointInstance, } from '../../symbols/viewpointSymbol.js';
 import { instance as connectAllInstance } from '../z3/modules/connectAllModule.js';
@@ -33,6 +34,7 @@ import LotusBTModule from './symbols/lotus.js';
 import MinesweeperBTModule from './symbols/minesweeper.js';
 import MyopiaBTModule from './symbols/myopia.js';
 import ViewpointBTModule from './symbols/viewpoint.js';
+import FocusBTModule from './symbols/focus.js';
 function translateToBTGridData(grid) {
     const tiles = array(grid.width, grid.height, (x, y) => {
         const tile = grid.getTile(x, y);
@@ -71,6 +73,9 @@ function translateToBTGridData(grid) {
             else if (id === minesweeperInstance.id) {
                 module = new MinesweeperBTModule(symbol);
             }
+            else if (id === focusInstance.id) {
+                module = new FocusBTModule(symbol);
+            }
             else if (id === letterInstance.id) {
                 continue;
             }
@@ -289,6 +294,12 @@ onmessage = e => {
     let count = 0;
     solve(grid, solution => {
         // if (count === 0) console.timeLog('Solve time', 'First solution');
+        if (solution) {
+            if (solution.resetTiles().colorEquals(solution)) {
+                postMessage(null);
+                return false;
+            }
+        }
         postMessage(Serializer.stringifyGrid(solution));
         count += 1;
         return count < 2;

package/dist/data/solver/backtrack/symbols/focus.d.ts

@@ -0,0 +1,9 @@
+import FocusSymbol from '../../../symbols/focusSymbol.js';
+import BTModule, { BTGridData, CheckResult } from '../data.js';
+export default class FocusBTModule extends BTModule {
+    instr: FocusSymbol;
+    private cachedCheckResult?;
+    constructor(instr: FocusSymbol);
+    checkGlobal(grid: BTGridData): CheckResult | false;
+    private buildCheckAndRating;
+}

package/dist/data/solver/backtrack/symbols/focus.js

@@ -0,0 +1,59 @@
+import BTModule, { BTTile, IntArray2D, createOneTileResult, } from '../data.js';
+export default class FocusBTModule extends BTModule {
+    constructor(instr) {
+        super();
+        Object.defineProperty(this, "instr", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cachedCheckResult", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.instr = instr;
+    }
+    checkGlobal(grid) {
+        const tile = grid.getTile(this.instr.x, this.instr.y);
+        if (tile === BTTile.Empty)
+            return createOneTileResult(grid, { x: this.instr.x, y: this.instr.y });
+        let gray = 0;
+        let same = 0;
+        for (let y = this.instr.y - 1; y <= this.instr.y + 1; y++) {
+            for (let x = this.instr.x - 1; x <= this.instr.x + 1; x++) {
+                if (y !== this.instr.y && x !== this.instr.x)
+                    continue;
+                if (!grid.isInBound(x, y) || (x === this.instr.x && y === this.instr.y))
+                    continue;
+                const checkTile = grid.getTile(x, y);
+                if (checkTile === BTTile.Empty)
+                    gray++;
+                else if (checkTile === tile)
+                    same++;
+            }
+        }
+        if (same > this.instr.number || same + gray < this.instr.number)
+            return false;
+        if (!this.cachedCheckResult)
+            this.cachedCheckResult = this.buildCheckAndRating(grid);
+        return this.cachedCheckResult;
+    }
+    buildCheckAndRating(grid) {
+        const tilesNeedCheck = IntArray2D.create(grid.width, grid.height);
+        const ratings = [];
+        for (let y = this.instr.y - 1; y <= this.instr.y + 1; y++) {
+            for (let x = this.instr.x - 1; x <= this.instr.x + 1; x++) {
+                if (y !== this.instr.y && x !== this.instr.x)
+                    continue;
+                if (!grid.isInBound(x, y) || (x === this.instr.x && y === this.instr.y))
+                    continue;
+                tilesNeedCheck.set(x, y, 1);
+                ratings.push({ pos: { x, y }, score: 1 });
+            }
+        }
+        return { tilesNeedCheck, ratings };
+    }
+}

package/dist/data/solver/eventIteratingSolver.d.ts

@@ -1,6 +1,7 @@
 import GridData from '../grid.js';
-import Solver, { CancelRef } from './solver.js';
+import Solver from './solver.js';
 export default abstract class EventIteratingSolver extends Solver {
+    readonly supportsCancellation = true;
     protected abstract createWorker(): Worker;
-    solve(grid: GridData, cancelRef: CancelRef): AsyncGenerator<GridData | null>;
+    solve(grid: GridData, abortSignal?: AbortSignal): AsyncGenerator<GridData | null>;
 }

package/dist/data/solver/eventIteratingSolver.js

@@ -2,9 +2,19 @@ import { Serializer } from '../serializer/allSerializers.js';
 import Solver from './solver.js';
 import { EventIterator } from 'event-iterator';
 export default class EventIteratingSolver extends Solver {
-    async *solve(grid, cancelRef) {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "supportsCancellation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+    }
+    async *solve(grid, abortSignal) {
         const worker = this.createWorker();
-        cancelRef.cancel = () => worker.terminate();
+        const terminateHandler = () => worker.terminate();
+        abortSignal?.addEventListener('abort', terminateHandler);
         try {
             const iterator = new EventIterator(({ push, stop, fail }) => {
                 worker.postMessage(Serializer.stringifyGrid(grid.resetTiles()));
@@ -28,6 +38,7 @@ export default class EventIteratingSolver extends Solver {
         }
         finally {
             worker.terminate();
+            abortSignal?.removeEventListener('abort', terminateHandler);
         }
     }
 }

package/dist/data/solver/solver.d.ts

@@ -1,7 +1,4 @@
 import GridData from '../grid.js';
-export interface CancelRef {
-    cancel?: () => void;
-}
 /**
  * Base class that all solvers must extend.
  */
@@ -12,10 +9,18 @@ export default abstract class Solver {
      * This is also displayed to the user when selecting a solver.
      */
     abstract get id(): string;
+    /**
+     * The author(s) of the solver.
+     */
+    abstract get author(): string;
     /**
      * A short paragraph describing when the user should use this solver.
      */
     abstract get description(): string;
+    /**
+     * Whether the solver supports cancellation. If `true`, the solver must respond to the abort signal if it is provided.
+     */
+    abstract get supportsCancellation(): boolean;
     /**
      * Solve the given grid. The implementation should delegate long-running tasks to a worker thread and yield solutions
      * asynchronously.
@@ -31,10 +36,10 @@ export default abstract class Solver {
      *
      * @param grid The grid to solve. The provided grid is guaranteed to be supported by the solver. Some tiles in the
      * grid may already be filled by the user. It is up to the solver to decide whether to respect these tiles or not.
-     * @param cancelRef A reference to a function that can be called to cancel the solver. If cancellation is supported,
-     * the solver can assign a function to `cancelRef.cancel` that will stop the solver when called.
+     * @param abortSignal An optional signal that the solver should subscribe to in order to cancel the operation. If the
+     * solver does not support cancellation, it should ignore this parameter.
      */
-    abstract solve(grid: GridData, cancelRef: CancelRef): AsyncGenerator<GridData | null>;
+    abstract solve(grid: GridData, abortSignal?: AbortSignal): AsyncGenerator<GridData | null>;
     /**
      * Check if the solver supports the current browser environment. This method is called once when the user first clicks
      * the "Solve" button, and the result is cached for the duration of the editor session.

package/dist/data/solver/universal/universalSolver.d.ts

@@ -1,6 +1,7 @@
 import EventIteratingSolver from '../eventIteratingSolver.js';
 export default class UniversalSolver extends EventIteratingSolver {
     readonly id = "universal";
+    readonly author = "romain22222, Lysine";
     readonly description = "A backtracking solver that supports all rules and symbols (including underclued) but is less optimized.";
     protected createWorker(): Worker;
     isInstructionSupported(instructionId: string): boolean;

package/dist/data/solver/universal/universalSolver.js

@@ -9,6 +9,12 @@ export default class UniversalSolver extends EventIteratingSolver {
             writable: true,
             value: 'universal'
         });
+        Object.defineProperty(this, "author", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'romain22222, Lysine'
+        });
         Object.defineProperty(this, "description", {
             enumerable: true,
             configurable: true,

package/dist/data/solver/universal/universalWorker.js

@@ -115,6 +115,11 @@ onmessage = e => {
     const grid = Serializer.parseGrid(e.data);
     let count = 0;
     solve(grid, solution => {
+        if (solution) {
+            if (solution.resetTiles().colorEquals(solution)) {
+                solution = null;
+            }
+        }
         postMessage(solution ? Serializer.stringifyGrid(solution) : null);
         count += 1;
         return count < 2;

package/dist/data/solver/z3/z3Solver.d.ts

@@ -2,7 +2,9 @@ import GridData from '../../grid.js';
 import Solver from '../solver.js';
 export default class Z3Solver extends Solver {
     readonly id = "z3";
+    readonly author = "Lysine";
     readonly description = "Good for confirming that a solution is unique, especially for larger puzzles. It is otherwise slower than most solvers in small to medium-sized puzzles.";
+    readonly supportsCancellation = false;
     isEnvironmentSupported(): Promise<boolean>;
     solve(grid: GridData): AsyncGenerator<GridData | null>;
     isInstructionSupported(instructionId: string): boolean;

package/dist/data/solver/z3/z3Solver.js

@@ -14,12 +14,24 @@ export default class Z3Solver extends Solver {
             writable: true,
             value: 'z3'
         });
+        Object.defineProperty(this, "author", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'Lysine'
+        });
         Object.defineProperty(this, "description", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: 'Good for confirming that a solution is unique, especially for larger puzzles. It is otherwise slower than most solvers in small to medium-sized puzzles.'
         });
+        Object.defineProperty(this, "supportsCancellation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
     }
     async isEnvironmentSupported() {
         try {

package/dist/data/symbols/directionLinkerSymbol.js

@@ -65,8 +65,11 @@ class DirectionLinkerSymbol extends Symbol {
     createExampleGrid() {
         return DirectionLinkerSymbol.EXAMPLE_GRID;
     }
-    deltaCoordinate(c, direction, grid) {
-        return grid.toArrayCoordinates(c.x + DirectionLinkerSymbol.directionDeltas[direction].dx, c.y + DirectionLinkerSymbol.directionDeltas[direction].dy);
+    deltaCoordinate(c, direction) {
+        return {
+            x: c.x + DirectionLinkerSymbol.directionDeltas[direction].dx,
+            y: c.y + DirectionLinkerSymbol.directionDeltas[direction].dy,
+        };
     }
     validateSymbol(grid) {
         // A turtle is an object which have 2 coordinates
@@ -112,22 +115,28 @@ class DirectionLinkerSymbol extends Symbol {
                 const directions = Object.keys(this.linkedDirections);
                 for (const direction of directions) {
                     const newTurtle = {
-                        pos1: this.deltaCoordinate(pos1, direction, grid),
-                        pos2: this.deltaCoordinate(pos2, this.linkedDirections[direction], grid),
+                        pos1: this.deltaCoordinate(pos1, direction),
+                        pos2: this.deltaCoordinate(pos2, this.linkedDirections[direction]),
                         color1: baseColor1,
                         color2: baseColor2,
                     };
-                    if (checkedCouples.some(({ pos1, pos2 }) => pos1.x === newTurtle.pos1.x &&
-                        pos1.y === newTurtle.pos1.y &&
-                        pos2.x === newTurtle.pos2.x &&
-                        pos2.y === newTurtle.pos2.y) ||
-                        (pos1.x === newTurtle.pos2.x &&
-                            pos1.y === newTurtle.pos2.y &&
-                            pos2.x === newTurtle.pos1.x &&
-                            pos2.y === newTurtle.pos1.y)) {
+                    const newArrTurtle = {
+                        pos1: grid.toArrayCoordinates(newTurtle.pos1.x, newTurtle.pos1.y),
+                        pos2: grid.toArrayCoordinates(newTurtle.pos2.x, newTurtle.pos2.y),
+                        color1: baseColor1,
+                        color2: baseColor2,
+                    };
+                    if (checkedCouples.some(({ pos1, pos2 }) => pos1.x === newArrTurtle.pos1.x &&
+                        pos1.y === newArrTurtle.pos1.y &&
+                        pos2.x === newArrTurtle.pos2.x &&
+                        pos2.y === newArrTurtle.pos2.y) ||
+                        (pos1.x === newArrTurtle.pos2.x &&
+                            pos1.y === newArrTurtle.pos2.y &&
+                            pos2.x === newArrTurtle.pos1.x &&
+                            pos2.y === newArrTurtle.pos1.y)) {
                         continue;
                     }
-                    checkedCouples.push(newTurtle);
+                    checkedCouples.push(newArrTurtle);
                     queue.push(newTurtle);
                 }
             }

package/dist/data/symbols/focusSymbol.d.ts

@@ -0,0 +1,30 @@
+import { AnyConfig } from '../config.js';
+import GridData from '../grid.js';
+import NumberSymbol from './numberSymbol.js';
+export default class FocusSymbol extends NumberSymbol {
+    private static readonly CONFIGS;
+    private static readonly EXAMPLE_GRID;
+    /**
+     * **Focus Numbers count directly adjacent cells of the same color**
+     * @param x - The x-coordinate of the symbol.
+     * @param y - The y-coordinate of the symbol.
+     * @param number - The focus number.
+     */
+    constructor(x: number, y: number, number: number);
+    get id(): string;
+    get placementStep(): number;
+    get explanation(): string;
+    get configs(): readonly AnyConfig[] | null;
+    createExampleGrid(): GridData;
+    countTiles(grid: GridData): {
+        completed: number;
+        possible: number;
+    };
+    copyWith({ x, y, number, }: {
+        x?: number;
+        y?: number;
+        number?: number;
+    }): this;
+    withNumber(number: number): this;
+}
+export declare const instance: FocusSymbol;

package/dist/data/symbols/focusSymbol.js

@@ -0,0 +1,110 @@
+import { ConfigType } from '../config.js';
+import GridData from '../grid.js';
+import { Color } from '../primitives.js';
+import NumberSymbol from './numberSymbol.js';
+const OFFSETS = [
+    [0, -1],
+    [1, 0],
+    [0, 1],
+    [-1, 0],
+];
+class FocusSymbol extends NumberSymbol {
+    /**
+     * **Focus Numbers count directly adjacent cells of the same color**
+     * @param x - The x-coordinate of the symbol.
+     * @param y - The y-coordinate of the symbol.
+     * @param number - The focus number.
+     */
+    constructor(x, y, number) {
+        super(x, y, number);
+    }
+    get id() {
+        return `focus`;
+    }
+    get placementStep() {
+        return 1;
+    }
+    get explanation() {
+        return '*Focus Numbers* count directly adjacent cells of the same color';
+    }
+    get configs() {
+        return FocusSymbol.CONFIGS;
+    }
+    createExampleGrid() {
+        return FocusSymbol.EXAMPLE_GRID;
+    }
+    countTiles(grid) {
+        if (Math.floor(this.x) !== this.x || Math.floor(this.y) !== this.y)
+            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+        const color = grid.getTile(this.x, this.y).color;
+        if (color === Color.Gray)
+            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+        let gray = 0;
+        let same = 0;
+        const visited = [];
+        for (const [dx, dy] of OFFSETS) {
+            const x = this.x + dx;
+            const y = this.y + dy;
+            if (grid.wrapAround.value) {
+                const pos = grid.toArrayCoordinates(x, y);
+                if (visited.some(v => v.x === pos.x && v.y === pos.y))
+                    continue;
+                visited.push(pos);
+            }
+            const tile = grid.getTile(x, y);
+            if (!tile.exists)
+                continue;
+            if (tile.color === Color.Gray)
+                gray++;
+            else if (tile.color === color)
+                same++;
+        }
+        return { completed: same, possible: same + gray };
+    }
+    copyWith({ x, y, number, }) {
+        return new FocusSymbol(x ?? this.x, y ?? this.y, number ?? this.number);
+    }
+    withNumber(number) {
+        return this.copyWith({ number });
+    }
+}
+Object.defineProperty(FocusSymbol, "CONFIGS", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze([
+        {
+            type: ConfigType.Number,
+            default: 0,
+            field: 'x',
+            description: 'X',
+            configurable: false,
+        },
+        {
+            type: ConfigType.Number,
+            default: 0,
+            field: 'y',
+            description: 'Y',
+            configurable: false,
+        },
+        {
+            type: ConfigType.Number,
+            default: 1,
+            field: 'number',
+            description: 'Number',
+            configurable: true,
+        },
+    ])
+});
+Object.defineProperty(FocusSymbol, "EXAMPLE_GRID", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(GridData.create(['wwwww', 'bbbbw', 'wwbbw', 'wwwww']).withSymbols([
+        new FocusSymbol(0, 0, 1),
+        new FocusSymbol(4, 1, 2),
+        new FocusSymbol(1, 3, 3),
+    ]))
+});
+export default FocusSymbol;
+export const instance = new FocusSymbol(0, 0, 1);

package/dist/data/symbols/minesweeperSymbol.d.ts

@@ -5,7 +5,7 @@ export default class MinesweeperSymbol extends NumberSymbol {
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
     /**
-     * **Minesweeper numbers count opposite cells in 8 adjacent spaces**
+     * **Minesweeper Numbers count opposite cells in 8 adjacent spaces**
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.

package/dist/data/symbols/minesweeperSymbol.js

@@ -4,7 +4,7 @@ import { Color } from '../primitives.js';
 import NumberSymbol from './numberSymbol.js';
 class MinesweeperSymbol extends NumberSymbol {
     /**
-     * **Minesweeper numbers count opposite cells in 8 adjacent spaces**
+     * **Minesweeper Numbers count opposite cells in 8 adjacent spaces**
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
@@ -20,7 +20,7 @@ class MinesweeperSymbol extends NumberSymbol {
         return 1;
     }
     get explanation() {
-        return `*Minesweeper numbers* count opposite cells in 8 adjacent spaces`;
+        return `*Minesweeper Numbers* count opposite cells in 8 adjacent spaces`;
     }
     get configs() {
         return MinesweeperSymbol.CONFIGS;
@@ -36,10 +36,17 @@ class MinesweeperSymbol extends NumberSymbol {
             return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
         let gray = 0;
         let opposite = 0;
+        const visited = [];
         for (let y = this.y - 1; y <= this.y + 1; y++) {
             for (let x = this.x - 1; x <= this.x + 1; x++) {
                 if (x === this.x && y === this.y)
                     continue;
+                if (grid.wrapAround.value) {
+                    const pos = grid.toArrayCoordinates(x, y);
+                    if (visited.some(v => v.x === pos.x && v.y === pos.y))
+                        continue;
+                    visited.push(pos);
+                }
                 const tile = grid.getTile(x, y);
                 if (!tile.exists)
                     continue;

package/dist/data/symbols/symbols.gen.d.ts

@@ -2,6 +2,7 @@ export { instance as AreaNumberSymbol } from './areaNumberSymbol.js';
 export { instance as CustomIconSymbol } from './customIconSymbol.js';
 export { instance as CustomTextSymbol } from './customTextSymbol.js';
 export { instance as DartSymbol } from './dartSymbol.js';
+export { instance as FocusSymbol } from './focusSymbol.js';
 export { instance as GalaxySymbol } from './galaxySymbol.js';
 export { instance as HiddenSymbol } from './hiddenSymbol.js';
 export { instance as LetterSymbol } from './letterSymbol.js';

package/dist/data/symbols/symbols.gen.js

@@ -6,6 +6,7 @@ export { instance as AreaNumberSymbol } from './areaNumberSymbol.js';
 export { instance as CustomIconSymbol } from './customIconSymbol.js';
 export { instance as CustomTextSymbol } from './customTextSymbol.js';
 export { instance as DartSymbol } from './dartSymbol.js';
+export { instance as FocusSymbol } from './focusSymbol.js';
 export { instance as GalaxySymbol } from './galaxySymbol.js';
 export { instance as HiddenSymbol } from './hiddenSymbol.js';
 export { instance as LetterSymbol } from './letterSymbol.js';

package/dist/data/symbols/viewpointSymbol.js

@@ -31,19 +31,17 @@ class ViewpointSymbol extends NumberSymbol {
     countForColor(grid, color, pos) {
         let minSize = 1;
         let maxSize = 1;
-        const visited = array(grid.width, grid.height, (x, y) => x === pos.x && y === pos.y);
+        const visitedColored = array(grid.width, grid.height, (x, y) => x === pos.x && y === pos.y);
         for (const direction of DIRECTIONS) {
-            let continuous = true;
-            grid.iterateDirection(move(pos, direction), direction, tile => tile.color === color || tile.color === Color.Gray, tile => {
+            grid.iterateDirection(move(pos, direction), direction, tile => tile.color === color, () => {
+                minSize++;
+            }, visitedColored);
+        }
+        const visitedAll = array(grid.width, grid.height, (x, y) => x === pos.x && y === pos.y);
+        for (const direction of DIRECTIONS) {
+            grid.iterateDirection(move(pos, direction), direction, tile => tile.color === color || tile.color === Color.Gray, () => {
                 maxSize++;
-                if (tile.color === Color.Gray) {
-                    continuous = false;
-                }
-                else {
-                    if (continuous)
-                        minSize++;
-                }
-            }, visited);
+            }, visitedAll);
         }
         return { completed: minSize, possible: maxSize };
     }

package/dist/index.d.ts

@@ -60,6 +60,7 @@ import UniqueShapeBTModule from './data/solver/backtrack/rules/uniqueShape.js';
 import AreaNumberBTModule from './data/solver/backtrack/symbols/areaNumber.js';
 import DartBTModule from './data/solver/backtrack/symbols/dart.js';
 import DirectionLinkerBTModule from './data/solver/backtrack/symbols/directionLinker.js';
+import FocusBTModule from './data/solver/backtrack/symbols/focus.js';
 import GalaxyBTModule from './data/solver/backtrack/symbols/galaxy.js';
 import LetterBTModule from './data/solver/backtrack/symbols/letter.js';
 import LotusBTModule from './data/solver/backtrack/symbols/lotus.js';
@@ -88,6 +89,7 @@ import CustomSymbol from './data/symbols/customSymbol.js';
 import CustomTextSymbol from './data/symbols/customTextSymbol.js';
 import DartSymbol from './data/symbols/dartSymbol.js';
 import DirectionLinkerSymbol from './data/symbols/directionLinkerSymbol.js';
+import FocusSymbol from './data/symbols/focusSymbol.js';
 import GalaxySymbol from './data/symbols/galaxySymbol.js';
 import HiddenSymbol from './data/symbols/hiddenSymbol.js';
 import { allSymbols } from './data/symbols/index.js';
@@ -102,4 +104,4 @@ import ViewpointSymbol from './data/symbols/viewpointSymbol.js';
 import TileData from './data/tile.js';
 import TileConnections from './data/tileConnections.js';
 import validateGrid, { aggregateState, applyFinalOverrides } from './data/validate.js';
-export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle, MetadataSchema, PuzzleSchema, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, CustomRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerV0, getShapeVariants, normalizeShape, positionsToShape, shapeEquals, tilesToShape, allSolvers, BacktrackSolver, BTModule, BTGridData, BTTile, IntArray2D, colorToBTTile, createOneTileResult, getOppositeColor, BanPatternBTModule, CellCountBTModule, ConnectAllBTModule, RegionAreaBTModule, RegionShapeBTModule, SameShapeBTModule, SymbolsPerRegionBTModule, UniqueShapeBTModule, AreaNumberBTModule, DartBTModule, DirectionLinkerBTModule, GalaxyBTModule, LetterBTModule, LotusBTModule, MinesweeperBTModule, MyopiaBTModule, ViewpointBTModule, EventIteratingSolver, Solver, UniversalSolver, AreaNumberModule, CellCountModule, ConnectAllModule, DartModule, allZ3Modules, LetterModule, MyopiaModule, RegionAreaModule, ViewpointModule, Z3Module, convertDirection, Z3Solver, Z3SolverContext, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, GalaxySymbol, HiddenSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, };
+export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle, MetadataSchema, PuzzleSchema, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, CustomRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerV0, getShapeVariants, normalizeShape, positionsToShape, shapeEquals, tilesToShape, allSolvers, BacktrackSolver, BTModule, BTGridData, BTTile, IntArray2D, colorToBTTile, createOneTileResult, getOppositeColor, BanPatternBTModule, CellCountBTModule, ConnectAllBTModule, RegionAreaBTModule, RegionShapeBTModule, SameShapeBTModule, SymbolsPerRegionBTModule, UniqueShapeBTModule, AreaNumberBTModule, DartBTModule, DirectionLinkerBTModule, FocusBTModule, GalaxyBTModule, LetterBTModule, LotusBTModule, MinesweeperBTModule, MyopiaBTModule, ViewpointBTModule, EventIteratingSolver, Solver, UniversalSolver, AreaNumberModule, CellCountModule, ConnectAllModule, DartModule, allZ3Modules, LetterModule, MyopiaModule, RegionAreaModule, ViewpointModule, Z3Module, convertDirection, Z3Solver, Z3SolverContext, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, FocusSymbol, GalaxySymbol, HiddenSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, };

package/dist/index.js

@@ -63,6 +63,7 @@ import UniqueShapeBTModule from './data/solver/backtrack/rules/uniqueShape.js';
 import AreaNumberBTModule from './data/solver/backtrack/symbols/areaNumber.js';
 import DartBTModule from './data/solver/backtrack/symbols/dart.js';
 import DirectionLinkerBTModule from './data/solver/backtrack/symbols/directionLinker.js';
+import FocusBTModule from './data/solver/backtrack/symbols/focus.js';
 import GalaxyBTModule from './data/solver/backtrack/symbols/galaxy.js';
 import LetterBTModule from './data/solver/backtrack/symbols/letter.js';
 import LotusBTModule from './data/solver/backtrack/symbols/lotus.js';
@@ -91,6 +92,7 @@ import CustomSymbol from './data/symbols/customSymbol.js';
 import CustomTextSymbol from './data/symbols/customTextSymbol.js';
 import DartSymbol from './data/symbols/dartSymbol.js';
 import DirectionLinkerSymbol from './data/symbols/directionLinkerSymbol.js';
+import FocusSymbol from './data/symbols/focusSymbol.js';
 import GalaxySymbol from './data/symbols/galaxySymbol.js';
 import HiddenSymbol from './data/symbols/hiddenSymbol.js';
 import { allSymbols } from './data/symbols/index.js';
@@ -105,4 +107,4 @@ import ViewpointSymbol from './data/symbols/viewpointSymbol.js';
 import TileData from './data/tile.js';
 import TileConnections from './data/tileConnections.js';
 import validateGrid, { aggregateState, applyFinalOverrides } from './data/validate.js';
-export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle, MetadataSchema, PuzzleSchema, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, CustomRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerV0, getShapeVariants, normalizeShape, positionsToShape, shapeEquals, tilesToShape, allSolvers, BacktrackSolver, BTModule, BTGridData, BTTile, IntArray2D, colorToBTTile, createOneTileResult, getOppositeColor, BanPatternBTModule, CellCountBTModule, ConnectAllBTModule, RegionAreaBTModule, RegionShapeBTModule, SameShapeBTModule, SymbolsPerRegionBTModule, UniqueShapeBTModule, AreaNumberBTModule, DartBTModule, DirectionLinkerBTModule, GalaxyBTModule, LetterBTModule, LotusBTModule, MinesweeperBTModule, MyopiaBTModule, ViewpointBTModule, EventIteratingSolver, Solver, UniversalSolver, AreaNumberModule, CellCountModule, ConnectAllModule, DartModule, allZ3Modules, LetterModule, MyopiaModule, RegionAreaModule, ViewpointModule, Z3Module, convertDirection, Z3Solver, Z3SolverContext, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, GalaxySymbol, HiddenSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, };
+export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle, MetadataSchema, PuzzleSchema, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, CustomRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerV0, getShapeVariants, normalizeShape, positionsToShape, shapeEquals, tilesToShape, allSolvers, BacktrackSolver, BTModule, BTGridData, BTTile, IntArray2D, colorToBTTile, createOneTileResult, getOppositeColor, BanPatternBTModule, CellCountBTModule, ConnectAllBTModule, RegionAreaBTModule, RegionShapeBTModule, SameShapeBTModule, SymbolsPerRegionBTModule, UniqueShapeBTModule, AreaNumberBTModule, DartBTModule, DirectionLinkerBTModule, FocusBTModule, GalaxyBTModule, LetterBTModule, LotusBTModule, MinesweeperBTModule, MyopiaBTModule, ViewpointBTModule, EventIteratingSolver, Solver, UniversalSolver, AreaNumberModule, CellCountModule, ConnectAllModule, DartModule, allZ3Modules, LetterModule, MyopiaModule, RegionAreaModule, ViewpointModule, Z3Module, convertDirection, Z3Solver, Z3SolverContext, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, FocusSymbol, GalaxySymbol, HiddenSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-pad/core",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "type": "module",
   "files": [
     "dist",