scrabble-solver 2.10.11 → 2.11.1

package/packages/scrabble-solver/src/pages/api/solve.ts

@@ -57,30 +57,29 @@ const parseRequest = (request: NextApiRequest): RequestData => {
     throw new Error('Invalid "configId" parameter');
   }
 
-  const config = getLocaleConfig(configId, locale);
-
-  if (!isBoardJson(boardJson) || !isBoardValid(boardJson, config)) {
-    throw new Error('Invalid "board" parameter');
-  }
-
   if (!isStringArray(characters) || characters.length === 0) {
     throw new Error('Invalid "characters" parameter');
   }
 
+  const config = getLocaleConfig(configId, locale);
+
   for (const character of characters) {
     if (!config.hasCharacter(character) && character !== BLANK) {
       throw new Error('Invalid "characters" parameter');
     }
   }
-
-  const board = Board.fromJson(boardJson);
-  const blankTilesCount = characters.filter((character) => character === BLANK).length;
-  const blanksCount = board.getBlanksCount() + blankTilesCount;
+  const blanksCount = characters.filter((character) => character === BLANK).length;
 
   if (blanksCount > config.blanksCount) {
     throw new Error('Too many blank tiles passed');
   }
 
+  if (!isBoardJson(boardJson) || !isBoardValid(boardJson, config)) {
+    throw new Error('Invalid "board" parameter');
+  }
+
+  const board = Board.fromJson(boardJson);
+
   return {
     board,
     characters,

package/packages/scrabble-solver/src/pages/index.tsx

@@ -1,18 +1,26 @@
 import classNames from 'classnames';
 import fs from 'fs';
 import path from 'path';
-import { AnimationEvent, FunctionComponent, useEffect, useState } from 'react';
+import { FunctionComponent, useEffect, useState } from 'react';
 import ReactModal from 'react-modal';
 import { useDispatch } from 'react-redux';
 import { useEffectOnce, useMeasure } from 'react-use';
 
 import { Logo, LogoSplashScreen, NavButtons, Solver, SvgFontFix } from 'components';
-import { useDirection, useLanguage, useLocalStorage, useMediaQuery } from 'hooks';
+import { useAppLayout, useDirection, useLanguage, useLocalStorage } from 'hooks';
 import { LOCALE_FEATURES } from 'i18n';
-import { KeyMapModal, MenuModal, RemainingTilesModal, ResultsModal, SettingsModal, WordsModal } from 'modals';
+import {
+  DictionaryModal,
+  KeyMapModal,
+  MenuModal,
+  RemainingTilesModal,
+  ResultsModal,
+  SettingsModal,
+  WordsModal,
+} from 'modals';
 import { INITIALIZATION_DURATION } from 'parameters';
 import { registerServiceWorker } from 'serviceWorkerManager';
-import { initialize, localStorage, reset, selectLocale, useTypedSelector } from 'state';
+import { initialize, reset, selectLocale, useTypedSelector } from 'state';
 
 import styles from './index.module.scss';
 
@@ -26,7 +34,8 @@ interface Props {
 const Index: FunctionComponent<Props> = ({ version }) => {
   const dispatch = useDispatch();
   const locale = useTypedSelector(selectLocale);
-  const isLessThanL = useMediaQuery('<l');
+  const { showResultsInModal } = useAppLayout();
+  const [showDictionary, setShowDictionary] = useState(false);
   const [showKeyMap, setShowKeyMap] = useState(false);
   const [showMenu, setShowMenu] = useState(false);
   const [showRemainingTiles, setShowRemainingTiles] = useState(false);
@@ -44,13 +53,6 @@ const Index: FunctionComponent<Props> = ({ version }) => {
     dispatch(reset());
   };
 
-  const handleSplashAnimationEnd = (event: AnimationEvent<HTMLDivElement>) => {
-    if (event.target === event.currentTarget && !localStorage.getHasVisited()) {
-      setShowSettings(true);
-      localStorage.setHasVisited(true);
-    }
-  };
-
   useDirection(LOCALE_FEATURES[locale].direction);
   useLanguage(locale);
   useLocalStorage();
@@ -65,10 +67,10 @@ const Index: FunctionComponent<Props> = ({ version }) => {
   });
 
   useEffect(() => {
-    if (!isLessThanL) {
+    if (!showResultsInModal) {
       setShowResults(false);
     }
-  }, [isLessThanL]);
+  }, [showResultsInModal]);
 
   useEffect(() => {
     if (process.env.NODE_ENV === 'production') {
@@ -115,6 +117,7 @@ const Index: FunctionComponent<Props> = ({ version }) => {
       <MenuModal
         isOpen={showMenu}
         onClose={() => setShowMenu(false)}
+        onShowDictionary={() => setShowDictionary(true)}
         onShowRemainingTiles={() => setShowRemainingTiles(true)}
         onShowSettings={() => setShowSettings(true)}
         onShowWords={() => setShowWords(true)}
@@ -130,7 +133,9 @@ const Index: FunctionComponent<Props> = ({ version }) => {
 
       <ResultsModal isOpen={showResults} onClose={() => setShowResults(false)} />
 
-      <LogoSplashScreen forceShow={!isInitialized} onAnimationEnd={handleSplashAnimationEnd} />
+      <DictionaryModal isOpen={showDictionary} onClose={() => setShowDictionary(false)} />
+
+      <LogoSplashScreen forceShow={!isInitialized} />
     </>
   );
 };

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

@@ -1,21 +1,37 @@
-import { applyMiddleware, compose, createStore } from 'redux';
+import { configureStore } from '@reduxjs/toolkit';
 import reduxSaga from 'redux-saga';
 
-import rootReducer from './rootReducer';
 import { rootSaga } from './sagas';
-import { RootState } from './types';
+import {
+  boardSlice,
+  cellFilterSlice,
+  dictionarySlice,
+  rackSlice,
+  resultsSlice,
+  settingsSlice,
+  solveSlice,
+  verifySlice,
+} from './slices';
 
 const sagaMiddleware = reduxSaga();
-const initialState: Partial<RootState> | undefined = undefined;
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-// eslint-disable-next-line no-underscore-dangle
-const composeEnhancers = globalThis.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+const createAppStore = () => {
+  const store = configureStore({
+    reducer: {
+      board: boardSlice.reducer,
+      cellFilter: cellFilterSlice.reducer,
+      dictionary: dictionarySlice.reducer,
+      rack: rackSlice.reducer,
+      results: resultsSlice.reducer,
+      settings: settingsSlice.reducer,
+      solve: solveSlice.reducer,
+      verify: verifySlice.reducer,
+    },
+    middleware: [sagaMiddleware],
+  });
 
-const createAppStore = (): ReturnType<typeof createStore> => {
-  const store = createStore(rootReducer, initialState, composeEnhancers(applyMiddleware(sagaMiddleware)));
   sagaMiddleware.run(rootSaga);
+
   return store;
 };
 

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

@@ -3,7 +3,6 @@ import store2 from 'store2';
 
 const BOARD = 'board';
 const CONFIG_ID = 'config-id';
-const HAS_VISITED = 'has-visited';
 const LOCALE = 'locale';
 const RACK = 'rack';
 
@@ -28,14 +27,6 @@ const localStorage = {
     store.set(CONFIG_ID, configId, true);
   },
 
-  getHasVisited(): boolean {
-    return Boolean(store.get(HAS_VISITED));
-  },
-
-  setHasVisited(hasVisited: boolean): void {
-    store.set(HAS_VISITED, hasVisited, true);
-  },
-
   getLocale(): Locale | undefined {
     return store.get(LOCALE);
   },

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

@@ -1,3 +1,21 @@
-import rootReducer from './rootReducer';
+import {
+  boardSlice,
+  cellFilterSlice,
+  dictionarySlice,
+  rackSlice,
+  resultsSlice,
+  settingsSlice,
+  solveSlice,
+  verifySlice,
+} from './slices';
 
-export type RootState = ReturnType<typeof rootReducer>;
+export type RootState = {
+  board: ReturnType<typeof boardSlice.reducer>;
+  cellFilter: ReturnType<typeof cellFilterSlice.reducer>;
+  dictionary: ReturnType<typeof dictionarySlice.reducer>;
+  rack: ReturnType<typeof rackSlice.reducer>;
+  results: ReturnType<typeof resultsSlice.reducer>;
+  settings: ReturnType<typeof settingsSlice.reducer>;
+  solve: ReturnType<typeof solveSlice.reducer>;
+  verify: ReturnType<typeof verifySlice.reducer>;
+};

package/packages/scrabble-solver/src/styles/animations.scss

@@ -28,6 +28,16 @@
   }
 }
 
+@keyframes rotate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
 @keyframes pulse {
   0% {
     transform: scale(1);

package/packages/scrabble-solver/src/styles/global.scss

@@ -54,5 +54,5 @@ h4 {
 
 [lang='fa-IR'] {
   --font--family: 'Vazirmatn', sans-serif;
-  --font--family--title: 'Vazirmatn', sans-serif;
+  --font--family--title: var(--font--family);
 }

package/packages/scrabble-solver/src/styles/mixins.scss

@@ -12,6 +12,28 @@ $media-expressions: (
   touch: '(hover: none)',
 );
 
+@mixin scrollbars {
+  scrollbar-color: var(--scrollbar--thumb--color) var(--scrollbar--thumb--track);
+  scrollbar-width: auto;
+
+  &::-webkit-scrollbar {
+    width: var(--scrollbar--size);
+    background-color: var(--scrollbar--track--color);
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: var(--scrollbar--thumb--color);
+  }
+
+  &:hover {
+    scrollbar-color: var(--scrollbar--thumb--color--highlight) var(--scrollbar--track--color);
+
+    &::-webkit-scrollbar-thumb {
+      background-color: var(--scrollbar--thumb--color--highlight);
+    }
+  }
+}
+
 /**
  * It does not work when applied on input elements.
  */

package/packages/scrabble-solver/src/styles/variables.scss

@@ -1,3 +1,5 @@
+@import 'styles/mixins';
+
 $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
 
 :root {
@@ -8,7 +10,7 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --border--width: 1px;
 
   --box-shadow: 0 0 var(--box-shadow--blur) var(--box-shadow--spread) var(--box-shadow--color);
-  --box-shadow--blur: 10px;
+  --box-shadow--blur: 8px;
   --box-shadow--color: rgba(0, 0, 0, 0.15);
   --box-shadow--spread: 1px;
   --box-shadow--null: 0 0 var(--box-shadow--blur) var(--box-shadow--spread) transparent;
@@ -74,6 +76,11 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --spacing--xl: 40px;
   --spacing--xxl: 80px;
 
+  --scrollbar--size: 5px;
+  --scrollbar--thumb--color: var(--border--color);
+  --scrollbar--thumb--color--highlight: var(--color--foreground--secondary);
+  --scrollbar--track--color: transparent;
+
   --transition: all var(--transition--duration) var(--transition--easing);
   --transition--long: all var(--transition--duration--long) var(--transition--easing);
   --transition--duration: 100ms;
@@ -86,10 +93,18 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --z-index--close-button: 101;
   --z-index--tooltip: 102;
 
+  --button--icon--size: 24px;
   --dictionary--height: 260px;
   --modal--width: 370px;
   --solver-column--width: 580px;
   --square-button--size: 32px;
-  --button--icon--size: 24px;
   --text-input--height: 40px;
+
+  @include media('<s') {
+    --box-shadow--blur: 5px;
+  }
+
+  @include media('<xs') {
+    --box-shadow--blur: 3px;
+  }
 }

package/packages/scrabble-solver/src/types/index.ts

@@ -50,6 +50,7 @@ export type TranslationKey =
   | 'common.vowels'
   | 'common.word'
   | 'common.words'
+  | 'dictionary'
   | 'dictionary.empty-state.no-definitions'
   | 'dictionary.empty-state.no-results'
   | 'dictionary.empty-state.not-allowed'

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.10.11",
+  "version": "2.11.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.10.11",
+      "version": "2.11.1",
       "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.10.11",
+  "version": "2.11.1",
   "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.10.11"
+    "@scrabble-solver/types": "^2.11.1"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.10.11",
-    "@scrabble-solver/constants": "^2.10.11",
-    "@scrabble-solver/dictionaries": "^2.10.11"
+    "@scrabble-solver/configs": "^2.11.1",
+    "@scrabble-solver/constants": "^2.11.1",
+    "@scrabble-solver/dictionaries": "^2.11.1"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/build/Bonus.d.ts

@@ -1,3 +1,4 @@
+import { BONUS_CHARACTER, BONUS_WORD } from '@scrabble-solver/constants';
 import BonusJson from './BonusJson';
 import BonusValue from './BonusValue';
 import Cell from './Cell';
@@ -5,7 +6,7 @@ import Config from './Config';
 declare abstract class Bonus {
     readonly multiplier: number;
     readonly score: number | undefined;
-    abstract readonly type: string;
+    abstract readonly type: typeof BONUS_CHARACTER | typeof BONUS_WORD;
     readonly x: number;
     readonly y: number;
     constructor({ multiplier, score, x, y }: {

package/packages/types/package.json

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

package/packages/types/src/Bonus.ts

@@ -1,3 +1,5 @@
+import { BONUS_CHARACTER, BONUS_WORD } from '@scrabble-solver/constants';
+
 import BonusJson from './BonusJson';
 import BonusValue from './BonusValue';
 import Cell from './Cell';
@@ -8,7 +10,7 @@ abstract class Bonus {
 
   public readonly score: number | undefined;
 
-  public abstract readonly type: string;
+  public abstract readonly type: typeof BONUS_CHARACTER | typeof BONUS_WORD;
 
   public readonly x: number;
 

package/packages/word-definitions/build/lib/normalizeDefinition.js

@@ -7,7 +7,7 @@ const striptags_1 = __importDefault(require("striptags"));
 const EMPHASIS_TAGS = ['a', 'b', 'em', 'internalXref'];
 const normalizeHtmlTags = (definition) => (0, striptags_1.default)((0, striptags_1.default)(definition, EMPHASIS_TAGS), undefined, '"');
 const normalizeLineBreaks = (definition) => definition.replace(/\r\n/g, '\n');
-const normalizeWhitespace = (definition) => definition.replace(/[ ]+/g, ' ');
+const normalizeWhitespace = (definition) => definition.replace(/[^\S\n ]+/g, ' ').replace(/[ ]+/g, ' ');
 const normalizeQuotes = (definition) => definition.replace(/\."/g, '".');
 /**
  * `(1.2) definition` -> `definition`

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.10.11",
+  "version": "2.11.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.10.11",
+      "version": "2.11.1",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz",
-      "integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==",
+      "version": "18.15.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
+      "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
       "dev": true
     },
     "node_modules/boolbase": {
@@ -249,9 +249,9 @@
       }
     },
     "@types/node": {
-      "version": "18.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz",
-      "integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==",
+      "version": "18.15.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
+      "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
       "dev": true
     },
     "boolbase": {

package/packages/word-definitions/package.json

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

package/packages/word-definitions/src/lib/normalizeDefinition.ts

@@ -8,7 +8,7 @@ const normalizeHtmlTags: Normalize = (definition) => striptags(striptags(definit
 
 const normalizeLineBreaks: Normalize = (definition) => definition.replace(/\r\n/g, '\n');
 
-const normalizeWhitespace: Normalize = (definition) => definition.replace(/[ ]+/g, ' ');
+const normalizeWhitespace: Normalize = (definition) => definition.replace(/[^\S\n ]+/g, ' ').replace(/[ ]+/g, ' ');
 
 const normalizeQuotes: Normalize = (definition) => definition.replace(/\."/g, '".');
 

package/packages/word-definitions/src/parse/__tests__/expected/en-US.oe.json

@@ -0,0 +1,7 @@
+{
+  "definitions": [
+    "oersted",
+    "Kenzaburo 1935– Japanese writer"
+  ],
+  "exists": true
+}