@logic-pad/core 0.21.0 → 0.22.1

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

@@ -1036,7 +1036,11 @@ declare global {
      */
     iterateArea<T>(
       position: Position$1,
-      predicate: (tile: TileData) => boolean,
+      predicate: (
+        tile: TileData,
+        logicalX: number,
+        logicalY: number
+      ) => boolean,
       callback: (
         tile: TileData,
         x: number,
@@ -1061,7 +1065,11 @@ declare global {
     iterateDirection<T>(
       position: Position$1,
       direction: Direction | Orientation,
-      predicate: (tile: TileData) => boolean,
+      predicate: (
+        tile: TileData,
+        logicalX: number,
+        logicalY: number
+      ) => boolean,
       callback: (
         tile: TileData,
         x: number,
@@ -1086,7 +1094,11 @@ declare global {
     iterateDirectionAll<T>(
       position: Position$1,
       direction: Direction | Orientation,
-      predicate: (tile: TileData) => boolean,
+      predicate: (
+        tile: TileData,
+        logicalX: number,
+        logicalY: number
+      ) => boolean,
       callback: (
         tile: TileData,
         x: number,
@@ -1096,6 +1108,26 @@ declare global {
       ) => T | undefined,
       visited?: boolean[][]
     ): T | undefined;
+    /**
+     * Reduce the grid by zones defined in the GridZones.
+     *
+     * @param reducer The reducer function to apply to each zone.
+     * @param initializer The initializer function to create the initial value for each zone.
+     * @param visited A 2D array to keep track of visited tiles. This array is modified by the function.
+     * @returns An array of reduced values, one for each zone.
+     */
+    reduceByZone<T>(
+      reducer: (
+        acc: T,
+        tile: TileData,
+        x: number,
+        y: number,
+        logicalX: number,
+        logicalY: number
+      ) => T,
+      initializer: () => T,
+      visited?: boolean[][]
+    ): T[];
     /**
      * Check if every tile in the grid is filled with a color other than gray.
      *
@@ -1628,6 +1660,28 @@ declare global {
     copyWith({ color }: { color?: Color }): this;
     withColor(color: Color): this;
   }
+  export declare class ConnectZonesRule extends Rule {
+    readonly color: Color;
+    readonly title = 'Connect Zones';
+    private static readonly CONFIGS;
+    private static readonly EXAMPLE_GRID_LIGHT;
+    private static readonly EXAMPLE_GRID_DARK;
+    private static readonly SEARCH_VARIANTS;
+    /**
+     * **Connect all &lt;color&gt; cells in each zone**
+     *
+     * @param color - The color of the cells to connect.
+     */
+    constructor(color: Color);
+    get id(): string;
+    get explanation(): string;
+    get configs(): readonly AnyConfig[] | null;
+    createExampleGrid(): GridData;
+    get searchVariants(): SearchVariant[];
+    validateGrid(grid: GridData): RuleState;
+    copyWith({ color }: { color?: Color }): this;
+    withColor(color: Color): this;
+  }
   export type ShapeRegions = {
     regions: {
       positions: Position$1[];
@@ -1723,6 +1777,30 @@ declare global {
     validateGrid(grid: GridData): RuleState;
     copyWith({ color }: { color?: Color }): this;
   }
+  export declare class ExactCountPerZoneRule extends CellCountPerZoneRule {
+    readonly color: Color;
+    readonly count: number;
+    readonly title = 'Exact Count Per Zone';
+    private static readonly CONFIGS;
+    private static readonly EXAMPLE_GRID_LIGHT;
+    private static readonly EXAMPLE_GRID_DARK;
+    private static readonly EXAMPLE_GRID_GRAY;
+    private static readonly SEARCH_VARIANTS;
+    /**
+     * **Each zone has &lt;count&gt; &lt;color&gt; cells.**
+     *
+     * @param color - The color of the cells to count.
+     * @param count - The exact count of the cells in each zone.
+     */
+    constructor(color: Color, count: number);
+    get id(): string;
+    get explanation(): string;
+    get configs(): readonly AnyConfig[] | null;
+    createExampleGrid(): GridData;
+    get searchVariants(): SearchVariant[];
+    validateGrid(grid: GridData): RuleState;
+    copyWith({ color, count }: { color?: Color; count?: number }): this;
+  }
   export declare class ForesightRule extends Rule {
     readonly count: number;
     readonly regenInterval: number;

package/dist/data/grid.d.ts

@@ -245,7 +245,7 @@ export default class GridData {
      * @param visited A 2D array to keep track of visited tiles. This array is modified by the function.
      * @returns The value returned by the callback that stopped the iteration, or undefined if the iteration completed.
      */
-    iterateArea<T>(position: Position, predicate: (tile: TileData) => boolean, callback: (tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => undefined | T, visited?: boolean[][]): T | undefined;
+    iterateArea<T>(position: Position, predicate: (tile: TileData, logicalX: number, logicalY: number) => boolean, callback: (tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => undefined | T, visited?: boolean[][]): T | undefined;
     /**
      * Iterate over all tiles in a straight line from the given position in the given direction that satisfy the predicate.
      * The iteration stops when the callback returns a value that is not undefined.
@@ -258,7 +258,7 @@ export default class GridData {
      * @param visited A 2D array to keep track of visited tiles. This array is modified by the function.
      * @returns The value returned by the callback that stopped the iteration, or undefined if the iteration completed.
      */
-    iterateDirection<T>(position: Position, direction: Direction | Orientation, predicate: (tile: TileData) => boolean, callback: (tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => T | undefined, visited?: boolean[][]): T | undefined;
+    iterateDirection<T>(position: Position, direction: Direction | Orientation, predicate: (tile: TileData, logicalX: number, logicalY: number) => boolean, callback: (tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => T | undefined, visited?: boolean[][]): T | undefined;
     /**
      * Iterate over all tiles in a straight line from the given position in the given direction that satisfy the predicate.
      * The iteration stops when the callback returns a value that is not undefined.
@@ -271,7 +271,16 @@ export default class GridData {
      * @param visited A 2D array to keep track of visited tiles. This array is modified by the function.
      * @returns The value returned by the callback that stopped the iteration, or undefined if the iteration completed.
      */
-    iterateDirectionAll<T>(position: Position, direction: Direction | Orientation, predicate: (tile: TileData) => boolean, callback: (tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => T | undefined, visited?: boolean[][]): T | undefined;
+    iterateDirectionAll<T>(position: Position, direction: Direction | Orientation, predicate: (tile: TileData, logicalX: number, logicalY: number) => boolean, callback: (tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => T | undefined, visited?: boolean[][]): T | undefined;
+    /**
+     * Reduce the grid by zones defined in the GridZones.
+     *
+     * @param reducer The reducer function to apply to each zone.
+     * @param initializer The initializer function to create the initial value for each zone.
+     * @param visited A 2D array to keep track of visited tiles. This array is modified by the function.
+     * @returns An array of reduced values, one for each zone.
+     */
+    reduceByZone<T>(reducer: (acc: T, tile: TileData, x: number, y: number, logicalX: number, logicalY: number) => T, initializer: () => T, visited?: boolean[][]): T[];
     /**
      * Check if every tile in the grid is filled with a color other than gray.
      *

package/dist/data/grid.js

@@ -650,7 +650,7 @@ export default class GridData {
      */
     iterateArea(position, predicate, callback, visited = array(this.width, this.height, () => false)) {
         const tile = this.getTile(position.x, position.y);
-        if (!tile.exists || !predicate(tile)) {
+        if (!tile.exists || !predicate(tile, position.x, position.y)) {
             return;
         }
         const stack = [position];
@@ -668,7 +668,7 @@ export default class GridData {
                 const next = { x: x + offset.x, y: y + offset.y };
                 if (this.isPositionValid(next.x, next.y)) {
                     const nextTile = this.getTile(next.x, next.y);
-                    if (nextTile.exists && predicate(nextTile))
+                    if (nextTile.exists && predicate(nextTile, next.x, next.y))
                         stack.push(next);
                 }
             }
@@ -687,7 +687,7 @@ export default class GridData {
      * @returns The value returned by the callback that stopped the iteration, or undefined if the iteration completed.
      */
     iterateDirection(position, direction, predicate, callback, visited = array(this.width, this.height, () => false)) {
-        return this.iterateDirectionAll(position, direction, tile => tile.exists && predicate(tile), callback, visited);
+        return this.iterateDirectionAll(position, direction, (tile, logicalX, logicalY) => tile.exists && predicate(tile, logicalX, logicalY), callback, visited);
     }
     /**
      * Iterate over all tiles in a straight line from the given position in the given direction that satisfy the predicate.
@@ -710,7 +710,7 @@ export default class GridData {
             }
             visited[arrPos.y][arrPos.x] = true;
             const tile = this.getTile(current.x, current.y);
-            if (!predicate(tile)) {
+            if (!predicate(tile, arrPos.x, arrPos.y)) {
                 break;
             }
             const ret = callback(tile, arrPos.x, arrPos.y, current.x, current.y);
@@ -719,6 +719,51 @@ export default class GridData {
             current = move(current, direction);
         }
     }
+    /**
+     * Reduce the grid by zones defined in the GridZones.
+     *
+     * @param reducer The reducer function to apply to each zone.
+     * @param initializer The initializer function to create the initial value for each zone.
+     * @param visited A 2D array to keep track of visited tiles. This array is modified by the function.
+     * @returns An array of reduced values, one for each zone.
+     */
+    reduceByZone(reducer, initializer, visited = array(this.width, this.height, () => false)) {
+        const zones = [];
+        while (true) {
+            const seed = this.find((tile, x, y) => tile.exists && !visited[y][x]);
+            if (!seed)
+                break;
+            let zone = initializer();
+            const stack = [seed];
+            while (stack.length > 0) {
+                const { x, y } = stack.pop();
+                const { x: arrX, y: arrY } = this.toArrayCoordinates(x, y);
+                if (visited[arrY][arrX])
+                    continue;
+                visited[arrY][arrX] = true;
+                zone = reducer(zone, this.getTile(arrX, arrY), arrX, arrY, x, y);
+                for (const offset of NEIGHBOR_OFFSETS) {
+                    const next = this.toArrayCoordinates(x + offset.x, y + offset.y);
+                    if (!this.zones.edges.some(e => {
+                        const { x: x1, y: y1 } = this.toArrayCoordinates(e.x1, e.y1);
+                        const { x: x2, y: y2 } = this.toArrayCoordinates(e.x2, e.y2);
+                        return ((x1 === arrX &&
+                            y1 === arrY &&
+                            x2 === next.x &&
+                            y2 === next.y) ||
+                            (x2 === arrX && y2 === arrY && x1 === next.x && y1 === next.y));
+                    })) {
+                        const nextTile = this.getTile(next.x, next.y);
+                        if (nextTile.exists) {
+                            stack.push(next);
+                        }
+                    }
+                }
+            }
+            zones.push(zone);
+        }
+        return zones;
+    }
     /**
      * Check if every tile in the grid is filled with a color other than gray.
      *

package/dist/data/rules/cellCountPerZoneRule.js

@@ -1,5 +1,3 @@
-import { array } from '../dataHelper.js';
-import { NEIGHBOR_OFFSETS } from '../grid.js';
 import { Color } from '../primitives.js';
 import Rule from './rule.js';
 export default class CellCountPerZoneRule extends Rule {
@@ -21,49 +19,21 @@ export default class CellCountPerZoneRule extends Rule {
     }
     getZoneCounts(grid) {
         let complete = true;
-        const visited = array(grid.width, grid.height, (i, j) => !grid.getTile(i, j).exists);
-        const zones = [];
-        while (true) {
-            const seed = grid.find((_tile, x, y) => !visited[y][x]);
-            if (!seed)
-                break;
-            const zone = {
-                positions: [],
-                completed: 0,
-                possible: 0,
-            };
-            const stack = [seed];
-            while (stack.length > 0) {
-                let { x, y } = stack.pop();
-                ({ x, y } = grid.toArrayCoordinates(x, y));
-                if (visited[y][x])
-                    continue;
-                visited[y][x] = true;
-                zone.positions.push({ x, y });
-                if (grid.getTile(x, y).color === this.color) {
-                    zone.completed++;
-                }
-                else if (grid.getTile(x, y).color === Color.Gray) {
-                    zone.possible++;
-                    complete = false;
-                }
-                for (const offset of NEIGHBOR_OFFSETS) {
-                    const next = grid.toArrayCoordinates(x + offset.x, y + offset.y);
-                    if (!grid.zones.edges.some(e => {
-                        const { x: x1, y: y1 } = grid.toArrayCoordinates(e.x1, e.y1);
-                        const { x: x2, y: y2 } = grid.toArrayCoordinates(e.x2, e.y2);
-                        return ((x1 === x && y1 === y && x2 === next.x && y2 === next.y) ||
-                            (x2 === x && y2 === y && x1 === next.x && y1 === next.y));
-                    })) {
-                        const nextTile = grid.getTile(next.x, next.y);
-                        if (nextTile.exists) {
-                            stack.push(next);
-                        }
-                    }
-                }
+        const zones = grid.reduceByZone((zone, tile, x, y) => {
+            zone.positions.push({ x, y });
+            if (tile.color === this.color) {
+                zone.completed++;
             }
-            zones.push(zone);
-        }
+            else if (tile.color === Color.Gray) {
+                zone.possible++;
+                complete = false;
+            }
+            return zone;
+        }, () => ({
+            positions: [],
+            completed: 0,
+            possible: 0,
+        }));
         return { zones, complete };
     }
     withColor(color) {

package/dist/data/rules/connectAllRule.js

@@ -44,19 +44,18 @@ class ConnectAllRule extends Rule {
     }
     validateGrid(grid) {
         let complete = true;
-        const visited = array(grid.width, grid.height, (i, j) => !(grid.getTile(i, j).exists && grid.getTile(i, j).color === this.color));
+        const visited = array(grid.width, grid.height, (i, j) => !grid.getTile(i, j).exists);
         const islands = [];
         while (true) {
-            const seed = grid.find((_tile, x, y) => !visited[y][x]);
+            const seed = grid.find((tile, x, y) => !visited[y][x] && tile.color === this.color);
             if (!seed)
                 break;
             const positions = [];
             grid.iterateArea(seed, tile => tile.color === this.color || tile.color === Color.Gray, (tile, x, y) => {
-                visited[y][x] = true;
                 if (tile.color === Color.Gray)
                     complete = false;
                 positions.push({ x, y });
-            });
+            }, visited);
             islands.push(positions);
         }
         if (islands.length > 1) {

package/dist/data/rules/connectZonesRule.d.ts

@@ -0,0 +1,29 @@
+import { AnyConfig } from '../config.js';
+import GridData from '../grid.js';
+import { Color, RuleState } from '../primitives.js';
+import Rule, { SearchVariant } from './rule.js';
+export default class ConnectZonesRule extends Rule {
+    readonly color: Color;
+    readonly title = "Connect Zones";
+    private static readonly CONFIGS;
+    private static readonly EXAMPLE_GRID_LIGHT;
+    private static readonly EXAMPLE_GRID_DARK;
+    private static readonly SEARCH_VARIANTS;
+    /**
+     * **Connect all <color> cells in each zone**
+     *
+     * @param color - The color of the cells to connect.
+     */
+    constructor(color: Color);
+    get id(): string;
+    get explanation(): string;
+    get configs(): readonly AnyConfig[] | null;
+    createExampleGrid(): GridData;
+    get searchVariants(): SearchVariant[];
+    validateGrid(grid: GridData): RuleState;
+    copyWith({ color }: {
+        color?: Color;
+    }): this;
+    withColor(color: Color): this;
+}
+export declare const instance: ConnectZonesRule;

package/dist/data/rules/connectZonesRule.js

@@ -0,0 +1,141 @@
+import { ConfigType } from '../config.js';
+import GridData from '../grid.js';
+import { array, minBy } from '../dataHelper.js';
+import { Color, State } from '../primitives.js';
+import Rule from './rule.js';
+import GridZones from '../gridZones.js';
+class ConnectZonesRule extends Rule {
+    /**
+     * **Connect all <color> cells in each zone**
+     *
+     * @param color - The color of the cells to connect.
+     */
+    constructor(color) {
+        super();
+        Object.defineProperty(this, "color", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: color
+        });
+        Object.defineProperty(this, "title", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'Connect Zones'
+        });
+        this.color = color;
+    }
+    get id() {
+        return `connect_zones`;
+    }
+    get explanation() {
+        return `Connect all ${this.color} cells in each zone`;
+    }
+    get configs() {
+        return ConnectZonesRule.CONFIGS;
+    }
+    createExampleGrid() {
+        return this.color === Color.Light
+            ? ConnectZonesRule.EXAMPLE_GRID_LIGHT
+            : ConnectZonesRule.EXAMPLE_GRID_DARK;
+    }
+    get searchVariants() {
+        return ConnectZonesRule.SEARCH_VARIANTS;
+    }
+    validateGrid(grid) {
+        let complete = true;
+        let zoneId = 1;
+        const zoneMap = array(grid.width, grid.height, () => 0);
+        const visited = array(grid.width, grid.height, (i, j) => !grid.getTile(i, j).exists);
+        const zones = grid.reduceByZone((zone, tile, x, y) => {
+            zoneMap[y][x] = zone;
+            if (tile.exists && tile.color === Color.Gray) {
+                complete = false;
+            }
+            return zone;
+        }, () => zoneId++);
+        for (const zone of zones) {
+            const islands = [];
+            while (true) {
+                const seed = grid.find((tile, x, y) => !visited[y][x] &&
+                    zoneMap[y][x] === zone &&
+                    tile.color === this.color);
+                if (!seed)
+                    break;
+                const positions = [];
+                grid.iterateArea(seed, (tile, x, y) => {
+                    if (tile.color !== this.color && tile.color !== Color.Gray) {
+                        return false;
+                    }
+                    const pos = grid.toArrayCoordinates(x, y);
+                    return zoneMap[pos.y][pos.x] === zone;
+                }, (tile, x, y) => {
+                    if (tile.color === Color.Gray)
+                        complete = false;
+                    positions.push({ x, y });
+                }, visited);
+                islands.push(positions);
+            }
+            if (islands.length > 1) {
+                return {
+                    state: State.Error,
+                    positions: minBy(islands, island => island.length),
+                };
+            }
+        }
+        return { state: complete ? State.Satisfied : State.Incomplete };
+    }
+    copyWith({ color }) {
+        return new ConnectZonesRule(color ?? this.color);
+    }
+    withColor(color) {
+        return this.copyWith({ color });
+    }
+}
+Object.defineProperty(ConnectZonesRule, "CONFIGS", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze([
+        {
+            type: ConfigType.Color,
+            default: Color.Light,
+            allowGray: false,
+            field: 'color',
+            description: 'Color',
+            configurable: true,
+        },
+    ])
+});
+Object.defineProperty(ConnectZonesRule, "EXAMPLE_GRID_LIGHT", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(GridData.create(['wbbwb', 'wbbwb', 'wbbww', 'wwbbb'])
+        .withZones(new GridZones([
+        { x1: 2, y1: 1, x2: 2, y2: 2 },
+        { x1: 1, y1: 0, x2: 2, y2: 0 },
+        { x1: 1, y1: 1, x2: 2, y2: 1 },
+        { x1: 2, y1: 2, x2: 3, y2: 2 },
+        { x1: 2, y1: 3, x2: 3, y2: 3 },
+    ]))
+        .addRule(new ConnectZonesRule(Color.Light)))
+});
+Object.defineProperty(ConnectZonesRule, "EXAMPLE_GRID_DARK", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(ConnectZonesRule.EXAMPLE_GRID_LIGHT.withTiles(tiles => tiles.map(row => row.map(tile => tile.withColor(tile.color === Color.Dark ? Color.Light : Color.Dark)))))
+});
+Object.defineProperty(ConnectZonesRule, "SEARCH_VARIANTS", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: [
+        new ConnectZonesRule(Color.Light).searchVariant(),
+        new ConnectZonesRule(Color.Dark).searchVariant(),
+    ]
+});
+export default ConnectZonesRule;
+export const instance = new ConnectZonesRule(Color.Dark);

package/dist/data/rules/exactCountPerZoneRule.d.ts

@@ -0,0 +1,33 @@
+import { AnyConfig } from '../config.js';
+import GridData from '../grid.js';
+import { Color, RuleState } from '../primitives.js';
+import CellCountPerZoneRule from './cellCountPerZoneRule.js';
+import { SearchVariant } from './rule.js';
+export default class ExactCountPerZoneRule extends CellCountPerZoneRule {
+    readonly color: Color;
+    readonly count: number;
+    readonly title = "Exact Count Per Zone";
+    private static readonly CONFIGS;
+    private static readonly EXAMPLE_GRID_LIGHT;
+    private static readonly EXAMPLE_GRID_DARK;
+    private static readonly EXAMPLE_GRID_GRAY;
+    private static readonly SEARCH_VARIANTS;
+    /**
+     * **Each zone has <count> <color> cells.**
+     *
+     * @param color - The color of the cells to count.
+     * @param count - The exact count of the cells in each zone.
+     */
+    constructor(color: Color, count: number);
+    get id(): string;
+    get explanation(): string;
+    get configs(): readonly AnyConfig[] | null;
+    createExampleGrid(): GridData;
+    get searchVariants(): SearchVariant[];
+    validateGrid(grid: GridData): RuleState;
+    copyWith({ color, count }: {
+        color?: Color;
+        count?: number;
+    }): this;
+}
+export declare const instance: ExactCountPerZoneRule;

package/dist/data/rules/exactCountPerZoneRule.js

@@ -0,0 +1,138 @@
+import { ConfigType } from '../config.js';
+import GridData from '../grid.js';
+import GridZones from '../gridZones.js';
+import { Color, State } from '../primitives.js';
+import CellCountPerZoneRule from './cellCountPerZoneRule.js';
+class ExactCountPerZoneRule extends CellCountPerZoneRule {
+    /**
+     * **Each zone has <count> <color> cells.**
+     *
+     * @param color - The color of the cells to count.
+     * @param count - The exact count of the cells in each zone.
+     */
+    constructor(color, count) {
+        super(color);
+        Object.defineProperty(this, "color", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: color
+        });
+        Object.defineProperty(this, "count", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: count
+        });
+        Object.defineProperty(this, "title", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'Exact Count Per Zone'
+        });
+        this.count = count;
+    }
+    get id() {
+        return `zone_exact_count`;
+    }
+    get explanation() {
+        return `Each zone has exactly ${this.count} ${this.color} cell${this.count === 1 ? '' : 's'}`;
+    }
+    get configs() {
+        return ExactCountPerZoneRule.CONFIGS;
+    }
+    createExampleGrid() {
+        if (this.color === Color.Light) {
+            return ExactCountPerZoneRule.EXAMPLE_GRID_LIGHT;
+        }
+        else if (this.color === Color.Dark) {
+            return ExactCountPerZoneRule.EXAMPLE_GRID_DARK;
+        }
+        else {
+            return ExactCountPerZoneRule.EXAMPLE_GRID_GRAY;
+        }
+    }
+    get searchVariants() {
+        return ExactCountPerZoneRule.SEARCH_VARIANTS;
+    }
+    validateGrid(grid) {
+        const { zones, complete } = this.getZoneCounts(grid);
+        const errorZone = zones.find(z => z.completed > this.count || z.completed + z.possible < this.count);
+        if (errorZone) {
+            return {
+                state: State.Error,
+                positions: errorZone.positions,
+            };
+        }
+        else {
+            return { state: complete ? State.Satisfied : State.Incomplete };
+        }
+    }
+    copyWith({ color, count }) {
+        return new ExactCountPerZoneRule(color ?? this.color, count ?? this.count);
+    }
+}
+Object.defineProperty(ExactCountPerZoneRule, "CONFIGS", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze([
+        {
+            type: ConfigType.Color,
+            default: Color.Light,
+            allowGray: true,
+            field: 'color',
+            description: 'Color',
+            configurable: true,
+        },
+        {
+            type: ConfigType.Number,
+            default: 1,
+            min: 0,
+            field: 'count',
+            description: 'Count',
+            configurable: true,
+        },
+    ])
+});
+Object.defineProperty(ExactCountPerZoneRule, "EXAMPLE_GRID_LIGHT", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(GridData.create(['wbbbb', 'bbbwb', 'bbbwb', 'bwbbb'])
+        .withZones(new GridZones([
+        { x1: 0, y1: 1, x2: 0, y2: 2 },
+        { x1: 1, y1: 1, x2: 1, y2: 2 },
+        { x1: 2, y1: 1, x2: 2, y2: 2 },
+        { x1: 3, y1: 1, x2: 3, y2: 2 },
+        { x1: 4, y1: 1, x2: 4, y2: 2 },
+        { x1: 1, y1: 0, x2: 2, y2: 0 },
+        { x1: 1, y1: 1, x2: 2, y2: 1 },
+        { x1: 2, y1: 2, x2: 3, y2: 2 },
+        { x1: 2, y1: 3, x2: 3, y2: 3 },
+    ]))
+        .addRule(new ExactCountPerZoneRule(Color.Light, 1)))
+});
+Object.defineProperty(ExactCountPerZoneRule, "EXAMPLE_GRID_DARK", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(ExactCountPerZoneRule.EXAMPLE_GRID_LIGHT.withTiles(tiles => tiles.map(row => row.map(tile => tile.withColor(tile.color === Color.Dark ? Color.Light : Color.Dark)))))
+});
+Object.defineProperty(ExactCountPerZoneRule, "EXAMPLE_GRID_GRAY", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(ExactCountPerZoneRule.EXAMPLE_GRID_LIGHT.withTiles(tiles => tiles.map(row => row.map(tile => tile.withColor(tile.color === Color.Light ? Color.Gray : tile.color)))))
+});
+Object.defineProperty(ExactCountPerZoneRule, "SEARCH_VARIANTS", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: [
+        new ExactCountPerZoneRule(Color.Light, 1).searchVariant(),
+        new ExactCountPerZoneRule(Color.Dark, 1).searchVariant(),
+    ]
+});
+export default ExactCountPerZoneRule;
+export const instance = new ExactCountPerZoneRule(Color.Light, 1);

package/dist/data/rules/rules.gen.d.ts

@@ -2,9 +2,11 @@ export { instance as BanPatternRule } from './banPatternRule.js';
 export { instance as CellCountRule } from './cellCountRule.js';
 export { instance as CompletePatternRule } from './completePatternRule.js';
 export { instance as ConnectAllRule } from './connectAllRule.js';
+export { instance as ConnectZonesRule } from './connectZonesRule.js';
 export { instance as ContainsShapeRule } from './containsShapeRule.js';
 export { instance as CustomRule } from './customRule.js';
 export { instance as DifferentCountPerZoneRule } from './differentCountPerZoneRule.js';
+export { instance as ExactCountPerZoneRule } from './exactCountPerZoneRule.js';
 export { instance as ForesightRule } from './foresightRule.js';
 export { instance as LyingSymbolRule } from './lyingSymbolRule.js';
 export { instance as MusicGridRule } from './musicGridRule.js';

package/dist/data/rules/rules.gen.js

@@ -6,9 +6,11 @@ export { instance as BanPatternRule } from './banPatternRule.js';
 export { instance as CellCountRule } from './cellCountRule.js';
 export { instance as CompletePatternRule } from './completePatternRule.js';
 export { instance as ConnectAllRule } from './connectAllRule.js';
+export { instance as ConnectZonesRule } from './connectZonesRule.js';
 export { instance as ContainsShapeRule } from './containsShapeRule.js';
 export { instance as CustomRule } from './customRule.js';
 export { instance as DifferentCountPerZoneRule } from './differentCountPerZoneRule.js';
+export { instance as ExactCountPerZoneRule } from './exactCountPerZoneRule.js';
 export { instance as ForesightRule } from './foresightRule.js';
 export { instance as LyingSymbolRule } from './lyingSymbolRule.js';
 export { instance as MusicGridRule } from './musicGridRule.js';

package/dist/index.d.ts

@@ -20,9 +20,11 @@ import CellCountPerZoneRule from './data/rules/cellCountPerZoneRule.js';
 import CellCountRule from './data/rules/cellCountRule.js';
 import CompletePatternRule from './data/rules/completePatternRule.js';
 import ConnectAllRule from './data/rules/connectAllRule.js';
+import ConnectZonesRule from './data/rules/connectZonesRule.js';
 import ContainsShapeRule from './data/rules/containsShapeRule.js';
 import CustomRule from './data/rules/customRule.js';
 import DifferentCountPerZoneRule from './data/rules/differentCountPerZoneRule.js';
+import ExactCountPerZoneRule from './data/rules/exactCountPerZoneRule.js';
 import ForesightRule from './data/rules/foresightRule.js';
 import { allRules } from './data/rules/index.js';
 import LyingSymbolRule from './data/rules/lyingSymbolRule.js';
@@ -114,4 +116,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, 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, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, 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, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, 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, 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, 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, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };

package/dist/index.js

@@ -23,9 +23,11 @@ import CellCountPerZoneRule from './data/rules/cellCountPerZoneRule.js';
 import CellCountRule from './data/rules/cellCountRule.js';
 import CompletePatternRule from './data/rules/completePatternRule.js';
 import ConnectAllRule from './data/rules/connectAllRule.js';
+import ConnectZonesRule from './data/rules/connectZonesRule.js';
 import ContainsShapeRule from './data/rules/containsShapeRule.js';
 import CustomRule from './data/rules/customRule.js';
 import DifferentCountPerZoneRule from './data/rules/differentCountPerZoneRule.js';
+import ExactCountPerZoneRule from './data/rules/exactCountPerZoneRule.js';
 import ForesightRule from './data/rules/foresightRule.js';
 import { allRules } from './data/rules/index.js';
 import LyingSymbolRule from './data/rules/lyingSymbolRule.js';
@@ -117,4 +119,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, 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, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, ForesightRule, allRules, LyingSymbolRule, ControlLine, Row, MusicGridRule, MysteryRule, 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, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, 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, 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, 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, FocusSymbol, GalaxySymbol, HiddenSymbol, HouseSymbol, allSymbols, LetterSymbol, LotusSymbol, MinesweeperSymbol, MultiEntrySymbol, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };

package/package.json

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