@piveau/dpi 0.2.0-alpha.14 → 0.2.0-alpha.15

package/dist/packages/dpi/src/data-provider-interface/composables/useDpiSimpleLoader.js

@@ -1,4 +1,4 @@
-import { defineJsonldResolver as Z, dcatDatasetTransformer as ee, datasetResolvers as te } from "@piveau/jsonld";
+import { datasetResolvers as Z, defineJsonldResolver as ee, dcatDatasetTransformer as te } from "@piveau/jsonld";
 import { useAsyncState as re } from "@vueuse/core";
 import { isEmpty as ie } from "lodash-es";
 import { toRef as oe, ref as ae, toValue as F, computed as z, watch as K } from "vue";
@@ -19,67 +19,67 @@ function ne(e) {
     )
   );
 }
-function ve(e, i) {
-  const { enabled: r, hubSearchUrl: t } = i, c = oe(r), { safeTransform: h } = Z({
+function De(e, i) {
+  const { enabled: r, hubSearchUrl: t } = i, a = oe(r), R = [...Z()].filter((l) => l.name !== "licence"), { safeTransform: u } = ee({
     baseUrl: t,
-    resolvers: te(),
-    transformer: ee
-  }), d = ae([]), {
-    state: p,
-    isReady: b,
-    isLoading: g,
-    error: m,
-    execute: L
+    resolvers: R,
+    transformer: te
+  }), f = ae([]), {
+    state: m,
+    isReady: g,
+    isLoading: b,
+    error: L,
+    execute: T
   } = re(
     async () => {
       var A;
       if (!i.preprocess && !i.transform) {
-        const a = await h(F(e));
-        if (a.error)
-          return d.value.push({
+        const n = await u(F(e));
+        if (n.error)
+          return f.value.push({
             code: "transform_failed",
-            message: a.error.message
+            message: n.error.message
           }), null;
-        const y = a.data;
-        return (!y || !((A = y["dpi:isDPIv3"]) != null && A["@value"])) && d.value.push({
+        const y = n.data;
+        return (!y || !((A = y["dpi:isDPIv3"]) != null && A["@value"])) && f.value.push({
           code: "not_dpi_v3",
           message: `The dataset is not a DPI v3 dataset. ID ${y["@id"]}`
         }), {
-          dpiData: ge(y),
+          dpiData: ge(y, i.visibility || "public"),
           data: y
         };
       }
       let D;
       if (i.preprocess)
         try {
-          const a = await i.preprocess(F(e));
-          if (a && typeof a == "object" && "error" in a && a.error)
-            return d.value.push({
+          const n = await i.preprocess(F(e));
+          if (n && typeof n == "object" && "error" in n && n.error)
+            return f.value.push({
               code: "preprocess_failed",
-              message: a.error.message || "Preprocess failed"
+              message: n.error.message || "Preprocess failed"
             }), null;
-          D = a && typeof a == "object" && "data" in a ? a.data : a;
-        } catch (a) {
-          return d.value.push({
+          D = n && typeof n == "object" && "data" in n ? n.data : n;
+        } catch (n) {
+          return f.value.push({
             code: "preprocess_failed",
-            message: (a == null ? void 0 : a.message) || String(a)
+            message: (n == null ? void 0 : n.message) || String(n)
           }), null;
         }
       else
         D = F(e);
       if (!i.transform)
-        return d.value.push({
+        return f.value.push({
           code: "missing_transform",
           message: "No transform function provided. Either supply a transform or omit both preprocess and transform to use the default DCAT dataset path."
         }), null;
       let P;
       try {
-        const a = i.preprocess ? D : F(e);
-        P = await i.transform(a);
-      } catch (a) {
-        return d.value.push({
+        const n = i.preprocess ? D : F(e);
+        P = await i.transform(n);
+      } catch (n) {
+        return f.value.push({
           code: "transform_apply_failed",
-          message: (a == null ? void 0 : a.message) || String(a)
+          message: (n == null ? void 0 : n.message) || String(n)
         }), null;
       }
       return {
@@ -89,34 +89,34 @@ function ve(e, i) {
     },
     null,
     { immediate: !1 }
-  ), R = z(
-    () => c.value && !g.value && !!b.value
+  ), v = z(
+    () => a.value && !b.value && !!g.value
   ), B = z(
-    () => c.value && !!R.value
-  ), T = z(() => B.value), I = z(() => {
-    var u;
-    return (u = p.value) == null ? void 0 : u.dpiData;
-  }), S = z(() => {
-    var u;
-    return (u = p.value) == null ? void 0 : u.data;
+    () => a.value && !!v.value
+  ), I = z(() => B.value), S = z(() => {
+    var l;
+    return (l = m.value) == null ? void 0 : l.dpiData;
+  }), V = z(() => {
+    var l;
+    return (l = m.value) == null ? void 0 : l.data;
   });
   return K(
     () => F(e),
-    (u) => u && c.value ? L() : null
-  ), K(S, (u) => {
-    console.log("jsonld resolved result:", u);
-  }), K(m, (u) => {
-    console.log("jsonld error:", u);
+    (l) => l && a.value ? T() : null
+  ), K(V, (l) => {
+    console.log("jsonld resolved result:", l);
+  }), K(L, (l) => {
+    console.log("jsonld error:", l);
   }), {
-    processedInput: p,
-    isProcessedInputReady: R,
-    result: I,
+    processedInput: m,
+    isProcessedInputReady: v,
+    result: S,
     isMaterialized: B,
-    isReady: T,
-    errors: d
+    isReady: I,
+    errors: f
   };
 }
-function f(e) {
+function p(e) {
   if (typeof e == "string")
     return e;
   if (e && typeof e == "object") {
@@ -127,7 +127,7 @@ function f(e) {
   }
   return "";
 }
-function l(e, i = "de") {
+function d(e, i = "de") {
   if (!e)
     return "";
   if (typeof e == "string")
@@ -136,14 +136,14 @@ function l(e, i = "de") {
     return e[i] || Object.values(e)[0] || "";
   if (Array.isArray(e)) {
     const r = e.find(
-      (c) => c["@language"] === i
+      (a) => a["@language"] === i
     );
     if (r)
       return r["@value"] || "";
     const t = e[0];
-    return (t == null ? void 0 : t["@value"]) || f(t) || "";
+    return (t == null ? void 0 : t["@value"]) || p(t) || "";
   }
-  return e["@language"] && e["@value"] ? e["@value"] : f(e);
+  return e["@language"] && e["@value"] ? e["@value"] : p(e);
 }
 function E(e) {
   return {
@@ -155,7 +155,7 @@ function x(e, i) {
   const r = e.prefLabel;
   return E({
     uri: e["@id"] || e["purl:identifier"] || "",
-    "@value": r ? l(r) : e["purl:identifier"] || ""
+    "@value": r ? d(r) : e["purl:identifier"] || ""
   });
 }
 function N(e) {
@@ -177,7 +177,7 @@ function H(e, i = "de") {
     "@value": t["@value"],
     "@language": t["@language"]
   }) : U({
-    "@value": f(t),
+    "@value": p(t),
     "@language": i
   }) : U({
     "@value": "",
@@ -188,14 +188,14 @@ function ce(e, i) {
   return e ? M(e).map(
     (t) => U({
       "@type": i,
-      "@value": f(t)
+      "@value": p(t)
     })
   ) : [];
 }
 function X(e, i) {
   const r = { isValid: !0 };
-  for (const [t, c] of Object.entries(i))
-    r[t] = f(e == null ? void 0 : e[c]);
+  for (const [t, a] of Object.entries(i))
+    r[t] = p(e == null ? void 0 : e[a]);
   return r;
 }
 function de(e) {
@@ -203,32 +203,37 @@ function de(e) {
     happyFlowLandingPage: {}
   };
 }
-function le(e) {
-  const i = {
+function le(e, i) {
+  const r = {
     discoverabilityPage: [{ isValid: !0 }]
   };
   if (e["dcatap:hvdCategory"]) {
-    const r = M(e["dcatap:hvdCategory"]).filter(Boolean);
-    i.hvdPage = r == null ? void 0 : r.map((t) => ({
+    const t = M(e["dcatap:hvdCategory"]).filter(Boolean);
+    r.hvdPage = t == null ? void 0 : t.map((a) => ({
       isValid: !0,
-      uri: t["@id"],
-      label: l(t.prefLabel)
+      uri: a["@id"],
+      label: d(a.prefLabel)
     }));
   }
   if (e["dcat:theme"]) {
-    const r = M(e["dcat:theme"]);
-    i.discoverabilityPage = [
+    const t = M(e["dcat:theme"]);
+    r.discoverabilityPage = [
       { isValid: !0 },
-      ...r.map(
-        (t) => U({
-          id: f(t).split("/").pop(),
-          uri: f(t),
-          label: l(t.prefLabel)
+      ...t.map(
+        (a) => U({
+          id: p(a).split("/").pop(),
+          uri: p(a),
+          label: d(a.prefLabel)
         })
       )
     ];
   }
-  return i;
+  return i && (r.visibilityPage = [
+    {
+      isValid: !0,
+      visibility: i
+    }
+  ]), r;
 }
 function se(e) {
   var t;
@@ -246,9 +251,9 @@ function se(e) {
     e["dct:modified"],
     "http://www.w3.org/2001/XMLSchema#date"
   )), e["dct:publisher"]) {
-    const c = o(e["dct:publisher"]);
+    const a = o(e["dct:publisher"]);
     r["dct:publisher"] = [
-      X(c, {
+      X(a, {
         "foaf:name": "foaf:name",
         "foaf:mbox": "foaf:mbox",
         "foaf:homepage": "foaf:homepage"
@@ -256,9 +261,9 @@ function se(e) {
     ];
   }
   if (e["dcat:contactPoint"]) {
-    const c = o(e["dcat:contactPoint"]);
+    const a = o(e["dcat:contactPoint"]);
     r["dcat:contactPoint"] = [
-      X(c, {
+      X(a, {
         "vcard:fn": "vcard:fn",
         "vcard:hasEmail": "vcard:hasEmail",
         "vcard:hasTelephone": "vcard:hasTelephone"
@@ -271,8 +276,8 @@ function ue(e) {
   var i, r;
   return {
     "dcatde:politicalGeocodingURI": (i = e["dcatapde:politicalGeocodingURI"]) == null ? void 0 : i.map((t) => {
-      var p;
-      const h = {
+      var f;
+      const R = {
         districtKey: "Kreis",
         governmentDistrictKey: "Bezirk",
         municipalityKey: "Gemeindeschlüssel",
@@ -280,27 +285,27 @@ function ue(e) {
         stateKey: "Bundesland",
         regionalKey: "Regionalschlüssel"
       };
-      let d = t["@id"].split("/").slice(-2, -1)[0];
-      return d = h[d] || d, {
+      let u = t["@id"].split("/").slice(-2, -1)[0];
+      return u = R[u] || u, {
         isValid: !0,
         uri: t["@id"],
-        id: ((p = t.prefLabel) == null ? void 0 : p.de) || t["@id"].split("/").pop(),
-        label: l(t.altLabel),
-        inVoc: d
+        id: ((f = t.prefLabel) == null ? void 0 : f.de) || t["@id"].split("/").pop(),
+        label: d(t.altLabel),
+        inVoc: u
       };
     }),
-    "dcat:temporalResolution": (r = e["dct:temporal"]) == null ? void 0 : r.reduce((t, c) => {
-      const d = o(c["dcat:startDate"]), p = o(c["dcat:endDate"]), b = f(d) || "", g = f(p) || "", m = typeof d != "string" && (d == null ? void 0 : d["@type"]) === "http://www.w3.org/2001/XMLSchema#dateTime" ? "dateTime" : "date", L = m === "date" ? b : b.split("T")[0], R = m === "date" ? g : g.split("T")[0], B = m === "dateTime" ? b.split("T")[1] : "", T = m === "dateTime" ? g.split("T")[1] : "";
+    "dcat:temporalResolution": (r = e["dct:temporal"]) == null ? void 0 : r.reduce((t, a) => {
+      const u = o(a["dcat:startDate"]), f = o(a["dcat:endDate"]), m = p(u) || "", g = p(f) || "", b = typeof u != "string" && (u == null ? void 0 : u["@type"]) === "http://www.w3.org/2001/XMLSchema#dateTime" ? "dateTime" : "date", L = b === "date" ? m : m.split("T")[0], T = b === "date" ? g : g.split("T")[0], v = b === "dateTime" ? m.split("T")[1] : "", B = b === "dateTime" ? g.split("T")[1] : "";
       return {
         isValid: !0,
         type: "dct:PeriodOfTime",
         "dct:temporal": [
           {
-            dataType: m,
+            dataType: b,
             "dcat:startDate": L,
-            "dcat:endDate": R,
-            startTime: B || "",
-            endTime: T || ""
+            "dcat:endDate": T,
+            startTime: v || "",
+            endTime: B || ""
           }
         ]
       };
@@ -308,77 +313,77 @@ function ue(e) {
   };
 }
 function fe(e, i) {
-  var t, c, h, d, p, b, g, m, L, R, B, T, I, S, u, D, P, A, a, y, V;
+  var t, a, R, u, f, m, g, b, L, T, v, B, I, S, V, l, D, P, A, n, y;
   if (!e)
     return {};
   const r = o(e["spdx:checksum"]);
   return {
     isValid: !0,
     id: i + 1,
-    "dcat:accessURL": f(o(e["dcat:accessURL"])) || "",
+    "dcat:accessURL": p(o(e["dcat:accessURL"])) || "",
     "dct:format": {
       // redundancy in label and title for better compatibility
       label: ((t = o(e["dct:format"])) == null ? void 0 : t["purl:identifier"]) || "",
-      title: ((c = o(e["dct:format"])) == null ? void 0 : c["purl:identifier"]) || "",
-      uri: ((h = o(e["dct:format"])) == null ? void 0 : h["@id"]) || ""
+      title: ((a = o(e["dct:format"])) == null ? void 0 : a["purl:identifier"]) || "",
+      uri: ((R = o(e["dct:format"])) == null ? void 0 : R["@id"]) || ""
     },
-    "dct:title": l(e["dct:title"]),
-    "dct:description": l(e["dct:description"]),
-    "dct:modified": f(o(e["dct:modified"])),
-    "dct:issued": f(o(e["dct:issued"])),
-    "dcat:byteSize": f(o(e["dcat:byteSize"])),
-    "dcatde:licenseAttributionByText": l(e["dcatapde:licenseAttributionByText"]) || "",
+    "dct:title": d(e["dct:title"]),
+    "dct:description": d(e["dct:description"]),
+    "dct:modified": p(o(e["dct:modified"])),
+    "dct:issued": p(o(e["dct:issued"])),
+    "dcat:byteSize": p(o(e["dcat:byteSize"])),
+    "dcatde:licenseAttributionByText": d(e["dcatapde:licenseAttributionByText"]) || "",
     "dct:license": e["dct:license"] ? [{
       isValid: !0,
-      uri: ((d = o(e["dct:license"])) == null ? void 0 : d["@id"]) || "",
-      "dcterms:license": l((p = o(e["dct:license"])) == null ? void 0 : p.altLabel) || "",
-      label: l((b = o(e["dct:license"])) == null ? void 0 : b.prefLabel) || "",
-      title: l((g = o(e["dct:license"])) == null ? void 0 : g.prefLabel) || ""
+      uri: ((u = o(e["dct:license"])) == null ? void 0 : u["@id"]) || "",
+      "dcterms:license": d((f = o(e["dct:license"])) == null ? void 0 : f.altLabel) || "",
+      label: d((m = o(e["dct:license"])) == null ? void 0 : m.prefLabel) || "",
+      title: d((g = o(e["dct:license"])) == null ? void 0 : g.prefLabel) || ""
     }] : [],
-    "dct:accessRights": f(o(e["dct:accessRights"])),
+    "dct:accessRights": p(o(e["dct:accessRights"])),
     "dcatap:availability": {
       // Redundant label and title for better compatibility
-      label: ((m = o(e["dcatap:availability"])) == null ? void 0 : m.prefLabel) || "",
+      label: ((b = o(e["dcatap:availability"])) == null ? void 0 : b.prefLabel) || "",
       title: ((L = o(e["dcatap:availability"])) == null ? void 0 : L.prefLabel) || "",
-      uri: ((R = o(e["dcatap:availability"])) == null ? void 0 : R["@id"]) || ""
+      uri: ((T = o(e["dcatap:availability"])) == null ? void 0 : T["@id"]) || ""
     },
-    "dct:language": ((B = e["dct:language"]) == null ? void 0 : B.map((v) => x(v)).filter(Boolean)) || [],
+    "dct:language": ((v = e["dct:language"]) == null ? void 0 : v.map((h) => x(h)).filter(Boolean)) || [],
     "dcat:mediaType": E({
-      label: l(
-        (T = o(e["dcat:mediaType"])) == null ? void 0 : T.prefLabel
+      label: d(
+        (B = o(e["dcat:mediaType"])) == null ? void 0 : B.prefLabel
       ) || "",
       uri: ((I = o(e["dcat:mediaType"])) == null ? void 0 : I["@id"]) || ""
     }),
     "dcat:compressFormat": E({
-      label: l(
+      label: d(
         (S = o(e["dcat:compressFormat"])) == null ? void 0 : S.prefLabel
       ) || "",
-      uri: ((u = o(e["dcat:compressFormat"])) == null ? void 0 : u["@id"]) || ""
+      uri: ((V = o(e["dcat:compressFormat"])) == null ? void 0 : V["@id"]) || ""
     }),
     "dcat:packageFormat": E({
-      label: l(
-        (D = o(e["dcat:packageFormat"])) == null ? void 0 : D.prefLabel
+      label: d(
+        (l = o(e["dcat:packageFormat"])) == null ? void 0 : l.prefLabel
       ) || "",
-      uri: ((P = o(e["dcat:packageFormat"])) == null ? void 0 : P["@id"]) || ""
+      uri: ((D = o(e["dcat:packageFormat"])) == null ? void 0 : D["@id"]) || ""
     }),
-    "adms:status": ((A = o(e["adms:status"])) == null ? void 0 : A["@id"]) || "",
+    "adms:status": ((P = o(e["adms:status"])) == null ? void 0 : P["@id"]) || "",
     checksum: {
-      title: f(o(r == null ? void 0 : r["spdx:checksumValue"])),
-      "spdx:checksum": ((a = f(o(r == null ? void 0 : r["spdx:algorithm"]))) == null ? void 0 : a.split("_").pop()) || "",
-      uri: (y = f(
+      title: p(o(r == null ? void 0 : r["spdx:checksumValue"])),
+      "spdx:checksum": ((A = p(o(r == null ? void 0 : r["spdx:algorithm"]))) == null ? void 0 : A.split("_").pop()) || "",
+      uri: (n = p(
         o(r == null ? void 0 : r["spdx:algorithm"])
-      )) == null ? void 0 : y.replace("spdx:", "http://spdx.org/rdf/terms#")
+      )) == null ? void 0 : n.replace("spdx:", "http://spdx.org/rdf/terms#")
     },
     accessServices: ye(e["dcat:accessService"] || []),
-    conformsToItems: (V = e["dct:conformsTo"]) == null ? void 0 : V.map((v, j) => ({
+    conformsToItems: (y = e["dct:conformsTo"]) == null ? void 0 : y.map((h, j) => ({
       // for some reason dct:conformsTo is different from the one on dcat:dataset level
       id: j + 1,
-      "dcat:accessURL": v["@id"],
-      "dct:title": l(v["rdfs:label"]) || "",
-      "dcat:downloadURL": v["@id"],
+      "dcat:accessURL": h["@id"],
+      "dct:title": d(h["rdfs:label"]) || "",
+      "dcat:downloadURL": h["@id"],
       // redundancy to match properties on dcat:dataset level
-      "rdfs:label": l(v["rdfs:label"]) || "",
-      uri: v["@id"]
+      "rdfs:label": d(h["rdfs:label"]) || "",
+      uri: h["@id"]
     })).filter(Boolean)
   };
 }
@@ -388,7 +393,7 @@ function pe(e) {
   };
   if (e["dcat:distribution"]) {
     const r = M(e["dcat:distribution"]);
-    i["dcat:distribution"] = r.map((t, c) => fe(t, c)).filter((t) => Object.keys(t).length > 0);
+    i["dcat:distribution"] = r.map((t, a) => fe(t, a)).filter((t) => Object.keys(t).length > 0);
   }
   return console.log(i), i;
 }
@@ -398,96 +403,96 @@ function me(e) {
   };
 }
 function be(e) {
-  var r, t, c, h, d, p, b, g, m, L, R, B, T, I, S, u, D, P, A, a, y, V, v, j, C, G, q;
+  var r, t, a, R, u, f, m, g, b, L, T, v, B, I, S, V, l, D, P, A, n, y, h, j, C, G, q;
   const i = {
-    "dct:language": (r = e["dct:language"]) == null ? void 0 : r.map((n) => x(n)).filter(Boolean),
-    "dct:conformsTo": (t = e["dct:conformsTo"]) == null ? void 0 : t.map((n) => ({
-      "rdfs:label": l(n["rdfs:label"]) || "",
-      "@id": n["@id"]
+    "dct:language": (r = e["dct:language"]) == null ? void 0 : r.map((c) => x(c)).filter(Boolean),
+    "dct:conformsTo": (t = e["dct:conformsTo"]) == null ? void 0 : t.map((c) => ({
+      "rdfs:label": d(c["rdfs:label"]) || "",
+      "@id": c["@id"]
     })).filter(Boolean),
     "dct:accessRights": e["dct:accessRights"] ? s(x(e["dct:accessRights"])) : [],
-    "dct:provenance": (c = e["dct:provenance"]) == null ? void 0 : c.map((n) => ({
-      "rdfs:label": l(n["rdfs:label"]) || "",
-      uri: n["@id"]
+    "dct:provenance": (a = e["dct:provenance"]) == null ? void 0 : a.map((c) => ({
+      "rdfs:label": d(c["rdfs:label"]) || "",
+      uri: c["@id"]
     })).filter(Boolean),
     "dct:accrualPeriodicity": e["dct:accrualPeriodicity"] ? s(x(e["dct:accrualPeriodicity"])) : [],
-    "dct:type": (h = e["dct:type"]) == null ? void 0 : h.map((n) => x(n)).filter(Boolean),
-    "dcat:spatialResolutionInMeters": ((d = e["dcat:spatialResolutionInMeters"]) == null ? void 0 : d.map(N)) || void 0,
-    "dcat:temporalResolution": e["dcat:temporalResolution"] ? e["dcat:temporalResolution"].map(N).map((n) => {
-      const _ = n["@value"].match(/^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/);
+    "dct:type": (R = e["dct:type"]) == null ? void 0 : R.map((c) => x(c)).filter(Boolean),
+    "dcat:spatialResolutionInMeters": ((u = e["dcat:spatialResolutionInMeters"]) == null ? void 0 : u.map(N)) || void 0,
+    "dcat:temporalResolution": e["dcat:temporalResolution"] ? e["dcat:temporalResolution"].map(N).map((c) => {
+      const _ = c["@value"].match(/^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/);
       if (_) {
         const [, O, k, Y, $, J, Q] = _.map((W) => W || "0");
         return { Year: O, Month: k, Day: Y, Hour: $, Minute: J, Second: Q };
       }
     }).filter(Boolean) : void 0,
-    "dcat:qualifiedRelation": (p = s(
+    "dcat:qualifiedRelation": (f = s(
       e["dcat:qualifiedRelation"]
-    )) == null ? void 0 : p.filter(Boolean),
-    "dct:creator": (b = s(e["dct:creator"])) == null ? void 0 : b.filter(Boolean),
+    )) == null ? void 0 : f.filter(Boolean),
+    "dct:creator": (m = s(e["dct:creator"])) == null ? void 0 : m.filter(Boolean),
     "dct:contributor": (g = s(e["dct:contributor"])) == null ? void 0 : g.filter(Boolean),
-    "dcatde:contributorID": (m = e["dcatapde:contributorID"]) == null ? void 0 : m.map((n) => x(n)).filter(Boolean),
+    "dcatde:contributorID": (b = e["dcatapde:contributorID"]) == null ? void 0 : b.map((c) => x(c)).filter(Boolean),
     "dcatde:geocodingDescription": (L = s(
       e["dcatapde:geocodingDescription"]
     )) == null ? void 0 : L.filter(Boolean),
-    "dct:identifier": (R = e["dct:identifier"]) == null ? void 0 : R.map((n) => ({
-      "@value": n
+    "dct:identifier": (T = e["dct:identifier"]) == null ? void 0 : T.map((c) => ({
+      "@value": c
     })),
-    "adms:identifier": (B = s(e["adms:identifier"])) == null ? void 0 : B.filter(Boolean),
-    "owl:versionInfo": (T = e["owl:versionInfo"]) == null ? void 0 : T.map((n) => ({
-      "@value": n
+    "adms:identifier": (v = s(e["adms:identifier"])) == null ? void 0 : v.filter(Boolean),
+    "owl:versionInfo": (B = e["owl:versionInfo"]) == null ? void 0 : B.map((c) => ({
+      "@value": c
     })),
     "adms:versionNotes": e["adms:versionNotes"],
     "dcatde:legalBasis": (I = s(e["dcatapde:legalBasis"])) == null ? void 0 : I.filter(
       Boolean
     ),
     "dct:relation": (S = s(e["dct:relation"])) == null ? void 0 : S.filter(Boolean),
-    "dcat:landingPage": (u = s(e["dcat:landingPage"])) == null ? void 0 : u.filter(
+    "dcat:landingPage": (V = s(e["dcat:landingPage"])) == null ? void 0 : V.filter(
       Boolean
     ),
-    "prov:wasGeneratedBy": (D = s(e["prov:wasGeneratedBy"])) == null ? void 0 : D.filter(
+    "prov:wasGeneratedBy": (l = s(e["prov:wasGeneratedBy"])) == null ? void 0 : l.filter(
       Boolean
     ),
-    "dct:isReferencedBy": (P = s(e["dct:isReferencedBy"])) == null ? void 0 : P.filter(
+    "dct:isReferencedBy": (D = s(e["dct:isReferencedBy"])) == null ? void 0 : D.filter(
       Boolean
     ),
-    "dct:source": (A = s(e["dct:source"])) == null ? void 0 : A.filter(Boolean),
-    "dct:hasVersion": (a = s(e["dct:hasVersion"])) == null ? void 0 : a.filter(Boolean),
-    "dct:isVersionOf": (y = s(e["dct:isVersionOf"])) == null ? void 0 : y.filter(Boolean),
-    "prov:qualifiedAttribution": (V = s(
+    "dct:source": (P = s(e["dct:source"])) == null ? void 0 : P.filter(Boolean),
+    "dct:hasVersion": (A = s(e["dct:hasVersion"])) == null ? void 0 : A.filter(Boolean),
+    "dct:isVersionOf": (n = s(e["dct:isVersionOf"])) == null ? void 0 : n.filter(Boolean),
+    "prov:qualifiedAttribution": (y = s(
       e["prov:qualifiedAttribution"]
-    )) == null ? void 0 : V.filter(Boolean),
-    "dcat:keyword": (v = s(e["dcat:keyword"])) == null ? void 0 : v.filter(Boolean),
+    )) == null ? void 0 : y.filter(Boolean),
+    "dcat:keyword": (h = s(e["dcat:keyword"])) == null ? void 0 : h.filter(Boolean),
     "dct:spatial": (j = s(e["dct:spatial"])) == null ? void 0 : j.filter(Boolean),
     "dct:references": (C = s(e["dct:references"])) == null ? void 0 : C.filter(Boolean),
-    "foaf:page": (G = s(e["foaf:page"])) == null ? void 0 : G.filter(Boolean).map((n) => {
-      if (!n)
+    "foaf:page": (G = s(e["foaf:page"])) == null ? void 0 : G.filter(Boolean).map((c) => {
+      if (!c)
         return;
-      const w = o(n["dct:format"]);
+      const w = o(c["dct:format"]);
       return {
-        "dct:title": o(n["dct:title"]),
-        "dct:description": o(n["dct:description"]),
-        "@value": w ? l(w.prefLabel) : "",
+        "dct:title": o(c["dct:title"]),
+        "dct:description": o(c["dct:description"]),
+        "@value": w ? d(w.prefLabel) : "",
         uri: w ? w["@id"] : "",
-        "foaf:homepage": o(n["foaf:homepage"]) || ""
+        "foaf:homepage": o(c["foaf:homepage"]) || ""
       };
     }),
-    "dcatap:availability": (q = e["dcatap:availability"]) == null ? void 0 : q.map((n) => {
+    "dcatap:availability": (q = e["dcatap:availability"]) == null ? void 0 : q.map((c) => {
       var w, _, O, k;
       return {
         // Redundant label and title for better compatibility
-        label: ((w = o(n)) == null ? void 0 : w.prefLabel) || "",
-        title: ((_ = o(n)) == null ? void 0 : _.prefLabel) || "",
-        uri: ((O = o(n)) == null ? void 0 : O["@id"]) || "",
-        "@value": l((k = o(n)) == null ? void 0 : k.prefLabel) || ""
+        label: ((w = o(c)) == null ? void 0 : w.prefLabel) || "",
+        title: ((_ = o(c)) == null ? void 0 : _.prefLabel) || "",
+        uri: ((O = o(c)) == null ? void 0 : O["@id"]) || "",
+        "@value": d((k = o(c)) == null ? void 0 : k.prefLabel) || ""
       };
     })
   };
   return ne(i);
 }
-function ge(e) {
+function ge(e, i) {
   return {
     Landing: de(),
-    Discoverability: le(e),
+    Discoverability: le(e, i),
     BasicInfos: se(e),
     Covering: ue(e),
     DistributionSimple: pe(e),
@@ -497,24 +502,24 @@ function ge(e) {
 }
 function ye(e) {
   return !e || !Array.isArray(e) || e.length === 0 ? [] : e.map((i, r) => {
-    var t, c;
+    var t, a;
     return {
       id: r + 1,
       "dcat:downloadURL": ((t = o(i["dcat:endpointURL"])) == null ? void 0 : t["@id"]) || "",
-      "dcat:endpointURL": ((c = o(i["dcat:endpointURL"])) == null ? void 0 : c["@id"]) || "",
-      "dct:description": l(i["dct:description"]) || "",
-      "dct:title": l(i["dct:title"]) || ""
+      "dcat:endpointURL": ((a = o(i["dcat:endpointURL"])) == null ? void 0 : a["@id"]) || "",
+      "dct:description": d(i["dct:description"]) || "",
+      "dct:title": d(i["dct:title"]) || ""
     };
   });
 }
 export {
   s as asSomeArray,
-  l as extractLocalizedString,
-  f as extractStringValue,
+  d as extractLocalizedString,
+  p as extractStringValue,
   o as getFirstItem,
   M as normalizeToArray,
   ne as purgeNullishAndEmptyProperties,
   ye as toAccessService,
   ge as toDpi,
-  ve as useDpiSimpleLoader
+  De as useDpiSimpleLoader
 };