scrabble-solver 2.9.3 → 2.10.1

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

@@ -18,14 +18,16 @@ import {
   Results,
   Settings,
   Splash,
+  SvgFontFix,
   Well,
   Words,
 } from 'components';
-import { useIsTablet, useLocalStorage } from 'hooks';
+import { useDirection, useIsTablet, useLanguage, useLocalStorage } from 'hooks';
+import { LOCALE_FEATURES } from 'i18n';
 import { getCellSize } from 'lib';
 import { COMPONENTS_SPACING, COMPONENTS_SPACING_MOBILE, DICTIONARY_HEIGHT } from 'parameters';
 import { registerServiceWorker } from 'serviceWorkerManager';
-import { initialize, localStorage, reset, selectConfig, solveSlice, useTypedSelector } from 'state';
+import { initialize, localStorage, reset, selectConfig, selectLocale, solveSlice, useTypedSelector } from 'state';
 
 import styles from './index.module.scss';
 
@@ -37,6 +39,7 @@ interface Props {
 
 const Index: FunctionComponent<Props> = ({ version }) => {
   const dispatch = useDispatch();
+  const locale = useTypedSelector(selectLocale);
   const isTablet = useIsTablet();
   const [showKeyMap, setShowKeyMap] = useState(false);
   const [showRemainingTiles, setShowRemainingTiles] = useState(false);
@@ -68,6 +71,9 @@ const Index: FunctionComponent<Props> = ({ version }) => {
     }
   };
 
+  const { direction } = LOCALE_FEATURES[locale];
+  useDirection(direction);
+  useLanguage(locale);
   useLocalStorage();
 
   useEffectOnce(() => {
@@ -86,6 +92,8 @@ const Index: FunctionComponent<Props> = ({ version }) => {
 
   return (
     <>
+      <SvgFontFix />
+
       <div className={classNames(styles.index, { [styles.initialized]: isInitialized })}>
         <div className={styles.nav}>
           <div className={styles.navLogo}>

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

@@ -3,7 +3,7 @@ import { Locale, WordDefinition, WordDefinitionJson } from '@scrabble-solver/typ
 import fetchJson from './fetchJson';
 
 const findWordDefinitions = async (locale: Locale, word: string): Promise<WordDefinition[]> => {
-  const json = await fetchJson<WordDefinitionJson[]>(`/api/dictionary/${locale}/${word}`);
+  const json = await fetchJson<WordDefinitionJson[]>(`/api/dictionary/${locale}/${encodeURIComponent(word)}`);
   return json.map(WordDefinition.fromJson);
 };
 

package/packages/scrabble-solver/src/service-worker/routeVerifyRequests.ts

@@ -22,7 +22,7 @@ const routeVerifyRequests = () => {
       }
 
       const board = Board.fromJson(boardJson);
-      const words = board.getWords().sort((a, b) => a.localeCompare(b));
+      const words = board.getWords().sort((a, b) => a.localeCompare(b, locale));
       const invalidWords = words.filter((word) => !trie.has(word));
       const validWords = words.filter((word) => trie.has(word));
       const json = JSON.stringify({ invalidWords, validWords });

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

@@ -7,13 +7,13 @@ import { findWordDefinitions, solve, verify, visit } from 'sdk';
 
 import { initialize, reset } from './actions';
 import {
-  selectAutoGroupTiles,
   selectBoard,
   selectCellIsFiltered,
   selectCharacters,
   selectConfig,
   selectDictionary,
   selectLocale,
+  selectLocaleAutoGroupTiles,
 } from './selectors';
 import {
   boardSlice,
@@ -65,7 +65,7 @@ function* onRackValueChange(): AnyGenerator {
 }
 
 function* onApplyResult({ payload: result }: PayloadAction<Result>): AnyGenerator {
-  const autoGroupTiles = yield select(selectAutoGroupTiles);
+  const autoGroupTiles = yield select(selectLocaleAutoGroupTiles);
   yield put(boardSlice.actions.applyResult(result));
   yield put(cellFilterSlice.actions.reset());
   yield put(rackSlice.actions.removeTiles(result.tiles));
@@ -74,8 +74,15 @@ function* onApplyResult({ payload: result }: PayloadAction<Result>): AnyGenerato
 }
 
 function* onConfigIdChange(): AnyGenerator {
+  const characters = yield select(selectCharacters);
+
+  if (characters.length > 0) {
+    yield put(solveSlice.actions.submit());
+  } else {
+    yield put(resultsSlice.actions.reset());
+  }
+
   yield put(resultsSlice.actions.reset());
-  yield put(solveSlice.actions.submit());
   yield put(verifySlice.actions.submit());
   yield* ensureProperTilesCount();
 }
@@ -112,9 +119,16 @@ function* onReset(): AnyGenerator {
 }
 
 function* onLocaleChange(): AnyGenerator {
+  const characters = yield select(selectCharacters);
+
+  if (characters.length > 0) {
+    yield put(solveSlice.actions.submit());
+  } else {
+    yield put(resultsSlice.actions.reset());
+  }
+
   yield put(dictionarySlice.actions.reset());
   yield put(resultsSlice.actions.changeResultCandidate(null));
-  yield put(solveSlice.actions.submit());
   yield put(verifySlice.actions.submit());
 }
 
@@ -181,7 +195,7 @@ function* ensureProperTilesCount(): AnyGenerator {
   } 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);
+    const autoGroupTiles = yield select(selectLocaleAutoGroupTiles);
     yield put(rackSlice.actions.init([...nonNulls, ...Array(differenceCount).fill(null)]));
     yield put(rackSlice.actions.groupTiles(autoGroupTiles));
   }

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

@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 import { getLocaleConfig } from '@scrabble-solver/configs';
 import { Cell, Config, isError, Result, Tile } from '@scrabble-solver/types';
 
-import i18n from 'i18n';
+import i18n, { LOCALE_FEATURES } from 'i18n';
 import { findCell, getRemainingTiles, getRemainingTilesGroups, sortResults, unorderedArraysEqual } from 'lib';
 import { Translations } from 'types';
 
@@ -38,9 +38,17 @@ export const selectDictionaryError = createSelector([selectDictionaryRoot], (dic
   return isError(dictionary.error) ? dictionary.error : undefined;
 });
 
+export const selectLocale = createSelector([selectSettingsRoot], (settings) => settings.locale);
+
 export const selectAutoGroupTiles = createSelector([selectSettingsRoot], (settings) => settings.autoGroupTiles);
 
-export const selectLocale = createSelector([selectSettingsRoot], (settings) => settings.locale);
+export const selectLocaleAutoGroupTiles = createSelector([selectLocale, selectSettingsRoot], (locale, settings) => {
+  if (LOCALE_FEATURES[locale].direction === 'ltr' || settings.autoGroupTiles === null) {
+    return settings.autoGroupTiles;
+  }
+
+  return settings.autoGroupTiles === 'left' ? 'right' : 'left';
+});
 
 export const selectBoard = selectBoardRoot;
 
@@ -63,7 +71,7 @@ export const selectResultsSortColumn = createSelector([selectResultsRoot], (resu
 export const selectResultsSortDirection = createSelector([selectResultsRoot], (results) => results.sort.direction);
 
 export const selectSortedResults = createSelector(
-  [selectResults, selectResultsSortColumn, selectResultsSortDirection],
+  [selectResults, selectResultsSortColumn, selectResultsSortDirection, selectLocale],
   sortResults,
 );
 
@@ -167,9 +175,9 @@ export const selectSolveError = createSelector([selectSolveRoot], (solve) => {
 });
 
 export const selectHaveCharactersChanged = createSelector(
-  [selectLastSolvedParameters, selectCharacters],
-  (lastSolvedParameters, characters) => {
-    return !unorderedArraysEqual(lastSolvedParameters.characters, characters);
+  [selectLastSolvedParameters, selectCharacters, selectLocale],
+  (lastSolvedParameters, characters, locale) => {
+    return !unorderedArraysEqual(lastSolvedParameters.characters, characters, locale);
   },
 );
 
@@ -184,7 +192,7 @@ export const selectAreResultsOutdated = createSelector(
 );
 
 export const selectRemainingTiles = createSelector(
-  [selectConfig, selectBoardRoot, selectCharacters],
+  [selectConfig, selectBoardRoot, selectCharacters, selectLocale],
   getRemainingTiles,
 );
 

package/packages/scrabble-solver/src/styles/global.scss

@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&family=Open+Sans:wght@400;700&family=Roboto+Mono&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&family=Open+Sans:wght@400;700&family=Vazirmatn:wght@300;400;700&family=Roboto+Mono&display=swap');
 
 @import '~normalize.css';
 
@@ -51,3 +51,8 @@ h4 {
   -webkit-margin-after: 0;
   margin: 0;
 }
+
+[lang='fa-IR'] {
+  --font--family: 'Vazirmatn', 'Open Sans', sans-serif;
+  --font--family--title: 'Vazirmatn', 'Lato', sans-serif;
+}

package/packages/solver/package-lock.json

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

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.9.3",
+  "version": "2.10.1",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^2.0.1",
-    "@scrabble-solver/types": "^2.9.3"
+    "@scrabble-solver/types": "^2.10.1"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.9.3",
-    "@scrabble-solver/constants": "^2.9.3",
-    "@scrabble-solver/dictionaries": "^2.9.3"
+    "@scrabble-solver/configs": "^2.10.1",
+    "@scrabble-solver/constants": "^2.10.1",
+    "@scrabble-solver/dictionaries": "^2.10.1"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

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

@@ -3,6 +3,7 @@ declare enum Locale {
     EN_GB = "en-GB",
     EN_US = "en-US",
     ES_ES = "es-ES",
+    FA_IR = "fa-IR",
     FR_FR = "fr-FR",
     PL_PL = "pl-PL"
 }

package/packages/types/build/Locale.js

@@ -8,6 +8,7 @@ var Locale;
     Locale["EN_GB"] = "en-GB";
     Locale["EN_US"] = "en-US";
     Locale["ES_ES"] = "es-ES";
+    Locale["FA_IR"] = "fa-IR";
     Locale["FR_FR"] = "fr-FR";
     Locale["PL_PL"] = "pl-PL";
 })(Locale || (Locale = {}));

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

@@ -13,7 +13,6 @@ declare class Result {
     readonly points: number;
     readonly pointsRatio: number;
     readonly tiles: Tile[];
-    readonly tilesCharacters: string;
     readonly tilesCount: number;
     readonly vowelsCount: number;
     readonly word: string;

package/packages/types/build/Result.js

@@ -17,7 +17,6 @@ class Result {
         this.points = points;
         this.pointsRatio = getPointsRatio(tiles, points);
         this.tiles = tiles;
-        this.tilesCharacters = getTilesCharacters(tiles);
         this.tilesCount = tiles.length;
         this.vowelsCount = getVowels(tiles).length;
         this.word = getWord(cells);
@@ -41,15 +40,11 @@ class Result {
         };
     }
 }
-const charactersComparator = (a, b) => a.localeCompare(b);
 const getBlanks = (tiles) => tiles.filter(({ isBlank }) => isBlank);
 const getConsonants = (tiles) => tiles.filter(isConsonant);
 const getVowels = (tiles) => tiles.filter(isVowel);
-const getNonBlankCharacters = (tiles) => getNonBlanks(tiles).map(({ character }) => character);
-const getNonBlanks = (tiles) => tiles.filter(({ isBlank }) => !isBlank);
 const getPointsRatio = (tiles, points) => points / tiles.length;
 const getTiles = (cells) => cells.filter(({ isEmpty }) => isEmpty).map(({ tile }) => tile);
-const getTilesCharacters = (tiles) => getNonBlankCharacters(tiles).sort(charactersComparator).join('');
 // eslint-disable-next-line prefer-template
 const getWord = (cells) => cells.reduce((word, cell) => word + cell.toString(), '');
 const getWords = (cells, collisions) => [cells, ...collisions].map(getWord);

package/packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.9.3",
+  "version": "2.10.1",
   "description": "Scrabble Solver 2 - Types",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,7 +24,7 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.9.3"
+    "@scrabble-solver/constants": "^2.10.1"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/src/Locale.ts

@@ -4,6 +4,7 @@ enum Locale {
   EN_GB = 'en-GB',
   EN_US = 'en-US',
   ES_ES = 'es-ES',
+  FA_IR = 'fa-IR',
   FR_FR = 'fr-FR',
   PL_PL = 'pl-PL',
 }

package/packages/types/src/Result.ts

@@ -34,8 +34,6 @@ class Result {
 
   public readonly tiles: Tile[];
 
-  public readonly tilesCharacters: string;
-
   public readonly tilesCount: number;
 
   public readonly vowelsCount: number;
@@ -67,7 +65,6 @@ class Result {
     this.points = points;
     this.pointsRatio = getPointsRatio(tiles, points);
     this.tiles = tiles;
-    this.tilesCharacters = getTilesCharacters(tiles);
     this.tilesCount = tiles.length;
     this.vowelsCount = getVowels(tiles).length;
     this.word = getWord(cells);
@@ -85,24 +82,16 @@ class Result {
   }
 }
 
-const charactersComparator = (a: string, b: string): number => a.localeCompare(b);
-
 const getBlanks = (tiles: Tile[]): Tile[] => tiles.filter(({ isBlank }) => isBlank);
 
 const getConsonants = (tiles: Tile[]): Tile[] => tiles.filter(isConsonant);
 
 const getVowels = (tiles: Tile[]): Tile[] => tiles.filter(isVowel);
 
-const getNonBlankCharacters = (tiles: Tile[]): string[] => getNonBlanks(tiles).map(({ character }) => character);
-
-const getNonBlanks = (tiles: Tile[]): Tile[] => tiles.filter(({ isBlank }) => !isBlank);
-
 const getPointsRatio = (tiles: Tile[], points: number): number => points / tiles.length;
 
 const getTiles = (cells: Cell[]): Tile[] => cells.filter(({ isEmpty }) => isEmpty).map(({ tile }) => tile);
 
-const getTilesCharacters = (tiles: Tile[]): string => getNonBlankCharacters(tiles).sort(charactersComparator).join('');
-
 // eslint-disable-next-line prefer-template
 const getWord = (cells: Cell[]): string => cells.reduce((word, cell) => word + cell.toString(), '');
 

package/packages/word-definitions/build/crawl/crawl.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
 const crawlEnglish_1 = __importDefault(require("./crawlEnglish"));
+const crawlFarsi_1 = __importDefault(require("./crawlFarsi"));
 const crawlFrench_1 = __importDefault(require("./crawlFrench"));
 const crawlGerman_1 = __importDefault(require("./crawlGerman"));
 const crawlPolish_1 = __importDefault(require("./crawlPolish"));
@@ -14,6 +15,7 @@ const crawlPerLocale = {
     [types_1.Locale.EN_GB]: crawlEnglish_1.default,
     [types_1.Locale.EN_US]: crawlEnglish_1.default,
     [types_1.Locale.ES_ES]: crawlSpanish_1.default,
+    [types_1.Locale.FA_IR]: crawlFarsi_1.default,
     [types_1.Locale.FR_FR]: crawlFrench_1.default,
     [types_1.Locale.PL_PL]: crawlPolish_1.default,
 };

package/packages/word-definitions/build/crawl/crawlFarsi.d.ts

@@ -0,0 +1,2 @@
+declare const crawlFarsi: (word: string) => Promise<string>;
+export default crawlFarsi;

package/packages/word-definitions/build/crawl/crawlFarsi.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = require("../lib");
+const crawlFarsi = (word) => {
+    return (0, lib_1.request)({
+        protocol: 'https',
+        hostname: 'www.vajehyab.com',
+        path: `/moein/${encodeURIComponent(word)}`,
+    });
+};
+exports.default = crawlFarsi;

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

@@ -15,7 +15,8 @@ const normalizeQuotes = (definition) => definition.replace(/\."/g, '".');
 const normalizeMarkers = (definition) => definition.replace(/^\(\d+\.\d+\)\s+/g, '');
 const normalizeTrailingSymbols = (definition) => definition.trim().replace(/:$/, '');
 const normalizeLeadingSymbols = (definition) => definition.trim().replace(/^:/, '');
-const normalizeNonWords = (definition) => (/\w/.test(definition) ? definition : '');
+// https://stackoverflow.com/a/40732368
+const normalizeNonWords = (definition) => (/[\w\u0621-\u064A]+/.test(definition) ? definition : '');
 const normalizeCommas = (definition) => {
     return definition
         .replace(/\s+,\s+/g, ', ')

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

@@ -1,5 +1,6 @@
 export { default as parse } from './parse';
 export { default as parseEnglish } from './parseEnglish';
+export { default as parseFarsi } from './parseFarsi';
 export { default as parseFrench } from './parseFrench';
 export { default as parseGerman } from './parseGerman';
 export { default as parsePolish } from './parsePolish';

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

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSpanish = exports.parsePolish = exports.parseGerman = exports.parseFrench = exports.parseEnglish = exports.parse = void 0;
+exports.parseSpanish = exports.parsePolish = exports.parseGerman = exports.parseFrench = exports.parseFarsi = exports.parseEnglish = exports.parse = void 0;
 var parse_1 = require("./parse");
 Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return __importDefault(parse_1).default; } });
 var parseEnglish_1 = require("./parseEnglish");
 Object.defineProperty(exports, "parseEnglish", { enumerable: true, get: function () { return __importDefault(parseEnglish_1).default; } });
+var parseFarsi_1 = require("./parseFarsi");
+Object.defineProperty(exports, "parseFarsi", { enumerable: true, get: function () { return __importDefault(parseFarsi_1).default; } });
 var parseFrench_1 = require("./parseFrench");
 Object.defineProperty(exports, "parseFrench", { enumerable: true, get: function () { return __importDefault(parseFrench_1).default; } });
 var parseGerman_1 = require("./parseGerman");

package/packages/word-definitions/build/parse/parse.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
 const lib_1 = require("../lib");
 const parseEnglish_1 = __importDefault(require("./parseEnglish"));
+const parseFarsi_1 = __importDefault(require("./parseFarsi"));
 const parseFrench_1 = __importDefault(require("./parseFrench"));
 const parseGerman_1 = __importDefault(require("./parseGerman"));
 const parsePolish_1 = __importDefault(require("./parsePolish"));
@@ -15,6 +16,7 @@ const parsePerLocale = {
     [types_1.Locale.EN_GB]: parseEnglish_1.default,
     [types_1.Locale.EN_US]: parseEnglish_1.default,
     [types_1.Locale.ES_ES]: parseSpanish_1.default,
+    [types_1.Locale.FA_IR]: parseFarsi_1.default,
     [types_1.Locale.FR_FR]: parseFrench_1.default,
     [types_1.Locale.PL_PL]: parsePolish_1.default,
 };

package/packages/word-definitions/build/parse/parseEnglish.js

@@ -8,7 +8,7 @@ const parseEnglish = (html) => {
     const $ = (0, cheerio_1.load)(html);
     $('strong.mw_t_bc').replaceWith(', ');
     $('.text-lowercase').remove();
-    $('[id^=dictionary-entry]').find('.dtText > *:not(a)').remove();
+    $('.sub-content-thread').remove();
     const $definitions = $('[id^=dictionary-entry]').find('.dtText, .cxl-ref');
     return {
         definitions: Array.from($definitions).map((definition) => $(definition).text().replace(/\n/g, '')),

package/packages/word-definitions/build/parse/parseFarsi.d.ts

@@ -0,0 +1,3 @@
+import { ParseResult } from '../types';
+declare const parseFarsi: (html: string) => ParseResult;
+export default parseFarsi;

package/packages/word-definitions/build/parse/parseFarsi.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cheerio_1 = require("cheerio");
+const DOES_NOT_EXIST_MESSAGE = '404 Page Not Found';
+const parseFarsi = (html) => {
+    const $ = (0, cheerio_1.load)(html);
+    const $definitions = $('[itemprop=articleBody]');
+    return {
+        definitions: Array.from($definitions).map((definition) => $(definition).text()),
+        exists: $('#container h1').text() !== DOES_NOT_EXIST_MESSAGE,
+    };
+};
+exports.default = parseFarsi;

package/packages/word-definitions/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.9.3",
+  "version": "2.10.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/word-definitions",
-      "version": "2.9.3",
+      "version": "2.10.1",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.9.3",
+  "version": "2.10.1",
   "description": "Scrabble Solver 2 - Word definitions",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/ node_modules/ package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.9.3",
+    "@scrabble-solver/types": "^2.10.1",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"

package/packages/word-definitions/src/crawl/crawl.ts

@@ -1,6 +1,7 @@
 import { Locale } from '@scrabble-solver/types';
 
 import crawlEnglish from './crawlEnglish';
+import crawlFarsi from './crawlFarsi';
 import crawlFrench from './crawlFrench';
 import crawlGerman from './crawlGerman';
 import crawlPolish from './crawlPolish';
@@ -11,6 +12,7 @@ const crawlPerLocale: Record<Locale, (word: string) => Promise<string>> = {
   [Locale.EN_GB]: crawlEnglish,
   [Locale.EN_US]: crawlEnglish,
   [Locale.ES_ES]: crawlSpanish,
+  [Locale.FA_IR]: crawlFarsi,
   [Locale.FR_FR]: crawlFrench,
   [Locale.PL_PL]: crawlPolish,
 };

package/packages/word-definitions/src/crawl/crawlFarsi.ts

@@ -0,0 +1,11 @@
+import { request } from '../lib';
+
+const crawlFarsi = (word: string): Promise<string> => {
+  return request({
+    protocol: 'https',
+    hostname: 'www.vajehyab.com',
+    path: `/moein/${encodeURIComponent(word)}`,
+  });
+};
+
+export default crawlFarsi;

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

@@ -21,7 +21,8 @@ const normalizeTrailingSymbols: Normalize = (definition) => definition.trim().re
 
 const normalizeLeadingSymbols: Normalize = (definition) => definition.trim().replace(/^:/, '');
 
-const normalizeNonWords: Normalize = (definition) => (/\w/.test(definition) ? definition : '');
+// https://stackoverflow.com/a/40732368
+const normalizeNonWords: Normalize = (definition) => (/[\w\u0621-\u064A]+/.test(definition) ? definition : '');
 
 const normalizeCommas: Normalize = (definition) => {
   return definition