cocoda-sdk 3.2.1 → 3.2.3

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

@@ -257,9 +257,9 @@ class BaseProvider {
     if (options.auth && this._auth.key != _.get(this._config, "auth.key")) {
       return false;
     }
+    const userUris = [user.uri].concat(Object.values(user.identities || {}).map((id) => id.uri)).filter((uri) => uri != null);
     if (options.auth && options.identities) {
-      const uris = [user.uri].concat(Object.values(user.identities || {}).map((id) => id.uri)).filter((uri) => uri != null);
-      if (_.intersection(uris, options.identities).length == 0) {
+      if (_.intersection(userUris, options.identities).length == 0) {
         return false;
       }
     }
@@ -270,7 +270,7 @@ class BaseProvider {
       }
     }
     if (crossUser) {
-      return !!options.crossUser;
+      return options.crossUser === true || _.intersection(options.crossUser || [], userUris).length > 0;
     }
     return !!this.has[type][action];
   }

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

@@ -94,20 +94,22 @@ class LocApiProvider extends BaseProvider {
   }
   async getSchemes() {
     const schemes = [];
-    for (let scheme of await Promise.all(supportedSchemes.filter((s) => !this.schemes || !this.schemes.length || this.schemes.find((s2) => jskos.compare(s, s2))).map((s) => axios({
-      method: "get",
-      url: `${s.uri.replace("http:", "https:")}.json`
-    }).then(({ status, data }) => {
-      if (status === 200) {
-        let scheme2 = data.find((d) => s.uri === d["@id"]);
-        if (scheme2) {
-          scheme2 = jskos.merge(madsToJskosScheme(scheme2), s);
-          scheme2.topConcepts = (scheme2.topConcepts || []).filter((c) => c);
-          return scheme2;
+    for (let scheme of await Promise.all(
+      supportedSchemes.filter((s) => !this.schemes || !this.schemes.length || this.schemes.find((s2) => jskos.compare(s, s2))).map((s) => axios({
+        method: "get",
+        url: `${s.uri.replace("http:", "https:")}.json`
+      }).then(({ status, data }) => {
+        if (status === 200) {
+          let scheme2 = data.find((d) => s.uri === d["@id"]);
+          if (scheme2) {
+            scheme2 = jskos.merge(madsToJskosScheme(scheme2), s);
+            scheme2.topConcepts = (scheme2.topConcepts || []).filter((c) => c);
+            return scheme2;
+          }
         }
-      }
-      return null;
-    })))) {
+        return null;
+      }))
+    )) {
       if (scheme) {
         schemes.push(scheme);
       }

package/dist/esm/providers/local-mappings-provider.js

@@ -47,9 +47,11 @@ class LocalMappingsProvider extends BaseProvider {
         console.warn(`Warning: There is old data in local storage (or IndexedDB, depending on the ) with the key "${oldLocalStorageKey}". This data will not be used anymore. A manual export is necessary to get this data back.`);
       }
     });
-    this.queue.push(addUris().catch((error) => {
-      console.warn("Error when adding URIs to local mappings:", error);
-    }));
+    this.queue.push(
+      addUris().catch((error) => {
+        console.warn("Error when adding URIs to local mappings:", error);
+      })
+    );
   }
   isAuthorizedFor({ type, action }) {
     if (type == "mappings" && action != "anonymous") {
@@ -137,10 +139,10 @@ class LocalMappingsProvider extends BaseProvider {
       let checkConcept = (concept, param) => concept.uri == param || param && concept.notation && concept.notation[0].toLowerCase() == param.toLowerCase();
       if (params.from || params.to) {
         mappings = mappings.filter((mapping) => {
-          let fromInFrom = jskos.conceptsOfMapping(mapping, "from").find((concept) => checkConcept(concept, params.from)) != null;
-          let fromInTo = jskos.conceptsOfMapping(mapping, "to").find((concept) => checkConcept(concept, params.from)) != null;
-          let toInFrom = jskos.conceptsOfMapping(mapping, "from").find((concept) => checkConcept(concept, params.to)) != null;
-          let toInTo = jskos.conceptsOfMapping(mapping, "to").find((concept) => checkConcept(concept, params.to)) != null;
+          let fromInFrom = null != jskos.conceptsOfMapping(mapping, "from").find((concept) => checkConcept(concept, params.from));
+          let fromInTo = null != jskos.conceptsOfMapping(mapping, "to").find((concept) => checkConcept(concept, params.from));
+          let toInFrom = null != jskos.conceptsOfMapping(mapping, "from").find((concept) => checkConcept(concept, params.to));
+          let toInTo = null != jskos.conceptsOfMapping(mapping, "to").find((concept) => checkConcept(concept, params.to));
           if (params.direction == "backward") {
             if (params.mode == "or") {
               return params.from && fromInTo || params.to && toInFrom;

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

@@ -36,8 +36,10 @@ class OccurrencesApiProvider extends BaseProvider {
   }
   async getMappings(config) {
     const occurrences = await this.getOccurrences(config);
-    const fromScheme = _.get(config, "from.inScheme[0]") || config.fromScheme;
-    const toScheme = _.get(config, "to.inScheme[0]") || config.toScheme;
+    const from = config.from;
+    const fromScheme = _.get(from, "inScheme[0]") || config.fromScheme;
+    const to = config.to;
+    const toScheme = _.get(to, "inScheme[0]") || config.toScheme;
     const mappings = [];
     for (let occurrence of occurrences) {
       if (!occurrence) {
@@ -58,7 +60,7 @@ class OccurrencesApiProvider extends BaseProvider {
         mapping.to = { memberSet: [] };
       }
       mapping.toScheme = _.get(occurrence, "memberSet[1].inScheme[0]");
-      if (fromScheme && mapping.fromScheme && !jskos.compare(mapping.fromScheme, fromScheme) || toScheme && mapping.toScheme && !jskos.compare(mapping.toScheme, toScheme)) {
+      if (from && jskos.compare(from, _.get(mapping, "to.memberSet[0]")) || to && jskos.compare(to, _.get(mapping, "from.memberSet[0]"))) {
         [mapping.from, mapping.fromScheme, mapping.to, mapping.toScheme] = [mapping.to, mapping.toScheme, mapping.from, mapping.fromScheme];
       }
       if (!mapping.fromScheme && fromScheme) {
@@ -70,14 +72,12 @@ class OccurrencesApiProvider extends BaseProvider {
       mapping.type = [jskos.defaultMappingType.uri];
       mapping._occurrence = occurrence;
       mapping = jskos.addMappingIdentifiers(mapping);
-      if (occurrence.database) {
-        mapping.creator = [occurrence.database];
-      }
       mappings.push(mapping);
     }
+    mappings._url = occurrences._url;
     return mappings;
   }
-  async getOccurrences({ from, to, concepts, ...config }) {
+  async getOccurrences({ from, to, concepts, threshold = 0, ...config }) {
     let promises = [];
     concepts = (concepts || []).concat([from, to]).filter((c) => !!c);
     for (let concept of concepts) {
@@ -101,17 +101,7 @@ class OccurrencesApiProvider extends BaseProvider {
         params: {
           member: uri,
           scheme: "*",
-          threshold: 5
-        }
-      }));
-    }
-    if (uris.length > 1) {
-      let urisString = uris.join(" ");
-      promises.push(this._getOccurrences({
-        ...config,
-        params: {
-          member: urisString,
-          threshold: 5
+          threshold
         }
       }));
     }
@@ -135,7 +125,9 @@ class OccurrencesApiProvider extends BaseProvider {
       delete occurrences[value];
     });
     occurrences = occurrences.filter((o) => o != null);
-    return occurrences.sort((a, b) => parseInt(b.count || 0) - parseInt(a.count || 0));
+    occurrences = occurrences.sort((a, b) => parseInt(b.count || 0) - parseInt(a.count || 0));
+    occurrences._url = results.map((result) => result._url);
+    return occurrences;
   }
   async _getOccurrences(config) {
     let resultsFromCache = this._cache.find((item) => {

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

@@ -5,9 +5,12 @@ import { listOfCapabilities } from "../utils/index.js";
 import jskos from "jskos-tools";
 import FlexSearch from "flexsearch";
 function decodeUnicode(text) {
-  return text.replace(/\\u[\dA-F]{4}/gi, function(match) {
-    return String.fromCharCode(parseInt(match.replace(/\\u/g, ""), 16));
-  });
+  return text.replace(
+    /\\u[\dA-F]{4}/gi,
+    function(match) {
+      return String.fromCharCode(parseInt(match.replace(/\\u/g, ""), 16));
+    }
+  );
 }
 class SkohubProvider extends BaseProvider {
   _prepare() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cocoda-sdk",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "SDK for Cocoda",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.js",
@@ -52,14 +52,14 @@
   },
   "homepage": "https://github.com/gbv/cocoda-sdk#readme",
   "devDependencies": {
-    "axios-mock-adapter": "^1.21.1",
+    "axios-mock-adapter": "^1.21.2",
     "better-docs": "^2.7.2",
-    "esbuild": "~0.14.43",
+    "esbuild": "~0.14.54",
     "esbuild-plugin-ifdef": "^1.0.1",
-    "eslint": "^8.17.0",
+    "eslint": "^8.23.1",
     "eslint-config-gbv": "^1.0.3",
     "glob": "^8.0.3",
-    "jsdoc": "^3.6.10",
+    "jsdoc": "^3.6.11",
     "license-checker": "^25.0.1",
     "lint-staged": "^12.5.0",
     "mocha": "^9.2.2",
@@ -72,6 +72,6 @@
     "jskos-tools": "^1.0.26",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   }
 }