@logic-pad/core 0.19.1 → 0.21.0

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

@@ -146,6 +146,27 @@ declare global {
     Solve = 'solve',
     Perfection = 'perfection',
   }
+  export declare enum Instrument {
+    Piano = 'piano',
+    Drum = 'drum',
+    Violin = 'violin',
+    Xylophone = 'xylophone',
+    GuitarAcoustic = 'guitar-acoustic',
+    GuitarElectric = 'guitar-electric',
+    Flute = 'flute',
+    Trumpet = 'trumpet',
+  }
+  export declare const INSTRUMENTS: readonly Instrument[];
+  export declare const DRUM_SAMPLES: readonly [
+    'snare',
+    'kick',
+    'hihat',
+    'hihat-open',
+    'crash',
+    'tom',
+    'rim',
+  ];
+  export declare function isDrumSample(note: string): boolean;
   export declare class GridZones {
     readonly edges: readonly Edge[];
     constructor(edges?: readonly Edge[]);
@@ -490,6 +511,12 @@ declare global {
      * If this is null from the first control line, the note will be silent.
      */
     readonly note: string | null;
+    /**
+     * The instrument to play the note with, or null to keep the current instrument from the previous control line.
+     * If this is null from the first control line, the instrument will be "piano".
+     * This has no effect if the current note is a drum sample.
+     */
+    readonly instrument: Instrument | null;
     /**
      * The velocity to play the note at, or null to keep the current velocity from the previous control line.
      * Ranges from 0 to 1
@@ -505,6 +532,12 @@ declare global {
        * If this is null from the first control line, the note will be silent.
        */
       note: string | null,
+      /**
+       * The instrument to play the note with, or null to keep the current instrument from the previous control line.
+       * If this is null from the first control line, the instrument will be "piano".
+       * This has no effect if the current note is a drum sample.
+       */
+      instrument: Instrument | null,
       /**
        * The velocity to play the note at, or null to keep the current velocity from the previous control line.
        * Ranges from 0 to 1
@@ -514,9 +547,11 @@ declare global {
     get configs(): readonly AnyConfig[] | null;
     copyWith({
       note,
+      instrument,
       velocity,
     }: {
       note?: string | null;
+      instrument?: Instrument | null;
       velocity?: number | null;
     }): this;
   }
@@ -1219,6 +1254,7 @@ declare global {
     Icon = 'icon',
     ControlLines = 'controlLines',
     NullableNote = 'nullableNote',
+    NullableInstrument = 'nullableInstrument',
     SolvePath = 'solvePath',
   }
   export interface Config<T> {
@@ -1298,6 +1334,9 @@ declare global {
   export interface NullableNoteConfig extends Config<string | null> {
     readonly type: ConfigType.NullableNote;
   }
+  export interface NullableInstrumentConfig extends Config<Instrument | null> {
+    readonly type: ConfigType.NullableInstrument;
+  }
   export interface SolvePathConfig extends Config<Position$1[]> {
     readonly type: ConfigType.SolvePath;
   }
@@ -1321,6 +1360,7 @@ declare global {
     | IconConfig
     | ControlLinesConfig
     | NullableNoteConfig
+    | NullableInstrumentConfig
     | SolvePathConfig;
   /**
    * Compare two config values for equality, using an appropriate method for the config type.
@@ -3113,6 +3153,21 @@ declare global {
     grid: GridData,
     solution: GridData | null
   ): GridState;
+  export declare class GridValidator {
+    private worker;
+    private stateListeners;
+    private loadListeners;
+    private readonly validateGridDebounced;
+    readonly validateGrid: (grid: GridData, solution: GridData | null) => void;
+    private readonly notifyState;
+    readonly subscribeToState: (
+      listener: (state: GridState) => void
+    ) => () => void;
+    private readonly notifyLoad;
+    readonly subscribeToLoad: (listener: () => void) => () => void;
+    readonly isLoading: () => boolean;
+    readonly delete: () => void;
+  }
 
   export { Symbol$1 as Symbol, escape$1 as escape, unescape$1 as unescape };
 

package/dist/data/config.d.ts

@@ -1,5 +1,5 @@
 import GridData from './grid.js';
-import { Color, Comparison, Direction, DirectionToggle, Orientation, OrientationToggle, Position, Wrapping } from './primitives.js';
+import { Color, Comparison, Direction, DirectionToggle, Instrument, Orientation, OrientationToggle, Position, Wrapping } from './primitives.js';
 import { ControlLine } from './rules/musicControlLine.js';
 export declare enum ConfigType {
     Boolean = "boolean",
@@ -21,6 +21,7 @@ export declare enum ConfigType {
     Icon = "icon",
     ControlLines = "controlLines",
     NullableNote = "nullableNote",
+    NullableInstrument = "nullableInstrument",
     SolvePath = "solvePath"
 }
 export interface Config<T> {
@@ -100,10 +101,13 @@ export interface ControlLinesConfig extends Config<ControlLine[]> {
 export interface NullableNoteConfig extends Config<string | null> {
     readonly type: ConfigType.NullableNote;
 }
+export interface NullableInstrumentConfig extends Config<Instrument | null> {
+    readonly type: ConfigType.NullableInstrument;
+}
 export interface SolvePathConfig extends Config<Position[]> {
     readonly type: ConfigType.SolvePath;
 }
-export type AnyConfig = BooleanConfig | NullableBooleanConfig | NumberConfig | NullableNumberConfig | StringConfig | ColorConfig | ComparisonConfig | WrappingConfig | DirectionConfig | DirectionToggleConfig | OrientationConfig | OrientationToggleConfig | TileConfig | ShapeConfig | GridConfig | NullableGridConfig | IconConfig | ControlLinesConfig | NullableNoteConfig | SolvePathConfig;
+export type AnyConfig = BooleanConfig | NullableBooleanConfig | NumberConfig | NullableNumberConfig | StringConfig | ColorConfig | ComparisonConfig | WrappingConfig | DirectionConfig | DirectionToggleConfig | OrientationConfig | OrientationToggleConfig | TileConfig | ShapeConfig | GridConfig | NullableGridConfig | IconConfig | ControlLinesConfig | NullableNoteConfig | NullableInstrumentConfig | SolvePathConfig;
 /**
  * Compare two config values for equality, using an appropriate method for the config type.
  *

package/dist/data/config.js

@@ -21,6 +21,7 @@ export var ConfigType;
     ConfigType["Icon"] = "icon";
     ConfigType["ControlLines"] = "controlLines";
     ConfigType["NullableNote"] = "nullableNote";
+    ConfigType["NullableInstrument"] = "nullableInstrument";
     ConfigType["SolvePath"] = "solvePath";
 })(ConfigType || (ConfigType = {}));
 /**

package/dist/data/primitives.d.ts

@@ -123,3 +123,16 @@ export declare enum Mode {
     Solve = "solve",
     Perfection = "perfection"
 }
+export declare enum Instrument {
+    Piano = "piano",
+    Drum = "drum",
+    Violin = "violin",
+    Xylophone = "xylophone",
+    GuitarAcoustic = "guitar-acoustic",
+    GuitarElectric = "guitar-electric",
+    Flute = "flute",
+    Trumpet = "trumpet"
+}
+export declare const INSTRUMENTS: readonly Instrument[];
+export declare const DRUM_SAMPLES: readonly ["snare", "kick", "hihat", "hihat-open", "crash", "tom", "rim"];
+export declare function isDrumSample(note: string): boolean;

package/dist/data/primitives.js

@@ -142,3 +142,36 @@ export var Mode;
     Mode["Solve"] = "solve";
     Mode["Perfection"] = "perfection";
 })(Mode || (Mode = {}));
+export var Instrument;
+(function (Instrument) {
+    Instrument["Piano"] = "piano";
+    Instrument["Drum"] = "drum";
+    Instrument["Violin"] = "violin";
+    Instrument["Xylophone"] = "xylophone";
+    Instrument["GuitarAcoustic"] = "guitar-acoustic";
+    Instrument["GuitarElectric"] = "guitar-electric";
+    Instrument["Flute"] = "flute";
+    Instrument["Trumpet"] = "trumpet";
+})(Instrument || (Instrument = {}));
+export const INSTRUMENTS = [
+    Instrument.Piano,
+    Instrument.Drum,
+    Instrument.Violin,
+    Instrument.Xylophone,
+    Instrument.GuitarAcoustic,
+    Instrument.GuitarElectric,
+    Instrument.Flute,
+    Instrument.Trumpet,
+];
+export const DRUM_SAMPLES = [
+    'snare',
+    'kick',
+    'hihat',
+    'hihat-open',
+    'crash',
+    'tom',
+    'rim',
+];
+export function isDrumSample(note) {
+    return DRUM_SAMPLES.includes(note);
+}

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

@@ -1,11 +1,18 @@
 import { AnyConfig } from '../config.js';
 import Configurable from '../configurable.js';
+import { Instrument } from '../primitives.js';
 export declare class Row extends Configurable {
     /**
      * The note to play at this row, or null to keep the current note from the previous control line.
      * If this is null from the first control line, the note will be silent.
      */
     readonly note: string | null;
+    /**
+     * The instrument to play the note with, or null to keep the current instrument from the previous control line.
+     * If this is null from the first control line, the instrument will be "piano".
+     * This has no effect if the current note is a drum sample.
+     */
+    readonly instrument: Instrument | null;
     /**
      * The velocity to play the note at, or null to keep the current velocity from the previous control line.
      * Ranges from 0 to 1
@@ -20,14 +27,21 @@ export declare class Row extends Configurable {
      * If this is null from the first control line, the note will be silent.
      */
     note: string | null, 
+    /**
+     * The instrument to play the note with, or null to keep the current instrument from the previous control line.
+     * If this is null from the first control line, the instrument will be "piano".
+     * This has no effect if the current note is a drum sample.
+     */
+    instrument: Instrument | null, 
     /**
      * The velocity to play the note at, or null to keep the current velocity from the previous control line.
      * Ranges from 0 to 1
      */
     velocity: number | null);
     get configs(): readonly AnyConfig[] | null;
-    copyWith({ note, velocity, }: {
+    copyWith({ note, instrument, velocity, }: {
         note?: string | null;
+        instrument?: Instrument | null;
         velocity?: number | null;
     }): this;
 }

package/dist/data/rules/musicControlLine.js

@@ -1,5 +1,6 @@
 import { ConfigType } from '../config.js';
 import Configurable from '../configurable.js';
+import { Instrument } from '../primitives.js';
 export class Row extends Configurable {
     constructor(
     /**
@@ -7,6 +8,12 @@ export class Row extends Configurable {
      * If this is null from the first control line, the note will be silent.
      */
     note, 
+    /**
+     * The instrument to play the note with, or null to keep the current instrument from the previous control line.
+     * If this is null from the first control line, the instrument will be "piano".
+     * This has no effect if the current note is a drum sample.
+     */
+    instrument, 
     /**
      * The velocity to play the note at, or null to keep the current velocity from the previous control line.
      * Ranges from 0 to 1
@@ -19,6 +26,12 @@ export class Row extends Configurable {
             writable: true,
             value: note
         });
+        Object.defineProperty(this, "instrument", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: instrument
+        });
         Object.defineProperty(this, "velocity", {
             enumerable: true,
             configurable: true,
@@ -38,13 +51,14 @@ export class Row extends Configurable {
             value: 'Configure the playback settings from this tile onwards.'
         });
         this.note = note;
+        this.instrument = instrument;
         this.velocity = velocity;
     }
     get configs() {
         return Row.CONFIGS;
     }
-    copyWith({ note, velocity, }) {
-        return new Row(note !== undefined ? note : this.note, velocity !== undefined ? velocity : this.velocity);
+    copyWith({ note, instrument, velocity, }) {
+        return new Row(note !== undefined ? note : this.note, instrument !== undefined ? instrument : this.instrument, velocity !== undefined ? velocity : this.velocity);
     }
 }
 Object.defineProperty(Row, "CONFIGS", {
@@ -60,6 +74,14 @@ Object.defineProperty(Row, "CONFIGS", {
             explanation: 'The musical note or sample to play.',
             configurable: true,
         },
+        {
+            type: ConfigType.NullableInstrument,
+            default: Instrument.Piano,
+            field: 'instrument',
+            description: 'Instrument',
+            explanation: 'The musical instrument to use. This has no effect if the current note is a drum sample.',
+            configurable: true,
+        },
         {
             type: ConfigType.NullableNumber,
             default: 0.5,
@@ -68,7 +90,7 @@ Object.defineProperty(Row, "CONFIGS", {
             step: 0.2,
             field: 'velocity',
             description: 'Velocity',
-            explanation: 'For piano notes, how hard the note is played.',
+            explanation: 'The volume to play the note at.',
             configurable: true,
         },
     ])

package/dist/data/rules/musicGridRule.js

@@ -1,19 +1,19 @@
 import { ConfigType } from '../config.js';
 import GridData from '../grid.js';
 import { resize } from '../dataHelper.js';
-import { Color, MajorRule, State } from '../primitives.js';
+import { Color, Instrument, MajorRule, State, } from '../primitives.js';
 import CustomIconSymbol from '../symbols/customIconSymbol.js';
 import { ControlLine, Row } from './musicControlLine.js';
 import Rule from './rule.js';
-const DEFAULT_SCALLE = [
-    new Row('C5', null),
-    new Row('B4', null),
-    new Row('A4', null),
-    new Row('G4', null),
-    new Row('F4', null),
-    new Row('E4', null),
-    new Row('D4', null),
-    new Row('C4', null),
+const DEFAULT_SCALE = [
+    new Row('C5', Instrument.Piano, null),
+    new Row('B4', Instrument.Piano, null),
+    new Row('A4', Instrument.Piano, null),
+    new Row('G4', Instrument.Piano, null),
+    new Row('F4', Instrument.Piano, null),
+    new Row('E4', Instrument.Piano, null),
+    new Row('D4', Instrument.Piano, null),
+    new Row('C4', Instrument.Piano, null),
 ];
 class MusicGridRule extends Rule {
     get configExplanation() {
@@ -87,7 +87,7 @@ class MusicGridRule extends Rule {
             return this;
         const controlLines = this.controlLines
             .filter(line => line.column < newGrid.width)
-            .map(line => line.withRows(resize(line.rows, newGrid.height, () => new Row(null, null))));
+            .map(line => line.withRows(resize(line.rows, newGrid.height, () => new Row(null, null, null))));
         return this.copyWith({ controlLines });
     }
     onGridResize(_grid, mode, direction, index) {
@@ -96,7 +96,7 @@ class MusicGridRule extends Rule {
                 return this.copyWith({
                     controlLines: this.controlLines.map(line => {
                         const rows = line.rows.slice();
-                        rows.splice(index, 0, new Row(null, null));
+                        rows.splice(index, 0, new Row(null, null, null));
                         return line.withRows(rows);
                     }),
                 });
@@ -165,10 +165,13 @@ class MusicGridRule extends Rule {
             const note = lines
                 .map(l => l.rows[idx]?.note)
                 .reduce((a, b) => b ?? a, null);
+            const instrument = lines
+                .map(l => l.rows[idx]?.instrument)
+                .reduce((a, b) => b ?? a, null);
             const velocity = lines
                 .map(l => l.rows[idx]?.velocity)
                 .reduce((a, b) => b ?? a, null);
-            return new Row(note, velocity);
+            return new Row(note, instrument, velocity);
         });
         const bpm = lines.map(l => l.bpm).reduce((a, b) => b ?? a, null);
         const pedal = lines.map(l => l.pedal).reduce((a, b) => b ?? a, null);
@@ -201,7 +204,7 @@ Object.defineProperty(MusicGridRule, "CONFIGS", {
     value: Object.freeze([
         {
             type: ConfigType.ControlLines,
-            default: [new ControlLine(0, 120, false, false, DEFAULT_SCALLE)],
+            default: [new ControlLine(0, 120, false, false, DEFAULT_SCALE)],
             field: 'controlLines',
             description: 'Control Lines',
             configurable: false,
@@ -214,7 +217,7 @@ Object.defineProperty(MusicGridRule, "CONFIGS", {
                 'wwwww',
                 'wwwww',
                 'wwwww',
-            ]).addRule(new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALLE)], null)),
+            ]).addRule(new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALE)], null)),
             field: 'track',
             description: 'Track',
             explanation: 'If set, this grid will be played instead of the solution.',
@@ -235,8 +238,8 @@ Object.defineProperty(MusicGridRule, "SEARCH_VARIANTS", {
     configurable: true,
     writable: true,
     value: [
-        new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALLE)], null).searchVariant(),
+        new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALE)], null).searchVariant(),
     ]
 });
 export default MusicGridRule;
-export const instance = new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALLE)], null);
+export const instance = new MusicGridRule([new ControlLine(0, 120, false, false, DEFAULT_SCALE)], null);

package/dist/data/serializer/compressor/streamCompressor.js

@@ -6,8 +6,9 @@ function ensureCompressionStream() {
     }
     return Promise.resolve();
 }
+const encoder = new TextEncoder();
+const decoder = new TextDecoder();
 export default class StreamCompressor extends CompressorBase {
-    /* eslint-disable @typescript-eslint/no-floating-promises */
     async compress(input) {
         await ensureCompressionStream();
         const blobToBase64 = (blob) => new Promise(resolve => {
@@ -15,22 +16,27 @@ export default class StreamCompressor extends CompressorBase {
             reader.onloadend = () => resolve(reader.result.split(',')[1]);
             reader.readAsDataURL(blob);
         });
-        const byteArray = new TextEncoder().encode(input);
+        const byteArray = encoder.encode(input);
         const cs = new CompressionStream(this.algorithm);
         const writer = cs.writable.getWriter();
-        writer.write(byteArray);
-        writer.close();
+        writer.ready
+            .then(() => writer.write(byteArray))
+            .then(() => writer.close())
+            .catch(console.log);
         return new Response(cs.readable).blob().then(blobToBase64);
     }
     async decompress(input) {
         await ensureCompressionStream();
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
         const bytes = Uint8Array.from(atob(input), c => c.charCodeAt(0));
         const cs = new DecompressionStream(this.algorithm);
         const writer = cs.writable.getWriter();
-        writer.write(bytes);
-        writer.close();
-        return new Response(cs.readable).arrayBuffer().then(function (arrayBuffer) {
-            return new TextDecoder().decode(arrayBuffer);
+        writer.ready
+            .then(() => writer.write(bytes))
+            .then(() => writer.close())
+            .catch(console.log);
+        return new Response(cs.readable).arrayBuffer().then(arrayBuffer => {
+            return decoder.decode(arrayBuffer);
         });
     }
 }

package/dist/data/serializer/serializer_checksum.js

@@ -10,7 +10,7 @@ export default class SerializerChecksum extends SerializerV0 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 3
+            value: 4
         });
     }
     parseTile(_str) {
@@ -87,6 +87,8 @@ export default class SerializerChecksum extends SerializerV0 {
                         : escape(String(instruction[config.field])
                             .toLowerCase()
                             .trim())));
+            case ConfigType.NullableInstrument:
+                return config.field + '='; // do not include instrument in checksum
             case ConfigType.Tile:
             case ConfigType.Grid:
                 return (config.field +

package/dist/data/serializer/serializer_v0.js

@@ -2,7 +2,7 @@ import GridData from '../grid.js';
 import GridConnections from '../gridConnections.js';
 import TileData from '../tile.js';
 import { ConfigType, } from '../config.js';
-import { Color, DIRECTIONS, ORIENTATIONS, Orientation, directionToggle, orientationToggle, } from '../primitives.js';
+import { Color, DIRECTIONS, ORIENTATIONS, Orientation, directionToggle, orientationToggle, INSTRUMENTS, } from '../primitives.js';
 import { array, escape, unescape } from '../dataHelper.js';
 import { allRules } from '../rules/index.js';
 import { allSymbols } from '../symbols/index.js';
@@ -54,7 +54,7 @@ export default class SerializerV0 extends SerializerBase {
         if (line.checkpoint)
             result.push('s');
         result.push(`r${line.rows
-            .map(row => `v${row.velocity ?? ''}n${row.note ?? ''}`)
+            .map(row => `i${row.instrument ?? ''}v${row.velocity ?? ''}n${row.note ?? ''}`)
             .join(',')}`);
         return result.join('|');
     }
@@ -83,11 +83,14 @@ export default class SerializerV0 extends SerializerBase {
                     break;
                 case 'r':
                     rows.push(...value.split(',').map(row => {
-                        const match = /^v([\d.]*?)n(.*)$/.exec(row);
+                        const match = /^(?:i(\w*?))?v([\d.]*?)n(.*)$/.exec(row);
                         if (!match)
-                            return new Row(null, null);
-                        const [, velocity, note] = match;
-                        return new Row(note === '' ? null : note, velocity === '' ? null : Number(velocity));
+                            return new Row(null, null, null);
+                        const [, instrument, velocity, note] = match;
+                        return new Row(note === '' ? null : note, instrument === '' ||
+                            !INSTRUMENTS.includes(instrument)
+                            ? null
+                            : instrument, velocity === '' ? null : Number(velocity));
                     }));
                     break;
             }
@@ -146,6 +149,12 @@ export default class SerializerV0 extends SerializerBase {
                     escape(instruction[config.field] === null
                         ? ''
                         : escape(String(instruction[config.field]))));
+            case ConfigType.NullableInstrument:
+                return (config.field +
+                    '=' +
+                    escape(instruction[config.field] === null
+                        ? ''
+                        : String(instruction[config.field])));
             case ConfigType.Tile:
             case ConfigType.Shape:
             case ConfigType.Grid:
@@ -233,6 +242,11 @@ export default class SerializerV0 extends SerializerBase {
                 ];
             case ConfigType.NullableNote:
                 return [config.field, value === '' ? null : unescape(value)];
+            case ConfigType.NullableInstrument:
+                return [
+                    config.field,
+                    value === '' ? null : unescape(value),
+                ];
             case ConfigType.SolvePath:
                 return [
                     config.field,

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

@@ -16,6 +16,7 @@ import { instance as myopiaInstance } from '../../symbols/myopiaSymbol.js';
 import { instance as viewpointInstance } from '../../symbols/viewpointSymbol.js';
 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() {

package/dist/data/solver/cspuz/cspuzSolver.js

@@ -17,6 +17,7 @@ import { instance as connectAllInstance } from '../../rules/connectAllRule.js';
 import EventIteratingSolver from '../eventIteratingSolver.js';
 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() {

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

@@ -1,5 +1,6 @@
 import { instance as undercluedInstance } from '../../rules/undercluedRule.js';
 import EventIteratingSolver from '../eventIteratingSolver.js';
+// eslint-disable-next-line @typescript-eslint/no-unused-expressions
 ('vite-apply-code-mod');
 export default class UniversalSolver extends EventIteratingSolver {
     constructor() {

package/dist/data/validateAsync.d.ts

@@ -0,0 +1,15 @@
+import GridData from './grid.js';
+import { GridState } from './primitives.js';
+export declare class GridValidator {
+    private worker;
+    private stateListeners;
+    private loadListeners;
+    private readonly validateGridDebounced;
+    readonly validateGrid: (grid: GridData, solution: GridData | null) => void;
+    private readonly notifyState;
+    readonly subscribeToState: (listener: (state: GridState) => void) => () => void;
+    private readonly notifyLoad;
+    readonly subscribeToLoad: (listener: () => void) => () => void;
+    readonly isLoading: () => boolean;
+    readonly delete: () => void;
+}

package/dist/data/validateAsync.js

@@ -0,0 +1,128 @@
+import debounce from 'lodash/debounce.js';
+import { Serializer } from './serializer/allSerializers.js';
+import validateGrid from './validate.js';
+const SYNC_VALIDATION_THRESHOLD = 10000;
+export class GridValidator {
+    constructor() {
+        Object.defineProperty(this, "worker", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "stateListeners", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
+        Object.defineProperty(this, "loadListeners", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
+        Object.defineProperty(this, "validateGridDebounced", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: debounce((grid, solution) => {
+                this.worker?.terminate();
+                this.worker = new Worker(new URL('./validateAsyncWorker.js', import.meta.url), { type: 'module' });
+                this.worker.onmessage = (event) => {
+                    if (event.data) {
+                        this.notifyState(event.data);
+                    }
+                    this.worker?.terminate();
+                    this.worker = null;
+                    this.notifyLoad();
+                };
+                this.worker.onmessageerror = (error) => {
+                    console.error('Validation worker error:', error);
+                    this.worker?.terminate();
+                    this.worker = null;
+                    this.notifyLoad();
+                };
+                this.worker.postMessage({
+                    grid: Serializer.stringifyGrid(grid),
+                    solution: solution ? Serializer.stringifyGrid(solution) : null,
+                });
+                this.notifyLoad();
+            }, 300, { leading: true, trailing: true })
+        });
+        Object.defineProperty(this, "validateGrid", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (grid, solution) => {
+                if (grid.width * grid.height <= SYNC_VALIDATION_THRESHOLD) {
+                    // Synchronous validation for small grids
+                    // to avoid the overhead of worker communication.
+                    const state = validateGrid(grid, solution);
+                    this.notifyState(state);
+                }
+                else {
+                    this.validateGridDebounced(grid, solution);
+                }
+            }
+        });
+        Object.defineProperty(this, "notifyState", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (state) => {
+                this.stateListeners.forEach(listener => listener(state));
+            }
+        });
+        Object.defineProperty(this, "subscribeToState", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (listener) => {
+                this.stateListeners.add(listener);
+                return () => {
+                    this.stateListeners.delete(listener);
+                };
+            }
+        });
+        Object.defineProperty(this, "notifyLoad", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.loadListeners.forEach(listener => listener());
+            }
+        });
+        Object.defineProperty(this, "subscribeToLoad", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (listener) => {
+                this.loadListeners.add(listener);
+                return () => {
+                    this.loadListeners.delete(listener);
+                };
+            }
+        });
+        Object.defineProperty(this, "isLoading", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                return this.worker !== null;
+            }
+        });
+        Object.defineProperty(this, "delete", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (this.worker) {
+                    this.worker.terminate();
+                    this.worker = null;
+                }
+                this.stateListeners.clear();
+            }
+        });
+    }
+}

