@scrabble-solver/solver 2.5.0 → 2.7.0

package/build/PatternsFiller.js

@@ -20,6 +20,7 @@ var __spread = (this && this.__spread) || function () {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var constants_1 = require("@scrabble-solver/constants");
 var types_1 = require("@scrabble-solver/types");
 var PatternsFiller = /** @class */ (function () {
     function PatternsFiller(config, trie) {
@@ -53,8 +54,9 @@ var PatternsFiller = /** @class */ (function () {
                 var previousTile = pattern.cells[indexOfFirstCellWithoutTile].tile;
                 pattern.cells[indexOfFirstCellWithoutTile].tile = tile;
                 var indexOfNextCellWithoutTile = pattern.getIndexOfFirstCellWithoutTile();
-                var newWordPrefix = word.substring(0, indexOfFirstCellWithoutTile) + tile.character;
-                var newWord = newWordPrefix + word.substring(indexOfFirstCellWithoutTile + 1);
+                var indexOfFirstEmptyLetter = word.indexOf(constants_1.EMPTY_CELL);
+                var newWordPrefix = word.substring(0, indexOfFirstEmptyLetter) + tile.character;
+                var newWord = newWordPrefix + word.substring(indexOfFirstEmptyLetter + 1);
                 if (indexOfNextCellWithoutTile === -1) {
                     if (this.canAddPattern(pattern, newWord)) {
                         onPatternFound(pattern.clone());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -11,7 +11,7 @@
   "author": {
     "name": "Kamil Mielnik",
     "email": "kamil.adam.mielnik@gmail.com",
-    "url": "http://kamilmielnik.com/"
+    "url": "https://kamilmielnik.com/"
   },
   "license": "CC-BY-NC-ND-4.0",
   "bugs": {
@@ -25,14 +25,14 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^1.0.3",
-    "@scrabble-solver/types": "^2.5.0",
+    "@scrabble-solver/types": "^2.7.0",
     "lodash": "^4.17.20"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.5.0",
-    "@scrabble-solver/constants": "^2.5.0",
-    "@scrabble-solver/dictionaries": "^2.5.0",
+    "@scrabble-solver/configs": "^2.7.0",
+    "@scrabble-solver/constants": "^2.7.0",
+    "@scrabble-solver/dictionaries": "^2.7.0",
     "@types/lodash": "^4.14.168"
   },
-  "gitHead": "e698e6466c1872c2c325cfce1585f3e22892e633"
+  "gitHead": "db0e2eab74ee597f70df456444312241f2646f9e"
 }

package/src/PatternsFiller.ts

@@ -1,4 +1,5 @@
 import { Trie } from '@kamilmielnik/trie';
+import { EMPTY_CELL } from '@scrabble-solver/constants';
 import { Config, Pattern, Tile } from '@scrabble-solver/types';
 
 class PatternsFiller {
@@ -48,8 +49,9 @@ class PatternsFiller {
         const previousTile = pattern.cells[indexOfFirstCellWithoutTile].tile;
         pattern.cells[indexOfFirstCellWithoutTile].tile = tile;
         const indexOfNextCellWithoutTile = pattern.getIndexOfFirstCellWithoutTile();
-        const newWordPrefix = word.substring(0, indexOfFirstCellWithoutTile) + tile.character;
-        const newWord = newWordPrefix + word.substring(indexOfFirstCellWithoutTile + 1);
+        const indexOfFirstEmptyLetter = word.indexOf(EMPTY_CELL);
+        const newWordPrefix = word.substring(0, indexOfFirstEmptyLetter) + tile.character;
+        const newWord = newWordPrefix + word.substring(indexOfFirstEmptyLetter + 1);
         if (indexOfNextCellWithoutTile === -1) {
           if (this.canAddPattern(pattern, newWord)) {
             onPatternFound(pattern.clone());

package/src/Solver.test.ts

@@ -1,13 +1,21 @@
-import { literaki } from '@scrabble-solver/configs';
+import { literaki, scrabble } from '@scrabble-solver/configs';
 import { dictionaries } from '@scrabble-solver/dictionaries';
-import { Board, Locale, Tile } from '@scrabble-solver/types';
+import { Board, Locale, Result, Tile } from '@scrabble-solver/types';
 
 import Solver from './Solver';
 
-const generateTiles = (characters: string): Tile[] =>
-  characters.split('').map((character) => new Tile({ character, isBlank: false }));
+const generateTiles = (characters: string[]): Tile[] => {
+  return characters.map((character) => new Tile({ character, isBlank: false }));
+};
 
-describe('Solver', () => {
+const getBestResult = ([firstResult, ...results]: Result[]): Result => {
+  return results.reduce(
+    (bestResultCandidate, result) => (result.points > bestResultCandidate.points ? result : bestResultCandidate),
+    firstResult,
+  );
+};
+
+describe('Solver - PL', () => {
   const locale = Locale.PL_PL;
   const config = literaki[locale];
   let solver: Solver | undefined;
@@ -36,9 +44,9 @@ describe('Solver', () => {
       '               ',
       '               ',
     ]);
-    const tiles = generateTiles('lino');
+    const tiles = generateTiles(['l', 'i', 'n', 'o']);
     const results = solver!.solve(board, tiles);
-    expect(results.length).toBe(60);
+    expect(results.length).toBe(61);
   });
 
   it('zmartwychwstałą x9', () => {
@@ -59,12 +67,9 @@ describe('Solver', () => {
       '               ',
       '               ',
     ]);
-    const tiles = generateTiles('aaąrtwz');
-    const [firstResult, ...results] = solver!.solve(board, tiles);
-    const bestResult = results.reduce(
-      (bestResultCandidate, result) => (result.points > bestResultCandidate.points ? result : bestResultCandidate),
-      firstResult,
-    );
+    const tiles = generateTiles(['a', 'a', 'ą', 'r', 't', 'w', 'z']);
+    const results = solver!.solve(board, tiles);
+    const bestResult = getBestResult(results);
     expect(bestResult.word).toBe('zmartwychwstałą');
     expect(bestResult.points).toBe(682);
   });
@@ -87,13 +92,47 @@ describe('Solver', () => {
       'da do    ot    ',
       'ar  ń    m     ',
     ]);
-    const tiles = generateTiles('ąchtwwz');
-    const [firstResult, ...results] = solver!.solve(board, tiles);
-    const bestResult = results.reduce(
-      (bestResultCandidate, result) => (result.points > bestResultCandidate.points ? result : bestResultCandidate),
-      firstResult,
-    );
+    const tiles = generateTiles(['ą', 'c', 'h', 't', 'w', 'w', 'z']);
+    const results = solver!.solve(board, tiles);
+    const bestResult = getBestResult(results);
     expect(bestResult.word).toBe('zmartwychwstałą');
     expect(bestResult.points).toBe(1157);
   });
 });
+
+describe('Solver - ES', () => {
+  const locale = Locale.ES_ES;
+  const config = scrabble[locale];
+  let solver: Solver | undefined;
+
+  beforeAll(() => {
+    return dictionaries.get(locale).then((trie) => {
+      solver = new Solver(config, trie);
+    });
+  });
+
+  it('llana', () => {
+    const board = Board.fromStringArray([
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+    ]);
+    const tiles = generateTiles(['ll', 'a', 'n', 'a']);
+    const results = solver!.solve(board, tiles);
+    const bestResult = getBestResult(results);
+    expect(results.length).toBe(24);
+    expect(bestResult.points).toBe(22);
+  });
+});