@scrabble-solver/solver 2.13.10 → 2.13.11

package/build/generateHorizontalPatterns.js

@@ -8,8 +8,7 @@ const generatePattern_1 = __importDefault(require("./generatePattern"));
 const generateVectors_1 = __importDefault(require("./generateVectors"));
 const generateHorizontalPatterns = (config, board) => {
     const getNthVector = (index) => board.getRow(index);
-    const vectorsCount = config.boardHeight;
-    const horizontalVectors = (0, generateVectors_1.default)({ getNthVector, vectorsCount });
+    const horizontalVectors = (0, generateVectors_1.default)({ getNthVector, vectorsCount: config.boardSize });
     const horizontalPatterns = horizontalVectors.flatMap((cells) => {
         return (0, generatePattern_1.default)({ board, config, PatternModel: types_1.HorizontalPattern, cells });
     });

package/build/generateVerticalPatterns.js

@@ -8,8 +8,7 @@ const generatePattern_1 = __importDefault(require("./generatePattern"));
 const generateVectors_1 = __importDefault(require("./generateVectors"));
 const generateVerticalPatterns = (config, board) => {
     const getNthVector = (index) => board.getColumn(index);
-    const vectorsCount = config.boardWidth;
-    const verticalVectors = (0, generateVectors_1.default)({ getNthVector, vectorsCount });
+    const verticalVectors = (0, generateVectors_1.default)({ getNthVector, vectorsCount: config.boardSize });
     const verticalPatterns = verticalVectors.flatMap((cells) => {
         return (0, generatePattern_1.default)({ board, config, PatternModel: types_1.VerticalPattern, cells });
     });

package/build/getPatternScore.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const getCellsScore_1 = __importDefault(require("./getCellsScore"));
 const getPatternScore = (config, pattern) => {
-    const areAllTilesUsed = pattern.getEmptyCellsCount() === config.maximumCharactersCount;
-    const bonusScore = areAllTilesUsed ? config.allTilesBonusScore : 0;
+    const areAllTilesUsed = pattern.getEmptyCellsCount() === config.rackSize;
+    const bonusScore = areAllTilesUsed ? config.bingoScore : 0;
     const score = pattern
         .getCollisions()
         .reduce((sum, collision) => sum + (0, getCellsScore_1.default)(config, collision.cells), (0, getCellsScore_1.default)(config, pattern.cells));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.13.10",
+  "version": "2.13.11",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^3.0.0",
-    "@scrabble-solver/types": "^2.13.10"
+    "@scrabble-solver/types": "^2.13.11"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.13.10",
-    "@scrabble-solver/constants": "^2.13.10",
-    "@scrabble-solver/dictionaries": "^2.13.10"
+    "@scrabble-solver/configs": "^2.13.11",
+    "@scrabble-solver/constants": "^2.13.11",
+    "@scrabble-solver/dictionaries": "^2.13.11"
   },
-  "gitHead": "ebc7207c650ab1fdbb0bca3df53a445eaa6de268"
+  "gitHead": "1b418c5dadc1ff365839cd7825f57eb6d182a815"
 }

package/src/generateHorizontalPatterns.test.ts

@@ -6,9 +6,8 @@ import generateHorizontalPatterns from './generateHorizontalPatterns';
 const board = Board.fromStringArray([' t ', 'do ', '   ']);
 
 const config = {
-  boardHeight: 3,
-  boardWidth: 3,
-  maximumCharactersCount: 7,
+  boardSize: 3,
+  rackSize: 7,
 } as Config;
 
 describe('generateHorizontalPatterns', () => {

package/src/generateHorizontalPatterns.ts

@@ -5,8 +5,7 @@ import generateVectors from './generateVectors';
 
 const generateHorizontalPatterns = (config: Config, board: Board): Pattern[] => {
   const getNthVector = (index: number) => board.getRow(index);
-  const vectorsCount = config.boardHeight;
-  const horizontalVectors = generateVectors({ getNthVector, vectorsCount });
+  const horizontalVectors = generateVectors({ getNthVector, vectorsCount: config.boardSize });
   const horizontalPatterns = horizontalVectors.flatMap((cells) => {
     return generatePattern({ board, config, PatternModel: HorizontalPattern, cells });
   });

package/src/generatePatterns.test.ts

@@ -6,7 +6,7 @@ import generatePatterns from './generatePatterns';
 describe('generatePatterns', () => {
   it('Generates all patterns for an empty board', () => {
     const config = getConfig(Game.Scrabble, Locale.EN_US);
-    const board = Board.create(config.boardWidth, config.boardHeight);
+    const board = Board.create(config.boardSize);
 
     expect(generatePatterns(config, board).length).toEqual(54);
   });

package/src/generateVerticalPatterns.test.ts

@@ -6,9 +6,8 @@ import generateVerticalPatterns from './generateVerticalPatterns';
 const board = Board.fromStringArray([' t ', 'do ', '   ']);
 
 const config = {
-  boardHeight: 3,
-  boardWidth: 3,
-  maximumCharactersCount: 7,
+  boardSize: 3,
+  rackSize: 7,
 } as Config;
 
 describe('generateVerticalPatterns', () => {

package/src/generateVerticalPatterns.ts

@@ -5,8 +5,7 @@ import generateVectors from './generateVectors';
 
 const generateVerticalPatterns = (config: Config, board: Board): Pattern[] => {
   const getNthVector = (index: number) => board.getColumn(index);
-  const vectorsCount = config.boardWidth;
-  const verticalVectors = generateVectors({ getNthVector, vectorsCount });
+  const verticalVectors = generateVectors({ getNthVector, vectorsCount: config.boardSize });
   const verticalPatterns = verticalVectors.flatMap((cells) => {
     return generatePattern({ board, config, PatternModel: VerticalPattern, cells });
   });

package/src/getPatternScore.ts

@@ -3,8 +3,8 @@ import { Config, Pattern } from '@scrabble-solver/types';
 import getCellsScore from './getCellsScore';
 
 const getPatternScore = (config: Config, pattern: Pattern) => {
-  const areAllTilesUsed = pattern.getEmptyCellsCount() === config.maximumCharactersCount;
-  const bonusScore = areAllTilesUsed ? config.allTilesBonusScore : 0;
+  const areAllTilesUsed = pattern.getEmptyCellsCount() === config.rackSize;
+  const bonusScore = areAllTilesUsed ? config.bingoScore : 0;
   const score = pattern
     .getCollisions()
     .reduce((sum, collision) => sum + getCellsScore(config, collision.cells), getCellsScore(config, pattern.cells));