@logic-pad/core 0.17.1 → 0.19.0

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

@@ -773,54 +773,36 @@ declare global {
       connections?: GridConnections,
       zones?: GridZones,
       symbols?: ReadonlyMap<string, readonly Symbol$1[]>,
-      rules?: readonly Rule[]
+      rules?: readonly Rule[],
+      sanitize?: boolean,
+      triggerEvents?: boolean
     ): GridData;
     /**
      * Copy the current grid while modifying the provided properties.
      * @param param0 The properties to modify.
      * @returns The new grid with the modified properties.
      */
-    copyWith({
-      width,
-      height,
-      tiles,
-      connections,
-      zones,
-      symbols,
-      rules,
-    }: {
-      width?: number;
-      height?: number;
-      tiles?: readonly (readonly TileData[])[];
-      connections?: GridConnections;
-      zones?: GridZones;
-      symbols?: ReadonlyMap<string, readonly Symbol$1[]>;
-      rules?: readonly Rule[];
-    }): GridData;
-    /**
-     * Copy the current grid while modifying the provided properties.
-     * Skip sanitization and event triggering for performance.
-     *
-     * @param param0 The properties to modify.
-     * @returns The new grid with the modified properties.
-     */
-    fastCopyWith({
-      width,
-      height,
-      tiles,
-      connections,
-      zones,
-      symbols,
-      rules,
-    }: {
-      width?: number;
-      height?: number;
-      tiles?: readonly (readonly TileData[])[];
-      connections?: GridConnections;
-      zones?: GridZones;
-      symbols?: ReadonlyMap<string, readonly Symbol$1[]>;
-      rules?: readonly Rule[];
-    }): GridData;
+    copyWith(
+      {
+        width,
+        height,
+        tiles,
+        connections,
+        zones,
+        symbols,
+        rules,
+      }: {
+        width?: number;
+        height?: number;
+        tiles?: readonly (readonly TileData[])[];
+        connections?: GridConnections;
+        zones?: GridZones;
+        symbols?: ReadonlyMap<string, readonly Symbol$1[]>;
+        rules?: readonly Rule[];
+      },
+      sanitize?: boolean,
+      triggerEvents?: boolean
+    ): GridData;
     toArrayCoordinates(x: number, y: number): Position$1;
     isPositionValid(x: number, y: number): boolean;
     /**
@@ -3083,9 +3065,10 @@ declare global {
     }): this;
     withRevealLocation(revealLocation: boolean): this;
   }
-  export declare class HouseSymbol extends Symbol$1 {
+  export declare class HouseSymbol extends NumberSymbol {
     readonly x: number;
     readonly y: number;
+    readonly number: number;
     readonly title = 'House';
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
@@ -3094,14 +3077,26 @@ declare global {
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param number - The number of houses in this region.
      */
