@logic-pad/core 0.22.0 → 0.23.0

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

@@ -1448,6 +1448,16 @@ declare global {
   export declare function handlesSymbolDisplay<T extends Instruction>(
     val: T
   ): val is T & SymbolDisplayHandler;
+  export interface SymbolMergeHandler {
+    /**
+     * Determines if the description of two symbols can be merged when displayed in the UI.
+     * @param other The other symbol to compare against.
+     */
+    descriptionEquals(other: Symbol$1): boolean;
+  }
+  export declare function handlesSymbolMerge<T extends Instruction>(
+    val: T
+  ): val is T & SymbolMergeHandler;
   export interface SymbolValidationHandler {
     /**
      * Overrides the validation of symbols.
@@ -1660,7 +1670,7 @@ declare global {
     copyWith({ color }: { color?: Color }): this;
     withColor(color: Color): this;
   }
-  export declare class CollectZonesRule extends Rule {
+  export declare class ConnectZonesRule extends Rule {
     readonly color: Color;
     readonly title = 'Connect Zones';
     private static readonly CONFIGS;
@@ -2641,17 +2651,23 @@ declare global {
       y: number
     ): Position$1 | null;
   }
-  export declare class FocusSymbol extends NumberSymbol {
-    readonly title = 'Focus Number';
+  export declare class FocusSymbol
+    extends NumberSymbol
+    implements SymbolMergeHandler
+  {
+    readonly deadEnd: boolean;
+    get title(): string;
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
+    private static readonly EXAMPLE_GRID_DEAD_END;
     /**
      * **Focus Numbers count directly adjacent cells of the same color**
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param deadEnd - Whether this Focus Number is a Dead End.
      * @param number - The focus number.
      */
-    constructor(x: number, y: number, number: number);
+    constructor(x: number, y: number, deadEnd: boolean, number: number);
     get id(): string;
     get placementStep(): number;
     get explanation(): string;
@@ -2662,16 +2678,20 @@ declare global {
       completed: number;
       possible: number;
     };
+    descriptionEquals(other: Symbol$1): boolean;
     copyWith({
       x,
       y,
+      deadEnd,
       number,
     }: {
       x?: number;
       y?: number;
+      deadEnd?: boolean;
       number?: number;
     }): this;
     withNumber(number: number): this;
+    withDeadEnd(deadEnd: boolean): this;
   }
   export declare class FocusBTModule extends BTModule {
     instr: FocusSymbol;
@@ -2826,15 +2846,10 @@ declare global {
     checkGlobal(grid: BTGridData): CheckResult | false;
     private buildCheckAndRating;
   }
-  export declare abstract class MultiEntrySymbol extends Symbol$1 {
-    /**
-     * Determines if the description of two MultiEntrySymbols can be merged when displayed in the UI.
-     * @param other - The other MultiEntrySymbol to compare to.
-     * @returns Whether the two MultiEntrySymbols have the same description.
-     */
-    descriptionEquals(other: Instruction): boolean;
-  }
-  export declare class MyopiaSymbol extends MultiEntrySymbol {
+  export declare class MyopiaSymbol
+    extends Symbol$1
+    implements SymbolMergeHandler
+  {
     readonly diagonals: boolean;
     readonly directions: OrientationToggle;
     get title(): 'Framed Myopia Arrow' | 'Myopia Arrow';
@@ -2860,6 +2875,7 @@ declare global {
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
     validateSymbol(grid: GridData): State;
+    descriptionEquals(other: Symbol$1): boolean;
     copyWith({
       x,
       y,
@@ -3030,7 +3046,10 @@ declare global {
     isInstructionSupported(instructionId: string): boolean;
     isGridSupported(grid: GridData): boolean;
   }
-  export declare abstract class CustomSymbol extends MultiEntrySymbol {
+  export declare abstract class CustomSymbol
+    extends Symbol$1
+    implements SymbolMergeHandler
+  {
     readonly description: string;
     readonly grid: GridData;
     /**
@@ -3046,6 +3065,7 @@ declare global {
     createExampleGrid(): GridData;
     validateSymbol(_grid: GridData): State;
     get validateWithSolution(): boolean;
+    descriptionEquals(other: Symbol$1): boolean;
     withDescription(description: string): this;
     withGrid(grid: GridData): this;
   }

package/dist/data/events/onSymbolMerge.d.ts

@@ -0,0 +1,10 @@
+import Instruction from '../instruction.js';
+import Symbol from '../symbols/symbol.js';
+export interface SymbolMergeHandler {
+    /**
+     * Determines if the description of two symbols can be merged when displayed in the UI.
+     * @param other The other symbol to compare against.
+     */
+    descriptionEquals(other: Symbol): boolean;
+}
+export declare function handlesSymbolMerge<T extends Instruction>(val: T): val is T & SymbolMergeHandler;

package/dist/data/events/onSymbolMerge.js

@@ -0,0 +1,4 @@
+import { isEventHandler } from './eventHelper.js';
+export function handlesSymbolMerge(val) {
+    return isEventHandler(val, 'descriptionEquals');
+}

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

@@ -2,7 +2,7 @@ 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 CollectZonesRule extends Rule {
+export default class ConnectZonesRule extends Rule {
     readonly color: Color;
     readonly title = "Connect Zones";
     private static readonly CONFIGS;
@@ -26,4 +26,4 @@ export default class CollectZonesRule extends Rule {
     }): this;
     withColor(color: Color): this;
 }
-export declare const instance: CollectZonesRule;
+export declare const instance: ConnectZonesRule;

package/dist/data/rules/connectZonesRule.js

@@ -3,7 +3,8 @@ import GridData from '../grid.js';
 import { array, minBy } from '../dataHelper.js';
 import { Color, State } from '../primitives.js';
 import Rule from './rule.js';
-class CollectZonesRule extends Rule {
+import GridZones from '../gridZones.js';
+class ConnectZonesRule extends Rule {
     /**
      * **Connect all <color> cells in each zone**
      *
@@ -32,15 +33,15 @@ class CollectZonesRule extends Rule {
         return `Connect all ${this.color} cells in each zone`;
     }
     get configs() {
-        return CollectZonesRule.CONFIGS;
+        return ConnectZonesRule.CONFIGS;
     }
     createExampleGrid() {
         return this.color === Color.Light
-            ? CollectZonesRule.EXAMPLE_GRID_LIGHT
-            : CollectZonesRule.EXAMPLE_GRID_DARK;
+            ? ConnectZonesRule.EXAMPLE_GRID_LIGHT
+            : ConnectZonesRule.EXAMPLE_GRID_DARK;
     }
     get searchVariants() {
-        return CollectZonesRule.SEARCH_VARIANTS;
+        return ConnectZonesRule.SEARCH_VARIANTS;
     }
     validateGrid(grid) {
         let complete = true;
@@ -86,13 +87,13 @@ class CollectZonesRule extends Rule {
         return { state: complete ? State.Satisfied : State.Incomplete };
     }
     copyWith({ color }) {
-        return new CollectZonesRule(color ?? this.color);
+        return new ConnectZonesRule(color ?? this.color);
     }
     withColor(color) {
         return this.copyWith({ color });
     }
 }
-Object.defineProperty(CollectZonesRule, "CONFIGS", {
+Object.defineProperty(ConnectZonesRule, "CONFIGS", {
     enumerable: true,
     configurable: true,
     writable: true,
@@ -107,26 +108,34 @@ Object.defineProperty(CollectZonesRule, "CONFIGS", {
         },
     ])
 });
-Object.defineProperty(CollectZonesRule, "EXAMPLE_GRID_LIGHT", {
+Object.defineProperty(ConnectZonesRule, "EXAMPLE_GRID_LIGHT", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: Object.freeze(GridData.create(['bwwwb', 'bwbww', 'wwwbb', 'wbwww']))
+    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(CollectZonesRule, "EXAMPLE_GRID_DARK", {
+Object.defineProperty(ConnectZonesRule, "EXAMPLE_GRID_DARK", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: Object.freeze(GridData.create(['wbbbw', 'wbwbb', 'bbbww', 'bwbbb']))
+    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(CollectZonesRule, "SEARCH_VARIANTS", {
+Object.defineProperty(ConnectZonesRule, "SEARCH_VARIANTS", {
     enumerable: true,
     configurable: true,
     writable: true,
     value: [
-        new CollectZonesRule(Color.Light).searchVariant(),
-        new CollectZonesRule(Color.Dark).searchVariant(),
+        new ConnectZonesRule(Color.Light).searchVariant(),
+        new ConnectZonesRule(Color.Dark).searchVariant(),
     ]
 });
-export default CollectZonesRule;
-export const instance = new CollectZonesRule(Color.Dark);
+export default ConnectZonesRule;
+export const instance = new ConnectZonesRule(Color.Dark);

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

@@ -2,7 +2,7 @@ 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 CollectZonesRule } from './connectZonesRule.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';

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

@@ -6,7 +6,7 @@ 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 CollectZonesRule } from './connectZonesRule.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';

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

@@ -1,7 +1,8 @@
+import { SymbolMergeHandler } from '../events/onSymbolMerge.js';
 import GridData from '../grid.js';
 import { State } from '../primitives.js';
-import MultiEntrySymbol from './multiEntrySymbol.js';
-export default abstract class CustomSymbol extends MultiEntrySymbol {
+import Symbol from './symbol.js';
+export default abstract class CustomSymbol extends Symbol implements SymbolMergeHandler {
     readonly description: string;
     readonly grid: GridData;
     /**
@@ -17,6 +18,7 @@ export default abstract class CustomSymbol extends MultiEntrySymbol {
     createExampleGrid(): GridData;
     validateSymbol(_grid: GridData): State;
     get validateWithSolution(): boolean;
+    descriptionEquals(other: Symbol): boolean;
     withDescription(description: string): this;
     withGrid(grid: GridData): this;
 }

package/dist/data/symbols/customSymbol.js

@@ -1,6 +1,6 @@
 import { State } from '../primitives.js';
-import MultiEntrySymbol from './multiEntrySymbol.js';
-export default class CustomSymbol extends MultiEntrySymbol {
+import Symbol from './symbol.js';
+export default class CustomSymbol extends Symbol {
     /**
      * **A custom symbol**
      *
@@ -38,6 +38,11 @@ export default class CustomSymbol extends MultiEntrySymbol {
     get validateWithSolution() {
         return true;
     }
+    descriptionEquals(other) {
+        return (this.id === other.id &&
+            this.explanation === other.explanation &&
+            this.createExampleGrid().equals(other.createExampleGrid()));
+    }
     withDescription(description) {
         return this.copyWith({ description });
     }

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

@@ -1,17 +1,22 @@
 import { AnyConfig } from '../config.js';
+import { SymbolMergeHandler } from '../events/onSymbolMerge.js';
 import GridData from '../grid.js';
 import NumberSymbol from './numberSymbol.js';
-export default class FocusSymbol extends NumberSymbol {
-    readonly title = "Focus Number";
+import Symbol from './symbol.js';
+export default class FocusSymbol extends NumberSymbol implements SymbolMergeHandler {
+    readonly deadEnd: boolean;
+    get title(): string;
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
+    private static readonly EXAMPLE_GRID_DEAD_END;
     /**
      * **Focus Numbers count directly adjacent cells of the same color**
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param deadEnd - Whether this Focus Number is a Dead End.
      * @param number - The focus number.
      */
-    constructor(x: number, y: number, number: number);
+    constructor(x: number, y: number, deadEnd: boolean, number: number);
     get id(): string;
     get placementStep(): number;
     get explanation(): string;
@@ -22,11 +27,14 @@ export default class FocusSymbol extends NumberSymbol {
         completed: number;
         possible: number;
     };
-    copyWith({ x, y, number, }: {
+    descriptionEquals(other: Symbol): boolean;
+    copyWith({ x, y, deadEnd, number, }: {
         x?: number;
         y?: number;
+        deadEnd?: boolean;
         number?: number;
     }): this;
     withNumber(number: number): this;
+    withDeadEnd(deadEnd: boolean): this;
 }
 export declare const instance: FocusSymbol;

package/dist/data/symbols/focusSymbol.js

@@ -1,6 +1,8 @@
 import { ConfigType } from '../config.js';
 import GridData from '../grid.js';
 import { Color } from '../primitives.js';
+import AreaNumberSymbol from './areaNumberSymbol.js';
+import LetterSymbol from './letterSymbol.js';
 import NumberSymbol from './numberSymbol.js';
 const OFFSETS = [
     [0, -1],
@@ -9,20 +11,33 @@ const OFFSETS = [
     [-1, 0],
 ];
 class FocusSymbol extends NumberSymbol {
+    get title() {
+        if (this.deadEnd) {
+            return 'Dead End';
+        }
+        else {
+            return 'Focus Number';
+        }
+    }
     /**
      * **Focus Numbers count directly adjacent cells of the same color**
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param deadEnd - Whether this Focus Number is a Dead End.
      * @param number - The focus number.
      */
-    constructor(x, y, number) {
+    constructor(x, y, deadEnd, number) {
+        if (deadEnd) {
+            number = 1;
+        }
         super(x, y, number);
-        Object.defineProperty(this, "title", {
+        Object.defineProperty(this, "deadEnd", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 'Focus Number'
+            value: deadEnd
         });
+        this.deadEnd = deadEnd;
     }
     get id() {
         return `focus`;
@@ -31,13 +46,23 @@ class FocusSymbol extends NumberSymbol {
         return 1;
     }
     get explanation() {
-        return '*Focus Numbers* count directly adjacent cells of the same color';
+        if (this.deadEnd) {
+            return `*Dead Ends* connect to one adjacent cell of the same color`;
+        }
+        else {
+            return '*Focus Numbers* count directly adjacent cells of the same color';
+        }
     }
     get configs() {
         return FocusSymbol.CONFIGS;
     }
     createExampleGrid() {
-        return FocusSymbol.EXAMPLE_GRID;
+        if (this.deadEnd) {
+            return FocusSymbol.EXAMPLE_GRID_DEAD_END;
+        }
+        else {
+            return FocusSymbol.EXAMPLE_GRID;
+        }
     }
     countForColor(grid, color) {
         let gray = 0;
@@ -76,12 +101,18 @@ class FocusSymbol extends NumberSymbol {
         }
         return this.countForColor(grid, color);
     }
-    copyWith({ x, y, number, }) {
-        return new FocusSymbol(x ?? this.x, y ?? this.y, number ?? this.number);
+    descriptionEquals(other) {
+        return this.id === other.id && this.explanation === other.explanation;
+    }
+    copyWith({ x, y, deadEnd, number, }) {
+        return new FocusSymbol(x ?? this.x, y ?? this.y, deadEnd ?? this.deadEnd, number ?? this.number);
     }
     withNumber(number) {
         return this.copyWith({ number });
     }
+    withDeadEnd(deadEnd) {
+        return this.copyWith({ deadEnd });
+    }
 }
 Object.defineProperty(FocusSymbol, "CONFIGS", {
     enumerable: true,
@@ -102,11 +133,20 @@ Object.defineProperty(FocusSymbol, "CONFIGS", {
             description: 'Y',
             configurable: false,
         },
+        {
+            type: ConfigType.Boolean,
+            default: false,
+            field: 'deadEnd',
+            description: 'Dead End',
+            explanation: 'A Dead End is a Focus Number of 1 that can be stacked with other symbols.',
+            configurable: true,
+        },
         {
             type: ConfigType.Number,
             default: 1,
             field: 'number',
             description: 'Number',
+            explanation: 'Must be 1 for Dead Ends. Between 0 and 4 for Focus Numbers.',
             configurable: true,
         },
     ])
@@ -116,10 +156,24 @@ Object.defineProperty(FocusSymbol, "EXAMPLE_GRID", {
     configurable: true,
     writable: true,
     value: Object.freeze(GridData.create(['wwwww', 'bbbbw', 'wwbbw', 'wwwww']).withSymbols([
-        new FocusSymbol(0, 0, 1),
-        new FocusSymbol(4, 1, 2),
-        new FocusSymbol(1, 3, 3),
+        new FocusSymbol(0, 0, false, 1),
+        new FocusSymbol(4, 1, false, 2),
+        new FocusSymbol(1, 3, false, 3),
+    ]))
+});
+Object.defineProperty(FocusSymbol, "EXAMPLE_GRID_DEAD_END", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: Object.freeze(GridData.create(['wwwww', 'bbbbw', 'wwwbw', 'bbbbw']).withSymbols([
+        new FocusSymbol(0, 0, true, 1),
+        new FocusSymbol(4, 3, true, 1),
+        new FocusSymbol(0, 2, true, 1),
+        new FocusSymbol(2, 2, true, 1),
+        new AreaNumberSymbol(0, 2, 3),
+        new LetterSymbol(0, 0, 'A'),
+        new LetterSymbol(4, 3, 'A'),
     ]))
 });
 export default FocusSymbol;
-export const instance = new FocusSymbol(0, 0, 1);
+export const instance = new FocusSymbol(0, 0, false, 1);

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

@@ -1,8 +1,9 @@
 import { AnyConfig } from '../config.js';
+import { SymbolMergeHandler } from '../events/onSymbolMerge.js';
 import GridData from '../grid.js';
 import { OrientationToggle, State } from '../primitives.js';
-import MultiEntrySymbol from './multiEntrySymbol.js';
-export default class MyopiaSymbol extends MultiEntrySymbol {
+import Symbol from './symbol.js';
+export default class MyopiaSymbol extends Symbol implements SymbolMergeHandler {
     readonly diagonals: boolean;
     readonly directions: OrientationToggle;
     get title(): "Framed Myopia Arrow" | "Myopia Arrow";
@@ -23,6 +24,7 @@ export default class MyopiaSymbol extends MultiEntrySymbol {
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
     validateSymbol(grid: GridData): State;
+    descriptionEquals(other: Symbol): boolean;
     copyWith({ x, y, diagonals, directions, }: {
         x?: number;
         y?: number;

package/dist/data/symbols/myopiaSymbol.js

@@ -2,8 +2,8 @@ import { ConfigType } from '../config.js';
 import { move } from '../dataHelper.js';
 import GridData from '../grid.js';
 import { Color, ORIENTATIONS, Orientation, State, orientationToggle, } from '../primitives.js';
-import MultiEntrySymbol from './multiEntrySymbol.js';
-class MyopiaSymbol extends MultiEntrySymbol {
+import Symbol from './symbol.js';
+class MyopiaSymbol extends Symbol {
     get title() {
         return this.diagonals ? 'Framed Myopia Arrow' : 'Myopia Arrow';
     }
@@ -134,6 +134,9 @@ class MyopiaSymbol extends MultiEntrySymbol {
             return State.Satisfied;
         return State.Incomplete;
     }
+    descriptionEquals(other) {
+        return this.id === other.id && this.explanation === other.explanation;
+    }
     copyWith({ x, y, diagonals, directions, }) {
         return new MyopiaSymbol(x ?? this.x, y ?? this.y, diagonals ?? this.diagonals, directions ?? this.directions);
     }

package/dist/index.d.ts

@@ -8,6 +8,7 @@ import { handlesGridChange } from './data/events/onGridChange.js';
 import { handlesGridResize } from './data/events/onGridResize.js';
 import { handlesSetGrid, invokeSetGrid } from './data/events/onSetGrid.js';
 import { handlesSymbolDisplay } from './data/events/onSymbolDisplay.js';
+import { handlesSymbolMerge } from './data/events/onSymbolMerge.js';
 import { handlesSymbolValidation } from './data/events/onSymbolValidation.js';
 import GridData, { NEIGHBOR_OFFSETS } from './data/grid.js';
 import GridConnections from './data/gridConnections.js';
@@ -20,7 +21,7 @@ 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 CollectZonesRule from './data/rules/connectZonesRule.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';
@@ -107,7 +108,6 @@ import { allSymbols } from './data/symbols/index.js';
 import LetterSymbol from './data/symbols/letterSymbol.js';
 import LotusSymbol from './data/symbols/lotusSymbol.js';
 import MinesweeperSymbol from './data/symbols/minesweeperSymbol.js';
-import MultiEntrySymbol from './data/symbols/multiEntrySymbol.js';
 import MyopiaSymbol from './data/symbols/myopiaSymbol.js';
 import NumberSymbol from './data/symbols/numberSymbol.js';
 import Symbol from './data/symbols/symbol.js';
@@ -116,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, CollectZonesRule, 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, };
+export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolMerge, 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, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };

package/dist/index.js

@@ -11,6 +11,7 @@ import { handlesGridChange } from './data/events/onGridChange.js';
 import { handlesGridResize } from './data/events/onGridResize.js';
 import { handlesSetGrid, invokeSetGrid } from './data/events/onSetGrid.js';
 import { handlesSymbolDisplay } from './data/events/onSymbolDisplay.js';
+import { handlesSymbolMerge } from './data/events/onSymbolMerge.js';
 import { handlesSymbolValidation } from './data/events/onSymbolValidation.js';
 import GridData, { NEIGHBOR_OFFSETS } from './data/grid.js';
 import GridConnections from './data/gridConnections.js';
@@ -23,7 +24,7 @@ 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 CollectZonesRule from './data/rules/connectZonesRule.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';
@@ -110,7 +111,6 @@ import { allSymbols } from './data/symbols/index.js';
 import LetterSymbol from './data/symbols/letterSymbol.js';
 import LotusSymbol from './data/symbols/lotusSymbol.js';
 import MinesweeperSymbol from './data/symbols/minesweeperSymbol.js';
-import MultiEntrySymbol from './data/symbols/multiEntrySymbol.js';
 import MyopiaSymbol from './data/symbols/myopiaSymbol.js';
 import NumberSymbol from './data/symbols/numberSymbol.js';
 import Symbol from './data/symbols/symbol.js';
@@ -119,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, CollectZonesRule, 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, };
+export { ConfigType, configEquals, Configurable, CachedAccess, allEqual, array, directionToRotation, escape, isSameEdge, maxBy, minBy, move, orientationToRotation, resize, unescape, isEventHandler, handlesFinalValidation, handlesGetTile, handlesGridChange, handlesGridResize, handlesSetGrid, invokeSetGrid, handlesSymbolDisplay, handlesSymbolMerge, 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, MyopiaSymbol, NumberSymbol, Symbol, ViewpointSymbol, TileData, TileConnections, validateGrid, aggregateState, applyFinalOverrides, GridValidator, };

package/package.json

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

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

@@ -1,11 +0,0 @@
-import Instruction from '../instruction.js';
-import Symbol from './symbol.js';
-export default abstract class MultiEntrySymbol extends Symbol {
-    /**
-     * Determines if the description of two MultiEntrySymbols can be merged when displayed in the UI.
-     * @param other - The other MultiEntrySymbol to compare to.
-     * @returns Whether the two MultiEntrySymbols have the same description.
-     */
-    descriptionEquals(other: Instruction): boolean;
-}
-export declare const instance: undefined;

package/dist/data/symbols/multiEntrySymbol.js

@@ -1,14 +0,0 @@
-import Symbol from './symbol.js';
-export default class MultiEntrySymbol extends Symbol {
-    /**
-     * Determines if the description of two MultiEntrySymbols can be merged when displayed in the UI.
-     * @param other - The other MultiEntrySymbol to compare to.
-     * @returns Whether the two MultiEntrySymbols have the same description.
-     */
-    descriptionEquals(other) {
-        return (this.id === other.id &&
-            this.explanation === other.explanation &&
-            this.createExampleGrid().equals(other.createExampleGrid()));
-    }
-}
-export const instance = undefined;