scrabble-solver 2.15.9 → 2.15.10

package/packages/types/src/CharacterBonus.ts

@@ -1,11 +1,11 @@
 import { BONUS_CHARACTER } from '@scrabble-solver/constants';
 
-import Bonus from './Bonus';
-import BonusValue from './BonusValue';
-import Cell from './Cell';
-import type Config from './Config';
+import { Bonus } from './Bonus';
+import { BonusValue } from './BonusValue';
+import { Cell } from './Cell';
+import { type Config } from './Config';
 
-class CharacterBonus extends Bonus {
+export class CharacterBonus extends Bonus {
   public readonly type = BONUS_CHARACTER;
 
   public canApply(config: Config, cell: Cell): boolean {
@@ -27,5 +27,3 @@ class CharacterBonus extends Bonus {
     };
   }
 }
-
-export default CharacterBonus;

package/packages/types/src/Collision.ts

@@ -1,5 +1,3 @@
-import Cell from './Cell';
+import { Cell } from './Cell';
 
-type Collision = Cell[];
-
-export default Collision;
+export type Collision = Cell[];

package/packages/types/src/CollisionJson.ts

@@ -1,5 +1,3 @@
-import CellJson from './CellJson';
+import { CellJson } from './CellJson';
 
-type CollisionJson = CellJson[];
-
-export default CollisionJson;
+export type CollisionJson = CellJson[];

package/packages/types/src/Config.ts

@@ -1,20 +1,20 @@
 import { BLANK, BONUS_CHARACTER, BONUS_WORD, NO_BONUS } from '@scrabble-solver/constants';
 
-import Bonus from './Bonus';
-import BonusValue from './BonusValue';
-import Cell from './Cell';
-import CharacterBonus from './CharacterBonus';
-import ConfigJson from './ConfigJson';
-import Game from './Game';
-import Locale from './Locale';
-import Tile from './Tile';
-import TileConfig from './TileConfig';
-import WordBonus from './WordBonus';
-
-class Config {
-  public static fromJson(json: ConfigJson): Config {
+import { Bonus } from './Bonus';
+import { BonusValue } from './BonusValue';
+import { Cell } from './Cell';
+import { CharacterBonus } from './CharacterBonus';
+import { ConfigJson } from './ConfigJson';
+import { Game } from './Game';
+import { Locale } from './Locale';
+import { Tile } from './Tile';
+import { TileConfig } from './TileConfig';
+import { WordBonus } from './WordBonus';
+
+export class Config {
+  public static fromJson = (json: ConfigJson): Config => {
     return new Config(json);
-  }
+  };
 
   public readonly bonuses: Bonus[];
 
@@ -44,8 +44,12 @@ class Config {
     return this.config.blanksCount;
   }
 
-  public get boardSize(): number {
-    return this.config.boardSize;
+  public get boardHeight(): number {
+    return this.config.boardHeight;
+  }
+
+  public get boardWidth(): number {
+    return this.config.boardWidth;
   }
 
   public get game(): Game {
@@ -141,5 +145,3 @@ const getPointsMap = (config: ConfigJson): Record<string, number> =>
     }),
     {},
   );
-
-export default Config;

package/packages/types/src/ConfigJson.ts

@@ -1,13 +1,14 @@
-import BonusJson from './BonusJson';
-import Game from './Game';
-import Locale from './Locale';
-import TileConfig from './TileConfig';
+import { BonusJson } from './BonusJson';
+import { Game } from './Game';
+import { Locale } from './Locale';
+import { TileConfig } from './TileConfig';
 
-interface ConfigJson {
+export interface ConfigJson {
   bingoScore: number;
   blankScore: number;
   blanksCount: number;
-  boardSize: number;
+  boardHeight: number;
+  boardWidth: number;
   bonuses: BonusJson[];
   game: Game;
   locale: Locale;
@@ -15,5 +16,3 @@ interface ConfigJson {
   rackSize: number;
   tiles: TileConfig[];
 }
-
-export default ConfigJson;

package/packages/types/src/Dictionary.ts

@@ -1,9 +1,7 @@
-import Locale from './Locale';
+import { Locale } from './Locale';
 
-interface Dictionary {
+export interface Dictionary {
   description: string;
   locale: Locale;
   name: string;
 }
-
-export default Dictionary;

package/packages/types/src/FinalPattern.ts

@@ -1,6 +1,6 @@
-import Pattern from './Pattern';
+import { Pattern } from './Pattern';
 
-class FinalPattern extends Pattern {
+export class FinalPattern extends Pattern {
   private readonly collisions: Pattern[];
 
   constructor(pattern: Pattern) {
@@ -12,5 +12,3 @@ class FinalPattern extends Pattern {
     return this.collisions;
   }
 }
-
-export default FinalPattern;

package/packages/types/src/Game.ts

@@ -1,12 +1,11 @@
-enum Game {
+export enum Game {
   Kelimelik = 'kelimelik',
   Literaki = 'literaki',
   Scrabble = 'scrabble',
+  ScrabbleDuel = 'scrabble-duel',
   SuperScrabble = 'super-scrabble',
 }
 
 const games = Object.values(Game);
 
 export const isGame = (locale: unknown): locale is Game => games.includes(locale as Game);
-
-export default Game;

package/packages/types/src/HorizontalPattern.ts

@@ -1,6 +1,6 @@
-import Pattern from './Pattern';
+import { Pattern } from './Pattern';
 
-class HorizontalPattern extends Pattern {
+export class HorizontalPattern extends Pattern {
   public clone(): Pattern {
     return new HorizontalPattern(
       this.board,
@@ -35,5 +35,3 @@ class HorizontalPattern extends Pattern {
     return collisions;
   }
 }
-
-export default HorizontalPattern;

package/packages/types/src/Locale.ts

@@ -3,7 +3,7 @@
  * @see https://en.wikipedia.org/wiki/IETF_language_tag
  * @see https://en.wikipedia.org/wiki/ISO_3166-1
  */
-enum Locale {
+export enum Locale {
   DE_DE = 'de-DE',
   EN_GB = 'en-GB',
   EN_US = 'en-US',
@@ -18,5 +18,3 @@ enum Locale {
 const locales = Object.values(Locale);
 
 export const isLocale = (locale: unknown): locale is Locale => locales.includes(locale as Locale);
-
-export default Locale;

package/packages/types/src/Pattern.ts

@@ -1,9 +1,9 @@
-import Board from './Board';
-import Cell from './Cell';
-import Config from './Config';
-import PatternJson from './PatternJson';
+import { Board } from './Board';
+import { Cell } from './Cell';
+import { Config } from './Config';
+import { PatternJson } from './PatternJson';
 
-class Pattern {
+export class Pattern {
   public readonly board: Board;
 
   public readonly cells: Cell[];
@@ -69,5 +69,3 @@ class Pattern {
     return this.cells.reduce((result, cell) => result + cell.toString(), '');
   }
 }
-
-export default Pattern;

package/packages/types/src/PatternJson.ts

@@ -1,9 +1,7 @@
-import CellJson from './CellJson';
+import { CellJson } from './CellJson';
 
-interface PatternJson {
+export interface PatternJson {
   cells: CellJson[];
   collisions: PatternJson[];
   word: string;
 }
-
-export default PatternJson;

package/packages/types/src/Result.ts

@@ -1,20 +1,20 @@
 import { CONSONANTS, VOWELS } from '@scrabble-solver/constants';
 
-import Cell from './Cell';
-import ResultJson from './ResultJson';
-import Tile from './Tile';
+import { Cell } from './Cell';
+import { ResultJson } from './ResultJson';
+import { Tile } from './Tile';
 
 type Collision = Cell[];
 
-class Result {
-  public static fromJson(json: ResultJson): Result {
+export class Result {
+  public static fromJson = (json: ResultJson): Result => {
     return new Result({
       id: json.id,
       cells: json.cells.map(Cell.fromJson),
       collisions: json.collisions.map((collision) => collision.map(Cell.fromJson)),
       points: json.points,
     });
-  }
+  };
 
   public readonly blanksCount: number;
 
@@ -99,5 +99,3 @@ const getWords = (cells: Cell[], collisions: Collision[]): string[] => [cells, .
 const isConsonant = ({ character, isBlank }: Tile): boolean => CONSONANTS.includes(character) && !isBlank;
 
 const isVowel = ({ character, isBlank }: Tile): boolean => VOWELS.includes(character) && !isBlank;
-
-export default Result;

package/packages/types/src/ResultJson.ts

@@ -1,11 +1,9 @@
-import CellJson from './CellJson';
-import CollisionJson from './CollisionJson';
+import { CellJson } from './CellJson';
+import { CollisionJson } from './CollisionJson';
 
-interface ResultJson {
+export interface ResultJson {
   cells: CellJson[];
   collisions: CollisionJson[];
   id: number;
   points: number;
 }
-
-export default ResultJson;

package/packages/types/src/ShowCoordinates.ts

@@ -3,6 +3,4 @@
  * 'alternative' means columns have numbers and rows have letters
  * 'hidden' means coordinates won't be shown
  */
-type ShowCoordinates = 'original' | 'alternative' | 'hidden';
-
-export default ShowCoordinates;
+export type ShowCoordinates = 'original' | 'alternative' | 'hidden';

package/packages/types/src/Tile.ts

@@ -1,9 +1,9 @@
 import { EMPTY_CELL } from '@scrabble-solver/constants';
 
-import TileJson from './TileJson';
+import { TileJson } from './TileJson';
 
-class Tile {
-  public static fromJson(json: TileJson | null): Tile {
+export class Tile {
+  public static fromJson = (json: TileJson | null): Tile => {
     if (!json) {
       return Tile.Null;
     }
@@ -12,7 +12,7 @@ class Tile {
       character: json.character,
       isBlank: json.isBlank,
     });
-  }
+  };
 
   public static readonly Null: Tile = Object.freeze({
     character: EMPTY_CELL,
@@ -54,5 +54,3 @@ class Tile {
     return this.character;
   }
 }
-
-export default Tile;

package/packages/types/src/TileConfig.ts

@@ -1,7 +1,5 @@
-interface TileConfig {
+export interface TileConfig {
   character: string;
   count: number;
   score: number;
 }
-
-export default TileConfig;

package/packages/types/src/TileJson.ts

@@ -1,6 +1,6 @@
-import isObject from './isObject';
+import { isObject } from './isObject';
 
-interface TileJson {
+export interface TileJson {
   character: string;
   isBlank: boolean;
 }
@@ -8,5 +8,3 @@ interface TileJson {
 export const isTileJson = (value: unknown): value is TileJson => {
   return isObject(value) && typeof value.character === 'string' && typeof value.isBlank === 'boolean';
 };
-
-export default TileJson;

package/packages/types/src/VerticalPattern.ts

@@ -1,6 +1,6 @@
-import Pattern from './Pattern';
+import { Pattern } from './Pattern';
 
-class VerticalPattern extends Pattern {
+export class VerticalPattern extends Pattern {
   public clone(): Pattern {
     return new VerticalPattern(
       this.board,
@@ -35,5 +35,3 @@ class VerticalPattern extends Pattern {
     return collisions;
   }
 }
-
-export default VerticalPattern;

package/packages/types/src/WordBonus.ts

@@ -1,9 +1,9 @@
 import { BONUS_WORD } from '@scrabble-solver/constants';
 
-import Bonus from './Bonus';
-import BonusValue from './BonusValue';
+import { Bonus } from './Bonus';
+import { BonusValue } from './BonusValue';
 
-class WordBonus extends Bonus {
+export class WordBonus extends Bonus {
   public readonly type = BONUS_WORD;
 
   public get value(): BonusValue {
@@ -13,5 +13,3 @@ class WordBonus extends Bonus {
     };
   }
 }
-
-export default WordBonus;

package/packages/types/src/WordDefinition.ts

@@ -1,7 +1,7 @@
-import WordDefinitionJson from './WordDefinitionJson';
+import { WordDefinitionJson } from './WordDefinitionJson';
 
-class WordDefinition {
-  public static fromJson(json: WordDefinitionJson | null): WordDefinition {
+export class WordDefinition {
+  public static fromJson = (json: WordDefinitionJson | null): WordDefinition => {
     if (!json) {
       return WordDefinition.Null;
     }
@@ -12,7 +12,7 @@ class WordDefinition {
       isAllowed: json.isAllowed,
       word: json.word,
     });
-  }
+  };
 
   public static readonly Null: WordDefinition = Object.freeze({
     definitions: [],
@@ -52,5 +52,3 @@ class WordDefinition {
     };
   }
 }
-
-export default WordDefinition;

package/packages/types/src/WordDefinitionJson.ts

@@ -1,4 +1,4 @@
-interface WordDefinitionJson {
+export interface WordDefinitionJson {
   definitions: string[];
   /**
    * Does the word have an entry in a corresponding online dictionary?
@@ -10,5 +10,3 @@ interface WordDefinitionJson {
   isAllowed: boolean;
   word: string;
 }
-
-export default WordDefinitionJson;

package/packages/types/src/index.ts

@@ -1,31 +1,31 @@
-export { default as Board } from './Board';
-export { default as BoardJson, isBoardJson } from './BoardJson';
-export { default as Bonus } from './Bonus';
-export { default as BonusJson } from './BonusJson';
-export { default as BonusValue } from './BonusValue';
-export { default as Cell } from './Cell';
-export { default as CellJson, isCellJson } from './CellJson';
-export { default as CharacterBonus } from './CharacterBonus';
-export { default as Collision } from './Collision';
-export { default as CollisionJson } from './CollisionJson';
-export { default as Config } from './Config';
-export { default as ConfigJson } from './ConfigJson';
-export { default as Dictionary } from './Dictionary';
-export { default as FinalPattern } from './FinalPattern';
-export { default as Game, isGame } from './Game';
-export { default as HorizontalPattern } from './HorizontalPattern';
-export { default as Locale, isLocale } from './Locale';
-export { default as Pattern } from './Pattern';
-export { default as PatternJson } from './PatternJson';
-export { default as Result } from './Result';
-export { default as ResultJson } from './ResultJson';
-export { default as ShowCoordinates } from './ShowCoordinates';
-export { default as Tile } from './Tile';
-export { default as TileConfig } from './TileConfig';
-export { default as TileJson, isTileJson } from './TileJson';
-export { default as VerticalPattern } from './VerticalPattern';
-export { default as WordBonus } from './WordBonus';
-export { default as WordDefinition } from './WordDefinition';
-export { default as WordDefinitionJson } from './WordDefinitionJson';
-export { default as isError } from './isError';
-export { default as isObject } from './isObject';
+export { Board } from './Board';
+export { BoardJson, isBoardJson } from './BoardJson';
+export { Bonus } from './Bonus';
+export { BonusJson } from './BonusJson';
+export { BonusValue } from './BonusValue';
+export { Cell } from './Cell';
+export { CellJson, isCellJson } from './CellJson';
+export { CharacterBonus } from './CharacterBonus';
+export { Collision } from './Collision';
+export { CollisionJson } from './CollisionJson';
+export { Config } from './Config';
+export { ConfigJson } from './ConfigJson';
+export { Dictionary } from './Dictionary';
+export { FinalPattern } from './FinalPattern';
+export { Game, isGame } from './Game';
+export { HorizontalPattern } from './HorizontalPattern';
+export { isError } from './isError';
+export { isObject } from './isObject';
+export { isLocale, Locale } from './Locale';
+export { Pattern } from './Pattern';
+export { PatternJson } from './PatternJson';
+export { Result } from './Result';
+export { ResultJson } from './ResultJson';
+export { ShowCoordinates } from './ShowCoordinates';
+export { Tile } from './Tile';
+export { TileConfig } from './TileConfig';
+export { isTileJson, TileJson } from './TileJson';
+export { VerticalPattern } from './VerticalPattern';
+export { WordBonus } from './WordBonus';
+export { WordDefinition } from './WordDefinition';
+export { WordDefinitionJson } from './WordDefinitionJson';

package/packages/types/src/isError.ts

@@ -1,11 +1,9 @@
-import isObject from './isObject';
+import { isObject } from './isObject';
 
-const isError = (value: unknown): value is Error => {
+export const isError = (value: unknown): value is Error => {
   if (!isObject(value)) {
     return false;
   }
 
   return typeof value.message === 'string';
 };
-
-export default isError;

package/packages/types/src/isObject.ts

@@ -1,5 +1,3 @@
-const isObject = (value: unknown): value is Record<string, unknown> => {
+export const isObject = (value: unknown): value is Record<string, unknown> => {
   return typeof value === 'object' && value !== null;
 };
-
-export default isObject;

package/packages/word-definitions/build/languages/turkish.js

@@ -15,7 +15,7 @@ const crawl = (word) => {
 exports.crawl = crawl;
 const parse = (json) => {
     const response = JSON.parse(json);
-    if (response.error) {
+    if (!Array.isArray(response) || ('error' in response && response.error)) {
         return {
             definitions: [],
             exists: false,

package/packages/word-definitions/build/lib/index.d.ts

@@ -1,3 +1,3 @@
-export * from './normalizeDefinition';
-export * from './request';
-export * from './unique';
+export { normalizeDefinition } from './normalizeDefinition';
+export { request } from './request';
+export { unique } from './unique';

package/packages/word-definitions/build/lib/index.js

@@ -1,19 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./normalizeDefinition"), exports);
-__exportStar(require("./request"), exports);
-__exportStar(require("./unique"), exports);
+exports.unique = exports.request = exports.normalizeDefinition = void 0;
+var normalizeDefinition_1 = require("./normalizeDefinition");
+Object.defineProperty(exports, "normalizeDefinition", { enumerable: true, get: function () { return normalizeDefinition_1.normalizeDefinition; } });
+var request_1 = require("./request");
+Object.defineProperty(exports, "request", { enumerable: true, get: function () { return request_1.request; } });
+var unique_1 = require("./unique");
+Object.defineProperty(exports, "unique", { enumerable: true, get: function () { return unique_1.unique; } });

package/packages/word-definitions/build/lib/request.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = void 0;
+const types_1 = require("@scrabble-solver/types");
 const follow_redirects_1 = require("follow-redirects");
 const request = ({ protocol, ...options }) => {
     const agent = protocol === 'https' ? follow_redirects_1.https : follow_redirects_1.http;
@@ -17,7 +18,7 @@ const request = ({ protocol, ...options }) => {
                     resolve(data);
                 }
                 catch (error) {
-                    reject(error);
+                    reject((0, types_1.isError)(error) ? error : new Error(String(error)));
                 }
             });
         })

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.15.9",
+  "version": "2.15.10",
   "description": "Scrabble Solver 2 - Word definitions",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.15.9",
+    "@scrabble-solver/types": "^2.15.10",
     "cheerio": "^1.0.0",
     "follow-redirects": "^1.15.9",
     "striptags": "^3.2.0"

package/packages/word-definitions/src/languages/turkish.ts

@@ -13,9 +13,9 @@ export const crawl = (word: string): Promise<string> => {
 };
 
 export const parse = (json: string): ParsingResult => {
-  const response = JSON.parse(json);
+  const response = JSON.parse(json) as [{ anlamlarListe: [{ anlam: string }] }] | { error?: unknown };
 
-  if (response.error) {
+  if (!Array.isArray(response) || ('error' in response && response.error)) {
     return {
       definitions: [],
       exists: false,
@@ -23,7 +23,7 @@ export const parse = (json: string): ParsingResult => {
   }
 
   const [wordInfo] = response;
-  const definitions = wordInfo.anlamlarListe.map((entry: { anlam: string }) => entry.anlam.replace('►', '').trim());
+  const definitions = wordInfo.anlamlarListe.map((entry) => entry.anlam.replace('►', '').trim());
 
   return {
     definitions,

package/packages/word-definitions/src/lib/index.ts

@@ -1,3 +1,3 @@
-export * from './normalizeDefinition';
-export * from './request';
-export * from './unique';
+export { normalizeDefinition } from './normalizeDefinition';
+export { request } from './request';
+export { unique } from './unique';

package/packages/word-definitions/src/lib/request.ts

@@ -1,3 +1,4 @@
+import { isError } from '@scrabble-solver/types';
 import { http, https } from 'follow-redirects';
 import { RequestOptions } from 'http';
 
@@ -20,7 +21,7 @@ export const request = ({ protocol, ...options }: Options): Promise<string> => {
           try {
             resolve(data);
           } catch (error) {
-            reject(error);
+            reject(isError(error) ? error : new Error(String(error)));
           }
         });
       })

package/packages/word-definitions/src/parse.test.ts

@@ -4,7 +4,7 @@ import path from 'path';
 
 import { parse } from './parse';
 
-export const readTestFile = (filepath: string): string => {
+const readTestFile = (filepath: string): string => {
   const absoluteFilepath = path.resolve(__dirname, '__tests__', filepath);
   return fs.readFileSync(absoluteFilepath, 'utf-8');
 };