@logic-pad/core 0.4.4 → 0.4.6

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

@@ -6,10 +6,11 @@ export interface SymbolDisplayHandler {
      * Controls whether a symbol should be visible in the grid.
      *
      * @param grid The grid that is being displayed.
+     * @param solution The solution grid, if it is available.
      * @param symbol The symbol that is being displayed.
      * @param editing Whether the grid is being edited.
      * @returns True if the symbol should be displayed, false otherwise. The symbol will not be displayed if any handler returns false.
      */
-    onSymbolDisplay(grid: GridData, symbol: Symbol, editing: boolean): boolean;
+    onSymbolDisplay(grid: GridData, solution: GridData | null, symbol: Symbol, editing: boolean): boolean;
 }
 export declare function handlesSymbolDisplay<T extends Instruction>(val: T): val is T & SymbolDisplayHandler;

package/dist/data/rules/banPatternRule.js

@@ -26,7 +26,9 @@ class BanPatternRule extends Rule {
         });
         this.pattern = pattern
             // unlock all tiles
-            .withTiles(tiles => tiles.map(row => row.map(t => t.withFixed(false))))
+            .withTiles(tiles => tiles.map(row => row.map(t => t.exists
+            ? t.withFixed(false)
+            : t.copyWith({ exists: true, color: Color.Gray, fixed: false }))))
             // strip all symbols and rules
             .withRules([])
             .withSymbols(new Map());

package/dist/data/rules/musicControlLine.js

