@logic-pad/core 0.11.0 → 0.11.4

package/dist/data/gridZones.js

@@ -63,6 +63,12 @@ export default class GridZones {
                 edge.y2 >= height + 1) {
                 continue;
             }
+            if ((edge.x1 < 0 && edge.x2 < 0) ||
+                (edge.y1 < 0 && edge.y2 < 0) ||
+                (edge.x1 >= width && edge.x2 >= width) ||
+                (edge.y1 >= height && edge.y2 >= height)) {
+                continue;
+            }
             if (Math.abs(edge.x1 - edge.x2) + Math.abs(edge.y1 - edge.y2) !== 1) {
                 continue;
             }

package/dist/data/rules/banPatternRule.js

@@ -64,13 +64,26 @@ class BanPatternRule extends Rule {
     }
     validateGrid(grid) {
         for (const pattern of this.cache) {
-            for (let y = 0; y <= grid.height - 1; y++) {
-                for (let x = 0; x <= grid.width - 1; x++) {
+            let startX, startY, endX, endY;
+            if (grid.wrapAround.value) {
+                startX = -pattern.width;
+                startY = -pattern.height;
+                endX = grid.width - 1;
+                endY = grid.height - 1;
+            }
+            else {
+                startX = 0;
+                startY = 0;
+                endX = grid.width - pattern.width;
+                endY = grid.height - pattern.height;
+            }
+            for (let y = startY; y <= endY; y++) {
+                for (let x = startX; x <= endX; x++) {
                     let match = true;
                     const visited = [];
                     for (const tile of pattern.elements) {
                         const pos = grid.toArrayCoordinates(x + tile.x, y + tile.y);
-                        if (grid.wrapAround.value && // optimization: not need to check visited if wrapAround is disabled
+                        if (grid.wrapAround.value && // optimization: no need to check visited if wrapAround is disabled
                             visited.some(p => p.x === pos.x && p.y === pos.y)) {
                             match = false;
                             break;

package/dist/data/rules/musicGridRule.js

@@ -200,7 +200,12 @@ Object.defineProperty(MusicGridRule, "CONFIGS", {
         {
             type: ConfigType.NullableGrid,
             default: null,
-            nonNullDefault: GridData.create(5, 4).addRule(new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALLE)], null)),
+            nonNullDefault: GridData.create([
+                'wwwww',
+                'wwwww',
+                'wwwww',
+                'wwwww',
+            ]).addRule(new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALLE)], null)),
             field: 'track',
             description: 'Track',
             configurable: true,

package/dist/data/solver/auto/autoSolver.js

@@ -3,6 +3,7 @@ import { instance as lyingSymbolInstance } from '../../rules/lyingSymbolRule.js'
 import { instance as offByXInstance } from '../../rules/offByXRule.js';
 import { instance as lotusInstance } from '../../symbols/lotusSymbol.js';
 import { instance as galaxyInstance } from '../../symbols/galaxySymbol.js';
+import { instance as wrapAroundInstance } from '../../rules/wrapAroundRule.js';
 import { allSolvers } from '../allSolvers.js';
 import Solver from '../solver.js';
 import UndercluedRule from '../../rules/undercluedRule.js';
@@ -176,6 +177,7 @@ Object.defineProperty(AutoSolver, "nonAdditiveInstructions", {
     value: new Set([
         offByXInstance.id,
         lyingSymbolInstance.id,
+        wrapAroundInstance.id,
     ])
 });
 export default AutoSolver;

package/dist/data/symbols/directionLinkerSymbol.js

@@ -126,6 +126,14 @@ class DirectionLinkerSymbol extends Symbol {
                         color1: baseColor1,
                         color2: baseColor2,
                     };
+                    const newColor1 = getColor(newArrTurtle.pos1, grid);
+                    const newColor2 = getColor(newArrTurtle.pos2, grid);
+                    if (newColor1 !== baseColor1 &&
+                        newColor2 !== baseColor2 &&
+                        newColor1 !== Color.Gray &&
+                        newColor2 !== Color.Gray) {
+                        continue;
+                    }
                     if (checkedCouples.some(({ pos1, pos2 }) => pos1.x === newArrTurtle.pos1.x &&
                         pos1.y === newArrTurtle.pos1.y &&
                         pos2.x === newArrTurtle.pos2.x &&

package/dist/data/symbols/myopiaSymbol.js

@@ -1,4 +1,5 @@
 import { ConfigType } from '../config.js';
+import { move } from '../dataHelper.js';
 import GridData from '../grid.js';
 import { Color, ORIENTATIONS, Orientation, State, orientationToggle, } from '../primitives.js';
 import MultiEntrySymbol from './multiEntrySymbol.js';
@@ -71,11 +72,21 @@ class MyopiaSymbol extends MultiEntrySymbol {
         };
         const pos = { x: this.x, y: this.y };
         allDirections.forEach(direction => {
-            grid.iterateDirectionAll(pos, direction, t => !t.exists || t.color === tile.color, () => {
+            let stopped = false;
+            grid.iterateDirectionAll(move(pos, direction), direction, t => {
+                if (!t.exists)
+                    return true;
+                if (t.color === tile.color)
+                    return true;
+                stopped = true;
+                return false;
+            }, () => {
                 map[direction].min++;
             });
-            let stopped = false;
-            grid.iterateDirectionAll(pos, direction, t => {
+            if (!stopped && map[direction].min === 0)
+                map[direction].min = Number.MAX_SAFE_INTEGER;
+            stopped = false;
+            grid.iterateDirectionAll(move(pos, direction), direction, t => {
                 if (!t.exists)
                     return true;
                 if (t.color === tile.color || t.color === Color.Gray)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-pad/core",
-  "version": "0.11.0",
+  "version": "0.11.4",
   "type": "module",
   "files": [
     "dist",
@@ -58,6 +58,7 @@
     "events": "^3.3.0",
     "grilops": "^0.1.2",
     "lodash": "^4.17.21",
+    "logic-pad-solver-core": "^0.1.2",
     "z3-solver": "^4.13.0",
     "zod": "^3.24.1"
   },