scrabble-solver 2.12.1 → 2.12.2

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 (77) hide show
  1. package/README.md +5 -0
  2. package/lerna.json +1 -1
  3. package/package.json +7 -7
  4. package/packages/configs/package.json +4 -4
  5. package/packages/constants/package.json +2 -2
  6. package/packages/dictionaries/package-lock.json +2 -2
  7. package/packages/dictionaries/package.json +5 -5
  8. package/packages/logger/package-lock.json +2 -2
  9. package/packages/logger/package.json +2 -2
  10. package/packages/scrabble-solver/.next/BUILD_ID +1 -1
  11. package/packages/scrabble-solver/.next/build-manifest.json +13 -13
  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/edge-server-production/0.pack +0 -0
  18. package/packages/scrabble-solver/.next/cache/webpack/edge-server-production/index.pack +0 -0
  19. package/packages/scrabble-solver/.next/cache/webpack/server-production/0.pack +0 -0
  20. package/packages/scrabble-solver/.next/cache/webpack/server-production/index.pack +0 -0
  21. package/packages/scrabble-solver/.next/next-server.js.nft.json +1 -1
  22. package/packages/scrabble-solver/.next/prerender-manifest.json +1 -1
  23. package/packages/scrabble-solver/.next/required-server-files.json +1 -1
  24. package/packages/scrabble-solver/.next/routes-manifest.json +1 -1
  25. package/packages/scrabble-solver/.next/server/chunks/277.js +70 -37
  26. package/packages/scrabble-solver/.next/server/chunks/675.js +35 -13
  27. package/packages/scrabble-solver/.next/server/chunks/859.js +21 -4
  28. package/packages/scrabble-solver/.next/server/middleware-build-manifest.js +1 -1
  29. package/packages/scrabble-solver/.next/server/pages/404.html +1 -1
  30. package/packages/scrabble-solver/.next/server/pages/404.js.nft.json +1 -1
  31. package/packages/scrabble-solver/.next/server/pages/500.html +1 -1
  32. package/packages/scrabble-solver/.next/server/pages/_app.js.nft.json +1 -1
  33. package/packages/scrabble-solver/.next/server/pages/api/solve.js +29 -2
  34. package/packages/scrabble-solver/.next/server/pages/index.html +1 -1
  35. package/packages/scrabble-solver/.next/server/pages/index.js +13 -10
  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/server/pages-manifest.json +1 -1
  39. package/packages/scrabble-solver/.next/static/{_yG9K-PD5kWT_p4sMdCSV → 9dmPfnTc_AQTHBPvL7xQe}/_buildManifest.js +1 -1
  40. package/packages/scrabble-solver/.next/static/chunks/{framework-2c5cac93e8c637b5.js → framework-2c29dc3cd933590b.js} +2 -2
  41. package/packages/scrabble-solver/.next/static/chunks/main-4dcb7f9b52833aba.js +1 -0
  42. package/packages/scrabble-solver/.next/static/chunks/pages/_app-02851b06b95b19cb.js +32 -0
  43. package/packages/scrabble-solver/.next/static/chunks/pages/index-0ba5607d1aad8a09.js +1 -0
  44. package/packages/scrabble-solver/.next/static/css/{58053f9594647860.css → 09dfdea53eba31a9.css} +1 -1
  45. package/packages/scrabble-solver/.next/trace +52 -52
  46. package/packages/scrabble-solver/package-lock.json +251 -347
  47. package/packages/scrabble-solver/package.json +13 -13
  48. package/packages/scrabble-solver/src/components/Board/Board.module.scss +33 -0
  49. package/packages/scrabble-solver/src/components/Board/Board.tsx +3 -0
  50. package/packages/scrabble-solver/src/components/Board/BoardPure.tsx +25 -1
  51. package/packages/scrabble-solver/src/components/Board/components/InputPrompt/InputPrompt.tsx +1 -0
  52. package/packages/scrabble-solver/src/components/Board/hooks/useBackgroundImage.tsx +1 -6
  53. package/packages/scrabble-solver/src/components/Rack/components/InputPrompt/InputPrompt.tsx +1 -0
  54. package/packages/scrabble-solver/src/modals/SettingsModal/SettingsModal.tsx +7 -3
  55. package/packages/scrabble-solver/src/state/selectors.ts +7 -7
  56. package/packages/solver/README.md +1 -1
  57. package/packages/solver/build/areDigraphsValid.d.ts +3 -0
  58. package/packages/solver/build/areDigraphsValid.js +16 -0
  59. package/packages/solver/build/index.d.ts +1 -0
  60. package/packages/solver/build/index.js +3 -1
  61. package/packages/solver/build/solve.js +3 -1
  62. package/packages/solver/package-lock.json +2 -2
  63. package/packages/solver/package.json +6 -6
  64. package/packages/solver/src/areDigraphsValid.ts +20 -0
  65. package/packages/solver/src/getPatternScore.test.ts +9 -0
  66. package/packages/solver/src/index.ts +1 -0
  67. package/packages/solver/src/solve.test.ts +25 -1
  68. package/packages/solver/src/solve.ts +3 -1
  69. package/packages/types/package.json +3 -3
  70. package/packages/word-definitions/package-lock.json +2 -2
  71. package/packages/word-definitions/package.json +3 -3
  72. package/packages/word-lists/package-lock.json +2 -2
  73. package/packages/word-lists/package.json +3 -3
  74. package/packages/scrabble-solver/.next/static/chunks/main-0ecb9ccfcb6c9b24.js +0 -1
  75. package/packages/scrabble-solver/.next/static/chunks/pages/_app-bea4539a6b8042de.js +0 -32
  76. package/packages/scrabble-solver/.next/static/chunks/pages/index-4e8566409753e1c3.js +0 -1
  77. /package/packages/scrabble-solver/.next/static/{_yG9K-PD5kWT_p4sMdCSV → 9dmPfnTc_AQTHBPvL7xQe}/_ssgManifest.js +0 -0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/scrabble-solver",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "description": "Scrabble Solver 2 - App",