-    constructor(x: number, y: number);
+    constructor(x: number, y: number, number: number);
     get id(): string;
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
-    validateSymbol(grid: GridData): State;
-    copyWith({ x, y }: { x?: number; y?: number }): this;
+    countTiles(grid: GridData): {
+      completed: number;
+      possible: number;
+    };
+    copyWith({
+      x,
+      y,
+      number,
+    }: {
+      x?: number;
+      y?: number;
+      number?: number;
+    }): this;
   }
   export declare const allSymbols: Map<string, Symbol$1>;
   export declare function aggregateState(

package/dist/data/grid.d.ts

@@ -57,7 +57,7 @@ export default class GridData {
      * @param symbols The symbols in the grid.
      * @param rules The rules of the grid.
      */
-    static create(width: number, height: number, tiles?: readonly (readonly TileData[])[], connections?: GridConnections, zones?: GridZones, symbols?: ReadonlyMap<string, readonly Symbol[]>, rules?: readonly Rule[]): GridData;
+    static create(width: number, height: number, tiles?: readonly (readonly TileData[])[], connections?: GridConnections, zones?: GridZones, symbols?: ReadonlyMap<string, readonly Symbol[]>, rules?: readonly Rule[], sanitize?: boolean, triggerEvents?: boolean): GridData;
     /**
      * Copy the current grid while modifying the provided properties.
      * @param param0 The properties to modify.
@@ -71,23 +71,7 @@ export default class GridData {
         zones?: GridZones;
         symbols?: ReadonlyMap<string, readonly Symbol[]>;
         rules?: readonly Rule[];
-    }): GridData;
-    /**
-     * Copy the current grid while modifying the provided properties.
-     * Skip sanitization and event triggering for performance.
-     *
-     * @param param0 The properties to modify.
-     * @returns The new grid with the modified properties.
-     */
-    fastCopyWith({ width, height, tiles, connections, zones, symbols, rules, }: {
-        width?: number;
-        height?: number;
-        tiles?: readonly (readonly TileData[])[];
-        connections?: GridConnections;
-        zones?: GridZones;
-        symbols?: ReadonlyMap<string, readonly Symbol[]>;
-        rules?: readonly Rule[];
-    }): GridData;
+    }, sanitize?: boolean, triggerEvents?: boolean): GridData;
     toArrayCoordinates(x: number, y: number): Position;
     isPositionValid(x: number, y: number): boolean;
     /**

package/dist/data/grid.js

@@ -102,28 +102,62 @@ export default class GridData {
         this.symbols = symbols ?? new Map();
         this.rules = rules ?? [];
     }
-    static create(arrayOrWidth, height, tiles, connections, zones, symbols, rules) {
+    static create(arrayOrWidth, height, tiles, connections, zones, symbols, rules, sanitize, triggerEvents) {
         if (typeof arrayOrWidth === 'number') {
+            let hasGridChangeSymbols = false;
+            let hasGridChangeRules = false;
+            if (triggerEvents) {
+                symbols?.forEach(list => {
+                    list.forEach(sym => {
+                        if (handlesGridChange(sym)) {
+                            hasGridChangeSymbols = true;
+                        }
+                    });
+                });
+                rules?.forEach(rule => {
+                    if (handlesGridChange(rule)) {
+                        hasGridChangeRules = true;
+                    }
+                });
+            }
             const newSymbols = symbols
-                ? GridData.deduplicateSymbols(symbols)
+                ? sanitize
+                    ? GridData.deduplicateSymbols(symbols)
+                    : triggerEvents && hasGridChangeSymbols
+                        ? new Map([...symbols.entries()].map(([id, list]) => [id, list.slice()]))
+                        : symbols
                 : new Map();
             // do not deduplicate all rules because it makes for bad editor experience
-            const newRules = rules ? GridData.deduplicateSingletonRules(rules) : [];
+            const newRules = rules
+                ? sanitize
+                    ? GridData.deduplicateSingletonRules(rules)
+                    : triggerEvents && hasGridChangeRules
+                        ? rules.slice()
+                        : rules
+                : [];
             const newGrid = new GridData(arrayOrWidth, height, tiles, connections
-                ? GridConnections.validateEdges(connections, arrayOrWidth, height)
-                : connections, zones ? GridZones.validateEdges(zones, arrayOrWidth, height) : zones, newSymbols, newRules);
-            newSymbols.forEach(list => {
-                list.forEach((sym, i) => {
-                    if (handlesGridChange(sym)) {
-                        list[i] = sym.onGridChange(newGrid);
+                ? sanitize
+                    ? GridConnections.validateEdges(connections, arrayOrWidth, height)
+                    : connections
+                : undefined, zones
+                ? sanitize
+                    ? GridZones.validateEdges(zones, arrayOrWidth, height)
+                    : zones
+                : undefined, newSymbols, newRules);
+            if (triggerEvents) {
+                newSymbols.forEach(list => {
+                    list.forEach((sym, i) => {
+                        if (handlesGridChange(sym)) {
+                            list[i] = sym.onGridChange(newGrid);
+                        }
+                    });
+                });
+                newRules.forEach((rule, i) => {
+                    if (handlesGridChange(rule)) {
+                        newRules[i] = rule.onGridChange(newGrid);
                     }
                 });
-            });
-            newRules.forEach((rule, i) => {
-                if (handlesGridChange(rule)) {
-                    newRules[i] = rule.onGridChange(newGrid);
-                }
-            });
+            }
             return newGrid;
         }
         else {
@@ -136,18 +170,8 @@ export default class GridData {
      * @param param0 The properties to modify.
      * @returns The new grid with the modified properties.
      */
