scrabble-solver 2.8.6 → 2.8.7

package/packages/scrabble-solver/src/pages/index.tsx

@@ -74,8 +74,10 @@ const Index: FunctionComponent<Props> = ({ version }) => {
     <>
       <div className={classNames(styles.index, { [styles.initialized]: isInitialized })}>
         <div className={styles.nav}>
-          <div className={styles.logoContainer}>
-            <Logo className={styles.logo} />
+          <div className={styles.navLogo}>
+            <a className={styles.logoContainer} href="/" title={version}>
+              <Logo className={styles.logo} />
+            </a>
           </div>
 
           <NavButtons
@@ -114,8 +116,6 @@ const Index: FunctionComponent<Props> = ({ version }) => {
           <Rack className={styles.rack} />
           <input className={styles.submitInput} tabIndex={-1} type="submit" />
         </form>
-
-        <span className={styles.version}>v{version}</span>
       </div>
 
       <Settings isOpen={showSettings} onClose={() => setShowSettings(false)} />
@@ -138,7 +138,7 @@ const readVersion = async (): Promise<string> => {
   const packageJsonFilepath = path.resolve(process.cwd(), 'package.json');
   const data = await fs.promises.readFile(packageJsonFilepath, 'utf-8');
   const packageJson = JSON.parse(data);
-  return packageJson.version;
+  return `v${packageJson.version}`;
 };
 
 export default Index;

package/packages/scrabble-solver/src/sdk/{findWordDefinition.ts → findWordDefinitions.ts}

@@ -1,9 +1,9 @@
 import { Locale, WordDefinition } from '@scrabble-solver/types';
 
-const findWordDefinition = async (locale: Locale, word: string): Promise<WordDefinition> => {
+const findWordDefinitions = async (locale: Locale, word: string): Promise<WordDefinition[]> => {
   const url = `/api/dictionary/${locale}/${word}`;
   const json = await fetch(url).then((response) => response.json());
-  return WordDefinition.fromJson(json);
+  return json.map(WordDefinition.fromJson);
 };
 
-export default findWordDefinition;
+export default findWordDefinitions;

package/packages/scrabble-solver/src/sdk/index.ts

@@ -1,3 +1,3 @@
-export { default as findWordDefinition } from './findWordDefinition';
+export { default as findWordDefinitions } from './findWordDefinitions';
 export { default as solve } from './solve';
 export { default as visit } from './visit';

package/packages/scrabble-solver/src/state/sagas.ts

@@ -3,7 +3,7 @@ import { Result } from '@scrabble-solver/types';
 import { call, delay, put, select, takeEvery, takeLatest } from 'redux-saga/effects';
 
 import { memoize } from 'lib';
-import { findWordDefinition, solve, visit } from 'sdk';
+import { findWordDefinitions, solve, visit } from 'sdk';
 
 import { initialize, reset } from './actions';
 import {
@@ -18,7 +18,7 @@ import { boardSlice, dictionarySlice, rackSlice, resultsSlice, settingsSlice, so
 
 const SUBMIT_DELAY = 150;
 
-const memoizedFindWordDefinition = memoize(findWordDefinition);
+const memoizedFindWordDefinitions = memoize(findWordDefinitions);
 
 // Can't conveniently type generators for sagas yet,
 // see: https://github.com/microsoft/TypeScript/issues/43632
@@ -53,13 +53,13 @@ function* onDictionarySubmit(): AnyGenerator {
   const { input: word } = yield select(selectDictionary);
   const locale = yield select(selectLocale);
 
-  if (!memoizedFindWordDefinition.hasCache(locale, word)) {
+  if (!memoizedFindWordDefinitions.hasCache(locale, word)) {
     yield delay(SUBMIT_DELAY);
   }
 
   try {
-    const wordDefinition = yield call(memoizedFindWordDefinition, locale, word);
-    yield put(dictionarySlice.actions.submitSuccess(wordDefinition));
+    const wordDefinitions = yield call(memoizedFindWordDefinitions, locale, word);
+    yield put(dictionarySlice.actions.submitSuccess(wordDefinitions));
   } catch (error) {
     yield put(dictionarySlice.actions.submitFailure());
   }
@@ -85,7 +85,7 @@ function* onLocaleChange(): AnyGenerator {
 
 function* onResultCandidateChange({ payload: result }: PayloadAction<Result | null>): AnyGenerator {
   if (result) {
-    yield put(dictionarySlice.actions.changeInput(result.word));
+    yield put(dictionarySlice.actions.changeInput(result.words.join(', ')));
     yield put(dictionarySlice.actions.submit());
   }
 }
@@ -121,12 +121,12 @@ function* ensureProperTilesCount(): AnyGenerator {
   const { config } = yield select(selectConfig);
   const characters = yield select(selectCharacters);
 
-  if (config.maximumNumberOfCharacters > characters.length) {
-    const differenceCount = Math.abs(config.maximumNumberOfCharacters - characters.length);
+  if (config.maximumCharactersCount > characters.length) {
+    const differenceCount = Math.abs(config.maximumCharactersCount - characters.length);
     yield put(rackSlice.actions.init([...characters, ...Array(differenceCount).fill(null)]));
-  } else if (config.maximumNumberOfCharacters < characters.length) {
-    const nonNulls = characters.filter(Boolean).slice(0, config.maximumNumberOfCharacters);
-    const differenceCount = Math.abs(config.maximumNumberOfCharacters - nonNulls.length);
+  } else if (config.maximumCharactersCount < characters.length) {
+    const nonNulls = characters.filter(Boolean).slice(0, config.maximumCharactersCount);
+    const differenceCount = Math.abs(config.maximumCharactersCount - nonNulls.length);
     const autoGroupTiles = yield select(selectAutoGroupTiles);
     yield put(rackSlice.actions.init([...nonNulls, ...Array(differenceCount).fill(null)]));
     yield put(rackSlice.actions.groupTiles(autoGroupTiles));

package/packages/scrabble-solver/src/state/selectors.ts

@@ -59,8 +59,12 @@ export const selectSortedFilteredResults = createSelector(
     }
 
     return results.filter((result) => {
-      const regExp = new RegExp(query, 'gi');
-      return regExp.test(result.word);
+      try {
+        const regExp = new RegExp(query, 'gi');
+        return regExp.test(result.word);
+      } catch {
+        return false;
+      }
     });
   },
 );

package/packages/scrabble-solver/src/state/slices/dictionaryInitialState.ts

@@ -1,9 +1,9 @@
+import { WordDefinition } from '@scrabble-solver/types';
+
 const dictionaryInitialState = {
-  definitions: [] as string[],
   input: '',
-  isAllowed: null as boolean | null,
   isLoading: false,
-  word: undefined as string | undefined,
+  results: [] as WordDefinition[],
 };
 
 export default dictionaryInitialState;

package/packages/scrabble-solver/src/state/slices/dictionarySlice.ts

@@ -16,30 +16,24 @@ const dictionarySlice = createSlice({
     submit: (state) => {
       return {
         ...state,
-        definitions: dictionaryInitialState.definitions,
-        isAllowed: dictionaryInitialState.isAllowed,
         isLoading: true,
-        word: dictionaryInitialState.word,
+        results: dictionaryInitialState.results,
       };
     },
 
     submitFailure: (state) => {
       return {
         ...state,
-        definitions: dictionaryInitialState.definitions,
-        isAllowed: false,
         isLoading: false,
-        word: state.input,
+        results: dictionaryInitialState.results,
       };
     },
 
-    submitSuccess: (state, action: PayloadAction<WordDefinition>) => {
+    submitSuccess: (state, action: PayloadAction<WordDefinition[]>) => {
       return {
         ...state,
-        definitions: action.payload.definitions,
-        isAllowed: action.payload.isAllowed,
         isLoading: false,
-        word: action.payload.word,
+        results: action.payload,
       };
     },
   },

package/packages/solver/build/PatternsFiller.js

@@ -9,7 +9,7 @@ class PatternsFiller {
     }
     fill(pattern, tiles) {
         const patterns = [];
-        if (pattern.getNumberOfEmptyCells() > tiles.length) {
+        if (pattern.getEmptyCellsCount() > tiles.length) {
             return [];
         }
         const onPatternFound = (newPattern) => patterns.push(newPattern);

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

@@ -5,18 +5,18 @@ declare class PatternsGenerator {
     generate(board: Board): Pattern[];
     generateHorizontal(board: Board): HorizontalPattern[];
     generateVertical(board: Board): VerticalPattern[];
-    generatePatterns<P extends Pattern>({ board, getNthVector, numberOfVectors, PatternModel, }: {
+    generatePatterns<P extends Pattern>({ board, getNthVector, vectorsCount, PatternModel, }: {
         board: Board;
         getNthVector: (index: number) => Cell[];
-        numberOfVectors: number;
         PatternModel: new (parameters: {
             board: Board;
             cells: Cell[];
         }) => P;
+        vectorsCount: number;
     }): P[];
-    generateVectors({ getNthVector, numberOfVectors, }: {
+    generateVectors({ getNthVector, vectorsCount, }: {
         getNthVector: (index: number) => Cell[];
-        numberOfVectors: number;
+        vectorsCount: number;
     }): Cell[][];
     generateCellsPatterns<P extends Pattern>({ board, cells, PatternModel, }: {
         board: Board;

package/packages/solver/build/PatternsGenerator.js

@@ -12,25 +12,25 @@ class PatternsGenerator {
         return this.generatePatterns({
             board,
             getNthVector: (index) => board.getRow(index),
-            numberOfVectors: this.config.boardHeight,
             PatternModel: types_1.HorizontalPattern,
+            vectorsCount: this.config.boardHeight,
         });
     }
     generateVertical(board) {
         return this.generatePatterns({
             board,
             getNthVector: (index) => board.getColumn(index),
-            numberOfVectors: this.config.boardWidth,
             PatternModel: types_1.VerticalPattern,
+            vectorsCount: this.config.boardWidth,
         });
     }
-    generatePatterns({ board, getNthVector, numberOfVectors, PatternModel, }) {
-        return this.generateVectors({ getNthVector, numberOfVectors }).reduce((patterns, cells) => {
+    generatePatterns({ board, getNthVector, vectorsCount, PatternModel, }) {
+        return this.generateVectors({ getNthVector, vectorsCount }).reduce((patterns, cells) => {
             return patterns.concat(this.generateCellsPatterns({ board, PatternModel, cells }));
         }, []);
     }
-    generateVectors({ getNthVector, numberOfVectors, }) {
-        return Array(numberOfVectors)
+    generateVectors({ getNthVector, vectorsCount, }) {
+        return Array(vectorsCount)
             .fill(0)
             .map((_, index) => getNthVector(index));
     }

package/packages/solver/build/ScoresCalculator.js

@@ -18,7 +18,7 @@ class ScoresCalculator {
         return this.calculatePatternScoreWithCollisions(pattern) + this.calculateBonusScore(pattern);
     }
     calculateBonusScore(pattern) {
-        const areAllTilesUsed = pattern.getNumberOfEmptyCells() === this.config.maximumNumberOfCharacters;
+        const areAllTilesUsed = pattern.getEmptyCellsCount() === this.config.maximumCharactersCount;
         return areAllTilesUsed ? this.config.allTilesBonusScore : 0;
     }
     calculatePatternScoreWithCollisions(pattern) {

package/packages/solver/build/Solver.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
-const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
+const getUniquePatterns_1 = __importDefault(require("./getUniquePatterns"));
 const PatternsFiller_1 = __importDefault(require("./PatternsFiller"));
 const PatternsGenerator_1 = __importDefault(require("./PatternsGenerator"));
 const ScoresCalculator_1 = __importDefault(require("./ScoresCalculator"));
@@ -17,11 +17,11 @@ class Solver {
     solve(board, tiles) {
         const patterns = this.patternsGenerator.generate(board);
         const filledPatterns = patterns.flatMap((pattern) => this.patternsFiller.fill(pattern, tiles));
-        const uniquePatterns = (0, uniqBy_1.default)(filledPatterns, (pattern) => JSON.stringify(pattern.toJson()));
+        const uniquePatterns = (0, getUniquePatterns_1.default)(filledPatterns);
         const results = uniquePatterns.map((pattern, index) => new types_1.Result({
             cells: pattern.cells,
+            collisions: pattern.getCollisions().map((collision) => collision.cells),
             id: index,
-            numberOfCollisions: pattern.getCollisions().length,
             points: this.scoresCalculator.calculate(pattern),
         }));
         return results;

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

@@ -0,0 +1,3 @@
+import { Pattern } from '@scrabble-solver/types';
+declare const getUniquePatterns: (patterns: Pattern[]) => Pattern[];
+export default getUniquePatterns;

package/packages/solver/build/getUniquePatterns.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const getPatternHash = (pattern) => {
+    return pattern.cells
+        .map((cell) => {
+        const blank = cell.tile.isBlank ? '!' : '';
+        const tile = cell.tile.character + blank;
+        // eslint-disable-next-line prefer-template
+        return cell.x + ',' + cell.y + ',' + tile;
+    })
+        .join('-');
+};
+const getUniquePatterns = (patterns) => {
+    const hashes = new Set();
+    const uniquePatterns = [];
+    for (const pattern of patterns) {
+        const hash = getPatternHash(pattern);
+        if (!hashes.has(hash)) {
+            hashes.add(hash);
+            uniquePatterns.push(pattern);
+        }
+    }
+    return uniquePatterns;
+};
+exports.default = getUniquePatterns;

package/packages/solver/package-lock.json

@@ -1,19 +1,15 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.8.6",
+      "version": "2.8.7",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
-        "@kamilmielnik/trie": "^2.0.0",
-        "lodash": "^4.17.21"
-      },
-      "devDependencies": {
-        "@types/lodash": "^4.14.186"
+        "@kamilmielnik/trie": "^2.0.0"
       }
     },
     "node_modules/@kamilmielnik/trie": {
@@ -23,17 +19,6 @@
       "engines": {
         "node": ">=16"
       }
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.186",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-      "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
-      "dev": true
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     }
   },
   "dependencies": {
@@ -41,17 +26,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@kamilmielnik/trie/-/trie-2.0.0.tgz",
       "integrity": "sha512-YWTYtrV97bQ5hRifG1FImP47PI400a56O8+oQClQOtDjY3tioxab4sOgFHckiDdswciN1RwngCZ9Kv3phJfSuA=="
-    },
-    "@types/lodash": {
-      "version": "4.14.186",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-      "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
-      "dev": true
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     }
   }
 }

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -25,14 +25,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^2.0.0",
-    "@scrabble-solver/types": "^2.8.6",
-    "lodash": "^4.17.21"
+    "@scrabble-solver/types": "^2.8.7"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.8.6",
-    "@scrabble-solver/constants": "^2.8.6",
-    "@scrabble-solver/dictionaries": "^2.8.6",
-    "@types/lodash": "^4.14.186"
+    "@scrabble-solver/configs": "^2.8.7",
+    "@scrabble-solver/constants": "^2.8.7",
+    "@scrabble-solver/dictionaries": "^2.8.7"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/solver/src/PatternsFiller.ts

@@ -15,7 +15,7 @@ class PatternsFiller {
   public fill(pattern: Pattern, tiles: Tile[]): Pattern[] {
     const patterns: Pattern[] = [];
 
-    if (pattern.getNumberOfEmptyCells() > tiles.length) {
+    if (pattern.getEmptyCellsCount() > tiles.length) {
       return [];
     }
 

package/packages/solver/src/PatternsGenerator.test.ts

@@ -8,7 +8,7 @@ const board = Board.fromStringArray([' t ', 'do ', '   ']);
 const patternsGenerator = new PatternsGenerator({
   boardHeight: 3,
   boardWidth: 3,
-  maximumNumberOfCharacters: 7,
+  maximumCharactersCount: 7,
 } as Config);
 
 describe('PatternsGenerator', () => {
@@ -45,7 +45,7 @@ describe('PatternsGenerator', () => {
   it('generates vectors', () => {
     const vectors = patternsGenerator.generateVectors({
       getNthVector: () => [],
-      numberOfVectors: 3,
+      vectorsCount: 3,
     });
     expect(vectors.length).toBe(3);
     expect(vectors).toEqual([[], [], []]);

package/packages/solver/src/PatternsGenerator.ts

@@ -15,8 +15,8 @@ class PatternsGenerator {
     return this.generatePatterns({
       board,
       getNthVector: (index) => board.getRow(index),
-      numberOfVectors: this.config.boardHeight,
       PatternModel: HorizontalPattern,
+      vectorsCount: this.config.boardHeight,
     });
   }
 
@@ -24,35 +24,35 @@ class PatternsGenerator {
     return this.generatePatterns({
       board,
       getNthVector: (index) => board.getColumn(index),
-      numberOfVectors: this.config.boardWidth,
       PatternModel: VerticalPattern,
+      vectorsCount: this.config.boardWidth,
     });
   }
 
   public generatePatterns<P extends Pattern>({
     board,
     getNthVector,
-    numberOfVectors,
+    vectorsCount,
     PatternModel,
   }: {
     board: Board;
     getNthVector: (index: number) => Cell[];
-    numberOfVectors: number;
     PatternModel: new (parameters: { board: Board; cells: Cell[] }) => P;
+    vectorsCount: number;
   }): P[] {
-    return this.generateVectors({ getNthVector, numberOfVectors }).reduce<P[]>((patterns, cells) => {
+    return this.generateVectors({ getNthVector, vectorsCount }).reduce<P[]>((patterns, cells) => {
       return patterns.concat(this.generateCellsPatterns<P>({ board, PatternModel, cells }));
     }, []);
   }
 
   public generateVectors({
     getNthVector,
-    numberOfVectors,
+    vectorsCount,
   }: {
     getNthVector: (index: number) => Cell[];
-    numberOfVectors: number;
+    vectorsCount: number;
   }): Cell[][] {
-    return Array(numberOfVectors)
+    return Array(vectorsCount)
       .fill(0)
       .map((_, index) => getNthVector(index));
   }

package/packages/solver/src/ScoresCalculator.ts

@@ -13,7 +13,7 @@ class ScoresCalculator {
   }
 
   public calculateBonusScore(pattern: Pattern): number {
-    const areAllTilesUsed = pattern.getNumberOfEmptyCells() === this.config.maximumNumberOfCharacters;
+    const areAllTilesUsed = pattern.getEmptyCellsCount() === this.config.maximumCharactersCount;
     return areAllTilesUsed ? this.config.allTilesBonusScore : 0;
   }
 

package/packages/solver/src/Solver.ts

@@ -1,7 +1,7 @@
 import { Trie } from '@kamilmielnik/trie';
 import { Board, Config, Result, Tile } from '@scrabble-solver/types';
-import uniqBy from 'lodash/uniqBy';
 
+import getUniquePatterns from './getUniquePatterns';
 import PatternsFiller from './PatternsFiller';
 import PatternsGenerator from './PatternsGenerator';
 import ScoresCalculator from './ScoresCalculator';
@@ -22,13 +22,13 @@ class Solver {
   public solve(board: Board, tiles: Tile[]): Result[] {
     const patterns = this.patternsGenerator.generate(board);
     const filledPatterns = patterns.flatMap((pattern) => this.patternsFiller.fill(pattern, tiles));
-    const uniquePatterns = uniqBy(filledPatterns, (pattern) => JSON.stringify(pattern.toJson()));
+    const uniquePatterns = getUniquePatterns(filledPatterns);
     const results = uniquePatterns.map(
       (pattern, index) =>
         new Result({
           cells: pattern.cells,
+          collisions: pattern.getCollisions().map((collision) => collision.cells),
           id: index,
-          numberOfCollisions: pattern.getCollisions().length,
           points: this.scoresCalculator.calculate(pattern),
         }),
     );

package/packages/solver/src/getUniquePatterns.ts

@@ -0,0 +1,30 @@
+import { Pattern } from '@scrabble-solver/types';
+
+const getPatternHash = (pattern: Pattern): string => {
+  return pattern.cells
+    .map((cell) => {
+      const blank = cell.tile.isBlank ? '!' : '';
+      const tile = cell.tile.character + blank;
+      // eslint-disable-next-line prefer-template
+      return cell.x + ',' + cell.y + ',' + tile;
+    })
+    .join('-');
+};
+
+const getUniquePatterns = (patterns: Pattern[]): Pattern[] => {
+  const hashes = new Set<string>();
+  const uniquePatterns: Pattern[] = [];
+
+  for (const pattern of patterns) {
+    const hash = getPatternHash(pattern);
+
+    if (!hashes.has(hash)) {
+      hashes.add(hash);
+      uniquePatterns.push(pattern);
+    }
+  }
+
+  return uniquePatterns;
+};
+
+export default getUniquePatterns;

package/packages/types/build/Board.d.ts

@@ -4,9 +4,9 @@ declare class Board {
     static create(width: number, height: number): Board;
     static fromJson(json: BoardJson): Board;
     static fromStringArray(stringArray: string[]): Board;
+    readonly columnsCount: number;
     readonly rows: Cell[][];
-    readonly numberOfColumns: number;
-    readonly numberOfRows: number;
+    readonly rowsCount: number;
     constructor({ rows }: {
         rows: Cell[][];
     });

package/packages/types/build/Board.js

@@ -9,8 +9,8 @@ const Tile_1 = __importDefault(require("./Tile"));
 class Board {
     constructor({ rows }) {
         this.rows = rows;
-        this.numberOfColumns = rows[0].length;
-        this.numberOfRows = rows.length;
+        this.columnsCount = rows[0].length;
+        this.rowsCount = rows.length;
     }
     static create(width, height) {
         return Board.fromStringArray(Array(height).fill(Array(width).fill(' ').join('')));
@@ -31,8 +31,8 @@ class Board {
         });
     }
     get center() {
-        const x = Math.floor(this.numberOfColumns / 2);
-        const y = Math.floor(this.numberOfRows / 2);
+        const x = Math.floor(this.columnsCount / 2);
+        const y = Math.floor(this.rowsCount / 2);
         return this.rows[y][x];
     }
     clone() {
@@ -43,20 +43,20 @@ class Board {
         return this.collidesUp(cell) || this.collidesDown(cell) || this.collidesLeft(cell) || this.collidesRight(cell);
     }
     collidesDown({ x, y }) {
-        return y < this.numberOfRows - 1 && !this.rows[y + 1][x].isEmpty;
+        return y < this.rowsCount - 1 && !this.rows[y + 1][x].isEmpty;
     }
     collidesLeft({ x, y }) {
         return x > 0 && !this.rows[y][x - 1].isEmpty;
     }
     collidesRight({ x, y }) {
-        return x < this.numberOfColumns - 1 && !this.rows[y][x + 1].isEmpty;
+        return x < this.columnsCount - 1 && !this.rows[y][x + 1].isEmpty;
     }
     collidesUp({ x, y }) {
         return y > 0 && !this.rows[y - 1][x].isEmpty;
     }
     equals(other) {
-        return (this.numberOfColumns === other.numberOfColumns &&
-            this.numberOfRows === other.numberOfRows &&
+        return (this.columnsCount === other.columnsCount &&
+            this.rowsCount === other.rowsCount &&
             this.rows.every((row, rowIndex) => {
                 return row.every((cell, cellIndex) => {
                     return cell.equals(other.rows[rowIndex][cellIndex]);

package/packages/types/build/BoardJson.d.ts

@@ -1,3 +1,4 @@
 import CellJson from './CellJson';
-declare type BoardJson = (CellJson | null)[][];
+declare type BoardJson = CellJson[][];
+export declare const isBoardJson: (value: unknown) => value is BoardJson;
 export default BoardJson;

package/packages/types/build/BoardJson.js

@@ -1,2 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBoardJson = void 0;
+const CellJson_1 = require("./CellJson");
+const isBoardJson = (value) => {
+    if (!Array.isArray(value)) {
+        return false;
+    }
+    for (const row of value) {
+        if (!Array.isArray(value)) {
+            return false;
+        }
+        for (const cell of row) {
+            if (!(0, CellJson_1.isCellJson)(cell)) {
+                return false;
+            }
+        }
+    }
+    return true;
+};
+exports.isBoardJson = isBoardJson;

package/packages/types/build/Cell.d.ts

@@ -1,8 +1,7 @@
 import CellJson from './CellJson';
 import Tile from './Tile';
 declare class Cell {
-    static fromJson(json: CellJson | null): Cell;
-    static readonly Null: Cell;
+    static fromJson(json: CellJson): Cell;
     readonly isEmpty: boolean;
     tile: Tile;
     readonly x: number;
@@ -17,7 +16,7 @@ declare class Cell {
     equals(other: Cell): boolean;
     hasTile(): boolean;
     isCandidate(): boolean;
-    toJson(): CellJson | null;
+    toJson(): CellJson;
     toString(): string;
 }
 export default Cell;