@piveau/dpi 0.1.0-beta.71 → 0.1.0-beta.72

package/dist/data-provider-interface/composables/useDpiSimpleLoader.js

@@ -1,4 +1,4 @@
-import { toRef as ee, ref as te, toValue as N, computed as O, watch as E } from "vue";
+import { toRef as ee, ref as te, toValue as N, computed as k, watch as q } from "vue";
 import { useAsyncState as ie } from "@vueuse/core";
 import { defineJsonldResolver as re, dcatDatasetTransformer as oe, datasetResolvers as ae } from "@piveau/jsonld";
 import { isEmpty as ne } from "lodash-es";
@@ -32,7 +32,7 @@ function De(e, r) {
     execute: B
   } = ie(
     async () => {
-      var D;
+      var T;
       const l = await f(N(e));
       if (l.error)
         return c.value.push({
@@ -40,7 +40,7 @@ function De(e, r) {
           message: l.error.message
         }), null;
       const h = l.data;
-      return (!h || !((D = h["dpi:isDPIv3"]) != null && D["@value"])) && c.value.push({
+      return (!h || !((T = h["dpi:isDPIv3"]) != null && T["@value"])) && c.value.push({
         code: "not_dpi_v3",
         message: `The dataset is not a DPI v3 dataset. ID ${h["@id"]}`
       }), {
@@ -50,23 +50,23 @@ function De(e, r) {
     },
     null,
     { immediate: !1 }
-  ), R = O(
+  ), R = k(
     () => n.value && !y.value && !!g.value
-  ), L = O(
+  ), L = k(
     () => n.value && !!R.value
-  ), v = O(() => L.value), w = O(() => {
+  ), v = k(() => L.value), w = k(() => {
     var l;
     return (l = m.value) == null ? void 0 : l.dpiData;
-  }), P = O(() => {
+  }), P = k(() => {
     var l;
     return (l = m.value) == null ? void 0 : l.data;
   });
-  return E(
+  return q(
     () => N(e),
     (l) => l && n.value ? B() : null
-  ), E(P, (l) => {
+  ), q(P, (l) => {
     console.log("jsonld resolved result:", l);
-  }), E(b, (l) => {
+  }), q(b, (l) => {
     console.log("jsonld error:", l);
   }), {
     processedInput: m,
@@ -106,7 +106,7 @@ function d(e, r = "de") {
   }
   return e["@language"] && e["@value"] ? e["@value"] : u(e);
 }
-function K(e) {
+function C(e) {
   return {
     uri: e.uri,
     label: e.label,
@@ -114,9 +114,9 @@ function K(e) {
     "@value": e.label
   };
 }
-function T(e, r) {
+function A(e, r) {
   const t = e.prefLabel;
-  return K({
+  return C({
     uri: e["@id"] || e["purl:identifier"] || "",
     label: t ? d(t) : e["purl:identifier"] || ""
   });
@@ -273,7 +273,7 @@ function ue(e) {
   };
 }
 function pe(e, r) {
-  var i, n, f, c, m, g, y, b, B, R, L, v, w, P, l, h, U, D, x, F, j, z, M;
+  var i, n, f, c, m, g, y, b, B, R, L, v, w, P, l, h, U, T, x, F, j, z, M, G, O;
   if (!e)
     return {};
   const t = o(e["spdx:checksum"]);
@@ -307,46 +307,49 @@ function pe(e, r) {
       ) || "",
       title: d(e["dcatapde:licenseAttributionByText"]) || ""
     } : {},
-    "dct:accessRights": e["dct:accessRights"] ? o(T(e["dct:accessRights"])) : [],
+    "dct:accessRights": e["dct:accessRights"] ? o({
+      uri: ((b = o(e["dct:accessRights"])) == null ? void 0 : b["@id"]) || "",
+      label: ((B = o(e["dct:accessRights"])) == null ? void 0 : B.prefLabel) || { de: "" }
+    }) : {},
     "dcatap:availability": {
       // Redundant label and title for better compatibility
-      label: ((b = o(e["dcatap:availability"])) == null ? void 0 : b.prefLabel) || "",
-      title: ((B = o(e["dcatap:availability"])) == null ? void 0 : B.prefLabel) || "",
-      uri: ((R = o(e["dcatap:availability"])) == null ? void 0 : R["@id"]) || ""
+      label: ((R = o(e["dcatap:availability"])) == null ? void 0 : R.prefLabel) || "",
+      title: ((L = o(e["dcatap:availability"])) == null ? void 0 : L.prefLabel) || "",
+      uri: ((v = o(e["dcatap:availability"])) == null ? void 0 : v["@id"]) || ""
     },
-    "dct:language": ((L = e["dct:language"]) == null ? void 0 : L.map((p) => T(p)).filter(Boolean)) || [],
-    "dcat:mediaType": K({
+    "dct:language": ((w = e["dct:language"]) == null ? void 0 : w.map((p) => A(p)).filter(Boolean)) || [],
+    "dcat:mediaType": C({
       label: d(
-        (v = o(e["dcat:mediaType"])) == null ? void 0 : v.prefLabel
+        (P = o(e["dcat:mediaType"])) == null ? void 0 : P.prefLabel
       ) || "",
-      uri: ((w = o(e["dcat:mediaType"])) == null ? void 0 : w["@id"]) || ""
+      uri: ((l = o(e["dcat:mediaType"])) == null ? void 0 : l["@id"]) || ""
     }),
-    "dcat:compressFormat": K({
+    "dcat:compressFormat": C({
       label: d(
-        (P = o(e["dcat:compressFormat"])) == null ? void 0 : P.prefLabel
+        (h = o(e["dcat:compressFormat"])) == null ? void 0 : h.prefLabel
       ) || "",
-      uri: ((l = o(e["dcat:compressFormat"])) == null ? void 0 : l["@id"]) || ""
+      uri: ((U = o(e["dcat:compressFormat"])) == null ? void 0 : U["@id"]) || ""
     }),
-    "dcat:packageFormat": K({
+    "dcat:packageFormat": C({
       label: d(
-        (h = o(e["dcat:packageFormat"])) == null ? void 0 : h.prefLabel
+        (T = o(e["dcat:packageFormat"])) == null ? void 0 : T.prefLabel
       ) || "",
-      uri: ((U = o(e["dcat:packageFormat"])) == null ? void 0 : U["@id"]) || ""
+      uri: ((x = o(e["dcat:packageFormat"])) == null ? void 0 : x["@id"]) || ""
     }),
     "adms:status": {
-      uri: ((D = o(e["adms:status"])) == null ? void 0 : D["@id"]) || "",
-      "@value": d((x = o(e["adms:status"])) == null ? void 0 : x.prefLabel) || ""
+      uri: ((F = o(e["adms:status"])) == null ? void 0 : F["@id"]) || "",
+      "@value": d((j = o(e["adms:status"])) == null ? void 0 : j.prefLabel) || ""
     },
     checksum: {
       title: u(o(t == null ? void 0 : t["spdx:checksumValue"])),
-      "spdx:checksum": ((F = u(o(t == null ? void 0 : t["spdx:algorithm"]))) == null ? void 0 : F.split("_").pop()) || "",
-      uri: (j = u(
+      "spdx:checksum": ((z = u(o(t == null ? void 0 : t["spdx:algorithm"]))) == null ? void 0 : z.split("_").pop()) || "",
+      uri: (M = u(
         o(t == null ? void 0 : t["spdx:algorithm"])
-      )) == null ? void 0 : j.replace("spdx:", "http://spdx.org/rdf/terms#")
+      )) == null ? void 0 : M.replace("spdx:", "http://spdx.org/rdf/terms#")
     },
     accessServices: he(e["dcat:accessService"] || []),
     documentations: Re(e["foaf:page"] || []),
-    conformsToItems: (z = e["dct:conformsTo"]) == null ? void 0 : z.map((p, I) => ({
+    conformsToItems: (G = e["dct:conformsTo"]) == null ? void 0 : G.map((p, I) => ({
       // for some reason dct:conformsTo is different from the one on dcat:dataset level
       id: I + 1,
       "dcat:accessURL": p["@id"],
@@ -356,7 +359,7 @@ function pe(e, r) {
       "rdfs:label": d(p["rdfs:label"]) || "",
       uri: p["@id"]
     })).filter(Boolean),
-    policyItems: ((M = e["odrl:hasPolicy"]) == null ? void 0 : M.map((p, I) => ({
+    policyItems: ((O = e["odrl:hasPolicy"]) == null ? void 0 : O.map((p, I) => ({
       // don't ask
       id: I + 1,
       "dcat:downloadURL": p["@id"],
@@ -381,9 +384,9 @@ function be(e) {
   };
 }
 function ge(e) {
-  var t, i, n, f, c, m, g, y, b, B, R, L, v, w, P, l, h, U, D, x, F, j, z, M, p, I, C, q;
+  var t, i, n, f, c, m, g, y, b, B, R, L, v, w, P, l, h, U, T, x, F, j, z, M, G, O, p, I;
   const r = {
-    "dct:language": (t = e["dct:language"]) == null ? void 0 : t.map((a) => T(a)).filter(Boolean),
+    "dct:language": (t = e["dct:language"]) == null ? void 0 : t.map((a) => A(a)).filter(Boolean),
     "dcatde:politicalGeocodingLevelURI": (i = e["dcatapde:politicalGeocodingLevelURI"]) == null ? void 0 : i.map((a) => ({
       uri: a["@id"],
       "@value": d(a.prefLabel)
@@ -392,26 +395,26 @@ function ge(e) {
       "rdfs:label": d(a["rdfs:label"]) || "",
       "@id": a["@id"]
     })).filter(Boolean),
-    "dct:accessRights": e["dct:accessRights"] ? s(T(e["dct:accessRights"])) : [],
+    "dct:accessRights": e["dct:accessRights"] ? s(A(e["dct:accessRights"])) : [],
     "dct:issued": V(e["dct:issued"]),
     "dct:provenance": (f = e["dct:provenance"]) == null ? void 0 : f.map((a) => ({
       "rdfs:label": d(a["rdfs:label"]) || "",
       uri: a["@id"]
     })).filter(Boolean),
-    "dct:accrualPeriodicity": e["dct:accrualPeriodicity"] ? s(T(e["dct:accrualPeriodicity"])) : [],
-    "dct:type": (c = e["dct:type"]) == null ? void 0 : c.map((a) => T(a)).filter(Boolean),
+    "dct:accrualPeriodicity": e["dct:accrualPeriodicity"] ? s(A(e["dct:accrualPeriodicity"])) : [],
+    "dct:type": (c = e["dct:type"]) == null ? void 0 : c.map((a) => A(a)).filter(Boolean),
     "dcat:spatialResolutionInMeters": ((m = e["dcat:spatialResolutionInMeters"]) == null ? void 0 : m.map(H)) || void 0,
     "dcat:temporalResolution": e["dcat:temporalResolution"] ? e["dcat:temporalResolution"].map(H).map((a) => {
-      const G = a["@value"].match(
+      const _ = a["@value"].match(
         /^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/
       );
-      if (G) {
-        const [, _, k, $, J, W, Q] = G.map(
+      if (_) {
+        const [, K, E, $, J, W, Q] = _.map(
           (Z) => Z || "0"
         );
         return [
-          { Year: _ },
-          { Month: k },
+          { Year: K },
+          { Month: E },
           { Day: $ },
           { Hour: J },
           { Minute: W },
@@ -424,7 +427,7 @@ function ge(e) {
     )) == null ? void 0 : g.filter(Boolean),
     "dct:creator": (y = s(e["dct:creator"])) == null ? void 0 : y.filter(Boolean),
     "dct:contributor": (b = s(e["dct:contributor"])) == null ? void 0 : b.filter(Boolean),
-    "dcatde:contributorID": (B = e["dcatapde:contributorID"]) == null ? void 0 : B.map((a) => T(a)).filter(Boolean),
+    "dcatde:contributorID": (B = e["dcatapde:contributorID"]) == null ? void 0 : B.map((a) => A(a)).filter(Boolean),
     "dcatde:geocodingDescription": (R = s(
       e["dcatapde:geocodingDescription"]
     )) == null ? void 0 : R.filter(Boolean),
@@ -446,7 +449,7 @@ function ge(e) {
     "prov:wasGeneratedBy": (U = s(e["prov:wasGeneratedBy"])) == null ? void 0 : U.filter(
       Boolean
     ),
-    "dct:isReferencedBy": (D = s(e["dct:isReferencedBy"])) == null ? void 0 : D.filter(
+    "dct:isReferencedBy": (T = s(e["dct:isReferencedBy"])) == null ? void 0 : T.filter(
       Boolean
     ),
     "dct:source": (x = s(e["dct:source"])) == null ? void 0 : x.filter(Boolean),
@@ -456,30 +459,30 @@ function ge(e) {
       e["prov:qualifiedAttribution"]
     )) == null ? void 0 : z.filter(Boolean),
     "dcat:keyword": (M = s(e["dcat:keyword"])) == null ? void 0 : M.filter(Boolean),
-    "dct:spatial": (p = s(e["dct:spatial"])) == null ? void 0 : p.filter((a) => a ? !a["@id"].startsWith(
+    "dct:spatial": (G = s(e["dct:spatial"])) == null ? void 0 : G.filter((a) => a ? !a["@id"].startsWith(
       "http://dcat-ap.de/def/politicalGeocoding/"
     ) : !1).filter(Boolean),
-    "dct:references": (I = s(e["dct:references"])) == null ? void 0 : I.filter(Boolean),
-    "foaf:page": (C = s(e["foaf:page"])) == null ? void 0 : C.filter(Boolean).map((a) => {
+    "dct:references": (O = s(e["dct:references"])) == null ? void 0 : O.filter(Boolean),
+    "foaf:page": (p = s(e["foaf:page"])) == null ? void 0 : p.filter(Boolean).map((a) => {
       if (!a) return;
-      const A = o(a["dct:format"]);
+      const D = o(a["dct:format"]);
       return {
         "dct:title": o(a["dct:title"]),
         "dct:description": o(a["dct:description"]),
-        "@value": A ? d(A.prefLabel) : "",
-        uri: A ? A["@id"] : "",
+        "@value": D ? d(D.prefLabel) : "",
+        uri: D ? D["@id"] : "",
         "foaf:homepage": o(a["foaf:homepage"]) || ""
       };
     }),
-    "dcatap:availability": (q = e["dcatap:availability"]) == null ? void 0 : q.map(
+    "dcatap:availability": (I = e["dcatap:availability"]) == null ? void 0 : I.map(
       (a) => {
-        var A, G, _, k;
+        var D, _, K, E;
         return {
           // Redundant label and title for better compatibility
-          label: ((A = o(a)) == null ? void 0 : A.prefLabel) || "",
-          title: ((G = o(a)) == null ? void 0 : G.prefLabel) || "",
-          uri: ((_ = o(a)) == null ? void 0 : _["@id"]) || "",
-          "@value": d((k = o(a)) == null ? void 0 : k.prefLabel) || ""
+          label: ((D = o(a)) == null ? void 0 : D.prefLabel) || "",
+          title: ((_ = o(a)) == null ? void 0 : _.prefLabel) || "",
+          uri: ((K = o(a)) == null ? void 0 : K["@id"]) || "",
+          "@value": d((E = o(a)) == null ? void 0 : E.prefLabel) || ""
         };
       }
     )
@@ -518,8 +521,8 @@ function Re(e) {
       "dcat:accessURL": ((n = o(r["dcat:accessURL"])) == null ? void 0 : n["@id"]) || "",
       "dct:description": d(r["dct:description"]) || "",
       "dct:title": d(r["dct:title"]) || "",
-      "dct:format": r["dct:format"] && ((f = T(o(r["dct:format"]))) == null ? void 0 : f.label) || "",
-      formatUri: r["dct:format"] && ((c = T(o(r["dct:format"]))) == null ? void 0 : c.uri) || ""
+      "dct:format": r["dct:format"] && ((f = A(o(r["dct:format"]))) == null ? void 0 : f.label) || "",
+      formatUri: r["dct:format"] && ((c = A(o(r["dct:format"]))) == null ? void 0 : c.uri) || ""
     };
   });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@piveau/dpi",
   "type": "module",
-  "version": "0.1.0-beta.71",
+  "version": "0.1.0-beta.72",
   "private": false,
   "sideEffects": [
     "*.css",
@@ -55,7 +55,7 @@
     "@headlessui/vue": "^1.7.23",
     "@histoire/plugin-vue": "1.0.0-alpha.2",
     "@phosphor-icons/vue": "^2.2.1",
-    "@piveau/jsonld": "file:../../bin/piveau-jsonld-1.0.0-beta.21.tgz",
+    "@piveau/jsonld": "file:../../bin/piveau-jsonld-1.0.0-beta.22.tgz",
     "@popperjs/core": "^2.11.8",
     "@types/jsonld": "^1.5.15",
     "@types/node": "^24.1.0",