@startinblox/core 2.0.6-beta.20 → 2.0.6-beta.22

package/dist/{custom-getter-Blm6IRrs.js → custom-getter-BKuxi53d.js}

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { q as mergeContexts, o as getRawContext, n as normalizeContext } from "./helpers-DtCY-jxq.js";
-import { S as StoreService } from "./store-D1nUbSMR.js";
+import { S as StoreService } from "./store-CsOvawDq.js";
 const store = StoreService.getInstance();
 class CustomGetter {
   // search attributes to give to server

package/dist/index.js

@@ -1,10 +1,10 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { g as getDefaultExportFromCjs, S as StoreService, b as base_context, f as formatAttributesToServerPaginationOptions, m as mergeServerSearchOptions, a as formatAttributesToServerSearchOptions, c as StoreType, d as StoreFactory, h as hasSetLocalData, e as hasQueryIndex, __tla as __tla_0 } from "./store-D1nUbSMR.js";
+import { g as getDefaultExportFromCjs, S as StoreService, b as base_context, f as formatAttributesToServerPaginationOptions, m as mergeServerSearchOptions, a as formatAttributesToServerSearchOptions, c as StoreType, d as StoreFactory, h as hasSetLocalData, e as hasQueryIndex, __tla as __tla_0 } from "./store-CsOvawDq.js";
 import { d as defineComponent, n as normalizeContext, u as uniqID, f as fuzzyCompare, a as asyncQuerySelector, i as importInlineCSS, b as importCSS, c as doesResourceContainList, e as findClosingBracketMatchIndex, p as parseFieldsString, g as evalTemplateString, h as compare, j as generalComparator, t as transformArrayToContainer, s as setDeepProperty } from "./helpers-DtCY-jxq.js";
-import { __tla as __tla_1 } from "./store-D1nUbSMR.js";
-import { A, D } from "./store-D1nUbSMR.js";
+import { __tla as __tla_1 } from "./store-CsOvawDq.js";
+import { A, D } from "./store-CsOvawDq.js";
 import { k } from "./helpers-DtCY-jxq.js";
 let index$4, BaseWidgetMixin, index$3, CounterMixin, DspCatalogDisplay, EdcAssetsDisplay, FederationMixin, FilterMixin, GrouperMixin, HighlighterMixin, ListMixin, NextMixin, PaginateMixin, RequiredMixin, Sib, SolidAcChecker, SolidDelete, SolidDisplay, SolidForm, SolidFormSearch, SolidLang, SolidMemberAdd, SolidMemberDelete, SolidMembership, SolidTable, SolidTemplateElement, SolidWidget, SorterMixin, StoreMixin, index$2, index$1, index, TranslationMixin, ValidationMixin, WidgetMixin, b, o$2, newWidgetFactory, D2, o$1, m, widgetFactory;
 let __tla = Promise.all([

package/dist/{store-D1nUbSMR.js → store-CsOvawDq.js}

@@ -3750,16 +3750,9 @@ let __tla = (async () => {
           })
         });
         if (!response.ok) {
-          const getResponse = await this.fetchAuthn(`${this.config.contractNegotiationEndpoint}?offset=0&limit=1000`, {
-            method: "GET",
-            headers: this.headers
-          });
-          if (!getResponse.ok) {
-            console.warn(`Failed to fetch contract negotiations: ${getResponse.status} ${getResponse.statusText}`);
-            return [];
-          }
-          const getData = await getResponse.json();
-          return Array.isArray(getData) ? getData : getData.items || [];
+          const body = await response.text().catch(() => "");
+          console.warn(`Failed to fetch contract negotiations: ${response.status} ${response.statusText}${body ? ` \u2014 ${body}` : ""}`);
+          return [];
         }
         const data = await response.json();
         return Array.isArray(data) ? data : data.items || [];
@@ -5529,6 +5522,23 @@ let __tla = (async () => {
       const endpointHash = ((_a2 = this.cfg.endpoint) == null ? void 0 : _a2.replace(/[^a-zA-Z0-9]/g, "")) || "unknown";
       return `store://local.fc-${endpointHash}-${containerType}/`;
     }
+    buildOutputContainer(resource, targetType) {
+      const items = resource == null ? void 0 : resource["ldp:contains"];
+      if (!Array.isArray(items)) return resource;
+      const filtered = items.filter((item) => {
+        const name = item == null ? void 0 : item.name;
+        if (!name || String(name).trim().length === 0) return false;
+        if (!targetType) return true;
+        const t = item == null ? void 0 : item["@type"];
+        const last = Array.isArray(t) ? t[t.length - 1] : t;
+        return last === targetType;
+      });
+      if (filtered.length === items.length) return resource;
+      return {
+        ...resource,
+        "ldp:contains": filtered
+      };
+    }
     async getData(args) {
       if (this.isFetching) {
         if (this.pendingGetData) {
@@ -5599,7 +5609,7 @@ let __tla = (async () => {
         const items = (apiList == null ? void 0 : apiList.items) || [];
         if (!Array.isArray(items)) {
           console.warn("[FederatedCatalogueStore] apiList.items is not an array");
-          return resource;
+          return this.buildOutputContainer(resource, targetType);
         }
         const apiHashes = new Set(items.map((item) => item.meta.sdHash));
         const newHashes = [];
@@ -5676,13 +5686,13 @@ let __tla = (async () => {
           },
           bubbles: true
         }));
-        return resource;
+        return this.buildOutputContainer(resource, targetType);
       } catch (error2) {
         console.error("[FederatedCatalogueStore] Delta update failed, falling back to full fetch:", error2);
         return await this.getFullData(targetType);
       }
     }
-    async getFullData(_targetType) {
+    async getFullData(targetType) {
       if (!this.fcApi) {
         console.warn("[FederatedCatalogueStore] API not initialized yet, waiting for auth");
         return await this.initLocalDataSourceContainer();
@@ -5728,7 +5738,7 @@ let __tla = (async () => {
         },
         bubbles: true
       }));
-      return resource;
+      return this.buildOutputContainer(resource, targetType);
     }
     async initLocalDataSourceContainer(dataSrc = "", containerType = "default") {
       if (!dataSrc) {
@@ -5852,30 +5862,74 @@ let __tla = (async () => {
       return obj;
     }
     mapSourceToDestination(src, opts) {
-      var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+      var _a2, _b, _c, _d;
       const vc = src.verifiableCredential;
       const cs = vc.credentialSubject;
+      const FOAF_THUMBNAIL_KEYS = [
+        "foaf:thumbnail",
+        "http://xmlns.com/foaf/0.1/thumbnail"
+      ];
+      const FOAF_NAME_KEYS = [
+        "foaf:name",
+        "http://xmlns.com/foaf/0.1/name"
+      ];
+      const DCTERMS_CREATOR_KEYS = [
+        "dcterms:creator",
+        "dct:creator",
+        "http://purl.org/dc/terms/creator"
+      ];
+      const RDF_RESOURCE_KEYS = [
+        "rdf:resource",
+        "http://www.w3.org/1999/02/22-rdf-syntax-ns#resource"
+      ];
+      const pickKey = (obj, keys) => {
+        if (!obj) return void 0;
+        for (const k of keys) if (obj[k] !== void 0) return obj[k];
+        return void 0;
+      };
+      const getThumbnailUrl = (obj) => pickKey(pickKey(obj, FOAF_THUMBNAIL_KEYS), RDF_RESOURCE_KEYS) || "";
+      const getCreator = (obj) => pickKey(obj, DCTERMS_CREATOR_KEYS);
       let catInfo;
       let usedKey;
       let type;
+      const datasetBlock = cs["dcat:dataset"] && cs["dcat:dataset"].length > 0 ? cs["dcat:dataset"][0] : void 0;
+      const detectIsDataOffer = (block) => {
+        if (!block || typeof block !== "object") return false;
+        const rawType = block["@type"];
+        const types2 = Array.isArray(rawType) ? rawType : rawType ? [
+          rawType
+        ] : [];
+        const datasetTypeHit = types2.some((t) => typeof t === "string" && (t === "dcat:Dataset" || t === "http://www.w3.org/ns/dcat#Dataset" || t === "tems:DataOffer" || t === "temscore:DataOffer" || t === "http://tems.org/2024/temscore#DataOffer"));
+        if (datasetTypeHit) return true;
+        const kind = block["tc:offeringKind"] || block["temscore:offeringKind"] || block["http://tems.org/2024/temscore#offeringKind"];
+        return typeof kind === "string" && /dataoffer/i.test(kind);
+      };
       if (cs["dcat:service"]) {
         catInfo = cs["dcat:service"];
         usedKey = "service";
-        type = "tems:Service";
-      } else if (cs["dcat:dataset"] && cs["dcat:dataset"].length > 0) {
-        const dataset2 = cs["dcat:dataset"][0];
-        if (dataset2["dcat:service"]) {
-          catInfo = dataset2["dcat:service"];
+        type = detectIsDataOffer(catInfo) ? "tems:DataOffer" : "tems:Service";
+      } else if (datasetBlock) {
+        const nestedDataset = datasetBlock["dcat:dataset"];
+        const firstNestedDataset = Array.isArray(nestedDataset) ? nestedDataset[0] : nestedDataset;
+        if (firstNestedDataset) {
+          catInfo = firstNestedDataset;
+          usedKey = "nested-dataset";
+          type = "tems:DataOffer";
+        } else if (datasetBlock["dcat:service"]) {
+          catInfo = datasetBlock["dcat:service"];
           usedKey = "nested-service";
-          type = "tems:Service";
+          type = detectIsDataOffer(catInfo) ? "tems:DataOffer" : "tems:Service";
         } else {
-          catInfo = dataset2;
+          catInfo = datasetBlock;
           usedKey = "dataset";
           type = "tems:DataOffer";
         }
       } else {
         throw new Error("Expected either credentialSubject['dcat:service'] or a non-empty array in ['dcat:dataset']");
       }
+      if (!catInfo) {
+        throw new Error(`Could not locate an offering block (used key: ${usedKey}); resolved catInfo is empty`);
+      }
       const resourceId = cs["@id"];
       const slug = resourceId.split("/").pop() || "unknown";
       const serviceId = `${opts.temsServiceBase}${encodeURIComponent(slug)}/`;
@@ -5883,7 +5937,10 @@ let __tla = (async () => {
       const update_date = vc.expirationDate;
       const name = catInfo["dcterms:title"] || catInfo["dct:title"];
       const description = catInfo["rdfs:comment"];
-      const keywords = catInfo["dcat:keyword"] || [];
+      const rawKeywords = catInfo["dcat:keyword"];
+      const keywords = Array.isArray(rawKeywords) ? rawKeywords : rawKeywords != null ? [
+        rawKeywords
+      ] : [];
       const long_description = keywords.length > 0 ? `Keywords: ${keywords.join(", ")}` : "";
       const categories = {
         "@id": `${serviceId}categories/`,
@@ -5901,12 +5958,10 @@ let __tla = (async () => {
       const is_external = hasEndpoint;
       const is_api = hasEndpoint;
       const imageUrls = [];
-      if ((_a2 = catInfo["foaf:thumbnail"]) == null ? void 0 : _a2["rdf:resource"]) {
-        imageUrls.push(catInfo["foaf:thumbnail"]["rdf:resource"]);
-      }
-      if ((_c = (_b = catInfo["dcterms:creator"]) == null ? void 0 : _b["foaf:thumbnail"]) == null ? void 0 : _c["rdf:resource"]) {
-        imageUrls.push(catInfo["dcterms:creator"]["foaf:thumbnail"]["rdf:resource"]);
-      }
+      const catThumbnail = getThumbnailUrl(catInfo);
+      if (catThumbnail) imageUrls.push(catThumbnail);
+      const creatorThumbnail = getThumbnailUrl(getCreator(catInfo));
+      if (creatorThumbnail) imageUrls.push(creatorThumbnail);
       const images = {
         "@id": `${serviceId}images/`,
         "@type": "ldp:Container",
@@ -5920,25 +5975,26 @@ let __tla = (async () => {
       };
       const contact_url = catInfo["dcat:endpointDescription"] || "";
       const documentation_url = contact_url || "";
-      let service_url = catInfo["dcat:endpointURL"] || "";
+      let service_url = endpointURL;
       if (!service_url) {
         console.warn("[FederatedCatalogueStore] dcat:endpointURL is missing from dcat:service. Available fields:", Object.keys(catInfo));
       }
       if (service_url.includes("demo.isan.org")) service_url = new URL(service_url).origin;
       let providerRef;
       if (usedKey === "service") {
-        providerRef = ((_d = cs["gax-core:operatedBy"]) == null ? void 0 : _d["@id"]) || "";
-      } else if (usedKey === "nested-service") {
-        providerRef = ((_e = cs["gax-core:operatedBy"]) == null ? void 0 : _e["@id"]) || ((_f = cs["gax-core:offeredBy"]) == null ? void 0 : _f["@id"]) || "";
+        providerRef = ((_a2 = cs["gax-core:operatedBy"]) == null ? void 0 : _a2["@id"]) || "";
+      } else if (usedKey === "nested-service" || usedKey === "nested-dataset") {
+        providerRef = ((_b = cs["gax-core:operatedBy"]) == null ? void 0 : _b["@id"]) || ((_c = cs["gax-core:offeredBy"]) == null ? void 0 : _c["@id"]) || "";
       } else {
-        providerRef = ((_g = cs["gax-core:offeredBy"]) == null ? void 0 : _g["@id"]) || "";
+        providerRef = ((_d = cs["gax-core:offeredBy"]) == null ? void 0 : _d["@id"]) || "";
       }
       const providerSlug = providerRef.split(":").pop() + String(Math.random()) || "0";
-      const providerLogo = ((_i = (_h = catInfo["dcterms:creator"]) == null ? void 0 : _h["foaf:thumbnail"]) == null ? void 0 : _i["rdf:resource"]) || "";
+      const creator = getCreator(catInfo);
+      const providerLogo = getThumbnailUrl(creator);
       const provider = {
         "@id": `${opts.temsProviderBase}${encodeURIComponent(providerSlug)}/`,
         "@type": "tems:Provider",
-        name: ((_j = catInfo["dcterms:creator"]) == null ? void 0 : _j["foaf:name"]) || "",
+        name: pickKey(creator, FOAF_NAME_KEYS) || "",
         image: {
           "@id": `${opts.temsImageBase}${encodeURIComponent(providerLogo.split("/").pop() || "0")}/`,
           "@type": "tems:Image",
@@ -32981,7 +33037,8 @@ sh:property [
     acl: "http://www.w3.org/ns/auth/acl#",
     hd: "http://cdn.startinblox.com/owl/ttl/vocab.ttl#",
     sib: "http://cdn.startinblox.com/owl/ttl/vocab.ttl#",
-    dcat: "https://www.w3.org/ns/dcat3.jsonld#",
+    dcat: "http://www.w3.org/ns/dcat#",
+    dct: "http://purl.org/dc/terms/",
     tems: "https://cdn.startinblox.com/owl/tems.jsonld#",
     name: "rdfs:label",
     deadline: "xsd:dateTime",
@@ -33060,7 +33117,7 @@ sh:property [
       window.dispatchEvent(event);
     }
     async initGetter() {
-      const { CustomGetter } = await import("./custom-getter-Blm6IRrs.js");
+      const { CustomGetter } = await import("./custom-getter-BKuxi53d.js");
       return CustomGetter;
     }
     disconnectedCallback() {

package/dist/store.js

@@ -1,4 +1,4 @@
-import { s, S, c, b, e, j, h, i } from "./store-D1nUbSMR.js";
+import { s, S, c, b, e, j, h, i } from "./store-CsOvawDq.js";
 export {
   s as SEMANTIZER,
   S as StoreService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/core",
-  "version": "2.0.6-beta.20",
+  "version": "2.0.6-beta.22",
   "description": "This is a series of web component respecting both the web components standards and the Linked Data Platform convention.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",