scrabble-solver 2.8.5 → 2.8.7

package/packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "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.5"
+    "@scrabble-solver/constants": "^2.8.7"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/src/Board.ts

@@ -31,21 +31,21 @@ class Board {
     });
   }
 
-  public readonly rows: Cell[][];
+  public readonly columnsCount: number;
 
-  public readonly numberOfColumns: number;
+  public readonly rows: Cell[][];
 
-  public readonly numberOfRows: number;
+  public readonly rowsCount: number;
 
   constructor({ rows }: { rows: Cell[][] }) {
     this.rows = rows;
-    this.numberOfColumns = rows[0].length;
-    this.numberOfRows = rows.length;
+    this.columnsCount = rows[0].length;
+    this.rowsCount = rows.length;
   }
 
   public get center(): Cell {
-    const x = Math.floor(this.numberOfColumns / 2);
-    const y = Math.floor(this.numberOfRows / 2);
+    const x = Math.floor(this.columnsCount / 2);
+    const y = Math.floor(this.rowsCount / 2);
     return this.rows[y][x];
   }
 
@@ -59,7 +59,7 @@ class Board {
   }
 
   public collidesDown({ x, y }: Cell): boolean {
-    return y < this.numberOfRows - 1 && !this.rows[y + 1][x].isEmpty;
+    return y < this.rowsCount - 1 && !this.rows[y + 1][x].isEmpty;
   }
 
   public collidesLeft({ x, y }: Cell): boolean {
@@ -67,7 +67,7 @@ class Board {
   }
 
   public collidesRight({ x, y }: Cell): boolean {
-    return x < this.numberOfColumns - 1 && !this.rows[y][x + 1].isEmpty;
+    return x < this.columnsCount - 1 && !this.rows[y][x + 1].isEmpty;
   }
 
   public collidesUp({ x, y }: Cell): boolean {
@@ -76,8 +76,8 @@ class Board {
 
   public equals(other: Board): boolean {
     return (
-      this.numberOfColumns === other.numberOfColumns &&
-      this.numberOfRows === other.numberOfRows &&
+      this.columnsCount === other.columnsCount &&
+      this.rowsCount === other.rowsCount &&
       this.rows.every((row, rowIndex) => {
         return row.every((cell, cellIndex) => {
           return cell.equals(other.rows[rowIndex][cellIndex]);

package/packages/types/src/BoardJson.ts

@@ -1,5 +1,25 @@
-import CellJson from './CellJson';
+import CellJson, { isCellJson } from './CellJson';
 
-type BoardJson = (CellJson | null)[][];
+type BoardJson = CellJson[][];
+
+export const isBoardJson = (value: unknown): value is BoardJson => {
+  if (!Array.isArray(value)) {
+    return false;
+  }
+
+  for (const row of value) {
+    if (!Array.isArray(value)) {
+      return false;
+    }
+
+    for (const cell of row) {
+      if (!isCellJson(cell)) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+};
 
 export default BoardJson;

package/packages/types/src/Cell.ts

@@ -2,11 +2,7 @@ import CellJson from './CellJson';
 import Tile from './Tile';
 
 class Cell {
-  public static fromJson(json: CellJson | null): Cell {
-    if (!json) {
-      return Cell.Null;
-    }
-
+  public static fromJson(json: CellJson): Cell {
     return new Cell({
       isEmpty: json.isEmpty,
       tile: Tile.fromJson(json.tile),
@@ -15,19 +11,6 @@ class Cell {
     });
   }
 
-  public static readonly Null: Cell = Object.freeze({
-    isEmpty: true,
-    tile: Tile.Null,
-    x: 0,
-    y: 0,
-    clone: () => Cell.Null,
-    equals: (other: Cell) => other === Cell.Null,
-    hasTile: () => false,
-    isCandidate: () => false,
-    toString: () => '',
-    toJson: () => null,
-  });
-
   public readonly isEmpty: boolean;
 
   public tile: Tile;
@@ -65,7 +48,7 @@ class Cell {
     return this.isEmpty && this.hasTile();
   }
 
-  public toJson(): CellJson | null {
+  public toJson(): CellJson {
     return {
       isEmpty: this.isEmpty,
       tile: this.tile.toJson(),

package/packages/types/src/CellJson.ts

@@ -1,4 +1,5 @@
-import TileJson from './TileJson';
+import isObject from './isObject';
+import TileJson, { isTileJson } from './TileJson';
 
 interface CellJson {
   isEmpty: boolean;
@@ -7,4 +8,14 @@ interface CellJson {
   y: number;
 }
 
+export const isCellJson = (value: unknown): value is CellJson => {
+  return (
+    isObject(value) &&
+    typeof value.isEmpty === 'boolean' &&
+    (isTileJson(value.tile) || value.tile === null) &&
+    typeof value.x === 'number' &&
+    typeof value.y === 'number'
+  );
+};
+
 export default CellJson;

package/packages/types/src/Collision.ts

@@ -0,0 +1,5 @@
+import Cell from './Cell';
+
+type Collision = Cell[];
+
+export default Collision;

package/packages/types/src/CollisionJson.ts

@@ -0,0 +1,5 @@
+import CellJson from './CellJson';
+
+type CollisionJson = CellJson[];
+
+export default CollisionJson;

package/packages/types/src/Config.ts

@@ -38,6 +38,10 @@ class Config {
     return this.config.blankScore;
   }
 
+  public get blanksCount(): number {
+    return this.config.blanksCount;
+  }
+
   public get boardHeight(): number {
     return this.config.boardHeight;
   }
@@ -94,12 +98,8 @@ class Config {
     return typeof this.getTwoCharacterTileByPrefix(character) !== 'undefined';
   }
 
-  public get maximumNumberOfCharacters(): number {
-    return this.config.maximumNumberOfCharacters;
-  }
-
-  public get numberOfBlanks(): number {
-    return this.config.numberOfBlanks;
+  public get maximumCharactersCount(): number {
+    return this.config.maximumCharactersCount;
   }
 
   public get tiles(): TileConfig[] {

package/packages/types/src/ConfigJson.ts

@@ -4,13 +4,13 @@ import TileConfig from './TileConfig';
 interface ConfigJson {
   allTilesBonusScore: number;
   blankScore: number;
+  blanksCount: number;
   boardHeight: number;
   boardWidth: number;
   bonuses: BonusJson[];
   id: string;
-  maximumNumberOfCharacters: number;
+  maximumCharactersCount: number;
   name: string;
-  numberOfBlanks: number;
   tiles: TileConfig[];
 }
 

package/packages/types/src/Locale.ts

@@ -8,4 +8,8 @@ enum Locale {
   DE_DE = 'de-DE',
 }
 
+const locales = Object.values(Locale);
+
+export const isLocale = (locale: unknown): locale is Locale => locales.includes(locale as Locale);
+
 export default Locale;

package/packages/types/src/Pattern.ts

@@ -14,11 +14,10 @@ class Pattern {
   }
 
   public canBePlaced(config: Config): boolean {
-    const numberOfEmptyCells = this.getNumberOfEmptyCells();
-    const isNumberOfUsedCellsInRange =
-      numberOfEmptyCells >= 1 && numberOfEmptyCells <= config.maximumNumberOfCharacters;
+    const emptyCellsCount = this.getEmptyCellsCount();
+    const isUsedCellsCountInRange = emptyCellsCount >= 1 && emptyCellsCount <= config.maximumCharactersCount;
     return (
-      isNumberOfUsedCellsInRange &&
+      isUsedCellsCountInRange &&
       (this.hasAtLeast1NonEmptyCell() || this.collides() || (this.goesThroughBoardCenter() && this.board.isEmpty()))
     );
   }
@@ -38,7 +37,7 @@ class Pattern {
     return this.cells.findIndex((cell) => !cell.hasTile());
   }
 
-  public getNumberOfEmptyCells(): number {
+  public getEmptyCellsCount(): number {
     return this.cells.filter((cell) => cell.isEmpty).length;
   }
 

package/packages/types/src/PatternJson.ts

@@ -1,7 +1,7 @@
 import CellJson from './CellJson';
 
 interface PatternJson {
-  cells: (CellJson | null)[];
+  cells: CellJson[];
   collisions: PatternJson[];
   word: string;
 }

package/packages/types/src/Result.ts

@@ -4,33 +4,29 @@ import Cell from './Cell';
 import ResultJson from './ResultJson';
 import Tile from './Tile';
 
+type Collision = Cell[];
+
 class Result {
   public static fromJson(json: ResultJson): Result {
     return new Result({
-      cells: json.cells.map(Cell.fromJson),
       id: json.id,
-      numberOfCollisions: json.numberOfCollisions,
+      cells: json.cells.map(Cell.fromJson),
+      collisions: json.collisions.map((collision) => collision.map(Cell.fromJson)),
       points: json.points,
     });
   }
 
-  public readonly cells: Cell[];
-
-  public readonly id: number;
-
-  public readonly length: number;
-
-  public readonly numberOfBlanks: number;
+  public readonly blanksCount: number;
 
-  public readonly numberOfCollisions: number;
+  public readonly cells: Cell[];
 
-  public readonly numberOfConsonants: number;
+  public readonly collisions: Collision[];
 
-  public readonly numberOfTiles: number;
+  public readonly consonantsCount: number;
 
-  public readonly numberOfVowels: number;
+  public readonly id: number;
 
-  public readonly numberOfWords: number;
+  public readonly length: number;
 
   public readonly points: number;
 
@@ -40,41 +36,50 @@ class Result {
 
   public readonly tilesCharacters: string;
 
+  public readonly tilesCount: number;
+
+  public readonly vowelsCount: number;
+
   public readonly word: string;
 
+  public readonly words: string[];
+
+  public readonly wordsCount: number;
+
   constructor({
     cells,
     id,
-    numberOfCollisions,
+    collisions,
     points,
   }: {
     cells: Cell[];
     id: number;
-    numberOfCollisions: number;
+    collisions: Collision[];
     points: number;
   }) {
     const tiles = getTiles(cells);
+    this.blanksCount = getBlanks(tiles).length;
     this.cells = cells;
+    this.collisions = collisions;
+    this.consonantsCount = getConsonants(tiles).length;
     this.id = id;
     this.length = cells.length;
-    this.numberOfCollisions = numberOfCollisions;
-    this.numberOfConsonants = getConsonants(tiles).length;
-    this.numberOfBlanks = getBlanks(tiles).length;
-    this.numberOfTiles = tiles.length;
-    this.numberOfVowels = getVowels(tiles).length;
-    this.numberOfWords = 1 + this.numberOfCollisions;
     this.points = points;
     this.pointsRatio = getPointsRatio(tiles, points);
     this.tiles = tiles;
     this.tilesCharacters = getTilesCharacters(tiles);
+    this.tilesCount = tiles.length;
+    this.vowelsCount = getVowels(tiles).length;
     this.word = getWord(cells);
+    this.words = getWords(cells, collisions);
+    this.wordsCount = 1 + this.collisions.length;
   }
 
   public toJson(): ResultJson {
     return {
       cells: this.cells.map((cell) => cell.toJson()),
       id: this.id,
-      numberOfCollisions: this.numberOfCollisions,
+      collisions: this.collisions.map((collision) => collision.map((cell) => cell.toJson())),
       points: this.points,
     };
   }
@@ -100,6 +105,11 @@ const getTilesCharacters = (tiles: Tile[]): string => getNonBlankCharacters(tile
 
 const getWord = (cells: Cell[]): string => cells.map(String).join('');
 
+const getWords = (cells: Cell[], collisions: Collision[]): string[] => [
+  getWord(cells),
+  ...collisions.map((collision) => collision.map(String).join('')),
+];
+
 const isConsonant = ({ character, isBlank }: Tile): boolean => CONSONANTS.includes(character) && !isBlank;
 
 const isVowel = ({ character, isBlank }: Tile): boolean => VOWELS.includes(character) && !isBlank;

package/packages/types/src/ResultJson.ts

@@ -1,9 +1,10 @@
 import CellJson from './CellJson';
+import CollisionJson from './CollisionJson';
 
 interface ResultJson {
-  cells: (CellJson | null)[];
+  cells: CellJson[];
+  collisions: CollisionJson[];
   id: number;
-  numberOfCollisions: number;
   points: number;
 }
 

package/packages/types/src/TileJson.ts

@@ -1,6 +1,12 @@
+import isObject from './isObject';
+
 interface TileJson {
   character: string;
   isBlank: boolean;
 }
 
+export const isTileJson = (value: unknown): value is TileJson => {
+  return isObject(value) && typeof value.character === 'string' && typeof value.isBlank === 'boolean';
+};
+
 export default TileJson;

package/packages/types/src/index.ts

@@ -1,22 +1,25 @@
 export { default as Board } from './Board';
-export { default as BoardJson } from './BoardJson';
+export { default as BoardJson, isBoardJson } from './BoardJson';
 export { default as Bonus } from './Bonus';
 export { default as BonusJson } from './BonusJson';
 export { default as BonusValue } from './BonusValue';
 export { default as Cell } from './Cell';
-export { default as CellJson } from './CellJson';
+export { default as CellJson, isCellJson } from './CellJson';
 export { default as CharacterBonus } from './CharacterBonus';
+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 HorizontalPattern } from './HorizontalPattern';
-export { default as Locale } from './Locale';
+export { default as isObject } from './isObject';
+export { default as Locale, isLocale } from './Locale';
 export { default as Pattern } from './Pattern';
 export { default as PatternJson } from './PatternJson';
 export { default as Result } from './Result';
 export { default as ResultJson } from './ResultJson';
 export { default as Tile } from './Tile';
 export { default as TileConfig } from './TileConfig';
-export { default as TileJson } from './TileJson';
+export { default as TileJson, isTileJson } from './TileJson';
 export { default as VerticalPattern } from './VerticalPattern';
 export { default as WordBonus } from './WordBonus';
 export { default as WordDefinition } from './WordDefinition';

package/packages/types/src/isObject.ts

@@ -0,0 +1,5 @@
+const isObject = (value: unknown): value is Record<string, unknown> => {
+  return typeof value === 'object' && value !== null;
+};
+
+export default isObject;

package/packages/word-definitions/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.8.5",
+      "version": "2.8.7",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "description": "Scrabble Solver 2 - Word definitions",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/ node_modules/ package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.8.5",
+    "@scrabble-solver/types": "^2.8.7",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"

package/packages/word-lists/build/getDeDeWordList.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const lib_1 = require("./lib");
-const FILE_URL = 'https://raw.githubusercontent.com/HanSolo80/German-Dictionary/master/dictionary.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/enz/german-wordlist/master/words';
 const getDeDeWordList = async () => {
     return (0, lib_1.getTxtWordList)(FILE_URL);
 };

package/packages/word-lists/build/lib/extractWords.js

@@ -7,7 +7,10 @@ const findFirstWordIndex_1 = __importDefault(require("./findFirstWordIndex"));
 const extractWords = (file) => {
     const lines = file.replace(/\r/g, '').split('\n');
     const firstWordIndex = (0, findFirstWordIndex_1.default)(lines);
-    const words = lines.slice(firstWordIndex).filter(Boolean);
+    const words = lines
+        .slice(firstWordIndex)
+        .filter((word) => word.trim().length > 0)
+        .map((word) => word.toLocaleLowerCase());
     return words;
 };
 exports.default = extractWords;

package/packages/word-lists/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-lists",
-      "version": "2.8.5",
+      "version": "2.8.7",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",

package/packages/word-lists/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "description": "Scrabble Solver 2 - Word lists",
   "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/types": "^2.8.5",
+    "@scrabble-solver/types": "^2.8.7",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "memfs": "^3.4.7",

package/packages/word-lists/src/getDeDeWordList.ts

@@ -1,6 +1,6 @@
 import { getTxtWordList } from './lib';
 
-const FILE_URL = 'https://raw.githubusercontent.com/HanSolo80/German-Dictionary/master/dictionary.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/enz/german-wordlist/master/words';
 
 const getDeDeWordList = async (): Promise<string[]> => {
   return getTxtWordList(FILE_URL);

package/packages/word-lists/src/lib/extractWords.ts

@@ -3,7 +3,10 @@ import findFirstWordIndex from './findFirstWordIndex';
 const extractWords = (file: string): string[] => {
   const lines = file.replace(/\r/g, '').split('\n');
   const firstWordIndex = findFirstWordIndex(lines);
-  const words = lines.slice(firstWordIndex).filter(Boolean);
+  const words = lines
+    .slice(firstWordIndex)
+    .filter((word) => word.trim().length > 0)
+    .map((word) => word.toLocaleLowerCase());
   return words;
 };
 

package/packages/scrabble-solver/.next/static/TzKQ3IntkvaYmHBkWpfoi/_buildManifest.js

@@ -1 +0,0 @@
-self.__BUILD_MANIFEST=function(s,a,e){return{__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":[s,a,e,"static/css/3159cfe62ff742a3.css","static/chunks/pages/index-13ea7770a65c69ee.js"],"/404":[s,a,e,"static/chunks/pages/404-30c06e61d256c5b2.js"],"/_error":["static/chunks/pages/_error-a4ba2246ff8fb532.js"],sortedPages:["/","/404","/_app","/_error"]}}("static/chunks/758-f333b1dcdb941547.js","static/css/551d09cac435debb.css","static/chunks/56-2d34867599a0ac66.js"),self.__BUILD_MANIFEST_CB&&self.__BUILD_MANIFEST_CB();