@scrabble-solver/scrabble-solver 2.15.23 → 2.15.25

package/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/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/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/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/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/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/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/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/src/pages/not-found.tsx

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

package/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/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/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/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/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/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/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/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/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';

package/src/state/cellFilters/types.ts

@@ -1,3 +1,3 @@
-import type { CellFilter } from 'types';
+import type { CellFilter } from '@/types';
 
 export type CellFiltersState = CellFilter[];

package/src/state/lib.ts

@@ -1,8 +1,8 @@
 import { BLANK } from '@scrabble-solver/constants';
 import { type Board, type Config } from '@scrabble-solver/types';
 
-import { createKeyComparator } from 'lib';
-import { type RemainingTile } from 'types';
+import { createKeyComparator } from '@/lib';
+import { type RemainingTile } from '@/types';
 
 export const getRemainingTiles = (
   config: Config,

package/src/state/localStorage.ts

@@ -1,7 +1,7 @@
 import { Board, type BoardJson, type Game, type Locale, type ShowCoordinates } from '@scrabble-solver/types';
 import store2 from 'store2';
 
-import type { AutoGroupTiles, InputMode, Rack, RemoveCellFilters } from 'types';
+import type { AutoGroupTiles, InputMode, Rack, RemoveCellFilters } from '@/types';
 
 const AUTO_GROUP_TILES = 'auto-group-tiles';
 const BOARD = 'board';

package/src/state/rack/slice.ts

@@ -1,8 +1,8 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 import { type Tile } from '@scrabble-solver/types';
 
-import { arrayEquals, createNullMovingComparator, inverseDirection, zipCharactersAndTiles } from 'lib';
-import { type AutoGroupTiles, type Rack } from 'types';
+import { arrayEquals, createNullMovingComparator, inverseDirection, zipCharactersAndTiles } from '@/lib';
+import { type AutoGroupTiles, type Rack } from '@/types';
 
 import { rackDefaultState, rackInitialState } from './initialState';
 

package/src/state/rack/types.ts

@@ -1,3 +1,3 @@
-import { type Rack } from 'types';
+import { type Rack } from '@/types';
 
 export type RackState = Rack;

package/src/state/results/initialState.ts

@@ -1,4 +1,4 @@
-import { ResultColumnId, SortDirection } from 'types';
+import { ResultColumnId, SortDirection } from '@/types';
 
 import type { ResultsState } from './types';
 

package/src/state/results/lib.ts

@@ -1,7 +1,14 @@
 import { type Result, type ShowCoordinates } from '@scrabble-solver/types';
 
-import { createKeyComparator, createRegExp, createStringComparator, getCoordinate, reverseComparator } from 'lib';
-import { type CellFilter, type Comparator, type GroupedResults, ResultColumnId, type Sort, SortDirection } from 'types';
+import { createKeyComparator, createRegExp, createStringComparator, getCoordinate, reverseComparator } from '@/lib';
+import {
+  type CellFilter,
+  type Comparator,
+  type GroupedResults,
+  ResultColumnId,
+  type Sort,
+  SortDirection,
+} from '@/types';
 
 export const getCoordinates = (result: Result, showCoordinates: ShowCoordinates): string => {
   if (showCoordinates === 'hidden') {

package/src/state/results/selectors.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 
-import { createRegExp } from 'lib';
+import { createRegExp } from '@/lib';
 
 import { selectCellFilters } from '../cellFilters';
 import { selectLocale, selectShowCoordinates } from '../settings';

package/src/state/results/slice.ts

@@ -1,7 +1,7 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 import { type Result } from '@scrabble-solver/types';
 
-import { type ResultColumnId, SortDirection } from 'types';
+import { type ResultColumnId, SortDirection } from '@/types';
 
 import { resultsInitialState } from './initialState';
 

package/src/state/results/types.ts

@@ -1,6 +1,6 @@
 import { type Result } from '@scrabble-solver/types';
 
-import type { Sort } from 'types';
+import type { Sort } from '@/types';
 
 export interface ResultsState {
   candidate: Result | null;

package/src/state/sagas.ts

@@ -1,4 +1,4 @@
-/* eslint-disable max-lines, no-implicit-globals */
+/* eslint-disable max-lines */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
@@ -8,9 +8,9 @@ import { hasConfig, languages } from '@scrabble-solver/configs';
 import { Board, type Locale, type Result } from '@scrabble-solver/types';
 import { call, delay, put, select, takeEvery, takeLatest } from 'redux-saga/effects';
 
-import { LOCALE_FEATURES } from 'i18n';
-import { memoize } from 'lib';
-import { findWordDefinitions, solve, verify, visit } from 'sdk';
+import { LOCALE_FEATURES } from '@/i18n';
+import { memoize } from '@/lib';
+import { findWordDefinitions, solve, verify, visit } from '@/sdk';
 
 import { initialize, reset } from './actions';
 import { boardSlice, selectBoard } from './board';
@@ -35,7 +35,6 @@ const memoizedFindWordDefinitions = memoize(findWordDefinitions);
 
 // Can't conveniently type generators for sagas yet,
 // see: https://github.com/microsoft/TypeScript/issues/43632
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AnyGenerator = Generator<any, any, any>;
 
 export function* rootSaga(): AnyGenerator {

package/src/state/selectors.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 
-import { unorderedArraysEqual } from 'lib';
+import { unorderedArraysEqual } from '@/lib';
 
 import { selectBoard } from './board';
 import { getRemainingTiles } from './lib';

package/src/state/settings/selectors.ts

@@ -3,7 +3,7 @@ import { getConfig } from '@scrabble-solver/configs';
 import { BLANK } from '@scrabble-solver/constants';
 import { type Cell, type Tile } from '@scrabble-solver/types';
 
-import { i18n, LOCALE_FEATURES } from 'i18n';
+import { i18n, LOCALE_FEATURES } from '@/i18n';
 
 import type { RootState } from '../types';
 

package/src/state/settings/slice.ts

@@ -1,7 +1,7 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 import { type Game, type Locale, type ShowCoordinates } from '@scrabble-solver/types';
 
-import type { AutoGroupTiles, InputMode, RemoveCellFilters } from 'types';
+import type { AutoGroupTiles, InputMode, RemoveCellFilters } from '@/types';
 
 import { settingsInitialState } from './initialState';
 

package/src/state/settings/types.ts

@@ -1,6 +1,6 @@
 import { type Game, type Locale, type ShowCoordinates } from '@scrabble-solver/types';
 
-import type { AutoGroupTiles, InputMode, RemoveCellFilters } from 'types';
+import type { AutoGroupTiles, InputMode, RemoveCellFilters } from '@/types';
 
 export interface SettingsState {
   autoGroupTiles: AutoGroupTiles;

package/src/state/useTranslate.ts

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import type { Translate } from 'types';
+import type { Translate } from '@/types';
 
 import { selectLocale, selectTranslations } from './settings';
 import { useTypedSelector } from './useTypedSelector';

package/tsconfig.json

@@ -3,28 +3,13 @@
 
   "compilerOptions": {
     "allowJs": true,
-    "baseUrl": ".",
     "declaration": false,
     "isolatedModules": true,
     "jsx": "preserve",
     "lib": ["dom", "dom.iterable", "esnext"],
     "noEmit": true,
     "paths": {
-      "api": ["./src/api"],
-      "app-layout": ["./src/app-layout"],
-      "components": ["./src/components"],
-      "hooks": ["./src/hooks"],
-      "icons": ["./src/icons"],
-      "i18n": ["./src/i18n"],
-      "lib": ["./src/lib"],
-      "modals": ["./src/modals"],
-      "pages": ["./src/pages"],
-      "parameters": ["./src/parameters"],
-      "sdk": ["./src/sdk"],
-      "serviceWorkerManager": ["./src/serviceWorkerManager"],
-      "state": ["./src/state"],
-      "styles": ["./src/styles"],
-      "types": ["./src/types"]
+      "@/*": ["./src/*"]
     },
     "resolveJsonModule": true,
     "rootDir": "./src",