@scrabble-solver/scrabble-solver 2.15.10 → 2.15.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.15.10",
+  "version": "2.15.11",
   "description": "Scrabble Solver 2 - App",
   "repository": {
     "type": "git",
@@ -21,19 +21,20 @@
     "clean": "rimraf .next/",
     "debug": "NODE_OPTIONS='--inspect' next dev",
     "dev": "env-cmd next dev",
-    "start": "env-cmd next start -p 3333"
+    "start": "env-cmd next start -p 3333",
+    "type-check": "tsc --noEmit"
   },
   "dependencies": {
     "@floating-ui/react": "^0.27.5",
     "@kamilmielnik/trie": "^4.0.0",
     "@reduxjs/toolkit": "^2.6.1",
-    "@scrabble-solver/configs": "^2.15.10",
-    "@scrabble-solver/constants": "^2.15.10",
-    "@scrabble-solver/dictionaries": "^2.15.10",
-    "@scrabble-solver/logger": "^2.15.10",
-    "@scrabble-solver/solver": "^2.15.10",
-    "@scrabble-solver/types": "^2.15.10",
-    "@scrabble-solver/word-definitions": "^2.15.10",
+    "@scrabble-solver/configs": "^2.15.11",
+    "@scrabble-solver/constants": "^2.15.11",
+    "@scrabble-solver/dictionaries": "^2.15.11",
+    "@scrabble-solver/logger": "^2.15.11",
+    "@scrabble-solver/solver": "^2.15.11",
+    "@scrabble-solver/types": "^2.15.11",
+    "@scrabble-solver/word-definitions": "^2.15.11",
     "classnames": "^2.5.1",
     "env-cmd": "^10.1.0",
     "include-media": "^2.0.0",
@@ -71,5 +72,5 @@
     "@types/redux-saga": "^0.10.5",
     "sass": "^1.86.0"
   },
-  "gitHead": "dab5a817c1bde1a3ebf8e8907215adf12af5cb27"
+  "gitHead": "4fa527098d5e67120adb7964777c044a09378332"
 }

package/src/components/Board/BoardPure.tsx

