@scrabble-solver/word-lists 2.13.0 → 2.13.2

package/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/build/getFrFrWordList.js

@@ -5,10 +5,6 @@ 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 (0, lib_1.latinizeDiacritics)(words);
 };
 exports.default = getFrFrWordList;

package/build/getRoRoWordList.js

@@ -1,23 +1,10 @@
 "use strict";
-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 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 (0, lib_1.latinizeDiacritics)(words);
 };
 exports.default = getRoRoWordList;

package/build/lib/index.d.ts

@@ -5,4 +5,6 @@ export { default as findFirstWordIndex } from './findFirstWordIndex';
 export { default as getHash } from './getHash';
 export { default as getTempFilepath } from './getTempFilepath';
 export { default as getTxtWordList } from './getTxtWordList';
+export { default as latinizeDiacritics } from './latinizeDiacritics';
+export { default as unique } from './unique';
 export { default as unzip } from './unzip';

package/build/lib/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.unzip = exports.getTxtWordList = exports.getTempFilepath = exports.getHash = exports.findFirstWordIndex = exports.extractWords = exports.downloadHtml = exports.downloadFile = void 0;
+exports.unzip = exports.unique = exports.latinizeDiacritics = exports.getTxtWordList = exports.getTempFilepath = exports.getHash = exports.findFirstWordIndex = exports.extractWords = exports.downloadHtml = exports.downloadFile = void 0;
 var downloadFile_1 = require("./downloadFile");
 Object.defineProperty(exports, "downloadFile", { enumerable: true, get: function () { return __importDefault(downloadFile_1).default; } });
 var downloadHtml_1 = require("./downloadHtml");
@@ -18,5 +18,9 @@ var getTempFilepath_1 = require("./getTempFilepath");
 Object.defineProperty(exports, "getTempFilepath", { enumerable: true, get: function () { return __importDefault(getTempFilepath_1).default; } });
 var getTxtWordList_1 = require("./getTxtWordList");
 Object.defineProperty(exports, "getTxtWordList", { enumerable: true, get: function () { return __importDefault(getTxtWordList_1).default; } });
+var latinizeDiacritics_1 = require("./latinizeDiacritics");
+Object.defineProperty(exports, "latinizeDiacritics", { enumerable: true, get: function () { return __importDefault(latinizeDiacritics_1).default; } });
+var unique_1 = require("./unique");
+Object.defineProperty(exports, "unique", { enumerable: true, get: function () { return __importDefault(unique_1).default; } });
 var unzip_1 = require("./unzip");
 Object.defineProperty(exports, "unzip", { enumerable: true, get: function () { return __importDefault(unzip_1).default; } });

package/build/lib/latinizeDiacritics.d.ts

@@ -0,0 +1,2 @@
+declare const latinizeDiacritics: (words: string[]) => string[];
+export default latinizeDiacritics;

package/build/lib/latinizeDiacritics.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const latinize_1 = __importDefault(require("latinize"));
+const unique_1 = __importDefault(require("./unique"));
+const latinizeDiacritics = (words) => {
+    return (0, unique_1.default)(words.map((word) => (0, latinize_1.default)(word)));
+};
+exports.default = latinizeDiacritics;

package/build/lib/unique.d.ts

@@ -0,0 +1,2 @@
+declare const unique: <T>(array: T[]) => T[];
+export default unique;

package/build/lib/unique.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const unique = (array) => Array.from(new Set(array));
+exports.default = unique;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.13.0",
+  "version": "2.13.2",
   "description": "Scrabble Solver 2 - Word lists",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,14 +24,16 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.13.0",
+    "@scrabble-solver/types": "^2.13.2",
     "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": "fb2e1c0ef099ea8983162ed9f0067d626ebdfaff"
+  "gitHead": "416ff4259dd617dd5a65212baf75aedfff2686af"
 }

package/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/src/getFrFrWordList.ts

@@ -1,17 +1,12 @@
 import { Locale } from '@scrabble-solver/types';
 
-import { getTxtWordList } from './lib';
+import { getTxtWordList, latinizeDiacritics } from './lib';
 
 const FILE_URL = 'https://raw.githubusercontent.com/Thecoolsim/French-Scrabble-ODS8/main/French%20ODS%20dictionary.txt';
 
 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 latinizeDiacritics(words);
 };
 
 export default getFrFrWordList;

package/src/getRoRoWordList.ts

@@ -1,23 +1,12 @@
-import fs from 'fs';
+import { Locale } from '@scrabble-solver/types';
 
-import { downloadFile, extractWords, getTempFilepath, unzip } from './lib';
+import { getTxtWordList, latinizeDiacritics } 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 latinizeDiacritics(words);
 };
 
 export default getRoRoWordList;

package/src/lib/index.ts

@@ -5,4 +5,6 @@ export { default as findFirstWordIndex } from './findFirstWordIndex';
 export { default as getHash } from './getHash';
 export { default as getTempFilepath } from './getTempFilepath';
 export { default as getTxtWordList } from './getTxtWordList';
+export { default as latinizeDiacritics } from './latinizeDiacritics';
+export { default as unique } from './unique';
 export { default as unzip } from './unzip';

package/src/lib/latinizeDiacritics.ts

@@ -0,0 +1,9 @@
+import latinize from 'latinize';
+
+import unique from './unique';
+
+const latinizeDiacritics = (words: string[]): string[] => {
+  return unique(words.map((word) => latinize(word)));
+};
+
+export default latinizeDiacritics;

package/src/lib/unique.ts

@@ -0,0 +1,3 @@
+const unique = <T>(array: T[]): T[] => Array.from(new Set(array));
+
+export default unique;