scrabble-solver 2.15.9 → 2.15.11

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

@@ -5,7 +5,7 @@ import { getConfig } from '@scrabble-solver/configs';
 import { BLANK } from '@scrabble-solver/constants';
 import { Cell, Config, isError, Tile } from '@scrabble-solver/types';
 
-import i18n, { LOCALE_FEATURES } from 'i18n';
+import { i18n, LOCALE_FEATURES } from 'i18n';
 import {
   createRegExp,
   findCell,
@@ -185,10 +185,7 @@ export const selectTranslation = createSelector(
 
 export const selectRack = selectRackRoot;
 
-export const selectCharacters = createSelector(
-  selectRackRoot,
-  (rack): string[] => rack.filter((tile) => tile !== null) as string[],
-);
+export const selectCharacters = createSelector(selectRackRoot, (rack) => rack.filter((tile) => tile !== null));
 
 export const selectLastSolvedParameters = createSelector([selectSolveRoot], (solve) => solve.lastSolvedParameters);
 
@@ -221,7 +218,7 @@ export const selectRemainingTiles = createSelector(
 );
 
 export const selectHasOverusedTiles = createSelector([selectRemainingTiles], (remainingTiles) => {
-  return remainingTiles.some(({ count, usedCount }) => usedCount > count);
+  return remainingTiles.some(({ count = 0, usedCount }) => usedCount > count);
 });
 
 export const selectRemainingTilesGroups = createSelector([selectRemainingTiles], getRemainingTilesGroups);

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

@@ -1,17 +1,18 @@
 import { getConfig } from '@scrabble-solver/configs';
 import { Board } from '@scrabble-solver/types';
 
-import localStorage from '../localStorage';
+import { localStorage } from '../localStorage';
 
-import settingsInitialState from './settingsInitialState';
+import { settingsInitialState } from './settingsInitialState';
 
 export type BoardState = Board;
 
 const { game, locale } = settingsInitialState;
-const { boardSize } = getConfig(game, locale);
-export const boardDefaultState = Board.create(boardSize);
+const { boardHeight, boardWidth } = getConfig(game, locale);
 
-const boardInitialState: BoardState = localStorage.getBoard() || boardDefaultState;
+export const boardDefaultState = Board.create(boardWidth, boardHeight);
+
+export const boardInitialState: BoardState = localStorage.getBoard() || boardDefaultState;
 
 // const createOxyphenbutazone = () => {
 //   // Tiles: oypbaze
@@ -39,5 +40,3 @@ const boardInitialState: BoardState = localStorage.getBoard() || boardDefaultSta
 
 //   return board;
 // };
-
-export default boardInitialState;

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

@@ -3,10 +3,10 @@ import { games } from '@scrabble-solver/configs';
 import { EMPTY_CELL } from '@scrabble-solver/constants';
 import { Board, Cell, Result, Tile } from '@scrabble-solver/types';
 
-import boardInitialState from './boardInitialState';
-import settingsSlice from './settingsSlice';
+import { boardInitialState } from './boardInitialState';
+import { settingsSlice } from './settingsSlice';
 
-const boardSlice = createSlice({
+export const boardSlice = createSlice({
   initialState: boardInitialState,
   name: 'board',
   reducers: {
@@ -65,13 +65,11 @@ const boardSlice = createSlice({
         throw new Error(`Cannot find config for game "${game}"`);
       }
 
-      if (state.rows.length !== config.boardSize || state.rows[0].length !== config.boardSize) {
-        return Board.create(config.boardSize);
+      if (state.rows.length !== config.boardHeight || state.rows[0].length !== config.boardWidth) {
+        return Board.create(config.boardWidth, config.boardHeight);
       }
 
       return state;
     });
   },
 });
-
-export default boardSlice;

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

@@ -2,6 +2,4 @@ import { CellFilterEntry } from 'types';
 
 export type CellFilterState = CellFilterEntry[];
 
-const cellFilterInitialState: CellFilterState = [];
-
-export default cellFilterInitialState;
+export const cellFilterInitialState: CellFilterState = [];

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

@@ -2,9 +2,9 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import { CellFilterType, Point } from 'types';
 
-import cellFilterInitialState from './cellFilterInitialState';
+import { cellFilterInitialState } from './cellFilterInitialState';
 
-const cellFilterSlice = createSlice({
+export const cellFilterSlice = createSlice({
   initialState: cellFilterInitialState,
   name: 'cellFilter',
   reducers: {
@@ -47,5 +47,3 @@ const toggleCellFilterState = (type: CellFilterType): CellFilterType | null => {
   const nextIndex = (index + 1) % chain.length;
   return chain[nextIndex];
 };
-
-export default cellFilterSlice;

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

@@ -1,17 +1,15 @@
 import { WordDefinition } from '@scrabble-solver/types';
 
 export interface DictionaryState {
-  error: unknown | undefined;
+  error: unknown;
   input: string;
   isLoading: boolean;
   results: WordDefinition[];
 }
 
-const dictionaryInitialState: DictionaryState = {
+export const dictionaryInitialState: DictionaryState = {
   error: undefined,
   input: '',
   isLoading: false,
   results: [],
 };
-
-export default dictionaryInitialState;

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

@@ -1,9 +1,9 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { WordDefinition } from '@scrabble-solver/types';
 
-import dictionaryInitialState from './dictionaryInitialState';
+import { dictionaryInitialState } from './dictionaryInitialState';
 
-const dictionarySlice = createSlice({
+export const dictionarySlice = createSlice({
   initialState: dictionaryInitialState,
   name: 'dictionary',
   reducers: {
@@ -32,5 +32,3 @@ const dictionarySlice = createSlice({
     },
   },
 });
-
-export default dictionarySlice;

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

@@ -1,16 +1,16 @@
-export { default as boardInitialState } from './boardInitialState';
-export { default as boardSlice } from './boardSlice';
-export { default as cellFilterInitialState } from './cellFilterInitialState';
-export { default as cellFilterSlice } from './cellFilterSlice';
-export { default as dictionaryInitialState } from './dictionaryInitialState';
-export { default as dictionarySlice } from './dictionarySlice';
-export { default as rackInitialState } from './rackInitialState';
-export { default as rackSlice } from './rackSlice';
-export { default as resultsInitialState } from './resultsInitialState';
-export { default as resultsSlice } from './resultsSlice';
-export { default as settingsInitialState } from './settingsInitialState';
-export { default as settingsSlice } from './settingsSlice';
-export { default as solveInitialState } from './solveInitialState';
-export { default as solveSlice } from './solveSlice';
-export { default as verifyInitialState } from './verifyInitialState';
-export { default as verifySlice } from './verifySlice';
+export { boardInitialState } from './boardInitialState';
+export { boardSlice } from './boardSlice';
+export { cellFilterInitialState } from './cellFilterInitialState';
+export { cellFilterSlice } from './cellFilterSlice';
+export { dictionaryInitialState } from './dictionaryInitialState';
+export { dictionarySlice } from './dictionarySlice';
+export { rackInitialState } from './rackInitialState';
+export { rackSlice } from './rackSlice';
+export { resultsInitialState } from './resultsInitialState';
+export { resultsSlice } from './resultsSlice';
+export { settingsInitialState } from './settingsInitialState';
+export { settingsSlice } from './settingsSlice';
+export { solveInitialState } from './solveInitialState';
+export { solveSlice } from './solveSlice';
+export { verifyInitialState } from './verifyInitialState';
+export { verifySlice } from './verifySlice';

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

@@ -1,11 +1,9 @@
 import { Rack } from 'types';
 
-import localStorage from '../localStorage';
+import { localStorage } from '../localStorage';
 
 export type RackState = Rack;
 
 export const rackDefaultState: RackState = [null, null, null, null, null, null, null];
 
-const rackInitialState: RackState = localStorage.getRack() || rackDefaultState;
-
-export default rackInitialState;
+export const rackInitialState: RackState = localStorage.getRack() || rackDefaultState;

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

@@ -4,9 +4,9 @@ import { Tile } from '@scrabble-solver/types';
 import { arrayEquals, createNullMovingComparator, inverseDirection, zipCharactersAndTiles } from 'lib';
 import { AutoGroupTiles, Rack } from 'types';
 
-import rackInitialState, { rackDefaultState } from './rackInitialState';
+import { rackInitialState, rackDefaultState } from './rackInitialState';
 
-const rackSlice = createSlice({
+export const rackSlice = createSlice({
   initialState: rackInitialState,
   name: 'rack',
   reducers: {
@@ -51,5 +51,3 @@ const rackSlice = createSlice({
     reset: () => rackDefaultState,
   },
 });
-
-export default rackSlice;

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

@@ -9,7 +9,7 @@ export interface ResultsState {
   sort: Sort;
 }
 
-const resultsInitialState: ResultsState = {
+export const resultsInitialState: ResultsState = {
   candidate: null,
   query: '',
   results: undefined,
@@ -18,5 +18,3 @@ const resultsInitialState: ResultsState = {
     direction: SortDirection.Descending,
   },
 };
-
-export default resultsInitialState;

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

@@ -3,13 +3,13 @@ import { Result } from '@scrabble-solver/types';
 
 import { ResultColumnId, SortDirection } from 'types';
 
-import resultsInitialState from './resultsInitialState';
+import { resultsInitialState } from './resultsInitialState';
 
 const toggleDirection = (direction: SortDirection): SortDirection => {
   return direction === SortDirection.Ascending ? SortDirection.Descending : SortDirection.Ascending;
 };
 
-const resultsSlice = createSlice({
+export const resultsSlice = createSlice({
   initialState: resultsInitialState,
   name: 'results',
   reducers: {
@@ -53,5 +53,3 @@ const resultsSlice = createSlice({
     reset: () => resultsInitialState,
   },
 });
-
-export default resultsSlice;

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

@@ -3,7 +3,7 @@ import { Game, Locale, ShowCoordinates } from '@scrabble-solver/types';
 import { guessLocale } from 'lib';
 import { AutoGroupTiles, InputMode } from 'types';
 
-import localStorage from '../localStorage';
+import { localStorage } from '../localStorage';
 
 export interface SettingsState {
   autoGroupTiles: AutoGroupTiles;
@@ -16,12 +16,10 @@ export interface SettingsState {
 const localStorageAutoGroupTiles = localStorage.getAutoGroupTiles();
 const isTouchScreen = typeof globalThis.matchMedia !== 'undefined' && globalThis.matchMedia('(hover: none)').matches;
 
-const settingsInitialState: SettingsState = {
+export const settingsInitialState: SettingsState = {
   autoGroupTiles: typeof localStorageAutoGroupTiles === 'undefined' ? 'left' : localStorageAutoGroupTiles,
   game: localStorage.getGame() ?? Game.Scrabble,
   inputMode: localStorage.getInputMode() ?? (isTouchScreen ? 'touchscreen' : 'keyboard'),
   locale: localStorage.getLocale() ?? guessLocale(),
   showCoordinates: localStorage.getShowCoordinates() ?? 'hidden',
 };
-
-export default settingsInitialState;

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

@@ -3,9 +3,9 @@ import { Game, Locale, ShowCoordinates } from '@scrabble-solver/types';
 
 import { AutoGroupTiles, InputMode } from 'types';
 
-import settingsInitialState from './settingsInitialState';
+import { settingsInitialState } from './settingsInitialState';
 
-const settingsSlice = createSlice({
+export const settingsSlice = createSlice({
   initialState: settingsInitialState,
   name: 'settings',
   reducers: {
@@ -39,5 +39,3 @@ const settingsSlice = createSlice({
     },
   },
 });
-
-export default settingsSlice;

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

@@ -1,9 +1,9 @@
 import { Board } from '@scrabble-solver/types';
 
-import boardInitialState from './boardInitialState';
+import { boardInitialState } from './boardInitialState';
 
 export interface SolveState {
-  error: unknown | undefined;
+  error: unknown;
   isLoading: boolean;
   lastSolvedParameters: {
     board: Board;
@@ -11,7 +11,7 @@ export interface SolveState {
   };
 }
 
-const solveInitialState: SolveState = {
+export const solveInitialState: SolveState = {
   error: undefined,
   isLoading: false,
   lastSolvedParameters: {
@@ -19,5 +19,3 @@ const solveInitialState: SolveState = {
     characters: [],
   },
 };
-
-export default solveInitialState;

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

@@ -1,14 +1,14 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { Board } from '@scrabble-solver/types';
 
-import solveInitialState from './solveInitialState';
+import { solveInitialState } from './solveInitialState';
 
 interface SolveParameters {
   board: Board;
   characters: string[];
 }
 
-const solveSlice = createSlice({
+export const solveSlice = createSlice({
   initialState: solveInitialState,
   name: 'solve',
   reducers: {
@@ -31,5 +31,3 @@ const solveSlice = createSlice({
     },
   },
 });
-
-export default solveSlice;

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

@@ -1,4 +1,4 @@
-import boardInitialState, { BoardState } from './boardInitialState';
+import { boardInitialState, BoardState } from './boardInitialState';
 
 export interface VerifyState {
   isLoading: boolean;
@@ -9,7 +9,7 @@ export interface VerifyState {
   validWords: string[];
 }
 
-const verifyInitialState: VerifyState = {
+export const verifyInitialState: VerifyState = {
   isLoading: false,
   lastSolvedParameters: {
     board: boardInitialState,
@@ -17,5 +17,3 @@ const verifyInitialState: VerifyState = {
   invalidWords: [],
   validWords: [],
 };
-
-export default verifyInitialState;

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

@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { Board } from '@scrabble-solver/types';
 
-import verifyInitialState from './verifyInitialState';
+import { verifyInitialState } from './verifyInitialState';
 
 interface VerifyParameters {
   board: Board;
@@ -9,7 +9,7 @@ interface VerifyParameters {
   validWords: string[];
 }
 
-const verifySlice = createSlice({
+export const verifySlice = createSlice({
   initialState: verifyInitialState,
   name: 'verify',
   reducers: {
@@ -27,5 +27,3 @@ const verifySlice = createSlice({
     },
   },
 });
-
-export default verifySlice;

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

@@ -15,7 +15,7 @@ import {
 
 const sagaMiddleware = reduxSaga();
 
-const store = configureStore({
+export const store = configureStore({
   reducer: {
     board: boardSlice.reducer,
     cellFilter: cellFilterSlice.reducer,
@@ -30,5 +30,3 @@ const store = configureStore({
 });
 
 sagaMiddleware.run(rootSaga);
-
-export default store;

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

@@ -3,9 +3,9 @@ import { useCallback } from 'react';
 import { Translate } from 'types';
 
 import { selectLocale, selectTranslations } from './selectors';
-import useTypedSelector from './useTypedSelector';
+import { useTypedSelector } from './useTypedSelector';
 
-const useTranslate = (): Translate => {
+export const useTranslate = (): Translate => {
   const translations = useTypedSelector(selectTranslations);
   const locale = useTypedSelector(selectLocale);
   const translate: Translate = useCallback(
@@ -30,5 +30,3 @@ const useTranslate = (): Translate => {
 
   return translate;
 };
-
-export default useTranslate;

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

@@ -2,6 +2,4 @@ import { TypedUseSelectorHook, useSelector } from 'react-redux';
 
 import { RootState } from './types';
 
-const useTypedSelector: TypedUseSelectorHook<RootState> = useSelector;
-
-export default useTypedSelector;
+export const useTypedSelector: TypedUseSelectorHook<RootState> = useSelector;

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

@@ -0,0 +1,15 @@
+import { BoardJson, ConfigJson, Game, Locale } from '@scrabble-solver/types';
+
+export interface SolveRequestPayload {
+  board: BoardJson;
+  characters: string[];
+  config: ConfigJson;
+  game: Game;
+  locale: Locale;
+}
+
+export interface VerifyRequestPayload {
+  board: BoardJson;
+  game: Game;
+  locale: Locale;
+}

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

@@ -36,7 +36,7 @@ export enum SortDirection {
 
 export interface RemainingTile {
   character: string;
-  count: number;
+  count?: number;
   score: number;
   usedCount: number;
 }
@@ -153,3 +153,5 @@ export type TranslationKey =
 export type Translate = (key: TranslationKey, replacements?: Record<string, string>) => string;
 
 export type Translations = Record<TranslationKey, string>;
+
+export * from './api';

package/packages/scrabble-solver/tsconfig.json

@@ -31,7 +31,7 @@
     "typeRoots": ["./node_modules/@types", "./src/@types"],
     "incremental": true
   },
-  "exclude": ["node_modules"],
+  "exclude": [ "node_modules", "**/*.test.ts"],
   "files": ["./src/@types/scss.d.ts", "./src/@types/svg.d.ts"],
   "include": ["next-env.d.ts", "./src"]
 }