@scrabble-solver/scrabble-solver 2.15.9 → 2.15.10

package/src/pages/api/solve.ts

@@ -1,9 +1,9 @@
 import { getConfig, hasConfig } from '@scrabble-solver/configs';
 import { BLANK } from '@scrabble-solver/constants';
 import { dictionaries } from '@scrabble-solver/dictionaries';
-import logger from '@scrabble-solver/logger';
+import { logger } from '@scrabble-solver/logger';
 import { solve as solveScrabble } from '@scrabble-solver/solver';
-import { Board, Config, Locale, Tile, isBoardJson, isGame, isLocale } from '@scrabble-solver/types';
+import { Board, Config, Game, Locale, Tile, isBoardJson, isGame, isLocale } from '@scrabble-solver/types';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { getServerLoggingData, isBoardValid, isCharacterValid } from 'api';
@@ -13,6 +13,7 @@ interface RequestData {
   board: Board;
   characters: string[];
   config: Config;
+  game: Game;
   locale: Locale;
 }
 
@@ -20,7 +21,7 @@ const solve = async (request: NextApiRequest, response: NextApiResponse): Promis
   const meta = getServerLoggingData(request);
 
   try {
-    const { board, characters, config, locale } = parseRequest(request);
+    const { board, characters, config, game, locale } = parseRequest(request);
 
     logger.info('solve - request', {
       meta,
@@ -30,7 +31,7 @@ const solve = async (request: NextApiRequest, response: NextApiResponse): Promis
         boardBlanksCount: board.getBlanksCount(),
         boardTilesCount: board.getTilesCount(),
         characters: characters.join(''),
-        game: request.body.game,
+        game,
         locale,
       },
     });
@@ -89,6 +90,7 @@ const parseRequest = (request: NextApiRequest): RequestData => {
     board,
     characters,
     config,
+    game,
     locale,
   };
 };

package/src/pages/api/verify.ts

@@ -1,7 +1,7 @@
 import { getConfig, hasConfig } from '@scrabble-solver/configs';
 import { dictionaries } from '@scrabble-solver/dictionaries';
-import logger from '@scrabble-solver/logger';
-import { Board, Config, Locale, isBoardJson, isGame, isLocale } from '@scrabble-solver/types';
+import { logger } from '@scrabble-solver/logger';
+import { Board, Config, Game, Locale, isBoardJson, isGame, isLocale } from '@scrabble-solver/types';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { getServerLoggingData, isBoardValid } from 'api';
@@ -9,6 +9,7 @@ import { getServerLoggingData, isBoardValid } from 'api';
 interface RequestData {
   board: Board;
   config: Config;
+  game: Game;
   locale: Locale;
 }
 
@@ -16,7 +17,7 @@ const verify = async (request: NextApiRequest, response: NextApiResponse): Promi
   const meta = getServerLoggingData(request);
 
   try {
-    const { board, locale } = parseRequest(request);
+    const { board, game, locale } = parseRequest(request);
 
     logger.info('verify - request', {
       meta,
@@ -24,7 +25,7 @@ const verify = async (request: NextApiRequest, response: NextApiResponse): Promi
         board: board.toString(),
         boardBlanksCount: board.getBlanksCount(),
         boardTilesCount: board.getTilesCount(),
-        game: request.body.game,
+        game,
         locale,
       },
     });
@@ -67,6 +68,7 @@ const parseRequest = (request: NextApiRequest): RequestData => {
   return {
     board,
     config,
+    game,
     locale,
   };
 };

package/src/pages/api/visit.ts

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

package/src/pages/index.tsx

@@ -1,3 +1,4 @@
+import { isObject } from '@scrabble-solver/types';
 import fs from 'fs';
 import path from 'path';
 import { FunctionComponent, useCallback, useState } from 'react';
