@logic-pad/core 0.15.1 → 0.15.2

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

@@ -2518,6 +2518,7 @@ declare global {
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
+    private countForColor;
     countTiles(grid: GridData): {
       completed: number;
       possible: number;
@@ -2663,6 +2664,7 @@ declare global {
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
+    private countForColor;
     countTiles(grid: GridData): {
       completed: number;
       possible: number;

package/dist/data/symbols/focusSymbol.d.ts

@@ -17,6 +17,7 @@ export default class FocusSymbol extends NumberSymbol {
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
+    private countForColor;
     countTiles(grid: GridData): {
         completed: number;
         possible: number;

package/dist/data/symbols/focusSymbol.js

@@ -39,12 +39,7 @@ class FocusSymbol extends NumberSymbol {
     createExampleGrid() {
         return FocusSymbol.EXAMPLE_GRID;
     }
-    countTiles(grid) {
-        if (Math.floor(this.x) !== this.x || Math.floor(this.y) !== this.y)
-            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
-        const color = grid.getTile(this.x, this.y).color;
-        if (color === Color.Gray)
-            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+    countForColor(grid, color) {
         let gray = 0;
         let same = 0;
         const visited = [];
@@ -67,6 +62,20 @@ class FocusSymbol extends NumberSymbol {
         }
         return { completed: same, possible: same + gray };
     }
+    countTiles(grid) {
+        if (Math.floor(this.x) !== this.x || Math.floor(this.y) !== this.y)
+            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+        const color = grid.getTile(this.x, this.y).color;
+        if (color === Color.Gray) {
+            const dark = this.countForColor(grid, Color.Dark);
+            const light = this.countForColor(grid, Color.Light);
+            return {
+                completed: Math.min(dark.completed, light.completed),
+                possible: Math.max(dark.possible, light.possible),
+            };
+        }
+        return this.countForColor(grid, color);
+    }
     copyWith({ x, y, number, }) {
         return new FocusSymbol(x ?? this.x, y ?? this.y, number ?? this.number);
     }

package/dist/data/symbols/minesweeperSymbol.d.ts

@@ -18,6 +18,7 @@ export default class MinesweeperSymbol extends NumberSymbol {
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
+    private countForColor;
     countTiles(grid: GridData): {
         completed: number;
         possible: number;

package/dist/data/symbols/minesweeperSymbol.js

@@ -34,12 +34,7 @@ class MinesweeperSymbol extends NumberSymbol {
     createExampleGrid() {
         return MinesweeperSymbol.EXAMPLE_GRID;
     }
-    countTiles(grid) {
-        if (Math.floor(this.x) !== this.x || Math.floor(this.y) !== this.y)
-            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
-        const color = grid.getTile(this.x, this.y).color;
-        if (color === Color.Gray)
-            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+    countForColor(grid, color) {
         let gray = 0;
         let opposite = 0;
         const visited = [];
@@ -64,6 +59,20 @@ class MinesweeperSymbol extends NumberSymbol {
         }
         return { completed: opposite, possible: opposite + gray };
     }
+    countTiles(grid) {
+        if (Math.floor(this.x) !== this.x || Math.floor(this.y) !== this.y)
+            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+        const color = grid.getTile(this.x, this.y).color;
+        if (color === Color.Gray) {
+            const dark = this.countForColor(grid, Color.Dark);
+            const light = this.countForColor(grid, Color.Light);
+            return {
+                completed: Math.min(dark.completed, light.completed),
+                possible: Math.max(dark.possible, light.possible),
+            };
+        }
+        return this.countForColor(grid, color);
+    }
     copyWith({ x, y, number, }) {
         return new MinesweeperSymbol(x ?? this.x, y ?? this.y, number ?? this.number);
     }

package/package.json

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