@logic-pad/core 0.7.0 → 0.10.0

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

@@ -9,6 +9,7 @@ declare global {
   // Generated by dts-bundle-generator v9.5.1
 
   import { RegionConstrainer, SymbolGrid } from 'grilops';
+  import { PuzzleData } from 'logic-pad-solver-core';
   import { Optimize, Solver as Solver$1, Z3LowLevel } from 'z3-solver';
   import { z } from 'zod';
 
@@ -86,6 +87,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 +569,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 +652,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 +2034,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 +2044,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 +2071,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,17 +2109,19 @@ 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).';
+      'Solves puzzles pretty fast using backtracking with optimizations. Support most rules and symbols (including underclued).';
     protected createWorker(): Worker;
     isInstructionSupported(instructionId: string): boolean;
   }
@@ -2357,6 +2364,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 +2508,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.
@@ -2586,8 +2630,21 @@ declare global {
     constructor(instr: ViewpointSymbol);
     checkGlobal(grid: BTGridData): CheckResult | false;
   }
+  export declare class CspuzSolver extends EventIteratingSolver {
+    private static readonly supportedInstrs;
+    readonly id = 'cspuz';
+    readonly author = 'semiexp';
+    readonly description =
+      'A blazingly fast WebAssembly solver that supports most rules and symbols (including underclued). No uniqueness check yet.';
+    protected createWorker(): Worker;
+    isGridSupported(grid: GridData): boolean;
+    isInstructionSupported(instructionId: string): boolean;
+    isEnvironmentSupported(): Promise<boolean>;
+  }
+  export declare function gridToJson(grid: GridData): PuzzleData;
   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 +2735,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.';
+      '(Obsolete) A WebAssembly solver that supports a limited set of rules and symbols.';
+    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/allSolvers.js

@@ -1,10 +1,12 @@
 import UniversalSolver from './universal/universalSolver.js';
 import BacktrackSolver from './backtrack/backtrackSolver.js';
 import Z3Solver from './z3/z3Solver.js';
+import CspuzSolver from './cspuz/cspuzSolver.js';
 const allSolvers = new Map();
 function register(prototype) {
     allSolvers.set(prototype.id, prototype);
 }
+register(new CspuzSolver());
 register(new BacktrackSolver());
 register(new UniversalSolver());
 register(new Z3Solver());

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

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

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

@@ -11,9 +11,10 @@ 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';
+import { instance as connectAllInstance } from '../../rules/connectAllRule.js';
 import EventIteratingSolver from '../eventIteratingSolver.js';
 class BacktrackSolver extends EventIteratingSolver {
     constructor() {
@@ -24,11 +25,17 @@ 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,
             writable: true,
-            value: 'Solves puzzles using backtracking with optimizations (blazingly fast). Support most rules and symbols (including underclued).'
+            value: 'Solves puzzles pretty fast using backtracking with optimizations. Support most rules and symbols (including underclued).'
         });
     }
     createWorker() {
@@ -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;
+}