@logic-pad/core 0.14.0 → 0.15.0

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

@@ -1231,6 +1231,7 @@ declare global {
     Orientation = 'orientation',
     OrientationToggle = 'orientationToggle',
     Tile = 'tile',
+    Shape = 'shape',
     Grid = 'grid',
     NullableGrid = 'nullableGrid',
     Icon = 'icon',
@@ -1295,6 +1296,10 @@ declare global {
     readonly type: ConfigType.Tile;
     readonly resizable: boolean;
   }
+  export interface ShapeConfig extends Config<GridData> {
+    readonly type: ConfigType.Shape;
+    readonly resizable: boolean;
+  }
   export interface GridConfig extends Config<GridData> {
     readonly type: ConfigType.Grid;
   }
@@ -1328,6 +1333,7 @@ declare global {
     | OrientationConfig
     | OrientationToggleConfig
     | TileConfig
+    | ShapeConfig
     | GridConfig
     | NullableGridConfig
     | IconConfig

package/dist/data/config.d.ts

@@ -15,6 +15,7 @@ export declare enum ConfigType {
     Orientation = "orientation",
     OrientationToggle = "orientationToggle",
     Tile = "tile",
+    Shape = "shape",
     Grid = "grid",
     NullableGrid = "nullableGrid",
     Icon = "icon",
@@ -79,6 +80,10 @@ export interface TileConfig extends Config<GridData> {
     readonly type: ConfigType.Tile;
     readonly resizable: boolean;
 }
+export interface ShapeConfig extends Config<GridData> {
+    readonly type: ConfigType.Shape;
+    readonly resizable: boolean;
+}
 export interface GridConfig extends Config<GridData> {
     readonly type: ConfigType.Grid;
 }
@@ -98,7 +103,7 @@ export interface NullableNoteConfig extends Config<string | null> {
 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 | 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 | SolvePathConfig;
 /**
  * Compare two config values for equality, using an appropriate method for the config type.
  *

package/dist/data/config.js

@@ -1,4 +1,5 @@
 import { DIRECTIONS, ORIENTATIONS, } from './primitives.js';
+import { normalizeShape, shapeEquals, tilesToShape } from './shapes.js';
 export var ConfigType;
 (function (ConfigType) {
     ConfigType["Boolean"] = "boolean";
@@ -14,6 +15,7 @@ export var ConfigType;
     ConfigType["Orientation"] = "orientation";
     ConfigType["OrientationToggle"] = "orientationToggle";
     ConfigType["Tile"] = "tile";
+    ConfigType["Shape"] = "shape";
     ConfigType["Grid"] = "grid";
     ConfigType["NullableGrid"] = "nullableGrid";
     ConfigType["Icon"] = "icon";
@@ -40,6 +42,11 @@ export function configEquals(type, a, b) {
     if (type === ConfigType.Tile || type === ConfigType.Grid) {
         return a.equals(b);
     }
+    if (type === ConfigType.Shape) {
+        const aShape = normalizeShape(tilesToShape(a.tiles));
+        const bShape = normalizeShape(tilesToShape(b.tiles));
+        return shapeEquals(aShape, bShape);
+    }
     if (type === ConfigType.NullableGrid) {
         if (a === null && b === null)
             return true;

package/dist/data/rules/banPatternRule.js

@@ -134,7 +134,7 @@ Object.defineProperty(BanPatternRule, "CONFIGS", {
     writable: true,
     value: Object.freeze([
         {
-            type: ConfigType.Tile,
+            type: ConfigType.Shape,
             default: BanPatternRule.EXAMPLE_GRID,
             resizable: true,
             field: 'pattern',

package/dist/data/rules/containsShapeRule.js

@@ -138,7 +138,7 @@ Object.defineProperty(ContainsShapeRule, "CONFIGS", {
             configurable: true,
         },
         {
-            type: ConfigType.Tile,
+            type: ConfigType.Shape,
             default: ContainsShapeRule.EXAMPLE_GRID_LIGHT,
             resizable: true,
             field: 'pattern',

package/dist/data/serializer/serializer_checksum.js

@@ -2,6 +2,7 @@ import { ConfigType, } from '../config.js';
 import SerializerV0, { orientationChars } from './serializer_v0.js';
 import { DIRECTIONS, ORIENTATIONS, } from '../primitives.js';
 import { escape } from '../dataHelper.js';
+import { normalizeShape, tilesToShape } from '../shapes.js';
 export default class SerializerChecksum extends SerializerV0 {
     constructor() {
         super(...arguments);
@@ -9,7 +10,7 @@ export default class SerializerChecksum extends SerializerV0 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 2
+            value: 3
         });
     }
     parseTile(_str) {
@@ -91,6 +92,13 @@ export default class SerializerChecksum extends SerializerV0 {
                 return (config.field +
                     '=' +
                     escape(this.stringifyGrid(instruction[config.field])));
+            case ConfigType.Shape:
+                return (config.field +
+                    '=' +
+                    escape(normalizeShape(tilesToShape(instruction[config.field].tiles))
+                        .elements.map(elm => `${elm.x}-${elm.y}-${elm.color}`)
+                        .sort()
+                        .join('/')));
             case ConfigType.NullableGrid:
                 return (config.field +
                     '=' +
@@ -137,6 +145,7 @@ export default class SerializerChecksum extends SerializerV0 {
     }
     stringifyRules(rules) {
         return `R${rules
+            .filter(rule => rule.necessaryForCompletion)
             .map(rule => this.stringifyRule(rule))
             .sort()
             .join(':')}`;
@@ -147,6 +156,7 @@ export default class SerializerChecksum extends SerializerV0 {
     stringifySymbols(symbols) {
         return `S${Array.from(symbols.values())
             .flat()
+            .filter(symbol => symbol.necessaryForCompletion)
             .map(symbol => this.stringifySymbol(symbol))
             .sort()
             .join(':')}`;

package/dist/data/serializer/serializer_v0.js

@@ -147,6 +147,7 @@ export default class SerializerV0 extends SerializerBase {
                         ? ''
                         : escape(String(instruction[config.field]))));
             case ConfigType.Tile:
+            case ConfigType.Shape:
             case ConfigType.Grid:
                 return (config.field +
                     '=' +
@@ -215,6 +216,7 @@ export default class SerializerV0 extends SerializerBase {
             case ConfigType.Icon:
                 return [config.field, unescape(value)];
             case ConfigType.Tile:
+            case ConfigType.Shape:
             case ConfigType.Grid:
                 return [config.field, this.parseGrid(unescape(value))];
             case ConfigType.NullableGrid:

package/dist/data/shapes.js

@@ -1,3 +1,5 @@
+import GridConnections from './gridConnections.js';
+import GridZones from './gridZones.js';
 import { Color } from './primitives.js';
 const colorIndex = {
     [Color.Dark]: 2,
@@ -129,5 +131,7 @@ export function sanitizePatternGrid(pattern, tileMapper = t => t) {
         : t.copyWith({ exists: true, color: Color.Gray, fixed: false })))))
         // strip all symbols and rules
         .withRules([])
-        .withSymbols(new Map()));
+        .withSymbols(new Map())
+        .withConnections(new GridConnections())
+        .withZones(new GridZones()));
 }

package/package.json

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