@logic-pad/core 0.18.0 → 0.19.1

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;
     /**

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/puzzle.js

@@ -1,24 +1,24 @@
 import { z } from 'zod';
 import GridData from './grid.js';
 import { Color, PuzzleType, State } from './primitives.js';
-export const MetadataSchema = z
-    .object({
-    title: z.string().min(1),
-    author: z.string().min(1),
-    description: z.string(),
-    difficulty: z.number().int().min(0).max(10),
-})
-    .strict();
-export const PuzzleSchema = z
-    .object({
-    title: z.string().min(1),
-    author: z.string().min(1),
-    description: z.string(),
-    difficulty: z.number().int().min(0).max(10),
-    grid: z.instanceof(GridData),
-    solution: z.instanceof(GridData).nullable(),
-})
-    .strict();
+export const MetadataSchema = z.strictObject({
+    title: z.string('Title must be a string').min(1, 'Title must not be empty'),
+    author: z
+        .string('Author must be a string')
+        .min(1, 'Author must not be empty'),
+    description: z.string('Description must be a string'),
+    difficulty: z
+        .number('Difficulty must be a number')
+        .int('Difficulty must be an integer')
+        .min(0, 'Difficulty must be at least 0')
+        .max(10, 'Difficulty must be at most 10'),
+}, 'Data must be an object');
+export const PuzzleSchema = MetadataSchema.extend({
+    grid: z.instanceof(GridData, { error: 'Grid must be a GridData instance' }),
+    solution: z
+        .instanceof(GridData, { error: 'Solution must be a GridData instance' })
+        .nullable(),
+}).strict();
 /**
  * Checks if two puzzles are equal.
  */

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/package.json

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