scrabble-solver 2.16.6 → 2.17.0

package/bunfig.toml

@@ -1,2 +1,8 @@
+# Keep the classic flat node_modules layout. With Bun's newer "isolated" layout,
+# `next build` fails: webpack starts bundling unzipper (used by word-lists) and
+# errors on @aws-sdk/client-s3 - an optional package we don't install.
+[install]
+linker = "hoisted"
+
 [test]
 preload = ["./bun.test.preload.ts"]

package/cypress/e2e/app.spec.cy.ts

@@ -11,6 +11,7 @@ import {
   getSettingOption,
   getSettingsButton,
   getTooltip,
+  hoverResult,
   moveMouseAway,
   solve,
   typeRack,
@@ -46,8 +47,7 @@ describe('app', () => {
 
   describe('full app test', () => {
     beforeEach(() => {
-      cy.intercept('/api/solve').as('solve');
-      cy.intercept('/api/dictionary/**/*').as('dictionary');
+      cy.intercept('/api/dictionary/*/*').as('dictionary');
     });
 
     it('Scrabble - Polish', () => {
@@ -60,7 +60,7 @@ describe('app', () => {
       solve();
 
       assertResult(0, 'bał', 14);
-      getResult(0).realHover();
+      hoverResult(0);
       getLoading().should('be.visible');
       cy.wait('@dictionary');
       getRackTile(0).parent().should('have.attr', 'role', 'mark');
@@ -88,7 +88,7 @@ describe('app', () => {
       cy.findByLabelText('Punkty').realClick();
       getTooltip().should('be.visible').and('have.text', 'Punkty');
       assertResult(0, 'ba', 8);
-      getResult(0).realHover();
+      hoverResult(0);
       getRackTile(0).parent().should('have.attr', 'role', 'mark');
       getRackTile(1).parent().should('have.attr', 'role', 'mark');
       getRackTile(2).parent().should('not.have.attr', 'role', 'mark');

package/cypress/e2e/features/solver-paths.ts

@@ -0,0 +1,66 @@
+import {
+  assertResult,
+  deleteCachedDictionaries,
+  getResults,
+  solve,
+  typeBoard,
+  typeRack,
+  unregisterServiceWorkers,
+  visitIndex,
+} from '../../support';
+
+describe('Solver paths', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+    await deleteCachedDictionaries();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('solves through the server when no dictionary is available locally', () => {
+    cy.intercept('GET', '/api/dictionary/*', { statusCode: 503 });
+    cy.intercept('POST', '/api/solve').as('solve');
+    visitIndex();
+    typeBoard('i', 'horizontal', 7, 7);
+    typeRack('q');
+    solve();
+    cy.wait('@solve');
+
+    getResults().should('have.length', 2);
+    assertResult(0, 'qi', 11);
+  });
+
+  it('solves locally once the dictionary is cached', () => {
+    visitIndex();
+    waitForCachedDictionary();
+
+    let solveRequestCount = 0;
+    cy.intercept('POST', '/api/solve', () => {
+      solveRequestCount += 1;
+    });
+    typeBoard('i', 'horizontal', 7, 7);
+    typeRack('q');
+    solve();
+
+    getResults().should('have.length', 2);
+    assertResult(0, 'qi', 11);
+    cy.then(() => {
+      expect(solveRequestCount).to.equal(0);
+    });
+  });
+});
+
+const waitForCachedDictionary = () => {
+  cy.then({ timeout: 30000 }, async () => {
+    const hasDictionary = async () => {
+      const cache = await caches.open('dictionary-api-cache');
+      return (await cache.match('/api/dictionary/en-US')) !== undefined;
+    };
+
+    while (!(await hasDictionary())) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  });
+};

package/cypress/e2e/features.spec.cy.ts

@@ -1,2 +1,3 @@
 import './features/91-hover-remaining-tile-highlights';
 import './features/198-highlight-unreachable-cells';
+import './features/solver-paths';

package/cypress/support/lib/actions.ts

@@ -1,8 +1,12 @@
-import { getBoardTile, getLoading, getModal, getOpenModal, getRackTile, getResult } from './selectors';
-
-const getRandomId = () => {
-  return String(Math.random()).replace(/^\d\./, '');
-};
+import {
+  getBoardTile,
+  getLoading,
+  getModal,
+  getOpenModal,
+  getRackTile,
+  getResult,
+  getResultsContainer,
+} from './selectors';
 
 export const visitIndex = () => {
   cy.visit('/');
@@ -60,14 +64,29 @@ export const pasteBoard = (word: string, direction: 'horizontal' | 'vertical', x
 };
 
 export const solve = () => {
-  const id = `solve-${getRandomId()}`;
-
-  cy.intercept('/api/solve').as(id);
   getRackTile().focus().parents('form').submit();
-  cy.wait(`@${id}`);
+  getResultsContainer().should('have.attr', 'data-outdated', 'false');
   getLoading().should('not.exist');
 };
 
+/**
+ * react-window remounts rows during its initial measure pass, and a row
+ * replaced under an already-hovered cursor never receives a new mouseenter -
+ * let the list settle before hovering.
+ */
+export const hoverResult = (index = 0) => {
+  cy.wait(100);
+  getResult(index).realHover();
+};
+
+/**
+ * Dropping the dictionary without its revalidation timestamp leaves the app
+ * throttled against re-downloading a dictionary it no longer has.
+ */
+export const deleteCachedDictionaries = async () => {
+  await Promise.all([caches.delete('dictionary-api-cache'), caches.delete('dictionary-revalidated-at')]);
+};
+
 export const assertResult = (index: number, word: string, points: number) => {
   getResult(index).should('have.attr', 'aria-label', word).and('include.text', word);
   getResult(index).findByTestId('points').should('have.text', String(points));

package/cypress.config.ts

@@ -1,9 +1,16 @@
+import webpackPreprocessor from '@cypress/webpack-batteries-included-preprocessor';
 import { defineConfig } from 'cypress';
 
 // eslint-disable-next-line no-restricted-exports
 export default defineConfig({
   e2e: {
     baseUrl: 'http://localhost:3000',
+    setupNodeEvents(on) {
+      // The preprocessor bundled with Cypress 15.19.0 cannot transpile specs under
+      // TypeScript 7 - its @babel/preset-typescript copy ships without a package.json.
+      // The npm-published preprocessor is intact, so register it explicitly.
+      on('file:preprocessor', webpackPreprocessor({ typescript: require.resolve('typescript') }));
+    },
     viewportHeight: 900,
     viewportWidth: 1440,
   },

package/lerna.json

@@ -6,6 +6,6 @@
     "access": "public"
   },
   "tagVersionPrefix": "",
-  "version": "2.16.6",
+  "version": "2.17.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package/nx.json

@@ -1,7 +1,9 @@
 {
   "targetDefaults": {
     "build": {
-      "dependsOn": ["^build"],
+      "dependsOn": [
+        "^build"
+      ],
       "cache": true
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrabble-solver",
-  "version": "2.16.6",
+  "version": "2.17.0",
   "description": "Scrabble Solver 2 - Free, open-source, cross-platform, multi-language analysis tool for Scrabble, Scrabble Duel, Super Scrabble, Letter League, Crossplay, Literaki, and Kelimelik. Quickly find the top-scoring words using the given board and tiles.",
   "keywords": [
     "Scrabble",
@@ -47,6 +47,7 @@
     "scrabble-solver": "./bin/scrabble-solver.js"
   },
   "scripts": {
+    "benchmark": "bun run --filter @scrabble-solver/solver benchmark",
     "build": "bun run --filter './packages/*' build",
     "clean": "bun run --filter './packages/*' clean && rimraf node_modules/",
     "dev": "bun run --filter @scrabble-solver/scrabble-solver dev",
@@ -59,7 +60,7 @@
     "release:prepare": "bun run reinstall",
     "release:publish": "bun run version:bump && np --no-cleanup --package-manager bun && lerna publish from-package --yes",
     "start": "concurrently -n w: bun:start:*",
-    "start:app": "bun run --filter @scrabble-solver/scrabble-solver start",
+    "start:app": "bun run --cwd packages/scrabble-solver start",
     "start:browser": "wait-on http://localhost:3333 && open-cli http://localhost:3333",
     "test": "bun run build && bun run test-unit && start-server-and-test start:app http://localhost:3333 test-cypress:run",
     "test-cypress": "cypress open",
@@ -95,32 +96,31 @@
     "packages/scrabble-solver"
   ],
   "dependencies": {
-    "@scrabble-solver/scrabble-solver": "^2.16.6",
-    "concurrently": "^10.0.3",
+    "@scrabble-solver/scrabble-solver": "^2.17.0",
+    "concurrently": "^10.0.4",
     "open-cli": "^9.0.0",
-    "wait-on": "^9.0.10"
+    "wait-on": "^9.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.29.7",
+    "@cypress/webpack-batteries-included-preprocessor": "^4.2.0",
+    "@cypress/webpack-preprocessor": "^7.1.1",
     "@testing-library/cypress": "^10.1.3",
     "@types/bun": "^1.3.14",
-    "@types/node": "^25.9.3",
-    "@typescript/native-preview": "^7.0.0-dev.20260615.1",
-    "cypress": "^15.17.0",
+    "@types/node": "^26.1.2",
+    "cypress": "^15.20.0",
     "cypress-real-events": "^1.15.0",
     "eslint-import-resolver-typescript": "^4.4.5",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-mocha": "^11.3.0",
+    "eslint-plugin-mocha": "^12.0.2",
     "eslint-plugin-react": "^7.37.5",
-    "lerna": "^9.0.7",
-    "np": "^11.2.1",
-    "oxfmt": "^0.55.0",
-    "oxlint": "^1.70.0",
-    "oxlint-tsgolint": "^0.23.0",
+    "lerna": "^10.0.0",
+    "np": "^12.0.1",
+    "oxfmt": "^0.62.0",
+    "oxlint": "^1.77.0",
+    "oxlint-tsgolint": "^7.0.2001",
     "rimraf": "^6.1.3",
-    "start-server-and-test": "^3.0.11",
-    "typescript": "^6.0.3"
+    "start-server-and-test": "^3.0.12",
+    "typescript": "^7.0.2"
   }
 }

package/packages/configs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/configs",
-  "version": "2.16.6",
+  "version": "2.17.0",
   "description": "Scrabble Solver 2 - Configs",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -19,12 +19,12 @@
   },
   "homepage": "https://scrabble-solver.org",
   "scripts": {
-    "build": "tsgo --project .",
+    "build": "tsc --project .",
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.16.6",
-    "@scrabble-solver/types": "^2.16.6"
+    "@scrabble-solver/constants": "^2.17.0",
+    "@scrabble-solver/types": "^2.17.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/constants",
-  "version": "2.16.6",
+  "version": "2.17.0",
   "description": "Scrabble Solver 2 - Constants",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -19,7 +19,7 @@
   },
   "homepage": "https://scrabble-solver.org",
   "scripts": {
-    "build": "tsgo --project .",
+    "build": "tsc --project .",
     "clean": "rimraf build/"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"

package/packages/dictionaries/README.md

@@ -1,3 +1,3 @@
 # @scrabble-solver/dictionaries
 
-Downloads, caches & serves dictionaries. Dictionaries are [Trie](https://github.com/kamilmielnik/trie) instances.
+Downloads, caches & serves dictionaries. Dictionaries are [Gaddag](https://github.com/kamilmielnik/gaddag) instances.

package/packages/dictionaries/build/Dictionaries.d.ts

@@ -1,10 +1,10 @@
-import { type Trie } from '@kamilmielnik/trie';
+import { type Gaddag } from '@kamilmielnik/gaddag';
 import { Locale } from '@scrabble-solver/types';
 export declare class Dictionaries {
     private readonly cache;
     private readonly downloadDictionaryProxies;
     constructor();
-    get(locale: Locale): Promise<Trie>;
+    get(locale: Locale): Promise<Gaddag>;
     remove(): void;
     update(force?: boolean): Promise<void>;
     private getLocalesToUpdate;

package/packages/dictionaries/build/Dictionaries.js

@@ -16,9 +16,9 @@ class Dictionaries {
     }
     async get(locale) {
         if (this.cache.has(locale)) {
-            const trie = await this.cache.get(locale);
-            if (trie) {
-                return trie;
+            const gaddag = await this.cache.get(locale);
+            if (gaddag) {
+                return gaddag;
             }
         }
         logger_1.logger.info('Dictionaries - cache miss', { locale });
@@ -40,9 +40,9 @@ class Dictionaries {
         logger_1.logger.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;
+        const gaddag = await downloadDictionaryProxy();
+        await this.cache.set(locale, gaddag);
+        return gaddag;
     }
 }
 exports.Dictionaries = Dictionaries;

package/packages/dictionaries/build/lib/DiskCache.d.ts

@@ -1,10 +1,17 @@
-import { Trie } from '@kamilmielnik/trie';
+import { Gaddag } from '@kamilmielnik/gaddag';
 import { type Locale } from '@scrabble-solver/types';
 import type { Cache } from '../types';
-export declare class DiskCache implements Cache<Locale, Trie> {
-    get(locale: Locale): Promise<Trie | undefined>;
+export declare class DiskCache implements Cache<Locale, Gaddag> {
+    private readonly directory;
+    constructor(directory?: string);
+    /**
+     * Returns undefined when the cached file cannot be deserialized (it was
+     * written by an app version with an incompatible format, or it is corrupted)
+     * so that callers re-download and re-serialize the dictionary.
+     */
+    get(locale: Locale): Promise<Gaddag | undefined>;
     getLastModifiedTimestamp(locale: Locale): number | undefined;
     has(locale: Locale): boolean;
     isStale(locale: Locale): boolean | undefined;
-    set(locale: Locale, trie: Trie): Promise<void>;
+    set(locale: Locale, gaddag: Gaddag): Promise<void>;
 }

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

@@ -4,22 +4,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiskCache = void 0;
-const trie_1 = require("@kamilmielnik/trie");
+const gaddag_1 = require("@kamilmielnik/gaddag");
+const logger_1 = require("@scrabble-solver/logger");
 const fs_1 = __importDefault(require("fs"));
 const constants_1 = require("../constants");
 const getDictionaryFilepath_1 = require("./getDictionaryFilepath");
 class DiskCache {
+    constructor(directory = constants_1.OUTPUT_DIRECTORY) {
+        this.directory = directory;
+    }
+    /**
+     * Returns undefined when the cached file cannot be deserialized (it was
+     * written by an app version with an incompatible format, or it is corrupted)
+     * so that callers re-download and re-serialize the dictionary.
+     */
     async get(locale) {
         if (!this.has(locale)) {
             return undefined;
         }
-        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale);
-        const serialized = await fs_1.default.promises.readFile(filepath, 'utf-8');
-        const trie = trie_1.Trie.deserialize(serialized);
-        return trie;
+        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale, this.directory);
+        try {
+            const serialized = await fs_1.default.promises.readFile(filepath);
+            return gaddag_1.Gaddag.deserialize(new Uint8Array(serialized.buffer, serialized.byteOffset, serialized.byteLength));
+        }
+        catch (error) {
+            logger_1.logger.warn('DiskCache - incompatible or corrupted dictionary file, it will be rebuilt', { error, locale });
+            await fs_1.default.promises.rm(filepath, { force: true });
+            return undefined;
+        }
     }
     getLastModifiedTimestamp(locale) {
-        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale);
+        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale, this.directory);
         if (!fs_1.default.existsSync(filepath)) {
             return undefined;
         }
@@ -27,7 +42,7 @@ class DiskCache {
         return stats.mtimeMs;
     }
     has(locale) {
-        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale);
+        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale, this.directory);
         return fs_1.default.existsSync(filepath);
     }
     isStale(locale) {
@@ -41,9 +56,11 @@ class DiskCache {
         const timeSinceModification = Math.abs(lastModifiedTimestamp - Date.now());
         return timeSinceModification > constants_1.CACHE_STALE_THRESHOLD;
     }
-    async set(locale, trie) {
-        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale);
-        await fs_1.default.promises.writeFile(filepath, trie.serialize());
+    async set(locale, gaddag) {
+        const filepath = (0, getDictionaryFilepath_1.getDictionaryFilepath)(locale, this.directory);
+        await fs_1.default.promises.writeFile(filepath, gaddag.serialize());
+        // Serialized-trie cache from before the GADDAG migration - remove this in #437
+        await fs_1.default.promises.rm((0, getDictionaryFilepath_1.getLegacyDictionaryFilepath)(locale, this.directory), { force: true });
     }
 }
 exports.DiskCache = DiskCache;

package/packages/dictionaries/build/lib/LayeredCache.d.ts

@@ -1,12 +1,12 @@
-import { type Trie } from '@kamilmielnik/trie';
+import { type Gaddag } from '@kamilmielnik/gaddag';
 import { type Locale } from '@scrabble-solver/types';
 import type { Cache } from '../types';
-export declare class LayeredCache implements Cache<Locale, Trie> {
+export declare class LayeredCache implements Cache<Locale, Gaddag> {
     private readonly layers;
-    get(locale: Locale): Promise<Trie | undefined>;
+    get(locale: Locale): Promise<Gaddag | undefined>;
     getLastModifiedTimestamp(locale: Locale): number | undefined;
     has(locale: Locale): boolean;
     isStale(locale: Locale): boolean | undefined;
-    set(locale: Locale, trie: Trie): Promise<void>;
+    set(locale: Locale, gaddag: Gaddag): Promise<void>;
     private getLastModifiedLayer;
 }

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

@@ -39,10 +39,10 @@ class LayeredCache {
         }
         return false;
     }
-    async set(locale, trie) {
+    async set(locale, gaddag) {
         const [memoryCache, diskCache] = this.layers;
-        await diskCache.set(locale, trie);
-        await memoryCache.set(locale, trie);
+        await diskCache.set(locale, gaddag);
+        await memoryCache.set(locale, gaddag);
     }
     getLastModifiedLayer(locale) {
         const layers = this.layers.filter((cache) => cache.has(locale));

package/packages/dictionaries/build/lib/MemoryCache.d.ts

@@ -1,12 +1,12 @@
-import { type Trie } from '@kamilmielnik/trie';
+import { type Gaddag } from '@kamilmielnik/gaddag';
 import { type Locale } from '@scrabble-solver/types';
 import type { Cache } from '../types';
-export declare class MemoryCache implements Cache<Locale, Trie> {
+export declare class MemoryCache implements Cache<Locale, Gaddag> {
     private readonly cache;
     private readonly cacheTimestamps;
-    get(locale: Locale): Promise<Trie | undefined>;
+    get(locale: Locale): Promise<Gaddag | undefined>;
     getLastModifiedTimestamp(locale: Locale): number | undefined;
     has(locale: Locale): boolean;
     isStale(locale: Locale): boolean | undefined;
-    set(locale: Locale, trie: Trie): Promise<void>;
+    set(locale: Locale, gaddag: Gaddag): Promise<void>;
 }

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

@@ -24,9 +24,9 @@ class MemoryCache {
         const timeSinceModification = Math.abs(timestamp - Date.now());
         return timeSinceModification > constants_1.CACHE_STALE_THRESHOLD;
     }
-    set(locale, trie) {
+    set(locale, gaddag) {
         this.cacheTimestamps[locale] = Date.now();
-        this.cache[locale] = trie;
+        this.cache[locale] = gaddag;
         return Promise.resolve();
     }
 }

package/packages/dictionaries/build/lib/createCacheTimestampComparator.d.ts

@@ -1,4 +1,4 @@
-import { type Trie } from '@kamilmielnik/trie';
+import { type Gaddag } from '@kamilmielnik/gaddag';
 import { type Locale } from '@scrabble-solver/types';
 import type { Cache } from '../types';
-export declare const createCacheTimestampComparator: (locale: Locale) => (a: Cache<Locale, Trie>, b: Cache<Locale, Trie>) => number;
+export declare const createCacheTimestampComparator: (locale: Locale) => (a: Cache<Locale, Gaddag>, b: Cache<Locale, Gaddag>) => number;

package/packages/dictionaries/build/lib/downloadDictionary.d.ts

@@ -1,3 +1,3 @@
-import { Trie } from '@kamilmielnik/trie';
+import { Gaddag } from '@kamilmielnik/gaddag';
 import { type Locale } from '@scrabble-solver/types';
-export declare const downloadDictionary: (locale: Locale) => Promise<Trie>;
+export declare const downloadDictionary: (locale: Locale) => Promise<Gaddag>;

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

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadDictionary = void 0;
-const trie_1 = require("@kamilmielnik/trie");
+const gaddag_1 = require("@kamilmielnik/gaddag");
 const logger_1 = require("@scrabble-solver/logger");
 const word_lists_1 = require("@scrabble-solver/word-lists");
 const downloadDictionary = async (locale) => {
     logger_1.logger.info('downloadDictionary', { locale });
     const words = await (0, word_lists_1.getWordList)(locale);
     logger_1.logger.info('downloadDictionary - success', { locale });
-    const trie = trie_1.Trie.fromArray(words);
-    return trie;
+    const gaddag = gaddag_1.Gaddag.fromArray(words);
+    logger_1.logger.info('downloadDictionary - gaddag built', { locale });
+    return gaddag;
 };
 exports.downloadDictionary = downloadDictionary;

package/packages/dictionaries/build/lib/getDictionaryFilepath.d.ts

@@ -1,2 +1,4 @@
 import { type Locale } from '@scrabble-solver/types';
-export declare const getDictionaryFilepath: (locale: Locale) => string;
+export declare const getDictionaryFilepath: (locale: Locale, directory?: string) => string;
+/** Filepath of the serialized-trie cache used before the GADDAG migration. Remove in #437. */
+export declare const getLegacyDictionaryFilepath: (locale: Locale, directory?: string) => string;

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

@@ -3,10 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDictionaryFilepath = void 0;
+exports.getLegacyDictionaryFilepath = exports.getDictionaryFilepath = void 0;
 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`);
+const getDictionaryFilepath = (locale, directory = constants_1.OUTPUT_DIRECTORY) => {
+    return path_1.default.resolve(directory, `${locale}.gaddag`);
 };
 exports.getDictionaryFilepath = getDictionaryFilepath;
+/** Filepath of the serialized-trie cache used before the GADDAG migration. Remove in #437. */
+const getLegacyDictionaryFilepath = (locale, directory = constants_1.OUTPUT_DIRECTORY) => {
+    return path_1.default.resolve(directory, `${locale}.txt`);
+};
+exports.getLegacyDictionaryFilepath = getLegacyDictionaryFilepath;

package/packages/dictionaries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/dictionaries",
-  "version": "2.16.6",
+  "version": "2.17.0",
   "description": "Scrabble Solver 2 - Dictionaries",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,16 +23,17 @@
   },
   "homepage": "https://scrabble-solver.org",
   "scripts": {
-    "build": "tsgo --project .",
+    "build": "tsc --project .",
     "clean": "rimraf build/",
     "clean:dictionaries": "node ./bin/remove-dictionaries.js",
-    "postbuild": "node ./bin/update-dictionaries.js"
+    "postbuild": "node ./bin/update-dictionaries.js",
+    "test": "bun test src"
   },
   "dependencies": {
-    "@kamilmielnik/trie": "^5.0.0",
-    "@scrabble-solver/logger": "^2.16.6",
-    "@scrabble-solver/types": "^2.16.6",
-    "@scrabble-solver/word-lists": "^2.16.6"
+    "@kamilmielnik/gaddag": "^2.0.0",
+    "@scrabble-solver/logger": "^2.17.0",
+    "@scrabble-solver/types": "^2.17.0",
+    "@scrabble-solver/word-lists": "^2.17.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }