scrabble-solver 2.11.1 → 2.11.3

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

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

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

@@ -1,3 +1,5 @@
-const rackInitialState: (string | null)[] = [null, null, null, null, null, null, null];
+export type RackState = (string | null)[];
+
+const rackInitialState: RackState = [null, null, null, null, null, null, null];
 
 export default rackInitialState;

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

@@ -1,11 +1,18 @@
 import { Result } from '@scrabble-solver/types';
 
-import { ResultColumn, SortDirection } from 'types';
+import { ResultColumn, Sort, SortDirection } from 'types';
 
-const resultsInitialState = {
-  candidate: null as Result | null,
+export interface ResultsState {
+  candidate: Result | null;
+  query: string;
+  results: Result[] | undefined;
+  sort: Sort;
+}
+
+const resultsInitialState: ResultsState = {
+  candidate: null,
   query: '',
-  results: undefined as Result[] | undefined,
+  results: undefined,
   sort: {
     column: ResultColumn.Points,
     direction: SortDirection.Descending,

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

@@ -1,29 +1,18 @@
-import { scrabble } from '@scrabble-solver/configs';
+import { literaki, scrabble } from '@scrabble-solver/configs';
 import { Locale } from '@scrabble-solver/types';
 
-const getInitialLocale = (): Locale => {
-  if (!globalThis.navigator) {
-    return Locale.EN_US;
-  }
+import { guessLocale } from 'lib';
 
-  const locales = Object.values(Locale);
-  const exactMatch = locales.find((locale) => globalThis.navigator.language === locale);
+export interface SettingsState {
+  autoGroupTiles: 'left' | 'right' | null;
+  configId: typeof literaki.id | typeof scrabble.id;
+  locale: Locale;
+}
 
-  if (exactMatch) {
-    return exactMatch;
-  }
-
-  const partialMatch = locales.find((locale) => {
-    return globalThis.navigator.language === locale.substring(0, 2);
-  });
-
-  return partialMatch || Locale.EN_US;
-};
-
-const settingsInitialState = {
-  autoGroupTiles: 'left' as 'left' | 'right' | null,
+const settingsInitialState: SettingsState = {
+  autoGroupTiles: 'left',
   configId: scrabble.id,
-  locale: getInitialLocale(),
+  locale: guessLocale(),
 };
 
 export default settingsInitialState;

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

@@ -2,7 +2,7 @@ import { Board } from '@scrabble-solver/types';
 
 import boardInitialState from './boardInitialState';
 
-interface SolveInitialState {
+export interface SolveState {
   error: unknown | undefined;
   isLoading: boolean;
   lastSolvedParameters: {
@@ -11,7 +11,7 @@ interface SolveInitialState {
   };
 }
 
-const solveInitialState: SolveInitialState = {
+const solveInitialState: SolveState = {
   error: undefined,
   isLoading: false,
   lastSolvedParameters: {

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

@@ -12,6 +12,8 @@ const solveSlice = createSlice({
   initialState: solveInitialState,
   name: 'solve',
   reducers: {
+    reset: () => solveInitialState,
+
     submit: (state) => {
       const error = solveInitialState.error;
       return { ...state, error, isLoading: true };

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

@@ -1,12 +1,21 @@
-import boardInitialState from './boardInitialState';
+import boardInitialState, { BoardState } from './boardInitialState';
 
-const verifyInitialState = {
+export interface VerifyState {
+  isLoading: boolean;
+  lastSolvedParameters: {
+    board: BoardState;
+  };
+  invalidWords: string[];
+  validWords: string[];
+}
+
+const verifyInitialState: VerifyState = {
   isLoading: false,
   lastSolvedParameters: {
     board: boardInitialState,
   },
-  invalidWords: [] as string[],
-  validWords: [] as string[],
+  invalidWords: [],
+  validWords: [],
 };
 
 export default verifyInitialState;

package/packages/scrabble-solver/src/styles/mixins.scss

@@ -43,7 +43,6 @@ $media-expressions: (
   position: relative;
 
   &::after {
-    content: '';
     position: absolute;
     top: 0;
     right: 0;
@@ -63,6 +62,7 @@ $media-expressions: (
     }
 
     &::after {
+      content: '';
       box-shadow: 0 0 0 var(--focus-effect--size) var(--color--focus);
     }
   }
@@ -119,7 +119,9 @@ $media-expressions: (
   input {
     position: absolute;
     top: -100%;
+    right: -100%;
     left: -100%;
+    bottom: -100%;
     width: 300%;
     height: 300%;
     clip-path: inset((100% / 3));
@@ -151,6 +153,7 @@ $media-expressions: (
     &:nth-child(3) {
       input {
         left: -200%;
+        right: 0;
         clip-path: polygon((200% / 3) (100% / 3), 100% (100% / 3), 100% (200% / 3), (200% / 3) (200% / 3));
       }
     }
@@ -160,6 +163,7 @@ $media-expressions: (
     &:nth-last-child(3) {
       input {
         left: 0;
+        right: -200%;
         clip-path: polygon(0 (100% / 3), (100% / 3) (100% / 3), (100% / 3) (200% / 3), 0 (200% / 3));
       }
     }

package/packages/scrabble-solver/src/styles/variables.scss

@@ -12,9 +12,13 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --box-shadow: 0 0 var(--box-shadow--blur) var(--box-shadow--spread) var(--box-shadow--color);
   --box-shadow--blur: 8px;
   --box-shadow--color: rgba(0, 0, 0, 0.15);
+  --box-shadow--color--inverse: rgba(255, 255, 255, 0.85);
+  --box-shadow--color--raised: rgba(34, 34, 34, 0.8);
   --box-shadow--spread: 1px;
   --box-shadow--null: 0 0 var(--box-shadow--blur) var(--box-shadow--spread) transparent;
   --box-shadow--error: 0 0 var(--box-shadow--blur) var(--box-shadow--spread) var(--color--error);
+  --box-shadow--raised: inset -2px -2px 2px -1px var(--box-shadow--color--raised);
+  --box-shadow--raised--subtle: inset -1px -1px 1px 0 var(--box-shadow--color--raised);
 
   --color--white: #ffffff;
   --color--blue: #c7d8f9;
@@ -41,6 +45,7 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --color--success: #00a900;
   --color--warning: hsl(35, 90%, 60%);
   --color--primary: var(--color--violet);
+  --color--primary--light: var(--color--violet--light);
   --color--primary--opposite: var(--color--white);
 
   --color--bonus--character--1: var(--color--yellow--light);
@@ -93,6 +98,14 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --z-index--close-button: 101;
   --z-index--tooltip: 102;
 
+  --flag--de--aspect-ratio: 20 / 12;
+  --flag--es--aspect-ratio: 750 / 500;
+  --flag--fa--aspect-ratio: 630 / 360;
+  --flag--fr--aspect-ratio: 24 / 15;
+  --flag--gb--aspect-ratio: 60 / 30;
+  --flag--pl--aspect-ratio: 16 / 10;
+  --flag--us--aspect-ratio: 7410 / 3900;
+
   --button--icon--size: 24px;
   --dictionary--height: 260px;
   --modal--width: 370px;

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

@@ -2,6 +2,16 @@ export type Comparator<T> = (a: T, B: T) => number;
 
 export type Direction = 'horizontal' | 'vertical';
 
+export interface Point {
+  x: number;
+  y: number;
+}
+
+export interface Sort {
+  column: ResultColumn;
+  direction: SortDirection;
+}
+
 export enum SortDirection {
   Ascending = 'ascending',
   Descending = 'descending',
@@ -30,7 +40,6 @@ export enum ResultColumn {
   Word = 'word',
   WordsCount = 'words-count',
 }
-
 export type TranslationKey =
   | 'cell.filter-cell'
   | 'cell.set-blank'
@@ -78,12 +87,12 @@ export type TranslationKey =
   | 'rack.tile.location'
   | 'remaining-tiles'
   | 'results'
-  | 'results.empty-state.no-filtered-results'
   | 'results.empty-state.no-results'
   | 'results.empty-state.outdated'
   | 'results.empty-state.uninitialized'
   | 'results.input.placeholder'
   | 'results.insert'
+  | 'results.preview'
   | 'results.solve'
   | 'settings'
   | 'settings.autoGroupTiles'

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.11.1",
+      "version": "2.11.3",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^2.0.1"

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^2.0.1",
-    "@scrabble-solver/types": "^2.11.1"
+    "@scrabble-solver/types": "^2.11.3"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.11.1",
-    "@scrabble-solver/constants": "^2.11.1",
-    "@scrabble-solver/dictionaries": "^2.11.1"
+    "@scrabble-solver/configs": "^2.11.3",
+    "@scrabble-solver/constants": "^2.11.3",
+    "@scrabble-solver/dictionaries": "^2.11.3"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "description": "Scrabble Solver 2 - Types",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,7 +24,7 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.11.1"
+    "@scrabble-solver/constants": "^2.11.3"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/word-definitions/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.11.1",
+      "version": "2.11.3",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.15.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
-      "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
+      "version": "18.15.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
+      "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==",
       "dev": true
     },
     "node_modules/boolbase": {
@@ -249,9 +249,9 @@
       }
     },
     "@types/node": {
-      "version": "18.15.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
-      "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
+      "version": "18.15.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
+      "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==",
       "dev": true
     },
     "boolbase": {

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "description": "Scrabble Solver 2 - Word definitions",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/ node_modules/ package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.11.1",
+    "@scrabble-solver/types": "^2.11.3",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"

package/packages/word-lists/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-lists",
-      "version": "2.11.1",
+      "version": "2.11.3",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",

package/packages/word-lists/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "description": "Scrabble Solver 2 - Word lists",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,7 +24,7 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.11.1",
+    "@scrabble-solver/types": "^2.11.3",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "unzipper": "^0.10.11"

package/packages/scrabble-solver/.next/server/chunks/417.js

@@ -1,221 +0,0 @@
-"use strict";
-exports.id = 417;
-exports.ids = [417];
-exports.modules = {
-
-/***/ 38436:
-/***/ ((__unused_webpack_module, exports) => {
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.VOWELS = exports.CONSONANTS = exports.NO_BONUS = exports.EMPTY_CELL = exports.BONUS_WORD = exports.BONUS_CHARACTER = exports.BLANK = exports.COMMA_LATIN = exports.COMMA_ARABIC = void 0;
-exports.COMMA_ARABIC = '،';
-exports.COMMA_LATIN = ',';
-exports.BLANK = ' ';
-exports.BONUS_CHARACTER = 'BONUS_CHARACTER';
-exports.BONUS_WORD = 'BONUS_WORD';
-exports.EMPTY_CELL = ' ';
-exports.NO_BONUS = { characterMultiplier: 1, wordMultiplier: 1 };
-exports.CONSONANTS = [
-    'b',
-    'c',
-    'ć',
-    'd',
-    'f',
-    'g',
-    'h',
-    'j',
-    'k',
-    'l',
-    'ł',
-    'm',
-    'n',
-    'ń',
-    'ñ',
-    'p',
-    'q',
-    'r',
-    's',
-    'ś',
-    't',
-    'v',
-    'w',
-    'x',
-    'z',
-    'ź',
-    'ż',
-];
-exports.VOWELS = ['a', 'ą', 'ä', 'e', 'ę', 'i', 'o', 'ó', 'ö', 'u', 'ü', 'y'];
-
-
-/***/ }),
-
-/***/ 98793:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.OUTPUT_DIRECTORY = void 0;
-const os_1 = __importDefault(__webpack_require__(22037));
-const path_1 = __importDefault(__webpack_require__(71017));
-exports.OUTPUT_DIRECTORY = path_1.default.resolve(os_1.default.homedir(), '.scrabble-solver', 'logs');
-
-
-/***/ }),
-
-/***/ 52954:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports["default"] = void 0;
-var logger_1 = __webpack_require__(6730);
-Object.defineProperty(exports, "default", ({ enumerable: true, get: function () { return __importDefault(logger_1).default; } }));
-
-
-/***/ }),
-
-/***/ 6730:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-const path_1 = __importDefault(__webpack_require__(71017));
-const winston_1 = __webpack_require__(46050);
-const constants_1 = __webpack_require__(98793);
-const logger = (0, winston_1.createLogger)({
-    level: 'info',
-    format: winston_1.format.combine(winston_1.format.timestamp({
-        format: 'YYYY-MM-DD HH:mm:ss',
-    }), winston_1.format.errors({ stack: true }), winston_1.format.splat(), winston_1.format.json(), winston_1.format.prettyPrint()),
-    transports: [
-        new winston_1.transports.File({
-            filename: path_1.default.resolve(constants_1.OUTPUT_DIRECTORY, 'error.log'),
-            level: 'error',
-        }),
-        new winston_1.transports.File({
-            filename: path_1.default.resolve(constants_1.OUTPUT_DIRECTORY, 'all.log'),
-        }),
-        new winston_1.transports.Console({
-            format: winston_1.format.combine(winston_1.format.colorize(), winston_1.format.simple()),
-            level: 'error',
-        }),
-    ],
-});
-exports["default"] = logger;
-
-
-/***/ }),
-
-/***/ 78570:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-
-// EXPORTS
-__webpack_require__.d(__webpack_exports__, {
-  "X8": () => (/* reexport */ api_getServerLoggingData),
-  "p2": () => (/* reexport */ api_isBoardValid)
-});
-
-// UNUSED EXPORTS: isCellValid, isRowValid
-
-;// CONCATENATED MODULE: ./src/api/getServerLoggingData.ts
-const getServerLoggingData = (request)=>({
-        origin: request.headers.origin,
-        referer: request.headers.referer,
-        userAgent: request.headers["user-agent"],
-        xForwardedFor: request.headers["x-forwarded-for"],
-        xRealIp: request.headers["x-real-ip"]
-    });
-/* harmony default export */ const api_getServerLoggingData = (getServerLoggingData);
-
-// EXTERNAL MODULE: ../constants/build/index.js
-var build = __webpack_require__(38436);
-;// CONCATENATED MODULE: ./src/api/isCellValid.ts
-
-const isCellValid = (cell, config)=>{
-    const { isEmpty , tile , x , y  } = cell;
-    if (x < 0 || x >= config.boardWidth) {
-        return false;
-    }
-    if (y < 0 || y >= config.boardHeight) {
-        return false;
-    }
-    if (isEmpty && tile !== null) {
-        return false;
-    }
-    if (tile !== null && !config.hasCharacter(tile.character) && tile.character !== build.BLANK) {
-        return false;
-    }
-    return true;
-};
-/* harmony default export */ const api_isCellValid = (isCellValid);
-
-;// CONCATENATED MODULE: ./src/api/isRowValid.ts
-
-const isRowValid = (row, config)=>{
-    if (row.length !== config.boardWidth) {
-        return false;
-    }
-    for (const cell of row){
-        if (!api_isCellValid(cell, config)) {
-            return false;
-        }
-    }
-    return true;
-};
-/* harmony default export */ const api_isRowValid = (isRowValid);
-
-;// CONCATENATED MODULE: ./src/api/isBoardValid.ts
-
-const isBoardValid = (board, config)=>{
-    if (board.length !== config.boardHeight) {
-        return false;
-    }
-    for (const row of board){
-        if (!api_isRowValid(row, config)) {
-            return false;
-        }
-    }
-    return areTwoCharacterTilesValid(board, config);
-};
-const areTwoCharacterTilesValid = (board, config)=>{
-    const cells = board.flat().filter((cell)=>cell && cell.tile && config.isTwoCharacterTilePrefix(cell.tile.character));
-    for (const cell of cells){
-        for (const characters of config.twoCharacterTiles){
-            const canCheckDown = cell.y + 1 < board.length;
-            const canCheckRight = cell.x + 1 < board[0].length;
-            const cellDown = board[cell.y + 1][cell.x];
-            const cellRight = board[cell.y][cell.x + 1];
-            const collidesDown = canCheckDown && cellDown.tile && cellDown.tile.character === characters[1];
-            const collidesRight = canCheckRight && cellRight.tile && cellRight.tile.character === characters[1];
-            const collides = collidesDown || collidesRight;
-            if (cell.tile && characters.startsWith(cell.tile.character) && collides) {
-                return false;
-            }
-        }
-    }
-    return true;
-};
-/* harmony default export */ const api_isBoardValid = (isBoardValid);
-
-;// CONCATENATED MODULE: ./src/api/index.ts
-
-
-
-
-
-
-/***/ })
-
-};
-;