@@ -62,6 +63,7 @@ const Index: FunctionComponent<Props> = ({ version }) => {
 
   useEffectOnce(() => {
     if (process.env.NODE_ENV === 'production') {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       registerServiceWorker();
     }
 
@@ -129,6 +131,11 @@ const readVersion = async (): Promise<string> => {
   const packageJsonFilepath = path.resolve(process.cwd(), 'package.json');
   const data = await fs.promises.readFile(packageJsonFilepath, 'utf-8');
   const packageJson = JSON.parse(data);
+
+  if (!isObject(packageJson) || !('version' in packageJson) || typeof packageJson.version !== 'string') {
+    throw new Error('Invalid package.json');
+  }
+
   return `v${packageJson.version}`;
 };
 

package/src/sdk/fetch.ts

@@ -1,6 +1,6 @@
 import { isError } from '@scrabble-solver/types';
 
-const fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
+export const fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
   let response: Response;
 
   try {
@@ -26,5 +26,3 @@ const fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Resp
 
   throw new Error(`HTTP ${response.status}: ${response.statusText}`);
 };
-
-export default fetch;

package/src/sdk/fetchJson.ts

@@ -1,6 +1,6 @@
-import fetch from './fetch';
+import { fetch } from './fetch';
 
-const fetchJson = async <T>(input: RequestInfo | URL, init?: RequestInit): Promise<T> => {
+export const fetchJson = async <T>(input: RequestInfo | URL, init?: RequestInit): Promise<T> => {
   const response = await fetch(input, {
     ...init,
     headers: {
@@ -11,5 +11,3 @@ const fetchJson = async <T>(input: RequestInfo | URL, init?: RequestInit): Promi
 
   return response.json();
 };
-
-export default fetchJson;

package/src/sdk/findWordDefinitions.ts

@@ -1,10 +1,8 @@
 import { Locale, WordDefinition, WordDefinitionJson } from '@scrabble-solver/types';
 
-import fetchJson from './fetchJson';
+import { fetchJson } from './fetchJson';
 
-const findWordDefinitions = async (locale: Locale, word: string): Promise<WordDefinition[]> => {
+export const findWordDefinitions = async (locale: Locale, word: string): Promise<WordDefinition[]> => {
   const json = await fetchJson<WordDefinitionJson[]>(`/api/dictionary/${locale}/${encodeURIComponent(word)}`);
   return json.map(WordDefinition.fromJson);
 };
-
-export default findWordDefinitions;

package/src/sdk/getDictionary.ts

@@ -1,11 +1,9 @@
 import { Trie } from '@kamilmielnik/trie';
 import { Locale } from '@scrabble-solver/types';
 
-import fetchJson from './fetchJson';
+import { fetchJson } from './fetchJson';
 
-const getDictionary = async (locale: Locale): Promise<Trie> => {
+export const getDictionary = async (locale: Locale): Promise<Trie> => {
   const serialized = await fetchJson<string>(`/api/dictionary/${locale}`);
   return Trie.deserialize(serialized);
 };
-
-export default getDictionary;

package/src/sdk/index.ts

@@ -1,4 +1,4 @@
-export { default as findWordDefinitions } from './findWordDefinitions';
-export { default as solve } from './solve';
-export { default as verify } from './verify';
-export { default as visit } from './visit';
+export { findWordDefinitions } from './findWordDefinitions';
+export { solve } from './solve';
+export { verify } from './verify';
+export { visit } from './visit';

package/src/sdk/solve.ts

@@ -1,6 +1,6 @@
 import { BoardJson, Locale, Result, ResultJson } from '@scrabble-solver/types';
 
-import fetchJson from './fetchJson';
+import { fetchJson } from './fetchJson';
 
 interface Payload {
   board: BoardJson;
@@ -9,7 +9,7 @@ interface Payload {
   locale: Locale;
 }
 
-const solve = async ({ board, characters, game, locale }: Payload): Promise<Result[]> => {
+export const solve = async ({ board, characters, game, locale }: Payload): Promise<Result[]> => {
   const json = await fetchJson<ResultJson[]>('/api/solve', {
     method: 'POST',
     body: JSON.stringify({ board, characters, game, locale }),
@@ -17,5 +17,3 @@ const solve = async ({ board, characters, game, locale }: Payload): Promise<Resu
 
   return json.map(Result.fromJson);
 };
-
-export default solve;

package/src/sdk/verify.ts

@@ -1,6 +1,6 @@
 import { BoardJson, Locale } from '@scrabble-solver/types';
 
-import fetchJson from './fetchJson';
+import { fetchJson } from './fetchJson';
 
 interface Payload {
   board: BoardJson;
@@ -13,11 +13,9 @@ interface Response {
   validWords: string[];
 }
 
-const verify = async ({ board, game, locale }: Payload): Promise<Response> => {
+export const verify = async ({ board, game, locale }: Payload): Promise<Response> => {
   return fetchJson<Response>('/api/verify', {
     method: 'POST',
     body: JSON.stringify({ board, game, locale }),
   });
 };
-
-export default verify;

package/src/sdk/visit.ts

@@ -1,7 +1,5 @@
-const visit = (): Promise<Response> => {
+export const visit = (): Promise<Response> => {
   return fetch('/api/visit', {
     method: 'PUT',
   });
 };
-
-export default visit;

package/src/service-worker/average.ts

@@ -1,9 +1,7 @@
-const average = (numbers: number[]): number => {
+export const average = (numbers: number[]): number => {
   if (numbers.length === 0) {
     return 0;
   }
 
   return numbers.reduce((sum, value) => sum + value, 0) / numbers.length;
 };
-
-export default average;

package/src/service-worker/dictionaries/expirationManager.ts

@@ -2,8 +2,6 @@ import { CacheExpiration } from 'workbox-expiration';
 
 import { DICTIONARY_CACHE, DICTIONARY_CACHE_MAX_AGE } from './constants';
 
-const expirationManager = new CacheExpiration(DICTIONARY_CACHE, {
+export const expirationManager = new CacheExpiration(DICTIONARY_CACHE, {
   maxAgeSeconds: DICTIONARY_CACHE_MAX_AGE / 1000,
 });
-
-export default expirationManager;

package/src/service-worker/dictionaries/getDictionary.ts

@@ -1,10 +1,10 @@
 import { Locale } from '@scrabble-solver/types';
 
 import { DICTIONARY_CACHE } from './constants';
-import expirationManager from './expirationManager';
-import getDictionaryUrl from './getDictionaryUrl';
+import { expirationManager } from './expirationManager';
+import { getDictionaryUrl } from './getDictionaryUrl';
 
-const getDictionary = async (locale: Locale): Promise<string | undefined> => {
+export const getDictionary = async (locale: Locale): Promise<string | undefined> => {
   await expirationManager.expireEntries();
 
   const url = getDictionaryUrl(locale);
@@ -18,5 +18,3 @@ const getDictionary = async (locale: Locale): Promise<string | undefined> => {
   const serialized = await cached.clone().text();
   return serialized;
 };
-
-export default getDictionary;

package/src/service-worker/dictionaries/getDictionaryUrl.ts

@@ -1,7 +1,5 @@
 import { Locale } from '@scrabble-solver/types';
 
-const getDictionaryUrl = (locale: Locale): string => {
+export const getDictionaryUrl = (locale: Locale): string => {
   return `/api/dictionary/${locale}`;
 };
-
-export default getDictionaryUrl;

package/src/service-worker/dictionaries/index.ts

@@ -1,2 +1,2 @@
-export { default as getDictionary } from './getDictionary';
-export { default as revalidateDictionary } from './revalidateDictionary';
+export { getDictionary } from './getDictionary';
+export { revalidateDictionary } from './revalidateDictionary';

package/src/service-worker/dictionaries/revalidateDictionary.ts

@@ -1,12 +1,12 @@
 import { Locale } from '@scrabble-solver/types';
 
 import { DICTIONARY_CACHE } from './constants';
-import expirationManager from './expirationManager';
-import getDictionaryUrl from './getDictionaryUrl';
+import { expirationManager } from './expirationManager';
+import { getDictionaryUrl } from './getDictionaryUrl';
 
 const requests: Partial<Record<Locale, Promise<Response> | undefined>> = {};
 
-const revalidateDictionary = async (locale: Locale): Promise<void> => {
+export const revalidateDictionary = async (locale: Locale): Promise<void> => {
   if (requests[locale] instanceof Promise) {
     return;
   }
@@ -31,5 +31,3 @@ const revalidateDictionary = async (locale: Locale): Promise<void> => {
     requests[locale] = undefined;
   }
 };
-
-export default revalidateDictionary;

package/src/service-worker/getTrie.ts

@@ -5,7 +5,7 @@ import { getDictionary } from './dictionaries';
 
 const cache: Partial<Record<Locale, { trie: Trie; dictionary: string } | undefined>> = {};
 
-const getTrie = async (locale: Locale): Promise<Trie | undefined> => {
+export const getTrie = async (locale: Locale): Promise<Trie | undefined> => {
   const dictionary = await getDictionary(locale);
 
   if (typeof dictionary === 'undefined') {
@@ -22,5 +22,3 @@ const getTrie = async (locale: Locale): Promise<Trie | undefined> => {
 
   return cached.trie;
 };
-
-export default getTrie;

package/src/service-worker/index.ts

@@ -2,16 +2,18 @@
 
 import { cleanupOutdatedCaches, precacheAndRoute } from 'workbox-precaching';
 
-import routeSolveRequests from './routeSolveRequests';
-import routeVerifyRequests from './routeVerifyRequests';
+import { routeSolveRequests } from './routeSolveRequests';
+import { routeVerifyRequests } from './routeVerifyRequests';
 
 declare const self: ServiceWorkerGlobalScope;
 
 self.addEventListener('install', () => {
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   self.skipWaiting();
 });
 
 self.addEventListener('activate', () => {
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   self.clients.claim();
 });
 

package/src/service-worker/routeSolveRequests.ts

@@ -5,9 +5,11 @@ import { solve } from '@scrabble-solver/solver';
 import { Board, Tile } from '@scrabble-solver/types';
 import { registerRoute } from 'workbox-routing';
 
-import average from './average';
+import { SolveRequestPayload } from 'types';
+
+import { average } from './average';
 import { revalidateDictionary } from './dictionaries';
-import getTrie from './getTrie';
+import { getTrie } from './getTrie';
 
 const headers = {
   'Content-Type': 'application/json; charset=utf-8',
@@ -29,18 +31,22 @@ const isSlowDevice = (): boolean | undefined => {
   return average(local) > average(server);
 };
 
-const routeSolveRequests = () => {
+export const routeSolveRequests = () => {
   registerRoute(
     ({ url }) => url.origin === location.origin && url.pathname === '/api/solve',
     async ({ request }) => {
-      const { board, characters, game, locale } = await request.clone().json();
+      const requestJson: SolveRequestPayload = await request.clone().json();
+      const { board, characters, game, locale } = requestJson;
 
-      const solveLocal = async (trie: Trie) => {
+      const solveLocal = async (trie: Trie): Promise<Response> => {
         const config = getConfig(game, locale);
         const tiles = characters.map((character: string) => new Tile({ character, isBlank: character === BLANK }));
-        const resultsJson = solve(trie, config, Board.fromJson(board), tiles);
-        const json = JSON.stringify(resultsJson);
-        return new Response(json, { headers });
+
+        return new Promise((resolve) => {
+          const resultsJson = solve(trie, config, Board.fromJson(board), tiles);
+          const responseJson = JSON.stringify(resultsJson);
+          resolve(new Response(responseJson, { headers }));
+        });
       };
 
       const solveServer = () => fetch(request);
@@ -51,7 +57,7 @@ const routeSolveRequests = () => {
         const response = await Promise.race([
           (async () => {
             const start = Date.now();
-            const result = await solveLocal(trie);
+            const result = solveLocal(trie);
             localDurations.push(Date.now() - start);
             return result;
           })(),
@@ -63,17 +69,17 @@ const routeSolveRequests = () => {
           })(),
         ]);
 
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         revalidateDictionary(locale);
         return response;
       }
 
       const handleSolve = trie && !isSlowDevice() ? () => solveLocal(trie) : () => solveServer();
       const response = await handleSolve();
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       revalidateDictionary(locale);
       return response;
     },
     'POST',
   );
 };
-
-export default routeSolveRequests;

package/src/service-worker/routeVerifyRequests.ts

@@ -1,22 +1,26 @@
 import { Board } from '@scrabble-solver/types';
 import { registerRoute } from 'workbox-routing';
 
+import { VerifyRequestPayload } from 'types';
+
 import { revalidateDictionary } from './dictionaries';
-import getTrie from './getTrie';
+import { getTrie } from './getTrie';
 
 const headers = {
   'Content-Type': 'application/json; charset=utf-8',
 };
 
-const routeVerifyRequests = () => {
+export const routeVerifyRequests = () => {
   registerRoute(
     ({ url }) => url.origin === location.origin && url.pathname === '/api/verify',
     async ({ request }) => {
-      const { board: boardJson, locale } = await request.clone().json();
+      const requestJson: VerifyRequestPayload = await request.clone().json();
+      const { board: boardJson, locale } = requestJson;
       const trie = await getTrie(locale);
 
       if (!trie) {
         const response = await fetch(request);
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         revalidateDictionary(locale);
         return response;
       }
@@ -31,5 +35,3 @@ const routeVerifyRequests = () => {
     'POST',
   );
 };
-
-export default routeVerifyRequests;

package/src/serviceWorkerManager.ts

@@ -2,16 +2,16 @@ import { Workbox } from 'workbox-window';
 
 let serviceWorker: Workbox | null = null;
 
-export const registerServiceWorker = () => {
+export const registerServiceWorker = async () => {
   if (!globalThis.navigator || !('serviceWorker' in globalThis.navigator)) {
     return;
   }
 
   serviceWorker = new Workbox('/service-worker.js');
-  serviceWorker.register({ immediate: true });
+  await serviceWorker.register({ immediate: true });
 };
 
-export const getServiceWorker = (): Workbox | null => {
+export const getServiceWorker = async (): Promise<Workbox | null> => {
   if (process.env.NODE_ENV !== 'production') {
     return null;
   }
@@ -20,7 +20,7 @@ export const getServiceWorker = (): Workbox | null => {
     return serviceWorker;
   }
 
-  registerServiceWorker();
+  await registerServiceWorker();
 
   return serviceWorker;
 };

package/src/state/index.ts

@@ -1,7 +1,7 @@
 export * from './actions';
-export { default as localStorage } from './localStorage';
+export { localStorage } from './localStorage';
 export * from './selectors';
 export * from './slices';
-export { default as store } from './store';
-export { default as useTranslate } from './useTranslate';
-export { default as useTypedSelector } from './useTypedSelector';
+export { store } from './store';
+export { useTranslate } from './useTranslate';
+export { useTypedSelector } from './useTypedSelector';

package/src/state/localStorage.ts

@@ -1,4 +1,4 @@
-import { Board, Game, Locale, ShowCoordinates } from '@scrabble-solver/types';
+import { Board, BoardJson, Game, Locale, ShowCoordinates } from '@scrabble-solver/types';
 import store2 from 'store2';
 
 import { AutoGroupTiles, InputMode, Rack } from 'types';
@@ -13,9 +13,9 @@ const SHOW_COORDINATES = 'show-coordinates';
 
 const store = store2.namespace('scrabble-solver');
 
-const localStorage = {
+export const localStorage = {
   getAutoGroupTiles(): AutoGroupTiles | undefined {
-    return store.get(AUTO_GROUP_TILES);
+    return store.get(AUTO_GROUP_TILES) as AutoGroupTiles | undefined;
   },
 
   setAutoGroupTiles(autoGroupTiles: AutoGroupTiles | undefined): void {
@@ -23,8 +23,8 @@ const localStorage = {
   },
 
   getBoard(): Board | undefined {
-    const serialized = store.get(BOARD);
-    return serialized ? Board.fromJson(JSON.parse(serialized)) : serialized;
+    const serialized = store.get(BOARD) as string | undefined;
+    return serialized ? Board.fromJson(JSON.parse(serialized) as BoardJson) : undefined;
   },
 
   setBoard(board: Board | undefined): void {
@@ -33,7 +33,7 @@ const localStorage = {
   },
 
   getGame(): Game | undefined {
-    return store.get(GAME_ID);
+    return store.get(GAME_ID) as Game | undefined;
   },
 
   setGame(game: Game | undefined): void {
@@ -41,7 +41,7 @@ const localStorage = {
   },
 
   getInputMode(): InputMode | undefined {
-    return store.get(INPUT_MODE);
+    return store.get(INPUT_MODE) as InputMode | undefined;
   },
 
   setInputMode(inputMode: InputMode | undefined): void {
@@ -49,7 +49,7 @@ const localStorage = {
   },
 
   getLocale(): Locale | undefined {
-    return store.get(LOCALE);
+    return store.get(LOCALE) as Locale | undefined;
   },
 
   setLocale(locale: Locale | undefined): void {
@@ -57,7 +57,7 @@ const localStorage = {
   },
 
   getRack(): Rack | undefined {
-    return store.get(RACK);
+    return store.get(RACK) as Rack | undefined;
   },
 
   setRack(rack: Rack | undefined): void {
@@ -65,12 +65,10 @@ const localStorage = {
   },
 
   getShowCoordinates(): ShowCoordinates | undefined {
-    return store.get(SHOW_COORDINATES);
+    return store.get(SHOW_COORDINATES) as ShowCoordinates | undefined;
   },
 
   setShowCoordinates(showCoordinates: ShowCoordinates | undefined): void {
     store.set(SHOW_COORDINATES, showCoordinates, true);
   },
 };
-
-export default localStorage;

package/src/state/sagas.ts

@@ -1,4 +1,7 @@
 /* eslint-disable max-lines, no-implicit-globals */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
 import { PayloadAction } from '@reduxjs/toolkit';
 import { hasConfig, languages } from '@scrabble-solver/configs';
@@ -131,7 +134,7 @@ function* onInitialize(): AnyGenerator {
 function* onReset(): AnyGenerator {
   const config = yield select(selectConfig);
 
-  yield put(boardSlice.actions.init(Board.create(config.boardSize)));
+  yield put(boardSlice.actions.init(Board.create(config.boardWidth, config.boardHeight)));
   yield put(cellFilterSlice.actions.reset());
   yield put(dictionarySlice.actions.reset());
   yield put(rackSlice.actions.reset());

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