@startinblox/core 2.0.6-beta.7 → 2.0.6-beta.8

package/dist/{custom-getter-DFIdqwHu.js → custom-getter-WZPa-O0k.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-vZrb1UDN.js";
-import { S as StoreService } from "./store-pxHgUL4R.js";
+import { S as StoreService } from "./store-D6BkvCFg.js";
 const store = StoreService.getInstance();
 class CustomGetter {
   // search attributes to give to server

package/dist/index.js

@@ -1,8 +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-pxHgUL4R.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-D6BkvCFg.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-vZrb1UDN.js";
+import { __tla as __tla_1 } from "./store-D6BkvCFg.js";
+import { A, D } from "./store-D6BkvCFg.js";
 import { k } from "./helpers-vZrb1UDN.js";
 let index$4, BaseWidgetMixin, index$3, CounterMixin, EdcAssetsDisplay, EdcCatalogDisplay, EdcFederatedCatalogDisplay, 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, x, o$2, newWidgetFactory, B, o$1, m, widgetFactory;
 let __tla = Promise.all([
@@ -11,6 +13,12 @@ let __tla = Promise.all([
       return __tla_0;
     } catch {
     }
+  })(),
+  (() => {
+    try {
+      return __tla_1;
+    } catch {
+    }
   })()
 ]).then(async () => {
   var _a2;
@@ -1115,7 +1123,7 @@ Component: ${componentName}
   }, b[d$1("elementProperties")] = /* @__PURE__ */ new Map(), b[d$1("finalized")] = /* @__PURE__ */ new Map(), p$1 == null ? void 0 : p$1({
     ReactiveElement: b
   }), (a$1.reactiveElementVersions ?? (a$1.reactiveElementVersions = [])).push("2.0.4");
-  let t$1, i$4, s$2, e$2, h$2, o$3, n$2, r$2, l, c$2, a, u, d, f$2, v, _, m$1, p, g, $, y, T, E, A, C;
+  let t$1, i$4, s$2, e$2, h$2, o$3, n$2, r$2, l, c$2, a, u, d, f$2, v, _, m$1, p, g, $, y, T, E, A2, C;
   t$1 = globalThis;
   i$4 = t$1.trustedTypes;
   s$2 = i$4 ? i$4.createPolicy("lit-html", {
@@ -1147,7 +1155,7 @@ Component: ${componentName}
   x = y(1);
   T = Symbol.for("lit-noChange");
   E = Symbol.for("lit-nothing");
-  A = /* @__PURE__ */ new WeakMap();
+  A2 = /* @__PURE__ */ new WeakMap();
   C = r$2.createTreeWalker(r$2, 129);
   function P$1(t2, i2) {
     if (!a(t2) || !t2.hasOwnProperty("raw")) throw Error("invalid template strings array");
@@ -1299,8 +1307,8 @@ Component: ${componentName}
       }
     }
     _$AC(t2) {
-      let i2 = A.get(t2.strings);
-      return void 0 === i2 && A.set(t2.strings, i2 = new N(t2)), i2;
+      let i2 = A2.get(t2.strings);
+      return void 0 === i2 && A2.set(t2.strings, i2 = new N(t2)), i2;
     }
     k(t2) {
       a(this._$AH) || (this._$AH = [], this._$AR());
@@ -103805,9 +103813,11 @@ ${preview}${JSON.stringify(data).length > 500 ? "..." : ""}`);
 });
 export {
   index$4 as AttributeMixins,
+  A as AuthFetchResolver,
   BaseWidgetMixin,
   index$3 as CallbackMixins,
   CounterMixin,
+  D as DEFAULT_AUTH_SELECTORS,
   EdcAssetsDisplay,
   EdcCatalogDisplay,
   EdcFederatedCatalogDisplay,

package/dist/{store-pxHgUL4R.js → store-D6BkvCFg.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 { l as isUrlOrRelativePath, m as jsonldContextParserExports, o as getRawContext, n as normalizeContext, q as mergeContexts, c as doesResourceContainList, r as requireJsonldContextParser, v as requireErrorCoded, w as requireLink } from "./helpers-vZrb1UDN.js";
-let StoreService, formatAttributesToServerSearchOptions, base_context, StoreType, StoreFactory, hasQueryIndex, formatAttributesToServerPaginationOptions, getDefaultExportFromCjs, hasSetLocalData, sibStore, mergeServerSearchOptions, semantizer;
+let AuthFetchResolver, DEFAULT_AUTH_SELECTORS, StoreService, formatAttributesToServerSearchOptions, base_context, StoreType, StoreFactory, hasQueryIndex, formatAttributesToServerPaginationOptions, getDefaultExportFromCjs, hasSetLocalData, sibStore, mergeServerSearchOptions, semantizer;
 let __tla = (async () => {
   var _a;
   getDefaultExportFromCjs = function(x) {
@@ -1354,6 +1354,78 @@ let __tla = (async () => {
   };
   __publicField(_DataspaceConnectorStoreAdapter, "store");
   let DataspaceConnectorStoreAdapter = _DataspaceConnectorStoreAdapter;
+  DEFAULT_AUTH_SELECTORS = [
+    "sib-auth-oidc",
+    "sib-auth"
+  ];
+  function findAuthElement(selectors = [
+    ...DEFAULT_AUTH_SELECTORS
+  ]) {
+    for (const selector of selectors) {
+      const element = document.querySelector(selector);
+      if (element && typeof element.getFetch === "function") {
+        return element;
+      }
+    }
+    return null;
+  }
+  function getAuthFetch(selectors) {
+    const authElement = findAuthElement(selectors);
+    if (authElement) {
+      try {
+        const authFetch = authElement.getFetch();
+        if (typeof authFetch === "function") {
+          return authFetch;
+        }
+      } catch (error2) {
+        console.warn("[AuthFetchResolver] Error getting auth fetch:", error2);
+      }
+    }
+    return fetch;
+  }
+  function onAuthActivated(callback, eventName = "sib-auth:activated") {
+    const handler2 = (event) => {
+      var _a2;
+      if (((_a2 = event.detail) == null ? void 0 : _a2.fetch) && typeof event.detail.fetch === "function") {
+        callback(event);
+      }
+    };
+    document.addEventListener(eventName, handler2);
+    return () => {
+      document.removeEventListener(eventName, handler2);
+    };
+  }
+  async function waitForAuthElement(selectors = [
+    ...DEFAULT_AUTH_SELECTORS
+  ], timeout = 5e3) {
+    const existing = findAuthElement(selectors);
+    if (existing) {
+      return existing;
+    }
+    return new Promise((resolve, reject) => {
+      const observer = new MutationObserver(() => {
+        const element = findAuthElement(selectors);
+        if (element) {
+          observer.disconnect();
+          resolve(element);
+        }
+      });
+      observer.observe(document.body, {
+        childList: true,
+        subtree: true
+      });
+      setTimeout(() => {
+        observer.disconnect();
+        reject(new Error(`No auth element found with selectors: ${selectors.join(", ")}`));
+      }, timeout);
+    });
+  }
+  AuthFetchResolver = {
+    findAuthElement,
+    getAuthFetch,
+    onAuthActivated,
+    waitForAuthElement
+  };
   const _LocalStorageCacheMetadataManager = class _LocalStorageCacheMetadataManager {
     constructor(endpoint, ttlMs = _LocalStorageCacheMetadataManager.DEFAULT_TTL_MS) {
       this.endpoint = endpoint;
@@ -1539,66 +1611,22 @@ let __tla = (async () => {
   __publicField(_LocalStorageCacheMetadataManager, "DEFAULT_TTL_MS", 2 * 60 * 60 * 1e3);
   let LocalStorageCacheMetadataManager = _LocalStorageCacheMetadataManager;
   class FederatedCatalogueAPIWrapper {
-    constructor(options, fcBaseUrl) {
+    constructor(fcBaseUrl, fetchAuth) {
       __publicField(this, "fcBaseUrl");
-      __publicField(this, "connect");
+      __publicField(this, "fetch");
       this.fcBaseUrl = fcBaseUrl;
-      try {
-        const connection = this.firstConnect(options);
-        this.connect = () => connection;
-      } catch (e) {
-        console.log("Error while establishing the first connection", e);
-        this.connect = null;
-      }
-    }
-    async firstConnect(options) {
-      const body = new URLSearchParams({
-        grant_type: options.kc_grant_type,
-        client_id: options.kc_client_id,
-        client_secret: options.kc_client_secret,
-        scope: options.kc_scope,
-        username: options.kc_username,
-        password: options.kc_password
-      });
-      const headers = new Headers({
-        "Content-Type": "application/x-www-form-urlencoded"
-      });
-      const response = await fetch(options.kc_url, {
-        method: "POST",
-        headers,
-        body
-      });
-      const data = await response.json();
-      const token = data.access_token;
-      if (token == null) {
-        throw new Error("connexion fails", {
-          cause: data
-        });
-      }
-      return token;
+      const baseFetch = fetchAuth || fetch;
+      this.fetch = baseFetch.bind(globalThis);
     }
     async getAllSelfDescriptions() {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/self-descriptions`;
-      const headers = new Headers({
-        Authorization: `Bearer ${token}`
-      });
-      const response = await fetch(url2, {
-        headers
-      });
+      const response = await this.fetch(url2);
       return await response.json();
     }
     async getSelfDescriptionByHash(sdHash) {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/self-descriptions/${sdHash}`;
-      const headers = new Headers({
-        Authorization: `Bearer ${token}`
-      });
-      const response = await fetch(url2, {
-        method: "GET",
-        headers
+      const response = await this.fetch(url2, {
+        method: "GET"
       });
       if (!response.ok) throw new Error(`GET /self-descriptions/${sdHash} failed: ${response.status} ${response.statusText}`, {
         cause: response
@@ -1606,18 +1634,15 @@ let __tla = (async () => {
       return await response.json();
     }
     async postQuery(statement, parameters = {}) {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/query`;
       const headers = new Headers({
-        Authorization: `Bearer ${token}`,
         "Content-Type": "application/json"
       });
       const body = JSON.stringify({
         statement,
         parameters
       });
-      const response = await fetch(url2, {
+      const response = await this.fetch(url2, {
         method: "POST",
         headers,
         body
@@ -1630,11 +1655,8 @@ let __tla = (async () => {
       return await response.json();
     }
     async postQuerySearch(statement, parameters = {}, queryLanguage = "OPENCYPHER", annotations) {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/query/search`;
       const headers = new Headers({
-        Authorization: `Bearer ${token}`,
         "Content-Type": "application/json"
       });
       const body = JSON.stringify({
@@ -1644,7 +1666,7 @@ let __tla = (async () => {
           queryLanguage
         }
       });
-      const response = await fetch(url2, {
+      const response = await this.fetch(url2, {
         method: "POST",
         headers,
         body
@@ -1657,27 +1679,33 @@ let __tla = (async () => {
       return await response.json();
     }
   }
-  function getFederatedCatalogueAPIWrapper(baseUrl, loginOptions) {
-    return new FederatedCatalogueAPIWrapper(loginOptions, baseUrl);
+  function getFederatedCatalogueAPIWrapper(baseUrl, fetch2) {
+    return new FederatedCatalogueAPIWrapper(baseUrl, fetch2);
   }
   class FederatedCatalogueStore {
     constructor(cfg) {
       __publicField(this, "cache");
-      __publicField(this, "session");
       __publicField(this, "fcApi");
       __publicField(this, "metadataManager");
       __publicField(this, "enableCaching");
+      __publicField(this, "cleanupAuth");
+      __publicField(this, "resolveFetch", (event) => {
+        if (!this.cfg.endpoint) {
+          throw new Error("Missing required `endpoint` in StoreConfig for FederatedCatalogueStore");
+        }
+        if (event.detail.fetch) {
+          this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, event.detail.fetch);
+        }
+      });
       this.cfg = cfg;
-      if (!this.cfg.login) {
-        throw new Error("Login must be provided for FederatedCatalogueStore");
-      }
       if (!this.cfg.endpoint) {
         throw new Error("Missing required `endpoint` in StoreConfig for FederatedCatalogueStore");
       }
-      try {
-        this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, this.cfg.login);
-      } catch (e) {
-        console.error("[FederatedCatalogueStore] Failed to initialize API wrapper:", e);
+      const fetchAuth = AuthFetchResolver.getAuthFetch();
+      this.cleanupAuth = AuthFetchResolver.onAuthActivated(this.resolveFetch.bind(this));
+      if (fetchAuth) {
+        this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, fetchAuth);
+      } else {
         this.fcApi = null;
       }
       this.cache = new InMemoryCacheManager();
@@ -1690,6 +1718,10 @@ let __tla = (async () => {
         this.metadataManager = null;
       }
     }
+    disconnectedCallback() {
+      var _a2;
+      (_a2 = this.cleanupAuth) == null ? void 0 : _a2.call(this);
+    }
     handlePageReload() {
       var _a2, _b;
       try {
@@ -1714,6 +1746,11 @@ let __tla = (async () => {
       }
       return "";
     }
+    buildContainerId(containerType = "default") {
+      var _a2;
+      const endpointHash = ((_a2 = this.cfg.endpoint) == null ? void 0 : _a2.replace(/[^a-zA-Z0-9]/g, "")) || "unknown";
+      return `store://local.fc-${endpointHash}-${containerType}/`;
+    }
     async getData(args) {
       var _a2;
       const targetType = this.resolveTargetType(args);
@@ -1759,7 +1796,7 @@ let __tla = (async () => {
           return await this.getFullData(targetType);
         }
         if (!resource["@id"]) {
-          resource["@id"] = targetType;
+          resource["@id"] = this.buildContainerId();
         }
         if (!resource["ldp:contains"]) {
           resource["ldp:contains"] = [];
@@ -1851,11 +1888,11 @@ let __tla = (async () => {
         return await this.getFullData(targetType);
       }
     }
-    async getFullData(targetType) {
+    async getFullData(_targetType) {
       if (!this.fcApi) {
         throw new Error("Federated API not initialized");
       }
-      const resource = await this.initLocalDataSourceContainer(targetType);
+      const resource = await this.initLocalDataSourceContainer();
       const dataset2 = await this.fcApi.getAllSelfDescriptions();
       const newMetadata = [];
       if ((dataset2 == null ? void 0 : dataset2.items) && Array.isArray(dataset2.items)) {
@@ -1899,11 +1936,8 @@ let __tla = (async () => {
       return resource;
     }
     async initLocalDataSourceContainer(dataSrc = "", containerType = "default") {
-      var _a2;
-      const endpointHash = ((_a2 = this.cfg.endpoint) == null ? void 0 : _a2.replace(/[^a-zA-Z0-9]/g, "")) || "unknown";
-      const idField = `fc-${endpointHash}-${containerType}`;
       if (!dataSrc) {
-        dataSrc = `store://local.${idField}/`;
+        dataSrc = this.buildContainerId(containerType);
       }
       const localContainer = {
         "@context": "https://cdn.startinblox.com/owl/context.jsonld",
@@ -1964,8 +1998,8 @@ let __tla = (async () => {
     }
     subscribeResourceTo(_resourceId, _nestedResourceId) {
     }
-    fetchAuthn(_iri, _options) {
-      return Promise.resolve({});
+    async fetchAuthn(_iri, _options) {
+      return await Promise.resolve({});
     }
     async setLocalData(resource, id) {
       try {
@@ -29056,9 +29090,9 @@ sh:property [
       __publicField(this, "loadingList");
       __publicField(this, "headers");
       __publicField(this, "fetch");
-      __publicField(this, "session");
       __publicField(this, "contextParser");
       __publicField(this, "searchProvider");
+      __publicField(this, "cleanupAuth");
       __publicField(this, "resolveResource", (id, resolve) => {
         const handler2 = (event) => {
           if (event.detail.id === id) {
@@ -29072,6 +29106,11 @@ sh:property [
         };
         return handler2;
       });
+      __publicField(this, "resolveFetch", (event) => {
+        if (event.detail.fetch) {
+          this.fetch = event.detail.fetch.bind ? event.detail.fetch.bind(globalThis) : event.detail.fetch;
+        }
+      });
       this.storeOptions = storeOptions;
       this.cache = this.storeOptions.cacheManager ?? new InMemoryCacheManager();
       this.subscriptionIndex = /* @__PURE__ */ new Map();
@@ -29082,15 +29121,35 @@ sh:property [
         "Content-Type": "application/ld+json",
         "Cache-Control": "must-revalidate"
       };
-      this.fetch = this.storeOptions.fetchMethod;
-      this.session = this.storeOptions.session;
       this.contextParser = new jsonldContextParserExports.ContextParser();
       this.searchProvider = new SolidIndexingSearchProvider(this.getData.bind(this));
+      if (this.storeOptions.fetchMethod) {
+        this.fetch = this.storeOptions.fetchMethod.bind(globalThis);
+      } else {
+        const authFetch = AuthFetchResolver.getAuthFetch();
+        this.fetch = authFetch.bind ? authFetch.bind(globalThis) : authFetch;
+        this.cleanupAuth = AuthFetchResolver.onAuthActivated(this.resolveFetch.bind(this));
+      }
+      if (!this.fetch) {
+        this.fetch = fetch;
+      }
+      const event = new CustomEvent("sib-core:loaded", {
+        bubbles: true,
+        composed: true,
+        detail: {
+          store: this
+        }
+      });
+      window.dispatchEvent(event);
     }
     async initGetter() {
-      const { CustomGetter } = await import("./custom-getter-DFIdqwHu.js");
+      const { CustomGetter } = await import("./custom-getter-WZPa-O0k.js");
       return CustomGetter;
     }
+    disconnectedCallback() {
+      var _a2;
+      (_a2 = this.cleanupAuth) == null ? void 0 : _a2.call(this);
+    }
     async getData(id, context2, parentId, localData, forceFetch, serverPagination, serverSearch, headers, bypassLoadingList) {
       var _a2;
       let key = id;
@@ -29156,17 +29215,7 @@ sh:property [
       if (!this.fetch) {
         console.warn("No fetch method available");
       }
-      let authenticated = false;
-      if (this.session) authenticated = await this.session;
-      if (this.fetch && authenticated) {
-        return this.fetch.then((fn) => {
-          return fn(iri, options);
-        });
-      }
-      if (options.headers) {
-        options.headers = this._convertHeaders(options.headers);
-      }
-      return fetch(iri, options).then((response) => response);
+      return await this.fetch(iri, options);
     }
     async fetchData(id, context2 = null, parentId = "", serverPagination, serverSearch, headers) {
       let iri = this._getAbsoluteIri(id, context2, parentId);
@@ -29409,19 +29458,19 @@ sh:property [
       ]);
     }
     _getAbsoluteIri(id, context2, parentId) {
+      var _a2;
       let iri = normalizeContext(context2, base_context).expandTerm(id);
       if (!iri) return "";
-      if (parentId && !parentId.startsWith("store://local")) {
-        const parentIri = new URL(parentId, document.location.href).href;
-        iri = new URL(iri, parentIri).href;
-      } else {
-        iri = new URL(iri, document.location.href).href;
+      try {
+        const baseHref = ((_a2 = document == null ? void 0 : document.location) == null ? void 0 : _a2.href) || "";
+        const canUseParent = parentId && !parentId.startsWith("store://local");
+        const base = canUseParent ? new URL(parentId, baseHref).href : baseHref;
+        iri = new URL(iri, base).href;
+      } catch (err) {
+        console.log("[LDPStore _getAbsoluteIri()]", err);
       }
       return iri;
     }
-    async getSession() {
-      return await this.session;
-    }
     _getLanguage() {
       return localStorage.getItem("language") || window.navigator.language.slice(0, 2);
     }
@@ -29439,16 +29488,8 @@ sh:property [
     if (window.sibStore) {
       return window.sibStore;
     }
-    const storeOptions = {};
-    const sibAuth = document.querySelector("sib-auth");
-    if (sibAuth) {
-      const sibAuthDefined = customElements.whenDefined(sibAuth.localName);
-      storeOptions.session = sibAuthDefined.then(() => sibAuth.session);
-      storeOptions.fetchMethod = sibAuthDefined.then(() => sibAuth.getFetch());
-    }
     const store2 = new LdpStore({
-      ..._cfg == null ? void 0 : _cfg.options,
-      ...storeOptions
+      ..._cfg == null ? void 0 : _cfg.options
     });
     window.sibStore = store2;
     return store2;
@@ -33622,6 +33663,8 @@ sh:property [
   semantizer = globalThis.SEMANTIZER;
 })();
 export {
+  AuthFetchResolver as A,
+  DEFAULT_AUTH_SELECTORS as D,
   StoreService as S,
   __tla,
   formatAttributesToServerSearchOptions as a,

package/dist/store.js

@@ -1,4 +1,4 @@
-import { s, S, c, b, i } from "./store-pxHgUL4R.js";
+import { s, S, c, b, i } from "./store-D6BkvCFg.js";
 export {
   s as SEMANTIZER,
   S as StoreService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/core",
-  "version": "2.0.6-beta.7",
+  "version": "2.0.6-beta.8",
   "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",