wiki-entity 0.5.11 → 0.6.0

package/lib/index.js

@@ -19,7 +19,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEntities = exports.WikipediaApi = exports.simplifyEntity = void 0;
+exports.mapRedirects = exports.getEntities = exports.WikipediaApi = exports.simplifyEntity = void 0;
 const wikidata_1 = require("./wikidata");
 const api_1 = require("./wikipedia/api");
 Object.defineProperty(exports, "WikipediaApi", { enumerable: true, get: function () { return api_1.Api; } });
@@ -29,10 +29,30 @@ var simplify_entity_1 = require("./wikidata/simplify_entity");
 Object.defineProperty(exports, "simplifyEntity", { enumerable: true, get: function () { return simplify_entity_1.simplifyEntity; } });
 __exportStar(require("./simpleEntity"), exports);
 __exportStar(require("./types"), exports);
+const getAllEntities = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const entities = yield (0, wikidata_1.getEntities)(params);
+    const titles = params.titles || [];
+    if (params.redirect === "no" || !titles.length || params.ids)
+        return entities;
+    const lang = params.language || "en";
+    const notFoundTitle = titles.find((title) => !Object.entries(entities).find(([, entity]) => {
+        return (!entity.sitelinks ||
+            !entity.sitelinks[lang] ||
+            entity.sitelinks[lang] !== title);
+    }));
+    if (notFoundTitle.length === 0)
+        return entities;
+    const redirects = yield mapRedirects(titles, lang);
+    const redirectTitles = [...new Set(Object.values(redirects))];
+    if (redirectTitles.length === 0)
+        return entities;
+    const redirectEntities = yield (0, wikidata_1.getEntities)(Object.assign(Object.assign({}, params), { ids: undefined, titles: redirectTitles }));
+    return Object.assign(Object.assign({}, entities), redirectEntities);
+});
 function getEntities(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const lang = params.language || "en";
-        const entities = yield (0, wikidata_1.getEntities)(params);
+        const entities = yield getAllEntities(params);
         const ids = Object.keys(entities).filter((id) => (0, utils_1.isValidWikiId)(id));
         if (ids.length === 0)
             return [];
@@ -100,3 +120,27 @@ function getEntities(params) {
     });
 }
 exports.getEntities = getEntities;
+function mapRedirects(titles, lang) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const wikiApi = new api_1.Api();
+        return wikiApi
+            .redirects()
+            .query(lang, {
+            titles: titles.map((it) => it.replace(/\s+/g, "_")).join("|"),
+            redirects: "yes"
+        })
+            .then((apiResults) => {
+            const result = {};
+            apiResults.forEach((r) => {
+                var _a;
+                if ((_a = r.redirects) === null || _a === void 0 ? void 0 : _a.length) {
+                    const it = r.redirects.find((it) => titles.includes(it));
+                    if (it && it !== r.title)
+                        result[it] = r.title;
+                }
+            });
+            return result;
+        });
+    });
+}
+exports.mapRedirects = mapRedirects;

package/lib/simpleEntity/getEntityCountry.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEntityCountryCode = void 0;
-const countries = require('../../data/countries.json');
+const countries = require("../../data/countries.json");
 function getEntityCountryCode(wikiEntity) {
-    if (!wikiEntity) {
+    if (!(wikiEntity === null || wikiEntity === void 0 ? void 0 : wikiEntity.claims)) {
         return null;
     }
     const countryIds = getEntityCountryIds(wikiEntity);
@@ -17,6 +17,9 @@ function getEntityCountryCode(wikiEntity) {
 }
 exports.getEntityCountryCode = getEntityCountryCode;
 function getEntityCountryIds(wikiEntity) {
-    let prop = wikiEntity.claims.P17 || wikiEntity.claims.P27 || wikiEntity.claims.P495 || wikiEntity.claims.P1532;
-    return prop && prop.values.map(item => item.value) || [];
+    let prop = wikiEntity.claims.P17 ||
+        wikiEntity.claims.P27 ||
+        wikiEntity.claims.P495 ||
+        wikiEntity.claims.P1532;
+    return (prop && prop.values.map((item) => item.value)) || [];
 }

package/lib/wikidata/index.js

@@ -62,7 +62,7 @@ function exploreEntitiesProperties(entities, lang) {
                 }
             });
         });
-        return null;
+        return entities;
     });
 }
 function exploreEntityClaims(claims, params) {

package/lib/wikipedia/api.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-entity",
-  "version": "0.5.11",
+  "version": "0.6.0",
   "description": "Wiki entity fetcher",
   "main": "./lib/index.js",
   "types": "./types/index.d.ts",
@@ -41,6 +41,6 @@
     "typescript": "latest"
   },
   "dependencies": {
-    "axios": "^0.21.1"
+    "axios": "^1.6.0"
   }
 }

package/types/index.d.ts

@@ -5,3 +5,4 @@ export { WikipediaApi };
 export * from "./simpleEntity";
 export * from "./types";
 export declare function getEntities(params: WikiEntitiesParams): Promise<WikiEntity[]>;
+export declare function mapRedirects(titles: string[], lang: string): Promise<Record<string, string>>;