@scrabble-solver/types 2.8.7 → 2.8.9

package/build/Board.d.ts

@@ -22,6 +22,7 @@ declare class Board {
     getColumn(index: number): Cell[];
     getRow(index: number): Cell[];
     getTilesCount(): number;
+    getWords(): string[];
     isEmpty(): boolean;
     toJson(): BoardJson;
     toString(): string;

package/build/Board.js

@@ -79,6 +79,22 @@ class Board {
             return count + row.reduce((rowCount, cell) => (cell.hasTile() ? rowCount + 1 : rowCount), 0);
         }, 0);
     }
+    getWords() {
+        const columns = [];
+        for (let x = 0; x < this.columnsCount; ++x) {
+            const column = [];
+            for (let y = 0; y < this.rowsCount; ++y) {
+                column.push(this.rows[y][x]);
+            }
+            columns.push(column);
+        }
+        const columnsBoard = new Board({ rows: columns });
+        const lines = this.toString().split('\n').concat(columnsBoard.toString().split('\n'));
+        const words = lines
+            .flatMap((line) => line.replaceAll(/\s+/g, constants_1.EMPTY_CELL).split(' '))
+            .filter((word) => word.length > 1);
+        return words;
+    }
     isEmpty() {
         return this.rows.every((row) => row.every(({ isEmpty }) => isEmpty));
     }
