scrabble-solver 2.11.7 → 2.11.9

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

@@ -1,11 +1,12 @@
 import { Board, Locale } from '@scrabble-solver/types';
 import store2 from 'store2';
 
-import { AutoGroupTiles, Rack } from 'types';
+import { AutoGroupTiles, InputMode, Rack } from 'types';
 
 const AUTO_GROUP_TILES = 'auto-group-tiles';
 const BOARD = 'board';
 const CONFIG_ID = 'config-id';
+const INPUT_MODE = 'input-mode';
 const LOCALE = 'locale';
 const RACK = 'rack';
 
@@ -38,6 +39,14 @@ const localStorage = {
     store.set(CONFIG_ID, configId, true);
   },
 
+  getInputMode(): InputMode | undefined {
+    return store.get(INPUT_MODE);
+  },
+
+  setInputMode(inputMode: InputMode | undefined): void {
+    store.set(INPUT_MODE, inputMode, true);
+  },
+
   getLocale(): Locale | undefined {
     return store.get(LOCALE);
   },

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

@@ -65,6 +65,8 @@ export const selectLocaleAutoGroupTiles = createSelector([selectLocale, selectSe
 
 export const selectBoard = selectBoardRoot;
 
+export const selectInputMode = createSelector([selectSettingsRoot], (settings) => settings.inputMode);
+
 export const selectConfigId = createSelector([selectSettingsRoot], (settings) => settings.configId);
 
 export const selectConfig = createSelector([selectConfigId, selectLocale], getLocaleConfig);

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

@@ -2,21 +2,24 @@ import { literaki, scrabble } from '@scrabble-solver/configs';
 import { Locale } from '@scrabble-solver/types';
 
 import { guessLocale } from 'lib';
-import { AutoGroupTiles } from 'types';
+import { AutoGroupTiles, InputMode } from 'types';
 
 import localStorage from '../localStorage';
 
 export interface SettingsState {
   autoGroupTiles: AutoGroupTiles;
   configId: typeof literaki.id | typeof scrabble.id;
+  inputMode: InputMode;
   locale: Locale;
 }
 
 const localStorageAutoGroupTiles = localStorage.getAutoGroupTiles();
+const isTouchScreen = typeof globalThis.matchMedia !== 'undefined' && globalThis.matchMedia('(hover: none)').matches;
 
 const settingsInitialState: SettingsState = {
   autoGroupTiles: typeof localStorageAutoGroupTiles === 'undefined' ? 'left' : localStorageAutoGroupTiles,
   configId: localStorage.getConfigId() || scrabble.id,
+  inputMode: localStorage.getInputMode() || (isTouchScreen ? 'touchscreen' : 'keyboard'),
   locale: localStorage.getLocale() || guessLocale(),
 };
 

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

@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { Locale } from '@scrabble-solver/types';
 
-import { AutoGroupTiles } from 'types';
+import { AutoGroupTiles, InputMode } from 'types';
 
 import settingsInitialState from './settingsInitialState';
 
@@ -19,6 +19,11 @@ const settingsSlice = createSlice({
       return { ...state, configId };
     },
 
+    changeInputMode: (state, action: PayloadAction<InputMode>) => {
+      const inputMode = action.payload;
+      return { ...state, inputMode };
+    },
+
     changeLocale: (state, action: PayloadAction<Locale>) => {
       const locale = action.payload;
       return { ...state, locale };

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

@@ -103,6 +103,7 @@ $media-expressions: (
   padding: 0 var(--spacing--l);
   transition: var(--transition);
   font-size: var(--font--size--m);
+  outline: none;
 }
 
 @mixin text-stroke($color, $size: 1px) {

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

@@ -107,6 +107,8 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --button--icon--size: 24px;
   --dictionary--height: 260px;
   --dictionary--height--mobile: 110px;
+  --key--height: 36px;
+  --key--icon--size: 16px;
   --logo--aspect-ratio: 682 / 166;
   --logo--height: 60px;
   --modal--width: 370px;

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

@@ -4,6 +4,8 @@ export type AutoGroupTiles = 'left' | 'right' | null;
 
 export type Direction = 'horizontal' | 'vertical';
 
+export type InputMode = 'keyboard' | 'touchscreen';
+
 export interface Point {
   x: number;
   y: number;
@@ -45,6 +47,7 @@ export enum ResultColumn {
   WordsCount = 'words-count',
 }
 export type TranslationKey =
+  | 'cell.enter-word'
   | 'cell.filter-cell'
   | 'cell.set-blank'
   | 'cell.set-not-blank'
@@ -89,6 +92,7 @@ export type TranslationKey =
   | 'menu'
   | 'rack.placeholder'
   | 'rack.tile.location'
+  | 'rack.touchscreen.placeholder'
   | 'remaining-tiles'
   | 'results'
   | 'results.empty-state.no-results'
@@ -104,6 +108,9 @@ export type TranslationKey =
   | 'settings.autoGroupTiles.right'
   | 'settings.autoGroupTiles.null'
   | 'settings.game'
+  | 'settings.inputMode'
+  | 'settings.inputMode.keyboard'
+  | 'settings.inputMode.touchscreen'
   | 'settings.language'
   | 'words'
   | 'words.invalid'

package/packages/solver/build/getCellsScore.js

@@ -5,10 +5,11 @@ const getCellsScore = (config, cells) => {
     const total = cells.reduce(({ multiplier, score }, cell) => {
         const bonus = config.getCellBonus(cell);
         const { characterMultiplier, wordMultiplier } = bonus && bonus.canApply(config, cell) ? bonus.value : constants_1.NO_BONUS;
-        const characterScore = cell.tile.isBlank ? config.blankScore : config.pointsMap[cell.tile.character];
+        const characterScore = config.pointsMap[cell.tile.character] || 0;
+        const tileScore = cell.tile.isBlank ? config.blankScore : characterScore;
         return {
             multiplier: multiplier * wordMultiplier,
-            score: score + characterScore * characterMultiplier,
+            score: score + tileScore * characterMultiplier,
         };
     }, { multiplier: 1, score: 0 });
     return total.score * total.multiplier;

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.11.7",
-  "lockfileVersion": 3,
+  "version": "2.11.9",
+  "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.11.7",
+      "version": "2.11.9",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^2.0.1"
@@ -20,5 +20,12 @@
         "node": ">=16"
       }
     }
+  },
+  "dependencies": {
+    "@kamilmielnik/trie": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@kamilmielnik/trie/-/trie-2.0.1.tgz",
+      "integrity": "sha512-6Ulw5/xgFRadHsx0uVnpOxB2E2ZO2osnaakI26yS3RMlww580JiaQEfXUmQjXZcmOjcO+HrZ0CWjRDhoDYKHbg=="
+    }
   }
 }

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.11.7",
+  "version": "2.11.9",
   "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.11.7"
+    "@scrabble-solver/types": "^2.11.9"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.11.7",
-    "@scrabble-solver/constants": "^2.11.7",
-    "@scrabble-solver/dictionaries": "^2.11.7"
+    "@scrabble-solver/configs": "^2.11.9",
+    "@scrabble-solver/constants": "^2.11.9",
+    "@scrabble-solver/dictionaries": "^2.11.9"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/solver/src/getCellsScore.ts

@@ -6,11 +6,12 @@ const getCellsScore = (config: Config, cells: Cell[]): number => {
     ({ multiplier, score }, cell: Cell): { multiplier: number; score: number } => {
       const bonus = config.getCellBonus(cell);
       const { characterMultiplier, wordMultiplier } = bonus && bonus.canApply(config, cell) ? bonus.value : NO_BONUS;
-      const characterScore = cell.tile.isBlank ? config.blankScore : config.pointsMap[cell.tile.character];
+      const characterScore = config.pointsMap[cell.tile.character] || 0;
+      const tileScore = cell.tile.isBlank ? config.blankScore : characterScore;
 
       return {
         multiplier: multiplier * wordMultiplier,
-        score: score + characterScore * characterMultiplier,
+        score: score + tileScore * characterMultiplier,
       };
     },
     { multiplier: 1, score: 0 },

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

@@ -2,6 +2,7 @@ import Bonus from './Bonus';
 import BonusValue from './BonusValue';
 import Cell from './Cell';
 import ConfigJson from './ConfigJson';
+import Locale from './Locale';
 import Tile from './Tile';
 import TileConfig from './TileConfig';
 declare class Config {
@@ -16,6 +17,7 @@ declare class Config {
     get blanksCount(): number;
     get boardHeight(): number;
     get boardWidth(): number;
+    get locale(): Locale;
     get twoCharacterTiles(): string[];
     getCellBonus(cell: Cell): Bonus | undefined;
     getCellBonusValue(cell: Cell): BonusValue;

package/packages/types/build/Config.js

@@ -33,6 +33,9 @@ class Config {
     get boardWidth() {
         return this.config.boardWidth;
     }
+    get locale() {
+        return this.config.locale;
+    }
     get twoCharacterTiles() {
         return this.config.tiles.filter((tile) => tile.character.length === 2).map((tile) => tile.character);
     }

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

@@ -1,4 +1,5 @@
 import BonusJson from './BonusJson';
+import Locale from './Locale';
 import TileConfig from './TileConfig';
 interface ConfigJson {
     allTilesBonusScore: number;
@@ -8,6 +9,7 @@ interface ConfigJson {
     boardWidth: number;
     bonuses: BonusJson[];
     id: string;
+    locale: Locale;
     maximumCharactersCount: number;
     name: string;
     tiles: TileConfig[];

package/packages/types/package.json

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

package/packages/types/src/Config.ts

@@ -5,6 +5,7 @@ import BonusValue from './BonusValue';
 import Cell from './Cell';
 import CharacterBonus from './CharacterBonus';
 import ConfigJson from './ConfigJson';
+import Locale from './Locale';
 import Tile from './Tile';
 import TileConfig from './TileConfig';
 import WordBonus from './WordBonus';
@@ -50,6 +51,10 @@ class Config {
     return this.config.boardWidth;
   }
 
+  public get locale(): Locale {
+    return this.config.locale;
+  }
+
   public get twoCharacterTiles(): string[] {
     return this.config.tiles.filter((tile) => tile.character.length === 2).map((tile) => tile.character);
   }

package/packages/types/src/ConfigJson.ts

@@ -1,4 +1,5 @@
 import BonusJson from './BonusJson';
+import Locale from './Locale';
 import TileConfig from './TileConfig';
 
 interface ConfigJson {
@@ -9,6 +10,7 @@ interface ConfigJson {
   boardWidth: number;
   bonuses: BonusJson[];
   id: string;
+  locale: Locale;
   maximumCharactersCount: number;
   name: string;
   tiles: TileConfig[];

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.11.7",
+  "version": "2.11.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.11.7",
+      "version": "2.11.9",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.15.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.5.tgz",
-      "integrity": "sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==",
+      "version": "18.15.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
+      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
       "dev": true
     },
     "node_modules/boolbase": {
@@ -181,9 +181,9 @@
       }
     },
     "node_modules/htmlparser2": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
-      "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
         {
@@ -193,9 +193,9 @@
       ],
       "dependencies": {
         "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
+        "domhandler": "^5.0.3",
         "domutils": "^3.0.1",
-        "entities": "^4.3.0"
+        "entities": "^4.4.0"
       }
     },
     "node_modules/nth-check": {
@@ -249,9 +249,9 @@
       }
     },
     "@types/node": {
-      "version": "18.15.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.5.tgz",
-      "integrity": "sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==",
+      "version": "18.15.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
+      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
       "dev": true
     },
     "boolbase": {
@@ -347,14 +347,14 @@
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "htmlparser2": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
-      "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
       "requires": {
         "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
+        "domhandler": "^5.0.3",
         "domutils": "^3.0.1",
-        "entities": "^4.3.0"
+        "entities": "^4.4.0"
       }
     },
     "nth-check": {

package/packages/word-definitions/package.json

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