package/dist/data/validateAsyncWorker.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/data/validateAsyncWorker.js

@@ -0,0 +1,9 @@
+import { Serializer } from './serializer/allSerializers.js';
+import validateGrid from './validate.js';
+onmessage = e => {
+    const data = e.data;
+    const grid = Serializer.parseGrid(data.grid);
+    const solution = data.solution ? Serializer.parseGrid(data.solution) : null;
+    const state = validateGrid(grid, solution);
+    postMessage(state);
+};

package/dist/index.d.ts

@@ -13,7 +13,7 @@ import GridData, { NEIGHBOR_OFFSETS } from './data/grid.js';
 import GridConnections from './data/gridConnections.js';
 import GridZones from './data/gridZones.js';
 import Instruction from './data/instruction.js';
-import { COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle } from './data/primitives.js';
+import { COMPARISONS, Color, Comparison, DIRECTIONS, DRUM_SAMPLES, Direction, INSTRUMENTS, Instrument, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, isDrumSample, orientationToggle } from './data/primitives.js';
 import { MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist } from './data/puzzle.js';
 import BanPatternRule from './data/rules/banPatternRule.js';
 import CellCountPerZoneRule from './data/rules/cellCountPerZoneRule.js';
@@ -113,4 +113,5 @@ import ViewpointSymbol from './data/symbols/viewpointSymbol.js';
 import TileData from './data/tile.js';
 import TileConnections from './data/tileConnections.js';
 import validateGrid, { aggregateState, applyFinalOverrides } from './data/validate.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, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle, MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, 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, };
