scrabble-solver 2.8.1 → 2.8.3

package/packages/dictionaries/build/lib/writeFile.js

@@ -1,57 +1,19 @@
 "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();
-                    }
-                });
-            })];
+const fs_1 = __importDefault(require("fs"));
+const writeFile = async (filepath, data) => {
+    return new Promise((resolve, reject) => {
+        fs_1.default.writeFile(filepath, data, (error) => {
+            if (error) {
+                reject();
+            }
+            else {
+                resolve();
+            }
+        });
     });
-}); };
+};
 exports.default = writeFile;

package/packages/dictionaries/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/dictionaries",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/dictionaries",
-      "version": "2.8.1",
+      "version": "2.8.3",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^1.0.3"

package/packages/dictionaries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/dictionaries",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "Scrabble Solver 2 - Dictionaries",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^1.0.3",
-    "@scrabble-solver/logger": "^2.8.1",
-    "@scrabble-solver/types": "^2.8.1",
-    "@scrabble-solver/word-lists": "^2.8.1"
+    "@scrabble-solver/logger": "^2.8.3",
+    "@scrabble-solver/types": "^2.8.3",
+    "@scrabble-solver/word-lists": "^2.8.3"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/dictionaries/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/packages/logger/build/constants.js

@@ -4,6 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OUTPUT_DIRECTORY = 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.OUTPUT_DIRECTORY = path_1.default.resolve(os_1.default.homedir(), '.scrabble-solver', 'logs');

package/packages/logger/build/logger.js

@@ -3,10 +3,10 @@ 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 winston_1 = require("winston");
-var constants_1 = require("./constants");
-var logger = (0, winston_1.createLogger)({
+const path_1 = __importDefault(require("path"));
+const winston_1 = require("winston");
+const constants_1 = require("./constants");
+const logger = (0, winston_1.createLogger)({
     level: 'info',
     format: winston_1.format.combine(winston_1.format.timestamp({
         format: 'YYYY-MM-DD HH:mm:ss',

package/packages/logger/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/logger",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/logger",
-      "version": "2.8.1",
+      "version": "2.8.3",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "winston": "^3.8.2"

package/packages/logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/logger",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "Scrabble Solver 2 - Logger",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/packages/scrabble-solver/.next/BUILD_ID

@@ -1 +1 @@
-CQTUJjnUaobzo-T6zRWj1
+OhUvTNKwyrrzmNwKBnpUU

package/packages/scrabble-solver/.next/build-manifest.json

@@ -5,8 +5,8 @@
   "devFiles": [],
   "ampDevFiles": [],
   "lowPriorityFiles": [
-    "static/CQTUJjnUaobzo-T6zRWj1/_buildManifest.js",
-    "static/CQTUJjnUaobzo-T6zRWj1/_ssgManifest.js"
+    "static/OhUvTNKwyrrzmNwKBnpUU/_buildManifest.js",
+    "static/OhUvTNKwyrrzmNwKBnpUU/_ssgManifest.js"
   ],
   "rootMainFiles": [],
   "pages": {
@@ -16,7 +16,7 @@
       "static/chunks/main-a75cf611e061d8f8.js",
       "static/chunks/758-f333b1dcdb941547.js",
       "static/css/d676d43c6b9c9a57.css",
-      "static/chunks/195-fcadef5c6eed8338.js",
+      "static/chunks/195-4b75c9c697b7b455.js",
       "static/css/3159cfe62ff742a3.css",
       "static/chunks/pages/index-75517525489ab316.js"
     ],
@@ -26,7 +26,7 @@
       "static/chunks/main-a75cf611e061d8f8.js",
       "static/chunks/758-f333b1dcdb941547.js",
       "static/css/d676d43c6b9c9a57.css",
-      "static/chunks/195-fcadef5c6eed8338.js",
+      "static/chunks/195-4b75c9c697b7b455.js",
       "static/chunks/pages/404-02d949d2fe59e960.js"
     ],
     "/_app": [
@@ -34,7 +34,7 @@
       "static/chunks/framework-4556c45dd113b893.js",
       "static/chunks/main-a75cf611e061d8f8.js",
       "static/css/6a9e5ba3f77c27f2.css",
-      "static/chunks/pages/_app-f4030148d742bcd2.js"
+      "static/chunks/pages/_app-72522bfb306a8aef.js"
     ],
     "/_error": [
       "static/chunks/webpack-5752944655d749a0.js",