@logic-pad/core 0.25.2 → 0.25.3

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

@@ -746,6 +746,7 @@ declare global {
     get isSingleton(): boolean;
   }
   export declare const NEIGHBOR_OFFSETS: Position$1[];
+  export declare const NEIGHBOR_OFFSETS_8: Position$1[];
   export declare class GridData {
     readonly width: number;
     readonly height: number;

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

@@ -10,6 +10,7 @@ import UndercluedRule from './rules/undercluedRule.js';
 import GridZones from './gridZones.js';
 import WrapAroundRule from './rules/wrapAroundRule.js';
 export declare const NEIGHBOR_OFFSETS: Position[];
+export declare const NEIGHBOR_OFFSETS_8: Position[];
 export default class GridData {
     readonly width: number;
     readonly height: number;

package/dist/src/data/grid.js

@@ -12,6 +12,16 @@ export const NEIGHBOR_OFFSETS = [
     { x: 0, y: -1 },
     { x: 0, y: 1 },
 ];
+export const NEIGHBOR_OFFSETS_8 = [
+    { x: -1, y: 0 },
+    { x: 1, y: 0 },
+    { x: 0, y: -1 },
+    { x: 0, y: 1 },
+    { x: -1, y: -1 },
+    { x: 1, y: -1 },
+    { x: -1, y: 1 },
+    { x: 1, y: 1 },
+];
 export default class GridData {
     width;
     height;

package/dist/src/data/rules/noLoopsRule.js

@@ -1,5 +1,5 @@
 import { ConfigType } from '../config.js';
-import GridData, { NEIGHBOR_OFFSETS } from '../grid.js';
+import GridData, { NEIGHBOR_OFFSETS, NEIGHBOR_OFFSETS_8 } from '../grid.js';
 import { array } from '../dataHelper.js';
 import { Color, State } from '../primitives.js';
 import Rule from './rule.js';
@@ -60,48 +60,152 @@ export default class NoLoopsRule extends Rule {
         return NoLoopsRule.SEARCH_VARIANTS;
     }
     validateGrid(grid) {
+        // wrap-around grids require special consideration because the "islands" assumption of the
+        // algorithm below does not hold
+        if (grid.wrapAround.value) {
+            const visited = array(grid.width, grid.height, (i, j) => {
+                const tile = grid.getTile(i, j);
+                return (!tile.exists ||
+                    (tile.color !== this.color && tile.color !== Color.Gray));
+            });
+            while (true) {
+                const seed = grid.find((tile, x, y) => !visited[y][x] && tile.color === this.color);
+                if (!seed)
+                    break;
+                let invalid = false;
+                const positions = [];
+                const stack = [[seed, null]];
+                while (stack.length > 0) {
+                    const [{ x, y }, from] = stack.pop();
+                    const { x: arrX, y: arrY } = grid.toArrayCoordinates(x, y);
+                    positions.push({ x: arrX, y: arrY });
+                    if (visited[arrY][arrX]) {
+                        invalid = true;
+                        continue;
+                    }
+                    visited[arrY][arrX] = true;
+                    for (const offset of NEIGHBOR_OFFSETS) {
+                        if (-offset.x === from?.x && -offset.y === from?.y)
+                            continue;
+                        const next = { x: x + offset.x, y: y + offset.y };
+                        if (grid.isPositionValid(next.x, next.y)) {
+                            const nextTile = grid.getTile(next.x, next.y);
+                            if (nextTile.exists && nextTile.color === this.color)
+                                stack.push([next, offset]);
+                        }
+                    }
+                }
+                if (invalid) {
+                    return {
+                        state: State.Error,
+                        positions,
+                    };
+                }
+            }
+            return {
+                state: visited.some(row => row.some(v => !v))
+                    ? State.Incomplete
+                    : State.Satisfied,
+            };
+        }
+        // special handling for 2x2 loops
+        for (let y = 0; y < grid.height; y++) {
+            for (let x = 0; x < grid.width; x++) {
+                const tlTile = grid.getTile(x, y);
+                const trTile = grid.getTile(x + 1, y);
+                const blTile = grid.getTile(x, y + 1);
+                const brTile = grid.getTile(x + 1, y + 1);
+                if (tlTile.exists &&
+                    tlTile.color === this.color &&
+                    trTile.exists &&
+                    trTile.color === this.color &&
+                    blTile.exists &&
+                    blTile.color === this.color &&
+                    brTile.exists &&
+                    brTile.color === this.color) {
+                    const positions = [
+                        grid.toArrayCoordinates(x, y),
+                        grid.toArrayCoordinates(x + 1, y),
+                        grid.toArrayCoordinates(x, y + 1),
+                        grid.toArrayCoordinates(x + 1, y + 1),
+                    ];
+                    return {
+                        state: State.Error,
+                        positions,
+                    };
+                }
+            }
+        }
+        // general case for non-wrap-around grids: a loop must form an elcosed island that does not touch the grid edge
         const visited = array(grid.width, grid.height, (i, j) => {
             const tile = grid.getTile(i, j);
-            return (!tile.exists || (tile.color !== this.color && tile.color !== Color.Gray));
+            return tile.exists && tile.color === this.color;
         });
+        const shape = array(grid.width, grid.height, () => false);
+        let complete = true;
         while (true) {
-            const seed = grid.find((tile, x, y) => !visited[y][x] && tile.color === this.color);
+            const seed = grid.find((tile, x, y) => !visited[y][x] && (!tile.exists || tile.color !== this.color));
+            shape.forEach(row => row.fill(false));
             if (!seed)
                 break;
-            let invalid = false;
-            const positions = [];
-            const stack = [[seed, null]];
+            let isIsland = true;
+            const stack = [seed];
             while (stack.length > 0) {
-                const [{ x, y }, from] = stack.pop();
+                const { x, y } = stack.pop();
                 const { x: arrX, y: arrY } = grid.toArrayCoordinates(x, y);
-                positions.push({ x, y });
+                const tile = grid.getTile(x, y);
+                if (tile.exists && tile.color === Color.Gray) {
+                    complete = false;
+                }
                 if (visited[arrY][arrX]) {
-                    invalid = true;
                     continue;
                 }
                 visited[arrY][arrX] = true;
-                for (const offset of NEIGHBOR_OFFSETS) {
-                    if (-offset.x === from?.x && -offset.y === from?.y)
-                        continue;
+                for (const offset of NEIGHBOR_OFFSETS_8) {
                     const next = { x: x + offset.x, y: y + offset.y };
+                    const arrPos = grid.toArrayCoordinates(next.x, next.y);
                     if (grid.isPositionValid(next.x, next.y)) {
                         const nextTile = grid.getTile(next.x, next.y);
-                        if (nextTile.exists && nextTile.color === this.color)
-                            stack.push([next, offset]);
+                        shape[arrPos.y][arrPos.x] = true;
+                        if (!nextTile.exists || nextTile.color !== this.color) {
+                            stack.push(arrPos);
+                        }
+                    }
+                    else {
+                        isIsland = false;
                     }
                 }
             }
-            if (invalid) {
+            if (isIsland) {
+                const loopPositions = [];
+                for (let y = 0; y < grid.height; y++) {
+                    for (let x = 0; x < grid.width; x++) {
+                        if (shape[y][x]) {
+                            if (x > 0 &&
+                                y > 0 &&
+                                x < grid.width - 1 &&
+                                y < grid.height - 1 &&
+                                shape[y][x - 1] &&
+                                shape[y - 1][x] &&
+                                shape[y][x + 1] &&
+                                shape[y + 1][x] &&
+                                shape[y - 1][x - 1] &&
+                                shape[y - 1][x + 1] &&
+                                shape[y + 1][x - 1] &&
+                                shape[y + 1][x + 1])
+                                continue;
+                            loopPositions.push({ x, y });
+                        }
+                    }
+                }
                 return {
                     state: State.Error,
-                    positions,
+                    positions: loopPositions,
                 };
             }
         }
         return {
-            state: visited.some(row => row.some(v => !v))
-                ? State.Incomplete
-                : State.Satisfied,
+            state: complete ? State.Satisfied : State.Incomplete,
         };
     }
     copyWith({ color }) {

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';
@@ -118,4 +118,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, 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, };

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';
@@ -121,4 +121,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, 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, };

package/package.json

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