+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, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, 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, };

package/dist/index.js

@@ -16,7 +16,7 @@ import GridData, { NEIGHBOR_OFFSETS } from './data/grid.js';
 import GridConnections from './data/gridConnections.js';
 import GridZones from './data/gridZones.js';
 import Instruction from './data/instruction.js';
-import { COMPARISONS, Color, Comparison, DIRECTIONS, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle } from './data/primitives.js';
+import { COMPARISONS, Color, Comparison, DIRECTIONS, DRUM_SAMPLES, Direction, INSTRUMENTS, Instrument, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, isDrumSample, orientationToggle } from './data/primitives.js';
 import { MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist } from './data/puzzle.js';
 import BanPatternRule from './data/rules/banPatternRule.js';
 import CellCountPerZoneRule from './data/rules/cellCountPerZoneRule.js';
@@ -116,4 +116,5 @@ import ViewpointSymbol from './data/symbols/viewpointSymbol.js';
 import TileData from './data/tile.js';
 import TileConnections from './data/tileConnections.js';
 import validateGrid, { aggregateState, applyFinalOverrides } from './data/validate.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, Direction, MajorRule, Mode, ORIENTATIONS, Orientation, PuzzleType, State, WRAPPINGS, Wrapping, directionToggle, orientationToggle, MetadataSchema, PuzzleSchema, getPuzzleTypes, puzzleEquals, validatePuzzleChecklist, BanPatternRule, CellCountPerZoneRule, CellCountRule, CompletePatternRule, ConnectAllRule, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, 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, };
+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, ContainsShapeRule, CustomRule, DifferentCountPerZoneRule, 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, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-pad/core",
-  "version": "0.19.1",
+  "version": "0.21.0",
   "type": "module",
   "files": [
     "dist",
@@ -54,6 +54,7 @@
     "compression-streams-polyfill": "^0.1.7",
     "event-iterator": "^2.0.0",
     "grilops": "^0.1.2",
+    "lodash": "^4.17.21",
     "logic-pad-solver-core": "^0.1.2",
     "z3-solver": "^4.13.0",
     "zod": "^4.0.17"
@@ -61,6 +62,7 @@
   "devDependencies": {
     "@types/bun": "^1.2.20",
     "@types/glob": "^9.0.0",
+    "@types/lodash": "^4.17.20",
     "dts-bundle-generator": "^9.5.1",
     "fast-glob": "^3.3.3",
     "prettier": "^3.6.2",
@@ -70,4 +72,4 @@
   "trustedDependencies": [
     "esbuild"
   ]
-}
+}