scrabble-solver 2.8.10 → 2.8.11

package/packages/scrabble-solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/scrabble-solver",
-      "version": "2.8.10",
+      "version": "2.8.11",
       "license": "CC BY-NC-ND 4.0",
       "dependencies": {
         "@popperjs/core": "^2.11.6",

package/packages/scrabble-solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "description": "Scrabble Solver 2 - App",
   "engines": {
     "node": ">=16"
@@ -30,13 +30,13 @@
   "dependencies": {
     "@popperjs/core": "^2.11.6",
     "@reduxjs/toolkit": "^1.8.6",
-    "@scrabble-solver/configs": "^2.8.10",
-    "@scrabble-solver/constants": "^2.8.10",
-    "@scrabble-solver/dictionaries": "^2.8.10",
-    "@scrabble-solver/logger": "^2.8.10",
-    "@scrabble-solver/solver": "^2.8.10",
-    "@scrabble-solver/types": "^2.8.10",
-    "@scrabble-solver/word-definitions": "^2.8.10",
+    "@scrabble-solver/configs": "^2.8.11",
+    "@scrabble-solver/constants": "^2.8.11",
+    "@scrabble-solver/dictionaries": "^2.8.11",
+    "@scrabble-solver/logger": "^2.8.11",
+    "@scrabble-solver/solver": "^2.8.11",
+    "@scrabble-solver/types": "^2.8.11",
+    "@scrabble-solver/word-definitions": "^2.8.11",
     "classnames": "^2.3.2",
     "next": "^12.3.1",
     "normalize.css": "^8.0.1",

package/packages/scrabble-solver/src/components/Board/components/Cell/CellPure.tsx

@@ -81,39 +81,41 @@ const CellPure: FunctionComponent<Props> = ({
       onFocus={onFocus}
     />
 
-    <div className={styles.actions}>
-      <Button tooltip={translate('cell.toggle-direction')} onClick={onDirectionToggleClick}>
-        <ArrowDown
-          className={classNames(styles.toggleDirection, {
-            [styles.right]: direction === 'horizontal',
-          })}
-        />
-      </Button>
-
-      {isEmpty && (
-        <Button
-          className={classNames(styles.filterCell, {
-            [styles.filtered]: isFiltered,
-          })}
-          tooltip={translate('cell.filter-cell')}
-          onClick={onToggleFilterCellClick}
-        >
-          <Flag />
+    {!cell.isCandidate() && (
+      <div className={styles.actions}>
+        <Button tooltip={translate('cell.toggle-direction')} onClick={onDirectionToggleClick}>
+          <ArrowDown
+            className={classNames(styles.toggleDirection, {
+              [styles.right]: direction === 'horizontal',
+            })}
+          />
         </Button>
-      )}
 
-      {!isEmpty && (
-        <Button
-          className={classNames(styles.blank, {
-            [styles.active]: tile.isBlank,
-          })}
-          tooltip={tile.isBlank ? translate('cell.set-not-blank') : translate('cell.set-blank')}
-          onClick={onToggleBlankClick}
-        >
-          B
-        </Button>
-      )}
-    </div>
+        {isEmpty && (
+          <Button
+            className={classNames(styles.filterCell, {
+              [styles.filtered]: isFiltered,
+            })}
+            tooltip={translate('cell.filter-cell')}
+            onClick={onToggleFilterCellClick}
+          >
+            <Flag />
+          </Button>
+        )}
+
+        {!isEmpty && (
+          <Button
+            className={classNames(styles.blank, {
+              [styles.active]: tile.isBlank,
+            })}
+            tooltip={tile.isBlank ? translate('cell.set-not-blank') : translate('cell.set-blank')}
+            onClick={onToggleBlankClick}
+          >
+            B
+          </Button>
+        )}
+      </div>
+    )}
   </div>
 );
 

package/packages/scrabble-solver/src/components/Board/hooks/useGrid.ts

@@ -15,6 +15,7 @@ import {
 } from 'react';
 import { useDispatch } from 'react-redux';
 import { useLatest } from 'react-use';
+import { AnyAction } from 'redux';
 
 import { createGridOf, createKeyboardNavigation, extractCharacters, extractInputValue, isCtrl } from 'lib';
 import { boardSlice, selectConfig, useTypedSelector } from 'state';
@@ -82,6 +83,7 @@ const useGrid = (rows: Cell[][]): [State, Actions] => {
   const insertValue = useCallback(
     (position: Point, value: string) => {
       const characters = value ? extractCharacters(config, value).filter((character) => character !== BLANK) : [BLANK];
+      const actions: AnyAction[] = [];
       let board = new Board({ rows: rows.map((row) => row.map((cell) => cell.clone())) });
       let { x, y } = position;
 
@@ -108,10 +110,9 @@ const useGrid = (rows: Cell[][]): [State, Actions] => {
           const twoCharacterCandidate = cellUp.tile.character + character;
 
           if (!cellUp.tile.isBlank && config.twoCharacterTiles.includes(twoCharacterCandidate)) {
-            board = boardSlice.reducer(
-              board,
-              boardSlice.actions.changeCellValue({ x, y: y - 1, value: twoCharacterCandidate }),
-            );
+            const action = boardSlice.actions.changeCellValue({ x, y: y - 1, value: twoCharacterCandidate });
+            board = boardSlice.reducer(board, action);
+            actions.push(action);
             return;
           }
         }
@@ -121,8 +122,10 @@ const useGrid = (rows: Cell[][]): [State, Actions] => {
           const twoCharacterCandidate = character + cellDown.tile.character;
 
           if (!cellDown.tile.isBlank && config.twoCharacterTiles.includes(twoCharacterCandidate)) {
-            board = boardSlice.reducer(board, boardSlice.actions.changeCellValue({ x, y, value: character }));
-            board = boardSlice.reducer(board, boardSlice.actions.changeCellValue({ x, y: y + 1, value: EMPTY_CELL }));
+            const action1 = boardSlice.actions.changeCellValue({ x, y, value: character });
+            const action2 = boardSlice.actions.changeCellValue({ x, y: y + 1, value: EMPTY_CELL });
+            board = boardSlice.reducer(boardSlice.reducer(board, action1), action2);
+            actions.push(action1, action2);
             scheduleMoveFocus();
             return;
           }
@@ -133,10 +136,9 @@ const useGrid = (rows: Cell[][]): [State, Actions] => {
           const twoCharacterCandidate = cellLeft.tile.character + character;
 
           if (!cellLeft.tile.isBlank && config.twoCharacterTiles.includes(twoCharacterCandidate)) {
-            board = boardSlice.reducer(
-              board,
-              boardSlice.actions.changeCellValue({ x: x - 1, y, value: twoCharacterCandidate }),
-            );
+            const action = boardSlice.actions.changeCellValue({ x: x - 1, y, value: twoCharacterCandidate });
+            board = boardSlice.reducer(board, action);
+            actions.push(action);
             return;
           }
         }
@@ -146,8 +148,10 @@ const useGrid = (rows: Cell[][]): [State, Actions] => {
           const twoCharacterCandidate = character + cellRight.tile.character;
 
           if (!cellRight.tile.isBlank && config.twoCharacterTiles.includes(twoCharacterCandidate)) {
-            board = boardSlice.reducer(board, boardSlice.actions.changeCellValue({ x, y, value: character }));
-            board = boardSlice.reducer(board, boardSlice.actions.changeCellValue({ x: x + 1, y, value: EMPTY_CELL }));
+            const action1 = boardSlice.actions.changeCellValue({ x, y, value: character });
+            const action2 = boardSlice.actions.changeCellValue({ x: x + 1, y, value: EMPTY_CELL });
+            board = boardSlice.reducer(boardSlice.reducer(board, action1), action2);
+            actions.push(action1, action2);
             scheduleMoveFocus();
             return;
           }
@@ -158,20 +162,21 @@ const useGrid = (rows: Cell[][]): [State, Actions] => {
           const twoCharacterCandidate = cell.tile.character + character;
 
           if (!cell.tile.isBlank && config.twoCharacterTiles.includes(twoCharacterCandidate)) {
-            board = boardSlice.reducer(
-              board,
-              boardSlice.actions.changeCellValue({ x, y, value: twoCharacterCandidate }),
-            );
+            const action = boardSlice.actions.changeCellValue({ x, y, value: twoCharacterCandidate });
+            board = boardSlice.reducer(board, action);
+            actions.push(action);
             return;
           }
         }
 
-        board = boardSlice.reducer(board, boardSlice.actions.changeCellValue({ x, y, value: character }));
+        const action = boardSlice.actions.changeCellValue({ x, y, value: character });
+        board = boardSlice.reducer(board, action);
+        actions.push(action);
         scheduleMoveFocus();
       });
 
       moveFocus(Math.abs(position.x - x) + Math.abs(position.y - y));
-      dispatch(boardSlice.actions.change(board));
+      actions.forEach(dispatch);
     },
     [config, directionRef, dispatch, moveFocus, rows],
   );

package/packages/scrabble-solver/src/components/Sidebar/Sidebar.tsx

@@ -1,6 +1,7 @@
 import classNames from 'classnames';
-import { FunctionComponent, ReactNode } from 'react';
+import { FunctionComponent, ReactNode, useEffect, useState } from 'react';
 import Modal from 'react-modal';
+import { useKey } from 'react-use';
 
 import { CrossFill } from 'icons';
 import { TRANSITION_DURATION_LONG } from 'parameters';
@@ -21,6 +22,23 @@ export interface Props {
 
 const Sidebar: FunctionComponent<Props> = ({ children, className, isOpen, title, onClose }) => {
   const translate = useTranslate();
+  const [shouldReturnFocusAfterClose, setShouldReturnFocusAfterClose] = useState(true);
+
+  useKey(
+    'Escape',
+    () => {
+      setShouldReturnFocusAfterClose(false);
+      onClose();
+    },
+    undefined,
+    [onClose],
+  );
+
+  useEffect(() => {
+    if (isOpen) {
+      setShouldReturnFocusAfterClose(true);
+    }
+  }, [isOpen]);
 
   return (
     <Modal
@@ -33,6 +51,7 @@ const Sidebar: FunctionComponent<Props> = ({ children, className, isOpen, title,
       contentLabel={title}
       isOpen={isOpen}
       overlayClassName={styles.overlay}
+      shouldReturnFocusAfterClose={shouldReturnFocusAfterClose}
       onRequestClose={onClose}
     >
       <div className={classNames(styles.sidebar, className)}>

package/packages/scrabble-solver/src/state/sagas.ts

@@ -37,6 +37,7 @@ type AnyGenerator = Generator<any, any, any>;
 
 export function* rootSaga(): AnyGenerator {
   yield takeEvery(boardSlice.actions.changeCellValue.type, onCellValueChange);
+  yield takeEvery([rackSlice.actions.changeCharacter.type, rackSlice.actions.changeCharacters.type], onRackValueChange);
   yield takeEvery(resultsSlice.actions.applyResult.type, onApplyResult);
   yield takeEvery(resultsSlice.actions.changeResultCandidate.type, onResultCandidateChange);
   yield takeEvery(settingsSlice.actions.changeConfigId.type, onConfigIdChange);
@@ -55,9 +56,14 @@ function* onCellValueChange({ payload }: PayloadAction<{ value: string; x: numbe
     yield put(cellFilterSlice.actions.toggle(payload));
   }
 
+  yield put(resultsSlice.actions.changeResultCandidate(null));
   yield put(verifySlice.actions.submit());
 }
 
+function* onRackValueChange(): AnyGenerator {
+  yield put(resultsSlice.actions.changeResultCandidate(null));
+}
+
 function* onApplyResult({ payload: result }: PayloadAction<Result>): AnyGenerator {
   const autoGroupTiles = yield select(selectAutoGroupTiles);
   yield put(boardSlice.actions.applyResult(result));

package/packages/scrabble-solver/src/state/slices/rackSlice.ts

@@ -9,11 +9,6 @@ const rackSlice = createSlice({
   initialState: rackInitialState,
   name: 'rack',
   reducers: {
-    change: (_state, action: PayloadAction<(string | null)[]>) => {
-      const rack = action.payload;
-      return rack;
-    },
-
     changeCharacter: (state, action: PayloadAction<{ character: string | null; index: number }>) => {
       const { character, index } = action.payload;
       return [...state.slice(0, index), character, ...state.slice(index + 1)];

package/packages/solver/build/index.d.ts

@@ -1 +1,13 @@
+export { default as fillPattern } from './fillPattern';
+export { default as generateEndIndices } from './generateEndIndices';
+export { default as generateHorizontalPatterns } from './generateHorizontalPatterns';
+export { default as generatePattern } from './generatePattern';
+export { default as generatePatterns } from './generatePatterns';
+export { default as generateStartIndices } from './generateStartIndices';
+export { default as generateVectors } from './generateVectors';
+export { default as generateVerticalPatterns } from './generateVerticalPatterns';
+export { default as getCellsScore } from './getCellsScore';
+export { default as getPatternHash } from './getPatternHash';
+export { default as getPatternScore } from './getPatternScore';
+export { default as getUniquePatterns } from './getUniquePatterns';
 export { default as solve } from './solve';

package/packages/solver/build/index.js

@@ -3,6 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solve = void 0;
+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;
+var fillPattern_1 = require("./fillPattern");
+Object.defineProperty(exports, "fillPattern", { enumerable: true, get: function () { return __importDefault(fillPattern_1).default; } });
+var generateEndIndices_1 = require("./generateEndIndices");
+Object.defineProperty(exports, "generateEndIndices", { enumerable: true, get: function () { return __importDefault(generateEndIndices_1).default; } });
+var generateHorizontalPatterns_1 = require("./generateHorizontalPatterns");
+Object.defineProperty(exports, "generateHorizontalPatterns", { enumerable: true, get: function () { return __importDefault(generateHorizontalPatterns_1).default; } });
+var generatePattern_1 = require("./generatePattern");
+Object.defineProperty(exports, "generatePattern", { enumerable: true, get: function () { return __importDefault(generatePattern_1).default; } });
+var generatePatterns_1 = require("./generatePatterns");
+Object.defineProperty(exports, "generatePatterns", { enumerable: true, get: function () { return __importDefault(generatePatterns_1).default; } });
+var generateStartIndices_1 = require("./generateStartIndices");
+Object.defineProperty(exports, "generateStartIndices", { enumerable: true, get: function () { return __importDefault(generateStartIndices_1).default; } });
+var generateVectors_1 = require("./generateVectors");
+Object.defineProperty(exports, "generateVectors", { enumerable: true, get: function () { return __importDefault(generateVectors_1).default; } });
+var generateVerticalPatterns_1 = require("./generateVerticalPatterns");
+Object.defineProperty(exports, "generateVerticalPatterns", { enumerable: true, get: function () { return __importDefault(generateVerticalPatterns_1).default; } });
+var getCellsScore_1 = require("./getCellsScore");
+Object.defineProperty(exports, "getCellsScore", { enumerable: true, get: function () { return __importDefault(getCellsScore_1).default; } });
+var getPatternHash_1 = require("./getPatternHash");
+Object.defineProperty(exports, "getPatternHash", { enumerable: true, get: function () { return __importDefault(getPatternHash_1).default; } });
+var getPatternScore_1 = require("./getPatternScore");
+Object.defineProperty(exports, "getPatternScore", { enumerable: true, get: function () { return __importDefault(getPatternScore_1).default; } });
+var getUniquePatterns_1 = require("./getUniquePatterns");
+Object.defineProperty(exports, "getUniquePatterns", { enumerable: true, get: function () { return __importDefault(getUniquePatterns_1).default; } });
 var solve_1 = require("./solve");
 Object.defineProperty(exports, "solve", { enumerable: true, get: function () { return __importDefault(solve_1).default; } });

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.8.10",
+      "version": "2.8.11",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^2.0.1"

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^2.0.1",
-    "@scrabble-solver/types": "^2.8.10"
+    "@scrabble-solver/types": "^2.8.11"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.8.10",
-    "@scrabble-solver/constants": "^2.8.10",
-    "@scrabble-solver/dictionaries": "^2.8.10"
+    "@scrabble-solver/configs": "^2.8.11",
+    "@scrabble-solver/constants": "^2.8.11",
+    "@scrabble-solver/dictionaries": "^2.8.11"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/solver/src/index.ts

@@ -1 +1,13 @@
+export { default as fillPattern } from './fillPattern';
+export { default as generateEndIndices } from './generateEndIndices';
+export { default as generateHorizontalPatterns } from './generateHorizontalPatterns';
+export { default as generatePattern } from './generatePattern';
+export { default as generatePatterns } from './generatePatterns';
+export { default as generateStartIndices } from './generateStartIndices';
+export { default as generateVectors } from './generateVectors';
+export { default as generateVerticalPatterns } from './generateVerticalPatterns';
+export { default as getCellsScore } from './getCellsScore';
+export { default as getPatternHash } from './getPatternHash';
+export { default as getPatternScore } from './getPatternScore';
+export { default as getUniquePatterns } from './getUniquePatterns';
 export { default as solve } from './solve';

package/packages/types/package.json

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

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.8.10",
+      "version": "2.8.11",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.11.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.2.tgz",
-      "integrity": "sha512-BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw==",
+      "version": "18.11.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.3.tgz",
+      "integrity": "sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==",
       "dev": true
     },
     "node_modules/boolbase": {
@@ -249,9 +249,9 @@
       }
     },
     "@types/node": {
-      "version": "18.11.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.2.tgz",
-      "integrity": "sha512-BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw==",
+      "version": "18.11.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.3.tgz",
+      "integrity": "sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==",
       "dev": true
     },
     "boolbase": {

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "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.10",
+    "@scrabble-solver/types": "^2.8.11",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-lists",
-      "version": "2.8.10",
+      "version": "2.8.11",
       "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.10",
+  "version": "2.8.11",
   "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.10",
+    "@scrabble-solver/types": "^2.8.11",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "memfs": "^3.4.7",

package/packages/scrabble-solver/.next/static/A8A_Lmg8cM-Bkf-Jo1CLh/_buildManifest.js

@@ -1 +0,0 @@
-self.__BUILD_MANIFEST=function(s,e,a){return{__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":[s,e,a,"static/css/751e8a14776d05d8.css","static/chunks/pages/index-0cc5e6eda5adac73.js"],"/404":[s,e,a,"static/chunks/pages/404-90c624da3c83fd17.js"],"/_error":["static/chunks/pages/_error-a4ba2246ff8fb532.js"],sortedPages:["/","/404","/_app","/_error"]}}("static/chunks/758-eff80059a1365d5d.js","static/css/9ac903004135f4b1.css","static/chunks/317-95ab9051449362fa.js"),self.__BUILD_MANIFEST_CB&&self.__BUILD_MANIFEST_CB();