5
5
  "engines": {
6
6
  "node": ">=16"
@@ -18,7 +18,7 @@
18
18
  "bugs": {
19
19
  "url": "https://github.com/kamilmielnik/scrabble-solver/issues"
20
20
  },
21
- "homepage": "https://github.com/kamilmielnik/scrabble-solver#readme",
21
+ "homepage": "https://scrabble-solver.org",
22
22
  "scripts": {
23
23
  "build": "env-cmd next build",
24
24
  "clean": "rimraf .next/ node_modules/",
@@ -28,20 +28,20 @@
28
28
  "start": "env-cmd next start -p 3333"
29
29
  },
30
30
  "dependencies": {
31
- "@floating-ui/react": "^0.22.2",
31
+ "@floating-ui/react": "^0.22.3",
32
32
  "@kamilmielnik/trie": "^2.0.1",
33
33
  "@reduxjs/toolkit": "^1.9.3",
34
- "@scrabble-solver/configs": "^2.12.1",
35
- "@scrabble-solver/constants": "^2.12.1",
36
- "@scrabble-solver/dictionaries": "^2.12.1",
37
- "@scrabble-solver/logger": "^2.12.1",
38
- "@scrabble-solver/solver": "^2.12.1",
39
- "@scrabble-solver/types": "^2.12.1",
40
- "@scrabble-solver/word-definitions": "^2.12.1",
34
+ "@scrabble-solver/configs": "^2.12.2",
35
+ "@scrabble-solver/constants": "^2.12.2",
36
+ "@scrabble-solver/dictionaries": "^2.12.2",
37
+ "@scrabble-solver/logger": "^2.12.2",
38
+ "@scrabble-solver/solver": "^2.12.2",
39
+ "@scrabble-solver/types": "^2.12.2",
40
+ "@scrabble-solver/word-definitions": "^2.12.2",
41
41
  "classnames": "^2.3.2",
42
42
  "include-media": "^2.0.0",
43
43
  "include-media-query-builder": "^1.1.0",
44
- "next": "^13.2.4",
44
+ "next": "^13.3.0",
45
45
  "normalize.css": "^8.0.1",
46
46
  "react": "^18.2.0",
47
47
  "react-cool-onclickoutside": "^1.7.0",
@@ -61,7 +61,7 @@
61
61
  "devDependencies": {
62
62
  "@svgr/webpack": "^7.0.0",
63
63
  "@types/classnames": "^2.3.0",
64
- "@types/react": "^18.0.31",
64
+ "@types/react": "^18.0.33",
65
65
  "@types/react-dom": "^18.0.11",
66
66
  "@types/react-highlight-words": "^0.16.4",
67
67
  "@types/react-modal": "^3.13.1",
@@ -71,7 +71,7 @@
71
71
  "@types/redux": "^3.6.31",
72
72
  "@types/redux-saga": "^0.10.5",
73
73
  "env-cmd": "^10.1.0",
74
- "sass": "^1.60.0",
74
+ "sass": "^1.61.0",
75
75
  "workbox-webpack-plugin": "^6.5.4"
76
76
  },
77
77
  "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
@@ -33,3 +33,36 @@
33
33
  user-select: none;
34
34
  animation: var(--transition--duration) var(--transition--easing) hide;
35
35
  }
36
+
37
+ .iconContainer {
38
+ position: absolute;
39
+ display: flex;
40
+ align-items: center;
41
+ justify-content: center;
42
+ pointer-events: none;
43
+ user-select: none;
44
+ }
45
+
46
+ .iconBackground,
47
+ .icon {
48
+ position: absolute;
49
+ top: calc((100% - var(--size)) / 2);
50
+ right: calc((100% - var(--size)) / 2);
51
+ bottom: calc((100% - var(--size)) / 2);
52
+ left: calc((100% - var(--size)) / 2);
53
+ width: var(--size);
54
+ height: var(--size);
55
+ }
56
+
57
+ .iconBackground {
58
+ --size: 80%;
59
+
60
+ border-radius: var(--border--radius);
61
+ background-color: var(--color--foreground--secondary);
62
+ }
63
+
64
+ .icon {
65
+ --size: 40%;
66
+
67
+ color: var(--color--white);
68
+ }
@@ -12,6 +12,7 @@ import { TRANSITION } from 'parameters';
12
12
  import {
13
13
  boardSlice,
14
14
  cellFilterSlice,
15
+ selectFilteredCells,
15
16
  selectInputMode,
16
17
  selectLocale,
17
18
  selectRowsWithCandidate,
@@ -33,6 +34,7 @@ const Board: FunctionComponent<Props> = ({ className }) => {
33
34
  const locale = useTypedSelector(selectLocale);
34
35
  const rows = useTypedSelector(selectRowsWithCandidate);
35
36
  const inputMode = useTypedSelector(selectInputMode);
37
+ const filteredCells = useTypedSelector(selectFilteredCells);
36
38
  const { cellSize } = useAppLayout();
37
39
  const [
38
40
  { activeIndex, direction, inputRefs },
@@ -147,6 +149,7 @@ const Board: FunctionComponent<Props> = ({ className }) => {
147
149
  <BoardPure
148
150
  className={className}
149
151
  cellSize={cellSize}
152
+ filteredCells={filteredCells}
150
153
  inputRefs={inputRefs}
151
154
  ref={ref}
152
155
  rows={rows}
@@ -12,12 +12,17 @@ import {
12
12
  RefObject,
13
13
  } from 'react';
14
14
 
15
+ import { FlagFill } from 'icons';
16
+ import { BORDER_WIDTH } from 'parameters';
17
+ import { Point } from 'types';
18
+
15
19
  import styles from './Board.module.scss';
16
20
  import { Cell } from './components';
17
21
 
18
22
  interface Props {
19
23
  className?: string;
20
24
  cellSize: number;
25
+ filteredCells: Point[];
21
26
  inputRefs: RefObject<HTMLInputElement>[][];
22
27
  rows: CellModel[][];
23
28
  style?: CSSProperties;
@@ -29,7 +34,10 @@ interface Props {
29
34
  }
30
35
 
31
36
  const BoardPure = forwardRef<HTMLDivElement, Props>(
32
- ({ className, cellSize, inputRefs, rows, style, onBlur, onChange, onFocus, onKeyDown, onPaste }, ref) => (
37
+ (
38
+ { className, cellSize, filteredCells, inputRefs, rows, style, onBlur, onChange, onFocus, onKeyDown, onPaste },
39
+ ref,
40
+ ) => (
33
41
  <div
34
42
  className={classNames(styles.board, className)}
35
43
  ref={ref}
@@ -57,6 +65,22 @@ const BoardPure = forwardRef<HTMLDivElement, Props>(
57
65
  ))}
58
66
  </Fragment>
59
67
  ))}
68
+
69
+ {filteredCells.map(({ x, y }) => (
70
+ <div
71
+ className={styles.iconContainer}
72
+ key={[x, y].join('-')}
73
+ style={{
74
+ height: cellSize,
75
+ width: cellSize,
76
+ left: x * (cellSize + BORDER_WIDTH),
77
+ top: y * (cellSize + BORDER_WIDTH),
78
+ }}
79
+ >
80
+ <div className={styles.iconBackground} />
81
+ <FlagFill className={styles.icon} />
82
+ </div>
83
+ ))}
60
84
  </div>
61
85
  ),
62
86
  );
@@ -37,6 +37,7 @@ const InputPrompt = forwardRef<HTMLFormElement, Props>(
37
37
  if (inputRef) {
38
38
  inputRef.focus();
39
39
  inputRef.select();
40
+ inputRef.scrollIntoView({ block: 'start', inline: 'center' });
40
41
  }
41
42
  }, [inputRef]);
42
43
 
@@ -9,7 +9,7 @@ import { useAppLayout, useMediaQueries } from 'hooks';
9
9
  import { FlagFill, Star } from 'icons';
10
10
  import { dataUrlToBlob, getTileSizes } from 'lib';
11
11
  import { BORDER_COLOR_LIGHT, BORDER_RADIUS, BORDER_WIDTH, COLOR_BONUS_START, COLOR_FILTERED } from 'parameters';
12
- import { selectCellFilter, selectConfig, store, useTypedSelector } from 'state';
12
+ import { selectConfig, store, useTypedSelector } from 'state';
13
13
  import { Point } from 'types';
14
14
 
15
15
  import { getBonusColor } from '../lib';
@@ -29,7 +29,6 @@ const useBackgroundImage = () => {
29
29
  const borderRadius = isLessThanXs ? BORDER_RADIUS_XS : BORDER_RADIUS;
30
30
  const config = useTypedSelector(selectConfig);
31
31
  const center = { x: Math.floor(config.boardWidth / 2), y: Math.floor(config.boardHeight / 2) };
32
- const cellFilter = useTypedSelector(selectCellFilter);
33
32
  const viewBoxHeight = boardSize;
34
33
  const viewBoxWidth = boardSize;
35
34
  const bonusSize = cellSize * 0.8;
@@ -154,10 +153,6 @@ const useBackgroundImage = () => {
154
153
  x={getX(center) + iconOffset}
155
154
  y={getY(center) + iconOffset}
156
155
  />
157
-
158
- {cellFilter.map((cell, index) => (
159
- <use key={index} href={`#${CELL_FILTER}`} x={getX(cell)} y={getY(cell)} />
160
- ))}
161
156
  </svg>
162
157
  </Provider>,
163
158
  );
@@ -52,6 +52,7 @@ const InputPrompt = forwardRef<HTMLFormElement, Props>(
52
52
  if (inputRef) {
53
53
  inputRef.focus();
54
54
  inputRef.select();
55
+ inputRef.scrollIntoView({ block: 'end', inline: 'center' });
55
56
  }
56
57
  }, [inputRef]);
57
58
 
@@ -1,6 +1,7 @@
1
1
  import { FunctionComponent, memo } from 'react';
2
2
 
3
3
  import { Modal } from 'components';
4
+ import { useIsTouchDevice } from 'hooks';
4
5
  import { useTranslate } from 'state';
5
6
 
6
7
  import { AutoGroupTilesSetting, ConfigSetting, InputModeSetting, LocaleSetting } from './components';
@@ -13,6 +14,7 @@ interface Props {
13
14
 
14
15
  const SettingsModal: FunctionComponent<Props> = ({ className, isOpen, onClose }) => {
15
16
  const translate = useTranslate();
17
+ const isTouchDevice = useIsTouchDevice();
16
18
 
17
19
  return (
18
20
  <Modal className={className} isOpen={isOpen} title={translate('settings')} onClose={onClose}>
@@ -24,9 +26,11 @@ const SettingsModal: FunctionComponent<Props> = ({ className, isOpen, onClose })
24
26
  <LocaleSetting disabled={!isOpen} />
25
27
  </Modal.Section>
26
28
 
27
- <Modal.Section title={translate('settings.inputMode')}>
28
- <InputModeSetting disabled={!isOpen} />
29
- </Modal.Section>
29
+ {!isTouchDevice && (
30
+ <Modal.Section title={translate('settings.inputMode')}>
31
+ <InputModeSetting disabled={!isOpen} />
32
+ </Modal.Section>
33
+ )}
30
34
 
31
35
  <Modal.Section title={translate('settings.autoGroupTiles')}>
32
36
  <AutoGroupTilesSetting disabled={!isOpen} />
@@ -71,9 +71,9 @@ export const selectConfigId = createSelector([selectSettingsRoot], (settings) =>
71
71
 
72
72
  export const selectConfig = createSelector([selectConfigId, selectLocale], getLocaleConfig);
73
73
 
74
- export const selectCellFilter = selectCellFilterRoot;
74
+ export const selectFilteredCells = selectCellFilterRoot;
75
75
 
76
- export const selectCellIsFiltered = createSelector([selectCellFilter, selectPoint], (cellFilter, { x, y }) => {
76
+ export const selectCellIsFiltered = createSelector([selectFilteredCells, selectPoint], (cellFilter, { x, y }) => {
77
77
  return cellFilter.some((cell) => cell.x === x && cell.y === y);
78
78
  });
79
79
 
@@ -94,7 +94,7 @@ export const selectResultsSort = createSelector([selectResultsRoot], (results) =
94
94
  export const selectSortedResults = createSelector([selectResultsRaw, selectResultsSort, selectLocale], sortResults);
95
95
 
96
96
  export const selectGroupedResults = createSelector(
97
- [selectSortedResults, selectResultsQuery, selectCellFilter],
97
+ [selectSortedResults, selectResultsQuery, selectFilteredCells],
98
98
  groupResults,
99
99
  );
100
100
 
@@ -103,8 +103,8 @@ export const selectResults = createSelector([selectGroupedResults], (groupedResu
103
103
  });
104
104
 
105
105
  export const selectIsResultMatching = createSelector(
106
- [selectResults, selectResultsQuery, selectCellFilter, selectResultIndex],
107
- (results, query, cellFilter, index) => {
106
+ [selectResults, selectResultsQuery, selectFilteredCells, selectResultIndex],
107
+ (results, query, filteredCells, index) => {
108
108
  if (!results) {
109
109
  return false;
110
110
  }
@@ -116,8 +116,8 @@ export const selectIsResultMatching = createSelector(
116
116
  return false;
117
117
  }
118
118
 
119
- if (cellFilter) {
120
- return cellFilter.every(({ x, y }) => result.cells.some((cell) => cell.x === x && cell.y === y));
119
+ if (filteredCells) {
120
+ return filteredCells.every(({ x, y }) => result.cells.some((cell) => cell.x === x && cell.y === y));
121
121
  }
122
122
 
123
123
  return true;
@@ -2,4 +2,4 @@
2
2
 
3
3
  ![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen.svg)
4
4
 
5
- The brains of the Scrabble-Solver.
5
+ The brains of Scrabble Solver.
@@ -0,0 +1,3 @@
1
+ import { Config, Pattern } from '@scrabble-solver/types';
2
+ declare const areDigraphsValid: (config: Config, pattern: Pattern) => boolean;
3
+ export default areDigraphsValid;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const areDigraphsValid = (config, pattern) => {
4
+ const { twoCharacterTiles } = config;
5
+ const { cells } = pattern;
6
+ for (let index = 0; index < cells.length - 1; ++index) {
7
+ const current = cells[index];
8
+ const next = cells[index + 1];
9
+ const digraphCandidate = current.tile.character + next.tile.character;
10
+ if (twoCharacterTiles.includes(digraphCandidate)) {
11
+ return false;
12
+ }
13
+ }
14
+ return true;
15
+ };
16
+ exports.default = areDigraphsValid;
@@ -1,3 +1,4 @@
1
+ export { default as areDigraphsValid } from './areDigraphsValid';
1
2
  export { default as fillPattern } from './fillPattern';
2
3
  export { default as generateEndIndices } from './generateEndIndices';
3
4
  export { default as generateHorizontalPatterns } from './generateHorizontalPatterns';
@@ -3,7 +3,9 @@ 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.solve = exports.getUniquePatterns = exports.getPatternScore = exports.getPatternHash = exports.getCellsScore = exports.generateVerticalPatterns = exports.generateVectors = exports.generateStartIndices = exports.generatePatterns = exports.generatePattern = exports.generateHorizontalPatterns = exports.generateEndIndices = exports.fillPattern = void 0;
6
+ exports.solve = exports.getUniquePatterns = exports.getPatternScore = exports.getPatternHash = exports.getCellsScore = exports.generateVerticalPatterns = exports.generateVectors = exports.generateStartIndices = exports.generatePatterns = exports.generatePattern = exports.generateHorizontalPatterns = exports.generateEndIndices = exports.fillPattern = exports.areDigraphsValid = void 0;
7
+ var areDigraphsValid_1 = require("./areDigraphsValid");
8
+ Object.defineProperty(exports, "areDigraphsValid", { enumerable: true, get: function () { return __importDefault(areDigraphsValid_1).default; } });
7
9
  var fillPattern_1 = require("./fillPattern");
8
10
  Object.defineProperty(exports, "fillPattern", { enumerable: true, get: function () { return __importDefault(fillPattern_1).default; } });
9
11
  var generateEndIndices_1 = require("./generateEndIndices");
@@ -3,6 +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
+ const areDigraphsValid_1 = __importDefault(require("./areDigraphsValid"));
6
7
  const fillPattern_1 = __importDefault(require("./fillPattern"));
7
8
  const generatePatterns_1 = __importDefault(require("./generatePatterns"));
8
9
  const getPatternScore_1 = __importDefault(require("./getPatternScore"));
@@ -10,7 +11,8 @@ const getUniquePatterns_1 = __importDefault(require("./getUniquePatterns"));
10
11
  const solve = (trie, config, board, tiles) => {
11
12
  const patterns = (0, generatePatterns_1.default)(config, board);
12
13
  const filledPatterns = patterns.flatMap((pattern) => (0, fillPattern_1.default)(trie, config, pattern, tiles));
13
- const uniquePatterns = (0, getUniquePatterns_1.default)(filledPatterns);
14
+ const validPatterns = filledPatterns.filter((pattern) => (0, areDigraphsValid_1.default)(config, pattern));
15
+ const uniquePatterns = (0, getUniquePatterns_1.default)(validPatterns);
14
16
  const results = uniquePatterns.map((pattern, index) => ({
15
17
  cells: pattern.cells.map((cell) => cell.toJson()),
16
18
  collisions: pattern.getCollisions().map((collision) => collision.cells.map((cell) => cell.toJson())),
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@scrabble-solver/solver",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@scrabble-solver/solver",
9
- "version": "2.12.1",
9
+ "version": "2.12.2",
10
10
  "license": "CC-BY-NC-ND-4.0",
11
11
  "dependencies": {
12
12
  "@kamilmielnik/trie": "^2.0.1"
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/solver",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "description": "Scrabble Solver 2 - Solver",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -17,7 +17,7 @@
17
17
  "bugs": {
18
18
  "url": "https://github.com/kamilmielnik/scrabble-solver/issues"
19
19
  },
20
- "homepage": "https://github.com/kamilmielnik/scrabble-solver#readme",
20
+ "homepage": "https://scrabble-solver.org",
21
21
  "scripts": {
22
22
  "build": "tsc --project .",
23
23
  "clean": "rimraf build/ node_modules/",
@@ -25,12 +25,12 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "@kamilmielnik/trie": "^2.0.1",
28
- "@scrabble-solver/types": "^2.12.1"
28
+ "@scrabble-solver/types": "^2.12.2"
29
29
  },
30
30
  "devDependencies": {
31
- "@scrabble-solver/configs": "^2.12.1",
32
- "@scrabble-solver/constants": "^2.12.1",
33
- "@scrabble-solver/dictionaries": "^2.12.1"
31
+ "@scrabble-solver/configs": "^2.12.2",
32
+ "@scrabble-solver/constants": "^2.12.2",
33
+ "@scrabble-solver/dictionaries": "^2.12.2"
34
34
  },
35
35
  "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
36
36
  }
@@ -0,0 +1,20 @@
1
+ import { Config, Pattern } from '@scrabble-solver/types';
2
+
3
+ const areDigraphsValid = (config: Config, pattern: Pattern): boolean => {
4
+ const { twoCharacterTiles } = config;
5
+ const { cells } = pattern;
6
+
7
+ for (let index = 0; index < cells.length - 1; ++index) {
8
+ const current = cells[index];
9
+ const next = cells[index + 1];
10
+ const digraphCandidate = current.tile.character + next.tile.character;
11
+
12
+ if (twoCharacterTiles.includes(digraphCandidate)) {
13
+ return false;
14
+ }
15
+ }
16
+
17
+ return true;
18
+ };
19
+
20
+ export default areDigraphsValid;
@@ -57,4 +57,13 @@ describe('getPatternScore', () => {
57
57
 
58
58
  expect(getPatternScore(config, pattern)).toBe(2);
59
59
  });
60
+
61
+ it('gives 0 score for unknown characters', () => {
62
+ const pattern = new HorizontalPattern(board, [
63
+ new Cell({ x: 13, y: 14, tile: new Tile({ character: '?', isBlank: false }), isEmpty: true }),
64
+ new Cell({ x: 12, y: 14, tile: new Tile({ character: 't' }), isEmpty: false }),
65
+ ]);
66
+
67
+ expect(getPatternScore(config, pattern)).toBe(2);
68
+ });
60
69
  });
@@ -1,3 +1,4 @@
1
+ export { default as areDigraphsValid } from './areDigraphsValid';
1
2
  export { default as fillPattern } from './fillPattern';
2
3
  export { default as generateEndIndices } from './generateEndIndices';
3
4
  export { default as generateHorizontalPatterns } from './generateHorizontalPatterns';
@@ -47,7 +47,7 @@ describe('solve - PL', () => {
47
47
  ]);
48
48
  const tiles = generateTiles(['l', 'i', 'n', 'o']);
49
49
  const results = solve(trie!, config, board, tiles);
50
- expect(results.length).toBe(61);
50
+ expect(results.length).toBe(60);
51
51
  });
52
52
 
53
53
  it('zmartwychwstałą x9', () => {
@@ -136,4 +136,28 @@ describe('solve - ES', () => {
136
136
  expect(results.length).toBe(24);
137
137
  expect(bestResult.points).toBe(22);
138
138
  });
139
+
140
+ it('chooho - does not use C + H to imitate CH', () => {
141
+ const board = Board.fromStringArray([
142
+ ' ',
143
+ ' ',
144
+ ' ',
145
+ ' ',
146
+ ' ',
147
+ ' ',
148
+ ' ',
149
+ ' ',
150
+ ' ',
151
+ ' ',
152
+ ' ',
153
+ ' ',
154
+ ' ',
155
+ ' ',
156
+ ' ',
157
+ ]);
158
+ const tiles = generateTiles(['ch', 'o', 'o', 'c', 'h']);
159
+ const results = solve(trie!, config, board, tiles);
160
+ const words = results.map((result) => result.cells.map((cell) => cell.tile?.character).join(''));
161
+ expect(words).not.toContain('chocho');
162
+ });
139
163
  });
@@ -1,6 +1,7 @@
1
1
  import { Trie } from '@kamilmielnik/trie';
2
2
  import { Board, Config, ResultJson, Tile } from '@scrabble-solver/types';
3
3
 
4
+ import areDigraphsValid from './areDigraphsValid';
4
5
  import fillPattern from './fillPattern';
5
6
  import generatePatterns from './generatePatterns';
6
7
  import getPatternScore from './getPatternScore';
@@ -9,7 +10,8 @@ import getUniquePatterns from './getUniquePatterns';
9
10
  const solve = (trie: Trie, config: Config, board: Board, tiles: Tile[]): ResultJson[] => {
10
11
  const patterns = generatePatterns(config, board);
11
12
  const filledPatterns = patterns.flatMap((pattern) => fillPattern(trie, config, pattern, tiles));
12
- const uniquePatterns = getUniquePatterns(filledPatterns);
13
+ const validPatterns = filledPatterns.filter((pattern) => areDigraphsValid(config, pattern));
14
+ const uniquePatterns = getUniquePatterns(validPatterns);
13
15
  const results = uniquePatterns.map((pattern, index) => ({
14
16
  cells: pattern.cells.map((cell) => cell.toJson()),
15
17
  collisions: pattern.getCollisions().map((collision) => collision.cells.map((cell) => cell.toJson())),
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/types",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "description": "Scrabble Solver 2 - Types",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -17,14 +17,14 @@
17
17
  "bugs": {
18
18
  "url": "https://github.com/kamilmielnik/scrabble-solver/issues"
19
19
  },
20
- "homepage": "https://github.com/kamilmielnik/scrabble-solver#readme",
20
+ "homepage": "https://scrabble-solver.org",
21
21
  "scripts": {
22
22
  "build": "tsc --project .",
23
23
  "clean": "rimraf build/ node_modules/",
24
24
  "clean:force": "npm run clean && rimraf package-lock.json"
25
25
  },
26
26
  "dependencies": {
27
- "@scrabble-solver/constants": "^2.12.1"
27
+ "@scrabble-solver/constants": "^2.12.2"
28
28
  },
29
29
  "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
30
30
  }
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@scrabble-solver/word-definitions",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@scrabble-solver/word-definitions",
9
- "version": "2.12.1",
9
+ "version": "2.12.2",
10
10
  "license": "CC-BY-NC-ND-4.0",
11
11
  "dependencies": {
12
12
  "cheerio": "^1.0.0-rc.12",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/word-definitions",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "description": "Scrabble Solver 2 - Word definitions",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -17,13 +17,13 @@
17
17
  "bugs": {
18
18
  "url": "https://github.com/kamilmielnik/scrabble-solver/issues"
19
19
  },
20
- "homepage": "https://github.com/kamilmielnik/scrabble-solver#readme",
20
+ "homepage": "https://scrabble-solver.org",
21
21
  "scripts": {
22
22
  "build": "tsc --project .",
23
23
  "clean": "rimraf build/ node_modules/ package-lock.json"
24
24
  },
25
25
  "dependencies": {
26
- "@scrabble-solver/types": "^2.12.1",
26
+ "@scrabble-solver/types": "^2.12.2",
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.12.1",
3
+ "version": "2.12.2",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@scrabble-solver/word-lists",
9
- "version": "2.12.1",
9
+ "version": "2.12.2",
10
10
  "license": "CC-BY-NC-ND-4.0",
11
11
  "dependencies": {
12
12
  "cheerio": "^1.0.0-rc.12",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrabble-solver/word-lists",
3
- "version": "2.12.1",
3
+ "version": "2.12.2",
4
4
  "description": "Scrabble Solver 2 - Word lists",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -17,14 +17,14 @@
17
17
  "bugs": {
18
18
  "url": "https://github.com/kamilmielnik/scrabble-solver/issues"
19
19
  },
20
- "homepage": "https://github.com/kamilmielnik/scrabble-solver#readme",
20
+ "homepage": "https://scrabble-solver.org",
21
21
  "scripts": {
22
22
  "build": "tsc --project .",
23
23
  "clean": "rimraf build/ node_modules/",
24
24
  "clean:force": "npm run clean && rimraf package-lock.json"
25
25
  },
26
26
  "dependencies": {
27
- "@scrabble-solver/types": "^2.12.1",
27
+ "@scrabble-solver/types": "^2.12.2",
28
28
  "cheerio": "^1.0.0-rc.12",
29
29
  "follow-redirects": "^1.15.2",
30
30
  "unzipper": "^0.10.11"