wiki-entity 0.5.2 → 0.5.6

package/README.md

@@ -59,6 +59,7 @@ type WikiEntity = {
     types?: string[];
     redirects?: string[];
     categories?: string[];
+    redirectsToId?: string;
 }
 
 type WikidataProperty = {
@@ -113,6 +114,7 @@ export type SimpleEntity = {
     countryCodes?: string[]
     data?: SimpleEntityData
     categories?: string[]
+    redirectsToId?: string;
 }
 
 ```

package/lib/index.js

@@ -1,4 +1,12 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    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); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
@@ -13,30 +21,21 @@ exports.simplifyEntity = simplify_entity_1.simplifyEntity;
 __export(require("./simpleEntity"));
 __export(require("./types"));
 function getEntities(params) {
-    const lang = params.language || "en";
-    return wikidata_1.getEntities(params)
-        .then(function (wikiDataEntities) {
-        const entities = wikiDataEntities;
+    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));
-        if (ids.length === 0) {
-            return entities;
-        }
-        const tasks = [];
+        if (ids.length === 0)
+            return [];
         const wikiApi = new api_1.Api({}, params.httpTimeout);
-        let callWikiApi = false;
-        if (params.extract) {
-            callWikiApi = true;
+        if (params.extract)
             wikiApi.extract(params.extract);
-        }
-        if (params.redirects) {
-            callWikiApi = true;
+        if (params.redirects)
             wikiApi.redirects();
-        }
-        if (params.categories) {
-            callWikiApi = true;
+        if (params.categories)
             wikiApi.categories();
-        }
-        if (callWikiApi && entities[ids[0]] && entities[ids[0]].sitelinks) {
+        const tasks = [];
+        if (entities[ids[0]] && entities[ids[0]].sitelinks) {
             const titleIds = ids.reduce((prev, id) => {
                 if (entities[id] &&
                     entities[id].sitelinks &&
@@ -57,15 +56,13 @@ function getEntities(params) {
             })
                 .then((apiResults) => apiResults.forEach((result) => {
                 const entity = entities[titleIds[result.title]];
-                if (params.extract) {
+                entity.pageid = result.pageid;
+                if (params.extract)
                     entity.extract = result.extract;
-                }
-                if (params.redirects) {
+                if (params.redirects)
                     entity.redirects = result.redirects;
-                }
-                if (params.categories) {
+                if (params.categories)
                     entity.categories = result.categories;
-                }
             })));
         }
         if (params.types === true || Array.isArray(params.types)) {
@@ -83,11 +80,9 @@ function getEntities(params) {
                 }
             });
         }
-        return Promise.all(tasks).then(() => entities);
-    })
-        .then(function (resultEntities) {
-        return Object.keys(resultEntities)
-            .map((id) => resultEntities[id])
+        yield Promise.all(tasks);
+        return Object.keys(entities)
+            .map((id) => entities[id])
             .filter((it) => !!it);
     });
 }

package/lib/simpleEntity/convertToSimpleEntity.js

@@ -15,6 +15,8 @@ function convertToSimpleEntity(wikiEntity, lang, options) {
     entity.description = wikiEntity.description;
     entity.wikiPageId = wikiEntity.pageid;
     entity.about = wikiEntity.extract;
+    if (wikiEntity.redirectsToId)
+        entity.redirectsToId = wikiEntity.redirectsToId;
     if (wikiEntity.types) {
         entity.types = utils_1.uniq(wikiEntity.types.filter((item) => !/:(Thing|Agent)$/.test(item)));
     }

package/lib/simpleEntity/simpleEntity.js

@@ -15,5 +15,5 @@ exports.SIMPLE_ENTITY_TYPES = [
     SimpleEntityType.PLACE,
     SimpleEntityType.ORG,
     SimpleEntityType.PRODUCT,
-    SimpleEntityType.WORK,
+    SimpleEntityType.WORK
 ];

package/lib/wikidata/api.js

@@ -46,6 +46,9 @@ function getEntities(params) {
             throw getError(data);
         const entities = (data && data.entities) || {};
         for (let id of Object.keys(entities)) {
+            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")) {
                 delete entities[id];
             }

package/lib/wikidata/get_entity_types.js

@@ -33,15 +33,17 @@ function parseTypes(types) {
     return types.map((item) => item.type.value);
 }
 function dbpediaTypes(name) {
-    const query = `
-SELECT ?type
-WHERE {
-    <http://dbpedia.org/resource/${encodeURIComponent(name.replace(/\s+/g, "_"))}> rdf:type ?type
-}`;
+    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", {
         params: { query: query },
-        timeout: 10 * 1000
-    }).then((data) => data.results && data.results.bindings);
+        timeout: 30 * 1000
+    })
+        .then((data) => data.results && data.results.bindings)
+        .catch((error) => {
+        console.error(`${error.message}: ${url}`);
+        return [];
+    });
 }
 function repairTypes(types) {
     const personIndex = types.findIndex((item) => /:Person$/.test(item));

package/lib/wikidata/index.js

@@ -100,7 +100,7 @@ function exploreEntityClaims(claims, params) {
             pa.forEach((pai) => {
                 const val = claims[pai.pid].values[pai.index];
                 for (var prop in item) {
-                    if (~["label", "pageid", "description"].indexOf(prop)) {
+                    if (~["label", "description"].indexOf(prop)) {
                         val[prop] = item[prop];
                     }
                 }

package/lib/wikidata/simplify_entity.js

@@ -3,31 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const simplify_claims_1 = require("./simplify_claims");
 function simplifyEntity(lang, data, options = {}) {
     const entity = { id: data.id };
-    if (data.pageid) {
+    if (data.pageid)
         entity.pageid = data.pageid;
-    }
+    if (data.redirectsToId)
+        entity.redirectsToId = data.redirectsToId;
     if (options.labels !== false && data.labels) {
         entity.labels = simplifyLabels(data.labels);
         entity.label = entity.labels[lang];
     }
     if (options.descriptions !== false && data.descriptions) {
         entity.description = simplifyDescriptions(data.descriptions)[lang];
-        if (!entity.description) {
+        if (!entity.description)
             delete entity.description;
-        }
     }
     if (options.aliases !== false && data.aliases) {
         entity.aliases = simplifyAliases(data.aliases)[lang];
-        if (!entity.aliases) {
+        if (!entity.aliases)
             delete entity.aliases;
-        }
     }
-    if (options.sitelinks !== false && data.sitelinks) {
+    if (options.sitelinks !== false && data.sitelinks)
         entity.sitelinks = simplifySitelinks(data.sitelinks);
-    }
-    if (options.claims !== false && data.claims) {
+    if (options.claims !== false && data.claims)
         entity.claims = simplify_claims_1.simplifyClaims(data.claims);
-    }
     return entity;
 }
 exports.simplifyEntity = simplifyEntity;

package/lib/wikipedia/api.js

@@ -33,14 +33,14 @@ class Api {
                     .map((id) => data.query.pages[id])
                     .map((data) => {
                     const item = {
-                        pageid: data["pageid"],
-                        title: data["title"]
+                        pageid: data.pageid,
+                        title: data.title
                     };
                     if (data["categories"]) {
-                        item.categories = data["categories"].map((item) => item.title);
+                        item.categories = data["categories"].map((it) => it.title);
                     }
                     if (data["redirects"]) {
-                        item.redirects = data["redirects"].map((item) => item.title);
+                        item.redirects = data["redirects"].map((it) => it.title);
                     }
                     if (data["extract"]) {
                         item.extract = data["extract"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-entity",
-  "version": "0.5.2",
+  "version": "0.5.6",
   "description": "Wiki entity fetcher",
   "main": "./lib/index.js",
   "types": "./types/index.d.ts",

package/types/simpleEntity/simpleEntity.d.ts

@@ -24,4 +24,5 @@ export declare type SimpleEntity = {
     countryCodes?: string[];
     data?: SimpleEntityData;
     categories?: string[];
+    redirectsToId?: string;
 };

package/types/types.d.ts

@@ -35,6 +35,7 @@ export interface WikiEntity extends WikidataEntity {
     types?: string[];
     redirects?: string[];
     categories?: string[];
+    redirectsToId?: string;
 }
 export declare type WikiEntities = PlainObject<WikiEntity>;
 export declare type ParamClaimsType = "none" | "all" | "item" | "property";