@scrabble-solver/scrabble-solver 2.15.23 → 2.15.24

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,

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

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

@@ -67,7 +67,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

@@ -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';

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

@@ -10,21 +10,7 @@
     "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",