scrabble-solver 2.13.0 → 2.13.1

package/packages/scrabble-solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/scrabble-solver",
-      "version": "2.13.0",
+      "version": "2.13.1",
       "license": "CC BY-NC-ND 4.0",
       "dependencies": {
         "@floating-ui/react": "^0.22.3",

package/packages/scrabble-solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "Scrabble Solver 2 - App",
   "engines": {
     "node": ">=16"
@@ -31,13 +31,13 @@
     "@floating-ui/react": "^0.22.3",
     "@kamilmielnik/trie": "^2.0.1",
     "@reduxjs/toolkit": "^1.9.3",
-    "@scrabble-solver/configs": "^2.13.0",
-    "@scrabble-solver/constants": "^2.13.0",
-    "@scrabble-solver/dictionaries": "^2.13.0",
-    "@scrabble-solver/logger": "^2.13.0",
-    "@scrabble-solver/solver": "^2.13.0",
-    "@scrabble-solver/types": "^2.13.0",
-    "@scrabble-solver/word-definitions": "^2.13.0",
+    "@scrabble-solver/configs": "^2.13.1",
+    "@scrabble-solver/constants": "^2.13.1",
+    "@scrabble-solver/dictionaries": "^2.13.1",
+    "@scrabble-solver/logger": "^2.13.1",
+    "@scrabble-solver/solver": "^2.13.1",
+    "@scrabble-solver/types": "^2.13.1",
+    "@scrabble-solver/word-definitions": "^2.13.1",
     "classnames": "^2.3.2",
     "include-media": "^2.0.0",
     "include-media-query-builder": "^1.1.0",

package/packages/solver/package-lock.json

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

package/packages/types/package.json

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

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

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.13.0",
+      "version": "2.13.1",
       "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.0",
+  "version": "2.13.1",
   "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.13.0",
+    "@scrabble-solver/types": "^2.13.1",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"

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

@@ -1,14 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
+const latinize_1 = __importDefault(require("latinize"));
 const lib_1 = require("./lib");
-const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/fise-2/master/fise-2.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/scrabble-dictionaries/master/spanish/fise-2.txt';
+const N_PLACEHOLDER = '---n---';
 const getEsEsWordList = async () => {
     const words = await (0, lib_1.getTxtWordList)(FILE_URL, types_1.Locale.ES_ES);
-    return words.map(normalizeWord);
-};
-const normalizeWord = (word) => {
-    // normalization from https://stackoverflow.com/a/37511463
-    return word.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+    return words
+        .map((word) => word.replaceAll('ñ', N_PLACEHOLDER))
+        .map(latinize_1.default)
+        .map((word) => word.replaceAll(N_PLACEHOLDER, 'ñ'));
 };
 exports.default = getEsEsWordList;

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

@@ -1,14 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
+const latinize_1 = __importDefault(require("latinize"));
 const lib_1 = require("./lib");
 const FILE_URL = 'https://raw.githubusercontent.com/Thecoolsim/French-Scrabble-ODS8/main/French%20ODS%20dictionary.txt';
 const getFrFrWordList = async () => {
     const words = await (0, lib_1.getTxtWordList)(FILE_URL, types_1.Locale.FR_FR);
-    return words.map(normalizeWord);
-};
-const normalizeWord = (word) => {
-    // normalization from https://stackoverflow.com/a/37511463
-    return word.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+    return words.map(latinize_1.default);
 };
 exports.default = getFrFrWordList;

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

@@ -3,21 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
+const types_1 = require("@scrabble-solver/types");
+const latinize_1 = __importDefault(require("latinize"));
 const lib_1 = require("./lib");
-const FILE_URL = 'https://dexonline.ro/static/download/scrabble/loc-flexiuni-5.0.zip';
-const FILE_TO_EXTRACT_FROM_ZIP = 'loc-flexiuni-5.0.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/scrabble-dictionaries/master/romanian/loc-5.0.txt';
 const getRoRoWordList = async () => {
-    const tempFilepath = (0, lib_1.getTempFilepath)();
-    const zipTempFilename = await (0, lib_1.downloadFile)(FILE_URL);
-    await (0, lib_1.unzip)(zipTempFilename, FILE_TO_EXTRACT_FROM_ZIP, tempFilepath);
-    fs_1.default.unlinkSync(zipTempFilename);
-    const file = fs_1.default.readFileSync(tempFilepath, 'utf-8');
-    fs_1.default.unlinkSync(tempFilepath);
-    const words = (0, lib_1.extractWords)(replaceDiacritics(file.toLocaleString()), 'ro-RO');
-    return words;
-};
-const replaceDiacritics = (file) => {
-    return file.replaceAll('ă', 'a').replaceAll('â', 'a').replaceAll('î', 'i').replaceAll('ș', 's').replaceAll('ț', 't');
+    const words = await (0, lib_1.getTxtWordList)(FILE_URL, types_1.Locale.RO_RO);
+    return words.map(latinize_1.default);
 };
 exports.default = getRoRoWordList;

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

@@ -1,20 +1,22 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-lists",
-      "version": "2.13.0",
+      "version": "2.13.1",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
         "follow-redirects": "^1.15.2",
+        "latinize": "^1.0.0",
         "unzipper": "^0.10.11"
       },
       "devDependencies": {
         "@types/follow-redirects": "^1.14.1",
+        "@types/latinize": "^0.2.17",
         "@types/unzipper": "^0.10.5"
       }
     },
