@pod-os/core 0.31.0-rc.f50f005.0 → 0.31.0

package/dist/index.js

@@ -28261,23 +28261,22 @@ var Fetcher = class _Fetcher {
   linkData(originalUri, rel2, uri6, why, reverse) {
     if (!uri6) return;
     let kb = this.store;
-    let predicate4;
     let obj = kb.rdfFactory.namedNode(join(uri6, originalUri.value));
+    let predicates;
     if (rel2 === "alternate" || rel2 === "seeAlso" || rel2 === "meta" || rel2 === "describedby") {
       if (obj.value === originalUri.value) {
         return;
       }
-      predicate4 = this.ns.rdfs("seeAlso");
+      predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel2)), this.ns.rdfs("seeAlso")];
     } else if (rel2 === "type") {
-      predicate4 = kb.rdfFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+      predicates = [kb.rdfFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")];
     } else {
-      predicate4 = kb.rdfFactory.namedNode(join(encodeURIComponent(rel2), "http://www.iana.org/assignments/link-relations/"));
-    }
-    if (reverse) {
-      kb.add(obj, predicate4, originalUri, why);
-    } else {
-      kb.add(originalUri, predicate4, obj, why);
+      predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel2))];
     }
+    kb.addAll(predicates.map((predicate4) => reverse ? kb.rdfFactory.quad(obj, predicate4, originalUri, why) : kb.rdfFactory.quad(originalUri, predicate4, obj, why)));
+  }
+  ianaLinkRelation(rel2) {
+    return join(encodeURIComponent(rel2), "http://www.iana.org/assignments/link-relations/");
   }
   parseLinkHeader(linkHeader, originalUri, reqNode) {
     if (!linkHeader) {
@@ -29913,6 +29912,11 @@ var rdfs = Namespace("http://www.w3.org/2000/01/rdf-schema#");
 var pim = Namespace("http://www.w3.org/ns/pim/space#");
 var schema = Namespace("https://schema.org/");
 var flow = Namespace("http://www.w3.org/2005/01/wf/flow#");
+var iana = Namespace(
+  "http://www.iana.org/assignments/link-relations/"
+);
+var link = Namespace("http://www.w3.org/2007/ont/link#");
+var internal = Namespace("urn:pod-os:internal");
 
 // src/thing/accumulateSubjects.ts
 var accumulateSubjects = (accumulator, current3) => {
@@ -30272,6 +30276,17 @@ var Thing = class {
     const uri6 = new URL(".", baseUri).toString();
     return { uri: uri6 };
   }
+  rdfDocument() {
+    const doc = namedNode2(this.uri).doc();
+    const isRdf = this.store.get(doc.uri).hasType(link("RDFDocument").value);
+    if (isRdf) {
+      return doc.value;
+    }
+    return this.store.anyValue(doc, iana("describedby"), null, internal());
+  }
+  hasType(typeUri) {
+    return this.types().map((it) => it.uri).includes(typeUri);
+  }
 };
 
 // src/ldp-container/LdpContainer.ts
@@ -30826,6 +30841,7 @@ var AssumeAlwaysOnline = class {
 // src/Store.ts
 var Store = class {
   constructor(session4, offlineCache = new NoOfflineCache(), onlineStatus = new AssumeAlwaysOnline(), internalStore = graph()) {
+    this.DESCRIBEDBY = iana("describedby");
     this.internalStore = internalStore;
     this.fetcher = new OfflineCapableFetcher(this.internalStore, {
       fetch: session4.authenticatedFetch,
@@ -30841,11 +30857,13 @@ var Store = class {
     );
   }
   /**
-   * Fetch data for the given URI to the internalStore
+   * Fetch data for the given URI to the internalStore.
+   * If the response includes a Link header with rel="describedby",
+   * the metadata document will also be fetched automatically.
    * @param uri
    */
-  fetch(uri6) {
-    return this.fetcher.load(namedNode2(uri6), {
+  async fetch(uri6) {
+    const response6 = await this.fetcher.load(namedNode2(uri6), {
       // force fetching due to
       // https://github.com/linkeddata/rdflib.js/issues/247
       // and
@@ -30855,6 +30873,28 @@ var Store = class {
       // https://github.com/pod-os/PodOS/issues/17
       credentials: "omit"
     });
+    const descriptionResourceUri = this.internalStore.any(
+      namedNode2(uri6),
+      this.DESCRIBEDBY,
+      null,
+      response6.req
+    );
+    if (descriptionResourceUri) {
+      try {
+        await this.fetcher.load(namedNode2(descriptionResourceUri.value), {
+          force: true,
+          credentials: "omit"
+        });
+      } catch {
+      } finally {
+        this.internalStore.add(
+          namedNode2(uri6),
+          this.DESCRIBEDBY,
+          namedNode2(descriptionResourceUri.value),
+          internal()
+        );
+      }
+    }
   }
   /**
    * Fetch all the given URIs in parallel and put the data to the internalStore
@@ -30878,38 +30918,38 @@ var Store = class {
    * @param property
    * @param value
    */
-  addPropertyValue(thing, property4, value8) {
-    return this.updater.update(
-      [],
-      [st(namedNode2(thing.uri), namedNode2(property4), lit(value8), namedNode2(thing.uri).doc())],
-      void 0,
-      false,
-      {
-        // explicitly omit credentials due to
-        // https://github.com/pod-os/PodOS/issues/17
-        credentials: "omit"
-      }
+  async addPropertyValue(thing, property4, value8) {
+    const docUrl = this.determineDocumentToUpdate(thing);
+    return this.insert(
+      st(namedNode2(thing.uri), namedNode2(property4), lit(value8), namedNode2(docUrl))
     );
   }
+  insert(statement2) {
+    return this.updater.update([], [statement2], void 0, false, {
+      // explicitly omit credentials due to
+      // https://github.com/pod-os/PodOS/issues/17
+      credentials: "omit"
+    });
+  }
   /**
    * Adds a new relation (link) from the thing to the given uri using the property
    * @param thing
    * @param property
    * @param uri
    */
-  addRelation(thing, property4, uri6) {
-    return this.updater.update(
-      [],
-      [st(namedNode2(thing.uri), namedNode2(property4), namedNode2(uri6), namedNode2(thing.uri).doc())],
-      void 0,
-      false,
-      {
-        // explicitly omit credentials due to
-        // https://github.com/pod-os/PodOS/issues/17
-        credentials: "omit"
-      }
+  async addRelation(thing, property4, uri6) {
+    const docUrl = this.determineDocumentToUpdate(thing);
+    return this.insert(
+      st(namedNode2(thing.uri), namedNode2(property4), namedNode2(uri6), namedNode2(docUrl))
     );
   }
+  determineDocumentToUpdate(thing) {
+    const docUrl = thing.rdfDocument();
+    if (!docUrl) {
+      throw new Error("Could not determine document to update");
+    }
+    return docUrl;
+  }
   async addNewThing(uri6, name9, type5) {
     await this.updater.update(
       [],
@@ -31123,7 +31163,7 @@ __export(index_es_exports, {
   http: () => http,
   hydra: () => hydra,
   ldp: () => ldp2,
-  link: () => link3,
+  link: () => link4,
   log: () => log2,
   meeting: () => meeting,
   owl: () => owl,
@@ -34636,7 +34676,7 @@ var referral = "http://hl7.org/fhir/referral";
 var _conditionality = "http://hl7.org/fhir/_conditionality";
 var AuditEventSourceComponent = "http://hl7.org/fhir/AuditEventSourceComponent";
 var _component = "http://hl7.org/fhir/_component";
-var link = "http://hl7.org/fhir/link";
+var link2 = "http://hl7.org/fhir/link";
 var _hasStage = "http://hl7.org/fhir/_hasStage";
 var _contentReference = "http://hl7.org/fhir/_contentReference";
 var program = "http://hl7.org/fhir/program";
@@ -38871,7 +38911,7 @@ var fhirImport = /* @__PURE__ */ Object.freeze({
   _conditionality,
   AuditEventSourceComponent,
   _component,
-  link,
+  link: link2,
   _hasStage,
   _contentReference,
   program,
@@ -51875,7 +51915,7 @@ var last_reply_date = "http://rdfs.org/sioc/ns#last_reply_date";
 var later_version = "http://rdfs.org/sioc/ns#later_version";
 var latest_version = "http://rdfs.org/sioc/ns#latest_version";
 var likes = "http://rdfs.org/sioc/ns#likes";
-var link2 = "http://rdfs.org/sioc/ns#link";
+var link3 = "http://rdfs.org/sioc/ns#link";
 var links_to = "http://rdfs.org/sioc/ns#links_to";
 var member_of = "http://rdfs.org/sioc/ns#member_of";
 var mentions3 = "http://rdfs.org/sioc/ns#mentions";
@@ -51974,7 +52014,7 @@ var siocImport = /* @__PURE__ */ Object.freeze({
   later_version,
   latest_version,
   likes,
-  link: link2,
+  link: link3,
   links_to,
   member_of,
   mentions: mentions3,
@@ -52755,7 +52795,7 @@ var foaf = foafImport;
 var http = httpImport;
 var hydra = hydraImport;
 var ldp2 = ldpImport;
-var link3 = linkImport;
+var link4 = linkImport;
 var log2 = logImport;
 var meeting = meetingImport;
 var owl = owlImport;

package/lib/index.js

@@ -17478,7 +17478,7 @@ var PodOS = (() => {
         if (!state2.link.hasOwnProperty(state2.graph)) {
           state2.link[state2.graph] = {};
         }
-        const link4 = state2.link[state2.graph];
+        const link5 = state2.link[state2.graph];
         const matches = _filterSubjects(state2, subjects2, frame, flags3);
         const ids = Object.keys(matches).sort();
         for (const id4 of ids) {
@@ -17488,15 +17488,15 @@ var PodOS = (() => {
           } else {
             state2.uniqueEmbeds[state2.graph] = state2.uniqueEmbeds[state2.graph] || {};
           }
-          if (flags3.embed === "@link" && id4 in link4) {
-            _addFrameOutput(parent4, property4, link4[id4]);
+          if (flags3.embed === "@link" && id4 in link5) {
+            _addFrameOutput(parent4, property4, link5[id4]);
             continue;
           }
           const output2 = { "@id": id4 };
           if (id4.indexOf("_:") === 0) {
             util.addValue(state2.bnodeMap, id4, output2, { propertyIsArray: true });
           }
-          link4[id4] = output2;
+          link5[id4] = output2;
           if ((flags3.embed === "@first" || flags3.embed === "@last") && state2.is11) {
             throw new JsonLdError(
               "Invalid JSON-LD syntax; invalid value of @embed.",
@@ -36698,23 +36698,22 @@ var PodOS = (() => {
     linkData(originalUri, rel2, uri6, why, reverse) {
       if (!uri6) return;
       let kb = this.store;
-      let predicate4;
       let obj = kb.rdfFactory.namedNode(join(uri6, originalUri.value));
+      let predicates;
       if (rel2 === "alternate" || rel2 === "seeAlso" || rel2 === "meta" || rel2 === "describedby") {
         if (obj.value === originalUri.value) {
           return;
         }
-        predicate4 = this.ns.rdfs("seeAlso");
+        predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel2)), this.ns.rdfs("seeAlso")];
       } else if (rel2 === "type") {
-        predicate4 = kb.rdfFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+        predicates = [kb.rdfFactory.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")];
       } else {
-        predicate4 = kb.rdfFactory.namedNode(join(encodeURIComponent(rel2), "http://www.iana.org/assignments/link-relations/"));
-      }
-      if (reverse) {
-        kb.add(obj, predicate4, originalUri, why);
-      } else {
-        kb.add(originalUri, predicate4, obj, why);
+        predicates = [kb.rdfFactory.namedNode(this.ianaLinkRelation(rel2))];
       }
+      kb.addAll(predicates.map((predicate4) => reverse ? kb.rdfFactory.quad(obj, predicate4, originalUri, why) : kb.rdfFactory.quad(originalUri, predicate4, obj, why)));
+    }
+    ianaLinkRelation(rel2) {
+      return join(encodeURIComponent(rel2), "http://www.iana.org/assignments/link-relations/");
     }
     parseLinkHeader(linkHeader, originalUri, reqNode) {
       if (!linkHeader) {
@@ -38350,6 +38349,11 @@ _:patch
   var pim = Namespace("http://www.w3.org/ns/pim/space#");
   var schema = Namespace("https://schema.org/");
   var flow = Namespace("http://www.w3.org/2005/01/wf/flow#");
+  var iana = Namespace(
+    "http://www.iana.org/assignments/link-relations/"
+  );
+  var link = Namespace("http://www.w3.org/2007/ont/link#");
+  var internal = Namespace("urn:pod-os:internal");
 
   // src/thing/accumulateSubjects.ts
   var accumulateSubjects = (accumulator, current3) => {
@@ -38709,6 +38713,17 @@ _:patch
       const uri6 = new URL(".", baseUri).toString();
       return { uri: uri6 };
     }
+    rdfDocument() {
+      const doc = namedNode2(this.uri).doc();
+      const isRdf = this.store.get(doc.uri).hasType(link("RDFDocument").value);
+      if (isRdf) {
+        return doc.value;
+      }
+      return this.store.anyValue(doc, iana("describedby"), null, internal());
+    }
+    hasType(typeUri) {
+      return this.types().map((it) => it.uri).includes(typeUri);
+    }
   };
 
   // src/ldp-container/LdpContainer.ts
@@ -39263,6 +39278,7 @@ _:patch
   // src/Store.ts
   var Store = class {
     constructor(session4, offlineCache = new NoOfflineCache(), onlineStatus = new AssumeAlwaysOnline(), internalStore = graph()) {
+      this.DESCRIBEDBY = iana("describedby");
       this.internalStore = internalStore;
       this.fetcher = new OfflineCapableFetcher(this.internalStore, {
         fetch: session4.authenticatedFetch,
@@ -39278,11 +39294,13 @@ _:patch
       );
     }
     /**
-     * Fetch data for the given URI to the internalStore
+     * Fetch data for the given URI to the internalStore.
+     * If the response includes a Link header with rel="describedby",
+     * the metadata document will also be fetched automatically.
      * @param uri
      */
-    fetch(uri6) {
-      return this.fetcher.load(namedNode2(uri6), {
+    async fetch(uri6) {
+      const response6 = await this.fetcher.load(namedNode2(uri6), {
         // force fetching due to
         // https://github.com/linkeddata/rdflib.js/issues/247
         // and
@@ -39292,6 +39310,28 @@ _:patch
         // https://github.com/pod-os/PodOS/issues/17
         credentials: "omit"
       });
+      const descriptionResourceUri = this.internalStore.any(
+        namedNode2(uri6),
+        this.DESCRIBEDBY,
+        null,
+        response6.req
+      );
+      if (descriptionResourceUri) {
+        try {
+          await this.fetcher.load(namedNode2(descriptionResourceUri.value), {
+            force: true,
+            credentials: "omit"
+          });
+        } catch {
+        } finally {
+          this.internalStore.add(
+            namedNode2(uri6),
+            this.DESCRIBEDBY,
+            namedNode2(descriptionResourceUri.value),
+            internal()
+          );
+        }
+      }
     }
     /**
      * Fetch all the given URIs in parallel and put the data to the internalStore
@@ -39315,38 +39355,38 @@ _:patch
      * @param property
      * @param value
      */
-    addPropertyValue(thing, property4, value8) {
-      return this.updater.update(
-        [],
-        [st(namedNode2(thing.uri), namedNode2(property4), lit(value8), namedNode2(thing.uri).doc())],
-        void 0,
-        false,
-        {
-          // explicitly omit credentials due to
-          // https://github.com/pod-os/PodOS/issues/17
-          credentials: "omit"
-        }
+    async addPropertyValue(thing, property4, value8) {
+      const docUrl = this.determineDocumentToUpdate(thing);
+      return this.insert(
+        st(namedNode2(thing.uri), namedNode2(property4), lit(value8), namedNode2(docUrl))
       );
     }
+    insert(statement2) {
+      return this.updater.update([], [statement2], void 0, false, {
+        // explicitly omit credentials due to
+        // https://github.com/pod-os/PodOS/issues/17
+        credentials: "omit"
+      });
+    }
     /**
      * Adds a new relation (link) from the thing to the given uri using the property
      * @param thing
      * @param property
      * @param uri
      */
-    addRelation(thing, property4, uri6) {
-      return this.updater.update(
-        [],
-        [st(namedNode2(thing.uri), namedNode2(property4), namedNode2(uri6), namedNode2(thing.uri).doc())],
-        void 0,
-        false,
-        {
-          // explicitly omit credentials due to
-          // https://github.com/pod-os/PodOS/issues/17
-          credentials: "omit"
-        }
+    async addRelation(thing, property4, uri6) {
+      const docUrl = this.determineDocumentToUpdate(thing);
+      return this.insert(
+        st(namedNode2(thing.uri), namedNode2(property4), namedNode2(uri6), namedNode2(docUrl))
       );
     }
+    determineDocumentToUpdate(thing) {
+      const docUrl = thing.rdfDocument();
+      if (!docUrl) {
+        throw new Error("Could not determine document to update");
+      }
+      return docUrl;
+    }
     async addNewThing(uri6, name9, type5) {
       await this.updater.update(
         [],
@@ -39560,7 +39600,7 @@ _:patch
     http: () => http,
     hydra: () => hydra,
     ldp: () => ldp2,
-    link: () => link3,
+    link: () => link4,
     log: () => log2,
     meeting: () => meeting,
     owl: () => owl,
@@ -43073,7 +43113,7 @@ _:patch
   var _conditionality = "http://hl7.org/fhir/_conditionality";
   var AuditEventSourceComponent = "http://hl7.org/fhir/AuditEventSourceComponent";
   var _component = "http://hl7.org/fhir/_component";
-  var link = "http://hl7.org/fhir/link";
+  var link2 = "http://hl7.org/fhir/link";
   var _hasStage = "http://hl7.org/fhir/_hasStage";
   var _contentReference = "http://hl7.org/fhir/_contentReference";
   var program = "http://hl7.org/fhir/program";
@@ -47308,7 +47348,7 @@ _:patch
     _conditionality,
     AuditEventSourceComponent,
     _component,
-    link,
+    link: link2,
     _hasStage,
     _contentReference,
     program,
@@ -60312,7 +60352,7 @@ _:patch
   var later_version = "http://rdfs.org/sioc/ns#later_version";
   var latest_version = "http://rdfs.org/sioc/ns#latest_version";
   var likes = "http://rdfs.org/sioc/ns#likes";
-  var link2 = "http://rdfs.org/sioc/ns#link";
+  var link3 = "http://rdfs.org/sioc/ns#link";
   var links_to = "http://rdfs.org/sioc/ns#links_to";
   var member_of = "http://rdfs.org/sioc/ns#member_of";
   var mentions3 = "http://rdfs.org/sioc/ns#mentions";
@@ -60411,7 +60451,7 @@ _:patch
     later_version,
     latest_version,
     likes,
-    link: link2,
+    link: link3,
     links_to,
     member_of,
     mentions: mentions3,
@@ -61192,7 +61232,7 @@ _:patch
   var http = httpImport;
   var hydra = hydraImport;
   var ldp2 = ldpImport;
-  var link3 = linkImport;
+  var link4 = linkImport;
   var log2 = logImport;
   var meeting = meetingImport;
   var owl = owlImport;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pod-os/core",
   "description": "Core module of PodOS",
-  "version": "0.31.0-rc.f50f005.0",
+  "version": "0.31.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
@@ -68,7 +68,7 @@
     "mime": "^4.1.0",
     "neverthrow": "^8.2.0",
     "rdf-namespaces": "^1.17.0",
-    "rdflib": "2.3.9",
+    "rdflib": "2.4.0",
     "rxjs": "^7.8.2",
     "slugify": "^1.6.9",
     "url": "^0.11.4",

package/types/Store.d.ts

@@ -16,16 +16,19 @@ export declare class Store {
     removals$: Subject<Quad>;
     private readonly internalStore;
     constructor(session: PodOsSession, offlineCache?: OfflineCache, onlineStatus?: OnlineStatus, internalStore?: IndexedFormula);
+    readonly DESCRIBEDBY: import("rdflib/lib/tf-types").NamedNode;
     /**
-     * Fetch data for the given URI to the internalStore
+     * Fetch data for the given URI to the internalStore.
+     * If the response includes a Link header with rel="describedby",
+     * the metadata document will also be fetched automatically.
      * @param uri
      */
-    fetch(uri: string): Promise<Response>;
+    fetch(uri: string): Promise<void>;
     /**
      * Fetch all the given URIs in parallel and put the data to the internalStore
      * @param uris
      */
-    fetchAll(uris: string[]): Promise<PromiseSettledResult<Response>[]>;
+    fetchAll(uris: string[]): Promise<PromiseSettledResult<void>[]>;
     /**
      * Retrieve the thing identified by the given URI from the internalStore
      * @param uri
@@ -38,6 +41,7 @@ export declare class Store {
      * @param value
      */
     addPropertyValue(thing: Thing, property: string, value: string): Promise<void>;
+    private insert;
     /**
      * Adds a new relation (link) from the thing to the given uri using the property
      * @param thing
@@ -45,6 +49,7 @@ export declare class Store {
      * @param uri
      */
     addRelation(thing: Thing, property: string, uri: string): Promise<void>;
+    private determineDocumentToUpdate;
     addNewThing(uri: string, name: string, type: string): Promise<void>;
     executeUpdate(operation: UpdateOperation): Promise<void>;
     flagAuthorizationMetadata(): void;

package/types/index.d.ts

@@ -48,8 +48,8 @@ export declare class PodOS {
     private readonly profileGateway;
     constructor({ session, offlineCache, onlineStatus, internalStore, }?: PodOsConfiguration);
     private flagAuthorizationMetaDataOnSessionChange;
-    fetch(uri: string): Promise<Response>;
-    fetchAll(uris: string[]): Promise<PromiseSettledResult<Response>[]>;
+    fetch(uri: string): Promise<void>;
+    fetchAll(uris: string[]): Promise<PromiseSettledResult<void>[]>;
     /**
      * @deprecated Use {@link FileFetcher.fetchFile} via {@link PodOS.files} instead
      * @param {string} url - URL identifying the file

package/types/namespaces/index.d.ts

@@ -1,4 +1,8 @@
+import { NamedNode } from "rdflib";
 export declare const rdfs: (ln: string) => import("rdflib/lib/tf-types").NamedNode;
 export declare const pim: (ln: string) => import("rdflib/lib/tf-types").NamedNode;
 export declare const schema: (ln: string) => import("rdflib/lib/tf-types").NamedNode;
 export declare const flow: (ln: string) => import("rdflib/lib/tf-types").NamedNode;
+export declare const iana: (ln: string) => import("rdflib/lib/tf-types").NamedNode;
+export declare const link: (ln: string) => import("rdflib/lib/tf-types").NamedNode;
+export declare const internal: () => NamedNode;

package/types/thing/Thing.d.ts

@@ -115,4 +115,6 @@ export declare class Thing {
     container(): {
         uri: string;
     };
+    rdfDocument(): string | undefined;
+    private hasType;
 }

package/types/thing/Thing.rdfDocument.spec.d.ts

@@ -0,0 +1 @@
+export {};