@@ -86,7 +102,7 @@ class Board {
         return this.rows.map((row) => row.map((cell) => cell.toJson()));
     }
     toString() {
-        return this.rows.map((row) => row.map(String)).join('\n');
+        return this.rows.map((row) => row.map(String).join('')).join('\n');
     }
     updateCell(x, y, updateCell) {
         this.rows[y][x] = updateCell(this.rows[y][x]);

package/build/Config.js

@@ -64,7 +64,7 @@ class Config {
         return tile.isBlank ? this.blankScore : this.getCharacterPoints(tile.character);
     }
     hasCharacter(character) {
-        return this.alphabet.includes(character);
+        return character in this.pointsMap;
     }
     isTwoCharacterTilePrefix(character) {
         return typeof this.getTwoCharacterTileByPrefix(character) !== 'undefined';

package/build/FinalPattern.d.ts

@@ -0,0 +1,7 @@
+import Pattern from './Pattern';
+declare class FinalPattern extends Pattern {
+    private readonly collisions;
+    constructor(pattern: Pattern);
+    getCollisions(): Pattern[];
+}
+export default FinalPattern;

package/build/FinalPattern.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Pattern_1 = __importDefault(require("./Pattern"));
+class FinalPattern extends Pattern_1.default {
+    constructor(pattern) {
+        super(pattern.board, pattern.cells);
+        this.collisions = pattern.getCollisions();
+    }
+    getCollisions() {
+        return this.collisions;
+    }
+}
+exports.default = FinalPattern;

package/build/HorizontalPattern.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Pattern_1 = __importDefault(require("./Pattern"));
 class HorizontalPattern extends Pattern_1.default {
     clone() {
-        return new HorizontalPattern({
-            board: this.board,
-            cells: this.cells.map((cell) => cell.clone()),
-        });
+        return new HorizontalPattern(this.board, this.cells.map((cell) => cell.clone()));
     }
     getCollisions() {
         const collisions = [];
@@ -29,7 +26,7 @@ class HorizontalPattern extends Pattern_1.default {
             const nextCells = column.slice(cell.y + 1, y);
             const cells = [...previousCells, cell, ...nextCells];
             if (cells.length > 1) {
-                const pattern = new Pattern_1.default({ board: this.board, cells });
+                const pattern = new Pattern_1.default(this.board, cells);
                 collisions.push(pattern);
             }
         });

package/build/Pattern.d.ts

@@ -5,10 +5,7 @@ import PatternJson from './PatternJson';
 declare class Pattern {
     readonly board: Board;
     readonly cells: Cell[];
-    constructor({ board, cells }: {
-        board: Board;
-        cells: Cell[];
-    });
+    constructor(board: Board, cells: Cell[]);
     canBePlaced(config: Config): boolean;
     clone(): Pattern;
     collides(): boolean;

package/build/Pattern.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class Pattern {
-    constructor({ board, cells }) {
+    constructor(board, cells) {
         this.board = board;
         this.cells = cells;
     }
@@ -12,10 +12,7 @@ class Pattern {
             (this.hasAtLeast1NonEmptyCell() || this.collides() || (this.goesThroughBoardCenter() && this.board.isEmpty())));
     }
     clone() {
-        return new Pattern({
-            board: this.board,
-            cells: this.cells.map((cell) => cell.clone()),
-        });
+        return new Pattern(this.board, this.cells.map((cell) => cell.clone()));
     }
     collides() {
         return this.cells.some((cell) => cell.isEmpty && this.board.collides(cell));

package/build/Result.js

@@ -50,11 +50,9 @@ const getNonBlanks = (tiles) => tiles.filter(({ isBlank }) => !isBlank);
 const getPointsRatio = (tiles, points) => points / tiles.length;
 const getTiles = (cells) => cells.filter(({ isEmpty }) => isEmpty).map(({ tile }) => tile);
 const getTilesCharacters = (tiles) => getNonBlankCharacters(tiles).sort(charactersComparator).join('');
-const getWord = (cells) => cells.map(String).join('');
-const getWords = (cells, collisions) => [
-    getWord(cells),
-    ...collisions.map((collision) => collision.map(String).join('')),
-];
+// eslint-disable-next-line prefer-template
+const getWord = (cells) => cells.reduce((word, cell) => word + cell.toString(), '');
+const getWords = (cells, collisions) => [cells, ...collisions].map(getWord);
 const isConsonant = ({ character, isBlank }) => constants_1.CONSONANTS.includes(character) && !isBlank;
 const isVowel = ({ character, isBlank }) => constants_1.VOWELS.includes(character) && !isBlank;
 exports.default = Result;

package/build/Tile.d.ts

@@ -2,8 +2,8 @@ import TileJson from './TileJson';
 declare class Tile {
     static fromJson(json: TileJson | null): Tile;
     static readonly Null: Tile;
-    readonly character: string;
-    readonly isBlank: boolean;
+    character: string;
+    isBlank: boolean;
     constructor({ character, isBlank }: {
         character: string;
         isBlank?: boolean;

package/build/VerticalPattern.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Pattern_1 = __importDefault(require("./Pattern"));
 class VerticalPattern extends Pattern_1.default {
     clone() {
-        return new VerticalPattern({
-            board: this.board,
-            cells: this.cells.map((cell) => cell.clone()),
-        });
+        return new VerticalPattern(this.board, this.cells.map((cell) => cell.clone()));
     }
     getCollisions() {
         const collisions = [];
@@ -29,7 +26,7 @@ class VerticalPattern extends Pattern_1.default {
             const nextCells = row.slice(cell.x + 1, x);
             const cells = [...previousCells, cell, ...nextCells];
             if (cells.length > 1) {
-                const pattern = new Pattern_1.default({ board: this.board, cells });
+                const pattern = new Pattern_1.default(this.board, cells);
                 collisions.push(pattern);
             }
         });

package/build/index.d.ts

@@ -10,6 +10,7 @@ export { default as Collision } from './Collision';
 export { default as CollisionJson } from './CollisionJson';
 export { default as Config } from './Config';
 export { default as ConfigJson } from './ConfigJson';
+export { default as FinalPattern } from './FinalPattern';
 export { default as HorizontalPattern } from './HorizontalPattern';
 export { default as isObject } from './isObject';
 export { default as Locale, isLocale } from './Locale';

package/build/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WordDefinition = exports.WordBonus = exports.VerticalPattern = exports.isTileJson = exports.Tile = exports.Result = exports.Pattern = exports.isLocale = exports.Locale = exports.isObject = exports.HorizontalPattern = exports.Config = exports.CharacterBonus = exports.isCellJson = exports.Cell = exports.Bonus = exports.isBoardJson = exports.Board = void 0;
+exports.WordDefinition = exports.WordBonus = exports.VerticalPattern = exports.isTileJson = exports.Tile = exports.Result = exports.Pattern = exports.isLocale = exports.Locale = exports.isObject = exports.HorizontalPattern = exports.FinalPattern = exports.Config = exports.CharacterBonus = exports.isCellJson = exports.Cell = exports.Bonus = exports.isBoardJson = exports.Board = void 0;
 var Board_1 = require("./Board");
 Object.defineProperty(exports, "Board", { enumerable: true, get: function () { return __importDefault(Board_1).default; } });
 var BoardJson_1 = require("./BoardJson");
@@ -18,6 +18,8 @@ var CharacterBonus_1 = require("./CharacterBonus");
 Object.defineProperty(exports, "CharacterBonus", { enumerable: true, get: function () { return __importDefault(CharacterBonus_1).default; } });
 var Config_1 = require("./Config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return __importDefault(Config_1).default; } });
+var FinalPattern_1 = require("./FinalPattern");
+Object.defineProperty(exports, "FinalPattern", { enumerable: true, get: function () { return __importDefault(FinalPattern_1).default; } });
 var HorizontalPattern_1 = require("./HorizontalPattern");
 Object.defineProperty(exports, "HorizontalPattern", { enumerable: true, get: function () { return __importDefault(HorizontalPattern_1).default; } });
 var isObject_1 = require("./isObject");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.8.7",
+  "version": "2.8.9",
   "description": "Scrabble Solver 2 - Types",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,7 +24,7 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.8.7"
+    "@scrabble-solver/constants": "^2.8.9"
   },
-  "gitHead": "879bf9b68f27fa3d530d0582fd8fbbcd5c8b150b"
+  "gitHead": "8557cc2c5214e6689a5c59373b228b28f5dd8ed4"
 }

package/src/Board.ts

@@ -106,6 +106,28 @@ class Board {
     }, 0);
   }
 
+  public getWords(): string[] {
+    const columns: Cell[][] = [];
+
+    for (let x = 0; x < this.columnsCount; ++x) {
+      const column: Cell[] = [];
+
+      for (let y = 0; y < this.rowsCount; ++y) {
+        column.push(this.rows[y][x]);
+      }
+
+      columns.push(column);
+    }
+
+    const columnsBoard = new Board({ rows: columns });
+    const lines = this.toString().split('\n').concat(columnsBoard.toString().split('\n'));
+    const words = lines
+      .flatMap((line) => line.replaceAll(/\s+/g, EMPTY_CELL).split(' '))
+      .filter((word) => word.length > 1);
+
+    return words;
+  }
+
   public isEmpty(): boolean {
     return this.rows.every((row) => row.every(({ isEmpty }) => isEmpty));
   }
@@ -115,7 +137,7 @@ class Board {
   }
 
   public toString(): string {
-    return this.rows.map((row) => row.map(String)).join('\n');
+    return this.rows.map((row) => row.map(String).join('')).join('\n');
   }
 
   public updateCell(x: number, y: number, updateCell: (cell: Cell) => Cell): void {

package/src/Config.ts

@@ -91,7 +91,7 @@ class Config {
   }
 
   public hasCharacter(character: string): boolean {
-    return this.alphabet.includes(character);
+    return character in this.pointsMap;
   }
 
   public isTwoCharacterTilePrefix(character: string): boolean {

package/src/FinalPattern.ts

@@ -0,0 +1,16 @@
+import Pattern from './Pattern';
+
+class FinalPattern extends Pattern {
+  private readonly collisions: Pattern[];
+
+  constructor(pattern: Pattern) {
+    super(pattern.board, pattern.cells);
+    this.collisions = pattern.getCollisions();
+  }
+
+  public getCollisions(): Pattern[] {
+    return this.collisions;
+  }
+}
+
+export default FinalPattern;

package/src/HorizontalPattern.ts

@@ -2,10 +2,10 @@ import Pattern from './Pattern';
 
 class HorizontalPattern extends Pattern {
   public clone(): Pattern {
-    return new HorizontalPattern({
-      board: this.board,
-      cells: this.cells.map((cell) => cell.clone()),
-    });
+    return new HorizontalPattern(
+      this.board,
+      this.cells.map((cell) => cell.clone()),
+    );
   }
 
   public getCollisions(): Pattern[] {
@@ -27,7 +27,7 @@ class HorizontalPattern extends Pattern {
         const nextCells = column.slice(cell.y + 1, y);
         const cells = [...previousCells, cell, ...nextCells];
         if (cells.length > 1) {
-          const pattern = new Pattern({ board: this.board, cells });
+          const pattern = new Pattern(this.board, cells);
           collisions.push(pattern);
         }
       });

package/src/Pattern.ts

@@ -8,7 +8,7 @@ class Pattern {
 
   public readonly cells: Cell[];
 
-  constructor({ board, cells }: { board: Board; cells: Cell[] }) {
+  constructor(board: Board, cells: Cell[]) {
     this.board = board;
     this.cells = cells;
   }
@@ -23,10 +23,10 @@ class Pattern {
   }
 
   public clone(): Pattern {
-    return new Pattern({
-      board: this.board,
-      cells: this.cells.map((cell) => cell.clone()),
-    });
+    return new Pattern(
+      this.board,
+      this.cells.map((cell) => cell.clone()),
+    );
   }
 
   public collides(): boolean {

package/src/Result.ts

@@ -103,12 +103,10 @@ const getTiles = (cells: Cell[]): Tile[] => cells.filter(({ isEmpty }) => isEmpt
 
 const getTilesCharacters = (tiles: Tile[]): string => getNonBlankCharacters(tiles).sort(charactersComparator).join('');
 
-const getWord = (cells: Cell[]): string => cells.map(String).join('');
+// eslint-disable-next-line prefer-template
+const getWord = (cells: Cell[]): string => cells.reduce((word, cell) => word + cell.toString(), '');
 
-const getWords = (cells: Cell[], collisions: Collision[]): string[] => [
-  getWord(cells),
-  ...collisions.map((collision) => collision.map(String).join('')),
-];
+const getWords = (cells: Cell[], collisions: Collision[]): string[] => [cells, ...collisions].map(getWord);
 
 const isConsonant = ({ character, isBlank }: Tile): boolean => CONSONANTS.includes(character) && !isBlank;
 

package/src/Tile.ts

@@ -23,9 +23,9 @@ class Tile {
     toString: () => EMPTY_CELL,
   });
 
-  public readonly character: string;
+  public character: string;
 
-  public readonly isBlank: boolean;
+  public isBlank: boolean;
 
   constructor({ character, isBlank = false }: { character: string; isBlank?: boolean }) {
     this.character = character;

package/src/VerticalPattern.ts

@@ -2,10 +2,10 @@ import Pattern from './Pattern';
 
 class VerticalPattern extends Pattern {
   public clone(): Pattern {
-    return new VerticalPattern({
-      board: this.board,
-      cells: this.cells.map((cell) => cell.clone()),
-    });
+    return new VerticalPattern(
+      this.board,
+      this.cells.map((cell) => cell.clone()),
+    );
   }
 
   public getCollisions(): Pattern[] {
@@ -27,7 +27,7 @@ class VerticalPattern extends Pattern {
         const nextCells = row.slice(cell.x + 1, x);
         const cells = [...previousCells, cell, ...nextCells];
         if (cells.length > 1) {
-          const pattern = new Pattern({ board: this.board, cells });
+          const pattern = new Pattern(this.board, cells);
           collisions.push(pattern);
         }
       });

package/src/index.ts

@@ -10,6 +10,7 @@ export { default as Collision } from './Collision';
 export { default as CollisionJson } from './CollisionJson';
 export { default as Config } from './Config';
 export { default as ConfigJson } from './ConfigJson';
+export { default as FinalPattern } from './FinalPattern';
 export { default as HorizontalPattern } from './HorizontalPattern';
 export { default as isObject } from './isObject';
 export { default as Locale, isLocale } from './Locale';