@logic-pad/core 0.24.0 → 0.25.0

package/dist/{data → src/data}/solver/backtrack/backtrackSolver.js

@@ -18,42 +18,8 @@ import { instance as connectAllInstance } from '../../rules/connectAllRule.js';
 import EventIteratingSolver from '../eventIteratingSolver.js';
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
 ('vite-apply-code-mod');
-class BacktrackSolver extends EventIteratingSolver {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "id", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'backtrack'
-        });
-        Object.defineProperty(this, "author", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'ALaggyDev'
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'Solves puzzles pretty fast using backtracking with optimizations. Support most rules and symbols (including underclued).'
-        });
-    }
-    createWorker() {
-        return new Worker(new URL(`./backtrackWorker.js`, import.meta.url), {
-            type: 'module',
-        });
-    }
-    isInstructionSupported(instructionId) {
-        return BacktrackSolver.supportedInstrs.includes(instructionId);
-    }
-}
-Object.defineProperty(BacktrackSolver, "supportedInstrs", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: [
+export default class BacktrackSolver extends EventIteratingSolver {
+    static supportedInstrs = [
         areaNumberInstance.id,
         viewpointInstance.id,
         dartInstance.id,
@@ -71,6 +37,16 @@ Object.defineProperty(BacktrackSolver, "supportedInstrs", {
         cellCountInstance.id,
         sameShapeInstance.id,
         uniqueShapeInstance.id,
-    ]
-});
-export default BacktrackSolver;
+    ];
+    id = 'backtrack';
+    author = 'ALaggyDev';
+    description = 'Solves puzzles pretty fast using backtracking with optimizations. Support most rules and symbols (including underclued).';
+    createWorker() {
+        return new Worker(new URL(`./backtrackWorker.js`, import.meta.url), {
+            type: 'module',
+        });
+    }
+    isInstructionSupported(instructionId) {
+        return BacktrackSolver.supportedInstrs.includes(instructionId);
+    }
+}

package/dist/{data → src/data}/solver/backtrack/backtrackWorker.js

@@ -182,7 +182,7 @@ function getNextTile(grid, ratings) {
                 highest = scores[y][x];
                 pos = { x, y };
             }
-            fallback ?? (fallback = { x, y });
+            fallback ??= { x, y };
         }
     }
     return pos ?? fallback;

package/dist/{data → src/data}/solver/backtrack/data.js

@@ -7,37 +7,17 @@ export var BTTile;
     BTTile[BTTile["NonExist"] = 3] = "NonExist";
 })(BTTile || (BTTile = {}));
 export class BTGridData {
+    tiles;
+    connections;
+    modules;
+    width;
+    height;
     constructor(tiles, connections, modules, width, height) {
-        Object.defineProperty(this, "tiles", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: tiles
-        });
-        Object.defineProperty(this, "connections", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: connections
-        });
-        Object.defineProperty(this, "modules", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: modules
-        });
-        Object.defineProperty(this, "width", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: width
-        });
-        Object.defineProperty(this, "height", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: height
-        });
+        this.tiles = tiles;
+        this.connections = connections;
+        this.modules = modules;
+        this.width = width;
+        this.height = height;
         this.tiles = tiles;
         this.connections = connections;
         this.modules = modules;
@@ -80,25 +60,13 @@ export class BTGridData {
     }
 }
 export class IntArray2D {
+    array;
+    width;
+    height;
     constructor(array, width, height) {
-        Object.defineProperty(this, "array", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: array
-        });
-        Object.defineProperty(this, "width", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: width
-        });
-        Object.defineProperty(this, "height", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: height
-        });
+        this.array = array;
+        this.width = width;
+        this.height = height;
         this.array = array;
         this.width = width;
         this.height = height;

package/dist/{data → src/data}/solver/backtrack/rules/banPattern.js

@@ -1,13 +1,8 @@
 import BTModule, { BTTile, colorToBTTile, } from '../data.js';
 export default class BanPatternBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/rules/cellCount.js

@@ -1,13 +1,8 @@
 import BTModule, { BTTile, colorToBTTile, } from '../data.js';
 export default class CellCountBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/rules/connectAll.js

@@ -1,13 +1,8 @@
 import BTModule, { IntArray2D, colorToBTTile, getOppositeColor, } from '../data.js';
 export default class ConnectAllBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/rules/regionArea.js

@@ -1,13 +1,8 @@
 import BTModule, { BTTile, IntArray2D, colorToBTTile, } from '../data.js';
 export default class RegionAreaBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/rules/regionShape.js

