wiki-entity 0.5.6 → 0.5.7

package/lib/index.js

@@ -1,30 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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);
+};
 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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntities = exports.WikipediaApi = exports.simplifyEntity = void 0;
 const wikidata_1 = require("./wikidata");
 const api_1 = require("./wikipedia/api");
-exports.WikipediaApi = api_1.Api;
+Object.defineProperty(exports, "WikipediaApi", { enumerable: true, get: function () { return api_1.Api; } });
 const utils_1 = require("./utils");
 const get_entity_types_1 = require("./wikidata/get_entity_types");
 var simplify_entity_1 = require("./wikidata/simplify_entity");
-exports.simplifyEntity = simplify_entity_1.simplifyEntity;
-__export(require("./simpleEntity"));
-__export(require("./types"));
+Object.defineProperty(exports, "simplifyEntity", { enumerable: true, get: function () { return simplify_entity_1.simplifyEntity; } });
+__exportStar(require("./simpleEntity"), exports);
+__exportStar(require("./types"), exports);
 function getEntities(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const lang = params.language || "en";
-        const entities = yield wikidata_1.getEntities(params);
-        const ids = Object.keys(entities).filter((id) => utils_1.isValidWikiId(id));
+        const entities = yield (0, wikidata_1.getEntities)(params);
+        const ids = Object.keys(entities).filter((id) => (0, utils_1.isValidWikiId)(id));
         if (ids.length === 0)
             return [];
         const wikiApi = new api_1.Api({}, params.httpTimeout);
@@ -73,7 +82,7 @@ function getEntities(params) {
                 if (entities[id] && entities[id].sitelinks) {
                     const enName = entities[id].sitelinks["en"];
                     if (enName) {
-                        tasks.push(get_entity_types_1.getEntityTypesByName(enName, prefixes).then((types) => {
+                        tasks.push((0, get_entity_types_1.getEntityTypesByName)(enName, prefixes).then((types) => {
                             entities[id].types = types;
                         }));
                     }

package/lib/request.js

@@ -1,9 +1,10 @@
 "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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -11,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 function default_1(url, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield axios_1.default(url, Object.assign({ method: "GET", responseType: "json", headers: { "User-Agent": "entity-finder" } }, options, { timeout: options.timeout || 10 * 1000 }));
+        const response = yield (0, axios_1.default)(url, Object.assign(Object.assign({ method: "GET", responseType: "json", headers: { "User-Agent": "entity-finder" } }, options), { timeout: options.timeout || 10 * 1000 }));
         return response.data;
     });
 }

package/lib/simpleEntity/convertToSimpleEntity.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToSimpleEntity = void 0;
 const getEntityType_1 = require("./getEntityType");
 const getEntityInstanceType_1 = require("./getEntityInstanceType");
 const getEntityTypeByExtract_1 = require("./getEntityTypeByExtract");
@@ -18,13 +19,13 @@ function convertToSimpleEntity(wikiEntity, lang, options) {
     if (wikiEntity.redirectsToId)
         entity.redirectsToId = wikiEntity.redirectsToId;
     if (wikiEntity.types) {
-        entity.types = utils_1.uniq(wikiEntity.types.filter((item) => !/:(Thing|Agent)$/.test(item)));
+        entity.types = (0, utils_1.uniq)(wikiEntity.types.filter((item) => !/:(Thing|Agent)$/.test(item)));
     }
-    entity.type = getEntityType_1.getEntityType(wikiEntity);
+    entity.type = (0, getEntityType_1.getEntityType)(wikiEntity);
     if (!entity.type) {
-        entity.type = getEntityInstanceType_1.getEntityType(wikiEntity);
+        entity.type = (0, getEntityInstanceType_1.getEntityType)(wikiEntity);
         if (!entity.type && entity.about && !entity.types) {
-            entity.type = getEntityTypeByExtract_1.getEntityTypeByExtract(entity.about, lang);
+            entity.type = (0, getEntityTypeByExtract_1.getEntityTypeByExtract)(entity.about, lang);
         }
         if (!entity.type && options.defaultType) {
             entity.type = options.defaultType;
@@ -37,14 +38,14 @@ function convertToSimpleEntity(wikiEntity, lang, options) {
     if (wikiEntity.claims) {
         const ids = Object.keys(wikiEntity.claims);
         if (ids.length) {
-            entity.data = getEntityData_1.getEntityData(wikiEntity);
+            entity.data = (0, getEntityData_1.getEntityData)(wikiEntity);
         }
-        entity.countryCodes = getEntityCountry_1.getEntityCountryCode(wikiEntity);
+        entity.countryCodes = (0, getEntityCountry_1.getEntityCountryCode)(wikiEntity);
     }
     return entity;
 }
 exports.convertToSimpleEntity = convertToSimpleEntity;
 function createCategories(entity) {
     let categories = entity.categories || [];
-    return utils_1.uniq(categories);
+    return (0, utils_1.uniq)(categories);
 }

package/lib/simpleEntity/getEntityCountry.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntityCountryCode = void 0;
 const countries = require('../../data/countries.json');
 function getEntityCountryCode(wikiEntity) {
     if (!wikiEntity) {

package/lib/simpleEntity/getEntityData.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntityData = void 0;
 function getEntityData(wikiEntity) {
     if (!wikiEntity.claims) {
         return null;

package/lib/simpleEntity/getEntityInstanceType.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntityType = void 0;
 const simpleEntity_1 = require("./simpleEntity");
 function getEntityType(wikiEntity) {
     if (!wikiEntity.claims) {

package/lib/simpleEntity/getEntityType.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntityType = void 0;
 const simpleEntity_1 = require("./simpleEntity");
 const TYPES_MAP = {
     'dbo:FictionalCharacter': simpleEntity_1.SimpleEntityType.WORK,

package/lib/simpleEntity/getEntityTypeByExtract.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntityTypeByExtract = void 0;
 const simpleEntity_1 = require("./simpleEntity");
 const MAP = {
     ro: [

package/lib/simpleEntity/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToSimpleEntity = exports.SimpleEntityType = void 0;
 var simpleEntity_1 = require("./simpleEntity");
-exports.SimpleEntityType = simpleEntity_1.SimpleEntityType;
+Object.defineProperty(exports, "SimpleEntityType", { enumerable: true, get: function () { return simpleEntity_1.SimpleEntityType; } });
 var convertToSimpleEntity_1 = require("./convertToSimpleEntity");
-exports.convertToSimpleEntity = convertToSimpleEntity_1.convertToSimpleEntity;
+Object.defineProperty(exports, "convertToSimpleEntity", { enumerable: true, get: function () { return convertToSimpleEntity_1.convertToSimpleEntity; } });

package/lib/simpleEntity/simpleEntity.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SIMPLE_ENTITY_TYPES = exports.SimpleEntityType = void 0;
 var SimpleEntityType;
 (function (SimpleEntityType) {
     SimpleEntityType["EVENT"] = "E";

package/lib/types.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WikidataPropsParam = void 0;
 var WikidataPropsParam;
 (function (WikidataPropsParam) {
     WikidataPropsParam["info"] = "info";

package/lib/utils.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidWikiId = exports.uniq = exports.eachSeries = void 0;
 function eachSeries(arr, iteratorFn) {
     return arr.reduce((p, item) => p.then(() => iteratorFn(item)), Promise.resolve());
 }

package/lib/wikidata/api.js

@@ -1,13 +1,15 @@
 "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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateParams = exports.getManyEntities = exports.getEntities = void 0;
 const request_1 = require("../request");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
@@ -38,7 +40,7 @@ function getEntities(params) {
         else {
             delete qs.sites;
         }
-        const data = yield request_1.default(API_URL, {
+        const data = yield (0, request_1.default)(API_URL, {
             params: qs,
             timeout: params.httpTimeout
         });
@@ -49,7 +51,7 @@ function getEntities(params) {
             const entity = entities[id];
             if (entity.redirects && entity.redirects.to)
                 entity.redirectsToId = entity.redirects.to;
-            if (!utils_1.isValidWikiId(id) || ~Object.keys(entities[id]).indexOf("missing")) {
+            if (!(0, utils_1.isValidWikiId)(id) || ~Object.keys(entities[id]).indexOf("missing")) {
                 delete entities[id];
             }
         }

package/lib/wikidata/get_entity_types.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntityTypesByName = void 0;
 const request_1 = require("../request");
 const PREFIXES_MAP = {
     "http://www.ontologydesignpatterns.org/ont/dul/DUL.owl#": "dul",
@@ -35,7 +36,7 @@ function parseTypes(types) {
 function dbpediaTypes(name) {
     const url = `http://dbpedia.org/resource/${name.replace(/\s+/g, "_")}`;
     const query = `SELECT ?type WHERE { <${url}> rdf:type ?type }`;
-    return request_1.default("http://dbpedia.org/sparql", {
+    return (0, request_1.default)("http://dbpedia.org/sparql", {
         params: { query: query },
         timeout: 30 * 1000
     })

package/lib/wikidata/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.exploreEntityClaims = exports.getEntities = void 0;
 const types_1 = require("../types");
 const api_1 = require("./api");
 const simplify_entity_1 = require("./simplify_entity");
@@ -7,17 +8,17 @@ const utils_1 = require("../utils");
 function getEntities(params) {
     const claims = params.claims || "none";
     const lang = params.language || "en";
-    return api_1.getManyEntities(params).then(function (entities) {
-        const ids = Object.keys(entities).filter((id) => utils_1.isValidWikiId(id));
+    return (0, api_1.getManyEntities)(params).then(function (entities) {
+        const ids = Object.keys(entities).filter((id) => (0, utils_1.isValidWikiId)(id));
         ids.forEach((id) => {
-            entities[id] = simplify_entity_1.simplifyEntity(lang, entities[id]);
+            entities[id] = (0, simplify_entity_1.simplifyEntity)(lang, entities[id]);
         });
         const tasks = [];
         if (~["all", "property"].indexOf(claims)) {
             tasks.push(exploreEntitiesProperties(entities, lang));
         }
         if (~["all", "item"].indexOf(claims)) {
-            tasks.push(utils_1.eachSeries(ids, (id) => exploreEntityClaims(entities[id].claims, { language: lang })));
+            tasks.push((0, utils_1.eachSeries)(ids, (id) => exploreEntityClaims(entities[id].claims, { language: lang })));
         }
         return Promise.all(tasks).then(() => entities);
     });
@@ -35,7 +36,7 @@ function exploreEntitiesProperties(entities, lang) {
     if (!ids.length) {
         return Promise.resolve();
     }
-    ids = utils_1.uniq(ids);
+    ids = (0, utils_1.uniq)(ids);
     return getEntities({
         ids: ids,
         language: lang,

package/lib/wikidata/simplify_claims.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.simplifyClaim = exports.simplifyPropertyClaims = exports.simplifyClaims = void 0;
 function simplifyClaims(claims) {
     const simpleClaims = {};
     for (let id in claims) {

package/lib/wikidata/simplify_entity.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.simplifySitelinks = exports.simplifyLabels = exports.simplifyDescriptions = exports.simplifyAliases = exports.simplifyEntity = void 0;
 const simplify_claims_1 = require("./simplify_claims");
 function simplifyEntity(lang, data, options = {}) {
     const entity = { id: data.id };
@@ -24,7 +25,7 @@ function simplifyEntity(lang, data, options = {}) {
     if (options.sitelinks !== false && data.sitelinks)
         entity.sitelinks = simplifySitelinks(data.sitelinks);
     if (options.claims !== false && data.claims)
-        entity.claims = simplify_claims_1.simplifyClaims(data.claims);
+        entity.claims = (0, simplify_claims_1.simplifyClaims)(data.claims);
     return entity;
 }
 exports.simplifyEntity = simplifyEntity;

package/lib/wikipedia/api.js

@@ -1,13 +1,15 @@
 "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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRedirects = exports.getExtract = exports.getExtracts = exports.Api = void 0;
 const request_1 = require("../request");
 const API_URL = "https://$lang.wikipedia.org/w/api.php";
 class Api {
@@ -22,7 +24,7 @@ class Api {
         return __awaiter(this, void 0, void 0, function* () {
             if (qs)
                 this.qs = Object.assign({}, this.qs, qs);
-            const data = yield request_1.default(API_URL.replace("$lang", lang), {
+            const data = yield (0, request_1.default)(API_URL.replace("$lang", lang), {
                 params: this.qs,
                 timeout: this.httpTimeout
             });
@@ -89,7 +91,7 @@ function getExtracts(params) {
             exsectionformat: "plain",
             format: "json"
         };
-        const data = yield request_1.default(API_URL.replace("$lang", params.lang), {
+        const data = yield (0, request_1.default)(API_URL.replace("$lang", params.lang), {
             params: qs
         });
         if (hasError(data))
@@ -101,7 +103,7 @@ function getExtracts(params) {
     });
 }
 exports.getExtracts = getExtracts;
-exports.getExtract = (lang, title, sentences) => getExtracts({
+const getExtract = (lang, title, sentences) => getExtracts({
     lang: lang,
     titles: [title],
     sentences: sentences
@@ -111,6 +113,7 @@ exports.getExtract = (lang, title, sentences) => getExtracts({
     }
     return null;
 });
+exports.getExtract = getExtract;
 function getRedirects(lang, title) {
     return __awaiter(this, void 0, void 0, function* () {
         const qs = {
@@ -120,7 +123,7 @@ function getRedirects(lang, title) {
             grdlimit: "max",
             format: "json"
         };
-        const data = yield request_1.default(API_URL.replace("$lang", lang), {
+        const data = yield (0, request_1.default)(API_URL.replace("$lang", lang), {
             params: qs
         });
         if (hasError(data))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-entity",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Wiki entity fetcher",
   "main": "./lib/index.js",
   "types": "./types/index.d.ts",
@@ -35,10 +35,10 @@
   },
   "homepage": "https://github.com/entitizer/wiki-entity#readme",
   "devDependencies": {
-    "@types/node": "^10.12.18",
+    "@types/node": "latest",
     "debug": "^4.1.1",
-    "mocha": "^5.2.0",
-    "typescript": "^3.2.2"
+    "mocha": "^9.1.2",
+    "typescript": "latest"
   },
   "dependencies": {
     "axios": "^0.21.1"

package/types/wikipedia/api.d.ts

@@ -27,5 +27,5 @@ export declare class Api {
     private addField;
 }
 export declare function getExtracts(params: ExtractsParamsType): Promise<ExtractType[]>;
-export declare const getExtract: (lang: string, title: string, sentences?: number) => Promise<ExtractType>;
+export declare const getExtract: (lang: string, title: string, sentences?: number) => Promise<ExtractType | null>;
 export declare function getRedirects(lang: string, title: string): Promise<string[]>;