scrabble-solver 2.12.2 → 2.12.4

package/packages/solver/src/solve.test.ts

@@ -1,7 +1,9 @@
+/* eslint-disable max-lines */
+
 import { Trie } from '@kamilmielnik/trie';
-import { literaki, scrabble } from '@scrabble-solver/configs';
+import { getConfig } from '@scrabble-solver/configs';
 import { dictionaries } from '@scrabble-solver/dictionaries';
-import { Board, Locale, Result, Tile } from '@scrabble-solver/types';
+import { Board, Game, Locale, Result, Tile } from '@scrabble-solver/types';
 
 import solve from './solve';
 
@@ -16,9 +18,9 @@ const getBestResult = ([firstResult, ...results]: Result[]): Result => {
   );
 };
 
-describe('solve - PL', () => {
+describe('solve - pl-PL', () => {
   const locale = Locale.PL_PL;
-  const config = literaki[locale];
+  const config = getConfig(Game.Literaki, locale);
   let trie: Trie | undefined;
 
   beforeAll(() => {
@@ -99,11 +101,34 @@ describe('solve - PL', () => {
     expect(bestResult.word).toBe('zmartwychwstałą');
     expect(bestResult.points).toBe(1157);
   });
+
+  it('does not duplicate results', () => {
+    const board = Board.fromStringArray([
+      '             a ',
+      '              a',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+    ]);
+    const tiles = generateTiles(['d']);
+    const results = solve(trie!, config, board, tiles);
+    expect(results.length).toBe(4);
+  });
 });
 
-describe('solve - ES', () => {
+describe('solve - es-ES', () => {
   const locale = Locale.ES_ES;
-  const config = scrabble[locale];
+  const config = getConfig(Game.Scrabble, locale);
   let trie: Trie | undefined;
 
   beforeAll(() => {
@@ -161,3 +186,40 @@ describe('solve - ES', () => {
     expect(words).not.toContain('chocho');
   });
 });
+
+describe('solve - en-GB', () => {
+  const locale = Locale.EN_GB;
+  const config = getConfig(Game.Scrabble, locale);
+  let trie: Trie | undefined;
+
+  beforeAll(() => {
+    return dictionaries.get(locale).then((loadedTrie) => {
+      trie = loadedTrie;
+    });
+  });
+
+  it('no', () => {
+    const board = Board.fromStringArray([
+      '               ',
+      '             ko',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+      '               ',
+    ]);
+    const tiles = generateTiles(['n']);
+    const results = solve(trie!, config, board, tiles).map(Result.fromJson);
+    expect(results.some((result) => result.word === 'no')).toBe(true);
+    expect(results.some((result) => result.word === 'on')).toBe(true);
+    expect(results.length).toBe(2);
+  });
+});

package/packages/solver/src/solve.ts

@@ -10,7 +10,10 @@ import getUniquePatterns from './getUniquePatterns';
 const solve = (trie: Trie, config: Config, board: Board, tiles: Tile[]): ResultJson[] => {
   const patterns = generatePatterns(config, board);
   const filledPatterns = patterns.flatMap((pattern) => fillPattern(trie, config, pattern, tiles));
-  const validPatterns = filledPatterns.filter((pattern) => areDigraphsValid(config, pattern));
+  const validPatterns =
+    config.twoCharacterTiles.length > 0
+      ? filledPatterns.filter((pattern) => areDigraphsValid(config, pattern))
+      : filledPatterns;
   const uniquePatterns = getUniquePatterns(validPatterns);
   const results = uniquePatterns.map((pattern, index) => ({
     cells: pattern.cells.map((cell) => cell.toJson()),

package/packages/types/build/Config.d.ts

@@ -2,6 +2,7 @@ import Bonus from './Bonus';
 import BonusValue from './BonusValue';
 import Cell from './Cell';
 import ConfigJson from './ConfigJson';
+import Game from './Game';
 import Locale from './Locale';
 import Tile from './Tile';
 import TileConfig from './TileConfig';
@@ -17,6 +18,7 @@ declare class Config {
     get blanksCount(): number;
     get boardHeight(): number;
     get boardWidth(): number;
+    get game(): Game;
     get locale(): Locale;
     get twoCharacterTiles(): string[];
     getCellBonus(cell: Cell): Bonus | undefined;

package/packages/types/build/Config.js

@@ -33,6 +33,9 @@ class Config {
     get boardWidth() {
         return this.config.boardWidth;
     }
+    get game() {
+        return this.config.game;
+    }
     get locale() {
         return this.config.locale;
     }

package/packages/types/build/ConfigJson.d.ts

@@ -1,4 +1,5 @@
 import BonusJson from './BonusJson';
+import Game from './Game';
 import Locale from './Locale';
 import TileConfig from './TileConfig';
 interface ConfigJson {
@@ -8,7 +9,7 @@ interface ConfigJson {
     boardHeight: number;
     boardWidth: number;
     bonuses: BonusJson[];
-    id: string;
+    game: Game;
     locale: Locale;
     maximumCharactersCount: number;
     name: string;

package/packages/types/build/Dictionary.d.ts

@@ -0,0 +1,7 @@
+import Locale from './Locale';
+interface Dictionary {
+    description: string;
+    locale: Locale;
+    name: string;
+}
+export default Dictionary;

package/packages/types/build/Dictionary.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/packages/types/build/Game.d.ts

@@ -0,0 +1,7 @@
+declare enum Game {
+    Literaki = "literaki",
+    Scrabble = "scrabble",
+    SuperScrabble = "super-scrabble"
+}
+export declare const isGame: (locale: unknown) => locale is Game;
+export default Game;

package/packages/types/build/Game.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isGame = void 0;
+var Game;
+(function (Game) {
+    Game["Literaki"] = "literaki";
+    Game["Scrabble"] = "scrabble";
+    Game["SuperScrabble"] = "super-scrabble";
+})(Game || (Game = {}));
+const games = Object.values(Game);
+const isGame = (locale) => games.includes(locale);
+exports.isGame = isGame;
+exports.default = Game;

package/packages/types/build/Locale.d.ts

@@ -1,3 +1,8 @@
+/**
+ * Locales are defined using IETF language tags
+ * @see https://en.wikipedia.org/wiki/IETF_language_tag
+ * @see https://en.wikipedia.org/wiki/ISO_3166-1
+ */
 declare enum Locale {
     DE_DE = "de-DE",
     EN_GB = "en-GB",

package/packages/types/build/Locale.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isLocale = void 0;
-// eslint-disable-next-line no-shadow
+/**
+ * Locales are defined using IETF language tags
+ * @see https://en.wikipedia.org/wiki/IETF_language_tag
+ * @see https://en.wikipedia.org/wiki/ISO_3166-1
+ */
 var Locale;
 (function (Locale) {
     Locale["DE_DE"] = "de-DE";

package/packages/types/build/index.d.ts

@@ -10,10 +10,10 @@ export { default as Collision } from './Collision';
 export { default as CollisionJson } from './CollisionJson';
 export { default as Config } from './Config';
 export { default as ConfigJson } from './ConfigJson';
+export { default as Dictionary } from './Dictionary';
 export { default as FinalPattern } from './FinalPattern';
+export { default as Game, isGame } from './Game';
 export { default as HorizontalPattern } from './HorizontalPattern';
-export { default as isError } from './isError';
-export { default as isObject } from './isObject';
 export { default as Locale, isLocale } from './Locale';
 export { default as Pattern } from './Pattern';
 export { default as PatternJson } from './PatternJson';
@@ -26,3 +26,5 @@ export { default as VerticalPattern } from './VerticalPattern';
 export { default as WordBonus } from './WordBonus';
 export { default as WordDefinition } from './WordDefinition';
 export { default as WordDefinitionJson } from './WordDefinitionJson';
+export { default as isError } from './isError';
+export { default as isObject } from './isObject';

package/packages/types/build/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WordDefinition = exports.WordBonus = exports.VerticalPattern = exports.isTileJson = exports.Tile = exports.Result = exports.Pattern = exports.isLocale = exports.Locale = exports.isObject = exports.isError = exports.HorizontalPattern = exports.FinalPattern = exports.Config = exports.CharacterBonus = exports.isCellJson = exports.Cell = exports.Bonus = exports.isBoardJson = exports.Board = void 0;
+exports.isObject = exports.isError = exports.WordDefinition = exports.WordBonus = exports.VerticalPattern = exports.isTileJson = exports.Tile = exports.Result = exports.Pattern = exports.isLocale = exports.Locale = exports.HorizontalPattern = exports.isGame = exports.Game = exports.FinalPattern = exports.Config = exports.CharacterBonus = exports.isCellJson = exports.Cell = exports.Bonus = exports.isBoardJson = exports.Board = void 0;
 var Board_1 = require("./Board");
 Object.defineProperty(exports, "Board", { enumerable: true, get: function () { return __importDefault(Board_1).default; } });
 var BoardJson_1 = require("./BoardJson");
@@ -20,12 +20,11 @@ var Config_1 = require("./Config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return __importDefault(Config_1).default; } });
 var FinalPattern_1 = require("./FinalPattern");
 Object.defineProperty(exports, "FinalPattern", { enumerable: true, get: function () { return __importDefault(FinalPattern_1).default; } });
+var Game_1 = require("./Game");
+Object.defineProperty(exports, "Game", { enumerable: true, get: function () { return __importDefault(Game_1).default; } });
+Object.defineProperty(exports, "isGame", { enumerable: true, get: function () { return Game_1.isGame; } });
 var HorizontalPattern_1 = require("./HorizontalPattern");
 Object.defineProperty(exports, "HorizontalPattern", { enumerable: true, get: function () { return __importDefault(HorizontalPattern_1).default; } });
-var isError_1 = require("./isError");
-Object.defineProperty(exports, "isError", { enumerable: true, get: function () { return __importDefault(isError_1).default; } });
-var isObject_1 = require("./isObject");
-Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return __importDefault(isObject_1).default; } });
 var Locale_1 = require("./Locale");
 Object.defineProperty(exports, "Locale", { enumerable: true, get: function () { return __importDefault(Locale_1).default; } });
 Object.defineProperty(exports, "isLocale", { enumerable: true, get: function () { return Locale_1.isLocale; } });
@@ -43,3 +42,7 @@ var WordBonus_1 = require("./WordBonus");
 Object.defineProperty(exports, "WordBonus", { enumerable: true, get: function () { return __importDefault(WordBonus_1).default; } });
 var WordDefinition_1 = require("./WordDefinition");
 Object.defineProperty(exports, "WordDefinition", { enumerable: true, get: function () { return __importDefault(WordDefinition_1).default; } });
+var isError_1 = require("./isError");
+Object.defineProperty(exports, "isError", { enumerable: true, get: function () { return __importDefault(isError_1).default; } });
+var isObject_1 = require("./isObject");
+Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return __importDefault(isObject_1).default; } });

package/packages/types/package.json

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

package/packages/types/src/Config.ts

@@ -5,6 +5,7 @@ import BonusValue from './BonusValue';
 import Cell from './Cell';
 import CharacterBonus from './CharacterBonus';
 import ConfigJson from './ConfigJson';
+import Game from './Game';
 import Locale from './Locale';
 import Tile from './Tile';
 import TileConfig from './TileConfig';
@@ -51,6 +52,10 @@ class Config {
     return this.config.boardWidth;
   }
 
+  public get game(): Game {
+    return this.config.game;
+  }
+
   public get locale(): Locale {
     return this.config.locale;
   }

package/packages/types/src/ConfigJson.ts

@@ -1,4 +1,5 @@
 import BonusJson from './BonusJson';
+import Game from './Game';
 import Locale from './Locale';
 import TileConfig from './TileConfig';
 
@@ -9,7 +10,7 @@ interface ConfigJson {
   boardHeight: number;
   boardWidth: number;
   bonuses: BonusJson[];
-  id: string;
+  game: Game;
   locale: Locale;
   maximumCharactersCount: number;
   name: string;

package/packages/types/src/Dictionary.ts

@@ -0,0 +1,9 @@
+import Locale from './Locale';
+
+interface Dictionary {
+  description: string;
+  locale: Locale;
+  name: string;
+}
+
+export default Dictionary;

package/packages/types/src/Game.ts

@@ -0,0 +1,11 @@
+enum Game {
+  Literaki = 'literaki',
+  Scrabble = 'scrabble',
+  SuperScrabble = 'super-scrabble',
+}
+
+const games = Object.values(Game);
+
+export const isGame = (locale: unknown): locale is Game => games.includes(locale as Game);
+
+export default Game;

package/packages/types/src/Locale.ts

@@ -1,4 +1,8 @@
-// eslint-disable-next-line no-shadow
+/**
+ * Locales are defined using IETF language tags
+ * @see https://en.wikipedia.org/wiki/IETF_language_tag
+ * @see https://en.wikipedia.org/wiki/ISO_3166-1
+ */
 enum Locale {
   DE_DE = 'de-DE',
   EN_GB = 'en-GB',

package/packages/types/src/index.ts

@@ -10,10 +10,10 @@ export { default as Collision } from './Collision';
 export { default as CollisionJson } from './CollisionJson';
 export { default as Config } from './Config';
 export { default as ConfigJson } from './ConfigJson';
+export { default as Dictionary } from './Dictionary';
 export { default as FinalPattern } from './FinalPattern';
+export { default as Game, isGame } from './Game';
 export { default as HorizontalPattern } from './HorizontalPattern';
-export { default as isError } from './isError';
-export { default as isObject } from './isObject';
 export { default as Locale, isLocale } from './Locale';
 export { default as Pattern } from './Pattern';
 export { default as PatternJson } from './PatternJson';
@@ -26,3 +26,5 @@ export { default as VerticalPattern } from './VerticalPattern';
 export { default as WordBonus } from './WordBonus';
 export { default as WordDefinition } from './WordDefinition';
 export { default as WordDefinitionJson } from './WordDefinitionJson';
+export { default as isError } from './isError';
+export { default as isObject } from './isObject';

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

@@ -15,7 +15,9 @@ const normalizeQuotes = (definition) => definition.replace(/\."/g, '".');
 const normalizeMarkers = (definition) => definition.replace(/^\(\d+\.\d+\)\s+/g, '');
 const normalizeTrailingSymbols = (definition) => definition.trim().replace(/:$/, '');
 const normalizeLeadingSymbols = (definition) => definition.trim().replace(/^:/, '');
-// https://stackoverflow.com/a/40732368
+/**
+ * @see https://stackoverflow.com/a/40732368
+ */
 const normalizeNonWords = (definition) => (/[\w\u0621-\u064A]+/.test(definition) ? definition : '');
 const normalizeCommas = (definition) => {
     return definition

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.12.2",
-  "lockfileVersion": 2,
+  "version": "2.12.4",
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.12.2",
+      "version": "2.12.4",
       "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.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
+      "version": "20.4.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
+      "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==",
       "dev": true
     },
     "node_modules/boolbase": {
@@ -138,22 +138,22 @@
       }
     },
     "node_modules/domutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
       "dependencies": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.1"
+        "domhandler": "^5.0.3"
       },
       "funding": {
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
     "node_modules/entities": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "engines": {
         "node": ">=0.12"
       },
@@ -237,155 +237,5 @@
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
       "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw=="
     }
-  },
-  "dependencies": {
-    "@types/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@types/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-THBEFwqsLuU/K62B5JRwab9NW97cFmL4Iy34NTMX0bMycQVzq2q7PKOkhfivIwxdpa/J72RppgC42vCHfwKJ0Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
-      "dev": true
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-    },
-    "cheerio": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-      "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-      "requires": {
-        "cheerio-select": "^2.1.0",
-        "dom-serializer": "^2.0.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "htmlparser2": "^8.0.1",
-        "parse5": "^7.0.0",
-        "parse5-htmlparser2-tree-adapter": "^7.0.0"
-      }
-    },
-    "cheerio-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-      "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-select": "^5.1.0",
-        "css-what": "^6.1.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1"
-      }
-    },
-    "css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      }
-    },
-    "css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-    },
-    "dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "requires": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      }
-    },
-    "domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-    },
-    "domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "requires": {
-        "domelementtype": "^2.3.0"
-      }
-    },
-    "domutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-      "requires": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.1"
-      }
-    },
-    "entities": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="
-    },
-    "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-    },
-    "htmlparser2": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-      "requires": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "entities": "^4.4.0"
-      }
-    },
-    "nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "requires": {
-        "entities": "^4.4.0"
-      }
-    },
-    "parse5-htmlparser2-tree-adapter": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-      "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-      "requires": {
-        "domhandler": "^5.0.2",
-        "parse5": "^7.0.0"
-      }
-    },
-    "striptags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw=="
-    }
   }
 }

package/packages/word-definitions/package.json

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

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

@@ -21,7 +21,9 @@ const normalizeTrailingSymbols: Normalize = (definition) => definition.trim().re
 
 const normalizeLeadingSymbols: Normalize = (definition) => definition.trim().replace(/^:/, '');
 
-// https://stackoverflow.com/a/40732368
+/**
+ * @see https://stackoverflow.com/a/40732368
+ */
 const normalizeNonWords: Normalize = (definition) => (/[\w\u0621-\u064A]+/.test(definition) ? definition : '');
 
 const normalizeCommas: Normalize = (definition) => {

package/packages/word-lists/build/getFrFrWordList.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
 const lib_1 = require("./lib");
-const FILE_URL = 
-// eslint-disable-next-line max-len
-'https://raw.githubusercontent.com/hbenbel/French-Dictionary/a573eab10cc798d7d5da7daab4d2ac0259bb46a3/dictionary/dictionary.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/french-dictionary/master/fr-FR.txt';
 const getFrFrWordList = async () => {
     const words = await (0, lib_1.getTxtWordList)(FILE_URL, types_1.Locale.FR_FR);
     return words.map(normalizeWord);