scrabble-solver 2.15.23 → 2.15.25

package/packages/scrabble-solver/src/i18n/languages/romanian.json

@@ -42,7 +42,7 @@
   "keyMap.board-and-rack.insert-two-letter-tile": "Introducere piesa 2 litere",
   "keyMap.board-and-rack.navigate": "Navigare",
   "keyMap.board-and-rack.remove-tile": "Indeparteaza piesa",
-  "keyMap.board-and-rack.submit": "Pornire cautare",
+  "keyMap.board-and-rack.submit": "Rezolvă",
   "keyMap.rack": "Grupa litere",
   "keyMap.rack.insert-blank": "Introducere joker",
   "menu": "Meniu",

package/packages/scrabble-solver/src/i18n/languages/spanish.json

@@ -42,7 +42,7 @@
   "keyMap.board-and-rack.insert-two-letter-tile": "Insertar mosaico de dos letras",
   "keyMap.board-and-rack.navigate": "Navegar",
   "keyMap.board-and-rack.remove-tile": "Quitar Letra",
-  "keyMap.board-and-rack.submit": "Empezar a resolver",
+  "keyMap.board-and-rack.submit": "Resolver",
   "keyMap.rack": "Estante",
   "keyMap.rack.insert-blank": "Insertar espacio en blanco",
   "menu": "Menú",

package/packages/scrabble-solver/src/i18n/languages/turkish.json

@@ -42,7 +42,7 @@
   "keyMap.board-and-rack.insert-two-letter-tile": "İki harfli kutucuğu ekle",
   "keyMap.board-and-rack.navigate": "Gezinme",
   "keyMap.board-and-rack.remove-tile": "Taşı kaldır",
-  "keyMap.board-and-rack.submit": "Çözmeye başla",
+  "keyMap.board-and-rack.submit": "Çöz",
   "keyMap.rack": "Deste",
   "keyMap.rack.insert-blank": "Joker ekle (spacebar)",
   "menu": "Menü",

package/packages/scrabble-solver/src/lib/createComparator.ts

@@ -1,4 +1,4 @@
-import type { Comparator } from 'types';
+import type { Comparator } from '@/types';
 
 import { createStringComparator } from './createStringComparator';
 import { numberComparator } from './numberComparator';

package/packages/scrabble-solver/src/lib/createKeyComparator.ts

@@ -1,4 +1,4 @@
-import { type Comparator } from 'types';
+import { type Comparator } from '@/types';
 
 import { createStringComparator } from './createStringComparator';
 import { numberComparator } from './numberComparator';

package/packages/scrabble-solver/src/lib/createStringComparator.ts

