cocoda-sdk 3.6.0 → 3.6.2

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

@@ -1,8 +1,7 @@
 import BaseProvider from "./base-provider.js";
 import jskos from "jskos-tools";
-import * as _ from "../utils/lodash.js";
 import * as errors from "../errors/index.js";
-import * as utils from "../utils/index.js";
+import { concatUrl, deepEqual } from "../utils/index.js";
 const cache = {};
 class OccurrencesApiProvider extends BaseProvider {
   static supports = {
@@ -30,7 +29,7 @@ class OccurrencesApiProvider extends BaseProvider {
     if (this._occurrencesSupportedSchemes && this._occurrencesSupportedSchemes.length) {
     } else {
       try {
-        const url = utils.concatUrl(this._api.api, "voc");
+        const url = concatUrl(this._api.api, "voc");
         const data = await this.axios({
           method: "get",
           url
@@ -56,30 +55,30 @@ class OccurrencesApiProvider extends BaseProvider {
   async getMappings(config) {
     const occurrences = await this.getOccurrences(config);
     const from = config.from;
-    const fromScheme = _.get(from, "inScheme[0]") || config.fromScheme;
+    const fromScheme = from?.inScheme?.[0] || config.fromScheme;
     const to = config.to;
-    const toScheme = _.get(to, "inScheme[0]") || config.toScheme;
+    const toScheme = to?.inScheme?.[0] || config.toScheme;
     const mappings = [];
     for (let occurrence of occurrences) {
       if (!occurrence) {
         continue;
       }
       let mapping = {};
-      mapping.from = _.get(occurrence, "memberSet[0]");
+      mapping.from = occurrence?.memberSet?.[0];
       if (mapping.from) {
         mapping.from = { memberSet: [mapping.from] };
       } else {
         mapping.from = null;
       }
-      mapping.fromScheme = _.get(occurrence, "memberSet[0].inScheme[0]");
-      mapping.to = _.get(occurrence, "memberSet[1]");
+      mapping.fromScheme = occurrence?.memberSet?.[0]?.inScheme?.[0];
+      mapping.to = occurrence?.memberSet?.[1];
       if (mapping.to) {
         mapping.to = { memberSet: [mapping.to] };
       } else {
         mapping.to = { memberSet: [] };
       }
-      mapping.toScheme = _.get(occurrence, "memberSet[1].inScheme[0]");
-      if (from && jskos.compare(from, _.get(mapping, "to.memberSet[0]")) || to && jskos.compare(to, _.get(mapping, "from.memberSet[0]"))) {
+      mapping.toScheme = occurrence?.memberSet?.[1]?.inScheme?.[0];
+      if (from && jskos.compare(from, mapping?.to?.memberSet?.[0]) || to && jskos.compare(to, mapping?.from?.memberSet?.[0])) {
         [mapping.from, mapping.fromScheme, mapping.to, mapping.toScheme] = [mapping.to, mapping.toScheme, mapping.from, mapping.fromScheme];
       }
       if (!mapping.fromScheme && fromScheme) {
@@ -109,7 +108,7 @@ class OccurrencesApiProvider extends BaseProvider {
     let promises = [];
     concepts = (concepts || []).concat([from, to]).filter((c) => !!c);
     for (let concept of concepts) {
-      promises.push(this._occurrencesIsSupported(_.get(concept, "inScheme[0]")).then((supported) => {
+      promises.push(this._occurrencesIsSupported(concept?.inScheme?.[0]).then((supported) => {
         if (supported && concept.uri) {
           return concept.uri;
         } else {
@@ -134,7 +133,7 @@ class OccurrencesApiProvider extends BaseProvider {
       }));
     }
     const results = await Promise.all(promises);
-    let occurrences = _.concat([], ...results);
+    let occurrences = results.flat();
     let existingUris = [];
     let indexesToDelete = [];
     for (let i = 0; i < occurrences.length; i += 1) {
@@ -165,9 +164,7 @@ class OccurrencesApiProvider extends BaseProvider {
    * @param {Object} config passthrough of config parameter for axios request
    */
   async _getOccurrences(config) {
-    let resultsFromCache = this._cache.find((item) => {
-      return _.isEqual(item.config.params, config.params);
-    });
+    let resultsFromCache = this._cache.find((item) => deepEqual(item.config.params, config.params));
     if (resultsFromCache) {
       return resultsFromCache.data;
     }

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/reconciliation-api-provider.js

@@ -1,7 +1,7 @@
 import BaseProvider from "./base-provider.js";
 import jskos from "jskos-tools";
-import * as _ from "../utils/lodash.js";
 import * as errors from "../errors/index.js";
+import { deepEqual } from "../utils/index.js";
 const cache = {};
 class ReconciliationApiProvider extends BaseProvider {
   static supports = {
@@ -27,13 +27,13 @@ class ReconciliationApiProvider extends BaseProvider {
    */
   async getMappings({ from, to, mode, ...config }) {
     let schemes = [];
-    if (_.isArray(this.schemes)) {
+    if (Array.isArray(this.schemes)) {
       schemes = this.schemes;
     }
     let swap;
     let concept;
-    let fromConceptScheme = _.get(from, "inScheme[0]");
-    let toConceptScheme = _.get(to, "inScheme[0]");
+    let fromConceptScheme = from?.inScheme?.[0];
+    let toConceptScheme = to?.inScheme?.[0];
     let fromScheme;
     let toScheme;
     if (!from || jskos.isContainedIn(fromConceptScheme, schemes)) {
@@ -60,11 +60,11 @@ class ReconciliationApiProvider extends BaseProvider {
     if (!language) {
       throw new errors.InvalidOrMissingParameterError({ parameter: swap ? "to" : "from", message: "Missing language" });
     }
-    let altLabels = _.get(concept, `altLabel.${language}`, []);
-    if (_.isString(altLabels)) {
+    let altLabels = concept?.altLabel?.[language] ?? [];
+    if (typeof altLabels === "string") {
       altLabels = [altLabels];
     }
-    let prefLabel = _.get(concept, `prefLabel.${language}`);
+    let prefLabel = concept?.prefLabel?.[language];
     let labels = altLabels.concat([prefLabel]);
     labels = [prefLabel];
     let { url, data: results } = await this._getReconciliationResults({ ...config, labels, language });
@@ -82,7 +82,7 @@ class ReconciliationApiProvider extends BaseProvider {
       }
       return a.id.length - b.id.length;
     });
-    let namespace = _.get(toScheme, "namespace", "");
+    let namespace = toScheme?.namespace ?? "";
     let mappings = results.map((result) => ({
       fromScheme,
       from: { memberSet: [concept] },
@@ -120,9 +120,7 @@ class ReconciliationApiProvider extends BaseProvider {
    */
   async _getReconciliationResults({ labels, language, ...config }) {
     labels = labels.sort();
-    let resultsFromCache = this._cache.find((item) => {
-      return _.isEqual(item.labels, labels) && item.language == language;
-    });
+    let resultsFromCache = this._cache.find((item) => deepEqual(item.labels, labels) && item.language == language);
     if (resultsFromCache) {
       return resultsFromCache;
     }
@@ -139,7 +137,8 @@ class ReconciliationApiProvider extends BaseProvider {
       url = url.replace("{language}", language);
     }
     const encodedData = `queries=${encodeURIComponent(JSON.stringify(queries))}`;
-    _.set(config, ["headers", "Content-Type"], "application/x-www-form-urlencoded");
+    config.headers ||= {};
+    config.headers["Content-Type"] = "application/x-www-form-urlencoded";
     let data = await this.axios({
       ...config,
       method: "post",

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

@@ -1,5 +1,4 @@
 import BaseProvider from "./base-provider.js";
-import * as _ from "../utils/lodash.js";
 import * as errors from "../errors/index.js";
 import jskos from "jskos-tools";
 import FlexSearch from "flexsearch";
@@ -66,7 +65,7 @@ class SkohubProvider extends BaseProvider {
       throw new errors.InvalidRequestError({ message: `Tried to load unsupported scheme (${scheme && scheme.uri})` });
     }
     const uri = schemeFromList.uri;
-    uris = _.uniq(uris.concat(jskos.getAllUris(schemeFromList)));
+    uris = [...new Set(uris.concat(jskos.getAllUris(schemeFromList)))];
     let postfix = ".json";
     if (uri.endsWith("/")) {
       postfix = "index.json";
@@ -147,7 +146,7 @@ class SkohubProvider extends BaseProvider {
     return scheme.topConcepts || [];
   }
   async getConcepts({ concepts, ...config }) {
-    if (!_.isArray(concepts)) {
+    if (!Array.isArray(concepts)) {
       concepts = [concepts];
     }
     return (await Promise.all(concepts.map(({ uri }) => this._loadConcept({ ...config, uri })))).filter(Boolean);

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

@@ -1,6 +1,5 @@
 import BaseProvider from "./base-provider.js";
 import jskos from "jskos-tools";
-import * as _ from "../utils/lodash.js";
 import * as errors from "../errors/index.js";
 class SkosmosApiProvider extends BaseProvider {
   static supports = {
@@ -46,7 +45,7 @@ class SkosmosApiProvider extends BaseProvider {
    * @private
    */
   _getApiUrl(scheme, endpoint, params) {
-    const VOCID = scheme && scheme.VOCID || _.get(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" });
     }
@@ -62,7 +61,7 @@ class SkosmosApiProvider extends BaseProvider {
    * @private
    */
   _getDataUrl(concept, { addFormatParameter = true } = {}) {
-    const scheme = _.get(concept, "inScheme[0]");
+    const scheme = concept?.inScheme?.[0];
     if (!concept || !concept.uri) {
       throw new errors.InvalidOrMissingParameterError({ parameter: "concept", message: "Missing concept URI" });
     }
@@ -117,29 +116,33 @@ class SkosmosApiProvider extends BaseProvider {
       concept.inScheme = [scheme];
     }
     let prefLabel = skosmosConcept.matchedPrefLabel || skosmosConcept.prefLabel || skosmosConcept.label;
-    if (_.isString(prefLabel)) {
-      _.set(concept, `prefLabel.${language}`, prefLabel);
+    if (typeof prefLabel === "string") {
+      concept.prefLabel ||= {};
+      concept.prefLabel[language] = prefLabel;
     } else {
-      if (prefLabel && !_.isArray(prefLabel)) {
+      if (prefLabel && !Array.isArray(prefLabel)) {
         prefLabel = [prefLabel];
       }
       for (let label of prefLabel || []) {
-        _.set(concept, `prefLabel.${label.lang}`, label.value);
+        concept.prefLabel ||= {};
+        concept.prefLabel[label.lang] = label.value;
       }
     }
     let altLabel = skosmosConcept.altLabel;
-    if (_.isString(altLabel)) {
-      _.set(concept, `altLabel.${language}`, [altLabel]);
+    if (typeof altLabel === "string") {
+      concept.altLabel ||= {};
+      concept.altLabel[language] = altLabel;
     } else {
-      if (altLabel && !_.isArray(altLabel)) {
+      if (altLabel && !Array.isArray(altLabel)) {
         altLabel = [altLabel];
       }
       for (let label of altLabel || []) {
-        if (_.get(concept, `altLabel.${label.lang}`)) {
+        if (concept?.altLabel?.[label.lang]) {
           concept.altLabel[label.lang].push(label.value);
-          concept.altLabel[label.lang] = _.uniq(concept.altLabel[label.lang]);
+          concept.altLabel[label.lang] = [...new Set(concept.altLabel[label.lang])];
         } else {
-          _.set(concept, `altLabel.${label.lang}`, [label.value]);
+          concept.altLabel ||= {};
+          concept.altLabel[label.lang] = [label.value];
         }
       }
     }
@@ -148,17 +151,17 @@ class SkosmosApiProvider extends BaseProvider {
       concept.notation = [notation.value || notation];
     }
     if (skosmosConcept.broader) {
-      if (!_.isArray(skosmosConcept.broader)) {
+      if (!Array.isArray(skosmosConcept.broader)) {
         skosmosConcept.broader = [skosmosConcept.broader];
       }
-      concept.broader = skosmosConcept.broader.map((concept2) => _.isString(concept2) ? { uri: concept2 } : concept2);
+      concept.broader = skosmosConcept.broader.map((uri) => typeof uri === "string" ? { uri } : uri);
     }
     if (skosmosConcept.hasChildren === true) {
       concept.narrower = [null];
     } else if (skosmosConcept.hasChildren === false) {
       concept.narrower = [];
     }
-    if (skosmosConcept.type && !_.isArray(skosmosConcept.type)) {
+    if (skosmosConcept.type && !Array.isArray(skosmosConcept.type)) {
       skosmosConcept.type = [skosmosConcept.type];
     }
     concept.type = concept.type || [];
@@ -172,10 +175,36 @@ class SkosmosApiProvider extends BaseProvider {
       }
       concept.type.push(type);
     }
-    concept.type = _.uniq(concept.type);
+    concept.type = [...new Set(concept.type)];
     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;
   }
   /**
@@ -196,7 +225,8 @@ class SkosmosApiProvider extends BaseProvider {
       const resultScheme = data.conceptschemes.find((s) => jskos.compare(s, scheme));
       const label = resultScheme && (resultScheme.prefLabel || resultScheme.label || resultScheme.title);
       if (label) {
-        _.set(scheme, `prefLabel.${this._language}`, label);
+        scheme.prefLabel ||= {};
+        scheme.prefLabel[this._language] = label;
       }
       schemes.push(scheme);
       this._approvedSchemes = this._approvedSchemes || [];
@@ -222,7 +252,8 @@ class SkosmosApiProvider extends BaseProvider {
     if (!schemeUri) {
       throw new errors.InvalidOrMissingParameterError({ parameter: "scheme", message: "Missing or unsupported scheme or VOCID property on scheme" });
     }
-    _.set(config, "params.scheme", schemeUri);
+    config.params ||= {};
+    config.params.scheme = schemeUri;
     const response = await this.axios({
       ...config,
       method: "get",
@@ -247,31 +278,31 @@ class SkosmosApiProvider extends BaseProvider {
    * @returns {Object[]} array of JSKOS concept objects
    */
   async getConcepts({ concepts, ...config }) {
-    if (!_.isArray(concepts)) {
+    if (!Array.isArray(concepts)) {
       concepts = [concepts];
     }
     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"]) {
           let relatives = resultConcept[type] || newConcept[type];
-          if (relatives && !_.isArray(relatives)) {
+          if (relatives && !Array.isArray(relatives)) {
             relatives = [relatives];
           }
           if (!relatives) {
@@ -298,7 +329,8 @@ class SkosmosApiProvider extends BaseProvider {
     }
     const scheme = concept.inScheme[0];
     const url = this._getApiUrl(scheme, "/children");
-    _.set(config, "params.uri", concept.uri);
+    config.params ||= {};
+    config.params.uri = concept.uri;
     const response = await this.axios({
       ...config,
       method: "get",
@@ -320,7 +352,8 @@ class SkosmosApiProvider extends BaseProvider {
     }
     const scheme = concept.inScheme[0];
     const url = this._getApiUrl(scheme, "/broaderTransitive");
-    _.set(config, "params.uri", concept.uri);
+    config.params ||= {};
+    config.params.uri = concept.uri;
     const response = await this.axios({
       ...config,
       method: "get",
@@ -330,10 +363,10 @@ class SkosmosApiProvider extends BaseProvider {
     let uri = concept.uri;
     while (uri) {
       if (uri != concept.uri) {
-        const ancestor = _.get(response, `broaderTransitive["${uri}"]`);
+        const ancestor = response?.broaderTransitive?.[uri];
         ancestors = ancestors.concat([ancestor]);
       }
-      uri = _.get(response, `broaderTransitive["${uri}"].broader[0]`);
+      uri = response?.broaderTransitive?.[uri]?.broader?.[0];
     }
     const concepts = ancestors.map((c) => this._toJskosConcept(c, { scheme })).filter((c) => c.uri != concept.uri);
     return concepts;
@@ -350,10 +383,11 @@ class SkosmosApiProvider extends BaseProvider {
    */
   async search({ search, scheme, limit, types = [], ...config }) {
     const url = this._getApiUrl(scheme, "/search");
-    _.set(config, "params.query", `${search}*`);
-    _.set(config, "params.unique", 1);
-    _.set(config, "params.maxhits", limit || 100);
-    _.set(config, "params.type", types.join(" "));
+    config.params ||= {};
+    config.params.query = `${search}*`;
+    config.params.unique = 1;
+    config.params.maxhits = limit || 100;
+    config.params.type = types.join(" ");
     const response = await this.axios({
       ...config,
       method: "get",
@@ -377,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/dist/esm/utils/index.js

@@ -167,8 +167,29 @@ const listOfCapabilities = [
   "annotations",
   "occurrences"
 ];
+const deepEqual = (a, b) => {
+  if (a === b) {
+    return true;
+  }
+  if (typeof a !== "object" || typeof b !== "object" || a === null || b === null) {
+    return false;
+  }
+  if (Object.keys(a).length === Object.keys(b).length) {
+    for (let key in a) {
+      if (!(key in b)) {
+        return false;
+      }
+      if (!deepEqual(a[key], b[key])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return false;
+};
 export {
   concatUrl,
+  deepEqual,
   listOfCapabilities,
   requestMethods,
   withCustomProps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cocoda-sdk",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "SDK for Cocoda",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.js",
@@ -72,7 +72,6 @@
     "flexsearch": "~0.8.0",
     "jskos-tools": "^1.0.43",
     "localforage": "^1.10.0",
-    "lodash": "^4.17.21",
     "uuid": "^13.0.0"
   }
 }

package/dist/esm/utils/lodash.js

@@ -1,32 +0,0 @@
-import get from "lodash/get.js";
-import set from "lodash/set.js";
-import uniq from "lodash/uniq.js";
-import intersection from "lodash/intersection.js";
-import union from "lodash/union.js";
-import forOwn from "lodash/forOwn.js";
-import isArray from "lodash/isArray.js";
-import isObject from "lodash/isObject.js";
-import isString from "lodash/isString.js";
-import isEmpty from "lodash/isEmpty.js";
-import isEqual from "lodash/isEqual.js";
-import merge from "lodash/merge.js";
-import last from "lodash/last.js";
-import omit from "lodash/omit.js";
-import concat from "lodash/concat.js";
-export {
-  concat,
-  forOwn,
-  get,
-  intersection,
-  isArray,
-  isEmpty,
-  isEqual,
-  isObject,
-  isString,
-  last,
-  merge,
-  omit,
-  set,
-  union,
-  uniq
-};