@@ -49,7 +49,7 @@ Object.defineProperty(Row, "CONFIGS", {
         },
         {
             type: ConfigType.NullableNumber,
-            default: 0.6,
+            default: 0.5,
             min: 0,
             max: 1,
             step: 0.2,

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

@@ -9,6 +9,7 @@ import Rule, { SearchVariant } from './rule.js';
 export default class MusicGridRule extends Rule implements GridChangeHandler, SetGridHandler, GridResizeHandler {
     readonly controlLines: readonly ControlLine[];
     readonly track: GridData | null;
+    readonly normalizeVelocity: boolean;
     private static readonly EXAMPLE_GRID;
     private static readonly CONFIGS;
     private static readonly SEARCH_VARIANTS;
@@ -16,8 +17,9 @@ export default class MusicGridRule extends Rule implements GridChangeHandler, Se
      * **Music Grid: Listen to the solution**
      * @param controlLines Denote changes in the playback settings. At least one control line at column 0 should be present to enable playback.
      * @param track The grid to be played when "listen" is clicked. Set as null to play the solution.
+     * @param normalizeVelocity Whether to normalize the velocity of the notes by their pitch such that lower notes are played softer.
      */
-    constructor(controlLines: readonly ControlLine[], track: GridData | null);
+    constructor(controlLines: readonly ControlLine[], track: GridData | null, normalizeVelocity?: boolean);
     get id(): string;
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
@@ -34,9 +36,10 @@ export default class MusicGridRule extends Rule implements GridChangeHandler, Se
      */
     setControlLine(controlLine: ControlLine): this;
     withTrack(track: GridData | null): this;
-    copyWith({ controlLines, track, }: {
+    copyWith({ controlLines, track, normalizeVelocity, }: {
         controlLines?: readonly ControlLine[];
         track?: GridData | null;
+        normalizeVelocity?: boolean;
     }): this;
     get validateWithSolution(): boolean;
     get isSingleton(): boolean;

package/dist/data/rules/musicGridRule.js

@@ -6,22 +6,23 @@ import CustomIconSymbol from '../symbols/customIconSymbol.js';
 import { ControlLine, Row } from './musicControlLine.js';
 import Rule from './rule.js';
 const DEFAULT_SCALLE = [
-    new Row('C5', 0.6),
-    new Row('B4', 0.6),
-    new Row('A4', 0.6),
-    new Row('G4', 0.6),
-    new Row('F4', 0.6),
-    new Row('E4', 0.6),
-    new Row('D4', 0.6),
-    new Row('C4', 0.6),
+    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),
 ];
 class MusicGridRule extends Rule {
     /**
      * **Music Grid: Listen to the solution**
      * @param controlLines Denote changes in the playback settings. At least one control line at column 0 should be present to enable playback.
      * @param track The grid to be played when "listen" is clicked. Set as null to play the solution.
+     * @param normalizeVelocity Whether to normalize the velocity of the notes by their pitch such that lower notes are played softer.
      */
-    constructor(controlLines, track) {
+    constructor(controlLines, track, normalizeVelocity = true) {
         super();
         Object.defineProperty(this, "controlLines", {
             enumerable: true,
@@ -35,8 +36,15 @@ class MusicGridRule extends Rule {
             writable: true,
             value: track
         });
+        Object.defineProperty(this, "normalizeVelocity", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: normalizeVelocity
+        });
         this.controlLines = MusicGridRule.deduplicateControlLines(controlLines);
         this.track = track;
+        this.normalizeVelocity = normalizeVelocity;
     }
     get id() {
         return MajorRule.MusicGrid;
@@ -134,8 +142,8 @@ class MusicGridRule extends Rule {
     withTrack(track) {
         return this.copyWith({ track });
     }
-    copyWith({ controlLines, track, }) {
-        return new MusicGridRule(controlLines ?? this.controlLines, track !== undefined ? track : this.track);
+    copyWith({ controlLines, track, normalizeVelocity, }) {
+        return new MusicGridRule(controlLines ?? this.controlLines, track !== undefined ? track : this.track, normalizeVelocity ?? this.normalizeVelocity);
     }
     get validateWithSolution() {
         return true;
@@ -197,6 +205,13 @@ Object.defineProperty(MusicGridRule, "CONFIGS", {
             description: 'Track',
             configurable: true,
         },
+        {
+            type: ConfigType.Boolean,
+            default: true,
+            field: 'normalizeVelocity',
+            description: 'Normalize Velocity',
+            configurable: true,
+        },
     ])
 });
 Object.defineProperty(MusicGridRule, "SEARCH_VARIANTS", {

package/dist/data/serializer/serializer_v0.js

@@ -173,8 +173,10 @@ export default class SerializerV0 extends SerializerBase {
     parseConfig(configs, entry) {
         const [key, value] = entry.split('=');
         const config = configs.find(x => x.field === key);
-        if (!config)
-            throw new Error(`Unknown config: ${key}`);
+        if (!config) {
+            console.warn(`Unknown config: ${key} when parsing ${entry}`);
+            return [key, value];
+        }
         switch (config.type) {
             case ConfigType.Boolean:
                 return [config.field, value === '1'];

package/dist/data/solver/backtrack/symbols/directionLinker.js

@@ -42,7 +42,6 @@ export default class DirectionLinkerBTModule extends BTModule {
             this.initialPositions = this.getInitialPositions();
         const tilesNeedCheck = IntArray2D.create(grid.width, grid.height);
         const ratings = [];
-        let checkable = false;
         for (const pos of this.initialPositions) {
             const tile = grid.isInBound(pos.x, pos.y)
                 ? grid.getTile(pos.x, pos.y)
@@ -53,6 +52,10 @@ export default class DirectionLinkerBTModule extends BTModule {
                     grid.getTile(oppoPos.x, oppoPos.y) === BTTile.NonExist)
                     return false;
                 else {
+                    if (grid.getTile(oppoPos.x, oppoPos.y) === BTTile.Empty) {
+                        tilesNeedCheck.set(oppoPos.x, oppoPos.y, 1);
+                        ratings.push({ pos: oppoPos, score: 1 });
+                    }
                     tilesNeedCheck.set(pos.x, pos.y, 1);
                     ratings.push({ pos, score: 1 });
                 }
@@ -69,20 +72,18 @@ export default class DirectionLinkerBTModule extends BTModule {
                 if (oppoPos !== null) {
                     const oppoTile = grid.getTile(oppoPos.x, oppoPos.y);
                     if (oppoTile === BTTile.Empty) {
-                        tilesNeedCheck.set(pos.x, pos.y, 1);
-                        ratings.push({ pos, score: 1 });
+                        tilesNeedCheck.set(oppoPos.x, oppoPos.y, 1);
+                        ratings.push({ pos: oppoPos, score: 1 });
                     }
                     else if (oppoTile === BTTile.NonExist)
                         return false;
-                    else
-                        checkable = true;
                 }
                 else {
                     return false;
                 }
             }
         }
-        if (!checkable) {
+        if (ratings.length > 0) {
             return { tilesNeedCheck, ratings };
         }
         const queue = this.initialPositions