scrabble-solver 2.8.2 → 2.8.4

package/.eslintrc.js

@@ -458,7 +458,7 @@ module.exports = {
     'react/prefer-es6-class': 'error',
     // 'react/prefer-stateless-function': 'error',
     'react/prop-types': 'error',
-    'react/react-in-jsx-scope': 'error',
+    'react/react-in-jsx-scope': 'off',
     // 'react/require-optimization': 'error',
     'react/require-render-return': 'error',
     'react/self-closing-comp': 'error',

package/.gitattributes

@@ -0,0 +1,2 @@
+packages/word-definitions/src/parse/__tests__/expected/** linguist-vendored
+packages/word-definitions/src/parse/__tests__/input/** linguist-vendored

package/HISTORY.md

@@ -0,0 +1,17 @@
+# History
+
+Back in January 2012 I wrote 200 lines of C++ code to load up a dictionary, store it in a Trie structure, read up to 7 letters from console input and traverse the Trie structure to find all the words that could be created from provided letters. I did it for 200 PLN (about 60 USD back then) and it was my first money earned by programming (assuming that beer is not a currency).
+
+I enjoyed working on it and wanted to enhance that with some visuals to take it to the next level. So I created a simple Windows Forms project in C#, added support for "blank" characters & displayed the results grouped by word length. And I left it like that.
+
+Some time later I got familiar with WPF and somehow I got the idea it would be fun to enhance the C# solver with a visual board input. This would provide solver with information which would allow to find a move that will give you the most points. So in September 2014 I started working on a new C# WPF project, but I haven't got far with it.
+
+After getting experienced with JavaScript, I decided to tackle the challenge once again. I started a new project in February 2017. React on the front, node.js in the back. On September 13th 2017, five and a half years since the beginning, `scrabble-solver@1.0.0` was released. And I saw it was good.
+
+It got to `1.4.0` - I have added en-US & en-GB locales support, a mini tutorial and kept the dependencies up to date (e.g. upgraded React from 15 to 16).
+
+Frontend development has changed, I've learned a few things - it was time for `scrabble-solver@2.0.0`. In 2019 I started to work on a new version. But due to many distractions the work took around 2 years to complete. Nevertheless, here it is, a shiny, state-of-the-art frontend app, January 2021 - 9 years after the first project.
+
+## Scrabble Solver 1
+
+A piece of history, available at http://scrabble-solver-v1.kamilmielnik.com/.

package/README.md

@@ -56,14 +56,14 @@ rm -rf $HOME/.scrabble-solver
 
 ## Dictionaries
 
-| Language     | Locale | Word list                                                                     | Word list (source)                                                                                       | Word definitions                                                               |
-|--------------|--------|-------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------|
-| 🇬🇧 English | en-GB  | [SOWPODS](https://en.wikipedia.org/wiki/Collins_Scrabble_Words)               | [download](https://www.wordgamedictionary.com/sowpods/download/sowpods.txt)                              | [Merriam-Webster](https://www.merriam-webster.com/)                            |
-| 🇺🇸 English | en-US  | [TWL06](https://en.wikipedia.org/wiki/NASPA_Word_List)                        | [download](https://www.wordgamedictionary.com/twl06/download/twl06.txt)                                  | [Merriam-Webster](https://www.merriam-webster.com/)                            |
-| 🇫🇷 French  | fr-FR  | [hbenbel/French-Dictionary](https://github.com/hbenbel/French-Dictionary/)    | [download](https://raw.githubusercontent.com/hbenbel/French-Dictionary/master/dictionary/dictionary.txt) | [Centre National de Ressources Textuelles et Lexicales](https://www.cnrtl.fr/) |
-| 🇩🇪 German  | de-DE  | [HanSolo80/German-Dictionary](https://github.com/HanSolo80/German-Dictionary) | [download](https://raw.githubusercontent.com/HanSolo80/German-Dictionary/master/dictionary.txt)          | [DWDS](https://www.dwds.de)                                                    |
-| 🇵🇱 Polish  | pl-PL  | [SJP.PL](https://sjp.pl/slownik/dp.phtml)                                     | [download](https://sjp.pl/slownik/growy/)                                                                | [SJP.PL](https://sjp.pl)                                                       |
-| 🇪🇸 Spanish | es-ES  | [FISE-2](https://fisescrabble.org/)                                           | [download](https://github.com/kamilmielnik/fise-2/blob/master/fise-2.txt)                                | [Diccionarios.com](www.diccionarios.com)                                       |
+| Language   | Word list                                                                     | Word list                                                                                                                                | Word definitions                                    |
+|------------|-------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------|
+| 🇬🇧 English | [SOWPODS](https://en.wikipedia.org/wiki/Collins_Scrabble_Words)               | [Source](https://www.wordgamedictionary.com/sowpods/download/sowpods.txt)                                                                | [Merriam-Webster](https://www.merriam-webster.com/) |
+| 🇺🇸 English | [TWL06](https://en.wikipedia.org/wiki/NASPA_Word_List)                        | [Source](https://www.wordgamedictionary.com/twl06/download/twl06.txt)                                                                    | [Merriam-Webster](https://www.merriam-webster.com/) |
+| 🇫🇷 French  | [hbenbel/French-Dictionary](https://github.com/hbenbel/French-Dictionary/)    | [Source](https://raw.githubusercontent.com/hbenbel/French-Dictionary/a573eab10cc798d7d5da7daab4d2ac0259bb46a3/dictionary/dictionary.txt) | [CNRTL](https://www.cnrtl.fr/)                      |
+| 🇩🇪 German  | [HanSolo80/German-Dictionary](https://github.com/HanSolo80/German-Dictionary) | [Source](https://raw.githubusercontent.com/HanSolo80/German-Dictionary/master/dictionary.txt)                                            | [DWDS](https://www.dwds.de)                         |
+| 🇵🇱 Polish  | [SJP.PL](https://sjp.pl/slownik/dp.phtml)                                     | [Source](https://sjp.pl/slownik/growy/)                                                                                                  | [SJP.PL](https://sjp.pl)                            |
+| 🇪🇸 Spanish | [FISE-2](https://fisescrabble.org/)                                           | [Source](https://github.com/kamilmielnik/fise-2/blob/master/fise-2.txt)                                                                  | [Diccionarios.com](https://www.diccionarios.com/)   |
 
 ## Tech stack
 
@@ -77,21 +77,3 @@ rm -rf $HOME/.scrabble-solver
 - [Jest](https://jestjs.io/)
 - [ESLint](https://eslint.org/)
 - [Prettier](https://prettier.io/)
-
-## History
-
-Back in January 2012 I wrote 200 lines of C++ code to load up a dictionary, store it in a Trie structure, read up to 7 letters from console input and traverse the Trie structure to find all the words that could be created from provided letters. I did it for 200 PLN (about 60 USD back then) and it was my first money earned by programming (assuming that beer is not a currency).
-
-I enjoyed working on it and wanted to enhance that with some visuals to take it to the next level. So I created a simple Windows Forms project in C#, added support for "blank" characters & displayed the results grouped by word length. And I left it like that.
-
-Some time later I got familiar with WPF and somehow I got the idea it would be fun to enhance the C# solver with a visual board input. This would provide solver with information which would allow to find a move that will give you the most points. So in September 2014 I started working on a new C# WPF project, but I haven't got far with it.
-
-After getting experienced with JavaScript, I decided to tackle the challenge once again. I started a new project in February 2017. React on the front, node.js in the back. On September 13th 2017, five and a half years since the beginning, `scrabble-solver@1.0.0` was released. And I saw it was good.
-
-It got to `1.4.0` - I have added en-US & en-GB locales support, a mini tutorial and kept the dependencies up to date (e.g. upgraded React from 15 to 16).
-
-Frontend development has changed, I've learned a few things - it was time for `scrabble-solver@2.0.0`. In 2019 I started to work on a new version. But due to many distractions the work took around 2 years to complete. Nevertheless, here it is, a shiny, state-of-the-art frontend app, January 2021 - 9 years after the first project.
-
-### Scrabble Solver 1
-
-A piece of history, available at http://scrabble-solver-v1.kamilmielnik.com/.

package/lerna.json

@@ -6,5 +6,5 @@
     "access": "public"
   },
   "tagVersionPrefix": "",
-  "version": "2.8.2"
+  "version": "2.8.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrabble-solver",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "Scrabble Solver 2 - The ultimate, open-source cheating app for Scrabble and Literaki",
   "keywords": [
     "Scrabble",
@@ -25,7 +25,7 @@
     "App"
   ],
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=16"
   },
   "bin": {
     "scrabble-solver": "./bin/scrabble-solver.js"
@@ -74,31 +74,31 @@
   },
   "homepage": "https://github.com/kamilmielnik/scrabble-solver#readme",
   "dependencies": {
-    "lerna": "^5.5.2",
+    "lerna": "^5.5.4",
     "npm-run-all": "^4.1.5",
     "open-cli": "^7.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.19.1",
+    "@babel/core": "^7.19.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.19.1",
-    "@types/jest": "^29.0.3",
-    "@types/node": "^18.7.18",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@babel/preset-env": "^7.19.3",
+    "@types/jest": "^29.1.1",
+    "@types/node": "^18.7.23",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
     "babel-eslint": "10.1.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.31.8",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "29.0.3",
+    "jest": "29.1.2",
     "np": "^7.6.2",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.1",
-    "typescript": "^4.8.3"
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.8.4"
   }
 }

package/packages/configs/build/getConfig.js

@@ -3,19 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var literaki_1 = __importDefault(require("./literaki"));
-var scrabble_1 = __importDefault(require("./scrabble"));
-var configs = [literaki_1.default, scrabble_1.default];
-var getConfig = function (configId) {
-    var config = configs.find(function (_a) {
-        var id = _a.id;
-        return id === configId;
-    });
+const literaki_1 = __importDefault(require("./literaki"));
+const scrabble_1 = __importDefault(require("./scrabble"));
+const configs = [literaki_1.default, scrabble_1.default];
+const getConfig = (configId) => {
+    const config = configs.find(({ id }) => id === configId);
     if (!config) {
-        throw new Error("Invalid \"configId\" parameter: not one of ".concat(configs.map(function (_a) {
-            var id = _a.id;
-            return id;
-        }).join('/')));
+        throw new Error(`Invalid "configId" parameter: not one of ${configs.map(({ id }) => id).join('/')}`);
     }
     return config;
 };

package/packages/configs/build/getLocaleConfig.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var getConfig_1 = __importDefault(require("./getConfig"));
-var getLocaleConfig = function (configId, locale) {
+const getConfig_1 = __importDefault(require("./getConfig"));
+const getLocaleConfig = (configId, locale) => {
     return (0, getConfig_1.default)(configId)[locale];
 };
 exports.default = getLocaleConfig;

package/packages/configs/build/isConfigId.js

@@ -3,13 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var literaki_1 = __importDefault(require("./literaki"));
-var scrabble_1 = __importDefault(require("./scrabble"));
-var configs = [literaki_1.default, scrabble_1.default];
-var isConfigId = function (configId) {
-    return configs.some(function (_a) {
-        var id = _a.id;
-        return id === configId;
-    });
+const literaki_1 = __importDefault(require("./literaki"));
+const scrabble_1 = __importDefault(require("./scrabble"));
+const configs = [literaki_1.default, scrabble_1.default];
+const isConfigId = (configId) => {
+    return configs.some(({ id }) => id === configId);
 };
 exports.default = isConfigId;

package/packages/configs/build/literaki/bonuses.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var constants_1 = require("@scrabble-solver/constants");
-var bonuses = [
+const constants_1 = require("@scrabble-solver/constants");
+const bonuses = [
     { multiplier: 3, score: 5, type: constants_1.BONUS_CHARACTER, x: 0, y: 0 },
     { multiplier: 3, type: constants_1.BONUS_WORD, x: 2, y: 0 },
     { multiplier: 3, score: 2, type: constants_1.BONUS_CHARACTER, x: 5, y: 0 },

package/packages/configs/build/literaki/literaki.js

@@ -1,24 +1,12 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("@scrabble-solver/types");
-var bonuses_1 = __importDefault(require("./bonuses"));
-var tiles_1 = require("./tiles");
-var base = {
+const types_1 = require("@scrabble-solver/types");
+const bonuses_1 = __importDefault(require("./bonuses"));
+const tiles_1 = require("./tiles");
+const base = {
     allTilesBonusScore: 50,
     blankScore: 0,
     boardHeight: 15,
@@ -29,15 +17,14 @@ var base = {
     name: 'Literaki',
     numberOfBlanks: 2,
 };
-var literaki = (_a = {
-        id: base.id,
-        name: base.name
-    },
-    _a[types_1.Locale.DE_DE] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesDe })),
-    _a[types_1.Locale.EN_GB] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesEn })),
-    _a[types_1.Locale.EN_US] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesEn })),
-    _a[types_1.Locale.ES_ES] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesEs })),
-    _a[types_1.Locale.FR_FR] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesFr })),
-    _a[types_1.Locale.PL_PL] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesPl })),
-    _a);
+const literaki = {
+    id: base.id,
+    name: base.name,
+    [types_1.Locale.DE_DE]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesDe }),
+    [types_1.Locale.EN_GB]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesEn }),
+    [types_1.Locale.EN_US]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesEn }),
+    [types_1.Locale.ES_ES]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesEs }),
+    [types_1.Locale.FR_FR]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesFr }),
+    [types_1.Locale.PL_PL]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesPl }),
+};
 exports.default = literaki;

package/packages/configs/build/literaki/tiles/tilesDe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesDe = [
+const tilesDe = [
     { character: 'a', count: 5, score: 1 },
     { character: 'ä', count: 1, score: 6 },
     { character: 'b', count: 2, score: 3 },

package/packages/configs/build/literaki/tiles/tilesEn.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesEn = [
+const tilesEn = [
     { character: 'a', count: 9, score: 1 },
     { character: 'b', count: 2, score: 3 },
     { character: 'c', count: 2, score: 3 },

package/packages/configs/build/literaki/tiles/tilesEs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesEs = [
+const tilesEs = [
     { character: 'a', count: 12, score: 1 },
     { character: 'b', count: 2, score: 3 },
     { character: 'c', count: 4, score: 3 },

package/packages/configs/build/literaki/tiles/tilesFr.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesFr = [
+const tilesFr = [
     { character: 'a', count: 9, score: 1 },
     { character: 'b', count: 2, score: 3 },
     { character: 'c', count: 2, score: 3 },

package/packages/configs/build/literaki/tiles/tilesPl.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesPl = [
+const tilesPl = [
     { character: 'a', count: 9, score: 1 },
     { character: 'ą', count: 1, score: 5 },
     { character: 'b', count: 2, score: 3 },

package/packages/configs/build/scrabble/bonuses.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var constants_1 = require("@scrabble-solver/constants");
-var bonuses = [
+const constants_1 = require("@scrabble-solver/constants");
+const bonuses = [
     { multiplier: 3, type: constants_1.BONUS_WORD, x: 0, y: 0 },
     { multiplier: 2, type: constants_1.BONUS_CHARACTER, x: 3, y: 0 },
     { multiplier: 3, type: constants_1.BONUS_WORD, x: 7, y: 0 },

package/packages/configs/build/scrabble/scrabble.js

@@ -1,24 +1,12 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("@scrabble-solver/types");
-var bonuses_1 = __importDefault(require("./bonuses"));
-var tiles_1 = require("./tiles");
-var base = {
+const types_1 = require("@scrabble-solver/types");
+const bonuses_1 = __importDefault(require("./bonuses"));
+const tiles_1 = require("./tiles");
+const base = {
     allTilesBonusScore: 50,
     blankScore: 0,
     boardHeight: 15,
@@ -29,15 +17,14 @@ var base = {
     name: 'Scrabble',
     numberOfBlanks: 2,
 };
-var scrabble = (_a = {
-        id: base.id,
-        name: base.name
-    },
-    _a[types_1.Locale.EN_GB] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesEn })),
-    _a[types_1.Locale.DE_DE] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesDe })),
-    _a[types_1.Locale.EN_US] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesEn })),
-    _a[types_1.Locale.ES_ES] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesEs })),
-    _a[types_1.Locale.FR_FR] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesFr })),
-    _a[types_1.Locale.PL_PL] = types_1.Config.fromJson(__assign(__assign({}, base), { tiles: tiles_1.tilesPl })),
-    _a);
+const scrabble = {
+    id: base.id,
+    name: base.name,
+    [types_1.Locale.EN_GB]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesEn }),
+    [types_1.Locale.DE_DE]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesDe }),
+    [types_1.Locale.EN_US]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesEn }),
+    [types_1.Locale.ES_ES]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesEs }),
+    [types_1.Locale.FR_FR]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesFr }),
+    [types_1.Locale.PL_PL]: types_1.Config.fromJson({ ...base, tiles: tiles_1.tilesPl }),
+};
 exports.default = scrabble;

package/packages/configs/build/scrabble/tiles/tilesDe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesDe = [
+const tilesDe = [
     { character: 'a', count: 5, score: 1 },
     { character: 'ä', count: 1, score: 6 },
     { character: 'b', count: 2, score: 3 },

package/packages/configs/build/scrabble/tiles/tilesEn.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesEn = [
+const tilesEn = [
     { character: 'a', count: 9, score: 1 },
     { character: 'b', count: 2, score: 3 },
     { character: 'c', count: 2, score: 3 },

package/packages/configs/build/scrabble/tiles/tilesEs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesEs = [
+const tilesEs = [
     { character: 'a', count: 12, score: 1 },
     { character: 'b', count: 2, score: 3 },
     { character: 'c', count: 4, score: 3 },

package/packages/configs/build/scrabble/tiles/tilesFr.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesFr = [
+const tilesFr = [
     { character: 'a', count: 9, score: 1 },
     { character: 'b', count: 2, score: 3 },
     { character: 'c', count: 2, score: 3 },

package/packages/configs/build/scrabble/tiles/tilesPl.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tilesPl = [
+const tilesPl = [
     { character: 'a', count: 9, score: 1 },
     { character: 'ą', count: 1, score: 5 },
     { character: 'b', count: 2, score: 3 },

package/packages/configs/package.json

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

package/packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/constants",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "Scrabble Solver 2 - Constants",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/packages/dictionaries/build/Dictionaries.js

@@ -1,119 +1,46 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = __importDefault(require("@scrabble-solver/logger"));
-var types_1 = require("@scrabble-solver/types");
-var fs_1 = __importDefault(require("fs"));
-var constants_1 = require("./constants");
-var lib_1 = require("./lib");
-var Dictionaries = /** @class */ (function () {
-    function Dictionaries() {
+const logger_1 = __importDefault(require("@scrabble-solver/logger"));
+const types_1 = require("@scrabble-solver/types");
+const fs_1 = __importDefault(require("fs"));
+const constants_1 = require("./constants");
+const lib_1 = require("./lib");
+class Dictionaries {
+    constructor() {
         this.cache = new lib_1.LayeredCache();
-        this.downloadDictionaryProxies = Object.fromEntries(Object.values(types_1.Locale).map(function (locale) { return [locale, (0, lib_1.createAsyncProxy)(function () { return (0, lib_1.downloadDictionary)(locale); })]; }));
+        this.downloadDictionaryProxies = Object.fromEntries(Object.values(types_1.Locale).map((locale) => [locale, (0, lib_1.createAsyncProxy)(() => (0, lib_1.downloadDictionary)(locale))]));
+    }
+    async get(locale) {
+        if (this.cache.has(locale)) {
+            const trie = await this.cache.get(locale);
+            if (trie) {
+                return trie;
+            }
+        }
+        logger_1.default.info('Dictionaries - cache miss', { locale });
+        return this.updateDictionary(locale);
     }
-    Dictionaries.prototype.get = function (locale) {
-        return __awaiter(this, void 0, void 0, function () {
-            var trie;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.cache.has(locale)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.cache.get(locale)];
-                    case 1:
-                        trie = _a.sent();
-                        if (trie) {
-                            return [2 /*return*/, trie];
-                        }
-                        _a.label = 2;
-                    case 2:
-                        logger_1.default.info('Dictionaries - cache miss', { locale: locale });
-                        return [2 /*return*/, this.updateDictionary(locale)];
-                }
-            });
-        });
-    };
-    Dictionaries.prototype.remove = function () {
+    remove() {
         fs_1.default.rmdirSync(constants_1.OUTPUT_DIRECTORY, { recursive: true });
-    };
-    Dictionaries.prototype.update = function (force) {
-        return __awaiter(this, void 0, void 0, function () {
-            var locales;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        locales = force ? Object.values(types_1.Locale) : this.getLocalesToUpdate();
-                        logger_1.default.info('Dictionaries - update', { force: force, locales: locales });
-                        return [4 /*yield*/, Promise.all(locales.map(function (locale) { return _this.updateDictionary(locale); }))];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Dictionaries.prototype.getLocalesToUpdate = function () {
-        var _this = this;
-        return Object.values(types_1.Locale).filter(function (locale) { return _this.cache.isStale(locale) !== false; });
-    };
-    Dictionaries.prototype.updateDictionary = function (locale) {
-        return __awaiter(this, void 0, void 0, function () {
-            var downloadDictionaryProxy, trie;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logger_1.default.info('Dictionaries - updateDictionary', { locale: locale });
-                        fs_1.default.mkdirSync(constants_1.OUTPUT_DIRECTORY, { recursive: true });
-                        downloadDictionaryProxy = this.downloadDictionaryProxies[locale];
-                        return [4 /*yield*/, downloadDictionaryProxy()];
-                    case 1:
-                        trie = _a.sent();
-                        return [4 /*yield*/, this.cache.set(locale, trie)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/, trie];
-                }
-            });
-        });
-    };
-    return Dictionaries;
-}());
+    }
+    async update(force) {
+        const locales = force ? Object.values(types_1.Locale) : this.getLocalesToUpdate();
+        logger_1.default.info('Dictionaries - update', { force, locales });
+        await Promise.all(locales.map((locale) => this.updateDictionary(locale)));
+    }
+    getLocalesToUpdate() {
+        return Object.values(types_1.Locale).filter((locale) => this.cache.isStale(locale) !== false);
+    }
+    async updateDictionary(locale) {
+        logger_1.default.info('Dictionaries - updateDictionary', { locale });
+        fs_1.default.mkdirSync(constants_1.OUTPUT_DIRECTORY, { recursive: true });
+        const downloadDictionaryProxy = this.downloadDictionaryProxies[locale];
+        const trie = await downloadDictionaryProxy();
+        await this.cache.set(locale, trie);
+        return trie;
+    }
+}
 exports.default = Dictionaries;