@scrabble-solver/dictionaries 2.8.2 → 2.8.4

package/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;

package/build/constants/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OUTPUT_DIRECTORY = exports.CACHE_STALE_THRESHOLD = exports.DAY = void 0;
-var os_1 = __importDefault(require("os"));
-var path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 exports.DAY = 24 * 60 * 60 * 1000;
 exports.CACHE_STALE_THRESHOLD = 30 * exports.DAY;
 exports.OUTPUT_DIRECTORY = path_1.default.resolve(os_1.default.homedir(), '.scrabble-solver', 'dictionaries');

package/build/index.js

@@ -18,6 +18,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dictionaries = void 0;
-var Dictionaries_1 = __importDefault(require("./Dictionaries"));
+const Dictionaries_1 = __importDefault(require("./Dictionaries"));
 __exportStar(require("./lib"), exports);
 exports.dictionaries = new Dictionaries_1.default();

package/build/lib/DiskCache.js

@@ -1,110 +1,48 @@
 "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 trie_1 = require("@kamilmielnik/trie");
-var fs_1 = __importDefault(require("fs"));
-var constants_1 = require("../constants");
-var getDictionaryFilepath_1 = __importDefault(require("./getDictionaryFilepath"));
-var readFile_1 = __importDefault(require("./readFile"));
-var writeFile_1 = __importDefault(require("./writeFile"));
-var DiskCache = /** @class */ (function () {
-    function DiskCache() {
+const trie_1 = require("@kamilmielnik/trie");
+const fs_1 = __importDefault(require("fs"));
+const constants_1 = require("../constants");
+const getDictionaryFilepath_1 = __importDefault(require("./getDictionaryFilepath"));
+class DiskCache {
+    async get(locale) {
+        if (!this.has(locale)) {
+            return undefined;
+        }
+        const filepath = (0, getDictionaryFilepath_1.default)(locale);
+        const serialized = await fs_1.default.promises.readFile(filepath, 'utf-8');
+        const trie = trie_1.Trie.deserialize(serialized);
+        return trie;
     }
-    DiskCache.prototype.get = function (locale) {
-        return __awaiter(this, void 0, void 0, function () {
-            var filepath, serialized, trie;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.has(locale)) {
-                            return [2 /*return*/, undefined];
-                        }
-                        filepath = (0, getDictionaryFilepath_1.default)(locale);
-                        return [4 /*yield*/, (0, readFile_1.default)(filepath)];
-                    case 1:
-                        serialized = _a.sent();
-                        trie = trie_1.Trie.deserialize(serialized);
-                        return [2 /*return*/, trie];
-                }
-            });
-        });
-    };
-    DiskCache.prototype.getLastModifiedTimestamp = function (locale) {
-        var filepath = (0, getDictionaryFilepath_1.default)(locale);
+    getLastModifiedTimestamp(locale) {
+        const filepath = (0, getDictionaryFilepath_1.default)(locale);
         if (!fs_1.default.existsSync(filepath)) {
             return undefined;
         }
-        var stats = fs_1.default.statSync(filepath);
+        const stats = fs_1.default.statSync(filepath);
         return stats.mtimeMs;
-    };
-    DiskCache.prototype.has = function (locale) {
-        var filepath = (0, getDictionaryFilepath_1.default)(locale);
+    }
+    has(locale) {
+        const filepath = (0, getDictionaryFilepath_1.default)(locale);
         return fs_1.default.existsSync(filepath);
-    };
-    DiskCache.prototype.isStale = function (locale) {
+    }
+    isStale(locale) {
         if (!this.has(locale)) {
             return undefined;
         }
-        var lastModifiedTimestamp = this.getLastModifiedTimestamp(locale);
+        const lastModifiedTimestamp = this.getLastModifiedTimestamp(locale);
         if (typeof lastModifiedTimestamp === 'undefined') {
             return undefined;
         }
-        var timeSinceModification = Math.abs(lastModifiedTimestamp - Date.now());
+        const timeSinceModification = Math.abs(lastModifiedTimestamp - Date.now());
         return timeSinceModification > constants_1.CACHE_STALE_THRESHOLD;
-    };
-    DiskCache.prototype.set = function (locale, trie) {
-        return __awaiter(this, void 0, void 0, function () {
-            var filepath;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        filepath = (0, getDictionaryFilepath_1.default)(locale);
-                        return [4 /*yield*/, (0, writeFile_1.default)(filepath, trie.serialize())];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    return DiskCache;
-}());
+    }
+    async set(locale, trie) {
+        const filepath = (0, getDictionaryFilepath_1.default)(locale);
+        await fs_1.default.promises.writeFile(filepath, trie.serialize());
+    }
+}
 exports.default = DiskCache;