@@ -1,14 +1,9 @@
 import { normalizeShape, positionsToShape, shapeEquals, } from '../../../shapes.js';
 import BTModule, { BTTile, IntArray2D, colorToBTTile, } from '../data.js';
 export default class RegionShapeBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     getShapeRegions(grid) {

package/dist/{data → src/data}/solver/backtrack/rules/sameShape.js

@@ -1,13 +1,8 @@
 import RegionShapeBTModule from './regionShape.js';
 export default class SameShapeBTModule extends RegionShapeBTModule {
+    instr;
     constructor(instr) {
         super(instr);
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/rules/symbolsPerRegion.js

@@ -1,20 +1,10 @@
 import { Comparison } from '../../../primitives.js';
 import BTModule, { BTTile, IntArray2D, colorToBTTile, } from '../data.js';
 export default class SymbolsPerRegionBTModule extends BTModule {
+    instr;
+    symbolCount;
     constructor(instr, width, height, allSymbols) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "symbolCount", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
         this.symbolCount = IntArray2D.create(width, height);
         for (const symbol of allSymbols) {

package/dist/{data → src/data}/solver/backtrack/rules/uniqueShape.js

@@ -1,13 +1,8 @@
 import RegionShapeBTModule from './regionShape.js';
 export default class UniqueShapeBTModule extends RegionShapeBTModule {
+    instr;
     constructor(instr) {
         super(instr);
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/symbols/areaNumber.js

@@ -1,13 +1,8 @@
 import BTModule, { BTTile, IntArray2D, createOneTileResult, } from '../data.js';
 export default class AreaNumberBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/symbols/dart.js

@@ -1,14 +1,9 @@
 import { move } from '../../../dataHelper.js';
 import BTModule, { BTTile, IntArray2D, createOneTileResult, getOppositeColor, } from '../data.js';
 export default class DartBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/symbols/directionLinker.js

@@ -1,21 +1,11 @@
 import BTModule, { BTTile, IntArray2D, } from '../data.js';
 export default class DirectionLinkerBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "initialPositions", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: null
-        });
         this.instr = instr;
     }
+    initialPositions = null;
     getInitialPositions() {
         if (this.instr.x % 1 !== 0 && this.instr.y % 1 !== 0)
             return [
@@ -38,7 +28,7 @@ export default class DirectionLinkerBTModule extends BTModule {
             return [{ x: this.instr.x, y: this.instr.y }];
     }
     checkGlobal(grid) {
-        this.initialPositions ?? (this.initialPositions = this.getInitialPositions());
+        this.initialPositions ??= this.getInitialPositions();
         const tilesNeedCheck = IntArray2D.create(grid.width, grid.height);
         const ratings = [];
         for (const pos of this.initialPositions) {

package/dist/{data → src/data}/solver/backtrack/symbols/focus.js

@@ -1,19 +1,9 @@
 import BTModule, { BTTile, IntArray2D, createOneTileResult, } from '../data.js';
 export default class FocusBTModule extends BTModule {
+    instr;
+    cachedCheckResult;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cachedCheckResult", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {
@@ -37,7 +27,7 @@ export default class FocusBTModule extends BTModule {
         }
         if (same > this.instr.number || same + gray < this.instr.number)
             return false;
-        this.cachedCheckResult ?? (this.cachedCheckResult = this.buildCheckAndRating(grid));
+        this.cachedCheckResult ??= this.buildCheckAndRating(grid);
         return this.cachedCheckResult;
     }
     buildCheckAndRating(grid) {

package/dist/{data → src/data}/solver/backtrack/symbols/galaxy.js

@@ -1,13 +1,8 @@
 import DirectionLinkerBTModule from './directionLinker.js';
 export default class GalaxyBTModule extends DirectionLinkerBTModule {
+    instr;
     constructor(instr) {
         super(instr);
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     // Translate a position in relative to a galaxy symbol

package/dist/{data → src/data}/solver/backtrack/symbols/letter.js

@@ -1,19 +1,9 @@
 import BTModule, { BTTile, IntArray2D, } from '../data.js';
 export default class LetterBTModule extends BTModule {
+    letters;
+    letterGrid;
     constructor(instrs, width, height) {
         super();
-        Object.defineProperty(this, "letters", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "letterGrid", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.letters = [];
         this.letterGrid = IntArray2D.create(width, height);
         const letterMap = new Map();

package/dist/{data → src/data}/solver/backtrack/symbols/lotus.js

@@ -2,14 +2,9 @@ import { Orientation } from '../../../primitives.js';
 import { BTTile } from '../data.js';
 import DirectionLinkerBTModule from './directionLinker.js';
 export default class LotusBTModule extends DirectionLinkerBTModule {
+    instr;
     constructor(instr) {
         super(instr);
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     // Translate a position in relative to a lotus symbol

package/dist/{data → src/data}/solver/backtrack/symbols/minesweeper.js

@@ -1,19 +1,9 @@
 import BTModule, { BTTile, IntArray2D, createOneTileResult, getOppositeColor, } from '../data.js';
 export default class MinesweeperBTModule extends BTModule {
+    instr;
+    cachedCheckResult;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cachedCheckResult", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {
@@ -35,7 +25,7 @@ export default class MinesweeperBTModule extends BTModule {
         }
         if (opposite > this.instr.number || opposite + gray < this.instr.number)
             return false;
-        this.cachedCheckResult ?? (this.cachedCheckResult = this.buildCheckAndRating(grid));
+        this.cachedCheckResult ??= this.buildCheckAndRating(grid);
         return this.cachedCheckResult;
     }
     buildCheckAndRating(grid) {

package/dist/{data → src/data}/solver/backtrack/symbols/myopia.js

@@ -2,14 +2,9 @@ import { move } from '../../../dataHelper.js';
 import { ORIENTATIONS, Orientation } from '../../../primitives.js';
 import BTModule, { BTTile, createOneTileResult, getOppositeColor, } from '../data.js';
 export default class MyopiaBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/backtrack/symbols/viewpoint.js

@@ -1,13 +1,8 @@
 import BTModule, { BTTile, IntArray2D, createOneTileResult, getOppositeColor, } from '../data.js';
 export default class ViewpointBTModule extends BTModule {
+    instr;
     constructor(instr) {
         super();
-        Object.defineProperty(this, "instr", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {

package/dist/{data → src/data}/solver/cspuz/cspuzSolver.js

@@ -19,28 +19,28 @@ import GridData from '../../grid.js';
 import { Color } from '../../primitives.js';
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
 ('vite-apply-code-mod');
-class CspuzSolver extends EventIteratingSolver {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "id", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'cspuz'
-        });
-        Object.defineProperty(this, "author", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'semiexp'
-        });
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'A blazingly fast WebAssembly solver that supports most rules and symbols (including underclued).'
-        });
-    }
+export default class CspuzSolver extends EventIteratingSolver {
+    static supportedInstrs = [
+        minesweeperInstance.id,
+        areaNumberInstance.id,
+        letterInstance.id,
+        dartInstance.id,
+        viewpointInstance.id,
+        lotusInstance.id,
+        galaxyInstance.id,
+        connectAllInstance.id,
+        banPatternInstance.id,
+        sameShapeInstance.id,
+        uniqueShapeInstance.id,
+        regionAreaInstance.id,
+        cellCountInstance.id,
+        offByXInstance.id,
+        undercluedInstance.id,
+        symbolsPerRegionInstance.id,
+    ];
+    id = 'cspuz';
+    author = 'semiexp';
+    description = 'A blazingly fast WebAssembly solver that supports most rules and symbols (including underclued).';
     createWorker() {
         return new Worker(new URL('./cspuzWorker.js', import.meta.url), {
             type: 'module',
@@ -88,27 +88,3 @@ class CspuzSolver extends EventIteratingSolver {
         }
     }
 }
-Object.defineProperty(CspuzSolver, "supportedInstrs", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: [
-        minesweeperInstance.id,
-        areaNumberInstance.id,
-        letterInstance.id,
-        dartInstance.id,
-        viewpointInstance.id,
-        lotusInstance.id,
-        galaxyInstance.id,
-        connectAllInstance.id,
-        banPatternInstance.id,
-        sameShapeInstance.id,
-        uniqueShapeInstance.id,
-        regionAreaInstance.id,
-        cellCountInstance.id,
-        offByXInstance.id,
-        undercluedInstance.id,
-        symbolsPerRegionInstance.id,
-    ]
-});
-export default CspuzSolver;

package/dist/{data → src/data}/solver/eventIteratingSolver.js

@@ -2,15 +2,7 @@ import { Serializer } from '../serializer/allSerializers.js';
 import Solver from './solver.js';
 import { EventIterator } from 'event-iterator';
 export default class EventIteratingSolver extends Solver {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "supportsCancellation", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: true
-        });
-    }
+    supportsCancellation = true;
     isEnvironmentSupported() {
         try {
             const worker = this.createWorker();
@@ -23,10 +15,14 @@ export default class EventIteratingSolver extends Solver {
     }
     async *solve(grid, abortSignal) {
         const worker = this.createWorker();
-        const terminateHandler = () => worker.terminate();
-        abortSignal?.addEventListener('abort', terminateHandler);
+        let terminateHandler;
         try {
             const iterator = new EventIterator(({ push, stop, fail }) => {
+                terminateHandler = () => {
+                    worker.terminate();
+                    stop();
+                };
+                abortSignal?.addEventListener('abort', terminateHandler);
                 worker.postMessage(Serializer.stringifyGrid(grid.resetTiles()));
                 worker.addEventListener('message', (e) => {
                     if (e.data) {
@@ -51,7 +47,8 @@ export default class EventIteratingSolver extends Solver {
         }
         finally {
             worker.terminate();
-            abortSignal?.removeEventListener('abort', terminateHandler);
+            if (terminateHandler)
+                abortSignal?.removeEventListener('abort', terminateHandler);
         }
     }
 }

package/dist/{data → src/data}/solver/solver.js

@@ -5,14 +5,6 @@ import { allSymbols } from '../symbols/index.js';
  * Base class that all solvers must extend.
  */
 export default class Solver {
-    constructor() {
-        Object.defineProperty(this, "environmentCheck", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: CachedAccess.of(() => this.isEnvironmentSupported())
-        });
-    }
     /**
      * Check if the solver supports the current browser environment. This method is called once when the user first clicks
      * the "Solve" button, and the result is cached for the duration of the editor session.
@@ -25,6 +17,7 @@ export default class Solver {
     isEnvironmentSupported() {
         return Promise.resolve(true);
     }
+    environmentCheck = CachedAccess.of(() => this.isEnvironmentSupported());
     /**
      * Check if the solver supports the given instruction. This is used to render a small indication in the UI for each
      * instruction in the editor.