scrabble-solver 2.10.10 → 2.11.0

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

@@ -38,10 +38,6 @@ export const BOARD_TILE_SIZE_MIN = 20;
 
 export const BORDER_WIDTH = 1;
 
-export const COLUMN_MIN_HEIGHT = 588.5;
-
-export const DICTIONARY_HEIGHT = 260;
-
 export const TILE_SIZE = 80;
 
 export const PLAIN_TILES_COLOR_DEFAULT = COLOR_GREEN;
@@ -73,9 +69,7 @@ export const RACK_TILE_SIZE_MAX = 80;
 
 export const REMAINING_TILES_TILE_SIZE = 50;
 
-export const RESULTS_HEADER_HEIGHT = 34;
 export const RESULTS_ITEM_HEIGHT = 40;
-export const RESULTS_INPUT_HEIGHT = 40;
 
 export const TILE_APPEAR_DURATION = 200;
 

package/packages/scrabble-solver/src/service-worker/routeSolveRequests.ts

@@ -23,7 +23,10 @@ const isSlowDevice = (): boolean | undefined => {
   }
 
   const count = Math.min(localDurations.length, serverDurations.length);
-  return average(localDurations.slice(0, count)) > average(serverDurations.slice(0, count));
+  const local = localDurations.slice(0, count).sort().slice(1, -1);
+  const server = serverDurations.slice(0, count).sort().slice(1, -1);
+
+  return average(local) > average(server);
 };
 
 const routeSolveRequests = () => {

package/packages/scrabble-solver/src/state/localStorage.ts

@@ -3,7 +3,6 @@ import store2 from 'store2';
 
 const BOARD = 'board';
 const CONFIG_ID = 'config-id';
-const HAS_VISITED = 'has-visited';
 const LOCALE = 'locale';
 const RACK = 'rack';
 
@@ -28,14 +27,6 @@ const localStorage = {
     store.set(CONFIG_ID, configId, true);
   },
 
-  getHasVisited(): boolean {
-    return Boolean(store.get(HAS_VISITED));
-  },
-
-  setHasVisited(hasVisited: boolean): void {
-    store.set(HAS_VISITED, hasVisited, true);
-  },
-
   getLocale(): Locale | undefined {
     return store.get(LOCALE);
   },

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

@@ -28,6 +28,16 @@
   }
 }
 
+@keyframes rotate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
 @keyframes pulse {
   0% {
     transform: scale(1);

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

@@ -54,5 +54,5 @@ h4 {
 
 [lang='fa-IR'] {
   --font--family: 'Vazirmatn', sans-serif;
-  --font--family--title: 'Vazirmatn', sans-serif;
+  --font--family--title: var(--font--family);
 }

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

@@ -86,10 +86,10 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --z-index--close-button: 101;
   --z-index--tooltip: 102;
 
+  --button--icon--size: 24px;
   --dictionary--height: 260px;
   --modal--width: 370px;
   --solver-column--width: 580px;
   --square-button--size: 32px;
-  --button--icon--size: 24px;
   --text-input--height: 40px;
 }

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

@@ -50,6 +50,7 @@ export type TranslationKey =
   | 'common.vowels'
   | 'common.word'
   | 'common.words'
+  | 'dictionary'
   | 'dictionary.empty-state.no-definitions'
   | 'dictionary.empty-state.no-results'
   | 'dictionary.empty-state.not-allowed'

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.10.10",
+  "version": "2.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.10.10",
+      "version": "2.11.0",
       "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.10.10",
+  "version": "2.11.0",
   "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.10.10"
+    "@scrabble-solver/types": "^2.11.0"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.10.10",
-    "@scrabble-solver/constants": "^2.10.10",
-    "@scrabble-solver/dictionaries": "^2.10.10"
+    "@scrabble-solver/configs": "^2.11.0",
+    "@scrabble-solver/constants": "^2.11.0",
+    "@scrabble-solver/dictionaries": "^2.11.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.10.10",
+  "version": "2.11.0",
   "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.10.10"
+    "@scrabble-solver/constants": "^2.11.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/word-definitions/build/lib/normalizeDefinition.js

@@ -7,7 +7,7 @@ const striptags_1 = __importDefault(require("striptags"));
 const EMPHASIS_TAGS = ['a', 'b', 'em', 'internalXref'];
 const normalizeHtmlTags = (definition) => (0, striptags_1.default)((0, striptags_1.default)(definition, EMPHASIS_TAGS), undefined, '"');
 const normalizeLineBreaks = (definition) => definition.replace(/\r\n/g, '\n');
-const normalizeWhitespace = (definition) => definition.replace(/[ ]+/g, ' ');
+const normalizeWhitespace = (definition) => definition.replace(/[^\S\n ]+/g, ' ').replace(/[ ]+/g, ' ');
 const normalizeQuotes = (definition) => definition.replace(/\."/g, '".');
 /**
  * `(1.2) definition` -> `definition`

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.10.10",
+  "version": "2.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.10.10",
+      "version": "2.11.0",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.14.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.1.tgz",
-      "integrity": "sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ==",
+      "version": "18.15.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
+      "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
       "dev": true
     },
     "node_modules/boolbase": {
@@ -249,9 +249,9 @@
       }
     },
     "@types/node": {
-      "version": "18.14.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.1.tgz",
-      "integrity": "sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ==",
+      "version": "18.15.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
+      "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
       "dev": true
     },
     "boolbase": {

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.10.10",
+  "version": "2.11.0",
   "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.10.10",
+    "@scrabble-solver/types": "^2.11.0",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"

package/packages/word-definitions/src/lib/normalizeDefinition.ts

@@ -8,7 +8,7 @@ const normalizeHtmlTags: Normalize = (definition) => striptags(striptags(definit
 
 const normalizeLineBreaks: Normalize = (definition) => definition.replace(/\r\n/g, '\n');
 
-const normalizeWhitespace: Normalize = (definition) => definition.replace(/[ ]+/g, ' ');
+const normalizeWhitespace: Normalize = (definition) => definition.replace(/[^\S\n ]+/g, ' ').replace(/[ ]+/g, ' ');
 
 const normalizeQuotes: Normalize = (definition) => definition.replace(/\."/g, '".');
 

package/packages/word-definitions/src/parse/__tests__/expected/en-US.oe.json

@@ -0,0 +1,7 @@
+{
+  "definitions": [
+    "oersted",
+    "Kenzaburo 1935– Japanese writer"
+  ],
+  "exists": true
+}