package/build/lib/LayeredCache.js

@@ -1,119 +1,55 @@
 "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 __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var createCacheTimestampComparator_1 = __importDefault(require("./createCacheTimestampComparator"));
-var DiskCache_1 = __importDefault(require("./DiskCache"));
-var MemoryCache_1 = __importDefault(require("./MemoryCache"));
-var LayeredCache = /** @class */ (function () {
-    function LayeredCache() {
+const createCacheTimestampComparator_1 = __importDefault(require("./createCacheTimestampComparator"));
+const DiskCache_1 = __importDefault(require("./DiskCache"));
+const MemoryCache_1 = __importDefault(require("./MemoryCache"));
+class LayeredCache {
+    constructor() {
         this.layers = [new MemoryCache_1.default(), new DiskCache_1.default()];
     }
-    LayeredCache.prototype.get = function (locale) {
-        var cached = this.getLastModifiedLayer(locale);
-        if (!cached) {
+    async get(locale) {
+        const cache = this.getLastModifiedLayer(locale);
+        if (!cache) {
             return Promise.resolve(undefined);
         }
-        return cached.get(locale);
-    };
-    LayeredCache.prototype.getLastModifiedTimestamp = function (locale) {
-        var cached = this.getLastModifiedLayer(locale);
-        if (!cached) {
+        const [memoryCache, diskCache] = this.layers;
+        const value = await cache.get(locale);
+        if (cache === diskCache && typeof value !== 'undefined') {
+            await memoryCache.set(locale, value);
+        }
+        return value;
+    }
+    getLastModifiedTimestamp(locale) {
+        const cache = this.getLastModifiedLayer(locale);
+        if (!cache) {
             return undefined;
         }
-        return cached.getLastModifiedTimestamp(locale);
-    };
-    LayeredCache.prototype.has = function (locale) {
-        return this.layers.some(function (cache) { return cache.has(locale); });
-    };
-    LayeredCache.prototype.isStale = function (locale) {
-        if (this.layers.some(function (cache) { return cache.isStale(locale); })) {
+        return cache.getLastModifiedTimestamp(locale);
+    }
+    has(locale) {
+        return this.layers.some((cache) => cache.has(locale));
+    }
+    isStale(locale) {
+        if (this.layers.some((cache) => cache.isStale(locale))) {
             return true;
         }
-        if (this.layers.every(function (cache) { return typeof cache.isStale(locale) === 'undefined'; })) {
+        if (this.layers.every((cache) => typeof cache.isStale(locale) === 'undefined')) {
             return undefined;
         }
         return false;
-    };
-    LayeredCache.prototype.set = function (locale, trie) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.all(this.layers.map(function (cache) { return cache.set(locale, trie); }))];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    LayeredCache.prototype.getLastModifiedLayer = function (locale) {
-        var layers = this.layers.filter(function (cache) { return cache.has(locale); });
-        var _a = __read(__spreadArray([], __read(layers), false).sort((0, createCacheTimestampComparator_1.default)(locale)), 1), cached = _a[0];
+    }
+    async set(locale, trie) {
+        const [memoryCache, diskCache] = this.layers;
+        await diskCache.set(locale, trie);
+        await memoryCache.set(locale, trie);
+    }
+    getLastModifiedLayer(locale) {
+        const layers = this.layers.filter((cache) => cache.has(locale));
+        const [cached] = [...layers].sort((0, createCacheTimestampComparator_1.default)(locale));
         return cached;
-    };
-    return LayeredCache;
-}());
+    }
+}
 exports.default = LayeredCache;

package/build/lib/MemoryCache.js

@@ -1,33 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var constants_1 = require("../constants");
-var MemoryCache = /** @class */ (function () {
-    function MemoryCache() {
+const constants_1 = require("../constants");
+class MemoryCache {
+    constructor() {
         this.cache = {};
         this.cacheTimestamps = {};
     }
-    MemoryCache.prototype.get = function (locale) {
+    get(locale) {
         return Promise.resolve(this.cache[locale]);
-    };
-    MemoryCache.prototype.getLastModifiedTimestamp = function (locale) {
+    }
+    getLastModifiedTimestamp(locale) {
         return this.cacheTimestamps[locale];
-    };
-    MemoryCache.prototype.has = function (locale) {
+    }
+    has(locale) {
         return typeof this.cache[locale] !== 'undefined';
-    };
-    MemoryCache.prototype.isStale = function (locale) {
-        var timestamp = this.getLastModifiedTimestamp(locale);
+    }
+    isStale(locale) {
+        const timestamp = this.getLastModifiedTimestamp(locale);
         if (!this.has(locale) || typeof timestamp === 'undefined') {
             return undefined;
         }
-        var timeSinceModification = Math.abs(timestamp - Date.now());
+        const timeSinceModification = Math.abs(timestamp - Date.now());
         return timeSinceModification > constants_1.CACHE_STALE_THRESHOLD;
-    };
-    MemoryCache.prototype.set = function (locale, trie) {
+    }
+    set(locale, trie) {
         this.cacheTimestamps[locale] = Date.now();
         this.cache[locale] = trie;
         return Promise.resolve();
-    };
-    return MemoryCache;
-}());
+    }
+}
 exports.default = MemoryCache;

package/build/lib/createAsyncProxy.js

@@ -1,62 +1,18 @@
 "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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var createAsyncProxy = function (asyncCallback) {
-    var promise = null;
-    return function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (promise) {
-                        return [2 /*return*/, promise];
-                    }
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, , 3, 4]);
-                    promise = asyncCallback();
-                    return [4 /*yield*/, promise];
-                case 2: return [2 /*return*/, _a.sent()];
-                case 3:
-                    promise = null;
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
-            }
-        });
-    }); };
+const createAsyncProxy = (asyncCallback) => {
+    let promise = null;
+    return async () => {
+        if (promise) {
+            return promise;
+        }
+        try {
+            promise = asyncCallback();
+            return await promise;
+        }
+        finally {
+            promise = null;
+        }
+    };
 };
 exports.default = createAsyncProxy;

