scrabble-solver 2.13.8 → 2.13.10

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

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

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

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { Point } from 'types';
+import { CellFilterType, Point } from 'types';
 
 import cellFilterInitialState from './cellFilterInitialState';
 
@@ -10,17 +10,42 @@ const cellFilterSlice = createSlice({
   reducers: {
     toggle: (state, action: PayloadAction<Point>) => {
       const { x, y } = action.payload;
-      const has = state.some((point) => point.x === x && point.y === y);
+      const currentEntry = state.find((point) => point.x === x && point.y === y);
+      const has = Boolean(currentEntry);
+      const nextType = currentEntry ? toggleCellFilterState(currentEntry.type) : 'include';
 
-      if (has) {
+      if (nextType === null) {
         return state.filter((point) => point.x !== x || point.y !== y);
       }
 
-      return [...state, action.payload];
+      if (!has) {
+        return [...state, { ...action.payload, type: nextType }];
+      }
+
+      return state.map((entry) => {
+        if (entry.x === x && entry.y === y) {
+          return { ...entry, type: nextType };
+        }
+
+        return entry;
+      });
+    },
+
+    cancel: (state, action: PayloadAction<Point>) => {
+      const { x, y } = action.payload;
+
+      return state.filter((point) => point.x !== x || point.y !== y);
     },
 
     reset: () => cellFilterInitialState,
   },
 });
 
+const toggleCellFilterState = (type: CellFilterType): CellFilterType | null => {
+  const chain: (CellFilterType | null)[] = ['include', 'exclude', null];
+  const index = chain.indexOf(type);
+  const nextIndex = (index + 1) % chain.length;
+  return chain[nextIndex];
+};
+
 export default cellFilterSlice;

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

@@ -1,7 +1,17 @@
+import { Result } from '@scrabble-solver/types';
+
 export type Comparator<T> = (a: T, B: T) => number;
 
 export type AutoGroupTiles = 'left' | 'right' | null;
 
+export type CellFilterType = 'include' | 'exclude';
+
+export type CellFilterEntry = {
+  x: Point['x'];
+  y: Point['y'];
+  type: CellFilterType;
+};
+
 export type Direction = 'horizontal' | 'vertical';
 
 export type InputMode = 'keyboard' | 'touchscreen';
@@ -47,9 +57,16 @@ export enum ResultColumn {
   Word = 'word',
   WordsCount = 'words-count',
 }
+
+export interface GroupedResults {
+  matching: Result[];
+  other: Result[];
+}
+
 export type TranslationKey =
   | 'cell.enter-word'
-  | 'cell.filter-cell'
+  | 'cell.filter-cell.exclude'
+  | 'cell.filter-cell.include'
   | 'cell.set-blank'
   | 'cell.set-not-blank'
   | 'cell.toggle-direction'

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.13.8",
+  "version": "2.13.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.13.8",
+      "version": "2.13.10",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^3.0.0"

package/packages/solver/package.json

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

package/packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.13.8",
+  "version": "2.13.10",
   "description": "Scrabble Solver 2 - Types",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.13.8"
+    "@scrabble-solver/constants": "^2.13.10"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.13.8",
+  "version": "2.13.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.13.8",
+      "version": "2.13.10",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",

package/packages/word-definitions/package.json

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

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.13.8",
+  "version": "2.13.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-lists",
-      "version": "2.13.8",
+      "version": "2.13.10",
       "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.13.8",
+  "version": "2.13.10",
   "description": "Scrabble Solver 2 - Word lists",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.13.8",
+    "@scrabble-solver/types": "^2.13.10",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.6",
     "latinize": "^1.0.0",

package/.eslintrc.prettier-only.js

@@ -1,9 +0,0 @@
-const fs = require('fs');
-
-const eslintConfigPath = './.eslintrc.js';
-const baseConfig = require(eslintConfigPath);
-
-module.exports = Object.assign({}, baseConfig, {
-  extends: baseConfig.extends.filter((config) => config.includes('prettier')),
-  rules: {},
-});