@scrabble-solver/scrabble-solver 2.16.7 → 2.18.0

package/src/state/sagas.ts

@@ -5,17 +5,23 @@
 
 import { type PayloadAction } from '@reduxjs/toolkit';
 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 { Board, Locale, type Result } from '@scrabble-solver/types';
+import { call, delay, put, select, spawn, takeEvery, takeLatest } from 'redux-saga/effects';
 
-import { LOCALE_FEATURES } from '@/i18n';
-import { memoize } from '@/lib';
+import { LOCALE_FEATURES } from '@/i18n/constants';
+import { loadTranslations } from '@/i18n/i18n';
+import { memoize } from '@/lib/memoize';
+import { waitForIdleOrFirstIntent } from '@/lib/waitForIdleOrFirstIntent';
 import { findWordDefinitions, solve, verify, visit } from '@/sdk';
+import { prefetchDictionary } from '@/solver-worker';
 
 import { initialize, reset } from './actions';
+import { appSlice, selectVersion } from './app';
 import { boardSlice, selectBoard } from './board';
 import { cellFiltersSlice, selectCellFilter } from './cellFilters';
 import { dictionarySlice, selectDictionary } from './dictionary';
+import { i18nSlice, selectLoadedTranslations } from './i18n';
+import { localStorage } from './localStorage';
 import { rackSlice, selectCharacters, selectRack } from './rack';
 import { resultsSlice } from './results';
 import {
@@ -24,8 +30,11 @@ import {
   selectLocale,
   selectLocaleAutoGroupTiles,
   selectRemoveCellFilters,
+  settingsInitialState,
   settingsSlice,
+  type SettingsState,
 } from './settings';
+import { guessLocale } from './settings/lib';
 import { solveSlice } from './solve';
 import { verifySlice } from './verify';
 
@@ -41,7 +50,7 @@ export function* rootSaga(): AnyGenerator {
   yield takeEvery(boardSlice.actions.changeCellValue.type, onCellValueChange);
   yield takeEvery([rackSlice.actions.changeCharacter.type, rackSlice.actions.changeCharacters.type], onRackValueChange);
   yield takeEvery(resultsSlice.actions.applyResult.type, onApplyResult);
-  yield takeEvery(resultsSlice.actions.changeResultCandidate.type, onResultCandidateChange);
+  yield takeLatest(resultsSlice.actions.changeResultCandidate.type, onResultCandidateChange);
   yield takeEvery(settingsSlice.actions.changeGame.type, onGameChange);
   yield takeEvery(settingsSlice.actions.changeLocale.type, onLocaleChange);
   yield takeLatest(dictionarySlice.actions.submit.type, onDictionarySubmit);
@@ -118,10 +127,22 @@ function* onDictionarySubmit(): AnyGenerator {
   }
 }
 
-function* onInitialize(): AnyGenerator {
+function* onInitialize({ payload }: PayloadAction<{ version: string }>): AnyGenerator {
+  try {
+    yield* hydratePersistedState(payload.version);
+    // oxlint-disable-next-line no-empty
+  } catch {
+  } finally {
+    yield put(appSlice.actions.hydrated());
+  }
+
   const board = yield select(selectBoard);
+  const locale = yield select(selectLocale);
 
-  yield call(visit);
+  yield spawn(prefetchDictionaryWhenIdle);
+  yield spawn(loadLocaleTranslations, locale);
+  yield spawn(preloadTranslationsWhenIdle);
+  yield spawn(visitWhenIdle);
 
   if (!board.isEmpty()) {
     yield* resetRack();
@@ -129,6 +150,100 @@ function* onInitialize(): AnyGenerator {
   }
 }
 
+function* hydratePersistedState(version: string): AnyGenerator {
+  const isTouchScreen = globalThis.matchMedia?.('(hover: none)').matches ?? false;
+  const settings: Pick<SettingsState, 'game' | 'inputMode' | 'locale'> & Partial<SettingsState> = {
+    game: settingsInitialState.game,
+    inputMode: isTouchScreen ? ('touchscreen' as const) : ('keyboard' as const),
+    locale: guessLocale(),
+    ...localStorage.getSettings(),
+  };
+
+  if (!hasConfig(settings.game, settings.locale)) {
+    const localeDefault = Object.values(languages).find((config) => config.locale === settings.locale);
+    settings.game = localeDefault?.game ?? settingsInitialState.game;
+    settings.locale = localeDefault?.locale ?? guessLocale();
+  }
+
+  yield put(settingsSlice.actions.init(settings));
+  yield* hydratePersistedTranslations(settings.locale, version);
+
+  const config = yield select(selectConfig);
+  const currentBoard: Board = yield select(selectBoard);
+  const board = localStorage.getBoard();
+
+  if (board) {
+    yield put(boardSlice.actions.init(board));
+  } else if (currentBoard.rows.length !== config.boardHeight || currentBoard.rows[0].length !== config.boardWidth) {
+    yield put(boardSlice.actions.init(Board.create(config.boardWidth, config.boardHeight)));
+  }
+
+  const currentRack = yield select(selectRack);
+  const rack = localStorage.getRack();
+
+  if (rack) {
+    yield put(rackSlice.actions.init(rack));
+  } else if (currentRack.length !== config.rackSize) {
+    yield put(rackSlice.actions.init(Array(config.rackSize).fill(null)));
+  }
+}
+
+// Applied synchronously so the first post-hydration paint is already translated
+function* hydratePersistedTranslations(locale: Locale, version: string): AnyGenerator {
+  const translations = localStorage.getTranslations(locale, version);
+
+  if (translations) {
+    yield put(i18nSlice.actions.loaded({ locale, translations }));
+  }
+}
+
+function* visitWhenIdle(): AnyGenerator {
+  yield call(waitForIdleOrFirstIntent);
+  yield call(visit);
+}
+
+function* prefetchDictionaryWhenIdle(): AnyGenerator {
+  yield call(waitForIdleOrFirstIntent);
+  const locale = yield select(selectLocale);
+  yield call(prefetchDictionary, locale);
+}
+
+function* loadLocaleTranslations(locale: Locale): AnyGenerator {
+  const loaded = yield select(selectLoadedTranslations);
+
+  if (loaded[locale]) {
+    return;
+  }
+
+  const translations = yield call(loadTranslations, locale);
+  yield put(i18nSlice.actions.loaded({ locale, translations }));
+
+  const activeLocale = yield select(selectLocale);
+
+  if (locale === activeLocale) {
+    const version = yield select(selectVersion);
+    localStorage.setTranslations(locale, version, translations);
+  }
+}
+
+// The cache makes the next boot's first paint translated without waiting for a chunk download
+function* persistTranslationsCache(locale: Locale): AnyGenerator {
+  const loaded = yield select(selectLoadedTranslations);
+  const version = yield select(selectVersion);
+
+  if (loaded[locale]) {
+    localStorage.setTranslations(locale, version, loaded[locale]);
+  }
+}
+
+function* preloadTranslationsWhenIdle(): AnyGenerator {
+  yield call(waitForIdleOrFirstIntent);
+
+  for (const locale of Object.values(Locale)) {
+    yield spawn(loadLocaleTranslations, locale);
+  }
+}
+
 function* onReset(): AnyGenerator {
   const config = yield select(selectConfig);
 
@@ -142,6 +257,10 @@ function* onReset(): AnyGenerator {
 }
 
 function* onLocaleChange({ payload: locale }: PayloadAction<Locale>): AnyGenerator {
+  yield spawn(loadLocaleTranslations, locale);
+  yield spawn(prefetchDictionary, locale);
+  yield* persistTranslationsCache(locale);
+
   const game = yield select(selectGame);
 
   if (!hasConfig(game, locale)) {
@@ -166,13 +285,20 @@ function* onLocaleChange({ payload: locale }: PayloadAction<Locale>): AnyGenerat
 }
 
 function* onResultCandidateChange({ payload: result }: PayloadAction<Result | null>): AnyGenerator {
-  if (result) {
-    const locale: Locale = yield select(selectLocale);
-    const uniqueWords = Array.from(new Set(result.words));
-    const input = uniqueWords.join(LOCALE_FEATURES[locale].separator);
-    yield put(dictionarySlice.actions.changeInput(input));
-    yield put(dictionarySlice.actions.submit());
+  if (!result) {
+    return;
+  }
+
+  const locale: Locale = yield select(selectLocale);
+  const uniqueWords = Array.from(new Set(result.words));
+  const input = uniqueWords.join(LOCALE_FEATURES[locale].separator);
+
+  if (!memoizedFindWordDefinitions.hasCache(locale, input)) {
+    yield delay(SUBMIT_DELAY);
   }
+
+  yield put(dictionarySlice.actions.changeInput(input));
+  yield put(dictionarySlice.actions.submit());
 }
 
 function* onSolve(): AnyGenerator {

package/src/state/selectors.ts

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

package/src/state/settings/initialState.ts

@@ -1,19 +1,16 @@
-import { Game } from '@scrabble-solver/types';
+import { Game, Locale } from '@scrabble-solver/types';
 
-import { localStorage } from '../localStorage';
-
-import { guessLocale } from './lib';
 import type { SettingsState } from './types';
 
-const isTouchScreen = typeof globalThis.matchMedia !== 'undefined' && globalThis.matchMedia('(hover: none)').matches;
-
+/**
+ * Deterministic defaults shared by the server render and the client's hydration render.
+ */
 export const settingsInitialState: SettingsState = {
   autoGroupTiles: null,
   game: Game.Scrabble,
   highlightUnreachableCells: false,
-  inputMode: isTouchScreen ? 'touchscreen' : 'keyboard',
-  locale: guessLocale(),
+  inputMode: 'keyboard',
+  locale: Locale.EN_US,
   removeCellFilters: 'always',
-  showCoordinates: 'hidden',
-  ...localStorage.getSettings(),
+  showCoordinates: 'original',
 };

package/src/state/settings/selectors.ts

@@ -3,8 +3,10 @@ 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 { LOCALE_FEATURES } from '@/i18n/constants';
+import { englishTranslations } from '@/i18n/i18n';
 
+import { selectLoadedTranslations } from '../i18n';
 import type { RootState } from '../types';
 
 const selectCell = (_: unknown, cell: Cell): Cell => cell;
@@ -68,6 +70,9 @@ export const selectCellIsValid = createSelector([selectConfig, selectCell], (con
   return config.tiles.some((tile) => tile.character === cell.tile.character);
 });
 
-export const selectTranslations = createSelector([selectLocale], (locale) => i18n[locale]);
+export const selectTranslations = createSelector(
+  [selectLocale, selectLoadedTranslations],
+  (locale, translations) => translations[locale] ?? englishTranslations,
+);
 
 export const selectRemoveCellFilters = createSelector([selectSettings], (settings) => settings.removeCellFilters);

package/src/state/settings/slice.ts

@@ -44,8 +44,11 @@ export const settingsSlice = createSlice({
       return { ...state, removeCellFilters };
     },
 
-    init: (state, action: PayloadAction<Partial<Pick<typeof settingsInitialState, 'game' | 'locale'>>>) => {
-      return { ...state, ...action.payload };
+    init: (state, action: PayloadAction<Partial<typeof settingsInitialState>>) => {
+      const settings = { ...state, ...action.payload };
+      const keys = Object.keys(settings) as (keyof typeof settingsInitialState)[];
+      const hasDiff = keys.some((key) => settings[key] !== state[key]);
+      return hasDiff ? settings : state;
     },
   },
 });

package/src/state/store.ts

@@ -1,10 +1,12 @@
 import { configureStore } from '@reduxjs/toolkit';
 import reduxSaga from 'redux-saga';
 
+import { appSlice } from './app';
 import { boardSlice } from './board';
 import { cellFiltersSlice } from './cellFilters';
 import { dictionarySlice } from './dictionary';
 import { hoveredTileSlice } from './hoveredTile';
+import { i18nSlice } from './i18n';
 import { rackSlice } from './rack';
 import { resultsSlice } from './results';
 import { rootSaga } from './sagas';
@@ -16,10 +18,12 @@ const sagaMiddleware = reduxSaga();
 
 export const store = configureStore({
   reducer: {
+    app: appSlice.reducer,
     board: boardSlice.reducer,
     cellFilters: cellFiltersSlice.reducer,
     dictionary: dictionarySlice.reducer,
     hoveredTile: hoveredTileSlice.reducer,
+    i18n: i18nSlice.reducer,
     rack: rackSlice.reducer,
     results: resultsSlice.reducer,
     settings: settingsSlice.reducer,

package/src/state/types.ts

@@ -1,7 +1,9 @@
+import type { AppState } from './app';
 import type { BoardState } from './board';
 import type { CellFiltersState } from './cellFilters';
 import type { DictionaryState } from './dictionary';
 import type { HoveredTileState } from './hoveredTile';
+import type { I18nState } from './i18n';
 import type { RackState } from './rack';
 import type { ResultsState } from './results';
 import type { SettingsState } from './settings';
@@ -9,10 +11,12 @@ import type { SolveState } from './solve';
 import type { VerifyState } from './verify';
 
 export type RootState = {
+  app: AppState;
   board: BoardState;
   cellFilters: CellFiltersState;
   dictionary: DictionaryState;
   hoveredTile: HoveredTileState;
+  i18n: I18nState;
   rack: RackState;
   results: ResultsState;
   settings: SettingsState;

package/src/state/useTypedStore.ts

@@ -0,0 +1,6 @@
+import { type Store } from '@reduxjs/toolkit';
+import { useStore } from 'react-redux';
+
+import type { RootState } from './types';
+
+export const useTypedStore = (): Store<RootState> => useStore<RootState>();

package/src/styles/_tokens.scss

@@ -57,3 +57,4 @@ $modal-width: 370px;
 $results-item-height: 40px;
 $solver-column-width: 580px;
 $text-input-height: 40px;
+$tile-size-max: 80px;

package/src/styles/global.scss

@@ -50,3 +50,12 @@ h4 {
 nextjs-portal {
   display: none;
 }
+
+/**
+ * Added pre-paint by _document's inline script when the persisted game differs from the
+ * prerendered default board; removed after hydration applies the persisted config.
+ * The class name must match CONFIG_PENDING_CLASS in parameters/index.ts.
+ */
+html.config-pending main {
+  visibility: hidden;
+}

package/src/styles/variables.module.scss

@@ -7,23 +7,16 @@
   breakpointL: strip-unit($breakpoint-l);
   breakpointXl: strip-unit($breakpoint-xl);
 
-  borderColor: $border-color;
   borderColorLight: $border-color-light;
-  borderRadius: strip-unit($border-radius);
   borderWidth: strip-unit($border-width);
 
-  colorBlue: $color-blue;
   colorBlueLight: $color-blue-light;
-  colorGreen: $color-green;
   colorGreenLight: $color-green-light;
-  colorRed: $color-red;
   colorRedLight: $color-red-light;
   colorVioletLight: $color-violet-light;
-  colorYellow: $color-yellow;
   colorYellowLight: $color-yellow-light;
 
   colorBackground: $color-background;
-  colorForegroundSecondary: $color-foreground-secondary;
 
   colorBonusCharacterMultiplier2: $color-bonus-character-multiplier-2;
   colorBonusCharacterMultiplier3: $color-bonus-character-multiplier-3;
@@ -32,22 +25,8 @@
   colorBonusWordMultiplier3: $color-bonus-word-multiplier-3;
   colorBonusWordMultiplier4: $color-bonus-word-multiplier-4;
 
-  spacingXs: strip-unit($spacing-xs);
-  spacingS: strip-unit($spacing-s);
-  spacingM: strip-unit($spacing-m);
-  spacingL: strip-unit($spacing-l);
-  spacingXl: strip-unit($spacing-xl);
-
   transitionDuration: strip-unit($transition-duration);
   transitionDurationLong: strip-unit($transition-duration-long);
 
-  buttonIconSize: strip-unit($button-icon-size);
-  dictionaryHeight: strip-unit($dictionary-height);
-  dictionaryHeightMobile: strip-unit($dictionary-height-mobile);
-  logoHeight: strip-unit($logo-height);
-  logoHeightSmall: strip-unit($logo-height-small);
-  modalWidth: strip-unit($modal-width);
   resultsItemHeight: strip-unit($results-item-height);
-  solverColumnWidth: strip-unit($solver-column-width);
-  textInputHeight: strip-unit($text-input-height);
 }

package/src/styles/variables.module.scss.d.ts

@@ -0,0 +1,27 @@
+// Generated by scripts/generate-scss-types.ts - do not edit.
+declare const styles: {
+  readonly borderColorLight: string;
+  readonly borderWidth: string;
+  readonly breakpointL: string;
+  readonly breakpointM: string;
+  readonly breakpointS: string;
+  readonly breakpointXl: string;
+  readonly breakpointXs: string;
+  readonly colorBackground: string;
+  readonly colorBlueLight: string;
+  readonly colorBonusCharacterMultiplier2: string;
+  readonly colorBonusCharacterMultiplier3: string;
+  readonly colorBonusCharacterMultiplier4: string;
+  readonly colorBonusWordMultiplier2: string;
+  readonly colorBonusWordMultiplier3: string;
+  readonly colorBonusWordMultiplier4: string;
+  readonly colorGreenLight: string;
+  readonly colorRedLight: string;
+  readonly colorVioletLight: string;
+  readonly colorYellowLight: string;
+  readonly resultsItemHeight: string;
+  readonly transitionDuration: string;
+  readonly transitionDurationLong: string;
+};
+
+export default styles;

package/src/styles/variables.scss

@@ -61,10 +61,12 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --color--bonus--word-multiplier--2: #{$color-bonus-word-multiplier-2};
   --color--bonus--word-multiplier--3: #{$color-bonus-word-multiplier-3};
   --color--bonus--word-multiplier--4: #{$color-bonus-word-multiplier-4};
+  --color--progress: var(--color--primary--light);
+  --color--progress--background: var(--color--inactive);
   --color--tooltip--background: #{$color-foreground-secondary};
   --color--tooltip--foreground: var(--color--white);
 
-  --font--family: system-ui, sans-serif;
+  --font--family: Ubuntu, system-ui, sans-serif;
   --font--family--monospace:
     ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;
   --font--size--h1: 30px;
@@ -101,13 +103,14 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --z-index--tooltip: 102;
 
   --button--icon--size: #{$button-icon-size};
+  --button--height: calc(var(--button--icon--size) + 2 * var(--spacing--m) + 2 * var(--border--width));
   --dictionary--height: #{$dictionary-height};
   --dictionary--height--mobile: #{$dictionary-height-mobile};
   --key--height: 36px;
   --key--icon--size: 16px;
   --logo--height: #{$logo-height};
   --modal--width: #{$modal-width};
-  --nav--height: calc(var(--logo--height) + var(--nav--padding));
+  --nav--height: calc(2 * var(--nav--padding) + var(--logo--height));
   --nav--padding: var(--spacing--l);
   --results--icon--size: 18px;
   --results--item--height: #{$results-item-height};
@@ -116,9 +119,50 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --text-input--height: #{$text-input-height};
   --tooltip--max-width: 500px;
 
+  /**
+   * Sizes of everything visible before hydration.
+   * Defaults are of classic Scrabble config.
+   */
+  --board-cols: 15;
+  --board-rows: 15;
+  --rack-size: 7;
+
+  --components-spacing: var(--spacing--xl);
+  --solver-column-total: calc(var(--solver-column--width) + var(--components-spacing));
+  --candidate-picker-height: 0px;
+  --max-board-width: calc(100vw - var(--solver-column-total) - 2 * var(--components-spacing));
+  --rack-tile-size: min(
+    calc((var(--max-board-width) - 2 * var(--border--width)) / var(--rack-size)),
+    #{$tile-size-max}
+  );
+  --bottom-container-height: calc(
+    var(--candidate-picker-height) + var(--rack-tile-size) + 2 * var(--components-spacing)
+  );
+  --max-board-height: max(calc(100dvh - var(--nav--height) - var(--bottom-container-height)), 0px);
+  --cell-from-width: calc(
+    (var(--max-board-width) - (var(--board-cols) + 2) * var(--border--width)) / (var(--board-cols) + 0.5)
+  );
+  --cell-from-height: calc(
+    (var(--max-board-height) - (var(--board-rows) + 2) * var(--border--width)) / (var(--board-rows) + 0.5)
+  );
+  --cell-size: min(var(--cell-from-width), var(--cell-from-height), #{$tile-size-max});
+  --coordinate-size: calc(0.5 * var(--cell-size));
+  --controls-max-width: calc(var(--rack-size) * var(--rack-tile-size) + 2 * var(--border--width));
+
+  @include media('<xl') {
+    --components-spacing: var(--spacing--l);
+  }
+
   @include media('<l') {
     --dictionary--height: var(--dictionary--height--mobile);
     --logo--height: #{$logo-height-small};
+    --solver-column-total: 0px;
+    --candidate-picker-height: calc(var(--button--height) + var(--components-spacing));
+  }
+
+  @include media('<m') {
+    // Full-width board: height no longer constrains the cell size.
+    --cell-size: min(var(--cell-from-width), #{$tile-size-max});
   }
 
   @include media('<s') {

package/src/types/api.ts

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

package/src/types/index.ts

@@ -15,7 +15,7 @@ export type CellFilter = {
 
 export type RemoveCellFilters = 'always' | 'never' | null;
 
-export type Direction = 'horizontal' | 'vertical';
+export { type Direction } from '@scrabble-solver/types';
 
 export type InputMode = 'keyboard' | 'touchscreen';
 
@@ -152,7 +152,6 @@ export type TranslationKey =
   | 'settings.language'
   | 'settings.showCoordinates'
   | 'settings.showCoordinates.alternative'
-  | 'settings.showCoordinates.hidden'
   | 'settings.showCoordinates.original'
   | 'words'
   | 'words.invalid'

package/tsconfig.json

@@ -7,6 +7,10 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "lib": ["dom", "dom.iterable", "esnext"],
+    // Webpack bundles this package (import.meta worker URLs need an ES module
+    // target), unlike the nodenext library packages.
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "noEmit": true,
     "paths": {
       "@/*": ["./src/*"]