@logic-pad/core 0.5.0 → 0.6.0

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

@@ -1,4 +1,3 @@
-import { EventIterator } from 'event-iterator';
 import { instance as banPatternInstance } from '../../rules/banPatternRule.js';
 import { instance as cellCountInstance } from '../../rules/cellCountRule.js';
 import { instance as regionAreaInstance } from '../../rules/regionAreaRule.js';
@@ -6,7 +5,6 @@ import { instance as sameShapeInstance } from '../../rules/sameShapeRule.js';
 import { instance as symbolsPerRegionInstance } from '../../rules/symbolsPerRegionRule.js';
 import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
 import { instance as uniqueShapeInstance } from '../../rules/uniqueShapeRule.js';
-import { Serializer } from '../../serializer/allSerializers.js';
 import { instance as areaNumberInstance } from '../../symbols/areaNumberSymbol.js';
 import { instance as dartInstance } from '../../symbols/dartSymbol.js';
 import { instance as galaxyInstance } from '../../symbols/galaxySymbol.js';
@@ -15,9 +13,9 @@ import { instance as lotusInstance } from '../../symbols/lotusSymbol.js';
 import { instance as minesweeperInstance } from '../../symbols/minesweeperSymbol.js';
 import { instance as myopiaInstance } from '../../symbols/myopiaSymbol.js';
 import { instance as viewpointInstance } from '../../symbols/viewpointSymbol.js';
-import Solver from '../solver.js';
 import { instance as connectAllInstance } from '../z3/modules/connectAllModule.js';