@@ -1,4 +1,4 @@
-import { type Comparator } from 'types';
+import { type Comparator } from '@/types';
 
 export const createStringComparator: (locale: string) => Comparator<string> = (locale) => {
   return (a, b) => {

package/packages/scrabble-solver/src/lib/getTileSizes.ts

@@ -1,4 +1,4 @@
-import { BOARD_TILE_FONT_SIZE_MIN, BOARD_TILE_FONT_SIZE_POINTS_MIN } from 'parameters';
+import { BOARD_TILE_FONT_SIZE_MIN, BOARD_TILE_FONT_SIZE_POINTS_MIN } from '@/parameters';
 
 interface TileSizes {
   pointsFontSize: number;

package/packages/scrabble-solver/src/lib/numberComparator.ts

@@ -1,3 +1,3 @@
-import { type Comparator } from 'types';
+import { type Comparator } from '@/types';
 
 export const numberComparator: Comparator<number> = (a, b) => a - b;

package/packages/scrabble-solver/src/lib/reverseComparator.ts

@@ -1,4 +1,4 @@
-import { type Comparator } from 'types';
+import { type Comparator } from '@/types';
 
 export const reverseComparator = <T>(comparator: Comparator<T>): Comparator<T> => {
   return (a: T, b: T): number => -comparator(a, b);

package/packages/scrabble-solver/src/lib/zipCharactersAndTiles.ts

@@ -1,7 +1,7 @@
 import { BLANK } from '@scrabble-solver/constants';
 import { type Tile } from '@scrabble-solver/types';
 
-import { type Rack } from 'types';
+import { type Rack } from '@/types';
 
 interface CharacterTilePair {
   character: string | null;

package/packages/scrabble-solver/src/modals/DictionaryModal/DictionaryModal.tsx

@@ -1,7 +1,7 @@
 import { type FunctionComponent, memo } from 'react';
 
-import { Dictionary, DictionaryInput, Modal } from 'components';
-import { useTranslate } from 'state';
+import { Dictionary, DictionaryInput, Modal } from '@/components';
+import { useTranslate } from '@/state';
 
 import styles from './DictionaryModal.module.scss';
 

package/packages/scrabble-solver/src/modals/KeyMapModal/KeyMapModal.tsx

@@ -1,7 +1,7 @@
 import { type FunctionComponent, memo } from 'react';
 
-import { Arrows, Backspace, Ctrl, Del, Enter, Key, Modal, Space } from 'components';
-import { selectConfig, useTranslate, useTypedSelector } from 'state';
+import { Arrows, Backspace, Ctrl, Del, Enter, Key, Modal, Space } from '@/components';
+import { selectConfig, useTranslate, useTypedSelector } from '@/state';
 
 import { Mapping } from './components';
 

package/packages/scrabble-solver/src/modals/MenuModal/MenuModal.tsx

@@ -1,10 +1,10 @@
 import { type FunctionComponent, memo } from 'react';
 
-import { Button, Modal } from 'components';
-import { LOCALE_FEATURES } from 'i18n';
-import { BookHalf, CardChecklist, Cog, Github, Sack } from 'icons';
-import { GITHUB_PROJECT_URL } from 'parameters';
-import { selectLocale, useTranslate, useTypedSelector } from 'state';
+import { Button, Modal } from '@/components';
+import { LOCALE_FEATURES } from '@/i18n';
+import { BookHalf, CardChecklist, Cog, Github, Sack } from '@/icons';
+import { GITHUB_PROJECT_URL } from '@/parameters';
+import { selectLocale, useTranslate, useTypedSelector } from '@/state';
 
 import styles from './MenuModal.module.scss';
 

package/packages/scrabble-solver/src/modals/RemainingTilesModal/RemainingTilesModal.tsx

@@ -1,10 +1,10 @@
 import { type FunctionComponent, memo } from 'react';
 
-import { Badge, Modal } from 'components';
-import { LOCALE_FEATURES } from 'i18n';
-import { getTileSizes } from 'lib';
-import { REMAINING_TILES_TILE_SIZE } from 'parameters';
-import { selectLocale, useTranslate, useTypedSelector } from 'state';
+import { Badge, Modal } from '@/components';
+import { LOCALE_FEATURES } from '@/i18n';
+import { getTileSizes } from '@/lib';
+import { REMAINING_TILES_TILE_SIZE } from '@/parameters';
+import { selectLocale, useTranslate, useTypedSelector } from '@/state';
 
 import { Character } from './components';
 import styles from './RemainingTilesModal.module.scss';

package/packages/scrabble-solver/src/modals/RemainingTilesModal/components/Character/Character.tsx

@@ -2,11 +2,11 @@ import { BLANK } from '@scrabble-solver/constants';
 import classNames from 'classnames';
 import { type FunctionComponent } from 'react';
 
-import { Progress, Tile } from 'components';
-import { LOCALE_FEATURES } from 'i18n';
-import { REMAINING_TILES_TILE_SIZE } from 'parameters';
-import { selectCharacterPoints, selectLocale, useTypedSelector } from 'state';
-import { type RemainingTile } from 'types';
+import { Progress, Tile } from '@/components';
+import { LOCALE_FEATURES } from '@/i18n';
+import { REMAINING_TILES_TILE_SIZE } from '@/parameters';
+import { selectCharacterPoints, selectLocale, useTypedSelector } from '@/state';
+import { type RemainingTile } from '@/types';
 
 import styles from './Character.module.scss';
 

package/packages/scrabble-solver/src/modals/RemainingTilesModal/lib.ts

@@ -1,6 +1,6 @@
 import { BLANK, CONSONANTS, VOWELS } from '@scrabble-solver/constants';
 
-import { type RemainingTile, type RemainingTilesGroup } from 'types';
+import { type RemainingTile, type RemainingTilesGroup } from '@/types';
 
 export const getRemainingTilesGroups = (remainingTiles: RemainingTile[]): RemainingTilesGroup[] => {
   const consonants = remainingTiles.filter(isConsonant);

package/packages/scrabble-solver/src/modals/RemainingTilesModal/selectors.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 
-import { selectRemainingTiles } from 'state';
+import { selectRemainingTiles } from '@/state';
 
 import { getRemainingTilesGroups } from './lib';
 

package/packages/scrabble-solver/src/modals/ResultsModal/ResultsModal.tsx

@@ -2,10 +2,10 @@ import { type Result } from '@scrabble-solver/types';
 import { type FunctionComponent, memo, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { useAppLayout } from 'app-layout';
-import { Button, Dictionary, Modal, Results } from 'components';
-import { Check, EyeFill } from 'icons';
-import { resultsSlice, selectProcessedResults, selectResultCandidate, useTranslate, useTypedSelector } from 'state';
+import { useAppLayout } from '@/app-layout';
+import { Button, Dictionary, Modal, Results } from '@/components';
+import { Check, EyeFill } from '@/icons';
+import { resultsSlice, selectProcessedResults, selectResultCandidate, useTranslate, useTypedSelector } from '@/state';
 
 import styles from './ResultsModal.module.scss';
 

package/packages/scrabble-solver/src/modals/SettingsModal/SettingsModal.tsx

@@ -1,8 +1,8 @@
 import { type FunctionComponent, memo } from 'react';
 
-import { Modal } from 'components';
-import { useIsTouchDevice } from 'hooks';
-import { useTranslate } from 'state';
+import { Modal } from '@/components';
+import { useIsTouchDevice } from '@/hooks';
+import { useTranslate } from '@/state';
 
 import {
   AutoGroupTilesSetting,

package/packages/scrabble-solver/src/modals/SettingsModal/components/AutoGroupTilesSetting/AutoGroupTilesSetting.tsx

@@ -1,8 +1,8 @@
 import { type ChangeEvent, type FunctionComponent } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Radio } from 'components';
-import { selectAutoGroupTiles, settingsSlice, useTranslate, useTypedSelector } from 'state';
+import { Radio } from '@/components';
+import { selectAutoGroupTiles, settingsSlice, useTranslate, useTypedSelector } from '@/state';
 
 import styles from './AutoGroupTilesSetting.module.scss';
 import { NULL_VALUE } from './constants';

package/packages/scrabble-solver/src/modals/SettingsModal/components/AutoGroupTilesSetting/lib.ts

@@ -1,4 +1,4 @@
-import { type AutoGroupTiles } from 'types';
+import { type AutoGroupTiles } from '@/types';
 
 import { NULL_VALUE } from './constants';
 

package/packages/scrabble-solver/src/modals/SettingsModal/components/ConfigSetting/ConfigSetting.tsx

@@ -2,8 +2,8 @@ import { isGame } from '@scrabble-solver/types';
 import { type ChangeEvent, type FunctionComponent, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Radio } from 'components';
-import { selectGame, selectLocale, settingsSlice, useTypedSelector } from 'state';
+import { Radio } from '@/components';
+import { selectGame, selectLocale, settingsSlice, useTypedSelector } from '@/state';
 
 import styles from './ConfigSetting.module.scss';
 import { getOptions } from './lib';

package/packages/scrabble-solver/src/modals/SettingsModal/components/InputModeSetting/InputModeSetting.tsx

@@ -1,8 +1,8 @@
 import { type ChangeEvent, type FunctionComponent } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Radio } from 'components';
-import { selectInputMode, settingsSlice, useTranslate, useTypedSelector } from 'state';
+import { Radio } from '@/components';
+import { selectInputMode, settingsSlice, useTranslate, useTypedSelector } from '@/state';
 
 import styles from './InputModeSetting.module.scss';
 import { parseValue } from './lib';

package/packages/scrabble-solver/src/modals/SettingsModal/components/InputModeSetting/lib.ts

@@ -1,4 +1,4 @@
-import { type InputMode } from 'types';
+import { type InputMode } from '@/types';
 
 export const parseValue = (value: string): InputMode => {
   if (value === 'keyboard') {

package/packages/scrabble-solver/src/modals/SettingsModal/components/LocaleSetting/LocaleSetting.tsx

@@ -3,9 +3,9 @@ import classNames from 'classnames';
 import { type ChangeEvent, type FunctionComponent } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Radio } from 'components';
-import { LOCALE_FEATURES } from 'i18n';
-import { selectLocale, settingsSlice, useTypedSelector } from 'state';
+import { Radio } from '@/components';
+import { LOCALE_FEATURES } from '@/i18n';
+import { selectLocale, settingsSlice, useTypedSelector } from '@/state';
 
 import styles from './LocaleSetting.module.scss';
 

package/packages/scrabble-solver/src/modals/SettingsModal/components/RemoveCellFiltersSetting/RemoveCellFiltersSetting.tsx

@@ -1,8 +1,8 @@
 import { type ChangeEvent, type FunctionComponent } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Radio } from 'components';
-import { selectRemoveCellFilters, settingsSlice, useTranslate, useTypedSelector } from 'state';
+import { Radio } from '@/components';
+import { selectRemoveCellFilters, settingsSlice, useTranslate, useTypedSelector } from '@/state';
 
 import { parseValue } from './lib';
 import styles from './RemoveCellFiltersSetting.module.scss';

package/packages/scrabble-solver/src/modals/SettingsModal/components/RemoveCellFiltersSetting/lib.ts

@@ -1,4 +1,4 @@
-import { type RemoveCellFilters } from 'types';
+import { type RemoveCellFilters } from '@/types';
 
 export const parseValue = (value: string): RemoveCellFilters => {
   if (value === 'always') {

package/packages/scrabble-solver/src/modals/SettingsModal/components/ShowCoordinatesSetting/ShowCoordinatesSetting.tsx

@@ -2,8 +2,8 @@ import { type ShowCoordinates } from '@scrabble-solver/types';
 import { type ChangeEvent, type FunctionComponent } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Radio } from 'components';
-import { selectShowCoordinates, settingsSlice, useTranslate, useTypedSelector } from 'state';
+import { Radio } from '@/components';
+import { selectShowCoordinates, settingsSlice, useTranslate, useTypedSelector } from '@/state';
 
 import styles from './ShowCoordinatesSetting.module.scss';
 

package/packages/scrabble-solver/src/modals/WordsModal/WordsModal.tsx

@@ -1,9 +1,9 @@
 import classNames from 'classnames';
 import { type FunctionComponent, memo } from 'react';
 
-import { Badge, Modal } from 'components';
-import { Check, Cross } from 'icons';
-import { selectInvalidWords, selectLocale, selectValidWords, useTranslate, useTypedSelector } from 'state';
+import { Badge, Modal } from '@/components';
+import { Check, Cross } from '@/icons';
+import { selectInvalidWords, selectLocale, selectValidWords, useTranslate, useTypedSelector } from '@/state';
 
 import styles from './WordsModal.module.scss';
 

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

@@ -4,14 +4,13 @@ import Head from 'next/head';
 import { type FunctionComponent } from 'react';
 import { Provider } from 'react-redux';
 
-import { AppLayoutProvider } from 'app-layout';
-import { SeoMessage } from 'components';
-import { store } from 'state';
+import { AppLayoutProvider } from '@/app-layout';
+import { SeoMessage } from '@/components';
+import { store } from '@/state';
 
 import '../styles/global.scss';
 
 const DESCRIPTION =
-  // eslint-disable-next-line max-len
   'Scrabble Solver 2 - Free and open-source analysis tool for Scrabble, Scrabble Duel, Super Scrabble, Letter League, Crossplay, Literaki and Kelimelik. Quickly find top scoring words using given letters and board state. Available in English, French, German, Persian, Polish, Romanian, Spanish, and Turkish.';
 
 const KEYWORDS = [

package/packages/scrabble-solver/src/pages/api/dictionary/[locale]/[word].ts

@@ -6,7 +6,7 @@ import { type Locale, isLocale } from '@scrabble-solver/types';
 import { getWordDefinition } from '@scrabble-solver/word-definitions';
 import { type NextApiRequest, type NextApiResponse } from 'next';
 
-import { getServerLoggingData } from 'api';
+import { getServerLoggingData } from '@/api';
 
 interface RequestData {
   locale: Locale;

package/packages/scrabble-solver/src/pages/api/dictionary/[locale]/index.ts

@@ -3,7 +3,7 @@ import { logger } from '@scrabble-solver/logger';
 import { isLocale, type Locale } from '@scrabble-solver/types';
 import { type NextApiRequest, type NextApiResponse } from 'next';
 
-import { getServerLoggingData } from 'api';
+import { getServerLoggingData } from '@/api';
 
 interface RequestData {
   locale: Locale;

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

@@ -15,8 +15,8 @@ import {
 } from '@scrabble-solver/types';
 import { type NextApiRequest, type NextApiResponse } from 'next';
 
-import { getServerLoggingData, isBoardValid, isCharacterValid } from 'api';
-import { isStringArray } from 'lib';
+import { getServerLoggingData, isBoardValid, isCharacterValid } from '@/api';
+import { isStringArray } from '@/lib';
 
 interface RequestData {
   board: Board;

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

@@ -4,7 +4,7 @@ import { logger } from '@scrabble-solver/logger';
 import { Board, type Config, type Game, type Locale, isBoardJson, isGame, isLocale } from '@scrabble-solver/types';
 import { type NextApiRequest, type NextApiResponse } from 'next';
 
-import { getServerLoggingData, isBoardValid } from 'api';
+import { getServerLoggingData, isBoardValid } from '@/api';
 
 interface RequestData {
   board: Board;

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

@@ -1,7 +1,7 @@
 import { logger } from '@scrabble-solver/logger';
 import { type NextApiRequest, type NextApiResponse } from 'next';
 
-import { getServerLoggingData } from 'api';
+import { getServerLoggingData } from '@/api';
 
 const visit = (request: NextApiRequest, response: NextApiResponse): void => {
   const meta = getServerLoggingData(request);

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

@@ -7,9 +7,9 @@ import { type FunctionComponent, useCallback, useState } from 'react';
 import ReactModal from 'react-modal';
 import { useDispatch } from 'react-redux';
 
-import { Logo, NavButtons, Solver } from 'components';
-import { useDirection, useEffectOnce, useLanguage, useLocalStorage } from 'hooks';
-import { LOCALE_FEATURES } from 'i18n';
+import { Logo, NavButtons, Solver } from '@/components';
+import { useDirection, useEffectOnce, useLanguage, useLocalStorage } from '@/hooks';
+import { LOCALE_FEATURES } from '@/i18n';
 import {
   DictionaryModal,
   KeyMapModal,
@@ -18,9 +18,9 @@ import {
   ResultsModal,
   SettingsModal,
   WordsModal,
-} from 'modals';
-import { registerServiceWorker } from 'serviceWorkerManager';
-import { initialize, reset, selectConfig, selectLocale, useTypedSelector } from 'state';
+} from '@/modals';
+import { registerServiceWorker } from '@/serviceWorkerManager';
+import { initialize, reset, selectConfig, selectLocale, useTypedSelector } from '@/state';
 
 import styles from './index.module.scss';
 

package/packages/scrabble-solver/src/pages/not-found.tsx

@@ -1,5 +1,5 @@
 'use-client';
 
-import { NotFound } from 'components';
+import { NotFound } from '@/components';
 
 export default NotFound;

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

@@ -1,4 +1,4 @@
-import { ResultColumnId } from 'types';
+import { ResultColumnId } from '@/types';
 
 export const BREAKPOINTS = {
   xs: 480,
@@ -62,11 +62,13 @@ export const SPACING_XL = 40;
 export const COMPONENTS_SPACING = SPACING_XL;
 export const COMPONENTS_SPACING_SMALL = SPACING_L;
 
+export const RACK_TILE_SIZE_MAX = 80;
+
 export const BOARD_CELL_ACTIONS_OFFSET = 3;
 export const BOARD_CELL_BORDER_WIDTH = 1;
 export const BOARD_TILE_FONT_SIZE_MIN = 14;
 export const BOARD_TILE_FONT_SIZE_POINTS_MIN = 10;
-export const BOARD_TILE_SIZE_MAX = 64;
+export const BOARD_TILE_SIZE_MAX = RACK_TILE_SIZE_MAX;
 
 export const BORDER_COLOR = '#cdcdcd';
 export const BORDER_COLOR_LIGHT = '#d9d9d9';
@@ -119,8 +121,6 @@ export const PLAIN_TILES_VERSION_TILE_SIZE = TILE_SIZE;
 export const PROGRESS_COLOR_VALUE = 'var(--color--violet--light)';
 export const PROGRESS_COLOR_BACKGROUND = 'var(--color--inactive)';
 
-export const RACK_TILE_SIZE_MAX = 80;
-
 export const REMAINING_TILES_TILE_SIZE = 50;
 
 export const RESULTS_COLUMN_WIDTH: Record<ResultColumnId, number | undefined> = {

package/packages/scrabble-solver/src/sdk/fetchJson.ts

@@ -1,13 +1,9 @@
 import { fetch } from './fetch';
 
 export const fetchJson = async <T>(input: RequestInfo | URL, init?: RequestInit): Promise<T> => {
-  const response = await fetch(input, {
-    ...init,
-    headers: {
-      'Content-Type': 'application/json',
-      ...init?.headers,
-    },
-  });
+  const headers = new Headers(init?.headers);
+  headers.set('Content-Type', 'application/json');
 
+  const response = await fetch(input, { ...init, headers });
   return response.json();
 };

package/packages/scrabble-solver/src/service-worker/index.ts

@@ -18,7 +18,6 @@ self.addEventListener('activate', () => {
 });
 
 cleanupOutdatedCaches();
-// eslint-disable-next-line no-underscore-dangle
 precacheAndRoute(self.__WB_MANIFEST);
 routeSolveRequests();
 routeVerifyRequests();

package/packages/scrabble-solver/src/service-worker/routeSolveRequests.ts

@@ -5,7 +5,7 @@ import { solve } from '@scrabble-solver/solver';
 import { Board, Tile } from '@scrabble-solver/types';
 import { registerRoute } from 'workbox-routing';
 
-import { type SolveRequestPayload } from 'types';
+import { type SolveRequestPayload } from '@/types';
 
 import { average } from './average';
 import { revalidateDictionary } from './dictionaries';
@@ -19,18 +19,6 @@ const MIN_MEASUREMENTS = 5;
 const localDurations: number[] = [];
 const serverDurations: number[] = [];
 
-const isSlowDevice = (): boolean | undefined => {
-  if (localDurations.length < MIN_MEASUREMENTS || serverDurations.length < MIN_MEASUREMENTS) {
-    return undefined;
-  }
-
-  const count = Math.min(localDurations.length, serverDurations.length);
-  const local = localDurations.slice(0, count).sort().slice(1, -1);
-  const server = serverDurations.slice(0, count).sort().slice(1, -1);
-
-  return average(local) > average(server);
-};
-
 export const routeSolveRequests = () => {
   registerRoute(
     ({ url }) => url.origin === location.origin && url.pathname === '/api/solve',
@@ -83,3 +71,21 @@ export const routeSolveRequests = () => {
     'POST',
   );
 };
+
+const isSlowDevice = (): boolean | undefined => {
+  if (localDurations.length < MIN_MEASUREMENTS || serverDurations.length < MIN_MEASUREMENTS) {
+    return undefined;
+  }
+
+  const count = Math.min(localDurations.length, serverDurations.length);
+  const local = localDurations
+    .slice(0, count)
+    .sort((a, b) => a - b)
+    .slice(1, -1);
+  const server = localDurations
+    .slice(0, count)
+    .sort((a, b) => a - b)
+    .slice(1, -1);
+
+  return average(local) > average(server);
+};

package/packages/scrabble-solver/src/service-worker/routeVerifyRequests.ts

@@ -1,7 +1,7 @@
 import { Board } from '@scrabble-solver/types';
 import { registerRoute } from 'workbox-routing';
 
-import { type VerifyRequestPayload } from 'types';
+import { type VerifyRequestPayload } from '@/types';
 
 import { revalidateDictionary } from './dictionaries';
 import { getTrie } from './getTrie';

package/packages/scrabble-solver/src/state/board/slice.ts

@@ -16,7 +16,7 @@ export const boardSlice = createSlice({
       const result = action.payload;
 
       result.cells.forEach((cell) => {
-        newBoard.updateCell(cell.x, cell.y, () => new Cell({ ...cell, isEmpty: false }));
+        newBoard.updateCell(cell.x, cell.y, () => new Cell({ isEmpty: false, tile: cell.tile, x: cell.x, y: cell.y }));
       });
 
       return newBoard;
@@ -34,7 +34,7 @@ export const boardSlice = createSlice({
       const tile = isEmpty ? Tile.Null : new Tile({ character: value });
 
       newBoard.updateCell(x, y, (cell) => {
-        return new Cell({ ...cell, isEmpty, tile });
+        return new Cell({ isEmpty, tile, x: cell.x, y: cell.y });
       });
 
       return newBoard;
@@ -50,8 +50,10 @@ export const boardSlice = createSlice({
       const { x, y } = action.payload;
 
       newBoard.updateCell(x, y, (cell) => {
-        const tile = cell.isEmpty ? cell.tile : new Tile({ ...cell.tile, isBlank: !cell.tile.isBlank });
-        return new Cell({ ...cell, tile });
+        const tile = cell.isEmpty
+          ? cell.tile
+          : new Tile({ isBlank: !cell.tile.isBlank, character: cell.tile.character });
+        return new Cell({ isEmpty: cell.isEmpty, tile, x: cell.x, y: cell.y });
       });
 
       return newBoard;
@@ -67,7 +69,30 @@ export const boardSlice = createSlice({
       }
 
       if (state.rows.length !== config.boardHeight || state.rows[0].length !== config.boardWidth) {
-        return Board.create(config.boardWidth, config.boardHeight);
+        const newBoard = Board.create(config.boardWidth, config.boardHeight);
+        const offsetX = Math.floor(config.boardWidth / 2) - Math.floor(state.rows[0].length / 2);
+        const offsetY = Math.floor(config.boardHeight / 2) - Math.floor(state.rows.length / 2);
+
+        for (let y = 0; y < state.rows.length; ++y) {
+          for (let x = 0; x < state.rows[y].length; ++x) {
+            const cell = state.rows[y][x];
+
+            if (cell.isEmpty) {
+              continue;
+            }
+
+            const newX = x + offsetX;
+            const newY = y + offsetY;
+
+            if (newX < 0 || newX >= config.boardWidth || newY < 0 || newY >= config.boardHeight) {
+              continue;
+            }
+
+            newBoard.updateCell(newX, newY, () => new Cell({ ...cell, x: newX, y: newY }));
+          }
+        }
+
+        return newBoard;
       }
 
       return state;

package/packages/scrabble-solver/src/state/cellFilters/lib.ts

@@ -1,4 +1,4 @@
-import type { CellFilterType } from 'types';
+import type { CellFilterType } from '@/types';
 
 export const toggleCellFilterState = (type: CellFilterType): CellFilterType | null => {
   const chain: (CellFilterType | null)[] = ['include', 'exclude', null];

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

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 
-import type { Point } from 'types';
+import type { Point } from '@/types';
 
 import type { RootState } from '../types';
 

package/packages/scrabble-solver/src/state/cellFilters/slice.ts

@@ -1,7 +1,7 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 import type { Cell } from '@scrabble-solver/types';
 
-import type { Point } from 'types';
+import type { Point } from '@/types';
 
 import { cellFiltersInitialState } from './initialState';
 import { toggleCellFilterState } from './lib';