@logic-pad/core 0.4.4 → 0.4.6

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

@@ -1,12 +1,11 @@
 import { AnyConfig } from '../config.js';
 import { SymbolDisplayHandler } from '../events/onSymbolDisplay.js';
 import GridData from '../grid.js';
-import { Color, State } from '../primitives.js';
+import { State } from '../primitives.js';
 import Symbol from './symbol.js';
 export default class HiddenSymbol extends Symbol implements SymbolDisplayHandler {
     readonly x: number;
     readonly y: number;
-    readonly color: Color;
     readonly revealLocation: boolean;
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
@@ -15,10 +14,9 @@ export default class HiddenSymbol extends Symbol implements SymbolDisplayHandler
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
-     * @param color - The target color of the cell.
      * @param revealLocation - Whether to reveal the location of the symbol.
      */
-    constructor(x: number, y: number, color: Color, revealLocation?: boolean);
+    constructor(x: number, y: number, revealLocation?: boolean);
     get id(): string;
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
@@ -26,15 +24,13 @@ export default class HiddenSymbol extends Symbol implements SymbolDisplayHandler
     get necessaryForCompletion(): boolean;
     get visibleWhenSolving(): boolean;
     get sortOrder(): number;
-    validateSymbol(grid: GridData): State;
-    onSymbolDisplay(grid: GridData, symbol: Symbol, editing: boolean): boolean;
-    copyWith({ x, y, color, revealLocation, }: {
+    validateSymbol(grid: GridData, solution: GridData | null): State;
+    onSymbolDisplay(grid: GridData, solution: GridData | null, symbol: Symbol, editing: boolean): boolean;
+    copyWith({ x, y, revealLocation, }: {
         x?: number;
         y?: number;
-        color?: Color;
         revealLocation?: boolean;
     }): this;
-    withColor(color: Color): this;
     withRevealLocation(revealLocation: boolean): this;
 }
 export declare const instance: HiddenSymbol;

package/dist/data/symbols/hiddenSymbol.js

@@ -9,10 +9,9 @@ class HiddenSymbol extends Symbol {
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
-     * @param color - The target color of the cell.
      * @param revealLocation - Whether to reveal the location of the symbol.
      */
-    constructor(x, y, color, revealLocation = false) {
+    constructor(x, y, revealLocation = false) {
         super(x, y);
         Object.defineProperty(this, "x", {
             enumerable: true,
@@ -26,19 +25,12 @@ class HiddenSymbol extends Symbol {
             writable: true,
             value: y
         });
-        Object.defineProperty(this, "color", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: color
-        });
         Object.defineProperty(this, "revealLocation", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: revealLocation
         });
-        this.color = color;
         this.revealLocation = revealLocation;
     }
     get id() {
@@ -62,14 +54,20 @@ class HiddenSymbol extends Symbol {
     get sortOrder() {
         return 0;
     }
-    validateSymbol(grid) {
+    validateSymbol(grid, solution) {
         const thisX = Math.floor(this.x);
         const thisY = Math.floor(this.y);
-        return grid.getTile(thisX, thisY).color === this.color
-            ? State.Satisfied
-            : State.Incomplete;
+        const thisColor = grid.getTile(thisX, thisY).color;
+        if (solution) {
+            return thisColor === solution.getTile(thisX, thisY).color
+                ? State.Satisfied
+                : State.Incomplete;
+        }
+        else {
+            return thisColor !== Color.Gray ? State.Satisfied : State.Incomplete;
+        }
     }
-    onSymbolDisplay(grid, symbol, editing) {
+    onSymbolDisplay(grid, solution, symbol, editing) {
         if (editing)
             return true;
         const thisX = Math.floor(this.x);
@@ -78,17 +76,17 @@ class HiddenSymbol extends Symbol {
         const symY = Math.floor(symbol.y);
         if (thisX !== symX || thisY !== symY)
             return true;
-        const colorMatch = grid.getTile(thisX, thisY).color === this.color;
+        const thisColor = grid.getTile(thisX, thisY).color;
+        const colorMatch = solution
+            ? thisColor === solution.getTile(thisX, thisY).color
+            : thisColor !== Color.Gray;
         if (symbol.id === this.id) {
             return !colorMatch;
         }
         return colorMatch;
     }
-    copyWith({ x, y, color, revealLocation, }) {
-        return new HiddenSymbol(x ?? this.x, y ?? this.y, color ?? this.color, revealLocation ?? this.revealLocation);
-    }
-    withColor(color) {
-        return this.copyWith({ color });
+    copyWith({ x, y, revealLocation, }) {
+        return new HiddenSymbol(x ?? this.x, y ?? this.y, revealLocation ?? this.revealLocation);
     }
     withRevealLocation(revealLocation) {
         return this.copyWith({ revealLocation });
@@ -113,14 +111,6 @@ Object.defineProperty(HiddenSymbol, "CONFIGS", {
             description: 'Y',
             configurable: false,
         },
-        {
-            type: ConfigType.Color,
-            default: Color.Light,
-            field: 'color',
-            allowGray: true,
-            description: 'Show on color',
-            configurable: true,
-        },
         {
             type: ConfigType.Boolean,
             default: false,
@@ -138,4 +128,4 @@ Object.defineProperty(HiddenSymbol, "EXAMPLE_GRID", {
     ))
 });
 export default HiddenSymbol;
-export const instance = new HiddenSymbol(0, 0, Color.Light);
+export const instance = new HiddenSymbol(0, 0);

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

@@ -6,7 +6,7 @@ export default abstract class Symbol extends Instruction implements GridResizeHa
     readonly x: number;
     readonly y: number;
     constructor(x: number, y: number);
-    abstract validateSymbol(grid: GridData): State;
+    abstract validateSymbol(grid: GridData, solution: GridData | null): State;
     modeVariant(_mode: Mode): Symbol | null;
     onGridResize(_grid: GridData, mode: 'insert' | 'remove', direction: 'row' | 'column', index: number): this | null;
     /**

package/dist/data/validate.js

@@ -64,7 +64,7 @@ export default function validateGrid(grid, solution) {
     grid.symbols.forEach((symbolList, id) => symbolStates.set(id, symbolList.map(s => {
         if (s.validateWithSolution)
             requireSolution = true;
-        return applySymbolOverrides(grid, grid.rules, s, g => s.validateSymbol(g));
+        return applySymbolOverrides(grid, grid.rules, s, g => s.validateSymbol(g, solution));
     })));
     // apply the result of symbol overrides to the rules that provided them
     symbolOverrideStates.forEach((states, i) => {

package/package.json

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