-    copyWith({ width, height, tiles, connections, zones, symbols, rules, }) {
-        return GridData.create(width ?? this.width, height ?? this.height, tiles ?? this.tiles, connections ?? this.connections, zones ?? this.zones, symbols ?? this.symbols, rules ?? this.rules);
-    }
-    /**
-     * Copy the current grid while modifying the provided properties.
-     * Skip sanitization and event triggering for performance.
-     *
-     * @param param0 The properties to modify.
-     * @returns The new grid with the modified properties.
-     */
-    fastCopyWith({ width, height, tiles, connections, zones, symbols, rules, }) {
-        return new GridData(width ?? this.width, height ?? this.height, tiles ?? this.tiles, connections ?? this.connections, zones ?? this.zones, symbols ?? this.symbols, rules ?? this.rules);
+    copyWith({ width, height, tiles, connections, zones, symbols, rules, }, sanitize = true, triggerEvents = true) {
+        return GridData.create(width ?? this.width, height ?? this.height, tiles ?? this.tiles, connections ?? this.connections, zones ?? this.zones, symbols ?? this.symbols, rules ?? this.rules, sanitize, triggerEvents);
     }
     toArrayCoordinates(x, y) {
         // // This is the preferred way to compute tile coordinates, but for performance reasons we will just access the
@@ -733,7 +757,7 @@ export default class GridData {
         this.iterateArea(position, t => t.color === from && (allowFixed || !t.fixed), (tile, x, y) => {
             tiles[y][x] = tile.withColor(to);
         });
-        return this.copyWith({ tiles });
+        return this.copyWith({ tiles }, false);
     }
     /**
      * Flood fill all tiles with the given color to a new color, even if they are not connected.
@@ -748,7 +772,7 @@ export default class GridData {
             tiles: this.tiles.map(row => row.map(tile => tile.color === from && (allowFixed || !tile.fixed)
                 ? tile.withColor(to)
                 : tile)),
-        });
+        }, false);
     }
     /**
      * Check if the grid has any instructions that require a custom solution.
@@ -778,7 +802,7 @@ export default class GridData {
         });
         if (!changed)
             return this;
-        let newGrid = this.copyWith({ tiles: newTiles });
+        let newGrid = this.copyWith({ tiles: newTiles }, false);
         this.symbols.forEach(list => {
             list.forEach(symbol => {
                 if (handlesSetGrid(symbol)) {

package/dist/data/solver/backtrack/backtrackWorker.js

@@ -231,9 +231,9 @@ function solveUnderclued(input) {
     function search(x, y, tile, color) {
         // count++;
         // console.log(`Trying (${x}, ${y}) with ${color}`);
-        const newGrid = grid.fastCopyWith({
+        const newGrid = grid.copyWith({
             tiles: grid.setTile(x, y, tile.withColor(color)),
-        });
+        }, false, false);
         // Solve
         let solution;
         solveNormal(newGrid, sol => {
@@ -265,13 +265,13 @@ function solveUnderclued(input) {
             if (!darkPossible && !lightPossible)
                 return null;
             if (darkPossible && !lightPossible)
-                grid = grid.fastCopyWith({
+                grid = grid.copyWith({
                     tiles: grid.setTile(x, y, tile.withColor(Color.Dark)),
-                });
+                }, false, false);
             if (!darkPossible && lightPossible)
-                grid = grid.fastCopyWith({
+                grid = grid.copyWith({
                     tiles: grid.setTile(x, y, tile.withColor(Color.Light)),
-                });
+                }, false, false);
         }
     }
     // console.log(`Solve count: ${count}`);

package/dist/data/solver/universal/universalWorker.js

@@ -7,9 +7,9 @@ function gridToRawTiles(grid) {
     return array(grid.width, grid.height, (x, y) => grid.getTile(x, y).color);
 }
 function rawTilesToGrid(rawTiles, grid) {
-    return grid.fastCopyWith({
+    return grid.copyWith({
         tiles: array(grid.width, grid.height, (x, y) => grid.getTile(x, y).withColor(rawTiles[y][x])),
-    });
+    }, false, false);
 }
 function getNextTile(grid, rawTiles) {
     for (let y = 0; y < grid.height; y++) {
@@ -58,9 +58,9 @@ function solveUnderclued(input) {
         light: false,
     }));
     function search(x, y, tile, color) {
-        const newGrid = grid.fastCopyWith({
+        const newGrid = grid.copyWith({
             tiles: grid.setTile(x, y, tile.withColor(color)),
-        });
+        }, false, false);
         // Solve
         let solution;
         solveNormal(newGrid, sol => {
@@ -92,13 +92,13 @@ function solveUnderclued(input) {
             if (!darkPossible && !lightPossible)
                 return null;
             if (darkPossible && !lightPossible)
-                grid = grid.fastCopyWith({
+                grid = grid.copyWith({
                     tiles: grid.setTile(x, y, tile.withColor(Color.Dark)),
-                });
+                }, false, false);
             if (!darkPossible && lightPossible)
-                grid = grid.fastCopyWith({
+                grid = grid.copyWith({
                     tiles: grid.setTile(x, y, tile.withColor(Color.Light)),
-                });
+                }, false, false);
         }
     }
     return grid;

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

@@ -1,10 +1,10 @@
 import { AnyConfig } from '../config.js';
 import GridData from '../grid.js';
-import { State } from '../primitives.js';
-import Symbol from './symbol.js';
-export default class HouseSymbol extends Symbol {
+import NumberSymbol from './numberSymbol.js';
+export default class HouseSymbol extends NumberSymbol {
     readonly x: number;
     readonly y: number;
+    readonly number: number;
     readonly title = "House";
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
@@ -13,16 +13,21 @@ export default class HouseSymbol extends Symbol {
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param number - The number of houses in this region.
      */
-    constructor(x: number, y: number);
+    constructor(x: number, y: number, number: number);
     get id(): string;
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
-    validateSymbol(grid: GridData): State;
-    copyWith({ x, y }: {
+    countTiles(grid: GridData): {
+        completed: number;
+        possible: number;
+    };
+    copyWith({ x, y, number, }: {
         x?: number;
         y?: number;
+        number?: number;
     }): this;
 }
 export declare const instance: HouseSymbol;

package/dist/data/symbols/houseSymbol.js

@@ -1,17 +1,18 @@
 import { ConfigType } from '../config.js';
 import GridData from '../grid.js';
 import { array } from '../dataHelper.js';
-import { Color, State } from '../primitives.js';
-import Symbol from './symbol.js';
-class HouseSymbol extends Symbol {
+import { Color } from '../primitives.js';
+import NumberSymbol from './numberSymbol.js';
+class HouseSymbol extends NumberSymbol {
     /**
      * **Houses must connect to exactly one other house**
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param number - The number of houses in this region.
      */
-    constructor(x, y) {
-        super(x, y);
+    constructor(x, y, number) {
+        super(x, y, number);
         Object.defineProperty(this, "x", {
             enumerable: true,
             configurable: true,
@@ -24,6 +25,12 @@ class HouseSymbol extends Symbol {
             writable: true,
             value: y
         });
+        Object.defineProperty(this, "number", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: number
+        });
         Object.defineProperty(this, "title", {
             enumerable: true,
             configurable: true,
@@ -35,7 +42,7 @@ class HouseSymbol extends Symbol {
         return `house`;
     }
     get explanation() {
-        return '*Houses* must connect to *exactly one* other house';
+        return '*House numbers* count the number of houses in the region';
     }
     get configs() {
         return HouseSymbol.CONFIGS;
@@ -43,45 +50,39 @@ class HouseSymbol extends Symbol {
     createExampleGrid() {
         return HouseSymbol.EXAMPLE_GRID;
     }
-    validateSymbol(grid) {
+    countTiles(grid) {
         const thisX = Math.floor(this.x);
         const thisY = Math.floor(this.y);
-        let complete = true;
         const visited = array(grid.width, grid.height, () => false);
         const connected = array(grid.width, grid.height, () => false);
         const color = grid.getTile(thisX, thisY).color;
-        grid.iterateArea({ x: thisX, y: thisY }, tile => color === Color.Gray ||
-            tile.color === Color.Gray ||
-            tile.color === color, (tile, x, y) => {
+        if (color === Color.Gray)
+            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+        grid.iterateArea({ x: thisX, y: thisY }, tile => tile.color === Color.Gray || tile.color === color, (_, x, y) => {
             visited[y][x] = true;
-            if (tile.color === Color.Gray)
-                complete = false;
         });
         grid.iterateArea({ x: thisX, y: thisY }, tile => tile.color === color, (_, x, y) => {
             connected[y][x] = true;
         });
-        let connectedHouses = 0;
+        let completedHouses = 0;
         let possibleHouses = 0;
         for (const symbol of grid.symbols.get(this.id) ?? []) {
-            if (symbol !== this && symbol instanceof HouseSymbol) {
+            if (symbol instanceof HouseSymbol) {
                 const symbolX = Math.floor(symbol.x);
                 const symbolY = Math.floor(symbol.y);
                 if (connected[symbolY][symbolX])
-                    connectedHouses++;
+                    completedHouses++;
                 else if (visited[symbolY][symbolX])
                     possibleHouses++;
             }
         }
-        if (color !== Color.Gray &&
-            (connectedHouses > 1 || connectedHouses + possibleHouses < 1)) {
-            return State.Error;
-        }
-        return complete || (connectedHouses === 1 && possibleHouses === 0)
-            ? State.Satisfied
-            : State.Incomplete;
+        return {
+            completed: completedHouses,
+            possible: completedHouses + possibleHouses,
+        };
     }
-    copyWith({ x, y }) {
-        return new HouseSymbol(x ?? this.x, y ?? this.y);
+    copyWith({ x, y, number, }) {
+        return new HouseSymbol(x ?? this.x, y ?? this.y, number ?? this.number);
     }
 }
 Object.defineProperty(HouseSymbol, "CONFIGS", {
@@ -103,6 +104,14 @@ Object.defineProperty(HouseSymbol, "CONFIGS", {
             description: 'Y',
             configurable: false,
         },
+        {
+            type: ConfigType.Number,
+            default: 2,
+            field: 'number',
+            description: 'Number',
+            explanation: 'Number of houses in this region',
+            configurable: true,
+        },
     ])
 });
 Object.defineProperty(HouseSymbol, "EXAMPLE_GRID", {
@@ -110,12 +119,12 @@ Object.defineProperty(HouseSymbol, "EXAMPLE_GRID", {
     configurable: true,
     writable: true,
     value: Object.freeze(GridData.create(['bbbww', 'wwwbw', 'wbbbw', 'wwwww'])
-        .addSymbol(new HouseSymbol(0, 0))
-        .addSymbol(new HouseSymbol(2, 0))
-        .addSymbol(new HouseSymbol(3, 0))
-        .addSymbol(new HouseSymbol(2, 1))
-        .addSymbol(new HouseSymbol(3, 1))
-        .addSymbol(new HouseSymbol(1, 2)))
+        .addSymbol(new HouseSymbol(0, 0, 2))
+        .addSymbol(new HouseSymbol(2, 0, 2))
+        .addSymbol(new HouseSymbol(3, 0, 2))
+        .addSymbol(new HouseSymbol(2, 1, 2))
+        .addSymbol(new HouseSymbol(3, 1, 2))
+        .addSymbol(new HouseSymbol(1, 2, 2)))
 });
 export default HouseSymbol;
-export const instance = new HouseSymbol(0, 0);
+export const instance = new HouseSymbol(0, 0, 2);

package/package.json

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