scrabble-solver 2.8.9 → 2.8.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. package/.eslintrc.js +3 -1
  2. package/lerna.json +1 -1
  3. package/package.json +12 -12
  4. package/packages/configs/package.json +3 -3
  5. package/packages/constants/package.json +1 -1
  6. package/packages/dictionaries/package-lock.json +9 -9
  7. package/packages/dictionaries/package.json +5 -5
  8. package/packages/logger/package-lock.json +2 -2
  9. package/packages/logger/package.json +1 -1
  10. package/packages/scrabble-solver/.next/BUILD_ID +1 -1
  11. package/packages/scrabble-solver/.next/build-manifest.json +10 -10
  12. package/packages/scrabble-solver/.next/cache/.tsbuildinfo +1 -1
  13. package/packages/scrabble-solver/.next/cache/eslint/.cache_8dgz12 +1 -1
  14. package/packages/scrabble-solver/.next/cache/next-server.js.nft.json +1 -1
  15. package/packages/scrabble-solver/.next/cache/webpack/client-production/0.pack +0 -0
  16. package/packages/scrabble-solver/.next/cache/webpack/client-production/index.pack +0 -0
  17. package/packages/scrabble-solver/.next/cache/webpack/server-production/0.pack +0 -0
  18. package/packages/scrabble-solver/.next/cache/webpack/server-production/index.pack +0 -0
  19. package/packages/scrabble-solver/.next/next-server.js.nft.json +1 -1
  20. package/packages/scrabble-solver/.next/prerender-manifest.json +1 -1
  21. package/packages/scrabble-solver/.next/routes-manifest.json +1 -1
  22. package/packages/scrabble-solver/.next/server/chunks/413.js +181 -39
  23. package/packages/scrabble-solver/.next/server/chunks/429.js +2 -13
  24. package/packages/scrabble-solver/.next/server/chunks/515.js +408 -227
  25. package/packages/scrabble-solver/.next/server/chunks/911.js +25 -3
  26. package/packages/scrabble-solver/.next/server/middleware-build-manifest.js +1 -1
  27. package/packages/scrabble-solver/.next/server/pages/404.html +2 -2
  28. package/packages/scrabble-solver/.next/server/pages/404.js.nft.json +1 -1
  29. package/packages/scrabble-solver/.next/server/pages/500.html +2 -2
  30. package/packages/scrabble-solver/.next/server/pages/_app.js.nft.json +1 -1
  31. package/packages/scrabble-solver/.next/server/pages/_document.js.nft.json +1 -1
  32. package/packages/scrabble-solver/.next/server/pages/_error.js.nft.json +1 -1
  33. package/packages/scrabble-solver/.next/server/pages/api/solve.js +52 -19
  34. package/packages/scrabble-solver/.next/server/pages/index.html +3 -3
  35. package/packages/scrabble-solver/.next/server/pages/index.js +1 -1
  36. package/packages/scrabble-solver/.next/server/pages/index.js.nft.json +1 -1
  37. package/packages/scrabble-solver/.next/server/pages/index.json +1 -1
  38. package/packages/scrabble-solver/.next/static/A8A_Lmg8cM-Bkf-Jo1CLh/_buildManifest.js +1 -0
  39. package/packages/scrabble-solver/.next/static/{yCxjzzYpw5JjJE53PO_s6 → A8A_Lmg8cM-Bkf-Jo1CLh}/_ssgManifest.js +0 -0
  40. package/packages/scrabble-solver/.next/static/chunks/317-95ab9051449362fa.js +1 -0
  41. package/packages/scrabble-solver/.next/static/chunks/758-eff80059a1365d5d.js +1 -0
  42. package/packages/scrabble-solver/.next/static/chunks/pages/_app-0e358b5622cf9e66.js +1 -0
  43. package/packages/scrabble-solver/.next/static/chunks/pages/index-0cc5e6eda5adac73.js +1 -0
  44. package/packages/scrabble-solver/.next/static/css/9ac903004135f4b1.css +1 -0
  45. package/packages/scrabble-solver/.next/trace +42 -42
  46. package/packages/scrabble-solver/package-lock.json +298 -298
  47. package/packages/scrabble-solver/package.json +11 -11
  48. package/packages/scrabble-solver/src/components/Badge/Badge.module.scss +1 -1
  49. package/packages/scrabble-solver/src/components/Board/Board.tsx +4 -2
  50. package/packages/scrabble-solver/src/components/Board/BoardPure.tsx +25 -5
  51. package/packages/scrabble-solver/src/components/Board/hooks/useGrid.ts +212 -91
  52. package/packages/scrabble-solver/src/components/Dictionary/Dictionary.tsx +8 -1
  53. package/packages/scrabble-solver/src/components/Rack/Rack.tsx +51 -11
  54. package/packages/scrabble-solver/src/components/Rack/RackTile.tsx +33 -16
  55. package/packages/scrabble-solver/src/components/Results/Results.tsx +19 -3
  56. package/packages/scrabble-solver/src/components/SquareButton/Link.tsx +1 -1
  57. package/packages/scrabble-solver/src/components/Tile/Tile.module.scss +4 -0
  58. package/packages/scrabble-solver/src/components/Tile/Tile.tsx +13 -4
  59. package/packages/scrabble-solver/src/components/Tile/TilePure.tsx +3 -4
  60. package/packages/scrabble-solver/src/lib/extractCharacters.ts +26 -0
  61. package/packages/scrabble-solver/src/lib/extractInputValue.ts +17 -0
  62. package/packages/scrabble-solver/src/lib/index.ts +2 -0
  63. package/packages/scrabble-solver/src/lib/isCtrl.ts +1 -1
  64. package/packages/scrabble-solver/src/lib/memoize.ts +15 -1
  65. package/packages/scrabble-solver/src/pages/api/solve.ts +1 -1
  66. package/packages/scrabble-solver/src/sdk/fetchJson.ts +36 -0
  67. package/packages/scrabble-solver/src/sdk/findWordDefinitions.ts +4 -3
  68. package/packages/scrabble-solver/src/sdk/solve.ts +8 -7
  69. package/packages/scrabble-solver/src/sdk/verify.ts +5 -6
  70. package/packages/scrabble-solver/src/state/sagas.ts +3 -3
  71. package/packages/scrabble-solver/src/state/selectors.ts +9 -1
  72. package/packages/scrabble-solver/src/state/slices/dictionaryInitialState.ts +10 -2
  73. package/packages/scrabble-solver/src/state/slices/dictionarySlice.ts +10 -16
  74. package/packages/scrabble-solver/src/state/slices/rackSlice.ts +7 -0
  75. package/packages/scrabble-solver/src/state/slices/solveInitialState.ts +14 -2
  76. package/packages/scrabble-solver/src/state/slices/solveSlice.ts +7 -4
  77. package/packages/scrabble-solver/src/types/index.ts +2 -0
  78. package/packages/solver/build/generateEndIndices.js +11 -4
  79. package/packages/solver/build/generateStartIndices.js +10 -4
  80. package/packages/solver/build/generateVectors.d.ts +3 -2
  81. package/packages/solver/build/generateVectors.js +2 -4
  82. package/packages/solver/build/solve.d.ts +2 -2
  83. package/packages/solver/build/solve.js +3 -4
  84. package/packages/solver/package-lock.json +9 -9
  85. package/packages/solver/package.json +6 -6
  86. package/packages/solver/src/generateEndIndices.test.ts +5 -0
  87. package/packages/solver/src/generateEndIndices.ts +15 -4
  88. package/packages/solver/src/generateStartIndices.test.ts +5 -0
  89. package/packages/solver/src/generateStartIndices.ts +13 -4
  90. package/packages/solver/src/generateVectors.ts +5 -8
  91. package/packages/solver/src/solve.test.ts +3 -3
  92. package/packages/solver/src/solve.ts +9 -11
  93. package/packages/types/build/Board.js +2 -2
  94. package/packages/types/build/index.d.ts +1 -0
  95. package/packages/types/build/index.js +3 -1
  96. package/packages/types/build/isError.d.ts +2 -0
  97. package/packages/types/build/isError.js +13 -0
  98. package/packages/types/package.json +2 -2
  99. package/packages/types/src/Board.ts +2 -2
  100. package/packages/types/src/index.ts +1 -0
  101. package/packages/types/src/isError.ts +11 -0
  102. package/packages/word-definitions/package-lock.json +8 -8
  103. package/packages/word-definitions/package.json +2 -2
  104. package/packages/word-lists/package-lock.json +2 -2
  105. package/packages/word-lists/package.json +2 -2
  106. package/packages/scrabble-solver/.next/static/chunks/317-a33dd38e9b9a17ed.js +0 -1
  107. package/packages/scrabble-solver/.next/static/chunks/758-f333b1dcdb941547.js +0 -1
  108. package/packages/scrabble-solver/.next/static/chunks/pages/_app-f8f360878e1c2aff.js +0 -1
  109. package/packages/scrabble-solver/.next/static/chunks/pages/index-ecea697d3e5d8a6f.js +0 -1
  110. package/packages/scrabble-solver/.next/static/css/64dc2ce1811912f1.css +0 -1
  111. package/packages/scrabble-solver/.next/static/yCxjzzYpw5JjJE53PO_s6/_buildManifest.js +0 -1