@@ -134,7 +134,7 @@ const BoardPureBase = forwardRef<HTMLDivElement, Props>(
               cell={cell}
               cellBottom={y < rows.length - 1 ? rows[y + 1][x] : undefined}
               cellLeft={x > 0 ? rows[y][x - 1] : undefined}
-              cellRight={x < rows.length - 1 ? rows[y][x + 1] : undefined}
+              cellRight={x < rows[y].length - 1 ? rows[y][x + 1] : undefined}
               cellTop={y > 0 ? rows[y - 1][x] : undefined}
               inputRef={inputRefs[y][x]}
               key={x}

package/src/components/NavButtons/NavButtons.tsx

@@ -4,7 +4,7 @@ import { FunctionComponent, memo } from 'react';
 import { useAppLayout } from 'hooks';
 import { CardChecklist, Cog, Eraser, Github, KeyboardFill, List, Sack } from 'icons';
 import { GITHUB_PROJECT_URL } from 'parameters';
-import { selectHasInvalidWords, selectHasOverusedTiles, useTranslate, useTypedSelector } from 'state';
+import { selectConfig, selectHasInvalidWords, selectHasOverusedTiles, useTranslate, useTypedSelector } from 'state';
 
 import { IconButton } from '../IconButton';
 
@@ -28,6 +28,7 @@ const NavButtonsBase: FunctionComponent<Props> = ({
   onShowWords,
 }) => {
   const translate = useTranslate();
+  const config = useTypedSelector(selectConfig);
   const hasOverusedTiles = useTypedSelector(selectHasOverusedTiles);
   const hasInvalidWords = useTypedSelector(selectHasInvalidWords);
   const { showKeyMap, showShortNav } = useAppLayout();
@@ -75,15 +76,17 @@ const NavButtonsBase: FunctionComponent<Props> = ({
       <div className={styles.separator} />
 
       <div className={styles.group}>
-        <IconButton
-          aria-label={translate('remaining-tiles')}
-          className={classNames(styles.button, {
-            [styles.error]: hasOverusedTiles,
-          })}
-          Icon={Sack}
-          tooltip={translate('remaining-tiles')}
-          onClick={onShowRemainingTiles}
-        />
+        {config.supportsRemainingTiles && (
+          <IconButton
+            aria-label={translate('remaining-tiles')}
+            className={classNames(styles.button, {
+              [styles.error]: hasOverusedTiles,
+            })}
+            Icon={Sack}
+            tooltip={translate('remaining-tiles')}
+            onClick={onShowRemainingTiles}
+          />
+        )}
 
         <IconButton
           aria-label={translate('words')}

package/src/components/SeoMessage/SeoMessage.tsx

@@ -10,8 +10,9 @@ const INVISIBLE_STYLE: CSSProperties = {
 
 export const SeoMessage: FunctionComponent = () => (
   <p style={INVISIBLE_STYLE}>
-    Scrabble Solver 2 is a free and open-source analysis tool for Scrabble, Scrabble Duel, Super Scrabble, 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. Source code is available on GitHub - contributions are welcome!
+    Scrabble Solver 2 is a free and open-source analysis tool for Scrabble, Scrabble Duel, Super Scrabble, Letter
+    League, 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. Source code is available on GitHub -
+    contributions are welcome!
   </p>
 );

package/src/lib/getCoordinate.test.ts

@@ -0,0 +1,22 @@
+import { getCoordinate } from './getCoordinate';
+
+describe('getCoordinate', () => {
+  it.each([
+    { index: 0, type: 'number' as const, expected: '1' },
+    { index: 99, type: 'number' as const, expected: '100' },
+  ])(`getCoordinate($index, "number") === "$expected"`, ({ index, type, expected }) => {
+    expect(getCoordinate(index, type)).toEqual(expected);
+  });
+
+  it.each([
+    { index: 0, type: 'letter' as const, expected: 'A' },
+    { index: 25, type: 'letter' as const, expected: 'Z' },
+    { index: 26, type: 'letter' as const, expected: 'AA' },
+    { index: 27, type: 'letter' as const, expected: 'AB' },
+    { index: 51, type: 'letter' as const, expected: 'AZ' },
+    { index: 52, type: 'letter' as const, expected: 'BA' },
+    { index: 53, type: 'letter' as const, expected: 'BB' },
+  ])(`getCoordinate("$index", "letter") === "$expected"`, ({ index, type, expected }) => {
+    expect(getCoordinate(index, type)).toEqual(expected);
+  });
+});

package/src/lib/getCoordinate.ts

@@ -5,5 +5,13 @@ export const getCoordinate = (index: number, type: 'letter' | 'number'): string
     return String(index + 1);
   }
 
-  return alphabet[index];
+  let result = '';
+  let nextIndex = index;
+
+  while (nextIndex >= 0) {
+    result = alphabet[nextIndex % alphabet.length] + result;
+    nextIndex = Math.floor(nextIndex / alphabet.length) - 1;
+  }
+
+  return result;
 };

package/src/lib/getRemainingTilesCount.ts

@@ -1,5 +1,11 @@
 import { RemainingTile } from 'types';
 
 export const getRemainingTilesCount = (remainingTiles: RemainingTile[]): number => {
-  return remainingTiles.reduce((sum, { count, usedCount }) => sum + count - usedCount, 0);
+  return remainingTiles.reduce((sum, { count, usedCount }) => {
+    if (typeof count === 'undefined') {
+      return sum;
+    }
+
+    return sum + count - usedCount;
+  }, 0);
 };

package/src/lib/getTotalRemainingTilesCount.ts

@@ -1,5 +1,11 @@
 import { RemainingTile } from 'types';
 
 export const getTotalRemainingTilesCount = (remainingTiles: RemainingTile[]): number => {
-  return remainingTiles.reduce((sum, { count }) => sum + count, 0);
+  return remainingTiles.reduce((sum, { count }) => {
+    if (typeof count === 'undefined') {
+      return sum;
+    }
+
+    return sum + count;
+  }, 0);
 };

package/src/modals/RemainingTilesModal/components/Character/Character.tsx

@@ -18,6 +18,11 @@ export const Character: FunctionComponent<Props> = ({ tile }) => {
   const locale = useTypedSelector(selectLocale);
   const { direction } = LOCALE_FEATURES[locale];
   const { character, count, usedCount } = tile;
+
+  if (typeof count === 'undefined') {
+    throw new Error('Remaining tiles not supported for this config');
+  }
+
   const remainingCount = count - usedCount;
   const points = useTypedSelector((state) => selectCharacterPoints(state, character));
   const current = direction === 'ltr' ? remainingCount : count;

package/src/pages/_app.tsx

@@ -11,7 +11,7 @@ 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 & Literaki. Quickly find top scoring words using given letters and board state. Available in English, French, German, Persian, Polish, Romanian, Spanish, and Turkish.';
+  'Scrabble Solver 2 - Free and open-source analysis tool for Scrabble, Scrabble Duel, Super Scrabble, Letter League & Literaki. Quickly find top scoring words using given letters and board state. Available in English, French, German, Persian, Polish, Romanian, Spanish, and Turkish.';
 
 const KEYWORDS = [
   'Scrabble Solver',
@@ -20,6 +20,7 @@ const KEYWORDS = [
   'Solver',
   'Super Scrabble',
   'Kelimelik',
+  'Letter League',
   'Literaki',
   'Board',
   'Open-source',

package/src/pages/index.tsx

@@ -18,7 +18,7 @@ import {
   WordsModal,
 } from 'modals';
 import { registerServiceWorker } from 'serviceWorkerManager';
-import { initialize, reset, selectLocale, useTypedSelector } from 'state';
+import { initialize, reset, selectConfig, selectLocale, useTypedSelector } from 'state';
 
 import styles from './index.module.scss';
 
@@ -31,6 +31,7 @@ interface Props {
 // eslint-disable-next-line max-statements
 const Index: FunctionComponent<Props> = ({ version }) => {
   const dispatch = useDispatch();
+  const config = useTypedSelector(selectConfig);
   const locale = useTypedSelector(selectLocale);
   const [showDictionary, setShowDictionary] = useState(false);
   const [showKeyMap, setShowKeyMap] = useState(false);
@@ -113,7 +114,9 @@ const Index: FunctionComponent<Props> = ({ version }) => {
 
       <WordsModal isOpen={showWords} onClose={handleHideWords} />
 
-      <RemainingTilesModal isOpen={showRemainingTiles} onClose={handleHideRemainingTiles} />
+      {config.supportsRemainingTiles && (
+        <RemainingTilesModal isOpen={showRemainingTiles} onClose={handleHideRemainingTiles} />
+      )}
 
       <ResultsModal isOpen={showResults} onClose={handleHideResults} />
 

package/src/state/selectors.ts

@@ -218,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/src/types/index.ts

@@ -36,7 +36,7 @@ export enum SortDirection {
 
 export interface RemainingTile {
   character: string;
-  count: number;
+  count?: number;
   score: number;
   usedCount: number;
 }