-class BacktrackSolver extends Solver {
+import EventIteratingSolver from '../eventIteratingSolver.js';
+class BacktrackSolver extends EventIteratingSolver {
     constructor() {
         super(...arguments);
         Object.defineProperty(this, "id", {
@@ -33,34 +31,10 @@ class BacktrackSolver extends Solver {
             value: 'Solves puzzles using backtracking with optimizations (blazingly fast). Support most rules and symbols (including underclued).'
         });
     }
-    async *solve(grid) {
-        const worker = new Worker(new URL(`./backtrackWorker.js`, import.meta.url), {
+    createWorker() {
+        return new Worker(new URL(`./backtrackWorker.js`, import.meta.url), {
             type: 'module',
         });
-        try {
-            const iterator = new EventIterator(({ push, stop, fail }) => {
-                worker.postMessage(Serializer.stringifyGrid(grid.resetTiles()));
-                worker.addEventListener('message', (e) => {
-                    if (e.data) {
-                        push(Serializer.parseGrid(e.data));
-                    }
-                    else {
-                        stop();
-                    }
-                });
-                worker.addEventListener('error', (e) => {
-                    alert(`Error while solving!\n${e.message}`);
-                    fail(e);
-                });
-            });
-            for await (const solution of iterator) {
-                yield solution;
-            }
-            yield null;
-        }
-        finally {
-            worker.terminate();
-        }
     }
     isInstructionSupported(instructionId) {
         return BacktrackSolver.supportedInstrs.includes(instructionId);

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

@@ -1,2 +1 @@
-declare const _default: null;
-export default _default;
+export {};

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

@@ -74,9 +74,10 @@ function translateToBTGridData(grid) {
             else if (id === letterInstance.id) {
                 continue;
             }
-            if (!module)
+            if (!module && symbol.necessaryForCompletion)
                 throw new Error('Symbol not supported.');
-            modules.push(module);
+            if (module)
+                modules.push(module);
         }
     }
     const letterSymbols = grid.symbols.get(letterInstance.id);
@@ -226,7 +227,9 @@ function solveUnderclued(input) {
     function search(x, y, tile, color) {
         // count++;
         // console.log(`Trying (${x}, ${y}) with ${color}`);
-        const newGrid = grid.setTile(x, y, tile.withColor(color));
+        const newGrid = grid.fastCopyWith({
+            tiles: grid.setTile(x, y, tile.withColor(color)),
+        });
         // Solve
         let solution;
         solveNormal(newGrid, sol => {
@@ -258,9 +261,13 @@ function solveUnderclued(input) {
             if (!darkPossible && !lightPossible)
                 return null;
             if (darkPossible && !lightPossible)
-                grid = grid.setTile(x, y, tile.withColor(Color.Dark));
+                grid = grid.fastCopyWith({
+                    tiles: grid.setTile(x, y, tile.withColor(Color.Dark)),
+                });
             if (!darkPossible && lightPossible)
-                grid = grid.setTile(x, y, tile.withColor(Color.Light));
+                grid = grid.fastCopyWith({
+                    tiles: grid.setTile(x, y, tile.withColor(Color.Light)),
+                });
         }
     }
     // console.log(`Solve count: ${count}`);
@@ -289,6 +296,3 @@ onmessage = e => {
     // console.timeEnd('Solve time');
     postMessage(null);
 };
-// make typescript happy
-// eslint-disable-next-line import/no-anonymous-default-export
-export default null;

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

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

package/dist/data/solver/eventIteratingSolver.js

@@ -0,0 +1,33 @@
+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) {
+        const worker = this.createWorker();
+        cancelRef.cancel = () => worker.terminate();
+        try {
+            const iterator = new EventIterator(({ push, stop, fail }) => {
+                worker.postMessage(Serializer.stringifyGrid(grid.resetTiles()));
+                worker.addEventListener('message', (e) => {
+                    if (e.data) {
+                        push(Serializer.parseGrid(e.data));
+                    }
+                    else {
+                        stop();
+                    }
+                });
+                worker.addEventListener('error', (e) => {
+                    alert(`Error while solving!\n${e.message}`);
+                    fail(e);
+                });
+            });
+            for await (const solution of iterator) {
+                yield solution;
+            }
+            yield null;
+        }
+        finally {
+            worker.terminate();
+        }
+    }
+}

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

@@ -1,4 +1,7 @@
 import GridData from '../grid.js';
+export interface CancelRef {
+    cancel?: () => void;
+}
 /**
  * Base class that all solvers must extend.
  */
@@ -28,8 +31,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.
      */
-    abstract solve(grid: GridData): AsyncGenerator<GridData | null>;
+    abstract solve(grid: GridData, cancelRef: CancelRef): 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/solver.js

@@ -47,7 +47,8 @@ export default class Solver {
         if (grid.rules.some(rule => rule.necessaryForCompletion && !this.isInstructionSupported(rule.id))) {
             return false;
         }
-        if ([...grid.symbols.keys()].some(id => !this.isInstructionSupported(id))) {
+        if ([...grid.symbols.keys()].some(id => grid.symbols.get(id)?.some(s => s.necessaryForCompletion) &&
+            !this.isInstructionSupported(id))) {
             return false;
         }
         return true;

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

@@ -0,0 +1,7 @@
+import EventIteratingSolver from '../eventIteratingSolver.js';
+export default class UniversalSolver extends EventIteratingSolver {
+    readonly id = "universal";
+    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

@@ -0,0 +1,30 @@
+import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
+import EventIteratingSolver from '../eventIteratingSolver.js';
+export default class UniversalSolver extends EventIteratingSolver {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "id", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'universal'
+        });
+        Object.defineProperty(this, "description", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'A backtracking solver that supports all rules and symbols (including underclued) but is less optimized.'
+        });
+    }
+    createWorker() {
+        return new Worker(new URL('./universalWorker.js', import.meta.url), {
+            type: 'module',
+        });
+    }
+    isInstructionSupported(instructionId) {
+        if (super.isInstructionSupported(instructionId)) {
+            return true;
+        }
+        return instructionId === undercluedInstance.id;
+    }
+}

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,119 @@
+import { Color, State } from '../../primitives.js';
+import { Serializer } from '../../serializer/allSerializers.js';
+import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
+import { array } from '../../dataHelper.js';
+import validateGrid from '../../validate.js';
+function gridToRawTiles(grid) {
+    return array(grid.width, grid.height, (x, y) => grid.getTile(x, y).color);
+}
+function rawTilesToGrid(rawTiles, grid) {
+    return grid.fastCopyWith({
+        tiles: array(grid.width, grid.height, (x, y) => grid.getTile(x, y).withColor(rawTiles[y][x])),
+    });
+}
+function getNextTile(grid, rawTiles) {
+    for (let y = 0; y < grid.height; y++) {
+        for (let x = 0; x < grid.width; x++) {
+            const tile = grid.getTile(x, y);
+            if (!tile.exists || tile.fixed)
+                continue;
+            if (rawTiles[y][x] === Color.Gray)
+                return [{ x, y }, Color.Dark];
+        }
+    }
+    return undefined;
+}
+function backtrack(grid, rawTiles, submitSolution) {
+    // Find the best empty cell to guess
+    const target = getNextTile(grid, rawTiles);
+    // Found a solution
+    if (!target)
+        return !submitSolution(rawTiles);
+    const [pos, color] = target;
+    const positions = grid.connections.getConnectedTiles(pos);
+    for (let i = 0; i <= 1; i++) {
+        const tile = i === 0 ? color : color === Color.Dark ? Color.Light : Color.Dark;
+        positions.forEach(({ x, y }) => (rawTiles[y][x] = tile));
+        const newGrid = rawTilesToGrid(rawTiles, grid);
+        const isValid = validateGrid(newGrid, null);
+        if (isValid.final !== State.Error &&
+            backtrack(newGrid, rawTiles, submitSolution))
+            return true;
+    }
+    positions.forEach(({ x, y }) => (rawTiles[y][x] = Color.Gray));
+    return false;
+}
+function solveNormal(input, submitSolution) {
+    // Call backtrack
+    backtrack(input, gridToRawTiles(input), rawTiles => submitSolution(rawTiles ? rawTilesToGrid(rawTiles, input) : null));
+}
+function solveUnderclued(input) {
+    let grid = input;
+    const possibles = array(grid.width, grid.height, () => ({
+        dark: false,
+        light: false,
+    }));
+    function search(x, y, tile, color) {
+        const newGrid = grid.fastCopyWith({
+            tiles: grid.setTile(x, y, tile.withColor(color)),
+        });
+        // Solve
+        let solution;
+        solveNormal(newGrid, sol => {
+            solution = sol;
+            return false;
+        });
+        if (!solution)
+            return false;
+        // Update the new possible states
+        solution.forEach((solTile, solX, solY) => {
+            if (solTile.color === Color.Dark) {
+                possibles[solY][solX].dark = true;
+            }
+            else {
+                possibles[solY][solX].light = true;
+            }
+        });
+        return true;
+    }
+    for (let y = 0; y < grid.height; y++) {
+        for (let x = 0; x < grid.width; x++) {
+            const tile = grid.getTile(x, y);
+            if (!tile.exists || tile.color !== Color.Gray)
+                continue;
+            // We can skip this solve if it is proved to be solvable
+            const darkPossible = possibles[y][x].dark || search(x, y, tile, Color.Dark);
+            const lightPossible = possibles[y][x].light || search(x, y, tile, Color.Light);
+            // No solution
+            if (!darkPossible && !lightPossible)
+                return null;
+            if (darkPossible && !lightPossible)
+                grid = grid.fastCopyWith({
+                    tiles: grid.setTile(x, y, tile.withColor(Color.Dark)),
+                });
+            if (!darkPossible && lightPossible)
+                grid = grid.fastCopyWith({
+                    tiles: grid.setTile(x, y, tile.withColor(Color.Light)),
+                });
+        }
+    }
+    return grid;
+}
+function solve(grid, submitSolution) {
+    if (grid.findRule(rule => rule.id === undercluedInstance.id)) {
+        submitSolution(solveUnderclued(grid));
+    }
+    else {
+        solveNormal(grid, submitSolution);
+    }
+}
+onmessage = e => {
+    const grid = Serializer.parseGrid(e.data);
+    let count = 0;
+    solve(grid, solution => {
+        postMessage(solution ? Serializer.stringifyGrid(solution) : null);
+        count += 1;
+        return count < 2;
+    });
+    postMessage(null);
+};

package/dist/data/symbols/customIconSymbol.js

@@ -49,7 +49,7 @@ Object.defineProperty(CustomIconSymbol, "EXAMPLE_GRID", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: Object.freeze(new GridData(5, 4))
+    value: Object.freeze(GridData.create(5, 4))
 });
 Object.defineProperty(CustomIconSymbol, "CONFIGS", {
     enumerable: true,
@@ -102,4 +102,4 @@ Object.defineProperty(CustomIconSymbol, "CONFIGS", {
     ])
 });
 export default CustomIconSymbol;
-export const instance = new CustomIconSymbol('A *custom* icon symbol', new GridData(5, 4), 0, 0, 'MdQuestionMark');
+export const instance = new CustomIconSymbol('A *custom* icon symbol', GridData.create(5, 4), 0, 0, 'MdQuestionMark');

package/dist/data/symbols/customTextSymbol.js

@@ -49,7 +49,7 @@ Object.defineProperty(CustomTextSymbol, "EXAMPLE_GRID", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: Object.freeze(new GridData(5, 4))
+    value: Object.freeze(GridData.create(5, 4))
 });
 Object.defineProperty(CustomTextSymbol, "CONFIGS", {
     enumerable: true,
@@ -103,4 +103,4 @@ Object.defineProperty(CustomTextSymbol, "CONFIGS", {
     ])
 });
 export default CustomTextSymbol;
-export const instance = new CustomTextSymbol('A *custom* text symbol', new GridData(5, 4), 0, 0, 'X');
+export const instance = new CustomTextSymbol('A *custom* text symbol', GridData.create(5, 4), 0, 0, 'X');

package/dist/index.d.ts

@@ -64,8 +64,9 @@ import LotusBTModule from './data/solver/backtrack/symbols/lotus.js';
 import MinesweeperBTModule from './data/solver/backtrack/symbols/minesweeper.js';
 import MyopiaBTModule from './data/solver/backtrack/symbols/myopia.js';
 import ViewpointBTModule from './data/solver/backtrack/symbols/viewpoint.js';
+import EventIteratingSolver from './data/solver/eventIteratingSolver.js';
 import Solver from './data/solver/solver.js';
-import UndercluedSolver from './data/solver/underclued/undercluedSolver.js';
+import UniversalSolver from './data/solver/universal/universalSolver.js';
 import AreaNumberModule from './data/solver/z3/modules/areaNumberModule.js';
 import CellCountModule from './data/solver/z3/modules/cellCountModule.js';
 import ConnectAllModule from './data/solver/z3/modules/connectAllModule.js';
@@ -99,4 +100,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, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, 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, 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, Solver, UndercluedSolver, 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, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, 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, 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, };

package/dist/index.js

@@ -67,8 +67,9 @@ import LotusBTModule from './data/solver/backtrack/symbols/lotus.js';
 import MinesweeperBTModule from './data/solver/backtrack/symbols/minesweeper.js';
 import MyopiaBTModule from './data/solver/backtrack/symbols/myopia.js';
 import ViewpointBTModule from './data/solver/backtrack/symbols/viewpoint.js';
+import EventIteratingSolver from './data/solver/eventIteratingSolver.js';
 import Solver from './data/solver/solver.js';
-import UndercluedSolver from './data/solver/underclued/undercluedSolver.js';
+import UniversalSolver from './data/solver/universal/universalSolver.js';
 import AreaNumberModule from './data/solver/z3/modules/areaNumberModule.js';
 import CellCountModule from './data/solver/z3/modules/cellCountModule.js';
 import ConnectAllModule from './data/solver/z3/modules/connectAllModule.js';
@@ -102,4 +103,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, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, 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, 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, Solver, UndercluedSolver, 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, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, State, 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, 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, };

package/package.json

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

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

@@ -1,8 +0,0 @@
-import GridData from '../../grid.js';
-import Solver from '../solver.js';
-export default class UndercluedSolver extends Solver {
-    readonly id = "underclued";
-    readonly description = "Solves every puzzle as if it were underclued. Supports all rules and symbols and is decently fast for small puzzles. Very slow for large puzzles.";
-    solve(grid: GridData): AsyncGenerator<GridData | null>;
-    isInstructionSupported(instructionId: string): boolean;
-}

package/dist/data/solver/underclued/undercluedSolver.js

@@ -1,55 +0,0 @@
-import { Color } from '../../primitives.js';
-import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
-import { Serializer } from '../../serializer/allSerializers.js';
-import Solver from '../solver.js';
-export default class UndercluedSolver extends Solver {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "id", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'underclued'
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'Solves every puzzle as if it were underclued. Supports all rules and symbols and is decently fast for small puzzles. Very slow for large puzzles.'
-        });
-    }
-    async *solve(grid) {
-        const worker = new Worker(new URL('./undercluedWorker.js', import.meta.url), {
-            type: 'module',
-        });
-        try {
-            const solved = await new Promise(resolve => {
-                worker.addEventListener('message', e => {
-                    const solution = Serializer.parseGrid(e.data);
-                    // console.timeEnd('Solve time');
-                    if (solution.resetTiles().equals(solution))
-                        resolve(null);
-                    else
-                        resolve(solution);
-                });
-                worker.postMessage(Serializer.stringifyGrid(grid));
-                // console.time('Solve time');
-            });
-            yield solved;
-            if (solved) {
-                if (solved.getTileCount(true, undefined, Color.Gray) === 0) {
-                    yield null; // the grid is completely filled, which means the solution is unique
-                }
-            }
-        }
-        finally {
-            worker.terminate();
-        }
-    }
-    isInstructionSupported(instructionId) {
-        if (super.isInstructionSupported(instructionId)) {
-            return true;
-        }
-        return instructionId === undercluedInstance.id;
-    }
-}

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

