cocoda-sdk 3.6.1 → 3.6.2

package/dist/esm/providers/base-provider.js

@@ -88,7 +88,7 @@ class BaseProvider {
       }
       return data;
     }, (error) => {
-      const count = error.config._retryCount ?? 0;
+      const count = error.config?._retryCount ?? 0;
       const method = error.config.method;
       const statusCode = error.response?.status;
       if (this._retryConfig.methods.includes(method) && this._retryConfig.statusCodes.includes(statusCode) && count < this._retryConfig.count) {

package/dist/esm/providers/concept-api-provider.js

@@ -190,13 +190,10 @@ class ConceptApiProvider extends BaseProvider {
     if (!url) {
       throw new errors.MissingApiUrlError();
     }
-    if (!concepts) {
-      throw new errors.InvalidOrMissingParameterError({ parameter: "concepts" });
-    }
     if (!Array.isArray(concepts)) {
-      concepts = [concepts];
+      concepts = concepts ? [concepts] : [];
     }
-    let uris = concepts.map((concept) => concept.uri).filter((uri) => uri != null);
+    const uris = concepts.map((concept) => concept.uri).filter((uri) => uri != null);
     return this.axios({
       ...config,
       method: "get",
@@ -204,7 +201,7 @@ class ConceptApiProvider extends BaseProvider {
       params: {
         ...this._defaultParams,
         // ? What should the default limit be?
-        limit: 500,
+        limit: 100,
         ...config.params || {},
         uri: uris.join("|")
       }

package/dist/esm/providers/ols-api-provider.js

@@ -16,7 +16,7 @@ class OlsApiProvider extends BaseProvider {
   };
   constructor(config) {
     super(config);
-    this.endpoint = config.endpoint;
+    this.endpoint = config.endpoint || config.uri;
   }
   /**
    * Used by `registryForScheme` (see src/lib/CocodaSDK.js) to determine a provider config for a concept schceme.
@@ -95,7 +95,7 @@ class OlsApiProvider extends BaseProvider {
     }
     if (term["http://www.w3.org/2000/01/rdf-schema#label"]) {
       concept.prefLabel = {};
-      concept.prefLabel[lan] = term["http://www.w3.org/2000/01/rdf-schema#label"];
+      concept.prefLabel[lan] = term["http://www.w3.org/2000/01/rdf-schema#label"].value || term["http://www.w3.org/2000/01/rdf-schema#label"];
     }
     concept.type = [
       "http://www.w3.org/2004/02/skos/core#Concept",
@@ -261,11 +261,8 @@ class OlsApiProvider extends BaseProvider {
   async getTop({ scheme }) {
     const VOCID = await this._getSchemeVOCID(scheme);
     if (VOCID) {
-      let url = this._getApiUrl(["ontologies", VOCID, "classes"], { hasDirectParents: "false" });
-      let response = await this._request(url);
-      if (response?.elements) {
-        return Promise.all(response.elements.map((item) => this._termToJSKOS(item)));
-      }
+      let response = await this._paginate(["ontologies", VOCID, "classes"], { hasDirectParents: "false" }, null);
+      return Promise.all(response.map((item) => this._termToJSKOS(item)));
     }
     return [];
   }
@@ -281,22 +278,16 @@ class OlsApiProvider extends BaseProvider {
   async getNarrower({ concept }) {
     const { VOCID, iri } = await this._splitConcept(concept);
     if (VOCID && iri) {
-      let url = this._getApiUrl(["ontologies", VOCID, "classes", iri, "children"]);
-      let response = await this._request(url);
-      if (response?.elements) {
-        return Promise.all(response.elements.map((item) => this._termToJSKOS(item)));
-      }
+      const items = await this._paginate(["ontologies", VOCID, "classes", iri, "children"], {}, 0);
+      return Promise.all(items.map((item) => this._termToJSKOS(item)));
     }
     return [];
   }
   async getAncestors({ concept }) {
     const { VOCID, iri } = await this._splitConcept(concept);
     if (VOCID && iri) {
-      let url = this._getApiUrl(["ontologies", VOCID, "classes", iri, "ancestors"]);
-      let response = await this._request(url);
-      if (response?.elements) {
-        return Promise.all(response.elements.map((item) => this._termToJSKOS(item)));
-      }
+      let response = await this._paginate(["ontologies", VOCID, "classes", iri, "ancestors"], {}, null);
+      return Promise.all(response.map((item) => this._termToJSKOS(item)));
     }
     return [];
   }

package/dist/esm/providers/skosmos-api-provider.js

@@ -45,7 +45,7 @@ class SkosmosApiProvider extends BaseProvider {
    * @private
    */
   _getApiUrl(scheme, endpoint, params) {
-    const VOCID = scheme && scheme.VOCID || this.schemes.find((s) => jskos.compare(s, scheme))?.VOCID;
+    const VOCID = scheme?.VOCID || this.schemes.find((s) => jskos.compare(s, scheme))?.VOCID;
     if (!VOCID) {
       throw new errors.InvalidOrMissingParameterError({ parameter: "scheme", message: "Missing scheme or VOCID property on scheme" });
     }
@@ -179,6 +179,32 @@ class SkosmosApiProvider extends BaseProvider {
     if (!concept.type.length) {
       concept.type = ["http://www.w3.org/2004/02/skos/core#Concept"];
     }
+    const map = {
+      "skos:definition": "definition",
+      "skos:note": "note",
+      "skos:scopeNote": "scopeNote",
+      "skos:example": "example",
+      "skos:historyNote": "historyNote",
+      "skos:editorialNote": "editorialNote",
+      "skos:changeNote": "changeNote"
+    };
+    for (let key in map) {
+      if (skosmosConcept[key]) {
+        const value = skosmosConcept[key];
+        if (value.lang && value.value) {
+          concept[map[key]] = {
+            [value.lang]: value.value
+          };
+        } else if (Array.isArray(value)) {
+          concept[map[key]] = {};
+          for (let val of value) {
+            if (val.lang && val.value) {
+              concept[map[key]][val.lang] = val.value;
+            }
+          }
+        }
+      }
+    }
     return concept;
   }
   /**
@@ -258,20 +284,20 @@ class SkosmosApiProvider extends BaseProvider {
     concepts = concepts.map((c) => ({ uri: c.uri, inScheme: c.inScheme }));
     const newConcepts = [];
     for (let concept of concepts) {
-      const url = this._getDataUrl(concept, { addFormatParameter: false });
+      if (!concept || !concept.uri) {
+        throw new errors.InvalidOrMissingParameterError({ parameter: "concept", message: "Missing concept URI" });
+      }
+      const params = { uri: concept.uri, format: "application/json" };
+      const url = this._getApiUrl(concept?.inScheme?.[0], "/data", params);
       if (!url) {
         continue;
       }
       const result = await this.axios({
         ...config,
         method: "get",
-        url,
-        params: {
-          uri: concept.uri,
-          format: "application/json"
-        }
+        url
       });
-      const resultConcept = result && result.graph && result.graph.find((c) => jskos.compare(c, concept));
+      const resultConcept = result?.graph?.find((c) => jskos.compare(c, concept));
       if (resultConcept) {
         const newConcept = this._toJskosConcept(resultConcept, { concept, result });
         for (let type of ["broader", "narrower"]) {
@@ -385,7 +411,7 @@ class SkosmosApiProvider extends BaseProvider {
       method: "get",
       url
     });
-    for (let type of response && response.types || []) {
+    for (let type of response?.types || []) {
       if (type.uri == "http://www.w3.org/2004/02/skos/core#Concept") {
         continue;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cocoda-sdk",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "SDK for Cocoda",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.js",