@@ -14,27 +14,21 @@ const dictionarySlice = createSlice({
14
14
  reset: () => dictionaryInitialState,
15
15
 
16
16
  submit: (state) => {
17
- return {
18
- ...state,
19
- isLoading: true,
20
- results: dictionaryInitialState.results,
21
- };
17
+ const error = dictionaryInitialState.error;
18
+ const results = dictionaryInitialState.results;
19
+ return { ...state, error, isLoading: true, results };
22
20
  },
23
21
 
24
- submitFailure: (state) => {
25
- return {
26
- ...state,
27
- isLoading: false,
28
- results: dictionaryInitialState.results,
29
- };
22
+ submitFailure: (state, action: PayloadAction<unknown>) => {
23
+ const error = action.payload;
24
+ const results = dictionaryInitialState.results;
25
+ return { ...state, error, isLoading: false, results };
30
26
  },
31
27
 
32
28
  submitSuccess: (state, action: PayloadAction<WordDefinition[]>) => {
33
- return {
34
- ...state,
35
- isLoading: false,
36
- results: action.payload,
37
- };
29
+ const error = dictionaryInitialState.error;
30
+ const results = action.payload;
31
+ return { ...state, error, isLoading: false, results };
38
32
  },
39
33
  },
40
34
  });
@@ -19,6 +19,13 @@ const rackSlice = createSlice({
19
19
  return [...state.slice(0, index), character, ...state.slice(index + 1)];
20
20
  },
21
21
 
22
+ changeCharacters: (state, action: PayloadAction<{ characters: (string | null)[]; index: number }>) => {
23
+ const { characters, index } = action.payload;
24
+ const expectedRackLength = state.length;
25
+ const rack = [...state.slice(0, index), ...characters, ...state.slice(index + characters.length)];
26
+ return rack.slice(0, expectedRackLength);
27
+ },
28
+
22
29
  groupTiles: (state, action: PayloadAction<'left' | 'right' | null>) => {
23
30
  const direction = action.payload;
24
31
 
@@ -1,10 +1,22 @@
1
+ import { Board } from '@scrabble-solver/types';
2
+
1
3
  import boardInitialState from './boardInitialState';
2
4
 
3
- const solveInitialState = {
5
+ interface SolveInitialState {
6
+ error: unknown | undefined;
7
+ isLoading: boolean;
8
+ lastSolvedParameters: {
9
+ board: Board;
10
+ characters: string[];
11
+ };
12
+ }
13
+
14
+ const solveInitialState: SolveInitialState = {
15
+ error: undefined,
4
16
  isLoading: false,
5
17
  lastSolvedParameters: {
6
18
  board: boardInitialState,
7
- characters: [] as string[],
19
+ characters: [],
8
20
  },
9
21
  };
10
22
 
@@ -13,16 +13,19 @@ const solveSlice = createSlice({
13
13
  name: 'solve',
14
14
  reducers: {
15
15
  submit: (state) => {
16
- return { ...state, isLoading: true };
16
+ const error = solveInitialState.error;
17
+ return { ...state, error, isLoading: true };
17
18
  },
18
19
 
19
- submitFailure: (state) => {
20
- return { ...state, isLoading: false };
20
+ submitFailure: (state, action: PayloadAction<unknown>) => {
21
+ const error = action.payload;
22
+ return { ...state, error, isLoading: false };
21
23
  },
22
24
 
23
25
  submitSuccess: (state, action: PayloadAction<SolveParameters>) => {
26
+ const error = solveInitialState.error;
24
27
  const lastSolvedParameters = action.payload;
25
- return { ...state, isLoading: false, lastSolvedParameters };
28
+ return { ...state, error, isLoading: false, lastSolvedParameters };
26
29
  },
27
30
  },
28
31
  });
@@ -1,5 +1,7 @@
1
1
  export type Comparator<T> = (a: T, B: T) => number;
2
2
 
3
+ export type Direction = 'horizontal' | 'vertical';
4
+
3
5
  export enum SortDirection {
4
6
  Ascending = 'ascending',
5
7
  Descending = 'descending',
@@ -1,9 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const generateEndIndices = (cells, startIndex) => {
4
- return Array(cells.length - startIndex - 1)
5
- .fill(0)
6
- .map((_, endIndex) => endIndex + startIndex + 1)
7
- .filter((endIndex) => endIndex >= cells.length - 1 || !cells[endIndex + 1].hasTile());
4
+ if (cells.length === 0) {
5
+ return [];
6
+ }
7
+ const endIndices = [];
8
+ for (let endIndex = startIndex + 1; endIndex < cells.length - 1; ++endIndex) {
9
+ if (!cells[endIndex + 1].hasTile()) {
10
+ endIndices.push(endIndex);
11
+ }
12
+ }
13
+ endIndices.push(cells.length - 1);
14
+ return endIndices;
8
15
  };
9
16
  exports.default = generateEndIndices;
@@ -1,9 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const generateStartIndices = (cells) => {
4
- return Array(cells.length - 1)
5
- .fill(0)
6
- .map((_, startIndex) => startIndex)
7
- .filter((startIndex) => startIndex === 0 || !cells[startIndex - 1].hasTile());
4
+ if (cells.length === 0) {
5
+ return [];
6
+ }
7
+ const startIndices = [0];
8
+ for (let startIndex = 1; startIndex < cells.length - 1; ++startIndex) {
9
+ if (!cells[startIndex - 1].hasTile()) {
10
+ startIndices.push(startIndex);
11
+ }
12
+ }
13
+ return startIndices;
8
14
  };
9
15
  exports.default = generateStartIndices;
@@ -1,6 +1,7 @@
1
1
  import { Cell } from '@scrabble-solver/types';
2
- declare const generateVectors: ({ getNthVector, vectorsCount, }: {
2
+ interface Parameters {
3
3
  getNthVector: (index: number) => Cell[];
4
4
  vectorsCount: number;
5
- }) => Cell[][];
5
+ }
6
+ declare const generateVectors: ({ getNthVector, vectorsCount }: Parameters) => Cell[][];
6
7
  export default generateVectors;
@@ -1,8 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const generateVectors = ({ getNthVector, vectorsCount, }) => {
4
- return Array(vectorsCount)
5
- .fill(0)
6
- .map((_, index) => getNthVector(index));
3
+ const generateVectors = ({ getNthVector, vectorsCount }) => {
4
+ return Array.from({ length: vectorsCount }, (_, index) => getNthVector(index));
7
5
  };
8
6
  exports.default = generateVectors;
@@ -1,4 +1,4 @@
1
1
  import { Trie } from '@kamilmielnik/trie';
2
- import { Board, Config, Result, Tile } from '@scrabble-solver/types';
3
- declare const solve: (trie: Trie, config: Config, board: Board, tiles: Tile[]) => Result[];
2
+ import { Board, Config, ResultJson, Tile } from '@scrabble-solver/types';
3
+ declare const solve: (trie: Trie, config: Config, board: Board, tiles: Tile[]) => ResultJson[];
4
4
  export default solve;
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const types_1 = require("@scrabble-solver/types");
7
6
  const fillPattern_1 = __importDefault(require("./fillPattern"));
8
7
  const generatePatterns_1 = __importDefault(require("./generatePatterns"));
9
8
  const getPatternScore_1 = __importDefault(require("./getPatternScore"));
@@ -12,9 +11,9 @@ const solve = (trie, config, board, tiles) => {
12
11
  const patterns = (0, generatePatterns_1.default)(config, board);
13
12
  const filledPatterns = patterns.flatMap((pattern) => (0, fillPattern_1.default)(trie, config, pattern, tiles));
14
13
  const uniquePatterns = (0, getUniquePatterns_1.default)(filledPatterns);
15
- const results = uniquePatterns.map((pattern, index) => new types_1.Result({
16
- cells: pattern.cells,
17
- collisions: pattern.getCollisions().map((collision) => collision.cells),
14
+ const results = uniquePatterns.map((pattern, index) => ({
15
+ cells: pattern.cells.map((cell) => cell.toJson()),
16
+ collisions: pattern.getCollisions().map((collision) => collision.cells.map((cell) => cell.toJson())),
18
17
  id: index,
19
18
  points: (0, getPatternScore_1.default)(config, pattern),
20
19
  }));
@@ -1,21 +1,21 @@
1
1
  {
2
2
  "name": "@scrabble-solver/solver",
3
- "version": "2.8.9",
3
+ "version": "2.8.10",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@scrabble-solver/solver",
9
- "version": "2.8.9",
9
+ "version": "2.8.10",
10
10
  "license": "CC-BY-NC-ND-4.0",
11
11
  "dependencies": {
12
- "@kamilmielnik/trie": "^2.0.0"
12
+ "@kamilmielnik/trie": "^2.0.1"
13
13
  }
14
14
  },
15
15
  "node_modules/@kamilmielnik/trie": {
16
- "version": "2.0.0",
17
- "resolved": "https://registry.npmjs.org/@kamilmielnik/trie/-/trie-2.0.0.tgz",
18
- "integrity": "sha512-YWTYtrV97bQ5hRifG1FImP47PI400a56O8+oQClQOtDjY3tioxab4sOgFHckiDdswciN1RwngCZ9Kv3phJfSuA==",
16
+ "version": "2.0.1",
17
+ "resolved": "https://registry.npmjs.org/@kamilmielnik/trie/-/trie-2.0.1.tgz",
18
+ "integrity": "sha512-6Ulw5/xgFRadHsx0uVnpOxB2E2ZO2osnaakI26yS3RMlww580JiaQEfXUmQjXZcmOjcO+HrZ0CWjRDhoDYKHbg==",
19
19
  "engines": {
20
20
  "node": ">=16"
21
21
  }
@@ -23,9 +23,9 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@kamilmielnik/trie": {
26
- "version": "2.0.0",
27
- "resolved": "https://registry.npmjs.org/@kamilmielnik/trie/-/trie-2.0.0.tgz",
28
- "integrity": "sha512-YWTYtrV97bQ5hRifG1FImP47PI400a56O8+oQClQOtDjY3tioxab4sOgFHckiDdswciN1RwngCZ9Kv3phJfSuA=="
26
+ "version": "2.0.1",
27
+ "resolved": "https://registry.npmjs.org/@kamilmielnik/trie/-/trie-2.0.1.tgz",
28
+ "integrity": "sha512-6Ulw5/xgFRadHsx0uVnpOxB2E2ZO2osnaakI26yS3RMlww580JiaQEfXUmQjXZcmOjcO+HrZ0CWjRDhoDYKHbg=="
29
29
  }
30
30
  }
31
31
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/solver",
3
- "version": "2.8.9",
3
+ "version": "2.8.10",
4
4
  "description": "Scrabble Solver 2 - Solver",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -24,13 +24,13 @@
24
24
  "clean:force": "npm run clean && rimraf package-lock.json"
25
25
  },
26
26
  "dependencies": {
27
- "@kamilmielnik/trie": "^2.0.0",
28
- "@scrabble-solver/types": "^2.8.9"
27
+ "@kamilmielnik/trie": "^2.0.1",
28
+ "@scrabble-solver/types": "^2.8.10"
29
29
  },
30
30
  "devDependencies": {
31
- "@scrabble-solver/configs": "^2.8.9",
32
- "@scrabble-solver/constants": "^2.8.9",
33
- "@scrabble-solver/dictionaries": "^2.8.9"
31
+ "@scrabble-solver/configs": "^2.8.10",
32
+ "@scrabble-solver/constants": "^2.8.10",
33
+ "@scrabble-solver/dictionaries": "^2.8.10"
34
34
  },
35
35
  "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
36
36
  }
@@ -6,6 +6,11 @@ describe('generateEndIndices', () => {
6
6
  const emptyCell: Cell = { hasTile: () => false } as Cell;
7
7
  const filledCell: Cell = { hasTile: () => true } as Cell;
8
8
 
9
+ it('returns empty array when no cells given', () => {
10
+ const cells: Cell[] = [];
11
+ expect(generateEndIndices(cells, 0).length).toBe(0);
12
+ });
13
+
9
14
  it('finds indices where a new word can end - XXOOOX', () => {
10
15
  const cells = [filledCell, filledCell, emptyCell, emptyCell, emptyCell, filledCell];
11
16
  expect(generateEndIndices(cells, 3)).toEqual([5]);
@@ -1,10 +1,21 @@
1
1
  import { Cell } from '@scrabble-solver/types';
2
2
 
3
3
  const generateEndIndices = (cells: Cell[], startIndex: number): number[] => {
4
- return Array(cells.length - startIndex - 1)
5
- .fill(0)
6
- .map((_, endIndex) => endIndex + startIndex + 1)
7
- .filter((endIndex) => endIndex >= cells.length - 1 || !cells[endIndex + 1].hasTile());
4
+ if (cells.length === 0) {
5
+ return [];
6
+ }
7
+
8
+ const endIndices: number[] = [];
9
+
10
+ for (let endIndex = startIndex + 1; endIndex < cells.length - 1; ++endIndex) {
11
+ if (!cells[endIndex + 1].hasTile()) {
12
+ endIndices.push(endIndex);
13
+ }
14
+ }
15
+
16
+ endIndices.push(cells.length - 1);
17
+
18
+ return endIndices;
8
19
  };
9
20
 
10
21
  export default generateEndIndices;
@@ -6,6 +6,11 @@ describe('generateStartIndices', () => {
6
6
  const emptyCell: Cell = { hasTile: () => false } as Cell;
7
7
  const filledCell: Cell = { hasTile: () => true } as Cell;
8
8
 
9
+ it('returns empty array when no cells given', () => {
10
+ const cells: Cell[] = [];
11
+ expect(generateStartIndices(cells).length).toBe(0);
12
+ });
13
+
9
14
  it('finds indices where a new word can start', () => {
10
15
  const cells = [filledCell, filledCell, emptyCell, emptyCell, emptyCell, filledCell];
11
16
  const startIndices = generateStartIndices(cells);
@@ -1,10 +1,19 @@
1
1
  import { Cell } from '@scrabble-solver/types';
2
2
 
3
3
  const generateStartIndices = (cells: Cell[]): number[] => {
4
- return Array(cells.length - 1)
5
- .fill(0)
6
- .map((_, startIndex) => startIndex)
7
- .filter((startIndex) => startIndex === 0 || !cells[startIndex - 1].hasTile());
4
+ if (cells.length === 0) {
5
+ return [];
6
+ }
7
+
8
+ const startIndices: number[] = [0];
9
+
10
+ for (let startIndex = 1; startIndex < cells.length - 1; ++startIndex) {
11
+ if (!cells[startIndex - 1].hasTile()) {
12
+ startIndices.push(startIndex);
13
+ }
14
+ }
15
+
16
+ return startIndices;
8
17
  };
9
18
 
10
19
  export default generateStartIndices;
@@ -1,15 +1,12 @@
1
1
  import { Cell } from '@scrabble-solver/types';
2
2
 
3
- const generateVectors = ({
4
- getNthVector,
5
- vectorsCount,
6
- }: {
3
+ interface Parameters {
7
4
  getNthVector: (index: number) => Cell[];
8
5
  vectorsCount: number;
9
- }): Cell[][] => {
10
- return Array(vectorsCount)
11
- .fill(0)
12
- .map((_, index) => getNthVector(index));
6
+ }
7
+
8
+ const generateVectors = ({ getNthVector, vectorsCount }: Parameters): Cell[][] => {
9
+ return Array.from({ length: vectorsCount }, (_, index) => getNthVector(index));
13
10
  };
14
11
 
15
12
  export default generateVectors;
@@ -70,7 +70,7 @@ describe('solve - PL', () => {
70
70
  ]);
71
71
  const tiles = generateTiles(['a', 'a', 'ą', 'r', 't', 'w', 'z']);
72
72
  const results = solve(trie!, config, board, tiles);
73
- const bestResult = getBestResult(results);
73
+ const bestResult = getBestResult(results.map((result) => Result.fromJson(result)));
74
74
  expect(bestResult.word).toBe('zmartwychwstałą');
75
75
  expect(bestResult.points).toBe(682);
76
76
  });
@@ -95,7 +95,7 @@ describe('solve - PL', () => {
95
95
  ]);
96
96
  const tiles = generateTiles(['ą', 'c', 'h', 't', 'w', 'w', 'z']);
97
97
  const results = solve(trie!, config, board, tiles);
98
- const bestResult = getBestResult(results);
98
+ const bestResult = getBestResult(results.map((result) => Result.fromJson(result)));
99
99
  expect(bestResult.word).toBe('zmartwychwstałą');
100
100
  expect(bestResult.points).toBe(1157);
101
101
  });
@@ -132,7 +132,7 @@ describe('solve - ES', () => {
132
132
  ]);
133
133
  const tiles = generateTiles(['ll', 'a', 'n', 'a']);
134
134
  const results = solve(trie!, config, board, tiles);
135
- const bestResult = getBestResult(results);
135
+ const bestResult = getBestResult(results.map((result) => Result.fromJson(result)));
136
136
  expect(results.length).toBe(24);
137
137
  expect(bestResult.points).toBe(22);
138
138
  });
@@ -1,24 +1,22 @@
1
1
  import { Trie } from '@kamilmielnik/trie';
2
- import { Board, Config, Result, Tile } from '@scrabble-solver/types';
2
+ import { Board, Config, ResultJson, Tile } from '@scrabble-solver/types';
3
3
 
4
4
  import fillPattern from './fillPattern';
5
5
  import generatePatterns from './generatePatterns';
6
6
  import getPatternScore from './getPatternScore';
7
7
  import getUniquePatterns from './getUniquePatterns';
8
8
 
9
- const solve = (trie: Trie, config: Config, board: Board, tiles: Tile[]): Result[] => {
9
+ const solve = (trie: Trie, config: Config, board: Board, tiles: Tile[]): ResultJson[] => {
10
10
  const patterns = generatePatterns(config, board);
11
11
  const filledPatterns = patterns.flatMap((pattern) => fillPattern(trie, config, pattern, tiles));
12
12
  const uniquePatterns = getUniquePatterns(filledPatterns);
13
- const results = uniquePatterns.map(
14
- (pattern, index) =>
15
- new Result({
16
- cells: pattern.cells,
17
- collisions: pattern.getCollisions().map((collision) => collision.cells),
18
- id: index,
19
- points: getPatternScore(config, pattern),
20
- }),
21
- );
13
+ const results = uniquePatterns.map((pattern, index) => ({
14
+ cells: pattern.cells.map((cell) => cell.toJson()),
15
+ collisions: pattern.getCollisions().map((collision) => collision.cells.map((cell) => cell.toJson())),
16
+ id: index,
17
+ points: getPatternScore(config, pattern),
18
+ }));
19
+
22
20
  return results;
23
21
  };
24
22
 
@@ -65,7 +65,7 @@ class Board {
65
65
  }
66
66
  getBlanksCount() {
67
67
  return this.rows.reduce((count, row) => {
68
- return count + row.reduce((rowCount, cell) => (cell.tile.isBlank ? rowCount + 1 : rowCount), 0);
68
+ return count + row.reduce((rowCount, cell) => rowCount + (cell.tile.isBlank ? 1 : 0), 0);
69
69
  }, 0);
70
70
  }
71
71
  getColumn(index) {
@@ -76,7 +76,7 @@ class Board {
76
76
  }
77
77
  getTilesCount() {
78
78
  return this.rows.reduce((count, row) => {
79
- return count + row.reduce((rowCount, cell) => (cell.hasTile() ? rowCount + 1 : rowCount), 0);
79
+ return count + row.reduce((rowCount, cell) => rowCount + (cell.hasTile() ? 1 : 0), 0);
80
80
  }, 0);
81
81
  }
82
82
  getWords() {
@@ -12,6 +12,7 @@ export { default as Config } from './Config';
12
12
  export { default as ConfigJson } from './ConfigJson';
13
13
  export { default as FinalPattern } from './FinalPattern';
14
14
  export { default as HorizontalPattern } from './HorizontalPattern';
15
+ export { default as isError } from './isError';
15
16
  export { default as isObject } from './isObject';
16
17
  export { default as Locale, isLocale } from './Locale';
17
18
  export { default as Pattern } from './Pattern';
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- 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;
6
+ exports.WordDefinition = exports.WordBonus = exports.VerticalPattern = exports.isTileJson = exports.Tile = exports.Result = exports.Pattern = exports.isLocale = exports.Locale = exports.isObject = exports.isError = exports.HorizontalPattern = exports.FinalPattern = exports.Config = exports.CharacterBonus = exports.isCellJson = exports.Cell = exports.Bonus = exports.isBoardJson = exports.Board = void 0;
7
7
  var Board_1 = require("./Board");
8
8
  Object.defineProperty(exports, "Board", { enumerable: true, get: function () { return __importDefault(Board_1).default; } });
9
9
  var BoardJson_1 = require("./BoardJson");
@@ -22,6 +22,8 @@ var FinalPattern_1 = require("./FinalPattern");
22
22
  Object.defineProperty(exports, "FinalPattern", { enumerable: true, get: function () { return __importDefault(FinalPattern_1).default; } });
23
23
  var HorizontalPattern_1 = require("./HorizontalPattern");
24
24
  Object.defineProperty(exports, "HorizontalPattern", { enumerable: true, get: function () { return __importDefault(HorizontalPattern_1).default; } });
25
+ var isError_1 = require("./isError");
26
+ Object.defineProperty(exports, "isError", { enumerable: true, get: function () { return __importDefault(isError_1).default; } });
25
27
  var isObject_1 = require("./isObject");
26
28
  Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return __importDefault(isObject_1).default; } });
27
29
  var Locale_1 = require("./Locale");
@@ -0,0 +1,2 @@
1
+ declare const isError: (value: unknown) => value is Error;
2
+ export default isError;
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const isObject_1 = __importDefault(require("./isObject"));
7
+ const isError = (value) => {
8
+ if (!(0, isObject_1.default)(value)) {
9
+ return false;
10
+ }
11
+ return typeof value.message === 'string';
12
+ };
13
+ exports.default = isError;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/types",
3
- "version": "2.8.9",
3
+ "version": "2.8.10",
4
4
  "description": "Scrabble Solver 2 - Types",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -24,7 +24,7 @@
24
24
  "clean:force": "npm run clean && rimraf package-lock.json"
25
25
  },
26
26
  "dependencies": {
27
- "@scrabble-solver/constants": "^2.8.9"
27
+ "@scrabble-solver/constants": "^2.8.10"
28
28
  },
29
29
  "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
30
30
  }
@@ -88,7 +88,7 @@ class Board {
88
88
 
89
89
  public getBlanksCount(): number {
90
90
  return this.rows.reduce((count, row) => {
91
- return count + row.reduce((rowCount, cell) => (cell.tile.isBlank ? rowCount + 1 : rowCount), 0);
91
+ return count + row.reduce((rowCount, cell) => rowCount + (cell.tile.isBlank ? 1 : 0), 0);
92
92
  }, 0);
93
93
  }
94
94
 
@@ -102,7 +102,7 @@ class Board {
102
102
 
103
103
  public getTilesCount(): number {
104
104
  return this.rows.reduce((count, row) => {
105
- return count + row.reduce((rowCount, cell) => (cell.hasTile() ? rowCount + 1 : rowCount), 0);
105
+ return count + row.reduce((rowCount, cell) => rowCount + (cell.hasTile() ? 1 : 0), 0);
106
106
  }, 0);
107
107
  }
108
108
 
@@ -12,6 +12,7 @@ export { default as Config } from './Config';
12
12
  export { default as ConfigJson } from './ConfigJson';
13
13
  export { default as FinalPattern } from './FinalPattern';
14
14
  export { default as HorizontalPattern } from './HorizontalPattern';
15
+ export { default as isError } from './isError';
15
16
  export { default as isObject } from './isObject';
16
17
  export { default as Locale, isLocale } from './Locale';
17
18
  export { default as Pattern } from './Pattern';
@@ -0,0 +1,11 @@
1
+ import isObject from './isObject';
2
+
3
+ const isError = (value: unknown): value is Error => {
4
+ if (!isObject(value)) {
5
+ return false;
6
+ }
7
+
8
+ return typeof value.message === 'string';
9
+ };
10
+
11
+ export default isError;
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@scrabble-solver/word-definitions",
3
- "version": "2.8.9",
3
+ "version": "2.8.10",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@scrabble-solver/word-definitions",
9
- "version": "2.8.9",
9
+ "version": "2.8.10",
10
10
  "license": "CC-BY-NC-ND-4.0",
11
11
  "dependencies": {
12
12
  "cheerio": "^1.0.0-rc.12",
@@ -27,9 +27,9 @@
27
27
  }
28
28
  },
29
29
  "node_modules/@types/node": {
30
- "version": "18.8.4",
31
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz",
32
- "integrity": "sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==",
30
+ "version": "18.11.2",
31
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.2.tgz",
32
+ "integrity": "sha512-BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw==",
33
33
  "dev": true
34
34
  },
35
35
  "node_modules/boolbase": {
@@ -249,9 +249,9 @@
249
249
  }
250
250
  },
251
251
  "@types/node": {
252
- "version": "18.8.4",
253
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz",
254
- "integrity": "sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==",
252
+ "version": "18.11.2",
253
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.2.tgz",
254
+ "integrity": "sha512-BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw==",
255
255
  "dev": true
256
256
  },
257
257
  "boolbase": {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/word-definitions",
3
- "version": "2.8.9",
3
+ "version": "2.8.10",
4
4
  "description": "Scrabble Solver 2 - Word definitions",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
23
23
  "clean": "rimraf build/ node_modules/ package-lock.json"
24
24
  },
25
25
  "dependencies": {
26
- "@scrabble-solver/types": "^2.8.9",
26
+ "@scrabble-solver/types": "^2.8.10",
27
27
  "cheerio": "^1.0.0-rc.12",
28
28
  "follow-redirects": "^1.15.2",
29
29
  "striptags": "^3.2.0"
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@scrabble-solver/word-lists",
3
- "version": "2.8.9",
3
+ "version": "2.8.10",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@scrabble-solver/word-lists",
9
- "version": "2.8.9",
9
+ "version": "2.8.10",
10
10
  "license": "CC-BY-NC-ND-4.0",
11
11
  "dependencies": {
12
12
  "cheerio": "^1.0.0-rc.12",