@@ -1,2 +0,0 @@
-declare const _default: null;
-export default _default;

package/dist/data/solver/underclued/undercluedWorker.js

@@ -1,135 +0,0 @@
-import { Color, State } from '../../primitives.js';
-import { Serializer } from '../../serializer/allSerializers.js';
-import validateGrid from '../../validate.js';
-function posToCoords(pos, width) {
-    if (pos === undefined) {
-        throw new Error('pos is undefined');
-    }
-    return [pos % width, Math.floor(pos / width)];
-}
-function coordsToPos(a, width) {
-    return a[0] + a[1] * width;
-}
-function getValidGrid(grid, assumptions, canAssump) {
-    while (true) {
-        // Get assumption
-        const newAssump = canAssump.findIndex((a, i) => a && !assumptions.includes(i));
-        if (newAssump === -1) {
-            return [grid, assumptions, true];
-        }
-        // Set assumption's color to dark
-        const coords = posToCoords(newAssump, grid.width);
-        grid = grid.setTile(coords[0], coords[1], tile => tile.withColor(Color.Dark));
-        assumptions.push(newAssump);
-        for (const a of grid.connections.getConnectedTiles({
-            x: coords[0],
-            y: coords[1],
-        })) {
-            canAssump[coordsToPos([a.x, a.y], grid.width)] =
-                a.x === coords[0] && a.y === coords[1];
-        }
-        const state = validateGrid(grid, null);
-        // If the grid is invalid, try to backtrack to a right assumption
-        if (state.final === State.Error) {
-            // eslint-disable-next-line @typescript-eslint/no-use-before-define
-            [grid, assumptions] = tryToBacktrack(grid, assumptions);
-            if (assumptions.length === 0) {
-                return [grid, assumptions, false];
-            }
-        }
-    }
-}
-function tryToBacktrack(grid, assumptions) {
-    while (assumptions.length > 0) {
-        const coords = posToCoords(assumptions[assumptions.length - 1], grid.width);
-        if (grid.getTile(coords[0], coords[1]).color === Color.Light) {
-            grid = grid.setTile(coords[0], coords[1], tile => tile.withColor(Color.Gray));
-            assumptions.pop();
-        }
-        else {
-            grid = grid.setTile(coords[0], coords[1], tile => tile.withColor(Color.Light));
-            const state = validateGrid(grid, null);
-            if (state.final === State.Error) {
-                grid = grid.setTile(coords[0], coords[1], tile => tile.withColor(Color.Gray));
-                assumptions.pop();
-            }
-            else {
-                return [grid, assumptions];
-            }
-        }
-    }
-    return [grid, assumptions];
-}
-function computeSolution(initialGrid) {
-    const canAssump = initialGrid.tiles
-        .map(row => row.map(t => t.exists && !t.fixed))
-        .flat();
-    let lastValidGrid = [];
-    let assumptions = [];
-    let currentGrid = initialGrid.copyWith({});
-    let anyNewGrid;
-    while (assumptions.length > 0 || lastValidGrid.length === 0) {
-        [currentGrid, assumptions, anyNewGrid] = getValidGrid(currentGrid, assumptions, canAssump);
-        // console.log(
-        //   currentGrid.tiles
-        //     .map(row =>
-        //       row
-        //         .map(t => {
-        //           const color = t.color === Color.Light ? 'w' : 'b';
-        //           if (t.color === Color.Gray) return 'n';
-        //           if (!t.exists) return '.';
-        //           return t.fixed ? color.toUpperCase() : color;
-        //         })
-        //         .join('')
-        //     )
-        //     .join('\n')
-        // );
-        if (!anyNewGrid) {
-            break;
-        }
-        const newLastValidGrid = currentGrid.tiles
-            .map(row => row.map(t => t.color))
-            .flat();
-        if (lastValidGrid.length !== 0) {
-            const diff = newLastValidGrid.map((color, i) => color === lastValidGrid[i]);
-            diff.forEach((same, i) => {
-                if (!same) {
-                    newLastValidGrid[i] = Color.Gray;
-                }
-            });
-        }
-        [currentGrid, assumptions] = tryToBacktrack(currentGrid, assumptions);
-        lastValidGrid = newLastValidGrid;
-    }
-    // Create a new grid with lastValidGrid
-    let solutionGrid = initialGrid.copyWith({});
-    lastValidGrid.forEach((color, i) => {
-        const coords = posToCoords(i, solutionGrid.width);
-        solutionGrid = solutionGrid.setTile(coords[0], coords[1], tile => tile.withColor(color));
-    });
-    // console.log(
-    //   solutionGrid.tiles
-    //     .map(row =>
-    //       row
-    //         .map(t => {
-    //           const color = t.color === Color.Light ? 'w' : 'b';
-    //           if (t.color === Color.Gray) return 'n';
-    //           if (!t.exists) return '.';
-    //           return t.fixed ? color.toUpperCase() : color;
-    //         })
-    //         .join('')
-    //     )
-    //     .join('\n')
-    // );
-    return solutionGrid;
-}
-onmessage = e => {
-    if (!e.data || typeof e.data !== 'string')
-        return;
-    const grid = Serializer.parseGrid(e.data);
-    const solved = computeSolution(grid);
-    postMessage(Serializer.stringifyGrid(solved));
-};
-// make typescript happy
-// eslint-disable-next-line import/no-anonymous-default-export
-export default null;