@@ -27,6 +29,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/latinize": {
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/@types/latinize/-/latinize-0.2.17.tgz",
+      "integrity": "sha512-TqSJE7HHuwaxaGLAWm+YlFBymfNaLdQdddmZutXRD7+kabPgpWAiQHazOixwz1IrHGtacM8Oed/cg8CzrYvEDQ==",
+      "dev": true
+    },
     "node_modules/@types/node": {
       "version": "18.15.13",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
@@ -354,6 +362,11 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
+    "node_modules/latinize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/latinize/-/latinize-1.0.0.tgz",
+      "integrity": "sha512-vAgAlB6nnbGmaLWOW3bHZ5EOUFYzV5h5LfgrRv43wWgWQXd1DorS7mMsgzc7XARPlQiokrNkv/9XzGmpYu44fg=="
+    },
     "node_modules/listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",

package/packages/word-lists/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "Scrabble Solver 2 - Word lists",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,13 +24,15 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.13.0",
+    "@scrabble-solver/types": "^2.13.1",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
+    "latinize": "^1.0.0",
     "unzipper": "^0.10.11"
   },
   "devDependencies": {
     "@types/follow-redirects": "^1.14.1",
+    "@types/latinize": "^0.2.17",
     "@types/unzipper": "^0.10.5"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"

package/packages/word-lists/src/getEsEsWordList.ts

@@ -1,17 +1,18 @@
 import { Locale } from '@scrabble-solver/types';
+import latinize from 'latinize';
 
 import { getTxtWordList } from './lib';
 
-const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/fise-2/master/fise-2.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/scrabble-dictionaries/master/spanish/fise-2.txt';
+const N_PLACEHOLDER = '---n---';
 
 const getEsEsWordList = async (): Promise<string[]> => {
   const words = await getTxtWordList(FILE_URL, Locale.ES_ES);
-  return words.map(normalizeWord);
-};
 
-const normalizeWord = (word: string): string => {
-  // normalization from https://stackoverflow.com/a/37511463
-  return word.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+  return words
+    .map((word) => word.replaceAll('ñ', N_PLACEHOLDER))
+    .map(latinize)
+    .map((word) => word.replaceAll(N_PLACEHOLDER, 'ñ'));
 };
 
 export default getEsEsWordList;

package/packages/word-lists/src/getFrFrWordList.ts

@@ -1,4 +1,5 @@
 import { Locale } from '@scrabble-solver/types';
+import latinize from 'latinize';
 
 import { getTxtWordList } from './lib';
 
@@ -6,12 +7,7 @@ const FILE_URL = 'https://raw.githubusercontent.com/Thecoolsim/French-Scrabble-O
 
 const getFrFrWordList = async (): Promise<string[]> => {
   const words = await getTxtWordList(FILE_URL, Locale.FR_FR);
-  return words.map(normalizeWord);
-};
-
-const normalizeWord = (word: string): string => {
-  // normalization from https://stackoverflow.com/a/37511463
-  return word.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+  return words.map(latinize);
 };
 
 export default getFrFrWordList;

package/packages/word-lists/src/getRoRoWordList.ts

@@ -1,23 +1,13 @@
-import fs from 'fs';
+import { Locale } from '@scrabble-solver/types';
+import latinize from 'latinize';
 
-import { downloadFile, extractWords, getTempFilepath, unzip } from './lib';
+import { getTxtWordList } from './lib';
 
-const FILE_URL = 'https://dexonline.ro/static/download/scrabble/loc-flexiuni-5.0.zip';
-const FILE_TO_EXTRACT_FROM_ZIP = 'loc-flexiuni-5.0.txt';
+const FILE_URL = 'https://raw.githubusercontent.com/kamilmielnik/scrabble-dictionaries/master/romanian/loc-5.0.txt';
 
 const getRoRoWordList = async (): Promise<string[]> => {
-  const tempFilepath = getTempFilepath();
-  const zipTempFilename = await downloadFile(FILE_URL);
-  await unzip(zipTempFilename, FILE_TO_EXTRACT_FROM_ZIP, tempFilepath);
-  fs.unlinkSync(zipTempFilename);
-  const file = fs.readFileSync(tempFilepath, 'utf-8');
-  fs.unlinkSync(tempFilepath);
-  const words = extractWords(replaceDiacritics(file.toLocaleString()), 'ro-RO');
-  return words;
-};
-
-const replaceDiacritics = (file: string): string => {
-  return file.replaceAll('ă', 'a').replaceAll('â', 'a').replaceAll('î', 'i').replaceAll('ș', 's').replaceAll('ț', 't');
+  const words = await getTxtWordList(FILE_URL, Locale.RO_RO);
+  return words.map(latinize);
 };
 
 export default getRoRoWordList;