@logic-pad/core 0.25.2 → 0.26.0

package/dist/src/data/solver/cspuz/cspuzSolver.js

@@ -6,10 +6,10 @@ import { instance as symbolsPerRegionInstance } from '../../rules/symbolsPerRegi
 import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
 import { instance as uniqueShapeInstance } from '../../rules/uniqueShapeRule.js';
 import { instance as offByXInstance } from '../../rules/offByXRule.js';
-import { instance as areaNumberInstance } from '../../symbols/areaNumberSymbol.js';
+import AreaNumberSymbol, { instance as areaNumberInstance, } from '../../symbols/areaNumberSymbol.js';
 import { instance as dartInstance } from '../../symbols/dartSymbol.js';
 import GalaxySymbol, { instance as galaxyInstance, } from '../../symbols/galaxySymbol.js';
-import { instance as letterInstance } from '../../symbols/letterSymbol.js';
+import LetterSymbol, { instance as letterInstance, } from '../../symbols/letterSymbol.js';
 import LotusSymbol, { instance as lotusInstance, } from '../../symbols/lotusSymbol.js';
 import { instance as minesweeperInstance } from '../../symbols/minesweeperSymbol.js';
 import { instance as viewpointInstance } from '../../symbols/viewpointSymbol.js';
@@ -50,31 +50,58 @@ export default class CspuzSolver extends EventIteratingSolver {
         if (!super.isGridSupported(grid)) {
             return false;
         }
-        // special handling for galaxies and lotuses since dual-color symbols are not supported yet
-        for (const [_, symbols] of grid.symbols) {
-            for (const symbol of symbols) {
-                if (symbol instanceof GalaxySymbol || symbol instanceof LotusSymbol) {
-                    if (symbol.x % 1 !== 0 && symbol.y % 1 !== 0) {
+        // special handling for fixed gray tiles
+        if (grid.getTileCount(true, true, Color.Gray) > 0) {
+            return false;
+        }
+        return true;
+    }
+    isInstructionSupported(grid, instruction) {
+        if (instruction instanceof LotusSymbol ||
+            instruction instanceof GalaxySymbol) {
+            if (instruction.x % 1 !== 0 && instruction.y % 1 !== 0) {
+                return false;
+            }
+        }
+        if (instruction instanceof LotusSymbol ||
+            instruction instanceof GalaxySymbol ||
+            instruction instanceof AreaNumberSymbol ||
+            instruction instanceof LetterSymbol) {
+            if (instruction.x % 1 !== 0 || instruction.y % 1 !== 0) {
+                const minX = Math.floor(instruction.x);
+                const minY = Math.floor(instruction.y);
+                const maxX = Math.ceil(instruction.x);
+                const maxY = Math.ceil(instruction.y);
+                const connectedTiles = grid.connections.getConnectedTiles({
+                    x: minX,
+                    y: minY,
+                });
+                if (connectedTiles.some(tile => tile.x === minX && tile.y === maxY) &&
+                    connectedTiles.some(tile => tile.x === maxX && tile.y === minY) &&
+                    connectedTiles.some(tile => tile.x === maxX && tile.y === maxY)) {
+                    return true;
+                }
+                let color = Color.Gray;
+                for (let i = 0; i < 4; i++) {
+                    const x = i % 2 === 0 ? minX : maxX;
+                    const y = i < 2 ? minY : maxY;
+                    const tile = grid.getTile(x, y);
+                    if (!tile.fixed || !tile.exists) {
                         return false;
                     }
-                    else if (symbol.x % 1 !== 0 || symbol.y % 1 !== 0) {
-                        const tile1 = grid.getTile(Math.floor(symbol.x), Math.floor(symbol.y));
-                        const tile2 = grid.getTile(Math.ceil(symbol.x), Math.ceil(symbol.y));
-                        if (!tile1.fixed || !tile2.fixed || tile1.color !== tile2.color) {
+                    if (tile.color !== Color.Gray) {
+                        if (color === Color.Gray) {
+                            color = tile.color;
+                        }
+                        else if (color !== tile.color) {
                             return false;
                         }
                     }
                 }
+                return true;
             }
         }
-        // special handling for fixed gray tiles
-        if (grid.getTileCount(true, true, Color.Gray) > 0) {
-            return false;
-        }
-        return true;
-    }
-    isInstructionSupported(instructionId) {
-        return CspuzSolver.supportedInstrs.includes(instructionId);
+        return CspuzSolver.supportedInstrs.includes(instruction.id);
     }
     async isEnvironmentSupported() {
         try {

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

@@ -1,5 +1,6 @@
 import { CachedAccess } from '../dataHelper.js';
 import GridData from '../grid.js';
+import { Instruction } from '../../index.js';
 /**
  * Base class that all solvers must extend.
  */
@@ -61,7 +62,7 @@ export default abstract class Solver {
      *
      * @param instructionId The unique identifier of the instruction.
      */
-    isInstructionSupported(instructionId: string): boolean;
+    isInstructionSupported(_grid: GridData, instruction: Instruction): boolean;
     /**
      * Check if the solver supports the given grid. This methid is frequently called when the user changes the grid, and
      * the result is used to enable or disable the "Solve" button.

package/dist/src/data/solver/solver.js

@@ -1,6 +1,7 @@
 import { CachedAccess } from '../dataHelper.js';
 import { allRules } from '../rules/index.js';
 import { allSymbols } from '../symbols/index.js';
+import { instance as undercluedInstance } from '../rules/undercluedRule.js';
 /**
  * Base class that all solvers must extend.
  */
@@ -24,14 +25,14 @@ export default class Solver {
      *
      * @param instructionId The unique identifier of the instruction.
      */
-    isInstructionSupported(instructionId) {
-        const symbol = allSymbols.get(instructionId);
+    isInstructionSupported(_grid, instruction) {
+        const symbol = allSymbols.get(instruction.id);
         if (symbol) {
             return !symbol.validateWithSolution;
         }
-        const rule = allRules.get(instructionId);
+        const rule = allRules.get(instruction.id);
         if (rule) {
-            return !rule.validateWithSolution;
+            return !rule.validateWithSolution || rule.id === undercluedInstance.id;
         }
         return false;
     }
@@ -46,11 +47,11 @@ export default class Solver {
      * @returns `true` if the grid is supported, or `false` otherwise.
      */
     isGridSupported(grid) {
-        if (grid.rules.some(rule => rule.necessaryForCompletion && !this.isInstructionSupported(rule.id))) {
+        if (grid.rules.some(rule => rule.necessaryForCompletion &&
+            !this.isInstructionSupported(grid, rule))) {
             return false;
         }
-        if ([...grid.symbols.keys()].some(id => grid.symbols.get(id)?.some(s => s.necessaryForCompletion) &&
-            !this.isInstructionSupported(id))) {
+        if ([...grid.symbols.values()].some(symbols => symbols.some(s => s.necessaryForCompletion && !this.isInstructionSupported(grid, s)))) {
             return false;
         }
         return true;

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

@@ -4,5 +4,4 @@ export default class UniversalSolver extends EventIteratingSolver {
     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/src/data/solver/universal/universalSolver.js

@@ -1,4 +1,3 @@
-import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
 import EventIteratingSolver from '../eventIteratingSolver.js';
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
 ('vite-apply-code-mod');
@@ -11,10 +10,4 @@ export default class UniversalSolver extends EventIteratingSolver {
             type: 'module',
         });
     }
-    isInstructionSupported(instructionId) {
-        if (super.isInstructionSupported(instructionId)) {
-            return true;
-        }
-        return instructionId === undercluedInstance.id;
-    }
 }

package/dist/src/data/symbols/areaNumberSymbol.d.ts

@@ -20,7 +20,7 @@ export default class AreaNumberSymbol extends NumberSymbol {
     countTiles(grid: GridData): {
         completed: number;
         possible: number;
-    };
+    } | null;
     copyWith({ x, y, number, }: {
         x?: number;
         y?: number;

package/dist/src/data/symbols/areaNumberSymbol.js

@@ -53,6 +53,8 @@ export default class AreaNumberSymbol extends NumberSymbol {
         return AreaNumberSymbol.EXAMPLE_GRID;
     }
     countTiles(grid) {
+        if (!this.validateSubtilePlacement(grid))
+            return null;
         const thisX = Math.floor(this.x);
         const thisY = Math.floor(this.y);
         const color = grid.getTile(thisX, thisY).color;

package/dist/src/data/symbols/everyLetterSymbol.js

@@ -64,6 +64,8 @@ export default class EveryLetterSymbol extends Symbol {
         return EveryLetterSymbol.EXAMPLE_GRID;
     }
     validateSymbol(grid) {
+        if (!this.validateSubtilePlacement(grid))
+            return State.Error;
         const uniqueLetters = new Set(grid.symbols.get(this.id)?.map(s => s.letter));
         if (uniqueLetters.size === 0) {
             return State.Satisfied;

package/dist/src/data/symbols/houseSymbol.d.ts

@@ -23,7 +23,7 @@ export default class HouseSymbol extends NumberSymbol {
     countTiles(grid: GridData): {
         completed: number;
         possible: number;
-    };
+    } | null;
     copyWith({ x, y, number, }: {
         x?: number;
         y?: number;

package/dist/src/data/symbols/houseSymbol.js

@@ -65,6 +65,8 @@ export default class HouseSymbol extends NumberSymbol {
         return HouseSymbol.EXAMPLE_GRID;
     }
     countTiles(grid) {
+        if (!this.validateSubtilePlacement(grid))
+            return null;
         const thisX = Math.floor(this.x);
         const thisY = Math.floor(this.y);
         const visited = array(grid.width, grid.height, () => false);

package/dist/src/data/symbols/letterSymbol.js

@@ -67,6 +67,8 @@ export default class LetterSymbol extends Symbol {
         return LetterSymbol.EXAMPLE_GRID;
     }
     validateSymbol(grid) {
+        if (!this.validateSubtilePlacement(grid))
+            return State.Error;
         const thisX = Math.floor(this.x);
         const thisY = Math.floor(this.y);
         let complete = true;

package/dist/src/data/symbols/numberSymbol.d.ts

@@ -12,7 +12,7 @@ export default abstract class NumberSymbol extends Symbol {
     abstract countTiles(grid: GridData): {
         completed: number;
         possible: number;
-    };
+    } | null;
     validateSymbol(grid: GridData): State;
     withNumber(number: number): this;
 }

package/dist/src/data/symbols/numberSymbol.js

@@ -15,7 +15,10 @@ export default class NumberSymbol extends Symbol {
         this.number = number;
     }
     validateSymbol(grid) {
-        const { completed, possible } = this.countTiles(grid);
+        const countResult = this.countTiles(grid);
+        if (countResult === null)
+            return State.Error;
+        const { completed, possible } = countResult;
         if (completed > this.number || possible < this.number)
             return State.Error;
         if (completed === this.number && possible === this.number)

package/dist/src/data/symbols/symbol.d.ts

@@ -20,5 +20,10 @@ export default abstract class Symbol extends Instruction implements GridResizeHa
     withX(x: number): this;
     withY(y: number): this;
     withPosition(x: number, y: number): this;
+    /**
+     * For symbols that can be placed between tiles, this method implements the default validation logic,
+     * which requires all tiles touching the symbol to be either gray or of the same color.
+     */
+    protected validateSubtilePlacement(grid: GridData): boolean;
 }
 export declare const instance: undefined;

package/dist/src/data/symbols/symbol.js

@@ -1,4 +1,5 @@
 import Instruction from '../instruction.js';
+import { Color } from '../primitives.js';
 export default class Symbol extends Instruction {
     x;
     y;
@@ -51,5 +52,36 @@ export default class Symbol extends Instruction {
     withPosition(x, y) {
         return this.copyWith({ x, y });
     }
+    /**
+     * For symbols that can be placed between tiles, this method implements the default validation logic,
+     * which requires all tiles touching the symbol to be either gray or of the same color.
+     */
+    validateSubtilePlacement(grid) {
+        if (this.placementStep >= 1)
+            return true;
+        const minX = Math.floor(this.x);
+        const minY = Math.floor(this.y);
+        if (minX === this.x && minY === this.y)
+            return true;
+        const maxX = Math.ceil(this.x);
+        const maxY = Math.ceil(this.y);
+        let color = Color.Gray;
+        for (let i = 0; i < 4; i++) {
+            const x = i % 2 === 0 ? minX : maxX;
+            const y = i < 2 ? minY : maxY;
+            const tile = grid.getTile(x, y);
+            if (!tile.exists)
+                return false;
+            if (tile.color !== Color.Gray) {
+                if (color === Color.Gray) {
+                    color = tile.color;
+                }
+                else if (color !== tile.color) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }
 export const instance = undefined;

package/dist/src/index.d.ts

@@ -10,7 +10,7 @@ import { handlesSetGrid, invokeSetGrid } from './data/events/onSetGrid.js';
 import { handlesSymbolDisplay } from './data/events/onSymbolDisplay.js';
 import { handlesSymbolMerge } from './data/events/onSymbolMerge.js';
 import { handlesSymbolValidation } from './data/events/onSymbolValidation.js';
-import GridData, { NEIGHBOR_OFFSETS } from './data/grid.js';
+import GridData, { NEIGHBOR_OFFSETS, NEIGHBOR_OFFSETS_8 } from './data/grid.js';
 import GridConnections from './data/gridConnections.js';
 import GridZones from './data/gridZones.js';
 import Instruction from './data/instruction.js';
@@ -58,7 +58,7 @@ import { getShapeVariants, normalizeShape, positionsToShape, sanitizePatternGrid
 import { allSolvers } from './data/solver/allSolvers.js';
 import AutoSolver from './data/solver/auto/autoSolver.js';
 import BacktrackSolver from './data/solver/backtrack/backtrackSolver.js';
-import BTModule, { BTGridData, BTTile, IntArray2D, colorToBTTile, createOneTileResult, getOppositeColor } from './data/solver/backtrack/data.js';
+import BTModule, { BTGridData, BTTile, IntArray2D, checkSubtilePlacement, colorToBTTile, createOneTileResult, getOppositeColor } from './data/solver/backtrack/data.js';
 import BanPatternBTModule from './data/solver/backtrack/rules/banPattern.js';
 import CellCountBTModule from './data/solver/backtrack/rules/cellCount.js';
 import ConnectAllBTModule from './data/solver/backtrack/rules/connectAll.js';
@@ -82,19 +82,6 @@ import { gridToJson } from './data/solver/cspuz/jsonify.js';
 import EventIteratingSolver from './data/solver/eventIteratingSolver.js';
 import Solver from './data/solver/solver.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';
-import DartModule from './data/solver/z3/modules/dartModule.js';
-import { allZ3Modules } from './data/solver/z3/modules/index.js';
-import LetterModule from './data/solver/z3/modules/letterModule.js';
-import MyopiaModule from './data/solver/z3/modules/myopiaModule.js';
-import RegionAreaModule from './data/solver/z3/modules/regionAreaModule.js';
-import ViewpointModule from './data/solver/z3/modules/viewpointModule.js';
-import Z3Module from './data/solver/z3/modules/z3Module.js';
-import { convertDirection } from './data/solver/z3/utils.js';
-import Z3Solver from './data/solver/z3/z3Solver.js';
-import Z3SolverContext from './data/solver/z3/z3SolverContext.js';
 import AreaNumberSymbol from './data/symbols/areaNumberSymbol.js';
 import CustomIconSymbol from './data/symbols/customIconSymbol.js';
 import CustomSymbol from './data/symbols/customSymbol.js';
@@ -118,4 +105,4 @@ import TileData from './data/tile.js';
 import TileConnections from './data/tileConnections.js';
 import validateGrid, { aggregateState, applyFinalOverrides } from './data/validate.js';
 import { GridValidator } from './data/validateAsync.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, handlesSymbolMerge, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, DRUM_SAMPLES, Direction, INSTRUMENTS, Instrument, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, isDrumSample, orientationToggle, MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, ConnectZonesRule, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, ExactCountPerZoneRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, NoLoopsRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameCountPerZoneRule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, ChecksumCompressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerChecksum, SerializerV0, OFFSETS, orientationChars, getShapeVariants, normalizeShape, positionsToShape, sanitizePatternGrid, shapeEquals, tilesToShape, allSolvers, AutoSolver, 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, CspuzSolver, gridToJson, EventIteratingSolver, Solver, UniversalSolver, AreaNumberModule, CellCountModule, ConnectAllModule, DartModule, allZ3Modules, LetterModule, MyopiaModule, RegionAreaModule, ViewpointModule, Z3Module, convertDirection, Z3Solver, Z3SolverContext, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, EveryLetterSymbol, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };
+export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolMerge, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, NEIGHBOR_OFFSETS_8, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, DRUM_SAMPLES, Direction, INSTRUMENTS, Instrument, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, isDrumSample, orientationToggle, MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, ConnectZonesRule, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, ExactCountPerZoneRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, NoLoopsRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameCountPerZoneRule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, ChecksumCompressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerChecksum, SerializerV0, OFFSETS, orientationChars, getShapeVariants, normalizeShape, positionsToShape, sanitizePatternGrid, shapeEquals, tilesToShape, allSolvers, AutoSolver, BacktrackSolver, BTModule, BTGridData, BTTile, IntArray2D, checkSubtilePlacement, colorToBTTile, createOneTileResult, getOppositeColor, BanPatternBTModule, CellCountBTModule, ConnectAllBTModule, RegionAreaBTModule, RegionShapeBTModule, SameShapeBTModule, SymbolsPerRegionBTModule, UniqueShapeBTModule, AreaNumberBTModule, DartBTModule, DirectionLinkerBTModule, FocusBTModule, GalaxyBTModule, LetterBTModule, LotusBTModule, MinesweeperBTModule, MyopiaBTModule, ViewpointBTModule, CspuzSolver, gridToJson, EventIteratingSolver, Solver, UniversalSolver, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, EveryLetterSymbol, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };

package/dist/src/index.js

@@ -13,7 +13,7 @@ import { handlesSetGrid, invokeSetGrid } from './data/events/onSetGrid.js';
 import { handlesSymbolDisplay } from './data/events/onSymbolDisplay.js';
 import { handlesSymbolMerge } from './data/events/onSymbolMerge.js';
 import { handlesSymbolValidation } from './data/events/onSymbolValidation.js';
-import GridData, { NEIGHBOR_OFFSETS } from './data/grid.js';
+import GridData, { NEIGHBOR_OFFSETS, NEIGHBOR_OFFSETS_8 } from './data/grid.js';
 import GridConnections from './data/gridConnections.js';
 import GridZones from './data/gridZones.js';
 import Instruction from './data/instruction.js';
@@ -61,7 +61,7 @@ import { getShapeVariants, normalizeShape, positionsToShape, sanitizePatternGrid
 import { allSolvers } from './data/solver/allSolvers.js';
 import AutoSolver from './data/solver/auto/autoSolver.js';
 import BacktrackSolver from './data/solver/backtrack/backtrackSolver.js';
-import BTModule, { BTGridData, BTTile, IntArray2D, colorToBTTile, createOneTileResult, getOppositeColor } from './data/solver/backtrack/data.js';
+import BTModule, { BTGridData, BTTile, IntArray2D, checkSubtilePlacement, colorToBTTile, createOneTileResult, getOppositeColor } from './data/solver/backtrack/data.js';
 import BanPatternBTModule from './data/solver/backtrack/rules/banPattern.js';
 import CellCountBTModule from './data/solver/backtrack/rules/cellCount.js';
 import ConnectAllBTModule from './data/solver/backtrack/rules/connectAll.js';
@@ -85,19 +85,6 @@ import { gridToJson } from './data/solver/cspuz/jsonify.js';
 import EventIteratingSolver from './data/solver/eventIteratingSolver.js';
 import Solver from './data/solver/solver.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';
-import DartModule from './data/solver/z3/modules/dartModule.js';
-import { allZ3Modules } from './data/solver/z3/modules/index.js';
-import LetterModule from './data/solver/z3/modules/letterModule.js';
-import MyopiaModule from './data/solver/z3/modules/myopiaModule.js';
-import RegionAreaModule from './data/solver/z3/modules/regionAreaModule.js';
-import ViewpointModule from './data/solver/z3/modules/viewpointModule.js';
-import Z3Module from './data/solver/z3/modules/z3Module.js';
-import { convertDirection } from './data/solver/z3/utils.js';
-import Z3Solver from './data/solver/z3/z3Solver.js';
-import Z3SolverContext from './data/solver/z3/z3SolverContext.js';
 import AreaNumberSymbol from './data/symbols/areaNumberSymbol.js';
 import CustomIconSymbol from './data/symbols/customIconSymbol.js';
 import CustomSymbol from './data/symbols/customSymbol.js';
@@ -121,4 +108,4 @@ import TileData from './data/tile.js';
 import TileConnections from './data/tileConnections.js';
 import validateGrid, { aggregateState, applyFinalOverrides } from './data/validate.js';
 import { GridValidator } from './data/validateAsync.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, handlesSymbolMerge, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, DRUM_SAMPLES, Direction, INSTRUMENTS, Instrument, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, isDrumSample, orientationToggle, MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, ConnectZonesRule, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, ExactCountPerZoneRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, NoLoopsRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameCountPerZoneRule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, ChecksumCompressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerChecksum, SerializerV0, OFFSETS, orientationChars, getShapeVariants, normalizeShape, positionsToShape, sanitizePatternGrid, shapeEquals, tilesToShape, allSolvers, AutoSolver, 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, CspuzSolver, gridToJson, EventIteratingSolver, Solver, UniversalSolver, AreaNumberModule, CellCountModule, ConnectAllModule, DartModule, allZ3Modules, LetterModule, MyopiaModule, RegionAreaModule, ViewpointModule, Z3Module, convertDirection, Z3Solver, Z3SolverContext, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, EveryLetterSymbol, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };
+export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolMerge, handlesSymbolValidation, GridData, NEIGHBOR_OFFSETS, NEIGHBOR_OFFSETS_8, GridConnections, GridZones, Instruction, COMPARISONS, Color, Comparison, DIRECTIONS, DRUM_SAMPLES, Direction, INSTRUMENTS, Instrument, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, isDrumSample, orientationToggle, MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, ConnectZonesRule, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, ExactCountPerZoneRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, NoLoopsRule, OffByXRule, PerfectionRule, RegionAreaRule, RegionShapeRule, Rule, SameCountPerZoneRule, SameShapeRule, SymbolsPerRegionRule, UndercluedRule, UniqueShapeRule, WrapAroundRule, Serializer, Compressor, ChecksumCompressor, CompressorBase, DeflateCompressor, GzipCompressor, StreamCompressor, SerializerBase, SerializerChecksum, SerializerV0, OFFSETS, orientationChars, getShapeVariants, normalizeShape, positionsToShape, sanitizePatternGrid, shapeEquals, tilesToShape, allSolvers, AutoSolver, BacktrackSolver, BTModule, BTGridData, BTTile, IntArray2D, checkSubtilePlacement, colorToBTTile, createOneTileResult, getOppositeColor, BanPatternBTModule, CellCountBTModule, ConnectAllBTModule, RegionAreaBTModule, RegionShapeBTModule, SameShapeBTModule, SymbolsPerRegionBTModule, UniqueShapeBTModule, AreaNumberBTModule, DartBTModule, DirectionLinkerBTModule, FocusBTModule, GalaxyBTModule, LetterBTModule, LotusBTModule, MinesweeperBTModule, MyopiaBTModule, ViewpointBTModule, CspuzSolver, gridToJson, EventIteratingSolver, Solver, UniversalSolver, AreaNumberSymbol, CustomIconSymbol, CustomSymbol, CustomTextSymbol, DartSymbol, DirectionLinkerSymbol, EveryLetterSymbol, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-pad/core",
-  "version": "0.25.2",
+  "version": "0.26.0",
   "type": "module",
   "files": [
     "dist",
@@ -54,10 +54,8 @@
   "dependencies": {
     "compression-streams-polyfill": "^0.1.7",
     "event-iterator": "^2.0.0",
-    "grilops": "^0.1.2",
     "lodash": "^4.17.21",
     "logic-pad-solver-core": "^0.1.2",
-    "z3-solver": "^4.13.0",
     "zod": "^4.0.17"
   },
   "devDependencies": {

package/dist/src/data/solver/z3/modules/areaNumberModule.d.ts

@@ -1,9 +0,0 @@
-import { Solver, Optimize } from 'z3-solver';
-import GridData from '../../../grid.js';
-import Z3SolverContext from '../z3SolverContext.js';
-import Z3Module from './z3Module.js';
-export default class AreaNumberModule extends Z3Module {
-    readonly id: string;
-    encode<Name extends string>(grid: GridData, ctx: Z3SolverContext<Name, Solver<Name> | Optimize<Name>>): void;
-}
-export declare const instance: AreaNumberModule;

package/dist/src/data/solver/z3/modules/areaNumberModule.js

@@ -1,27 +0,0 @@
-import Z3Module from './z3Module.js';
-import { instance as areaNumberInstance, } from '../../../symbols/areaNumberSymbol.js';
-import { Point } from 'grilops';
-export default class AreaNumberModule extends Z3Module {
-    id = areaNumberInstance.id;
-    encode(grid, ctx) {
-        const symbols = grid.symbols.get(this.id);
-        // optimizations
-        if (!symbols || symbols.length === 0) {
-            return;
-        }
-        for (const symbol of symbols) {
-            if (symbol.number < 1) {
-                ctx.solver.add(ctx.ctx.Bool.val(false));
-                return;
-            }
-        }
-        // encode for real
-        const rc = ctx.regionConstrainer;
-        for (const symbol of symbols) {
-            const x = Math.floor(symbol.x);
-            const y = Math.floor(symbol.y);
-            ctx.solver.add(rc.regionSizeGrid.get(new Point(y, x)).eq(Math.round(symbol.number)));
-        }
-    }
-}
-export const instance = new AreaNumberModule();

package/dist/src/data/solver/z3/modules/cellCountModule.d.ts

@@ -1,9 +0,0 @@
-import { Solver, Optimize } from 'z3-solver';
-import GridData from '../../../grid.js';
-import Z3SolverContext from '../z3SolverContext.js';
-import Z3Module from './z3Module.js';
-export default class CellCountModule extends Z3Module {
-    readonly id: string;
-    encode<Name extends string>(grid: GridData, ctx: Z3SolverContext<Name, Solver<Name> | Optimize<Name>>): void;
-}
-export declare const instance: CellCountModule;

package/dist/src/data/solver/z3/modules/cellCountModule.js

@@ -1,51 +0,0 @@
-import Z3Module from './z3Module.js';
-import { Point } from 'grilops';
-import { instance as cellCountInstance, } from '../../../rules/cellCountRule.js';
-import { Color } from '../../../primitives.js';
-export default class CellCountModule extends Z3Module {
-    id = cellCountInstance.id;
-    encode(grid, ctx) {
-        const rules = grid.rules.filter(rule => rule.id === this.id);
-        // optimizations
-        if (rules.length === 0) {
-            return;
-        }
-        const colorMap = new Map();
-        for (const rule of rules) {
-            if (colorMap.has(rule.color)) {
-                if (colorMap.get(rule.color) !== rule.count) {
-                    ctx.solver.add(ctx.ctx.Bool.val(false));
-                    return;
-                }
-            }
-            else {
-                colorMap.set(rule.color, rule.count);
-            }
-        }
-        for (const [color, count] of colorMap.entries()) {
-            const { min, max } = grid.getColorCount(color);
-            if (min > count || max < count) {
-                ctx.solver.add(ctx.ctx.Bool.val(false));
-                return;
-            }
-        }
-        if (colorMap.has(Color.Light) && colorMap.has(Color.Dark)) {
-            if (colorMap.get(Color.Light) + colorMap.get(Color.Dark) !==
-                grid.getTileCount(true)) {
-                ctx.solver.add(ctx.ctx.Bool.val(false));
-                return;
-            }
-        }
-        // encode for real
-        for (const [color, count] of colorMap.entries()) {
-            const sumTerms = [];
-            grid.forEach((tile, x, y) => {
-                if (tile.exists) {
-                    sumTerms.push(ctx.ctx.If(ctx.grid.cellAt(new Point(y, x)).eq(ctx.symbolSet.indices[color]), 1, 0));
-                }
-            });
-            ctx.solver.add(ctx.ctx.Sum(sumTerms[0], ...sumTerms.slice(1)).eq(count));
-        }
-    }
-}
-export const instance = new CellCountModule();

package/dist/src/data/solver/z3/modules/connectAllModule.d.ts

@@ -1,9 +0,0 @@
-import { Solver, Optimize } from 'z3-solver';
-import GridData from '../../../grid.js';
-import Z3SolverContext from '../z3SolverContext.js';
-import Z3Module from './z3Module.js';
-export default class ConnectAllModule extends Z3Module {
-    readonly id: string;
-    encode<Name extends string>(grid: GridData, ctx: Z3SolverContext<Name, Solver<Name> | Optimize<Name>>): void;
-}
-export declare const instance: ConnectAllModule;

package/dist/src/data/solver/z3/modules/connectAllModule.js

@@ -1,24 +0,0 @@
-import Z3Module from './z3Module.js';
-import { instance as connectAllInstance, } from '../../../rules/connectAllRule.js';
-export default class ConnectAllModule extends Z3Module {
-    id = connectAllInstance.id;
-    encode(grid, ctx) {
-        const rules = grid.rules.filter(rule => rule.id === this.id);
-        // optimizations to try to simplify the encoding
-        if (rules.length === 0) {
-            return;
-        }
-        // encode for real
-        const rc = ctx.regionConstrainer;
-        for (const color of new Set(rules.map(rule => rule.color))) {
-            const sumTerms = [];
-            for (const [p, cell] of ctx.grid.grid.entries()) {
-                sumTerms.push(ctx.ctx.If(cell
-                    .eq(ctx.symbolSet.indices[color])
-                    .and(rc.parentGrid.get(p).eq(1)), 1, 0));
-            }
-            ctx.solver.add(ctx.ctx.Sum(sumTerms[0], ...sumTerms.slice(1)).eq(1));
-        }
-    }
-}
-export const instance = new ConnectAllModule();

package/dist/src/data/solver/z3/modules/dartModule.d.ts

@@ -1,9 +0,0 @@
-import { Solver, Optimize } from 'z3-solver';
-import GridData from '../../../grid.js';
-import Z3SolverContext from '../z3SolverContext.js';
-import Z3Module from './z3Module.js';
-export default class DartModule extends Z3Module {
-    readonly id: string;
-    encode<Name extends string>(grid: GridData, ctx: Z3SolverContext<Name, Solver<Name> | Optimize<Name>>): void;
-}
-export declare const instance: DartModule;