scrabble-solver 2.16.7 → 2.17.0

package/packages/solver/build/index.d.ts

@@ -1,14 +1 @@
-export { areDigraphsValid } from './areDigraphsValid';
-export { fillPattern } from './fillPattern';
-export { generateEndIndices } from './generateEndIndices';
-export { generateHorizontalPatterns } from './generateHorizontalPatterns';
-export { generatePattern } from './generatePattern';
-export { generatePatterns } from './generatePatterns';
-export { generateStartIndices } from './generateStartIndices';
-export { generateVectors } from './generateVectors';
-export { generateVerticalPatterns } from './generateVerticalPatterns';
-export { getCellsScore } from './getCellsScore';
-export { getPatternHash } from './getPatternHash';
-export { getPatternScore } from './getPatternScore';
-export { getUniquePatterns } from './getUniquePatterns';
 export { solve } from './solve';

package/packages/solver/build/index.js

@@ -1,31 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solve = exports.getUniquePatterns = exports.getPatternScore = exports.getPatternHash = exports.getCellsScore = exports.generateVerticalPatterns = exports.generateVectors = exports.generateStartIndices = exports.generatePatterns = exports.generatePattern = exports.generateHorizontalPatterns = exports.generateEndIndices = exports.fillPattern = exports.areDigraphsValid = void 0;
-var areDigraphsValid_1 = require("./areDigraphsValid");
-Object.defineProperty(exports, "areDigraphsValid", { enumerable: true, get: function () { return areDigraphsValid_1.areDigraphsValid; } });
-var fillPattern_1 = require("./fillPattern");
-Object.defineProperty(exports, "fillPattern", { enumerable: true, get: function () { return fillPattern_1.fillPattern; } });
-var generateEndIndices_1 = require("./generateEndIndices");
-Object.defineProperty(exports, "generateEndIndices", { enumerable: true, get: function () { return generateEndIndices_1.generateEndIndices; } });
-var generateHorizontalPatterns_1 = require("./generateHorizontalPatterns");
-Object.defineProperty(exports, "generateHorizontalPatterns", { enumerable: true, get: function () { return generateHorizontalPatterns_1.generateHorizontalPatterns; } });
-var generatePattern_1 = require("./generatePattern");
-Object.defineProperty(exports, "generatePattern", { enumerable: true, get: function () { return generatePattern_1.generatePattern; } });
-var generatePatterns_1 = require("./generatePatterns");
-Object.defineProperty(exports, "generatePatterns", { enumerable: true, get: function () { return generatePatterns_1.generatePatterns; } });
-var generateStartIndices_1 = require("./generateStartIndices");
-Object.defineProperty(exports, "generateStartIndices", { enumerable: true, get: function () { return generateStartIndices_1.generateStartIndices; } });
-var generateVectors_1 = require("./generateVectors");
-Object.defineProperty(exports, "generateVectors", { enumerable: true, get: function () { return generateVectors_1.generateVectors; } });
-var generateVerticalPatterns_1 = require("./generateVerticalPatterns");
-Object.defineProperty(exports, "generateVerticalPatterns", { enumerable: true, get: function () { return generateVerticalPatterns_1.generateVerticalPatterns; } });
-var getCellsScore_1 = require("./getCellsScore");
-Object.defineProperty(exports, "getCellsScore", { enumerable: true, get: function () { return getCellsScore_1.getCellsScore; } });
-var getPatternHash_1 = require("./getPatternHash");
-Object.defineProperty(exports, "getPatternHash", { enumerable: true, get: function () { return getPatternHash_1.getPatternHash; } });
-var getPatternScore_1 = require("./getPatternScore");
-Object.defineProperty(exports, "getPatternScore", { enumerable: true, get: function () { return getPatternScore_1.getPatternScore; } });
-var getUniquePatterns_1 = require("./getUniquePatterns");
-Object.defineProperty(exports, "getUniquePatterns", { enumerable: true, get: function () { return getUniquePatterns_1.getUniquePatterns; } });
+exports.solve = void 0;
 var solve_1 = require("./solve");
 Object.defineProperty(exports, "solve", { enumerable: true, get: function () { return solve_1.solve; } });

package/packages/solver/build/solve.d.ts

@@ -1,3 +1,3 @@
-import { type Trie } from '@kamilmielnik/trie';
+import { type Gaddag } from '@kamilmielnik/gaddag';
 import { type Board, type Config, type ResultJson, type Tile } from '@scrabble-solver/types';
-export declare const solve: (trie: Trie, config: Config, board: Board, tiles: Tile[]) => ResultJson[];
+export declare const solve: (gaddag: Gaddag, config: Config, board: Board, tiles: Tile[]) => ResultJson[];

package/packages/solver/build/solve.js

@@ -1,24 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.solve = void 0;
-const areDigraphsValid_1 = require("./areDigraphsValid");
-const fillPattern_1 = require("./fillPattern");
-const generatePatterns_1 = require("./generatePatterns");
-const getPatternScore_1 = require("./getPatternScore");
-const getUniquePatterns_1 = require("./getUniquePatterns");
-const solve = (trie, config, board, tiles) => {
-    const patterns = (0, generatePatterns_1.generatePatterns)(config, board);
-    const filledPatterns = patterns.flatMap((pattern) => (0, fillPattern_1.fillPattern)(trie, config, pattern, tiles));
-    const validPatterns = config.twoCharacterTiles.length > 0
-        ? filledPatterns.filter((pattern) => (0, areDigraphsValid_1.areDigraphsValid)(config, pattern))
-        : filledPatterns;
-    const uniquePatterns = (0, getUniquePatterns_1.getUniquePatterns)(validPatterns);
-    const results = uniquePatterns.map((pattern, index) => ({
-        cells: pattern.cells.map((cell) => cell.toJson()),
-        collisions: pattern.getCollisions().map((collision) => collision.cells.map((cell) => cell.toJson())),
-        id: index,
-        points: (0, getPatternScore_1.getPatternScore)(config, pattern),
-    }));
-    return results;
+const MoveGenerator_1 = require("./MoveGenerator");
+const solve = (gaddag, config, board, tiles) => {
+    return new MoveGenerator_1.MoveGenerator(gaddag, config, board, tiles).run();
 };
 exports.solve = solve;

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.16.7",
+  "version": "2.17.0",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -19,18 +19,19 @@
   },
   "homepage": "https://scrabble-solver.org",
   "scripts": {
+    "benchmark": "bun benchmarks/index.ts",
     "build": "tsc --project .",
     "clean": "rimraf build/",
     "test": "bun test --timeout 180000 src"
   },
   "dependencies": {
-    "@kamilmielnik/trie": "^5.1.0",
-    "@scrabble-solver/types": "^2.16.7"
+    "@kamilmielnik/gaddag": "^2.0.0",
+    "@scrabble-solver/types": "^2.17.0"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.16.7",
-    "@scrabble-solver/constants": "^2.16.7",
-    "@scrabble-solver/dictionaries": "^2.16.7"
+    "@scrabble-solver/configs": "^2.17.0",
+    "@scrabble-solver/constants": "^2.17.0",
+    "@scrabble-solver/dictionaries": "^2.17.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }