@scrabble-solver/word-definitions 2.8.2 → 2.8.3

package/build/crawl/crawl.js

@@ -2,23 +2,22 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("@scrabble-solver/types");
-var crawlEnglish_1 = __importDefault(require("./crawlEnglish"));
-var crawlFrench_1 = __importDefault(require("./crawlFrench"));
-var crawlGerman_1 = __importDefault(require("./crawlGerman"));
-var crawlPolish_1 = __importDefault(require("./crawlPolish"));
-var crawlSpanish_1 = __importDefault(require("./crawlSpanish"));
-var crawlPerLocale = (_a = {},
-    _a[types_1.Locale.DE_DE] = crawlGerman_1.default,
-    _a[types_1.Locale.EN_GB] = crawlEnglish_1.default,
-    _a[types_1.Locale.EN_US] = crawlEnglish_1.default,
-    _a[types_1.Locale.ES_ES] = crawlSpanish_1.default,
-    _a[types_1.Locale.FR_FR] = crawlFrench_1.default,
-    _a[types_1.Locale.PL_PL] = crawlPolish_1.default,
-    _a);
-var crawl = function (locale, word) {
+const types_1 = require("@scrabble-solver/types");
+const crawlEnglish_1 = __importDefault(require("./crawlEnglish"));
+const crawlFrench_1 = __importDefault(require("./crawlFrench"));
+const crawlGerman_1 = __importDefault(require("./crawlGerman"));
+const crawlPolish_1 = __importDefault(require("./crawlPolish"));
+const crawlSpanish_1 = __importDefault(require("./crawlSpanish"));
+const crawlPerLocale = {
+    [types_1.Locale.DE_DE]: crawlGerman_1.default,
+    [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.FR_FR]: crawlFrench_1.default,
+    [types_1.Locale.PL_PL]: crawlPolish_1.default,
+};
+const crawl = (locale, word) => {
     return crawlPerLocale[locale](word);
 };
 exports.default = crawl;

package/build/crawl/crawlEnglish.js

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

package/build/crawl/crawlFrench.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var lib_1 = require("../lib");
-var crawlFrench = function (word) {
+const lib_1 = require("../lib");
+const crawlFrench = (word) => {
     return (0, lib_1.request)({
         protocol: 'https',
         hostname: 'www.cnrtl.fr',
-        path: "/definition/".concat(encodeURIComponent(word)),
+        path: `/definition/${encodeURIComponent(word)}`,
     });
 };
 exports.default = crawlFrench;

package/build/crawl/crawlGerman.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var lib_1 = require("../lib");
-var crawlGerman = function (word) {
+const lib_1 = require("../lib");
+const crawlGerman = (word) => {
     return (0, lib_1.request)({
         protocol: 'https',
         hostname: 'www.dwds.de',
-        path: "?q=".concat(encodeURIComponent(word), "&from=wb"),
+        path: `?q=${encodeURIComponent(word)}&from=wb`,
     });
 };
 exports.default = crawlGerman;

package/build/crawl/crawlPolish.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var lib_1 = require("../lib");
-var crawlPolish = function (word) {
+const lib_1 = require("../lib");
+const crawlPolish = (word) => {
     return (0, lib_1.request)({
         protocol: 'https',
         hostname: 'sjp.pl',
-        path: "/".concat(encodeURIComponent(word)),
+        path: `/${encodeURIComponent(word)}`,
     });
 };
 exports.default = crawlPolish;

package/build/crawl/crawlSpanish.js

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

package/build/getWordDefinition.js

@@ -1,55 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("@scrabble-solver/types");
-var crawl_1 = require("./crawl");
-var parse_1 = require("./parse");
-var getWordDefinition = function (locale, word) { return __awaiter(void 0, void 0, void 0, function () {
-    var html, _a, definitions, isAllowed, wordDefinition;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, (0, crawl_1.crawl)(locale, word)];
-            case 1:
-                html = _b.sent();
-                _a = (0, parse_1.parse)(locale, html), definitions = _a.definitions, isAllowed = _a.isAllowed;
-                wordDefinition = new types_1.WordDefinition({ definitions: definitions, isAllowed: isAllowed, word: word });
-                return [2 /*return*/, wordDefinition];
-        }
-    });
-}); };
+const types_1 = require("@scrabble-solver/types");
+const crawl_1 = require("./crawl");
+const parse_1 = require("./parse");
+const getWordDefinition = async (locale, word) => {
+    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 });
+    return wordDefinition;
+};
 exports.default = getWordDefinition;

package/build/lib/normalizeDefinition.js

@@ -3,25 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var striptags_1 = __importDefault(require("striptags"));
-var EMPHASIS_TAGS = ['a', 'b', 'em', 'internalXref'];
-var normalizeHtmlTags = function (definition) { return (0, striptags_1.default)((0, striptags_1.default)(definition, EMPHASIS_TAGS), undefined, '"'); };
-var normalizeLineBreaks = function (definition) { return definition.replace(/[\r\n]/g, ''); };
-var normalizeQuotes = function (definition) { return definition.replace(/\."/g, '".'); };
+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 normalizeQuotes = (definition) => definition.replace(/\."/g, '".');
 /**
  * `(1.2) definition` -> `definition`
  */
-var normalizeMarkers = function (definition) { return definition.replace(/^\(\d+\.\d+\)\s+/g, ''); };
-var normalizeTrailingSymbols = function (definition) { return definition.trim().replace(/:$/, ''); };
-var normalizeLeadingSymbols = function (definition) { return definition.trim().replace(/^:/, ''); };
-var normalizeNonWords = function (definition) { return (/\w/.test(definition) ? definition : ''); };
-var normalizeCommas = function (definition) {
+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 : '');
+const normalizeCommas = (definition) => {
     return definition
         .replace(/\s+,\s+/g, ', ')
         .replace(/^,/, '')
         .replace(/,$/, '');
 };
-var normalizers = [
+const normalizers = [
     normalizeHtmlTags,
     normalizeMarkers,
     normalizeQuotes,
@@ -30,11 +30,11 @@ var normalizers = [
     normalizeLeadingSymbols,
     normalizeNonWords,
     normalizeCommas,
-    function (definition) { return definition.trim(); },
+    (definition) => definition.trim(),
 ];
-var normalizeDefinition = function (definition) {
-    var normalized = normalizers.reduce(function (result, normalize) { return normalize(result); }, definition);
-    var hasChanged = normalized !== definition;
+const normalizeDefinition = (definition) => {
+    const normalized = normalizers.reduce((result, normalize) => normalize(result), definition);
+    const hasChanged = normalized !== definition;
     return hasChanged ? normalizeDefinition(normalized) : normalized;
 };
 exports.default = normalizeDefinition;

package/build/lib/request.js

@@ -1,29 +1,17 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var follow_redirects_1 = require("follow-redirects");
-var request = function (_a) {
-    var protocol = _a.protocol, options = __rest(_a, ["protocol"]);
-    var agent = protocol === 'https' ? follow_redirects_1.https : follow_redirects_1.http;
-    return new Promise(function (resolve, reject) {
+const follow_redirects_1 = require("follow-redirects");
+const request = ({ protocol, ...options }) => {
+    const agent = protocol === 'https' ? follow_redirects_1.https : follow_redirects_1.http;
+    return new Promise((resolve, reject) => {
         return agent
-            .get(options, function (response) {
-            var data = '';
+            .get(options, (response) => {
+            let data = '';
             response.setEncoding('utf8');
-            response.on('data', function (chunk) {
+            response.on('data', (chunk) => {
                 data += chunk;
             });
-            response.on('end', function () {
+            response.on('end', () => {
                 try {
                     resolve(data);
                 }

package/build/lib/unique.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var unique = function (array) { return Array.from(new Set(array)); };
+const unique = (array) => Array.from(new Set(array));
 exports.default = unique;

package/build/parse/parse.js

@@ -2,28 +2,27 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("@scrabble-solver/types");
-var lib_1 = require("../lib");
-var parseEnglish_1 = __importDefault(require("./parseEnglish"));
-var parseFrench_1 = __importDefault(require("./parseFrench"));
-var parseGerman_1 = __importDefault(require("./parseGerman"));
-var parsePolish_1 = __importDefault(require("./parsePolish"));
-var parseSpanish_1 = __importDefault(require("./parseSpanish"));
-var parsePerLocale = (_a = {},
-    _a[types_1.Locale.DE_DE] = parseGerman_1.default,
-    _a[types_1.Locale.EN_GB] = parseEnglish_1.default,
-    _a[types_1.Locale.EN_US] = parseEnglish_1.default,
-    _a[types_1.Locale.ES_ES] = parseSpanish_1.default,
-    _a[types_1.Locale.FR_FR] = parseFrench_1.default,
-    _a[types_1.Locale.PL_PL] = parsePolish_1.default,
-    _a);
-var parse = function (locale, html) {
-    var _a = parsePerLocale[locale](html), definitions = _a.definitions, isAllowed = _a.isAllowed;
+const types_1 = require("@scrabble-solver/types");
+const lib_1 = require("../lib");
+const parseEnglish_1 = __importDefault(require("./parseEnglish"));
+const parseFrench_1 = __importDefault(require("./parseFrench"));
+const parseGerman_1 = __importDefault(require("./parseGerman"));
+const parsePolish_1 = __importDefault(require("./parsePolish"));
+const parseSpanish_1 = __importDefault(require("./parseSpanish"));
+const parsePerLocale = {
+    [types_1.Locale.DE_DE]: parseGerman_1.default,
+    [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.FR_FR]: parseFrench_1.default,
+    [types_1.Locale.PL_PL]: parsePolish_1.default,
+};
+const parse = (locale, html) => {
+    const { definitions, isAllowed } = parsePerLocale[locale](html);
     return {
         definitions: (0, lib_1.unique)(definitions.map(lib_1.normalizeDefinition).filter(Boolean)),
-        isAllowed: isAllowed,
+        isAllowed,
     };
 };
 exports.default = parse;

package/build/parse/parseEnglish.js

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var cheerio_1 = __importDefault(require("cheerio"));
-var parseEnglish = function (html) {
-    var $ = cheerio_1.default.load(html);
+const cheerio_1 = __importDefault(require("cheerio"));
+const parseEnglish = (html) => {
+    const $ = cheerio_1.default.load(html);
     $('strong.mw_t_bc').replaceWith(', ');
     $('.text-lowercase').remove();
     $('[id^=dictionary-entry]').find('.dtText > *:not(a)').remove();
-    var $definitions = $('[id^=dictionary-entry]').find('.dtText, .cxl-ref');
+    const $definitions = $('[id^=dictionary-entry]').find('.dtText, .cxl-ref');
     return {
-        definitions: Array.from($definitions).map(function (definition) { return $(definition).text(); }),
+        definitions: Array.from($definitions).map((definition) => $(definition).text()),
         isAllowed: $definitions.length > 0,
     };
 };

package/build/parse/parseFrench.js

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

package/build/parse/parseGerman.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var cheerio_1 = __importDefault(require("cheerio"));
-var parseGerman = function (html) {
-    var $ = cheerio_1.default.load(html);
-    var $meaningOverview = $('.bedeutungsuebersicht');
-    var $definitions;
+const cheerio_1 = __importDefault(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');
     }
@@ -15,7 +15,7 @@ var parseGerman = function (html) {
         $definitions = $('.dwdswb-lesart .dwdswb-definition');
     }
     return {
-        definitions: Array.from($definitions).map(function (definition) { return $(definition).text().replace('/\n/', ''); }),
+        definitions: Array.from($definitions).map((definition) => $(definition).text().replace('/\n/', '')),
         isAllowed: $definitions.length > 0,
     };
 };

package/build/parse/parsePolish.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var cheerio_1 = __importDefault(require("cheerio"));
-var parsePolish = function (html) {
-    var $ = cheerio_1.default.load(html);
-    var $header = $($('h1')[0]);
-    var $isAllowed = $header.next();
-    var $definitions = $header.next().next().next().next();
+const cheerio_1 = __importDefault(require("cheerio"));
+const parsePolish = (html) => {
+    const $ = cheerio_1.default.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,

package/build/parse/parseSpanish.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var cheerio_1 = __importDefault(require("cheerio"));
-var parseSpanish = function (html) {
-    var $ = cheerio_1.default.load(html);
+const cheerio_1 = __importDefault(require("cheerio"));
+const parseSpanish = (html) => {
+    const $ = cheerio_1.default.load(html);
     $('.verdBold14 + .gris11 + .gris13').remove();
     $('br + .gris13').remove();
     $('.grisItalic13 + .gris13').remove();
@@ -13,19 +13,19 @@ var parseSpanish = function (html) {
     $('font.gris11').remove();
     $('font[class^="grisBold"]').remove();
     $('font[class^="grisItalic"]').remove();
-    Array.from($('.gris13')).forEach(function (element) {
-        var children = $(element).find('.gris13');
+    Array.from($('.gris13')).forEach((element) => {
+        const children = $(element).find('.gris13');
         if (children && children.length > 0) {
             children.remove();
         }
     });
-    var definitions = Array.from($('.dcom-search-result .gris13'));
+    const definitions = Array.from($('.dcom-search-result .gris13'));
     return {
         definitions: definitions
-            .map(function (definition) { return $(definition).text().trim(); })
+            .map((definition) => $(definition).text().trim())
             .filter(Boolean)
-            .map(function (definition) { return definition.replace(/\s+\.$/g, ''); })
-            .map(function (definition) { return (definition.endsWith('.') ? definition : "".concat(definition, ".")); }),
+            .map((definition) => definition.replace(/\s+\.$/g, ''))
+            .map((definition) => (definition.endsWith('.') ? definition : `${definition}.`)),
         isAllowed: definitions.length > 0,
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "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.8.2",
+    "@scrabble-solver/types": "^2.8.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": "bf360562a79572dd4640ac7cd7f26199f1ba6899"
+  "gitHead": "116f214733e7ad071044f556bcf67e867da3d9ca"
 }