package/build/lib/createCacheTimestampComparator.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var createCacheTimestampComparator = function (locale) {
-    return function (a, b) {
-        var aTimestamp = a.getLastModifiedTimestamp(locale);
-        var bTimestamp = b.getLastModifiedTimestamp(locale);
+const createCacheTimestampComparator = (locale) => {
+    return (a, b) => {
+        const aTimestamp = a.getLastModifiedTimestamp(locale);
+        const bTimestamp = b.getLastModifiedTimestamp(locale);
         if (aTimestamp === bTimestamp) {
             return 0;
         }

package/build/lib/downloadDictionary.js

@@ -1,60 +1,16 @@
 "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 trie_1 = require("@kamilmielnik/trie");
-var logger_1 = __importDefault(require("@scrabble-solver/logger"));
-var word_lists_1 = require("@scrabble-solver/word-lists");
-var downloadDictionary = function (locale) { return __awaiter(void 0, void 0, void 0, function () {
-    var words, trie;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                logger_1.default.info('downloadDictionary', { locale: locale });
-                return [4 /*yield*/, (0, word_lists_1.getWordList)(locale)];
-            case 1:
-                words = _a.sent();
-                logger_1.default.info('downloadDictionary - success', { locale: locale });
-                trie = trie_1.Trie.fromArray(words);
-                return [2 /*return*/, trie];
-        }
-    });
-}); };
+const trie_1 = require("@kamilmielnik/trie");
+const logger_1 = __importDefault(require("@scrabble-solver/logger"));
+const word_lists_1 = require("@scrabble-solver/word-lists");
+const downloadDictionary = async (locale) => {
+    logger_1.default.info('downloadDictionary', { locale });
+    const words = await (0, word_lists_1.getWordList)(locale);
+    logger_1.default.info('downloadDictionary - success', { locale });
+    const trie = trie_1.Trie.fromArray(words);
+    return trie;
+};
 exports.default = downloadDictionary;

package/build/lib/getDictionaryFilepath.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var path_1 = __importDefault(require("path"));
-var constants_1 = require("../constants");
-var getDictionaryFilepath = function (locale) {
-    return path_1.default.resolve(constants_1.OUTPUT_DIRECTORY, "".concat(locale, ".txt"));
+const path_1 = __importDefault(require("path"));
+const constants_1 = require("../constants");
+const getDictionaryFilepath = (locale) => {
+    return path_1.default.resolve(constants_1.OUTPUT_DIRECTORY, `${locale}.txt`);
 };
 exports.default = getDictionaryFilepath;

package/build/lib/index.d.ts

@@ -5,5 +5,3 @@ export { default as downloadDictionary } from './downloadDictionary';
 export { default as getDictionaryFilepath } from './getDictionaryFilepath';
 export { default as LayeredCache } from './LayeredCache';
 export { default as MemoryCache } from './MemoryCache';
-export { default as readFile } from './readFile';
-export { default as writeFile } from './writeFile';

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.writeFile = exports.readFile = exports.MemoryCache = exports.LayeredCache = exports.getDictionaryFilepath = exports.downloadDictionary = exports.DiskCache = exports.createCacheTimestampComparator = exports.createAsyncProxy = void 0;
+exports.MemoryCache = exports.LayeredCache = exports.getDictionaryFilepath = exports.downloadDictionary = exports.DiskCache = exports.createCacheTimestampComparator = exports.createAsyncProxy = void 0;
 var createAsyncProxy_1 = require("./createAsyncProxy");
 Object.defineProperty(exports, "createAsyncProxy", { enumerable: true, get: function () { return __importDefault(createAsyncProxy_1).default; } });
 var createCacheTimestampComparator_1 = require("./createCacheTimestampComparator");
@@ -18,7 +18,3 @@ var LayeredCache_1 = require("./LayeredCache");
 Object.defineProperty(exports, "LayeredCache", { enumerable: true, get: function () { return __importDefault(LayeredCache_1).default; } });
 var MemoryCache_1 = require("./MemoryCache");
 Object.defineProperty(exports, "MemoryCache", { enumerable: true, get: function () { return __importDefault(MemoryCache_1).default; } });
-var readFile_1 = require("./readFile");
-Object.defineProperty(exports, "readFile", { enumerable: true, get: function () { return __importDefault(readFile_1).default; } });
-var writeFile_1 = require("./writeFile");
-Object.defineProperty(exports, "writeFile", { enumerable: true, get: function () { return __importDefault(writeFile_1).default; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/dictionaries",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "Scrabble Solver 2 - Dictionaries",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -30,10 +30,10 @@
     "postbuild": "node ./bin/update-dictionaries.js"
   },
   "dependencies": {
-    "@kamilmielnik/trie": "^1.0.3",
-    "@scrabble-solver/logger": "^2.8.2",
-    "@scrabble-solver/types": "^2.8.2",
-    "@scrabble-solver/word-lists": "^2.8.2"
+    "@kamilmielnik/trie": "^2.0.0",
+    "@scrabble-solver/logger": "^2.8.4",
+    "@scrabble-solver/types": "^2.8.4",
+    "@scrabble-solver/word-lists": "^2.8.4"
   },
-  "gitHead": "bf360562a79572dd4640ac7cd7f26199f1ba6899"
+  "gitHead": "3b0c4c9d7987e456f34f7e2918931b0024b8a393"
 }

package/src/lib/DiskCache.ts

@@ -6,8 +6,6 @@ import { CACHE_STALE_THRESHOLD } from '../constants';
 import { Cache } from '../types';
 
 import getDictionaryFilepath from './getDictionaryFilepath';
-import readFile from './readFile';
-import writeFile from './writeFile';
 
 class DiskCache implements Cache<Locale, Trie> {
   public async get(locale: Locale): Promise<Trie | undefined> {
@@ -16,7 +14,7 @@ class DiskCache implements Cache<Locale, Trie> {
     }
 
     const filepath = getDictionaryFilepath(locale);
-    const serialized = await readFile(filepath);
+    const serialized = await fs.promises.readFile(filepath, 'utf-8');
     const trie = Trie.deserialize(serialized);
     return trie;
   }
@@ -54,7 +52,7 @@ class DiskCache implements Cache<Locale, Trie> {
 
   public async set(locale: Locale, trie: Trie): Promise<void> {
     const filepath = getDictionaryFilepath(locale);
-    await writeFile(filepath, trie.serialize());
+    await fs.promises.writeFile(filepath, trie.serialize());
   }
 }
 

package/src/lib/LayeredCache.ts

@@ -10,24 +10,31 @@ import MemoryCache from './MemoryCache';
 class LayeredCache implements Cache<Locale, Trie> {
   private readonly layers = [new MemoryCache(), new DiskCache()];
 
-  public get(locale: Locale): Promise<Trie | undefined> {
-    const cached = this.getLastModifiedLayer(locale);
+  public async get(locale: Locale): Promise<Trie | undefined> {
+    const cache = this.getLastModifiedLayer(locale);
 
-    if (!cached) {
+    if (!cache) {
       return Promise.resolve(undefined);
     }
 
-    return cached.get(locale);
+    const [memoryCache, diskCache] = this.layers;
+    const value = await cache.get(locale);
+
+    if (cache === diskCache && typeof value !== 'undefined') {
+      await memoryCache.set(locale, value);
+    }
+
+    return value;
   }
 
   public getLastModifiedTimestamp(locale: Locale): number | undefined {
-    const cached = this.getLastModifiedLayer(locale);
+    const cache = this.getLastModifiedLayer(locale);
 
-    if (!cached) {
+    if (!cache) {
       return undefined;
     }
 
-    return cached.getLastModifiedTimestamp(locale);
+    return cache.getLastModifiedTimestamp(locale);
   }
 
   public has(locale: Locale): boolean {
@@ -47,7 +54,9 @@ class LayeredCache implements Cache<Locale, Trie> {
   }
 
   public async set(locale: Locale, trie: Trie): Promise<void> {
-    await Promise.all(this.layers.map((cache) => cache.set(locale, trie)));
+    const [memoryCache, diskCache] = this.layers;
+    await diskCache.set(locale, trie);
+    await memoryCache.set(locale, trie);
   }
 
   private getLastModifiedLayer(locale: Locale): Cache<Locale, Trie> | undefined {

package/src/lib/index.ts

@@ -5,5 +5,3 @@ export { default as downloadDictionary } from './downloadDictionary';
 export { default as getDictionaryFilepath } from './getDictionaryFilepath';
 export { default as LayeredCache } from './LayeredCache';
 export { default as MemoryCache } from './MemoryCache';
-export { default as readFile } from './readFile';
-export { default as writeFile } from './writeFile';

package/build/lib/readFile.d.ts

@@ -1,2 +0,0 @@
-declare const readFile: (filepath: string) => Promise<string>;
-export default readFile;

package/build/lib/readFile.js

@@ -1,57 +0,0 @@
-"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 fs_1 = __importDefault(require("fs"));
-var readFile = function (filepath) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        return [2 /*return*/, new Promise(function (resolve, reject) {
-                fs_1.default.readFile(filepath, { encoding: 'utf-8' }, function (error, data) {
-                    if (error) {
-                        reject();
-                    }
-                    else {
-                        resolve(data.toString());
-                    }
-                });
-            })];
-    });
-}); };
-exports.default = readFile;

package/build/lib/writeFile.d.ts

@@ -1,2 +0,0 @@
-declare const writeFile: (filepath: string, data: string) => Promise<void>;
-export default writeFile;

package/build/lib/writeFile.js

@@ -1,57 +0,0 @@
-"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 fs_1 = __importDefault(require("fs"));
-var writeFile = function (filepath, data) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        return [2 /*return*/, new Promise(function (resolve, reject) {
-                fs_1.default.writeFile(filepath, data, function (error) {
-                    if (error) {
-                        reject();
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            })];
-    });
-}); };
-exports.default = writeFile;

package/src/lib/readFile.ts

@@ -1,15 +0,0 @@
-import fs from 'fs';
-
-const readFile = async (filepath: string): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    fs.readFile(filepath, { encoding: 'utf-8' }, (error, data) => {
-      if (error) {
-        reject();
-      } else {
-        resolve(data.toString());
-      }
-    });
-  });
-};
-
-export default readFile;

package/src/lib/writeFile.ts

@@ -1,15 +0,0 @@
-import fs from 'fs';
-
-const writeFile = async (filepath: string, data: string): Promise<void> => {
-  return new Promise((resolve, reject) => {
-    fs.writeFile(filepath, data, (error) => {
-      if (error) {
-        reject();
-      } else {
-        resolve();
-      }
-    });
-  });
-};
-
-export default writeFile;