@scrabble-solver/word-definitions 2.9.1 → 2.9.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Kamil Mielnik <kamil.adam.mielnik@gmail.com>
+Copyright (c) 2022 Kamil Mielnik <kamil@kamilmielnik.com>
 
 Attribution-NonCommercial-NoDerivatives 4.0 International
 

package/build/getWordDefinition.d.ts

@@ -1,3 +1,3 @@
 import { Locale, WordDefinition } from '@scrabble-solver/types';
-declare const getWordDefinition: (locale: Locale, word: string) => Promise<WordDefinition>;
+declare const getWordDefinition: (locale: Locale, word: string, isAllowed: boolean) => Promise<WordDefinition>;
 export default getWordDefinition;

package/build/getWordDefinition.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
 const crawl_1 = require("./crawl");
 const parse_1 = require("./parse");
-const getWordDefinition = async (locale, word) => {
+const getWordDefinition = async (locale, word, isAllowed) => {
     const html = await (0, crawl_1.crawl)(locale, word);
-    const { definitions, isAllowed } = (0, parse_1.parse)(locale, html);
-    const wordDefinition = new types_1.WordDefinition({ definitions, isAllowed, word });
+    const { definitions, exists } = (0, parse_1.parse)(locale, html);
+    const wordDefinition = new types_1.WordDefinition({ definitions, exists, isAllowed, word });
     return wordDefinition;
 };
 exports.default = getWordDefinition;

package/build/lib/normalizeDefinition.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const striptags_1 = __importDefault(require("striptags"));
 const EMPHASIS_TAGS = ['a', 'b', 'em', 'internalXref'];
 const normalizeHtmlTags = (definition) => (0, striptags_1.default)((0, striptags_1.default)(definition, EMPHASIS_TAGS), undefined, '"');
-const normalizeLineBreaks = (definition) => definition.replace(/[\r\n]/g, '');
+const normalizeLineBreaks = (definition) => definition.replace(/\r\n/g, '\n');
+const normalizeWhitespace = (definition) => definition.replace(/[ ]+/g, ' ');
 const normalizeQuotes = (definition) => definition.replace(/\."/g, '".');
 /**
  * `(1.2) definition` -> `definition`
@@ -26,6 +27,7 @@ const normalizers = [
     normalizeMarkers,
     normalizeQuotes,
     normalizeLineBreaks,
+    normalizeWhitespace,
     normalizeTrailingSymbols,
     normalizeLeadingSymbols,
     normalizeNonWords,

package/build/parse/parse.js

@@ -19,10 +19,10 @@ const parsePerLocale = {
     [types_1.Locale.PL_PL]: parsePolish_1.default,
 };
 const parse = (locale, html) => {
-    const { definitions, isAllowed } = parsePerLocale[locale](html);
+    const { definitions, exists } = parsePerLocale[locale](html);
     return {
         definitions: (0, lib_1.unique)(definitions.map(lib_1.normalizeDefinition).filter(Boolean)),
-        isAllowed,
+        exists,
     };
 };
 exports.default = parse;

package/build/parse/parseEnglish.js

@@ -1,18 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cheerio_1 = __importDefault(require("cheerio"));
+const cheerio_1 = require("cheerio");
+const DOES_NOT_EXIST_MESSAGE = 
+// eslint-disable-next-line max-len
+"The word you've entered isn't in the dictionary. Click on a spelling suggestion below or try again using the search bar above.";
 const parseEnglish = (html) => {
-    const $ = cheerio_1.default.load(html);
+    const $ = (0, cheerio_1.load)(html);
     $('strong.mw_t_bc').replaceWith(', ');
     $('.text-lowercase').remove();
     $('[id^=dictionary-entry]').find('.dtText > *:not(a)').remove();
     const $definitions = $('[id^=dictionary-entry]').find('.dtText, .cxl-ref');
     return {
-        definitions: Array.from($definitions).map((definition) => $(definition).text()),
-        isAllowed: $definitions.length > 0,
+        definitions: Array.from($definitions).map((definition) => $(definition).text().replace(/\n/g, '')),
+        exists: $('.spelling-suggestion-text').text().trim() !== DOES_NOT_EXIST_MESSAGE,
     };
 };
 exports.default = parseEnglish;

package/build/parse/parseFrench.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cheerio_1 = __importDefault(require("cheerio"));
+const cheerio_1 = require("cheerio");
 const parseFrench = (html) => {
-    const $ = cheerio_1.default.load(html);
+    const $ = (0, cheerio_1.load)(html);
     const $definitions = $('.tlf_cdefinition');
     return {
         definitions: Array.from($definitions).map((definition) => $(definition).text()),
-        isAllowed: $('#vitemselected span').length > 0,
+        exists: $('#vitemselected span').length > 0,
     };
 };
 exports.default = parseFrench;

package/build/parse/parseGerman.js

@@ -1,22 +1,60 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cheerio_1 = __importDefault(require("cheerio"));
+const cheerio_1 = require("cheerio");
 const parseGerman = (html) => {
-    const $ = cheerio_1.default.load(html);
-    const $meaningOverview = $('.bedeutungsuebersicht');
-    let $definitions;
-    if ($meaningOverview.length > 0) {
-        $definitions = $('.bedeutungsuebersicht > ol > li > a');
-    }
-    else {
-        $definitions = $('.dwdswb-lesart .dwdswb-definition');
+    const $ = (0, cheerio_1.load)(html);
+    const definitions = [parseBedeutungsubersicht, parseBedeutungen, parseBedeutung].reduce((results, parse) => (results.length === 0 ? parse($) : results), []);
+    const exists = Array.from($('.label-danger')).every((label) => $(label).text() !== 'Hinweis');
+    return { definitions, exists };
+};
+const parseBedeutungsubersicht = ($) => {
+    Array.from($('.bedeutungsuebersicht ol > li > a')).forEach((item) => {
+        $(item).text($(item).text().replace(/\n/g, ''));
+    });
+    Array.from($('.bedeutungsuebersicht ol > li > ol > li')).forEach((item) => {
+        const text = `\n${$(item).text().replace(/\n/g, '')}`;
+        const $text = $(`<div>${text}</div>`);
+        $(item).replaceWith($text);
+    });
+    Array.from($('.bedeutungsuebersicht ol > li > ol')).forEach((list) => {
+        const $list = $(list);
+        const html = $list.html() || '';
+        const $html = $(`<div>${html}</div>`);
+        const $prev = $list.prev('a');
+        if ($prev) {
+            $prev.append($html);
+            $(list).remove();
+        }
+        else {
+            $(list).replaceWith($html);
+        }
+    });
+    return parseDefinitions($, $('.bedeutungsuebersicht ol > li'));
+};
+const parseBedeutung = ($) => {
+    return parseDefinitions($, $('.dwdswb-lesart .dwdswb-definition-spezifizierung'));
+};
+const parseBedeutungen = ($) => {
+    const definitions = parseDefinitions($, $('.dwdswb-lesart .dwdswb-definition'));
+    if (definitions.length > 0) {
+        return definitions;
     }
-    return {
-        definitions: Array.from($definitions).map((definition) => $(definition).text().replace('/\n/', '')),
-        isAllowed: $definitions.length > 0,
-    };
+    const $references = $('.dwdswb-lesart .dwdswb-verweis');
+    const references = Array.from($references).reduce((result, reference) => {
+        const html = reference.attribs['data-content'] || '<span />';
+        const values = $(html)
+            .text()
+            .split(';')
+            .map((value) => value.trim());
+        return result.concat(values);
+    }, []);
+    return references;
+};
+const parseDefinitions = ($, $definitions) => {
+    return Array.from($definitions).map((definition) => $(definition)
+        .text()
+        .replace(/[ ]+/g, ' ')
+        .replace(/[ ]\n/g, '\n')
+        .replace(/^[0-9]+\.\s/g, ''));
 };
 exports.default = parseGerman;

package/build/parse/parsePolish.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cheerio_1 = __importDefault(require("cheerio"));
+const cheerio_1 = require("cheerio");
 const parsePolish = (html) => {
-    const $ = cheerio_1.default.load(html);
+    const $ = (0, cheerio_1.load)(html);
     const $header = $($('h1')[0]);
     const $isAllowed = $header.next();
     const $definitions = $header.next().next().next().next();
     return {
         definitions: $definitions.text().trim().split(/\d+\./),
-        isAllowed: $isAllowed.text().trim().indexOf('dopuszczalne w grach') >= 0,
+        exists: $isAllowed.text().trim().indexOf('dopuszczalne w grach') >= 0,
     };
 };
 exports.default = parsePolish;

package/build/parse/parseSpanish.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cheerio_1 = __importDefault(require("cheerio"));
+const cheerio_1 = require("cheerio");
 const parseSpanish = (html) => {
-    const $ = cheerio_1.default.load(html);
+    const $ = (0, cheerio_1.load)(html);
     $('.verdBold14 + .gris11 + .gris13').remove();
     $('br + .gris13').remove();
     $('.grisItalic13 + .gris13').remove();
@@ -26,7 +23,7 @@ const parseSpanish = (html) => {
             .filter(Boolean)
             .map((definition) => definition.replace(/\s+\.$/g, ''))
             .map((definition) => (definition.endsWith('.') ? definition : `${definition}.`)),
-        isAllowed: definitions.length > 0,
+        exists: $('.wrapper > p > strong').text() !== 'No se ha encontrado la palabra exacta',
     };
 };
 exports.default = parseSpanish;

package/build/types.d.ts

@@ -1,4 +1,4 @@
 export interface ParseResult {
     definitions: string[];
-    isAllowed: boolean;
+    exists: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "description": "Scrabble Solver 2 - Word definitions",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -10,8 +10,8 @@
   },
   "author": {
     "name": "Kamil Mielnik",
-    "email": "kamil.adam.mielnik@gmail.com",
-    "url": "https://kamilmielnik.com/"
+    "email": "kamil@kamilmielnik.com",
+    "url": "https://kamilmielnik.com"
   },
   "license": "CC-BY-NC-ND-4.0",
   "bugs": {
@@ -23,7 +23,7 @@
     "clean": "rimraf build/ node_modules/ package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.9.1",
+    "@scrabble-solver/types": "^2.9.3",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "striptags": "^3.2.0"
@@ -31,5 +31,5 @@
   "devDependencies": {
     "@types/follow-redirects": "^1.14.1"
   },
-  "gitHead": "4849b4d123131fe043174f000c523868f3bd68c5"
+  "gitHead": "ef8d030cbb76256a377f747f7ebe4b85b7eba61e"
 }

package/src/getWordDefinition.ts

@@ -3,10 +3,10 @@ import { Locale, WordDefinition } from '@scrabble-solver/types';
 import { crawl } from './crawl';
 import { parse } from './parse';
 
-const getWordDefinition = async (locale: Locale, word: string): Promise<WordDefinition> => {
+const getWordDefinition = async (locale: Locale, word: string, isAllowed: boolean): Promise<WordDefinition> => {
   const html = await crawl(locale, word);
-  const { definitions, isAllowed } = parse(locale, html);
-  const wordDefinition = new WordDefinition({ definitions, isAllowed, word });
+  const { definitions, exists } = parse(locale, html);
+  const wordDefinition = new WordDefinition({ definitions, exists, isAllowed, word });
   return wordDefinition;
 };
 

package/src/lib/normalizeDefinition.ts

@@ -6,7 +6,9 @@ const EMPHASIS_TAGS = ['a', 'b', 'em', 'internalXref'];
 
 const normalizeHtmlTags: Normalize = (definition) => striptags(striptags(definition, EMPHASIS_TAGS), undefined, '"');
 
-const normalizeLineBreaks: Normalize = (definition) => definition.replace(/[\r\n]/g, '');
+const normalizeLineBreaks: Normalize = (definition) => definition.replace(/\r\n/g, '\n');
+
+const normalizeWhitespace: Normalize = (definition) => definition.replace(/[ ]+/g, ' ');
 
 const normalizeQuotes: Normalize = (definition) => definition.replace(/\."/g, '".');
 
@@ -33,6 +35,7 @@ const normalizers: Normalize[] = [
   normalizeMarkers,
   normalizeQuotes,
   normalizeLineBreaks,
+  normalizeWhitespace,
   normalizeTrailingSymbols,
   normalizeLeadingSymbols,
   normalizeNonWords,

package/src/parse/__tests__/expected/de-DE.hm.json

@@ -0,0 +1,4 @@
+{
+  "definitions": ["[umgangssprachlich] ...\n1. drückt Einverständnis, Zustimmung aus\n2. drückt Nachdenklichkeit aus"],
+  "exists": true
+}

package/src/parse/__tests__/expected/de-DE.ho.json

@@ -0,0 +1,9 @@
+{
+  "definitions": [
+    "⟨ho, ho!⟩, ⟨ho, ho, ho!⟩, ⟨ho, ho, ho, ho!⟩ imitiert ein Lachen mit tiefer, maskuliner Stimme oder auch ein spöttisches, höhnisches oder triumphierendes Lachen",
+    "⟨ho!⟩, ⟨ho, ho!⟩\na) drückt Protest, Zweifel oder Abwehr aus\nb) drückt Überraschung, Begeisterung oder Freude aus",
+    "[umgangssprachlich] Zuruf, um jmdn. auf sich aufmerksam zu machen; auch zur Begrüßung verwendet",
+    "Zuruf vor allem an Reittiere und Zugtiere\na) verwendet, um das Tier zu beruhigen, zu loben und aufzufordern, langsamer zu werden, stehen zu bleiben\nb) Zuruf, der das Tier antreiben soll"
+  ],
+  "exists": true
+}

package/src/parse/__tests__/expected/de-DE.kolla.json

@@ -0,0 +1,4 @@
+{
+  "definitions": ["drückt Überraschung aus"],
+  "exists": true
+}

package/src/parse/__tests__/expected/de-DE.vom.json

@@ -0,0 +1,16 @@
+{
+  "definitions": [
+    "gibt an, dass ein Ort, eine Person Ausgangspunkt einer Bewegung oder eines Vorgangs ist, der einer Bewegung ähnelt",
+    "drückt den Vorgang des Entfernens, den Zustand des Getrenntseins von etw., jmdm. aus",
+    "gibt an, dass ein Ort, eine Person Anfangspunkt einer räumlichen Erstreckung, Bezugspunkt für die Kennzeichnung einer Entfernung oder eines Lageverhältnisses ist",
+    "gibt die Herkunft, den Ursprung an",
+    "gibt das Mittel an",
+    "mit",
+    "gibt den Bereich an, für den eine Aussage gilt",
+    "was … betrifft, hinsichtlich",
+    "gibt bei Aussagen über bestimmte Eigenschaften, Verhaltensweisen die Person an, für die die Aussage gilt",
+    "gibt den Gegenstand, Inhalt an",
+    "über"
+  ],
+  "exists": true
+}

package/src/parse/__tests__/expected/en-US.awe.json

@@ -5,5 +5,5 @@
     "the power to inspire dread",
     "to inspire or fill with awe"
   ],
-  "isAllowed": true
+  "exists": true
 }

package/src/parse/__tests__/expected/en-US.pawn.json

@@ -9,5 +9,5 @@
     "the act of pawning",
     "to deposit in pledge or as security especially in exchange for money"
   ],
-  "isAllowed": true
+  "exists": true
 }

package/src/parse/__tests__/expected/en-US.pawnee.json

@@ -1,4 +1,4 @@
 {
   "definitions": ["a member of an American Indian people originally of Kansas and Nebraska"],
-  "isAllowed": true
+  "exists": true
 }

package/src/parse/__tests__/expected/en-US.pean.json

@@ -5,5 +5,5 @@
     "of the heraldic fur pean",
     "variant spelling of peen"
   ],
-  "isAllowed": true
+  "exists": true
 }

package/src/parse/__tests__/expected/en-US.wiz.json

@@ -1,4 +1,4 @@
 {
   "definitions": ["a person who is very good at something, wizard"],
-  "isAllowed": true
+  "exists": true
 }

package/src/parse/__tests__/expected/es-ES.corma.json

@@ -3,5 +3,5 @@
     "Cepo de madera que se fijaba al pie de un hombre o un animal para impedirle andar.",
     "Molestia o impedimento para obrar con libertad."
   ],
-  "isAllowed": true
+  "exists": true
 }

package/src/parse/__tests__/expected/es-ES.portero.json

@@ -5,5 +5,5 @@
     "Funcionario subalterno que se encarga de la vigilancia, limpieza o servicios auxiliares en oficinas públicas.",
     "Jugador que en algunos deportes defiende la portería."
   ],
-  "isAllowed": true
+  "exists": true
 }